From nobody Sun Feb 8 20:34:12 2026 Received: from mail-lf1-f73.google.com (mail-lf1-f73.google.com [209.85.167.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 144D01292D2 for ; Thu, 4 Apr 2024 12:32:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233929; cv=none; b=jiVDbIV72fi9WaS7uMO6eVQZR/u/jC2KxuFwaLeyfXwzN04PrcEiUnYSArDPRxpK9z9qD7Um/BvfBXy7IiUlUQlGlFnXJXHuT4b6nVU2CPsSTjidX4cjjmlvqGI/49ny5YhL5nW5XjeVSjiDBI43QjUH1OBzyjSxuGjuvAJPRpA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233929; c=relaxed/simple; bh=ENZEMbGPREyoSg5+wBFZYD4lbX19qXHHsyAQOWu60DY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XTlX0KucVnsOTKJDotgzs09/s0EvgQu8MwBLp6MGLcWctxouAOjnEwTdhI2edBF1yF3Miz+3YJucaOaTr/8FYm0pv5LJQNEFZ04swV3N+fL7sBr6ka0s2N/FGyf6Y1ZI3QgPTiRVVcETmW0eaa4wd8+j8beg5F43Ehy8jiTpz9M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=WysMrGuH; arc=none smtp.client-ip=209.85.167.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="WysMrGuH" Received: by mail-lf1-f73.google.com with SMTP id 2adb3069b0e04-516d1d5eba4so32279e87.3 for ; Thu, 04 Apr 2024 05:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712233925; x=1712838725; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=ysVmEE4mL4bMw4uot+7FLn+nKcsM+tEfIcHG5UH/UW0=; b=WysMrGuHidg6eDNEwlU04V/Py7HeAtnG5JHpqI+Rq6uRv2dhZGBZajoMY0/HBXcefJ DprGlXTZiuytwyaotrPUNnYw4LvKoKFA9S5sfXf3kxMyt4f13sg5nlpflh2Su09BYzA5 2ii2KWd8exCBisEI9+CLsrDneeGYF2dpZdajkXajpCAyQmpNtgiB7Z+Otdose9N0zoTk mm4GK3RbZYadQMupQ8DsgCcwtdzFg3VbYppeiveJ2oqiHOT9LcKEpNexxhk7LZuhTgki ad+qsjGWe8NxPBulbhS0lxjpcRv/ilrpmW2r/TbfhkJ3dMSPSBPgBqQsaHVHDpW7RKdH zRyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712233925; x=1712838725; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=ysVmEE4mL4bMw4uot+7FLn+nKcsM+tEfIcHG5UH/UW0=; b=EINXPXTGKZMzhiky15u41CFuYCMnoFe4RSJhkOyJtLOCZUmNOMwWCXXBP1YQFBkrPz 7tjM+odNpJwiQfbpIumaS8GhfCqKq0UNovpAk3vdcFt5QdAX+LNXPAZOQ+8AGB8p1M9g K9wzJX3AyWvK4t6aU4KiHpwhzhhdg1Z8wGu3ira4k+08cQVSqQq1CQxpA/6QFQXzr1mC EYcLs1naYlbSwRR556Vyrd1oztXkdbTwTsJke3K24mPWJhWD/SjB/frxIIiXE8HF4cwv yOhTO2yizjCiMtgCdq9jZiqaoqj4PLuqh5hrdQzHQVfjBAJC5CrK8O9eY+HG2jvk3CnV z1Tw== X-Forwarded-Encrypted: i=1; AJvYcCUvgLmMhJ0fcaqB4hBJSHrPubZ6pdYmEopntkM/QysIRDCjHNytUEAZR020ohhwfTtWBINZ4S7hu7G5ZbT0Aw02GNbzddlyPfYrvM+W X-Gm-Message-State: AOJu0Yzep6Ph9YVy0Ah7Idxbp4+jbtOjwOfAFbqQyTQNKTReDp27DWpE Wv6p0VMAHWbyuQYLNbwLnEwA+XEg9/PfT9YL23iwHEOT0KpM0+err9omz9NVXlir7zXYSytkPeL Ic6Q4BcgfLfg5PQ== X-Google-Smtp-Source: AGHT+IFrwRynX5aWcZHx3g+jAqvB3lD7LQiPlI1bTzUb5n6NBE4kIOwE9BszfMGy9/GGL1AmsLhqzAfCwM6VGIM= X-Received: from aliceryhl2.c.googlers.com ([fda3:e722:ac3:cc00:68:949d:c0a8:572]) (user=aliceryhl job=sendgmr) by 2002:ac2:46ec:0:b0:516:726f:112a with SMTP id q12-20020ac246ec000000b00516726f112amr2495lfo.11.1712233924900; Thu, 04 Apr 2024 05:32:04 -0700 (PDT) Date: Thu, 04 Apr 2024 12:31:39 +0000 In-Reply-To: <20240404-alice-mm-v4-0-49a84242cf02@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240404-alice-mm-v4-0-49a84242cf02@google.com> X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=14993; i=aliceryhl@google.com; h=from:subject:message-id; bh=U2svVG4smSrGB686kZq+YByj41C8BHYczzuL+Plq8Y0=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBmDp297NpKkwdEgApdvuP1O7rHV/xrtpCd46bHP 6bmTytk0TqJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCZg6dvQAKCRAEWL7uWMY5 Rs/KD/4n5BXQB8lYJ5u0mP3iZ51DHuumLkvA7xur/HtXbnHKrnQwhSMz2FxWuvA3/6bRxuhN4lQ OSCMRU7R3FcErMKpA4M5FT8DLOZWeSfCFaTCm2W2xMXcAaLZA5wOZnEJKiesuOUjrGRCjlEhQE4 3HTrVrmfzwzJ0Sq8SfCNc5De2f2GBpqRsMTzYXJFerZVueUdsmXEUA6VH+ZuTkwFZznBKx7qt3s 088veuPbyt8jx6lVZieMEiR0OtYzYGwwu8rzH7SDFjRpKpAYcULcdKPBNkKjnXztjeE6aW0z7Ck hESfmDxTOUtswgKOnRbELN9W8CQ5Ah/K3Pidi8IT0yiiu1/s8rzfhEWuS2CJ6yv+/uocTMOLpoP q4/kEbuq4IX3N0uLc7HwtzW1XoI8yWaLytgliRHmBwUuYUmEYG8fPJ2EjJDQP2jVbKGgu2g4RdS 3k26rW/vlVx43cdJjc+0ocGJnMQok6omKdxNHeviMKWswPFJV9RigRTm5q/YfJUWPMiXkgHmQVl aKOK/LebzW6mQFiJyZ1JADfJ282jFfhj9Hul/1GTu1JMy152nS3Tfh2DSqeEXFSGRcLfy8yrjY7 ersWbqLCQu/EDahfc2TP5FaMraCyEBI45T+iLEeABV57jO8PLAg46vjLPJGeq1Fpmj/UzhsvDjF gVaZ6Px10t5Lrcw== X-Mailer: b4 0.13-dev-26615 Message-ID: <20240404-alice-mm-v4-1-49a84242cf02@google.com> Subject: [PATCH v4 1/4] rust: uaccess: add userspace pointers From: Alice Ryhl To: Miguel Ojeda , Matthew Wilcox , Al Viro , Andrew Morton , Kees Cook Cc: Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?utf-8?q?Bj=C3=B6rn_Roy_Baron?=" , Benno Lossin , Andreas Hindborg , Greg Kroah-Hartman , "=?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Arnd Bergmann , linux-mm@kvack.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alice Ryhl , Christian Brauner Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Wedson Almeida Filho A pointer to an area in userspace memory, which can be either read-only or read-write. All methods on this struct are safe: attempting to read or write on bad addresses (either out of the bound of the slice or unmapped addresses) will return `EFAULT`. Concurrent access, *including data races to/from userspace memory*, is permitted, because fundamentally another userspace thread/process could always be modifying memory at the same time (in the same way that userspace Rust's `std::io` permits data races with the contents of files on disk). In the presence of a race, the exact byte values read/written are unspecified but the operation is well-defined. Kernelspace code should validate its copy of data after completing a read, and not expect that multiple reads of the same address will return the same value. These APIs are designed to make it difficult to accidentally write TOCTOU bugs. Every time you read from a memory location, the pointer is advanced by the length so that you cannot use that reader to read the same memory location twice. Preventing double-fetches avoids TOCTOU bugs. This is accomplished by taking `self` by value to prevent obtaining multiple readers on a given `UserSlicePtr`, and the readers only permitting forward reads. If double-fetching a memory location is necessary for some reason, then that is done by creating multiple readers to the same memory location. Constructing a `UserSlicePtr` performs no checks on the provided address and length, it can safely be constructed inside a kernel thread with no current userspace process. Reads and writes wrap the kernel APIs `copy_from_user` and `copy_to_user`, which check the memory map of the current process and enforce that the address range is within the user range (no additional calls to `access_ok` are needed). This code is based on something that was originally written by Wedson on the old rust branch. It was modified by Alice by removing the `IoBufferReader` and `IoBufferWriter` traits, and various other changes. Signed-off-by: Wedson Almeida Filho Co-developed-by: Alice Ryhl Signed-off-by: Alice Ryhl --- rust/helpers.c | 14 +++ rust/kernel/lib.rs | 1 + rust/kernel/uaccess.rs | 311 +++++++++++++++++++++++++++++++++++++++++++++= ++++ 3 files changed, 326 insertions(+) diff --git a/rust/helpers.c b/rust/helpers.c index 70e59efd92bc..312b6fcb49d5 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -38,6 +38,20 @@ __noreturn void rust_helper_BUG(void) } EXPORT_SYMBOL_GPL(rust_helper_BUG); =20 +unsigned long rust_helper_copy_from_user(void *to, const void __user *from, + unsigned long n) +{ + return copy_from_user(to, from, n); +} +EXPORT_SYMBOL_GPL(rust_helper_copy_from_user); + +unsigned long rust_helper_copy_to_user(void __user *to, const void *from, + unsigned long n) +{ + return copy_to_user(to, from, n); +} +EXPORT_SYMBOL_GPL(rust_helper_copy_to_user); + void rust_helper_mutex_lock(struct mutex *lock) { mutex_lock(lock); diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index be68d5e567b1..37f84223b83f 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -49,6 +49,7 @@ pub mod task; pub mod time; pub mod types; +pub mod uaccess; pub mod workqueue; =20 #[doc(hidden)] diff --git a/rust/kernel/uaccess.rs b/rust/kernel/uaccess.rs new file mode 100644 index 000000000000..3f8ad4dc13c4 --- /dev/null +++ b/rust/kernel/uaccess.rs @@ -0,0 +1,311 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Slices to user space memory regions. +//! +//! C header: [`include/linux/uaccess.h`](srctree/include/linux/uaccess.h) + +use crate::{bindings, error::code::*, error::Result}; +use alloc::vec::Vec; +use core::ffi::{c_ulong, c_void}; +use core::mem::MaybeUninit; + +/// A pointer to an area in userspace memory, which can be either read-onl= y or +/// read-write. +/// +/// All methods on this struct are safe: attempting to read or write on bad +/// addresses (either out of the bound of the slice or unmapped addresses)= will +/// return `EFAULT`. Concurrent access, *including data races to/from user= space +/// memory*, is permitted, because fundamentally another userspace +/// thread/process could always be modifying memory at the same time (in t= he +/// same way that userspace Rust's [`std::io`] permits data races with the +/// contents of files on disk). In the presence of a race, the exact byte = values +/// read/written are unspecified but the operation is well-defined. Kernel= space +/// code should validate its copy of data after completing a read, and not +/// expect that multiple reads of the same address will return the same va= lue. +/// +/// These APIs are designed to make it difficult to accidentally write TOC= TOU +/// (time-of-check to time-of-use) bugs. Every time a memory location is r= ead, +/// the reader's position is advanced by the read length and the next read= will +/// start from there. This helps prevent accidentally reading the same loc= ation +/// twice and causing a TOCTOU bug. +/// +/// Creating a [`UserSliceReader`] and/or [`UserSliceWriter`] consumes the +/// `UserSlice`, helping ensure that there aren't multiple readers or writ= ers to +/// the same location. +/// +/// If double-fetching a memory location is necessary for some reason, the= n that +/// is done by creating multiple readers to the same memory location, e.g.= using +/// [`clone_reader`]. +/// +/// # Examples +/// +/// Takes a region of userspace memory from the current process, and modif= y it +/// by adding one to every byte in the region. +/// +/// ```no_run +/// use alloc::vec::Vec; +/// use core::ffi::c_void; +/// use kernel::error::Result; +/// use kernel::uaccess::UserSlice; +/// +/// fn bytes_add_one(uptr: *mut c_void, len: usize) -> Result<()> { +/// let (read, mut write) =3D UserSlice::new(uptr, len).reader_writer(= ); +/// +/// let mut buf =3D Vec::new(); +/// read.read_all(&mut buf)?; +/// +/// for b in &mut buf { +/// *b =3D b.wrapping_add(1); +/// } +/// +/// write.write_slice(&buf)?; +/// Ok(()) +/// } +/// ``` +/// +/// Example illustrating a TOCTOU (time-of-check to time-of-use) bug. +/// +/// ```no_run +/// use alloc::vec::Vec; +/// use core::ffi::c_void; +/// use kernel::error::{code::EINVAL, Result}; +/// use kernel::uaccess::UserSlice; +/// +/// /// Returns whether the data in this region is valid. +/// fn is_valid(uptr: *mut c_void, len: usize) -> Result { +/// let read =3D UserSlice::new(uptr, len).reader(); +/// +/// let mut buf =3D Vec::new(); +/// read.read_all(&mut buf)?; +/// +/// todo!() +/// } +/// +/// /// Returns the bytes behind this user pointer if they are valid. +/// fn get_bytes_if_valid(uptr: *mut c_void, len: usize) -> Result= > { +/// if !is_valid(uptr, len)? { +/// return Err(EINVAL); +/// } +/// +/// let read =3D UserSlice::new(uptr, len).reader(); +/// +/// let mut buf =3D Vec::new(); +/// read.read_all(&mut buf)?; +/// +/// // THIS IS A BUG! The bytes could have changed since we checked th= em. +/// // +/// // To avoid this kind of bug, don't call `UserSlice::new` multiple +/// // times with the same address. +/// Ok(buf) +/// } +/// ``` +/// +/// [`std::io`]: https://doc.rust-lang.org/std/io/index.html +/// [`clone_reader`]: UserSliceReader::clone_reader +pub struct UserSlice { + ptr: *mut c_void, + length: usize, +} + +impl UserSlice { + /// Constructs a user slice from a raw pointer and a length in bytes. + /// + /// Constructing a [`UserSlice`] performs no checks on the provided ad= dress + /// and length, it can safely be constructed inside a kernel thread wi= th no + /// current userspace process. Reads and writes wrap the kernel APIs + /// `copy_from_user` and `copy_to_user`, which check the memory map of= the + /// current process and enforce that the address range is within the u= ser + /// range (no additional calls to `access_ok` are needed). + /// + /// Callers must be careful to avoid time-of-check-time-of-use + /// (TOCTOU) issues. The simplest way is to create a single instance of + /// [`UserSlice`] per user memory block as it reads each byte at + /// most once. + pub fn new(ptr: *mut c_void, length: usize) -> Self { + UserSlice { ptr, length } + } + + /// Reads the entirety of the user slice, appending it to the end of t= he + /// provided buffer. + /// + /// Fails with `EFAULT` if the read happens on a bad address. + pub fn read_all(self, buf: &mut Vec) -> Result { + self.reader().read_all(buf) + } + + /// Constructs a [`UserSliceReader`]. + pub fn reader(self) -> UserSliceReader { + UserSliceReader { + ptr: self.ptr, + length: self.length, + } + } + + /// Constructs a [`UserSliceWriter`]. + pub fn writer(self) -> UserSliceWriter { + UserSliceWriter { + ptr: self.ptr, + length: self.length, + } + } + + /// Constructs both a [`UserSliceReader`] and a [`UserSliceWriter`]. + /// + /// Usually when this is used, you will first read the data, and then + /// overwrite it afterwards. + pub fn reader_writer(self) -> (UserSliceReader, UserSliceWriter) { + ( + UserSliceReader { + ptr: self.ptr, + length: self.length, + }, + UserSliceWriter { + ptr: self.ptr, + length: self.length, + }, + ) + } +} + +/// A reader for [`UserSlice`]. +/// +/// Used to incrementally read from the user slice. +pub struct UserSliceReader { + ptr: *mut c_void, + length: usize, +} + +impl UserSliceReader { + /// Skip the provided number of bytes. + /// + /// Returns an error if skipping more than the length of the buffer. + pub fn skip(&mut self, num_skip: usize) -> Result { + // Update `self.length` first since that's the fallible part of th= is + // operation. + self.length =3D self.length.checked_sub(num_skip).ok_or(EFAULT)?; + self.ptr =3D self.ptr.wrapping_byte_add(num_skip); + Ok(()) + } + + /// Create a reader that can access the same range of data. + /// + /// Reading from the clone does not advance the current reader. + /// + /// The caller should take care to not introduce TOCTOU issues, as des= cribed + /// in the documentation for [`UserSlice`]. + pub fn clone_reader(&self) -> UserSliceReader { + UserSliceReader { + ptr: self.ptr, + length: self.length, + } + } + + /// Returns the number of bytes left to be read from this reader. + /// + /// Note that even reading less than this number of bytes may fail. + pub fn len(&self) -> usize { + self.length + } + + /// Returns `true` if no data is available in the io buffer. + pub fn is_empty(&self) -> bool { + self.length =3D=3D 0 + } + + /// Reads raw data from the user slice into a kernel buffer. + /// + /// Fails with `EFAULT` if the read happens on a bad address. + pub fn read_raw(&mut self, out: &mut [MaybeUninit]) -> Result { + let len =3D out.len(); + let out_ptr =3D out.as_mut_ptr().cast::(); + if len > self.length { + return Err(EFAULT); + } + let Ok(len_ulong) =3D c_ulong::try_from(len) else { + return Err(EFAULT); + }; + // SAFETY: The caller promises that `out` is valid for writing `le= n` bytes. + let res =3D unsafe { bindings::copy_from_user(out_ptr, self.ptr, l= en_ulong) }; + if res !=3D 0 { + return Err(EFAULT); + } + // Userspace pointers are not directly dereferencable by the kerne= l, so + // we cannot use `add`, which has C-style rules for defined behavi= or. + self.ptr =3D self.ptr.wrapping_byte_add(len); + self.length -=3D len; + Ok(()) + } + + /// Reads raw data from the user slice into a kernel buffer. + /// + /// Fails with `EFAULT` if the read happens on a bad address. + pub fn read_slice(&mut self, out: &mut [u8]) -> Result { + // SAFETY: The types are compatible and `read_raw` doesn't write + // uninitialized bytes to `out`. + let out =3D unsafe { &mut *(out as *mut [u8] as *mut [MaybeUninit<= u8>]) }; + self.read_raw(out) + } + + /// Reads the entirety of the user slice, appending it to the end of t= he + /// provided buffer. + /// + /// Fails with `EFAULT` if the read happens on a bad address. + pub fn read_all(mut self, buf: &mut Vec) -> Result { + let len =3D self.length; + buf.try_reserve(len)?; + + // The call to `try_reserve` was successful, so the spare capacity= is at + // least `len` bytes long. + self.read_raw(&mut buf.spare_capacity_mut()[..len])?; + + // SAFETY: Since the call to `read_raw` was successful, so the next + // `len` bytes of the vector have been initialized. + unsafe { buf.set_len(buf.len() + len) }; + Ok(()) + } +} + +/// A writer for [`UserSlice`]. +/// +/// Used to incrementally write into the user slice. +pub struct UserSliceWriter { + ptr: *mut c_void, + length: usize, +} + +impl UserSliceWriter { + /// Returns the amount of space remaining in this buffer. + /// + /// Note that even writing less than this number of bytes may fail. + pub fn len(&self) -> usize { + self.length + } + + /// Returns `true` if no more data can be written to this buffer. + pub fn is_empty(&self) -> bool { + self.length =3D=3D 0 + } + + /// Writes raw data to this user pointer from a kernel buffer. + /// + /// Fails with `EFAULT` if the write happens on a bad address. + pub fn write_slice(&mut self, data: &[u8]) -> Result { + let len =3D data.len(); + let data_ptr =3D data.as_ptr().cast::(); + if len > self.length { + return Err(EFAULT); + } + let Ok(len_ulong) =3D c_ulong::try_from(len) else { + return Err(EFAULT); + }; + let res =3D unsafe { bindings::copy_to_user(self.ptr, data_ptr, le= n_ulong) }; + if res !=3D 0 { + return Err(EFAULT); + } + // Userspace pointers are not directly dereferencable by the kerne= l, so + // we cannot use `add`, which has C-style rules for defined behavi= or. + self.ptr =3D self.ptr.wrapping_byte_add(len); + self.length -=3D len; + Ok(()) + } +} --=20 2.44.0.478.gd926399ef9-goog From nobody Sun Feb 8 20:34:12 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1FCE9128832 for ; Thu, 4 Apr 2024 12:32:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233930; cv=none; b=U6EEQeleFWsmSMQ2CcwMKaOchxQvZFBwcdxIag67dRdWBHyhdwbqci1FgyA3uHE9BAbWsg41rQyYcryG3iTJDAaPRn+0dupKMKHd6qh+x0PkAWCHAxFE1z8XSFJAJnP06Y+aH9F2uPydtSdcCiHpLIy25ESFoxl/k4WF6qobEgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233930; c=relaxed/simple; bh=LCmFZdYF/+l0SVNHm/nDN6l6wTxTp1jhws0CkfXtePw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FfTlwvZCC+5S2izSjHZNyoU+c++KslnQYpbwAxOMskfS4Q1k1IF1KBI1OdNrGy378Cy9BvIaBiwVKndsZJjXIEpH4ckeQJDYG1n27hbBC4bsF8xvNHJWSD74yU5aJzwSRt9KhtuzlIYSlJKpwdLw7pQ5CvZlQpVjuQVZk3EWMoQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=qLRtS9i+; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="qLRtS9i+" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60cbba6f571so15540257b3.1 for ; Thu, 04 Apr 2024 05:32:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712233928; x=1712838728; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=XerkH2ynkf1vxp+fsqJ0qN8AZG46ak50/ECqEN32U0w=; b=qLRtS9i+Hpp3AoAJ9P2S6a9WNwWXQK5PdQigQeMkN8KusBsDj7EcoA9T0YPt2lp8QU jXUMmkHlLAIcYLgE7rEDbZh9unUgPCdg/G40G6rOIRVm9RlLbhri7HOgPuh0ByLmC1kX 75tSZjjLwVztrhqlm5U08SlCVJMPRR7ffS65xhGEWxxLHYzTjonFCsYEn9Hbmg3gvFPT s8FAYEFgyw5kJkeK3MVDp/dhe9tJ0MOpaCUwliqVR2oWjo131F80d3b69XPYRkE4ISSd uswnYKPaBpNdBxRk+clQUa7OdmtEvMOet8obX3s5SHB4Ak83PKmonXnw2md4+XFr1aDB TwVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712233928; x=1712838728; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=XerkH2ynkf1vxp+fsqJ0qN8AZG46ak50/ECqEN32U0w=; b=pY+VvhStpGxtTRjVTphL5lhFZun/AhqFCYXjSDBm6rd0/0wKchR6Nk0M8Zh0OhJXbA 9gmVqkxRWDQgqGzq4YxgAUFkeW2znENTo5c1riO7xhyxZy9Rt3xx3E0emN4WBQ+fSTV0 PH4/fa+c4U51F3FlukAnB4ZIF8C16/r2YpHqR3yjQtgmK/kh+HifwhDNen0xH/+9+67y 9m6EmEUT8FQF0TI9Zjnwff9YlXOGTX0/SUvaPEmMe+p4DW4u2580qL4JWx1j74RT4FmJ jy0yAoon6PbJPXeq4NBlvw2pWRhAGbjozOSxYLP3WFjvuvV6b/9ab7wV/9R6/McHViO4 y3SQ== X-Forwarded-Encrypted: i=1; AJvYcCWmRokNquwOZ+RsEYHapoGFCPlBOOup/tYDNn805ThwpTTCPp2hJ6LmvP0yBlV9Pi3vAnqQy1BuQZUFUzBGTL+321xZ/D2onRaRrWQ0 X-Gm-Message-State: AOJu0YylARL9XdsPoFPUO7dpHBwjqRATKj/OLcg54Dkz017A/lASPPVu Xx9Z4YABEXv8pLGL9lkTk7R6qC3KJ9JaDb1VmwFvGP892ZkaLbv8ey7hlb4opML2EIOHwZeSYQ7 WMJizIvWxT6PsXQ== X-Google-Smtp-Source: AGHT+IG0Bsq2KxhVPOQpSkN7RapTzL57jEs123Iy4spqtUcqzx174FkXstUUKG35PgzUW7U2kryjNQK8BX3zoew= X-Received: from aliceryhl2.c.googlers.com ([fda3:e722:ac3:cc00:68:949d:c0a8:572]) (user=aliceryhl job=sendgmr) by 2002:a05:6902:124a:b0:dc2:1f34:fac4 with SMTP id t10-20020a056902124a00b00dc21f34fac4mr708607ybu.2.1712233928129; Thu, 04 Apr 2024 05:32:08 -0700 (PDT) Date: Thu, 04 Apr 2024 12:31:40 +0000 In-Reply-To: <20240404-alice-mm-v4-0-49a84242cf02@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240404-alice-mm-v4-0-49a84242cf02@google.com> X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=5074; i=aliceryhl@google.com; h=from:subject:message-id; bh=fSgHfw/zkWrxiL7qQcuIRBGXo9AsMjuelkCO78cyAIg=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBmDp2+8k+koOL0GcIB850DW3ouuJxGlPR2MopoO q15ulz7hZOJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCZg6dvgAKCRAEWL7uWMY5 RgjkEACUB3R7Sn1Mx7xhemoU2eWMaNTf+LDF5Kpe7cqJ9xnqMJgUM7WKETGwNBOqbI3f/iZTFjx aiQywDbimWtwIc1Drme1GlbihXwW0ut7WIvv+XyiIlfzJ6zyEg43G6KnkHgFJrDQNJUJasQnF1U rZ8fqDaarX/EyfixSMWxDOy5iBCJUUB9TejXbUP3TN8pM+eeWUcDj2Ri75ZLBBRyj0ZFHmNT+Rk CsyqnI08i6aYsXalL/ZbGJcbr5ZzMh9FHkY7WbwlX9kViCto4ryG5uD/OT/XqJhjfDSeoroEtpF 0Pow3pGanpm1TogMELV6Al/8AYQxB2Ohtkto9Sraez/KsIwnHLWZUn7wy/Fy1122vwqDEDshM+a 9ZnHdbaYeepLUl07i5fbfQJF+vspuYl4Vlw0Vy6wKf92sanv7LX0Ea51dK3p9t5ISZSCj+fu2po UKW8atf6Zd61GG+mkP56/s6RoAmb8FkFETpVa1TJr5E2AK08IaccRyTuge6riMTD3pco/tngGqK gUbxYKsknZcq6egCRWt2fr/ghJggswWqRlYTMwQfkqZbRxngZACZ4spgLjMfBhj/czoN1673bJ4 GtDQCFA/FKvHXtKYpNaZPEbk0+O9ra4aNzGotNcsoVvFItYdR848PwQRYv2eh1kDTlnl46aFWAM NDdJ1cG5xmBxfGw== X-Mailer: b4 0.13-dev-26615 Message-ID: <20240404-alice-mm-v4-2-49a84242cf02@google.com> Subject: [PATCH v4 2/4] uaccess: always export _copy_[from|to]_user with CONFIG_RUST From: Alice Ryhl To: Miguel Ojeda , Matthew Wilcox , Al Viro , Andrew Morton , Kees Cook Cc: Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?utf-8?q?Bj=C3=B6rn_Roy_Baron?=" , Benno Lossin , Andreas Hindborg , Greg Kroah-Hartman , "=?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Arnd Bergmann , linux-mm@kvack.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alice Ryhl , Christian Brauner Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable From: Arnd Bergmann Rust code needs to be able to access _copy_from_user and _copy_to_user so that it can skip the check_copy_size check in cases where the length is known at compile-time, mirroring the logic for when C code will skip check_copy_size. To do this, we ensure that exported versions of these methods are available when CONFIG_RUST is enabled. Alice has verified that this patch passes the CONFIG_TEST_USER_COPY test on x86 using the Android cuttlefish emulator. Signed-off-by: Arnd Bergmann Tested-by: Alice Ryhl Reviewed-by: Boqun Feng Signed-off-by: Alice Ryhl --- include/linux/uaccess.h | 38 ++++++++++++++++++++++++-------------- lib/usercopy.c | 30 ++++-------------------------- 2 files changed, 28 insertions(+), 40 deletions(-) diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 3064314f4832..2ebfce98b5cc 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h @@ -5,6 +5,7 @@ #include #include #include +#include #include #include =20 @@ -138,13 +139,18 @@ __copy_to_user(void __user *to, const void *from, uns= igned long n) return raw_copy_to_user(to, from, n); } =20 -#ifdef INLINE_COPY_FROM_USER static inline __must_check unsigned long -_copy_from_user(void *to, const void __user *from, unsigned long n) +_inline_copy_from_user(void *to, const void __user *from, unsigned long n) { unsigned long res =3D n; might_fault(); if (!should_fail_usercopy() && likely(access_ok(from, n))) { + /* + * Ensure that bad access_ok() speculation will not + * lead to nasty side effects *after* the copy is + * finished: + */ + barrier_nospec(); instrument_copy_from_user_before(to, from, n); res =3D raw_copy_from_user(to, from, n); instrument_copy_from_user_after(to, from, n, res); @@ -153,14 +159,11 @@ _copy_from_user(void *to, const void __user *from, un= signed long n) memset(to + (n - res), 0, res); return res; } -#else extern __must_check unsigned long _copy_from_user(void *, const void __user *, unsigned long); -#endif =20 -#ifdef INLINE_COPY_TO_USER static inline __must_check unsigned long -_copy_to_user(void __user *to, const void *from, unsigned long n) +_inline_copy_to_user(void __user *to, const void *from, unsigned long n) { might_fault(); if (should_fail_usercopy()) @@ -171,25 +174,32 @@ _copy_to_user(void __user *to, const void *from, unsi= gned long n) } return n; } -#else extern __must_check unsigned long _copy_to_user(void __user *, const void *, unsigned long); -#endif =20 static __always_inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { - if (check_copy_size(to, n, false)) - n =3D _copy_from_user(to, from, n); - return n; + if (!check_copy_size(to, n, false)) + return n; +#ifdef INLINE_COPY_FROM_USER + return _inline_copy_from_user(to, from, n); +#else + return _copy_from_user(to, from, n); +#endif } =20 static __always_inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) { - if (check_copy_size(from, n, true)) - n =3D _copy_to_user(to, from, n); - return n; + if (!check_copy_size(from, n, true)) + return n; + +#ifdef INLINE_COPY_TO_USER + return _inline_copy_to_user(to, from, n); +#else + return _copy_to_user(to, from, n); +#endif } =20 #ifndef copy_mc_to_kernel diff --git a/lib/usercopy.c b/lib/usercopy.c index d29fe29c6849..de7f30618293 100644 --- a/lib/usercopy.c +++ b/lib/usercopy.c @@ -7,40 +7,18 @@ =20 /* out-of-line parts */ =20 -#ifndef INLINE_COPY_FROM_USER +#if !defined(INLINE_COPY_FROM_USER) || defined(CONFIG_RUST) unsigned long _copy_from_user(void *to, const void __user *from, unsigned = long n) { - unsigned long res =3D n; - might_fault(); - if (!should_fail_usercopy() && likely(access_ok(from, n))) { - /* - * Ensure that bad access_ok() speculation will not - * lead to nasty side effects *after* the copy is - * finished: - */ - barrier_nospec(); - instrument_copy_from_user_before(to, from, n); - res =3D raw_copy_from_user(to, from, n); - instrument_copy_from_user_after(to, from, n, res); - } - if (unlikely(res)) - memset(to + (n - res), 0, res); - return res; + return _inline_copy_from_user(to, from, n); } EXPORT_SYMBOL(_copy_from_user); #endif =20 -#ifndef INLINE_COPY_TO_USER +#if !defined(INLINE_COPY_TO_USER) || defined(CONFIG_RUST) unsigned long _copy_to_user(void __user *to, const void *from, unsigned lo= ng n) { - might_fault(); - if (should_fail_usercopy()) - return n; - if (likely(access_ok(to, n))) { - instrument_copy_to_user(to, from, n); - n =3D raw_copy_to_user(to, from, n); - } - return n; + return _inline_copy_to_user(to, from, n); } EXPORT_SYMBOL(_copy_to_user); #endif --=20 2.44.0.478.gd926399ef9-goog From nobody Sun Feb 8 20:34:12 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C0460129A8E for ; Thu, 4 Apr 2024 12:32:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233933; cv=none; b=agosMnVkcugZq6ON9kqjJfaaU5WwGUNk1PGzpkztaHxVD0mhyM8dfVN8AKNmRuocD5oha0HJJGhAMMw+h23Th5cGSRsSnWx4bIyJpHCnuhXrATyW7HYiPQKeERcdYgmX4I7HRg80TNp9TmcIHzTeHDIpJdDT80hET6/YPBPCtAc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233933; c=relaxed/simple; bh=UiZpIf3BFNfRYXQgX1pbRbLKUYIHeSA1dkwNj3p46PY=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Kwh+MWhqhy1+Kw9U8nfSq0PZz/lZ/fema4Y7mJk3jhCnpGGr/rWTp2pv4Ksex/ojs1jXsQ/hWo8Pk+A8ks0Wy1Fvij4A3tQ6DwkdXceCHoo9/a86Zau1IAhaInv+bzfXrkzHnR3MO0sa+tdEOa1gdjqzs4cBjFChNXcPXvt5eeU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=VvGOj/23; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="VvGOj/23" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6156b93c768so18007017b3.1 for ; Thu, 04 Apr 2024 05:32:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712233931; x=1712838731; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=taakBWKWpiwoIIU3/+JYifQ+UJK0O86XOZIW+qgXD8k=; b=VvGOj/23CXrIcXEmqyWqV0urEh6JCB/lsw5PACiGjJfXaEUOI+UMDorG4plSZqe+8W XKSAiJNq2LTRKXAaTHaf2iC4Pd9ky2+0ROTfLAMGM115UKkZoyYtKFiB83dQwytlXW4M sqakXFLPLTcGLcf3AsNSzwLdtq0RZzngLsC12YunqQrnMPXuQx6/KYBUqCK4yGWl6DMF amHU8cFuz2iIHbDbkdkKHuvEeKYOxMFY1q8e4CnvczD9hO3lqOSfPBgrWyv/fjBjtlNn 43oTgeaaUcteJjR5nJ2k5ud0a8L2haOXnMuiKYbTXd+U9zMteW/s2Mqde3XCjsdfq8+T 9V9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712233931; x=1712838731; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=taakBWKWpiwoIIU3/+JYifQ+UJK0O86XOZIW+qgXD8k=; b=DDvuSDjFNtWVO21W3LbkuSWPDPhBbRayxk7ZJi2LAbw4Srmsq+3DGshewiKhKHtCTb WYkLK85uk5PdwtaKOBpb3XNRXsucz0dHKtjbk3bf8OgNGF/YzN8HEE/aUPd8qwqEjRaY Gyg7c7XrbxcVzy/C7ZugWpYZ0MmRXQKXnl9GUjrluDb0xPsI0AllFnDs7L26TC4vVXcZ Mtt9kyXY7EuW4LjQY+meN6CQXe4zyCMttVA09jMtVHLwiBflj7zpTqVNjUej+9sRJYbn eZvkjSIPtiGFTgWeMEiqXJD6ruPvvlA3jfRk4s/zR7aRxrORo9fCLXvOqQ5FlYU1vHzB P73g== X-Forwarded-Encrypted: i=1; AJvYcCVeEc7ANo1ep1pGKi3iE9u4s62wFkjUVzrZzyYweG9G+OCiMyEJzi2p67JXu5f7amRpV9/c41xVpXUla4Z7T9kIV3xBuPG3x5bywFr8 X-Gm-Message-State: AOJu0Yxh7904BONGZ/qcI9QcIYmMcvll9sxX6O7EKRPxFxKp9uSHnmBg JamdnrvsTxKBUL5gOjpxBkpC9bnNNvgoqNpnUniiyM+2jvEPqd+CKBbUclcy1U5or2b+B4dD0u/ c3SEXM76L0TfmrQ== X-Google-Smtp-Source: AGHT+IFmI9GK0405EKKeFUihI1V2MMV978wCRRUD+IF2RG+iw2g50ENG8068UenBApb8aTochDt6fXyIgyqbaIU= X-Received: from aliceryhl2.c.googlers.com ([fda3:e722:ac3:cc00:68:949d:c0a8:572]) (user=aliceryhl job=sendgmr) by 2002:a81:a0c6:0:b0:615:36af:1997 with SMTP id x189-20020a81a0c6000000b0061536af1997mr657526ywg.1.1712233930863; Thu, 04 Apr 2024 05:32:10 -0700 (PDT) Date: Thu, 04 Apr 2024 12:31:41 +0000 In-Reply-To: <20240404-alice-mm-v4-0-49a84242cf02@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240404-alice-mm-v4-0-49a84242cf02@google.com> X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=8776; i=aliceryhl@google.com; h=from:subject:message-id; bh=UiZpIf3BFNfRYXQgX1pbRbLKUYIHeSA1dkwNj3p46PY=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBmDp2+LY7YpSqabe2ORUZvWo4bVNMZVV5WG3R5Y mu1KHdru/OJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCZg6dvgAKCRAEWL7uWMY5 Rg/hD/9idXpq7JAUwrsPqCMHE5ebfdee6X+qjWYNVVMCWAAHPuysFc6BuRDOAS3ksrtD6I64Hdx 0SzqKoLWlb5G84cPRR3FsBvS9LZFniXIOnGP89k0MzHz4LCLcgAzuSZR+8nWh1P8kikjfhh9XDM bIWO2k3E02cCC1VRTNmUWEv1dP7BrbQi6KTZWo9JrlqKuAaYH850u+ULTuThr4fL+Ht81FSKiw6 Z4pBcshiar3zqMhPz1UUyMk/oFXv0nGcmfkp+hRKzAgoWf6dEvxs+2IB/x1i7lm1DrhhIqb2U3F kjheC6V5Y8QcshSdG7ezsMEsLByCbEgrq2jQ3Hk3Hd48w869oYE0COHGY6cMHt5S619qGi0TV3r xnKuoInK826bagIN4wbiDkFKzfImcdzZ0+3AwdKjoUfrX8rQdwtBZ7N0N2/OQdNJnjJiGIUiJx/ q99e8A13V4pcSappEdzwx7wc6TzfPwDI95gpDV+6n4DF/I0WiPOVpdO8vYZhY3LQfoZqWopPS4N ruTmP8hGyabWfrAD0Ja82KS+WKqXuHFPQuuOnpqUQiYX+f68M4WJ/oTzC+Cpy+61hKIpC8Y0RVB ZCzUv+hAM1RIW280T6WS1qMu3Qj9oSrVLjpmlpGcavdbg3jbArrgOsMCpCFkVE3JRdu+mbqVW4S /wWNwuGpAnPGO1Q== X-Mailer: b4 0.13-dev-26615 Message-ID: <20240404-alice-mm-v4-3-49a84242cf02@google.com> Subject: [PATCH v4 3/4] rust: uaccess: add typed accessors for userspace pointers From: Alice Ryhl To: Miguel Ojeda , Matthew Wilcox , Al Viro , Andrew Morton , Kees Cook Cc: Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?utf-8?q?Bj=C3=B6rn_Roy_Baron?=" , Benno Lossin , Andreas Hindborg , Greg Kroah-Hartman , "=?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Arnd Bergmann , linux-mm@kvack.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alice Ryhl , Christian Brauner Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Add safe methods for reading and writing Rust values to and from userspace pointers. The C methods for copying to/from userspace use a function called `check_object_size` to verify that the kernel pointer is not dangling. However, this check is skipped when the length is a compile-time constant, with the assumption that such cases trivially have a correct kernel pointer. In this patch, we apply the same optimization to the typed accessors. For both methods, the size of the operation is known at compile time to be size_of of the type being read or written. Since the C side doesn't provide a variant that skips only this check, we create custom helpers for this purpose. The majority of reads and writes to userspace pointers in the Rust Binder driver uses these accessor methods. Benchmarking has found that skipping the `check_object_size` check makes a big difference for the cases being skipped here. (And that the check doesn't make a difference for the cases that use the raw read/write methods.) This code is based on something that was originally written by Wedson on the old rust branch. It was modified by Alice to skip the `check_object_size` check, and to update various comments, including the notes about kernel pointers in `WritableToBytes`. Co-developed-by: Wedson Almeida Filho Signed-off-by: Wedson Almeida Filho Reviewed-by: Benno Lossin Reviewed-by: Boqun Feng Signed-off-by: Alice Ryhl --- rust/kernel/types.rs | 67 ++++++++++++++++++++++++++++++++++++++++++++ rust/kernel/uaccess.rs | 76 ++++++++++++++++++++++++++++++++++++++++++++++= ++-- 2 files changed, 141 insertions(+), 2 deletions(-) diff --git a/rust/kernel/types.rs b/rust/kernel/types.rs index aa77bad9bce4..f72b82efdbfa 100644 --- a/rust/kernel/types.rs +++ b/rust/kernel/types.rs @@ -409,3 +409,70 @@ pub enum Either { /// Constructs an instance of [`Either`] containing a value of type `R= `. Right(R), } + +/// Types for which any bit pattern is valid. +/// +/// Not all types are valid for all values. For example, a `bool` must be = either +/// zero or one, so reading arbitrary bytes into something that contains a +/// `bool` is not okay. +/// +/// It's okay for the type to have padding, as initializing those bytes ha= s no +/// effect. +/// +/// # Safety +/// +/// All bit-patterns must be valid for this type. +pub unsafe trait FromBytes {} + +// SAFETY: All bit patterns are acceptable values of the types below. +unsafe impl FromBytes for u8 {} +unsafe impl FromBytes for u16 {} +unsafe impl FromBytes for u32 {} +unsafe impl FromBytes for u64 {} +unsafe impl FromBytes for usize {} +unsafe impl FromBytes for i8 {} +unsafe impl FromBytes for i16 {} +unsafe impl FromBytes for i32 {} +unsafe impl FromBytes for i64 {} +unsafe impl FromBytes for isize {} +// SAFETY: If all bit patterns are acceptable for individual values in an = array, +// then all bit patterns are also acceptable for arrays of that type. +unsafe impl FromBytes for [T] {} +unsafe impl FromBytes for [T; N] {} + +/// Types that can be viewed as an immutable slice of initialized bytes. +/// +/// If a struct implements this trait, then it is okay to copy it byte-for= -byte +/// to userspace. This means that it should not have any padding, as paddi= ng +/// bytes are uninitialized. Reading uninitialized memory is not just unde= fined +/// behavior, it may even lead to leaking sensitive information on the sta= ck to +/// userspace. +/// +/// The struct should also not hold kernel pointers, as kernel pointer add= resses +/// are also considered sensitive. However, leaking kernel pointers is not +/// considered undefined behavior by Rust, so this is a correctness requir= ement, +/// but not a safety requirement. +/// +/// # Safety +/// +/// Values of this type may not contain any uninitialized bytes. +pub unsafe trait AsBytes {} + +// SAFETY: Instances of the following types have no uninitialized portions. +unsafe impl AsBytes for u8 {} +unsafe impl AsBytes for u16 {} +unsafe impl AsBytes for u32 {} +unsafe impl AsBytes for u64 {} +unsafe impl AsBytes for usize {} +unsafe impl AsBytes for i8 {} +unsafe impl AsBytes for i16 {} +unsafe impl AsBytes for i32 {} +unsafe impl AsBytes for i64 {} +unsafe impl AsBytes for isize {} +unsafe impl AsBytes for bool {} +unsafe impl AsBytes for char {} +unsafe impl AsBytes for str {} +// SAFETY: If individual values in an array have no uninitialized portions= , then +// the array itself does not have any uninitialized portions either. +unsafe impl AsBytes for [T] {} +unsafe impl AsBytes for [T; N] {} diff --git a/rust/kernel/uaccess.rs b/rust/kernel/uaccess.rs index 3f8ad4dc13c4..6566b8cc2541 100644 --- a/rust/kernel/uaccess.rs +++ b/rust/kernel/uaccess.rs @@ -4,10 +4,15 @@ //! //! C header: [`include/linux/uaccess.h`](srctree/include/linux/uaccess.h) =20 -use crate::{bindings, error::code::*, error::Result}; +use crate::{ + bindings, + error::code::*, + error::Result, + types::{AsBytes, FromBytes}, +}; use alloc::vec::Vec; use core::ffi::{c_ulong, c_void}; -use core::mem::MaybeUninit; +use core::mem::{size_of, MaybeUninit}; =20 /// A pointer to an area in userspace memory, which can be either read-onl= y or /// read-write. @@ -246,6 +251,41 @@ pub fn read_slice(&mut self, out: &mut [u8]) -> Result= { self.read_raw(out) } =20 + /// Reads a value of the specified type. + /// + /// Fails with `EFAULT` if the read encounters a page fault. + pub fn read(&mut self) -> Result { + let len =3D size_of::(); + if len > self.length { + return Err(EFAULT); + } + let Ok(len_ulong) =3D c_ulong::try_from(len) else { + return Err(EFAULT); + }; + let mut out: MaybeUninit =3D MaybeUninit::uninit(); + // SAFETY: The local variable `out` is valid for writing `size_of:= :()` bytes. + // + // By using the _copy_from_user variant, we skip the check_object_= size + // check that verifies the kernel pointer. This mirrors the logic = on the + // C side that skips the check when the length is a compile-time + // constant. + let res =3D unsafe { + bindings::_copy_from_user(out.as_mut_ptr().cast::(), s= elf.ptr, len_ulong) + }; + if res !=3D 0 { + return Err(EFAULT); + } + // Since this is not a pointer to a valid object in our program, + // we cannot use `add`, which has C-style rules for defined + // behavior. + self.ptr =3D self.ptr.wrapping_byte_add(len); + self.length -=3D len; + // SAFETY: The read above has initialized all bytes in `out`, and = since + // `T` implements `FromBytes`, any bit-pattern is a valid value fo= r this + // type. + Ok(unsafe { out.assume_init() }) + } + /// Reads the entirety of the user slice, appending it to the end of t= he /// provided buffer. /// @@ -308,4 +348,36 @@ pub fn write_slice(&mut self, data: &[u8]) -> Result { self.length -=3D len; Ok(()) } + + /// Writes the provided Rust value to this userspace pointer. + /// + /// Fails with `EFAULT` if the write encounters a page fault. + pub fn write(&mut self, value: &T) -> Result { + let len =3D size_of::(); + if len > self.length { + return Err(EFAULT); + } + let Ok(len_ulong) =3D c_ulong::try_from(len) else { + return Err(EFAULT); + }; + // SAFETY: The reference points to a value of type `T`, so it is v= alid + // for reading `size_of::()` bytes. + // + // By using the _copy_to_user variant, we skip the check_object_si= ze + // check that verifies the kernel pointer. This mirrors the logic = on the + // C side that skips the check when the length is a compile-time + // constant. + let res =3D unsafe { + bindings::_copy_to_user(self.ptr, (value as *const T).cast::(), len_ulong) + }; + if res !=3D 0 { + return Err(EFAULT); + } + // Since this is not a pointer to a valid object in our program, + // we cannot use `add`, which has C-style rules for defined + // behavior. + self.ptr =3D self.ptr.wrapping_byte_add(len); + self.length -=3D len; + Ok(()) + } } --=20 2.44.0.478.gd926399ef9-goog From nobody Sun Feb 8 20:34:12 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7122212AAC2 for ; Thu, 4 Apr 2024 12:32:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233936; cv=none; b=MbzXRH3ntxNH31K4kOONR01Hz7CQxgD2mEqGGfYZJvTcXW3QNHiHUkB1lFw/V2uii7hqSpvUlX84MxLT8X5ja+Zgy4XsJuPOro52Q2lK9Z/AehSf5lmQYgOhZbsP0gRvHEzHba9iVCUg4K2BeFv24r9p0q5EBZGiwFfFWZZBRn4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712233936; c=relaxed/simple; bh=DIHPCmsYsAEVmOzNFnwpXPapPHFZB1wBN8+xcv/OdvM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ZHpf3dghRwVvgC/PNJ7soPauqRe6FFMofVJZg2rB7aLv9jHu9OVwjrzc+Zs/V+L05ggH1xcQ1R27suBqf5WIHnEihBFoYPM8ZttqGa/y7E2e/Ju0IKTwGMXAnd+92aCW/fQb+XAco2sH8UI+F85qm7iCj9P83ud+x//vbpeDwKA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=RKigVxk/; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--aliceryhl.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="RKigVxk/" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6156cef8098so16558387b3.0 for ; Thu, 04 Apr 2024 05:32:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1712233933; x=1712838733; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=upT25yzbahblDd5bFzHBxFzV9brjNUZc4+hrC3EotZA=; b=RKigVxk/eaeShhg82U5vXhK61oCOIcMzujUhgk96sJglCzLRg0jXQ+V8dqSugODAho Y+AMQKIft7S7TVG617Yc+gx3F8ylfcBR/7DwYefqhdFIRpNjx0tRHnpNDCjZ6sl0B7wo t5t0jv9/3lHGdo+FFiK5UnY0wftbuRdjVjgbEZKtUjzWxr3bRqz9vxG/BobGsnj9ph4i 366i/o0EeJvxThWiswhxJaSgp+DiJVGh/kITusavMUIoG2szWqhIPBso+1TLmB8IpcdA hyUmaJpsK4HRw+tcFph7p4MkXPlZQZNixU2cJRONxO0sqFhCbZLEZy1kiogs72XnBRNs lklQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712233933; x=1712838733; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=upT25yzbahblDd5bFzHBxFzV9brjNUZc4+hrC3EotZA=; b=khbdfZTiAqy0jNQ6cgvv/yKhMeZBcpoDHZqaE/TAl28LARTFtRIrARGYWfKjrc3O2h A1JTiSgcbwZ3qKhEP1KMlJkAx8xbebUEQcP4TbwVeVjp0AVM6UbZoOfrJTWMvlOp0g5E 2I6ywG/17mv9nv/Im/e8AWuLbHiwAM8OWnt4Hk3WcW4Zh0dLqOjIdORnm8ini97ADobU a4DcmOPQ/yFasmPGxkcr8dsF5H89GfxOykqh1mMkelPDTE1LGhuJJ9GIvgwA+YtAPLc8 fqK7w+syPs5N2lhwoxX8KUeEGCgz4mR3xxLvD0vtf9GZYNLyXx2nud6jXv9qvMl2ml2r xGLw== X-Forwarded-Encrypted: i=1; AJvYcCU3KujRJDrIecoTUvMWnpGNEZLFLg0jMDhnT5wx7wIZe3zpUxYVOqDwyQqEyz62I+iWBhvfHuvCOKbywBCamUi+mziPvd3b9jKqs/Kj X-Gm-Message-State: AOJu0Yx/o0ksHe5kIyFrAICTjhwqxOYWmREctHb8nw5U3prSwcIZhaNd 1RhoRUaUtdfCmHn6/40BovtCbOOJZ1JBXj/nCmHW98XunhiaTW6dP5Qip+huHHmPSbXAYGmBOjH 3ktS1K1CbtdNmmg== X-Google-Smtp-Source: AGHT+IGmCdSsDsX60IrhBcrsWkYfjETKHqOUwZqc/QWEbCWW/bS5bF3ZT3NOSDpSvaF+vXmL7+qspwRE95eAVCA= X-Received: from aliceryhl2.c.googlers.com ([fda3:e722:ac3:cc00:68:949d:c0a8:572]) (user=aliceryhl job=sendgmr) by 2002:a05:690c:6812:b0:615:1471:19bb with SMTP id id18-20020a05690c681200b00615147119bbmr665073ywb.2.1712233933464; Thu, 04 Apr 2024 05:32:13 -0700 (PDT) Date: Thu, 04 Apr 2024 12:31:42 +0000 In-Reply-To: <20240404-alice-mm-v4-0-49a84242cf02@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240404-alice-mm-v4-0-49a84242cf02@google.com> X-Developer-Key: i=aliceryhl@google.com; a=openpgp; fpr=49F6C1FAA74960F43A5B86A1EE7A392FDE96209F X-Developer-Signature: v=1; a=openpgp-sha256; l=15829; i=aliceryhl@google.com; h=from:subject:message-id; bh=DIHPCmsYsAEVmOzNFnwpXPapPHFZB1wBN8+xcv/OdvM=; b=owEBbQKS/ZANAwAKAQRYvu5YxjlGAcsmYgBmDp2/hsWUpMiZeeco043Qxmtop18YTPBPcVh9U CxK+y2Do5OJAjMEAAEKAB0WIQSDkqKUTWQHCvFIvbIEWL7uWMY5RgUCZg6dvwAKCRAEWL7uWMY5 RifMEACyrHbIuGxt75YdUBSQvrkN8yXNTT7lnKivUKsR0r6DrW6Tl08hjHyhClDbusEsDriRzI+ d324J7f699OcOryWCiUFzitCbxEvZ6pFGTHyFRHGFaniXWzXygA/Jd75BmmmH7+SOa/9jc2+32m Oj3A/TRdA5yJVFNdMxwB7oNqLEJOfXjZICWKnneD4jhAuQxSUmF1LM9IgUTrKvsMAsXURvV04zW IrLuIJTDHXOl+CSAoEC/EolKvtEnXRKoxfXLWeIPYjAOsPsSGgShwxZiKs6HOhQiEZTQ9YAgTzm YVH4p20Gr/0FsrggBPA3Rd+j+Ii2jWz0brK3m09kK/+AdQGFLXNFV6sSSZx650VCzDRpyZA3KEs cfBDFU84W9fdsooddDPPaqBN624FJgo9TXNkpqdDB+m4Tr+gHhddRYZvhbKvsythoLHCq7R9RSD td3ieUcYDmXGEe6/gQ2w1z79VQEOUem0Db25rekEf1MaRqO+wOh/+ADbJQJ5uQWL8L4OCdNjuvW M1JODMrwUHwltFxDvUvrkqSXQdNdHOrxWlD/0sRfKVj5IKuRSRunY4g4eQqe42BEVf1jbdeY5+K j4zmVuRIc/8/lRm9QYi68TIdXE7xYPQUOFoYNb9Aid5Kg8GMXVxFEFyx10CX1Fyxp8hnVrSKjNn mM1hxc6os3+IeGg== X-Mailer: b4 0.13-dev-26615 Message-ID: <20240404-alice-mm-v4-4-49a84242cf02@google.com> Subject: [PATCH v4 4/4] rust: add abstraction for `struct page` From: Alice Ryhl To: Miguel Ojeda , Matthew Wilcox , Al Viro , Andrew Morton , Kees Cook Cc: Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , "=?utf-8?q?Bj=C3=B6rn_Roy_Baron?=" , Benno Lossin , Andreas Hindborg , Greg Kroah-Hartman , "=?utf-8?q?Arve_Hj=C3=B8nnev=C3=A5g?=" , Todd Kjos , Martijn Coenen , Joel Fernandes , Carlos Llamas , Suren Baghdasaryan , Arnd Bergmann , linux-mm@kvack.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alice Ryhl , Christian Brauner Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Adds a new struct called `Page` that wraps a pointer to `struct page`. This struct is assumed to hold ownership over the page, so that Rust code can allocate and manage pages directly. The page type has various methods for reading and writing into the page. These methods will temporarily map the page to allow the operation. All of these methods use a helper that takes an offset and length, performs bounds checks, and returns a pointer to the given offset in the page. This patch only adds support for pages of order zero, as that is all Rust Binder needs. However, it is written to make it easy to add support for higher-order pages in the future. To do that, you would add a const generic parameter to `Page` that specifies the order. Most of the methods do not need to be adjusted, as the logic for dealing with mapping multiple pages at once can be isolated to just the `with_pointer_into_page` method. Finally, the struct can be renamed to `Pages`, and the type alias `Page =3D Pages<0>` can be introduced. Rust Binder needs to manage pages directly as that is how transactions are delivered: Each process has an mmap'd region for incoming transactions. When an incoming transaction arrives, the Binder driver will choose a region in the mmap, allocate and map the relevant pages manually, and copy the incoming transaction directly into the page. This architecture allows the driver to copy transactions directly from the address space of one process to another, without an intermediate copy to a kernel buffer. This code is based on Wedson's page abstractions from the old rust branch, but it has been modified by Alice by removing the incomplete support for higher-order pages, by introducing the `with_*` helpers to consolidate the bounds checking logic into a single place, and by introducing gfp flags. Co-developed-by: Wedson Almeida Filho Signed-off-by: Wedson Almeida Filho Signed-off-by: Alice Ryhl --- rust/bindings/bindings_helper.h | 2 + rust/helpers.c | 20 ++++ rust/kernel/lib.rs | 1 + rust/kernel/page.rs | 259 ++++++++++++++++++++++++++++++++++++= ++++ 4 files changed, 282 insertions(+) diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helpe= r.h index 65b98831b975..da1e97871419 100644 --- a/rust/bindings/bindings_helper.h +++ b/rust/bindings/bindings_helper.h @@ -20,5 +20,7 @@ =20 /* `bindgen` gets confused at certain things. */ const size_t RUST_CONST_HELPER_ARCH_SLAB_MINALIGN =3D ARCH_SLAB_MINALIGN; +const size_t RUST_CONST_HELPER_PAGE_SIZE =3D PAGE_SIZE; const gfp_t RUST_CONST_HELPER_GFP_KERNEL =3D GFP_KERNEL; const gfp_t RUST_CONST_HELPER___GFP_ZERO =3D __GFP_ZERO; +const gfp_t RUST_CONST_HELPER___GFP_HIGHMEM =3D ___GFP_HIGHMEM; diff --git a/rust/helpers.c b/rust/helpers.c index 312b6fcb49d5..72361003ba91 100644 --- a/rust/helpers.c +++ b/rust/helpers.c @@ -25,6 +25,8 @@ #include #include #include +#include +#include #include #include #include @@ -93,6 +95,24 @@ int rust_helper_signal_pending(struct task_struct *t) } EXPORT_SYMBOL_GPL(rust_helper_signal_pending); =20 +struct page *rust_helper_alloc_pages(gfp_t gfp_mask, unsigned int order) +{ + return alloc_pages(gfp_mask, order); +} +EXPORT_SYMBOL_GPL(rust_helper_alloc_pages); + +void *rust_helper_kmap_local_page(struct page *page) +{ + return kmap_local_page(page); +} +EXPORT_SYMBOL_GPL(rust_helper_kmap_local_page); + +void rust_helper_kunmap_local(const void *addr) +{ + kunmap_local(addr); +} +EXPORT_SYMBOL_GPL(rust_helper_kunmap_local); + refcount_t rust_helper_REFCOUNT_INIT(int n) { return (refcount_t)REFCOUNT_INIT(n); diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 37f84223b83f..667fc67fa24f 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -39,6 +39,7 @@ pub mod kunit; #[cfg(CONFIG_NET)] pub mod net; +pub mod page; pub mod prelude; pub mod print; mod static_assert; diff --git a/rust/kernel/page.rs b/rust/kernel/page.rs new file mode 100644 index 000000000000..5aba0261242d --- /dev/null +++ b/rust/kernel/page.rs @@ -0,0 +1,259 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Kernel page allocation and management. + +use crate::{bindings, error::code::*, error::Result, uaccess::UserSliceRea= der}; +use core::{ + alloc::AllocError, + ptr::{self, NonNull}, +}; + +/// A bitwise shift for the page size. +#[allow(clippy::unnecessary_cast)] +pub const PAGE_SHIFT: usize =3D bindings::PAGE_SHIFT as usize; + +/// The number of bytes in a page. +#[allow(clippy::unnecessary_cast)] +pub const PAGE_SIZE: usize =3D bindings::PAGE_SIZE as usize; + +/// A bitmask that gives the page containing a given address. +pub const PAGE_MASK: usize =3D !(PAGE_SIZE-1); + +/// Flags for the "get free page" function that underlies all memory alloc= ations. +pub mod flags { + /// gfp flags. + #[allow(non_camel_case_types)] + pub type gfp_t =3D bindings::gfp_t; + + /// `GFP_KERNEL` is typical for kernel-internal allocations. The calle= r requires `ZONE_NORMAL` + /// or a lower zone for direct access but can direct reclaim. + pub const GFP_KERNEL: gfp_t =3D bindings::GFP_KERNEL; + /// `GFP_ZERO` returns a zeroed page on success. + pub const __GFP_ZERO: gfp_t =3D bindings::__GFP_ZERO; + /// `GFP_HIGHMEM` indicates that the allocated memory may be located i= n high memory. + pub const __GFP_HIGHMEM: gfp_t =3D bindings::__GFP_HIGHMEM; +} + +/// A pointer to a page that owns the page allocation. +/// +/// # Invariants +/// +/// The pointer is valid, and has ownership over the page. +pub struct Page { + page: NonNull, +} + +// SAFETY: Pages have no logic that relies on them staying on a given thre= ad, so +// moving them across threads is safe. +unsafe impl Send for Page {} + +// SAFETY: Pages have no logic that relies on them not being accessed +// concurrently, so accessing them concurrently is safe. +unsafe impl Sync for Page {} + +impl Page { + /// Allocates a new page. + pub fn alloc_page(gfp_flags: flags::gfp_t) -> Result= { + // SAFETY: Depending on the value of `gfp_flags`, this call may sl= eep. + // Other than that, it is always safe to call this method. + let page =3D unsafe { bindings::alloc_pages(gfp_flags, 0) }; + let page =3D NonNull::new(page).ok_or(AllocError)?; + // INVARIANT: We just successfully allocated a page, so we now have + // ownership of the newly allocated page. We transfer that ownersh= ip to + // the new `Page` object. + Ok(Self { page }) + } + + /// Returns a raw pointer to the page. + pub fn as_ptr(&self) -> *mut bindings::page { + self.page.as_ptr() + } + + /// Runs a piece of code with this page mapped to an address. + /// + /// The page is unmapped when this call returns. + /// + /// # Using the raw pointer + /// + /// It is up to the caller to use the provided raw pointer correctly. = The + /// pointer is valid for `PAGE_SIZE` bytes and for the duration in whi= ch the + /// closure is called. The pointer might only be mapped on the current + /// thread, and when that is the case, dereferencing it on other threa= ds is + /// UB. Other than that, the usual rules for dereferencing a raw point= er + /// apply: don't cause data races, the memory may be uninitialized, an= d so + /// on. + /// + /// If multiple threads map the same page at the same time, then they = may + /// reference with different addresses. However, even if the addresses= are + /// different, the underlying memory is still the same for these purpo= ses + /// (e.g., it's still a data race if they both write to the same under= lying + /// byte at the same time). + fn with_page_mapped(&self, f: impl FnOnce(*mut u8) -> T) -> T { + // SAFETY: `page` is valid due to the type invariants on `Page`. + let mapped_addr =3D unsafe { bindings::kmap_local_page(self.as_ptr= ()) }; + + let res =3D f(mapped_addr.cast()); + + // This unmaps the page mapped above. + // + // SAFETY: Since this API takes the user code as a closure, it can= only + // be used in a manner where the pages are unmapped in reverse ord= er. + // This is as required by `kunmap_local`. + // + // In other words, if this call to `kunmap_local` happens when a + // different page should be unmapped first, then there must necess= arily + // be a call to `kmap_local_page` other than the call just above in + // `with_page_mapped` that made that possible. In this case, it is= the + // unsafe block that wraps that other call that is incorrect. + unsafe { bindings::kunmap_local(mapped_addr) }; + + res + } + + /// Runs a piece of code with a raw pointer to a slice of this page, w= ith + /// bounds checking. + /// + /// If `f` is called, then it will be called with a pointer that point= s at + /// `off` bytes into the page, and the pointer will be valid for at le= ast + /// `len` bytes. The pointer is only valid on this task, as this metho= d uses + /// a local mapping. + /// + /// If `off` and `len` refers to a region outside of this page, then t= his + /// method returns `EINVAL` and does not call `f`. + /// + /// # Using the raw pointer + /// + /// It is up to the caller to use the provided raw pointer correctly. = The + /// pointer is valid for `len` bytes and for the duration in which the + /// closure is called. The pointer might only be mapped on the current + /// thread, and when that is the case, dereferencing it on other threa= ds is + /// UB. Other than that, the usual rules for dereferencing a raw point= er + /// apply: don't cause data races, the memory may be uninitialized, an= d so + /// on. + /// + /// If multiple threads map the same page at the same time, then they = may + /// reference with different addresses. However, even if the addresses= are + /// different, the underlying memory is still the same for these purpo= ses + /// (e.g., it's still a data race if they both write to the same under= lying + /// byte at the same time). + fn with_pointer_into_page( + &self, + off: usize, + len: usize, + f: impl FnOnce(*mut u8) -> Result, + ) -> Result { + let bounds_ok =3D off <=3D PAGE_SIZE && len <=3D PAGE_SIZE && (off= + len) <=3D PAGE_SIZE; + + if bounds_ok { + self.with_page_mapped(move |page_addr| { + // SAFETY: The `off` integer is at most `PAGE_SIZE`, so th= is + // pointer offset will result in a pointer that is in boun= ds or + // one off the end of the page. + f(unsafe { page_addr.add(off) }) + }) + } else { + Err(EINVAL) + } + } + + /// Maps the page and reads from it into the given buffer. + /// + /// This method will perform bounds checks on the page offset. If `off= set .. + /// offset+len` goes outside ot the page, then this call returns `EINV= AL`. + /// + /// # Safety + /// + /// * Callers must ensure that `dst` is valid for writing `len` bytes. + /// * Callers must ensure that this call does not race with a write to= the + /// same page that overlaps with this read. + pub unsafe fn read_raw(&self, dst: *mut u8, offset: usize, len: usize)= -> Result { + self.with_pointer_into_page(offset, len, move |src| { + // SAFETY: If `with_pointer_into_page` calls into this closure= , then + // it has performed a bounds check and guarantees that `src` is + // valid for `len` bytes. + // + // There caller guarantees that there is no data race. + unsafe { ptr::copy_nonoverlapping(src, dst, len) }; + Ok(()) + }) + } + + /// Maps the page and writes into it from the given buffer. + /// + /// This method will perform bounds checks on the page offset. If `off= set .. + /// offset+len` goes outside ot the page, then this call returns `EINV= AL`. + /// + /// # Safety + /// + /// * Callers must ensure that `src` is valid for reading `len` bytes. + /// * Callers must ensure that this call does not race with a read or = write + /// to the same page that overlaps with this write. + pub unsafe fn write_raw(&self, src: *const u8, offset: usize, len: usi= ze) -> Result { + self.with_pointer_into_page(offset, len, move |dst| { + // SAFETY: If `with_pointer_into_page` calls into this closure= , then + // it has performed a bounds check and guarantees that `dst` is + // valid for `len` bytes. + // + // There caller guarantees that there is no data race. + unsafe { ptr::copy_nonoverlapping(src, dst, len) }; + Ok(()) + }) + } + + /// Maps the page and zeroes the given slice. + /// + /// This method will perform bounds checks on the page offset. If `off= set .. + /// offset+len` goes outside ot the page, then this call returns `EINV= AL`. + /// + /// # Safety + /// + /// Callers must ensure that this call does not race with a read or wr= ite to + /// the same page that overlaps with this write. + pub unsafe fn fill_zero(&self, offset: usize, len: usize) -> Result { + self.with_pointer_into_page(offset, len, move |dst| { + // SAFETY: If `with_pointer_into_page` calls into this closure= , then + // it has performed a bounds check and guarantees that `dst` is + // valid for `len` bytes. + // + // There caller guarantees that there is no data race. + unsafe { ptr::write_bytes(dst, 0u8, len) }; + Ok(()) + }) + } + + /// Copies data from userspace into this page. + /// + /// This method will perform bounds checks on the page offset. If `off= set .. + /// offset+len` goes outside ot the page, then this call returns `EINV= AL`. + /// + /// Like the other `UserSliceReader` methods, data races are allowed o= n the + /// userspace address. However, they are not allowed on the page you a= re + /// copying into. + /// + /// # Safety + /// + /// Callers must ensure that this call does not race with a read or wr= ite to + /// the same page that overlaps with this write. + pub unsafe fn copy_from_user_slice( + &self, + reader: &mut UserSliceReader, + offset: usize, + len: usize, + ) -> Result { + self.with_pointer_into_page(offset, len, move |dst| { + // SAFETY: If `with_pointer_into_page` calls into this closure= , then + // it has performed a bounds check and guarantees that `dst` is + // valid for `len` bytes. Furthermore, we have exclusive acces= s to + // the slice since the caller guarantees that there are no rac= es. + reader.read_raw(unsafe { core::slice::from_raw_parts_mut(dst.c= ast(), len) }) + }) + } +} + +impl Drop for Page { + fn drop(&mut self) { + // SAFETY: By the type invariants, we have ownership of the page a= nd can + // free it. + unsafe { bindings::__free_pages(self.page.as_ptr(), 0) }; + } +} --=20 2.44.0.478.gd926399ef9-goog