Merge 6.13-rc7 into driver-core-next
We need the debugfs / driver-core fixes in here as well for testing and to build on top of. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
@@ -860,7 +860,7 @@ impl DeviceMask {
|
||||
/// ];
|
||||
/// #[cfg(MODULE)]
|
||||
/// #[no_mangle]
|
||||
/// static __mod_mdio__phydev_device_table: [::kernel::bindings::mdio_device_id; 2] = _DEVICE_TABLE;
|
||||
/// static __mod_device_table__mdio__phydev: [::kernel::bindings::mdio_device_id; 2] = _DEVICE_TABLE;
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! module_phy_driver {
|
||||
@@ -883,7 +883,7 @@ macro_rules! module_phy_driver {
|
||||
|
||||
#[cfg(MODULE)]
|
||||
#[no_mangle]
|
||||
static __mod_mdio__phydev_device_table: [$crate::bindings::mdio_device_id;
|
||||
static __mod_device_table__mdio__phydev: [$crate::bindings::mdio_device_id;
|
||||
$crate::module_phy_driver!(@count_devices $($dev),+) + 1] = _DEVICE_TABLE;
|
||||
};
|
||||
|
||||
|
||||
@@ -519,7 +519,15 @@ impl_has_work! {
|
||||
impl{T} HasWork<Self> for ClosureWork<T> { self.work }
|
||||
}
|
||||
|
||||
// SAFETY: TODO.
|
||||
// SAFETY: The `__enqueue` implementation in RawWorkItem uses a `work_struct` initialized with the
|
||||
// `run` method of this trait as the function pointer because:
|
||||
// - `__enqueue` gets the `work_struct` from the `Work` field, using `T::raw_get_work`.
|
||||
// - The only safe way to create a `Work` object is through `Work::new`.
|
||||
// - `Work::new` makes sure that `T::Pointer::run` is passed to `init_work_with_key`.
|
||||
// - Finally `Work` and `RawWorkItem` guarantee that the correct `Work` field
|
||||
// will be used because of the ID const generic bound. This makes sure that `T::raw_get_work`
|
||||
// uses the correct offset for the `Work` field, and `Work::new` picks the correct
|
||||
// implementation of `WorkItemPointer` for `Arc<T>`.
|
||||
unsafe impl<T, const ID: u64> WorkItemPointer<ID> for Arc<T>
|
||||
where
|
||||
T: WorkItem<ID, Pointer = Self>,
|
||||
@@ -537,7 +545,13 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
// SAFETY: TODO.
|
||||
// SAFETY: The `work_struct` raw pointer is guaranteed to be valid for the duration of the call to
|
||||
// the closure because we get it from an `Arc`, which means that the ref count will be at least 1,
|
||||
// and we don't drop the `Arc` ourselves. If `queue_work_on` returns true, it is further guaranteed
|
||||
// to be valid until a call to the function pointer in `work_struct` because we leak the memory it
|
||||
// points to, and only reclaim it if the closure returns false, or in `WorkItemPointer::run`, which
|
||||
// is what the function pointer in the `work_struct` must be pointing to, according to the safety
|
||||
// requirements of `WorkItemPointer`.
|
||||
unsafe impl<T, const ID: u64> RawWorkItem<ID> for Arc<T>
|
||||
where
|
||||
T: WorkItem<ID, Pointer = Self>,
|
||||
|
||||
Reference in New Issue
Block a user