| Message ID | 20220316192010.19001-3-rdunlap@infradead.org |
|---|---|
| State | New |
| Headers | show |
| Series | treewide: eliminate anonymous module_init & module_exit | expand |
On 3/17/22 08:47, Amit Shah wrote: > On Wed, 2022-03-16 at 12:20 -0700, Randy Dunlap wrote: >> Eliminate anonymous module_init() and module_exit(), which can lead to >> confusion or ambiguity when reading System.map, crashes/oops/bugs, >> or an initcall_debug log. >> >> Give each of these init and exit functions unique driver-specific >> names to eliminate the anonymous names. >> >> Example 1: (System.map) >> ffffffff832fc78c t init >> ffffffff832fc79e t init >> ffffffff832fc8f8 t init >> >> Example 2: (initcall_debug log) >> calling init+0x0/0x12 @ 1 >> initcall init+0x0/0x12 returned 0 after 15 usecs >> calling init+0x0/0x60 @ 1 >> initcall init+0x0/0x60 returned 0 after 2 usecs >> calling init+0x0/0x9a @ 1 >> initcall init+0x0/0x9a returned 0 after 74 usecs >> >> Fixes: 31610434bc35 ("Virtio console driver") >> Fixes: 7177876fea83 ("virtio: console: Add ability to remove module") >> Signed-off-by: Randy Dunlap < >> rdunlap@infradead.org >>> >> Cc: Amit Shah < >> amit@kernel.org >>> >> Cc: >> virtualization@lists.linux-foundation.org >> >> Cc: Arnd Bergmann < >> arnd@arndb.de >>> >> Cc: Greg Kroah-Hartman < >> gregkh@linuxfoundation.org >>> >> --- >> drivers/char/virtio_console.c | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) > > Reviewed-by: Amit Shah <amit@kernel.org> > > I don't think the Fixes-by really applies here, though - we don't > really want to push this into stable, nor do we want any automated > tools to pick this up because of that tag.. Yeah, I'm fine with that. thanks.
--- lnx-517-rc8.orig/drivers/char/virtio_console.c +++ lnx-517-rc8/drivers/char/virtio_console.c @@ -2245,7 +2245,7 @@ static struct virtio_driver virtio_rproc .remove = virtcons_remove, }; -static int __init init(void) +static int __init virtio_console_init(void) { int err; @@ -2280,7 +2280,7 @@ free: return err; } -static void __exit fini(void) +static void __exit virtio_console_fini(void) { reclaim_dma_bufs(); @@ -2290,8 +2290,8 @@ static void __exit fini(void) class_destroy(pdrvdata.class); debugfs_remove_recursive(pdrvdata.debugfs_dir); } -module_init(init); -module_exit(fini); +module_init(virtio_console_init); +module_exit(virtio_console_fini); MODULE_DESCRIPTION("Virtio console driver"); MODULE_LICENSE("GPL");
Eliminate anonymous module_init() and module_exit(), which can lead to confusion or ambiguity when reading System.map, crashes/oops/bugs, or an initcall_debug log. Give each of these init and exit functions unique driver-specific names to eliminate the anonymous names. Example 1: (System.map) ffffffff832fc78c t init ffffffff832fc79e t init ffffffff832fc8f8 t init Example 2: (initcall_debug log) calling init+0x0/0x12 @ 1 initcall init+0x0/0x12 returned 0 after 15 usecs calling init+0x0/0x60 @ 1 initcall init+0x0/0x60 returned 0 after 2 usecs calling init+0x0/0x9a @ 1 initcall init+0x0/0x9a returned 0 after 74 usecs Fixes: 31610434bc35 ("Virtio console driver") Fixes: 7177876fea83 ("virtio: console: Add ability to remove module") Signed-off-by: Randy Dunlap <rdunlap@infradead.org> Cc: Amit Shah <amit@kernel.org> Cc: virtualization@lists.linux-foundation.org Cc: Arnd Bergmann <arnd@arndb.de> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- drivers/char/virtio_console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)