Here's an updated version of this original series:
https://lore.kernel.org/all/[email protected]/
that has the goal of making more functions in the driver core take const
pointers as they do not actually modify anything. This work is an
outgrowth of some conversations I had with the Linux Rust developers
talking about the mutability of many of the driver model pointers.
A small subset of the original submission is now in 6.2-rc1 and this
series is an outgrown of the original submission in that many things are
now changed and a bit more explicit than before.
I can take all of these through the driver-core git tree as they depend
on each other. 0-day has been passing on this series for quite a while,
so all should be good unless some subsystem trees have added new busses
without me noticing.
Bonus for all of this work, the overall code size of the kernel actually
decreased a tiny bit:
126 files changed, 283 insertions(+), 309 deletions(-)
while adding a lot more type-safeness to the system.
Changes from v1:
- rebased on 6.2-rc1 and dropped accepted patches already in there.
- container_of_const() is now in 6.2-rc1 so use that in many
individual subsystems to make the follow-on changes in the driver
core more obvious.
- collected some Reviewed-by
- of_device_uevent_modalias was being "abused" by many different
subsystems in using it instead of a local bus function which played
havoc when enabling stricter type-checking. Move that out into a
new function for the busses that were doing this to make it more
obvious what they need here.
Greg Kroah-Hartman (16):
of: device: make of_device_uevent_modalias() take a const device *
i3c: move dev_to_i3cdev() to use container_of_const()
platform/surface: aggregator: move to_ssam_device() to use
container_of_const()
firewire: move fw_device() and fw_unit() to use container_of_const()
driver core: make struct device_type.uevent() take a const *
driver core: make struct device_type.devnode() take a const *
driver core: device_get_devnode() should take a const *
vio: move to_vio_dev() to use container_of_const()
platform/x86: wmi: move dev_to_wblock() and dev_to_wdev to use
container_of_const()
drivers: hv: move device_to_hv_device to use container_of_const()
virtio: move dev_to_virtio() to use container_of_const()
drm/mipi-dsi: move to_mipi_dsi_device() to use container_of_const()
mcb: move to_mcb_device() to use container_of_const()
xen/xenbus: move to_xenbus_device() to use container_of_const()
driver core: make struct bus_type.uevent() take a const *
kobject: kset_uevent_ops: make uevent() callback take a const *
arch/mips/sgi-ip22/ip22-gio.c | 4 ++--
arch/parisc/kernel/drivers.c | 4 ++--
arch/powerpc/include/asm/vio.h | 5 +----
arch/powerpc/platforms/pseries/ibmebus.c | 7 ++++++-
arch/powerpc/platforms/pseries/vio.c | 4 ++--
arch/sparc/include/asm/vio.h | 5 +----
arch/sparc/kernel/vio.c | 2 +-
block/genhd.c | 2 +-
block/partitions/core.c | 4 ++--
drivers/acpi/bus.c | 2 +-
drivers/acpi/device_sysfs.c | 8 ++++----
drivers/acpi/internal.h | 2 +-
drivers/amba/bus.c | 4 ++--
drivers/base/auxiliary.c | 2 +-
drivers/base/base.h | 2 ++
drivers/base/core.c | 6 +++---
drivers/base/cpu.c | 2 +-
drivers/base/platform.c | 4 ++--
drivers/bcma/main.c | 6 +++---
drivers/bus/fsl-mc/fsl-mc-bus.c | 4 ++--
drivers/bus/mhi/ep/main.c | 4 ++--
drivers/bus/mhi/host/init.c | 4 ++--
drivers/bus/mips_cdmm.c | 4 ++--
drivers/bus/sunxi-rsb.c | 7 ++++++-
drivers/cxl/core/memdev.c | 4 ++--
drivers/cxl/core/port.c | 8 ++++----
drivers/cxl/cxl.h | 4 ++--
drivers/cxl/cxlmem.h | 2 +-
drivers/dax/bus.c | 2 +-
drivers/eisa/eisa-bus.c | 4 ++--
drivers/firewire/core-device.c | 8 ++++----
drivers/firmware/arm_ffa/bus.c | 4 ++--
drivers/fpga/dfl.c | 4 ++--
drivers/fsi/fsi-core.c | 6 +++---
drivers/gpu/drm/display/drm_dp_aux_bus.c | 7 ++++++-
drivers/gpu/drm/drm_mipi_dsi.c | 4 ++--
drivers/gpu/host1x/bus.c | 2 +-
drivers/greybus/core.c | 14 +++++++-------
drivers/hid/hid-core.c | 4 ++--
drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +-
drivers/hsi/hsi_core.c | 2 +-
drivers/hv/vmbus_drv.c | 4 ++--
drivers/hwtracing/intel_th/core.c | 6 +++---
drivers/hwtracing/intel_th/intel_th.h | 4 ++--
drivers/i2c/i2c-core-base.c | 4 ++--
drivers/i3c/device.c | 14 +-------------
drivers/i3c/master.c | 4 ++--
drivers/input/input.c | 16 ++++++++--------
drivers/input/serio/serio.c | 4 ++--
drivers/ipack/ipack.c | 4 ++--
drivers/macintosh/macio_asic.c | 7 ++++++-
drivers/mcb/mcb-core.c | 4 ++--
drivers/media/rc/rc-main.c | 2 +-
drivers/memstick/core/memstick.c | 6 +++---
drivers/misc/mei/bus.c | 4 ++--
drivers/misc/tifm_core.c | 4 ++--
drivers/mmc/core/bus.c | 4 ++--
drivers/mmc/core/sdio_bus.c | 4 ++--
drivers/net/phy/mdio_bus.c | 2 +-
drivers/net/xen-netback/xenbus.c | 2 +-
drivers/nvdimm/bus.c | 4 ++--
drivers/nvdimm/dax_devs.c | 2 +-
drivers/nvdimm/dimm_devs.c | 2 +-
drivers/nvdimm/nd-core.h | 10 +++++-----
drivers/nvdimm/nd.h | 4 ++--
drivers/nvdimm/region_devs.c | 4 ++--
drivers/of/device.c | 4 ++--
drivers/pci/pci-driver.c | 4 ++--
drivers/pcmcia/ds.c | 4 ++--
drivers/platform/surface/aggregator/bus.c | 4 ++--
drivers/platform/x86/wmi.c | 15 ++++-----------
drivers/rapidio/rio-driver.c | 4 ++--
drivers/rpmsg/rpmsg_core.c | 4 ++--
drivers/s390/cio/css.c | 4 ++--
drivers/s390/cio/device.c | 8 ++++----
drivers/s390/cio/scm.c | 2 +-
drivers/s390/crypto/ap_bus.c | 4 ++--
drivers/scsi/scsi_sysfs.c | 4 ++--
drivers/slimbus/core.c | 4 ++--
drivers/soc/qcom/apr.c | 4 ++--
drivers/soundwire/bus_type.c | 4 ++--
drivers/spi/spi.c | 2 +-
drivers/spmi/spmi.c | 2 +-
drivers/ssb/main.c | 4 ++--
drivers/staging/greybus/gbphy.c | 14 +++++++-------
drivers/tee/tee_core.c | 2 +-
drivers/thunderbolt/switch.c | 4 ++--
drivers/thunderbolt/tb.h | 2 +-
drivers/thunderbolt/xdomain.c | 6 +++---
drivers/tty/serdev/core.c | 2 +-
drivers/usb/common/ulpi.c | 4 ++--
drivers/usb/core/driver.c | 6 +++---
drivers/usb/core/message.c | 8 ++++----
drivers/usb/core/usb.c | 8 ++++----
drivers/usb/phy/phy.c | 6 +++---
drivers/usb/roles/class.c | 3 +--
drivers/usb/typec/bus.c | 4 ++--
drivers/usb/typec/class.c | 2 +-
drivers/virtio/virtio.c | 4 ++--
drivers/w1/w1.c | 10 +++++-----
drivers/xen/pvcalls-back.c | 2 +-
drivers/xen/xenbus/xenbus_probe_backend.c | 8 ++++----
drivers/xen/xenbus/xenbus_probe_frontend.c | 4 ++--
drivers/zorro/zorro-driver.c | 4 ++--
fs/dlm/lockspace.c | 4 ++--
fs/gfs2/sys.c | 6 +++---
include/drm/drm_mipi_dsi.h | 5 +----
include/linux/acpi.h | 4 ++--
include/linux/device.h | 6 ++----
include/linux/device/bus.h | 2 +-
include/linux/firewire.h | 15 +++------------
include/linux/hyperv.h | 5 +----
include/linux/i3c/device.h | 11 +++++++++--
include/linux/kobject.h | 2 +-
include/linux/mcb.h | 5 +----
include/linux/of_device.h | 4 ++--
include/linux/soundwire/sdw_type.h | 2 +-
include/linux/spi/spi.h | 2 +-
include/linux/ssb/ssb.h | 2 +-
include/linux/surface_aggregator/device.h | 5 +----
include/linux/virtio.h | 5 +----
include/sound/hdaudio.h | 2 +-
include/xen/xenbus.h | 7 ++-----
sound/aoa/soundbus/core.c | 6 +++---
sound/hda/hda_bus_type.c | 2 +-
sound/hda/hdac_device.c | 2 +-
126 files changed, 283 insertions(+), 309 deletions(-)
--
2.39.0
The driver core is changing to pass some pointers as const, so move
dev_to_i3cdev() to use container_of_const() to handle this change.
dev_to_i3cdev() now properly keeps the const-ness of the pointer passed
into it, while as before it could be lost.
Cc: Alexandre Belloni <[email protected]>
Cc: [email protected]
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
drivers/i3c/device.c | 12 ------------
include/linux/i3c/device.h | 9 ++++++++-
2 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c
index 9762630b917e..d111499061b2 100644
--- a/drivers/i3c/device.c
+++ b/drivers/i3c/device.c
@@ -208,18 +208,6 @@ struct device *i3cdev_to_dev(struct i3c_device *i3cdev)
}
EXPORT_SYMBOL_GPL(i3cdev_to_dev);
-/**
- * dev_to_i3cdev() - Returns the I3C device containing @dev
- * @dev: device object
- *
- * Return: a pointer to an I3C device object.
- */
-struct i3c_device *dev_to_i3cdev(struct device *dev)
-{
- return container_of(dev, struct i3c_device, dev);
-}
-EXPORT_SYMBOL_GPL(dev_to_i3cdev);
-
/**
* i3c_device_match_id() - Returns the i3c_device_id entry matching @i3cdev
* @i3cdev: I3C device
diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h
index 1c997abe868c..68b558929aec 100644
--- a/include/linux/i3c/device.h
+++ b/include/linux/i3c/device.h
@@ -186,7 +186,14 @@ static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv)
}
struct device *i3cdev_to_dev(struct i3c_device *i3cdev);
-struct i3c_device *dev_to_i3cdev(struct device *dev);
+
+/**
+ * dev_to_i3cdev() - Returns the I3C device containing @dev
+ * @dev: device object
+ *
+ * Return: a pointer to an I3C device object.
+ */
+#define dev_to_i3cdev(__dev) container_of_const(__dev, struct i3c_device, dev)
const struct i3c_device_id *
i3c_device_match_id(struct i3c_device *i3cdev,
--
2.39.0
Hi,
On 1/11/23 12:30, Greg Kroah-Hartman wrote:
> Here's an updated version of this original series:
> https://lore.kernel.org/all/[email protected]/
> that has the goal of making more functions in the driver core take const
> pointers as they do not actually modify anything. This work is an
> outgrowth of some conversations I had with the Linux Rust developers
> talking about the mutability of many of the driver model pointers.
>
> A small subset of the original submission is now in 6.2-rc1 and this
> series is an outgrown of the original submission in that many things are
> now changed and a bit more explicit than before.
>
> I can take all of these through the driver-core git tree as they depend
> on each other. 0-day has been passing on this series for quite a while,
> so all should be good unless some subsystem trees have added new busses
> without me noticing.
>
> Bonus for all of this work, the overall code size of the kernel actually
> decreased a tiny bit:
> 126 files changed, 283 insertions(+), 309 deletions(-)
> while adding a lot more type-safeness to the system.
Other then a small remark on "[PATCH v2 03/16] platform/surface: aggregator:
move to_ssam_device() to use container_of_const()" the platform/surface
and platform/x86/wmi.c changes look good to me:
Acked-by: Hans de Goede <[email protected]>
Regards,
Hans
>
> Changes from v1:
> - rebased on 6.2-rc1 and dropped accepted patches already in there.
> - container_of_const() is now in 6.2-rc1 so use that in many
> individual subsystems to make the follow-on changes in the driver
> core more obvious.
> - collected some Reviewed-by
> - of_device_uevent_modalias was being "abused" by many different
> subsystems in using it instead of a local bus function which played
> havoc when enabling stricter type-checking. Move that out into a
> new function for the busses that were doing this to make it more
> obvious what they need here.
>
> Greg Kroah-Hartman (16):
> of: device: make of_device_uevent_modalias() take a const device *
> i3c: move dev_to_i3cdev() to use container_of_const()
> platform/surface: aggregator: move to_ssam_device() to use
> container_of_const()
> firewire: move fw_device() and fw_unit() to use container_of_const()
> driver core: make struct device_type.uevent() take a const *
> driver core: make struct device_type.devnode() take a const *
> driver core: device_get_devnode() should take a const *
> vio: move to_vio_dev() to use container_of_const()
> platform/x86: wmi: move dev_to_wblock() and dev_to_wdev to use
> container_of_const()
> drivers: hv: move device_to_hv_device to use container_of_const()
> virtio: move dev_to_virtio() to use container_of_const()
> drm/mipi-dsi: move to_mipi_dsi_device() to use container_of_const()
> mcb: move to_mcb_device() to use container_of_const()
> xen/xenbus: move to_xenbus_device() to use container_of_const()
> driver core: make struct bus_type.uevent() take a const *
> kobject: kset_uevent_ops: make uevent() callback take a const *
>
> arch/mips/sgi-ip22/ip22-gio.c | 4 ++--
> arch/parisc/kernel/drivers.c | 4 ++--
> arch/powerpc/include/asm/vio.h | 5 +----
> arch/powerpc/platforms/pseries/ibmebus.c | 7 ++++++-
> arch/powerpc/platforms/pseries/vio.c | 4 ++--
> arch/sparc/include/asm/vio.h | 5 +----
> arch/sparc/kernel/vio.c | 2 +-
> block/genhd.c | 2 +-
> block/partitions/core.c | 4 ++--
> drivers/acpi/bus.c | 2 +-
> drivers/acpi/device_sysfs.c | 8 ++++----
> drivers/acpi/internal.h | 2 +-
> drivers/amba/bus.c | 4 ++--
> drivers/base/auxiliary.c | 2 +-
> drivers/base/base.h | 2 ++
> drivers/base/core.c | 6 +++---
> drivers/base/cpu.c | 2 +-
> drivers/base/platform.c | 4 ++--
> drivers/bcma/main.c | 6 +++---
> drivers/bus/fsl-mc/fsl-mc-bus.c | 4 ++--
> drivers/bus/mhi/ep/main.c | 4 ++--
> drivers/bus/mhi/host/init.c | 4 ++--
> drivers/bus/mips_cdmm.c | 4 ++--
> drivers/bus/sunxi-rsb.c | 7 ++++++-
> drivers/cxl/core/memdev.c | 4 ++--
> drivers/cxl/core/port.c | 8 ++++----
> drivers/cxl/cxl.h | 4 ++--
> drivers/cxl/cxlmem.h | 2 +-
> drivers/dax/bus.c | 2 +-
> drivers/eisa/eisa-bus.c | 4 ++--
> drivers/firewire/core-device.c | 8 ++++----
> drivers/firmware/arm_ffa/bus.c | 4 ++--
> drivers/fpga/dfl.c | 4 ++--
> drivers/fsi/fsi-core.c | 6 +++---
> drivers/gpu/drm/display/drm_dp_aux_bus.c | 7 ++++++-
> drivers/gpu/drm/drm_mipi_dsi.c | 4 ++--
> drivers/gpu/host1x/bus.c | 2 +-
> drivers/greybus/core.c | 14 +++++++-------
> drivers/hid/hid-core.c | 4 ++--
> drivers/hid/intel-ish-hid/ishtp/bus.c | 2 +-
> drivers/hsi/hsi_core.c | 2 +-
> drivers/hv/vmbus_drv.c | 4 ++--
> drivers/hwtracing/intel_th/core.c | 6 +++---
> drivers/hwtracing/intel_th/intel_th.h | 4 ++--
> drivers/i2c/i2c-core-base.c | 4 ++--
> drivers/i3c/device.c | 14 +-------------
> drivers/i3c/master.c | 4 ++--
> drivers/input/input.c | 16 ++++++++--------
> drivers/input/serio/serio.c | 4 ++--
> drivers/ipack/ipack.c | 4 ++--
> drivers/macintosh/macio_asic.c | 7 ++++++-
> drivers/mcb/mcb-core.c | 4 ++--
> drivers/media/rc/rc-main.c | 2 +-
> drivers/memstick/core/memstick.c | 6 +++---
> drivers/misc/mei/bus.c | 4 ++--
> drivers/misc/tifm_core.c | 4 ++--
> drivers/mmc/core/bus.c | 4 ++--
> drivers/mmc/core/sdio_bus.c | 4 ++--
> drivers/net/phy/mdio_bus.c | 2 +-
> drivers/net/xen-netback/xenbus.c | 2 +-
> drivers/nvdimm/bus.c | 4 ++--
> drivers/nvdimm/dax_devs.c | 2 +-
> drivers/nvdimm/dimm_devs.c | 2 +-
> drivers/nvdimm/nd-core.h | 10 +++++-----
> drivers/nvdimm/nd.h | 4 ++--
> drivers/nvdimm/region_devs.c | 4 ++--
> drivers/of/device.c | 4 ++--
> drivers/pci/pci-driver.c | 4 ++--
> drivers/pcmcia/ds.c | 4 ++--
> drivers/platform/surface/aggregator/bus.c | 4 ++--
> drivers/platform/x86/wmi.c | 15 ++++-----------
> drivers/rapidio/rio-driver.c | 4 ++--
> drivers/rpmsg/rpmsg_core.c | 4 ++--
> drivers/s390/cio/css.c | 4 ++--
> drivers/s390/cio/device.c | 8 ++++----
> drivers/s390/cio/scm.c | 2 +-
> drivers/s390/crypto/ap_bus.c | 4 ++--
> drivers/scsi/scsi_sysfs.c | 4 ++--
> drivers/slimbus/core.c | 4 ++--
> drivers/soc/qcom/apr.c | 4 ++--
> drivers/soundwire/bus_type.c | 4 ++--
> drivers/spi/spi.c | 2 +-
> drivers/spmi/spmi.c | 2 +-
> drivers/ssb/main.c | 4 ++--
> drivers/staging/greybus/gbphy.c | 14 +++++++-------
> drivers/tee/tee_core.c | 2 +-
> drivers/thunderbolt/switch.c | 4 ++--
> drivers/thunderbolt/tb.h | 2 +-
> drivers/thunderbolt/xdomain.c | 6 +++---
> drivers/tty/serdev/core.c | 2 +-
> drivers/usb/common/ulpi.c | 4 ++--
> drivers/usb/core/driver.c | 6 +++---
> drivers/usb/core/message.c | 8 ++++----
> drivers/usb/core/usb.c | 8 ++++----
> drivers/usb/phy/phy.c | 6 +++---
> drivers/usb/roles/class.c | 3 +--
> drivers/usb/typec/bus.c | 4 ++--
> drivers/usb/typec/class.c | 2 +-
> drivers/virtio/virtio.c | 4 ++--
> drivers/w1/w1.c | 10 +++++-----
> drivers/xen/pvcalls-back.c | 2 +-
> drivers/xen/xenbus/xenbus_probe_backend.c | 8 ++++----
> drivers/xen/xenbus/xenbus_probe_frontend.c | 4 ++--
> drivers/zorro/zorro-driver.c | 4 ++--
> fs/dlm/lockspace.c | 4 ++--
> fs/gfs2/sys.c | 6 +++---
> include/drm/drm_mipi_dsi.h | 5 +----
> include/linux/acpi.h | 4 ++--
> include/linux/device.h | 6 ++----
> include/linux/device/bus.h | 2 +-
> include/linux/firewire.h | 15 +++------------
> include/linux/hyperv.h | 5 +----
> include/linux/i3c/device.h | 11 +++++++++--
> include/linux/kobject.h | 2 +-
> include/linux/mcb.h | 5 +----
> include/linux/of_device.h | 4 ++--
> include/linux/soundwire/sdw_type.h | 2 +-
> include/linux/spi/spi.h | 2 +-
> include/linux/ssb/ssb.h | 2 +-
> include/linux/surface_aggregator/device.h | 5 +----
> include/linux/virtio.h | 5 +----
> include/sound/hdaudio.h | 2 +-
> include/xen/xenbus.h | 7 ++-----
> sound/aoa/soundbus/core.c | 6 +++---
> sound/hda/hda_bus_type.c | 2 +-
> sound/hda/hdac_device.c | 2 +-
> 126 files changed, 283 insertions(+), 309 deletions(-)
>
On 11/01/2023 12:30:04+0100, Greg Kroah-Hartman wrote:
> The driver core is changing to pass some pointers as const, so move
> dev_to_i3cdev() to use container_of_const() to handle this change.
> dev_to_i3cdev() now properly keeps the const-ness of the pointer passed
> into it, while as before it could be lost.
>
> Cc: Alexandre Belloni <[email protected]>
> Cc: [email protected]
> Signed-off-by: Greg Kroah-Hartman <[email protected]>
Acked-by: Alexandre Belloni <[email protected]>
> ---
> drivers/i3c/device.c | 12 ------------
> include/linux/i3c/device.h | 9 ++++++++-
> 2 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/i3c/device.c b/drivers/i3c/device.c
> index 9762630b917e..d111499061b2 100644
> --- a/drivers/i3c/device.c
> +++ b/drivers/i3c/device.c
> @@ -208,18 +208,6 @@ struct device *i3cdev_to_dev(struct i3c_device *i3cdev)
> }
> EXPORT_SYMBOL_GPL(i3cdev_to_dev);
>
> -/**
> - * dev_to_i3cdev() - Returns the I3C device containing @dev
> - * @dev: device object
> - *
> - * Return: a pointer to an I3C device object.
> - */
> -struct i3c_device *dev_to_i3cdev(struct device *dev)
> -{
> - return container_of(dev, struct i3c_device, dev);
> -}
> -EXPORT_SYMBOL_GPL(dev_to_i3cdev);
> -
> /**
> * i3c_device_match_id() - Returns the i3c_device_id entry matching @i3cdev
> * @i3cdev: I3C device
> diff --git a/include/linux/i3c/device.h b/include/linux/i3c/device.h
> index 1c997abe868c..68b558929aec 100644
> --- a/include/linux/i3c/device.h
> +++ b/include/linux/i3c/device.h
> @@ -186,7 +186,14 @@ static inline struct i3c_driver *drv_to_i3cdrv(struct device_driver *drv)
> }
>
> struct device *i3cdev_to_dev(struct i3c_device *i3cdev);
> -struct i3c_device *dev_to_i3cdev(struct device *dev);
> +
> +/**
> + * dev_to_i3cdev() - Returns the I3C device containing @dev
> + * @dev: device object
> + *
> + * Return: a pointer to an I3C device object.
> + */
> +#define dev_to_i3cdev(__dev) container_of_const(__dev, struct i3c_device, dev)
>
> const struct i3c_device_id *
> i3c_device_match_id(struct i3c_device *i3cdev,
> --
> 2.39.0
>
--
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com