Skip to content

Commit ffe6176

Browse files
krzkmstsirkin
authored andcommitted
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 9447057 ("platform_device: use a macro instead of platform_driver_register"). Fixes: 3cfc883 ("i2c: virtio: add a virtio i2c frontend driver") Cc: "Jie Deng" <[email protected]> Signed-off-by: Krzysztof Kozlowski <[email protected]> Message-Id: <[email protected]> Signed-off-by: Michael S. Tsirkin <[email protected]>
1 parent df9ace7 commit ffe6176

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

Documentation/driver-api/virtio/writing_virtio_drivers.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ like this::
9797

9898
static struct virtio_driver virtio_dummy_driver = {
9999
.driver.name = KBUILD_MODNAME,
100-
.driver.owner = THIS_MODULE,
101100
.id_table = id_table,
102101
.probe = virtio_dummy_probe,
103102
.remove = virtio_dummy_remove,

drivers/virtio/virtio.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,14 +362,16 @@ static const struct bus_type virtio_bus = {
362362
.remove = virtio_dev_remove,
363363
};
364364

365-
int register_virtio_driver(struct virtio_driver *driver)
365+
int __register_virtio_driver(struct virtio_driver *driver, struct module *owner)
366366
{
367367
/* Catch this early. */
368368
BUG_ON(driver->feature_table_size && !driver->feature_table);
369369
driver->driver.bus = &virtio_bus;
370+
driver->driver.owner = owner;
371+
370372
return driver_register(&driver->driver);
371373
}
372-
EXPORT_SYMBOL_GPL(register_virtio_driver);
374+
EXPORT_SYMBOL_GPL(__register_virtio_driver);
373375

374376
void unregister_virtio_driver(struct virtio_driver *driver)
375377
{

include/linux/virtio.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ size_t virtio_max_dma_size(const struct virtio_device *vdev);
170170

171171
/**
172172
* 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).
174174
* @id_table: the ids serviced by this driver.
175175
* @feature_table: an array of feature numbers supported by this driver.
176176
* @feature_table_size: number of entries in the feature table array.
@@ -208,7 +208,10 @@ static inline struct virtio_driver *drv_to_virtio(struct device_driver *drv)
208208
return container_of(drv, struct virtio_driver, driver);
209209
}
210210

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);
212215
void unregister_virtio_driver(struct virtio_driver *drv);
213216

214217
/* module_virtio_driver() - Helper macro for drivers that don't do

0 commit comments

Comments
 (0)