From: Daniel Almeida <daniel.almeida@collabora.com>
To: "Maarten Lankhorst" <maarten.lankhorst@linux.intel.com>,
"Maxime Ripard" <mripard@kernel.org>,
"Thomas Zimmermann" <tzimmermann@suse.de>,
"David Airlie" <airlied@gmail.com>,
"Simona Vetter" <simona@ffwll.ch>,
"Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Benno Lossin" <benno.lossin@proton.me>,
"Andreas Hindborg" <a.hindborg@kernel.org>,
"Alice Ryhl" <aliceryhl@google.com>,
"Trevor Gross" <tmgross@umich.edu>,
"Sumit Semwal" <sumit.semwal@linaro.org>,
"Christian König" <christian.koenig@amd.com>
Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org,
rust-for-linux@vger.kernel.org, linux-media@vger.kernel.org,
linaro-mm-sig@lists.linaro.org,
Danilo Krummrich <dakr@kernel.org>,
Asahi Lina <lina@asahilina.net>,
Daniel Almeida <daniel.almeida@collabora.com>
Subject: [PATCH 7/7] rust: drm: gem: shmem: Add share_dma_resv() function
Date: Tue, 18 Mar 2025 16:22:41 -0300 [thread overview]
Message-ID: <20250318-drm-gem-shmem-v1-7-64b96511a84f@collabora.com> (raw)
In-Reply-To: <20250318-drm-gem-shmem-v1-0-64b96511a84f@collabora.com>
From: Asahi Lina <lina@asahilina.net>
Allow a GEM object to share another object's DMA reservation, for use
with drm_gpuvm. To keep memory safety, we hold a reference to the GEM
object owning the resv, and drop it when the child object is freed.
Signed-off-by: Asahi Lina <lina@asahilina.net>
Signed-off-by: Daniel Almeida <daniel.almeida@collabora.com>
---
rust/kernel/drm/gem/shmem.rs | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/rust/kernel/drm/gem/shmem.rs b/rust/kernel/drm/gem/shmem.rs
index fdf7dd7f2408bd2857f5b72027ef48e29c9dd9e3..e026b26a4895daea0534b93296da9a33683aa432 100644
--- a/rust/kernel/drm/gem/shmem.rs
+++ b/rust/kernel/drm/gem/shmem.rs
@@ -17,7 +17,7 @@
slice,
};
-use gem::BaseObject;
+use gem::{BaseObject, IntoGEMObject};
/// Trait which must be implemented by drivers using shmem-backed GEM objects.
pub trait DriverObject: gem::BaseDriverObject<Object<Self>> {
@@ -72,6 +72,8 @@ pub struct Object<T: DriverObject> {
// The DRM core ensures the Device exists as long as its objects exist, so we don't need to
// manage the reference count here.
dev: *const bindings::drm_device,
+ // Parent object that owns this object's DMA reservation object
+ parent_resv_obj: *const bindings::drm_gem_object,
#[pin]
inner: T,
}
@@ -101,6 +103,7 @@ unsafe impl init::Zeroable for bindings::drm_gem_shmem_object {}
// SAFETY: GEM ensures the device lives as long as its objects live
inner <- T::new(unsafe { device::Device::borrow(dev)}, size),
dev,
+ parent_resv_obj: core::ptr::null(),
});
// SAFETY: p is a valid pointer to an uninitialized Object<T>.
@@ -135,6 +138,15 @@ unsafe impl init::Zeroable for bindings::drm_gem_shmem_object {}
core::ptr::drop_in_place(&mut (*p).inner);
}
+ // SAFETY: parent_resv_obj is either NULL or a valid reference to the
+ // GEM object owning the DMA reservation for this object, which we drop
+ // here.
+ unsafe {
+ if !(*p).parent_resv_obj.is_null() {
+ bindings::drm_gem_object_put((*p).parent_resv_obj as *const _ as *mut _);
+ }
+ }
+
// SAFETY: This pointer has to be valid, since p is valid
unsafe {
bindings::drm_gem_shmem_free(&mut (*p).obj);
@@ -236,6 +248,25 @@ pub fn vmap(&self) -> Result<VMap<T>> {
pub fn set_wc(&mut self, map_wc: bool) {
self.obj.set_map_wc(map_wc);
}
+
+ /// Share the dma_resv object from another GEM object.
+ ///
+ /// Should be called before the object is used/shared. Can only be called once.
+ pub fn share_dma_resv(&mut self, from_object: &impl IntoGEMObject) -> Result {
+ let from_obj = from_object.gem_obj();
+ if !self.parent_resv_obj.is_null() {
+ Err(EBUSY)
+ } else {
+ // SAFETY: from_obj is a valid object pointer per the trait Invariant.
+ unsafe {
+ bindings::drm_gem_object_get(from_obj as *const _ as *mut _);
+ }
+ self.parent_resv_obj = from_obj;
+ let gem = self.mut_gem_obj();
+ gem.resv = from_obj.resv;
+ Ok(())
+ }
+ }
}
impl<T: DriverObject> Deref for Object<T> {
--
2.48.1
prev parent reply other threads:[~2025-03-18 19:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-18 19:22 [PATCH 0/7] Rust abstractions for shmem-backed GEM objects Daniel Almeida
2025-03-18 19:22 ` [PATCH 1/7] drm/shmem-helper: Add lockdep asserts to vmap/vunmap Daniel Almeida
2025-03-19 7:49 ` Christian König
2025-05-13 19:26 ` Lyude Paul
2025-03-18 19:22 ` [PATCH 2/7] drm/gem-shmem: Export VM ops functions Daniel Almeida
2025-03-19 7:55 ` Christian König
2025-03-19 7:55 ` Christian König
2025-03-18 19:22 ` [PATCH 3/7] rust: helpers: Add bindings/wrappers for dma_resv_lock Daniel Almeida
2025-03-18 19:22 ` [PATCH 4/7] rust: drm: gem: shmem: Add DRM shmem helper abstraction Daniel Almeida
2025-03-18 19:22 ` [PATCH 5/7] drm/gem: Add a flag to control whether objects can be exported Daniel Almeida
2025-03-19 8:04 ` Christian König
2025-03-18 19:22 ` [PATCH 6/7] rust: drm: gem: Add set_exportable() method Daniel Almeida
2025-03-18 19:22 ` Daniel Almeida [this message]
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=20250318-drm-gem-shmem-v1-7-64b96511a84f@collabora.com \
--to=daniel.almeida@collabora.com \
--cc=a.hindborg@kernel.org \
--cc=airlied@gmail.com \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=christian.koenig@amd.com \
--cc=dakr@kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=gary@garyguo.net \
--cc=lina@asahilina.net \
--cc=linaro-mm-sig@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=simona@ffwll.ch \
--cc=sumit.semwal@linaro.org \
--cc=tmgross@umich.edu \
--cc=tzimmermann@suse.de \
/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).