| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20241119112408.779243-3-abdiel.janulgue@gmail.com>
Date: Tue, 19 Nov 2024 13:24:03 +0200
From: Abdiel Janulgue <abdiel.janulgue@...il.com>
To: rust-for-linux@...r.kernel.org
Cc: Miguel Ojeda <ojeda@...nel.org>,
Alex Gaynor <alex.gaynor@...il.com>,
Boqun Feng <boqun.feng@...il.com>,
Gary Guo <gary@...yguo.net>,
Björn Roy Baron <bjorn3_gh@...tonmail.com>,
Benno Lossin <benno.lossin@...ton.me>,
Andreas Hindborg <a.hindborg@...nel.org>,
Alice Ryhl <aliceryhl@...gle.com>,
Trevor Gross <tmgross@...ch.edu>,
Danilo Krummrich <dakr@...nel.org>,
Wedson Almeida Filho <wedsonaf@...il.com>,
Valentin Obst <kernel@...entinobst.de>,
linux-kernel@...r.kernel.org (open list),
Andrew Morton <akpm@...ux-foundation.org>,
linux-mm@...ck.org (open list:MEMORY MANAGEMENT),
airlied@...hat.com,
Abdiel Janulgue <abdiel.janulgue@...il.com>
Subject: [PATCH v3 2/2] rust: page: Extend support to existing struct page mappings
Extend Page to support pages that are not allocated by the constructor,
for example, those returned by vmalloc_to_page() or virt_to_page().
Since we don't own those pages we shouldn't Drop them either. Hence we
take advantage of the switch to Opaque so we can cast to a Page pointer
from a struct page pointer and be able to retrieve the reference on an
existing struct page mapping. In this case no destructor will be called
since we are not instantiating a new Page instance.
The new page_slice_to_page wrapper ensures that it explicity accepts
only page-sized chunks.
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@...il.com>
---
rust/helpers/page.c | 10 +++++
rust/kernel/page.rs | 97 ++++++++++++++++++++++++++++++++++++++++++++-
2 files changed, 106 insertions(+), 1 deletion(-)
diff --git a/rust/helpers/page.c b/rust/helpers/page.c
index 48d4481c1e33..784563924b83 100644
--- a/rust/helpers/page.c
+++ b/rust/helpers/page.c
@@ -27,3 +27,13 @@ void rust_helper_get_page(struct page *page)
{
get_page(page);
}
+
+struct page *rust_helper_virt_to_page(const void *kaddr)
+{
+ return virt_to_page(kaddr);
+}
+
+bool rust_helper_virt_addr_valid(const void *kaddr)
+{
+ return virt_addr_valid(kaddr);
+}
diff --git a/rust/kernel/page.rs b/rust/kernel/page.rs
index fdf7ee203597..d0a896f53afb 100644
--- a/rust/kernel/page.rs
+++ b/rust/kernel/page.rs
@@ -3,7 +3,7 @@
//! Kernel page allocation and management.
use crate::{
- alloc::{AllocError, Flags},
+ alloc::{AllocError, Allocator, Flags, VVec, KVec, KVVec, Vec, flags::*},
bindings,
error::code::*,
error::Result,
@@ -87,6 +87,49 @@ pub fn alloc_page(flags: Flags) -> Result<ARef<Self>, AllocError> {
Ok(unsafe { ARef::from_raw(NonNull::new_unchecked(ptr)) })
}
+ /// Create a page object from a buffer which is associated with an existing C `struct page`.
+ ///
+ /// This function ensures it takes a page-sized buffer as represented by `PageSlice`.
+ ///
+ /// # Examples
+ ///
+ /// ```
+ /// use kernel::page::*;
+ ///
+ /// let somedata: [u8; PAGE_SIZE * 2] = [0; PAGE_SIZE * 2];
+ /// let buf: &[u8] = &somedata;
+ /// let pages: VVec<PageSlice> = buf.try_into()?;
+ /// let page = Page::page_slice_to_page(&pages[0])?;
+ /// # Ok::<(), Error>(())
+ /// ```
+ pub fn page_slice_to_page<'a>(page: &PageSlice) -> Result<&'a Self>
+ {
+ let ptr: *const core::ffi::c_void = page.0.as_ptr() as _;
+ if ptr.is_null() {
+ return Err(EINVAL)
+ }
+ // SAFETY: We've checked that `ptr` is non-null, hence it's safe to call this method.
+ let page = if unsafe { bindings::is_vmalloc_addr(ptr) } {
+ // SAFETY: We've checked that `ptr` is non-null and within the vmalloc range, hence
+ // it's safe to call this method.
+ unsafe { bindings::vmalloc_to_page(ptr) }
+ // SAFETY: We've checked that `ptr` is non-null, hence it's safe to call this method.
+ } else if unsafe { bindings::virt_addr_valid(ptr) } {
+ // SAFETY: We've checked that `ptr` is non-null and a valid virtual address, hence
+ // it's safe to call this method.
+ unsafe { bindings::virt_to_page(ptr) }
+ } else {
+ ptr::null_mut()
+ };
+ if page.is_null() {
+ return Err(EINVAL);
+ }
+ // CAST: `Self` is a `repr(transparent)` wrapper around `bindings::page`.
+ // SAFETY: We just successfully retrieved an existing `bindings::page`, therefore
+ // dereferencing the page pointer is valid.
+ Ok(unsafe { &*page.cast() })
+ }
+
/// Returns a raw pointer to the page.
pub fn as_ptr(&self) -> *mut bindings::page {
self.page.get()
@@ -270,3 +313,55 @@ unsafe fn dec_ref(obj: ptr::NonNull<Self>) {
unsafe { bindings::put_page(obj.cast().as_ptr()) }
}
}
+
+/// A page-aligned, page-sized object.
+///
+/// This is used for convenience to convert a large buffer into an array of page-sized chunks
+/// allocated with the kernel's allocators which can then be used in the
+/// `Page::page_slice_to_page` wrapper.
+///
+// FIXME: This should be `PAGE_SIZE`, but the compiler rejects everything except a literal
+// integer argument for the `repr(align)` attribute.
+#[repr(align(4096))]
+pub struct PageSlice([u8; PAGE_SIZE]);
+
+fn to_vec_with_allocator<A: Allocator>(val: &[u8]) -> Result<Vec<PageSlice, A>, AllocError> {
+ let mut k = Vec::<PageSlice, A>::new();
+ let pages = page_align(val.len()) >> PAGE_SHIFT;
+ match k.reserve(pages, GFP_KERNEL) {
+ Ok(()) => {
+ // SAFETY: from above, the length should be equal to the vector's capacity
+ unsafe { k.set_len(pages); }
+ // SAFETY: src buffer sized val.len() does not overlap with dst buffer since
+ // the dst buffer's size is val.len() padded up to a multiple of PAGE_SIZE.
+ unsafe { ptr::copy_nonoverlapping(val.as_ptr(), k.as_mut_ptr() as *mut u8,
+ val.len()) };
+ Ok(k)
+ },
+ Err(_) => Err(AllocError),
+ }
+}
+
+impl TryFrom<&[u8]> for VVec<PageSlice> {
+ type Error = AllocError;
+
+ fn try_from(val: &[u8]) -> Result<Self, AllocError> {
+ to_vec_with_allocator(val)
+ }
+}
+
+impl TryFrom<&[u8]> for KVec<PageSlice> {
+ type Error = AllocError;
+
+ fn try_from(val: &[u8]) -> Result<Self, AllocError> {
+ to_vec_with_allocator(val)
+ }
+}
+
+impl TryFrom<&[u8]> for KVVec<PageSlice> {
+ type Error = AllocError;
+
+ fn try_from(val: &[u8]) -> Result<Self, AllocError> {
+ to_vec_with_allocator(val)
+ }
+}
--
2.43.0
Powered by blists - more mailing lists