From: Abdiel Janulgue <abdiel.janulgue@gmail.com>
To: rust-for-linux@vger.kernel.org, aliceryhl@google.com
Cc: dakr@redhat.com, linux-kernel@vger.kernel.org, lyude@redhat.com,
airlied@redhat.com, miguel.ojeda.sandonis@gmail.com,
boqun.feng@gmail.com
Subject: [PATCH 1/3] rust: page: replace the page pointer wrapper with Opaque
Date: Mon, 7 Oct 2024 23:27:50 +0300 [thread overview]
Message-ID: <20241007202752.3096472-2-abdiel.janulgue@gmail.com> (raw)
In-Reply-To: <20241007202752.3096472-1-abdiel.janulgue@gmail.com>
Replace NonNull with Opaque to make it possible to cast to a Page pointer
from a raw struct page pointer.
Signed-off-by: Abdiel Janulgue <abdiel.janulgue@gmail.com>
---
rust/kernel/page.rs | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/rust/kernel/page.rs b/rust/kernel/page.rs
index 208a006d587c..08ff09a25223 100644
--- a/rust/kernel/page.rs
+++ b/rust/kernel/page.rs
@@ -8,8 +8,9 @@
error::code::*,
error::Result,
uaccess::UserSliceReader,
+ types::Opaque,
};
-use core::ptr::{self, NonNull};
+use core::ptr::{self};
/// A bitwise shift for the page size.
pub const PAGE_SHIFT: usize = bindings::PAGE_SHIFT as usize;
@@ -25,8 +26,9 @@
/// # Invariants
///
/// The pointer is valid, and has ownership over the page.
+#[repr(transparent)]
pub struct Page {
- page: NonNull<bindings::page>,
+ page: Opaque<bindings::page>,
}
// SAFETY: Pages have no logic that relies on them staying on a given thread, so moving them across
@@ -65,15 +67,20 @@ pub fn alloc_page(flags: Flags) -> Result<Self, AllocError> {
// SAFETY: Depending on the value of `gfp_flags`, this call may sleep. Other than that, it
// is always safe to call this method.
let page = unsafe { bindings::alloc_pages(flags.as_raw(), 0) };
- let page = NonNull::new(page).ok_or(AllocError)?;
+ if page.is_null() {
+ return Err(AllocError);
+ }
+ // CAST: Self` is a `repr(transparent)` wrapper around `bindings::page`.
+ let ptr = page.cast::<Self>();
// INVARIANT: We just successfully allocated a page, so we now have ownership of the newly
// allocated page. We transfer that ownership to the new `Page` object.
- Ok(Self { page })
+ // SAFETY: According to invariant above ptr is valid.
+ Ok(unsafe { ptr::read(ptr) })
}
/// Returns a raw pointer to the page.
pub fn as_ptr(&self) -> *mut bindings::page {
- self.page.as_ptr()
+ self.page.get()
}
/// Runs a piece of code with this page mapped to an address.
@@ -245,6 +252,6 @@ pub unsafe fn copy_from_user_slice_raw(
impl Drop for Page {
fn drop(&mut self) {
// SAFETY: By the type invariants, we have ownership of the page and can free it.
- unsafe { bindings::__free_pages(self.page.as_ptr(), 0) };
+ unsafe { bindings::__free_pages(self.page.get(), 0) };
}
}
--
2.34.1
next prev parent reply other threads:[~2024-10-07 20:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-07 20:27 rust: page: Add support for vmalloc_to_page Abdiel Janulgue
2024-10-07 20:27 ` Abdiel Janulgue [this message]
2024-10-08 6:58 ` [PATCH 1/3] rust: page: replace the page pointer wrapper with Opaque Alice Ryhl
2024-10-08 7:04 ` Boqun Feng
2024-10-08 11:29 ` Abdiel Janulgue
2024-10-08 11:33 ` Boqun Feng
2024-10-11 11:07 ` Fiona Behrens
2024-10-15 13:21 ` Alice Ryhl
2024-10-07 20:27 ` [PATCH 2/3] rust: page: Extend support to vmalloc_to_page Abdiel Janulgue
2024-10-07 20:27 ` [PATCH 3/3] rust: page: Add page_slice_to_page Abdiel Janulgue
2024-10-11 11:03 ` kernel test robot
2024-10-07 20:58 ` rust: page: Add support for vmalloc_to_page Miguel Ojeda
2024-10-08 11:29 ` Abdiel Janulgue
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241007202752.3096472-2-abdiel.janulgue@gmail.com \
--to=abdiel.janulgue@gmail.com \
--cc=airlied@redhat.com \
--cc=aliceryhl@google.com \
--cc=boqun.feng@gmail.com \
--cc=dakr@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lyude@redhat.com \
--cc=miguel.ojeda.sandonis@gmail.com \
--cc=rust-for-linux@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).