Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

virtio: store owner from modules with register_virtio_driver()

Modules registering driver with register_virtio_driver() might forget to
set .owner field. i2c-virtio.c for example has it missing. The field
is used by some other kernel parts for reference counting
(try_module_get()), so it is expected that drivers will set it.

Solve the problem by moving this task away from the drivers to the core
virtio code, just like we did for platform_driver in
commit 9447057eaff8 ("platform_device: use a macro instead of
platform_driver_register").

Fixes: 3cfc88380413 ("i2c: virtio: add a virtio i2c frontend driver")
Cc: "Jie Deng" <jie.deng@intel.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Message-Id: <20240331-module-owner-virtio-v2-1-98f04bfaf46a@linaro.org>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

authored by

Krzysztof Kozlowski and committed by
Michael S. Tsirkin
ffe6176b df9ace76

+9 -5
-1
Documentation/driver-api/virtio/writing_virtio_drivers.rst
··· 97 97 98 98 static struct virtio_driver virtio_dummy_driver = { 99 99 .driver.name = KBUILD_MODNAME, 100 - .driver.owner = THIS_MODULE, 101 100 .id_table = id_table, 102 101 .probe = virtio_dummy_probe, 103 102 .remove = virtio_dummy_remove,
+4 -2
drivers/virtio/virtio.c
··· 362 362 .remove = virtio_dev_remove, 363 363 }; 364 364 365 - int register_virtio_driver(struct virtio_driver *driver) 365 + int __register_virtio_driver(struct virtio_driver *driver, struct module *owner) 366 366 { 367 367 /* Catch this early. */ 368 368 BUG_ON(driver->feature_table_size && !driver->feature_table); 369 369 driver->driver.bus = &virtio_bus; 370 + driver->driver.owner = owner; 371 + 370 372 return driver_register(&driver->driver); 371 373 } 372 - EXPORT_SYMBOL_GPL(register_virtio_driver); 374 + EXPORT_SYMBOL_GPL(__register_virtio_driver); 373 375 374 376 void unregister_virtio_driver(struct virtio_driver *driver) 375 377 {
+5 -2
include/linux/virtio.h
··· 170 170 171 171 /** 172 172 * struct virtio_driver - operations for a virtio I/O driver 173 - * @driver: underlying device driver (populate name and owner). 173 + * @driver: underlying device driver (populate name). 174 174 * @id_table: the ids serviced by this driver. 175 175 * @feature_table: an array of feature numbers supported by this driver. 176 176 * @feature_table_size: number of entries in the feature table array. ··· 208 208 return container_of(drv, struct virtio_driver, driver); 209 209 } 210 210 211 - int register_virtio_driver(struct virtio_driver *drv); 211 + /* use a macro to avoid include chaining to get THIS_MODULE */ 212 + #define register_virtio_driver(drv) \ 213 + __register_virtio_driver(drv, THIS_MODULE) 214 + int __register_virtio_driver(struct virtio_driver *drv, struct module *owner); 212 215 void unregister_virtio_driver(struct virtio_driver *drv); 213 216 214 217 /* module_virtio_driver() - Helper macro for drivers that don't do