rust: drm/gem: Remove Object.dev
Subsystems (3)
PATCH 1/1 rust: drm/gem: Remove Object.dev
I noticed by chance that there's actually already a pointer to this in struct drm_gem_object. So, no use in carrying this around!
Signed-off-by Lyude Paul <[email protected]>
--- rust/kernel/drm/gem/mod.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
rust/kernel/drm/gem/mod.rs +3 -8
@@ -187,12 +187,10 @@ impl<T: IntoGEMObject> BaseObject for T {}/// Invariants /// /// - `self.obj` is a valid instance of a `struct drm_gem_object`. -/// - `self.dev` is always a valid pointer to a `struct drm_device`. #[repr( C )] #[pin_data] pub struct Object <T :DriverObject +Send +Sync > { obj:Opaque <bindings::drm_gem_object >, - dev:NonNull <drm::Device <T ::Driver >>,#[pin] data:T , }
@@ -222,9 +220,6 @@ pub fn new(dev: &drm::Device<T::Driver>, size: usize) -> Result<ARef<Self>> {try_pin_init! (Self { obj:Opaque ::new (bindings::drm_gem_object::default ()), data <-T ::new (dev, size), -// INVARIANT: The drm subsystem guarantees that the `struct drm_device` will live -// as long as the GEM object lives. - dev: dev.into (), }),GFP_KERNEL , )?;
@@ -247,9 +242,9 @@ pub fn new(dev: &drm::Device<T::Driver>, size: usize) -> Result<ARef<Self>> {/// Returns the `Device` that owns this GEM object. pub fn dev (&self) -> &drm::Device <T ::Driver > { -// SAFETY: The DRM subsystem guarantees that the `struct drm_device` will live as long as -// the GEM object lives, hence the pointer must be valid. -unsafe { self.dev.as_ref () } +// SAFETY: `struct drm_gem_object.dev` is initialized and valid for as long as the GEM +// object lives. +unsafe { drm::Device ::from_raw ((*self.as_raw ()).dev) } }fn as_raw (&self) -> *mut bindings::drm_gem_object {
base-commit: 3a8660878839faadb4f1a6dd72c3179c1df56787
Signature · 1 line
2.51.0
Quoted 4 lines · Lyude Paul
I noticed by chance that there's actually already a pointer to this in struct
drm_gem_object. So, no use in carrying this around!Signed-off-by Lyude Paul <[email protected]>
Acked-by Danilo Krummrich <[email protected]>
Alice Ryhl
maintainerQuoted 36 lines · Lyude Paul
I noticed by chance that there's actually already a pointer to this in struct
drm_gem_object. So, no use in carrying this around!Signed-off-by Lyude Paul <[email protected]>--- rust/kernel/drm/gem/mod.rs | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)rust/kernel/drm/gem/mod.rs +0
-5@@ -187,12 +187,10 @@ impl<T: IntoGEMObject> BaseObject for T {}/// Invariants /// /// - `self.obj` is a valid instance of a `struct drm_gem_object`. -/// - `self.dev` is always a valid pointer to a `struct drm_device`. #[repr( C )] #[pin_data] pub struct Object <T :DriverObject +Send +Sync > { obj:Opaque <bindings::drm_gem_object >, - dev:NonNull <drm::Device <T ::Driver >>,#[pin] data:T , }@@ -222,9 +220,6 @@ pub fn new(dev: &drm::Device<T::Driver>, size: usize) -> Result<ARef<Self>> {try_pin_init! (Self { obj:Opaque ::new (bindings::drm_gem_object::default ()), data <-T ::new (dev, size), -// INVARIANT: The drm subsystem guarantees that the `struct drm_device` will live -// as long as the GEM object lives. - dev: dev.into (), }),GFP_KERNEL , )?;
rust/kernel/drm/gem/mod.rs pub fn new(dev: &drm::Device<T::Driver>, size: usize) -> Result<ARef<Self>> { · line 247
Quoted 9 lines
rust/kernel/drm/gem/mod.rs +3
-3@@ -247,9 +242,9 @@ pub fn new(dev: &drm::Device<T::Driver>, size: usize) -> Result<ARef<Self>> {/// Returns the `Device` that owns this GEM object. pub fn dev (&self) -> &drm::Device <T ::Driver > { -// SAFETY: The DRM subsystem guarantees that the `struct drm_device` will live as long as -// the GEM object lives, hence the pointer must be valid. -unsafe { self.dev.as_ref () } +// SAFETY: `struct drm_gem_object.dev` is initialized and valid for as long as the GEM +// object lives. +unsafe { drm::Device ::from_raw ((*self.as_raw ()).dev) }
The wording here and in the invariants could be improved to say that T::Driver is the right choice for the generic parameter.
Alice