mirror of
https://github.com/torvalds/linux.git
synced 2026-04-18 14:53:58 -04:00
Merge tag 'driver-core-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core
Pull driver core updates from Danilo Krummrich:
"Arch Topology:
- Move parse_acpi_topology() from arm64 to common code for reuse in
RISC-V
CPU:
- Expose housekeeping CPUs through /sys/devices/system/cpu/housekeeping
- Print a newline (or 0x0A) instead of '(null)' reading
/sys/devices/system/cpu/nohz_full when nohz_full= is not set
debugfs
- Remove (broken) 'no-mount' mode
- Remove redundant access mode checks in debugfs_get_tree() and
debugfs_create_*() functions
Devres:
- Remove unused devm_free_percpu() helper
- Move devm_alloc_percpu() from device.h to devres.h
Firmware Loader:
- Replace simple_strtol() with kstrtoint()
- Do not call cancel_store() when no upload is in progress
kernfs:
- Increase struct super_block::maxbytes to MAX_LFS_FILESIZE
- Fix a missing unwind path in __kernfs_new_node()
Misc:
- Increase the name size in struct auxiliary_device_id to 40
characters
- Replace system_unbound_wq with system_dfl_wq and add WQ_PERCPU to
alloc_workqueue()
Platform:
- Replace ERR_PTR() with IOMEM_ERR_PTR() in platform ioremap
functions
Rust:
- Auxiliary:
- Unregister auxiliary device on parent device unbind
- Move parent() to impl Device; implement device context aware
parent() for Device<Bound>
- Illustrate how to safely obtain a driver's device private data
when calling from an auxiliary driver into the parant device
driver
- DebugFs:
- Implement support for binary large objects
- Device:
- Let probe() return the driver's device private data as pinned
initializer, i.e. impl PinInit<Self, Error>
- Implement safe accessor for a driver's device private data for
Device<Bound> (returned reference can't out-live driver binding
and guarantees the correct private data type)
- Implement AsBusDevice trait, to be used by class device
abstractions to derive the bus device type of the parent device
- DMA:
- Store raw pointer of allocation as NonNull
- Use start_ptr() and start_ptr_mut() to inherit correct
mutability of self
- FS:
- Add file::Offset type alias
- I2C:
- Add abstractions for I2C device / driver infrastructure
- Implement abstractions for manual I2C device registrations
- I/O:
- Use "kernel vertical" style for imports
- Define ResourceSize as resource_size_t
- Move ResourceSize to top-level I/O module
- Add type alias for phys_addr_t
- Implement Rust version of read_poll_timeout_atomic()
- PCI:
- Use "kernel vertical" style for imports
- Move I/O and IRQ infrastructure to separate files
- Add support for PCI interrupt vectors
- Implement TryInto<IrqRequest<'a>> for IrqVector<'a> to convert
an IrqVector bound to specific pci::Device into an IrqRequest
bound to the same pci::Device's parent Device
- Leverage pin_init_scope() to get rid of redundant Result in IRQ
methods
- PinInit:
- Add {pin_}init_scope() to execute code before creating an
initializer
- Platform:
- Leverage pin_init_scope() to get rid of redundant Result in IRQ
methods
- Timekeeping:
- Implement abstraction of udelay()
- Uaccess:
- Implement read_slice_partial() and read_slice_file() for
UserSliceReader
- Implement write_slice_partial() and write_slice_file() for
UserSliceWriter
sysfs:
- Prepare the constification of struct attribute"
* tag 'driver-core-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core: (75 commits)
rust: pci: fix build failure when CONFIG_PCI_MSI is disabled
debugfs: Fix default access mode config check
debugfs: Remove broken no-mount mode
debugfs: Remove redundant access mode checks
driver core: Check drivers_autoprobe for all added devices
driver core: WQ_PERCPU added to alloc_workqueue users
driver core: replace use of system_unbound_wq with system_dfl_wq
tick/nohz: Expose housekeeping CPUs in sysfs
tick/nohz: avoid showing '(null)' if nohz_full= not set
sysfs/cpu: Use DEVICE_ATTR_RO for nohz_full attribute
kernfs: fix memory leak of kernfs_iattrs in __kernfs_new_node
fs/kernfs: raise sb->maxbytes to MAX_LFS_FILESIZE
mod_devicetable: Bump auxiliary_device_id name size
sysfs: simplify attribute definition macros
samples/kobject: constify 'struct foo_attribute'
samples/kobject: add is_visible() callback to attribute group
sysfs: attribute_group: enable const variants of is_visible()
sysfs: introduce __SYSFS_FUNCTION_ALTERNATIVE()
sysfs: transparently handle const pointers in ATTRIBUTE_GROUPS()
sysfs: attribute_group: allow registration of const attribute
...
This commit is contained in:
@@ -3,11 +3,16 @@
|
||||
|
||||
//! Traits for rendering or updating values exported to DebugFS.
|
||||
|
||||
use crate::alloc::Allocator;
|
||||
use crate::fmt;
|
||||
use crate::fs::file;
|
||||
use crate::prelude::*;
|
||||
use crate::sync::atomic::{Atomic, AtomicBasicOps, AtomicType, Relaxed};
|
||||
use crate::sync::Arc;
|
||||
use crate::sync::Mutex;
|
||||
use crate::uaccess::UserSliceReader;
|
||||
use crate::transmute::{AsBytes, FromBytes};
|
||||
use crate::uaccess::{UserSliceReader, UserSliceWriter};
|
||||
use core::ops::{Deref, DerefMut};
|
||||
use core::str::FromStr;
|
||||
|
||||
/// A trait for types that can be written into a string.
|
||||
@@ -36,6 +41,110 @@ impl<T: fmt::Debug> Writer for T {
|
||||
}
|
||||
}
|
||||
|
||||
/// Trait for types that can be written out as binary.
|
||||
pub trait BinaryWriter {
|
||||
/// Writes the binary form of `self` into `writer`.
|
||||
///
|
||||
/// `offset` is the requested offset into the binary representation of `self`.
|
||||
///
|
||||
/// On success, returns the number of bytes written in to `writer`.
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize>;
|
||||
}
|
||||
|
||||
// Base implementation for any `T: AsBytes`.
|
||||
impl<T: AsBytes> BinaryWriter for T {
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
writer.write_slice_file(self.as_bytes(), offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Mutex<T>`: Support a `T` with an outer mutex.
|
||||
impl<T: BinaryWriter> BinaryWriter for Mutex<T> {
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
let guard = self.lock();
|
||||
|
||||
guard.write_to_slice(writer, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Box<T, A>`: Support a `Box<T, A>` with no lock or an inner lock.
|
||||
impl<T, A> BinaryWriter for Box<T, A>
|
||||
where
|
||||
T: BinaryWriter,
|
||||
A: Allocator,
|
||||
{
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref().write_to_slice(writer, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Pin<Box<T, A>>`: Support a `Pin<Box<T, A>>` with no lock or an inner lock.
|
||||
impl<T, A> BinaryWriter for Pin<Box<T, A>>
|
||||
where
|
||||
T: BinaryWriter,
|
||||
A: Allocator,
|
||||
{
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref().write_to_slice(writer, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Arc<T>`: Support a `Arc<T>` with no lock or an inner lock.
|
||||
impl<T> BinaryWriter for Arc<T>
|
||||
where
|
||||
T: BinaryWriter,
|
||||
{
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref().write_to_slice(writer, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Vec<T, A>`.
|
||||
impl<T, A> BinaryWriter for Vec<T, A>
|
||||
where
|
||||
T: AsBytes,
|
||||
A: Allocator,
|
||||
{
|
||||
fn write_to_slice(
|
||||
&self,
|
||||
writer: &mut UserSliceWriter,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
let slice = self.as_slice();
|
||||
|
||||
// SAFETY: `T: AsBytes` allows us to treat `&[T]` as `&[u8]`.
|
||||
let buffer = unsafe {
|
||||
core::slice::from_raw_parts(slice.as_ptr().cast(), core::mem::size_of_val(slice))
|
||||
};
|
||||
|
||||
writer.write_slice_file(buffer, offset)
|
||||
}
|
||||
}
|
||||
|
||||
/// A trait for types that can be updated from a user slice.
|
||||
///
|
||||
/// This works similarly to `FromStr`, but operates on a `UserSliceReader` rather than a &str.
|
||||
@@ -81,3 +190,130 @@ where
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
/// Trait for types that can be constructed from a binary representation.
|
||||
///
|
||||
/// See also [`BinaryReader`] for interior mutability.
|
||||
pub trait BinaryReaderMut {
|
||||
/// Reads the binary form of `self` from `reader`.
|
||||
///
|
||||
/// Same as [`BinaryReader::read_from_slice`], but takes a mutable reference.
|
||||
///
|
||||
/// `offset` is the requested offset into the binary representation of `self`.
|
||||
///
|
||||
/// On success, returns the number of bytes read from `reader`.
|
||||
fn read_from_slice_mut(
|
||||
&mut self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize>;
|
||||
}
|
||||
|
||||
// Base implementation for any `T: AsBytes + FromBytes`.
|
||||
impl<T: AsBytes + FromBytes> BinaryReaderMut for T {
|
||||
fn read_from_slice_mut(
|
||||
&mut self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
reader.read_slice_file(self.as_bytes_mut(), offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Box<T, A>`: Support a `Box<T, A>` with an outer lock.
|
||||
impl<T: ?Sized + BinaryReaderMut, A: Allocator> BinaryReaderMut for Box<T, A> {
|
||||
fn read_from_slice_mut(
|
||||
&mut self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref_mut().read_from_slice_mut(reader, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Vec<T, A>`: Support a `Vec<T, A>` with an outer lock.
|
||||
impl<T, A> BinaryReaderMut for Vec<T, A>
|
||||
where
|
||||
T: AsBytes + FromBytes,
|
||||
A: Allocator,
|
||||
{
|
||||
fn read_from_slice_mut(
|
||||
&mut self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
let slice = self.as_mut_slice();
|
||||
|
||||
// SAFETY: `T: AsBytes + FromBytes` allows us to treat `&mut [T]` as `&mut [u8]`.
|
||||
let buffer = unsafe {
|
||||
core::slice::from_raw_parts_mut(
|
||||
slice.as_mut_ptr().cast(),
|
||||
core::mem::size_of_val(slice),
|
||||
)
|
||||
};
|
||||
|
||||
reader.read_slice_file(buffer, offset)
|
||||
}
|
||||
}
|
||||
|
||||
/// Trait for types that can be constructed from a binary representation.
|
||||
///
|
||||
/// See also [`BinaryReaderMut`] for the mutable version.
|
||||
pub trait BinaryReader {
|
||||
/// Reads the binary form of `self` from `reader`.
|
||||
///
|
||||
/// `offset` is the requested offset into the binary representation of `self`.
|
||||
///
|
||||
/// On success, returns the number of bytes read from `reader`.
|
||||
fn read_from_slice(
|
||||
&self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize>;
|
||||
}
|
||||
|
||||
// Delegate for `Mutex<T>`: Support a `T` with an outer `Mutex`.
|
||||
impl<T: BinaryReaderMut + Unpin> BinaryReader for Mutex<T> {
|
||||
fn read_from_slice(
|
||||
&self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
let mut this = self.lock();
|
||||
|
||||
this.read_from_slice_mut(reader, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Box<T, A>`: Support a `Box<T, A>` with an inner lock.
|
||||
impl<T: ?Sized + BinaryReader, A: Allocator> BinaryReader for Box<T, A> {
|
||||
fn read_from_slice(
|
||||
&self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref().read_from_slice(reader, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Pin<Box<T, A>>`: Support a `Pin<Box<T, A>>` with an inner lock.
|
||||
impl<T: ?Sized + BinaryReader, A: Allocator> BinaryReader for Pin<Box<T, A>> {
|
||||
fn read_from_slice(
|
||||
&self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref().read_from_slice(reader, offset)
|
||||
}
|
||||
}
|
||||
|
||||
// Delegate for `Arc<T>`: Support an `Arc<T>` with an inner lock.
|
||||
impl<T: ?Sized + BinaryReader> BinaryReader for Arc<T> {
|
||||
fn read_from_slice(
|
||||
&self,
|
||||
reader: &mut UserSliceReader,
|
||||
offset: &mut file::Offset,
|
||||
) -> Result<usize> {
|
||||
self.deref().read_from_slice(reader, offset)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user