Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 0/9] treewide: eliminate anonymous module_init & module_exit
There are a number of drivers that use "module_init(init)" and "module_exit(exit)", which are anonymous names and 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 ffffffff832fca05 t init ffffffff832fcbd2 t init ffffffff83328f0e t init ffffffff8332c5b1 t init ffffffff8332d9eb t init ffffffff8332f0aa t init ffffffff83330e25 t init ffffffff833317a5 t init ffffffff8333dd6b 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 calling init+0x0/0x73 @ 1 initcall init+0x0/0x73 returned 0 after 6 usecs calling init+0x0/0x73 @ 1 initcall init+0x0/0x73 returned 0 after 4 usecs calling init+0x0/0xf5 @ 1 initcall init+0x0/0xf5 returned 0 after 27 usecs calling init+0x0/0x7d @ 1 initcall init+0x0/0x7d returned 0 after 11 usecs calling init+0x0/0xc9 @ 1 initcall init+0x0/0xc9 returned 0 after 19 usecs calling init+0x0/0x9d @ 1 initcall init+0x0/0x9d returned 0 after 37 usecs calling init+0x0/0x63f @ 1 initcall init+0x0/0x63f returned 0 after 411 usecs calling init+0x0/0x171 @ 1 initcall init+0x0/0x171 returned 0 after 61 usecs calling init+0x0/0xef @ 1 initcall init+0x0/0xef returned 0 after 3 usecs Cc: "Michael S. Tsirkin" <mst at redhat.com> Cc: Jason Wang <jasowang at redhat.com> Cc: Paolo Bonzini <pbonzini at redhat.com> Cc: Stefan Hajnoczi <stefanha at redhat.com> Cc: Jens Axboe <axboe at kernel.dk> Cc: Amit Shah <amit at kernel.org> Cc: Arnd Bergmann <arnd at arndb.de> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> Cc: Eli Cohen <eli at mellanox.com> Cc: Saeed Mahameed <saeedm at nvidia.com> Cc: Leon Romanovsky <leon at kernel.org> Cc: Pablo Neira Ayuso <pablo at netfilter.org> Cc: Jozsef Kadlecsik <kadlec at netfilter.org> Cc: Florian Westphal <fw at strlen.de> Cc: "David S. Miller" <davem at davemloft.net> Cc: Jakub Kicinski <kuba at kernel.org> Cc: "James E.J. Bottomley" <jejb at linux.ibm.com> Cc: "Martin K. Petersen" <martin.petersen at oracle.com> Cc: Felipe Balbi <felipe.balbi at linux.intel.com> Cc: Micha? Miros?aw <mirq-linux at rere.qmqm.pl> Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de> Cc: Krzysztof Opasiak <k.opasiak at samsung.com> Cc: Igor Kotrasinski <i.kotrasinsk at samsung.com> Cc: Valentina Manea <valentina.manea.m at gmail.com> Cc: Shuah Khan <shuah at kernel.org> Cc: Shuah Khan <skhan at linuxfoundation.org> Cc: Jussi Kivilinna <jussi.kivilinna at mbnet.fi> Cc: Joachim Fritschi <jfritschi at freenet.de> Cc: Herbert Xu <herbert at gondor.apana.org.au> Cc: Thomas Gleixner <tglx at linutronix.de> Cc: Steven Rostedt <rostedt at goodmis.org> Cc: Ingo Molnar <mingo at kernel.org> Cc: Karol Herbst <karolherbst at gmail.com> Cc: Pekka Paalanen <ppaalanen at gmail.com> Cc: Dave Hansen <dave.hansen at linux.intel.com> Cc: Andy Lutomirski <luto at kernel.org> Cc: Peter Zijlstra <peterz at infradead.org> Cc: Borislav Petkov <bp at alien8.de> Cc: "H. Peter Anvin" <hpa at zytor.com> Cc: netfilter-devel at vger.kernel.org Cc: coreteam at netfilter.org Cc: netdev at vger.kernel.org Cc: linux-block at vger.kernel.org Cc: linux-crypto at vger.kernel.org Cc: linux-rdma at vger.kernel.org Cc: linux-scsi at vger.kernel.org Cc: linux-usb at vger.kernel.org Cc: nouveau at lists.freedesktop.org Cc: virtualization at lists.linux-foundation.org Cc: x86 at kernel.org patches: [PATCH 1/9] virtio_blk: eliminate anonymous module_init & module_exit [PATCH 2/9] virtio_console: eliminate anonymous module_init & module_exit [PATCH 3/9] net: mlx5: eliminate anonymous module_init & module_exit [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit [PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit [PATCH 6/9] usb: gadget: eliminate anonymous module_init & module_exit [PATCH 7/9] usb: usbip: eliminate anonymous module_init & module_exit [PATCH 8/9] x86/crypto: eliminate anonymous module_init & module_exit [PATCH 9/9] testmmiotrace: eliminate anonymous module_init & module_exit diffstat: arch/x86/crypto/blowfish_glue.c | 8 ++++---- arch/x86/crypto/camellia_glue.c | 8 ++++---- arch/x86/crypto/serpent_avx2_glue.c | 8 ++++---- arch/x86/crypto/twofish_glue.c | 8 ++++---- arch/x86/crypto/twofish_glue_3way.c | 8 ++++---- arch/x86/mm/testmmiotrace.c | 8 ++++---- drivers/block/virtio_blk.c | 8 ++++---- drivers/char/virtio_console.c | 8 ++++---- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 ++++---- drivers/scsi/virtio_scsi.c | 8 ++++---- drivers/usb/gadget/legacy/inode.c | 8 ++++---- drivers/usb/gadget/legacy/serial.c | 10 +++++----- drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- drivers/usb/usbip/vudc_main.c | 8 ++++---- net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- 15 files changed, 61 insertions(+), 61 deletions(-)
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 1/9] virtio_blk: eliminate anonymous module_init & module_exit
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: e467cde23818 ("Block driver using virtio.") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: "Michael S. Tsirkin" <mst at redhat.com> Cc: Jason Wang <jasowang at redhat.com> Cc: Paolo Bonzini <pbonzini at redhat.com> Cc: Stefan Hajnoczi <stefanha at redhat.com> Cc: virtualization at lists.linux-foundation.org Cc: Jens Axboe <axboe at kernel.dk> Cc: linux-block at vger.kernel.org --- drivers/block/virtio_blk.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lnx-517-rc8.orig/drivers/block/virtio_blk.c +++ lnx-517-rc8/drivers/block/virtio_blk.c @@ -1058,7 +1058,7 @@ static struct virtio_driver virtio_blk #endif }; -static int __init init(void) +static int __init virtio_blk_init(void) { int error; @@ -1084,14 +1084,14 @@ out_destroy_workqueue: return error; } -static void __exit fini(void) +static void __exit virtio_blk_fini(void) { unregister_virtio_driver(&virtio_blk); unregister_blkdev(major, "virtblk"); destroy_workqueue(virtblk_wq); } -module_init(init); -module_exit(fini); +module_init(virtio_blk_init); +module_exit(virtio_blk_fini); MODULE_DEVICE_TABLE(virtio, id_table); MODULE_DESCRIPTION("Virtio block driver");
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 2/9] virtio_console: eliminate anonymous module_init & module_exit
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 at infradead.org> Cc: Amit Shah <amit at kernel.org> Cc: virtualization at lists.linux-foundation.org Cc: Arnd Bergmann <arnd at arndb.de> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> --- drivers/char/virtio_console.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- 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");
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 3/9] net: mlx5: eliminate anonymous module_init & module_exit
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: e126ba97dba9 ("mlx5: Add driver for Mellanox Connect-IB adapters") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Eli Cohen <eli at mellanox.com> Cc: Saeed Mahameed <saeedm at nvidia.com> Cc: netdev at vger.kernel.org Cc: Leon Romanovsky <leon at kernel.org> Cc: linux-rdma at vger.kernel.org --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lnx-517-rc8.orig/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ lnx-517-rc8/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1893,7 +1893,7 @@ static void mlx5_core_verify_params(void } } -static int __init init(void) +static int __init mlx5_init(void) { int err; @@ -1929,7 +1929,7 @@ err_debug: return err; } -static void __exit cleanup(void) +static void __exit mlx5_cleanup(void) { mlx5e_cleanup(); mlx5_sf_driver_unregister(); @@ -1937,5 +1937,5 @@ static void __exit cleanup(void) mlx5_unregister_debugfs(); } -module_init(init); -module_exit(cleanup); +module_init(mlx5_init); +module_exit(mlx5_cleanup);
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit
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: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Pablo Neira Ayuso <pablo at netfilter.org> Cc: Jozsef Kadlecsik <kadlec at netfilter.org> Cc: Florian Westphal <fw at strlen.de> Cc: netfilter-devel at vger.kernel.org Cc: coreteam at netfilter.org Cc: "David S. Miller" <davem at davemloft.net> Cc: Jakub Kicinski <kuba at kernel.org> Cc: netdev at vger.kernel.org --- net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call }; /****************************************************************************/ -static int __init init(void) +static int __init nf_nat_h323_init(void) { BUG_ON(set_h245_addr_hook != NULL); BUG_ON(set_h225_addr_hook != NULL); @@ -607,7 +607,7 @@ static int __init init(void) } /****************************************************************************/ -static void __exit fini(void) +static void __exit nf_nat_h323_fini(void) { RCU_INIT_POINTER(set_h245_addr_hook, NULL); RCU_INIT_POINTER(set_h225_addr_hook, NULL); @@ -624,8 +624,8 @@ static void __exit fini(void) } /****************************************************************************/ -module_init(init); -module_exit(fini); +module_init(nf_nat_h323_init); +module_exit(nf_nat_h323_fini); MODULE_AUTHOR("Jing Min Zhao <zhaojingmin at users.sourceforge.net>"); MODULE_DESCRIPTION("H.323 NAT helper");
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit
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: 4fe74b1cb051 ("[SCSI] virtio-scsi: SCSI driver for QEMU based virtual machines") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: "Michael S. Tsirkin" <mst at redhat.com> Cc: Jason Wang <jasowang at redhat.com> Cc: Paolo Bonzini <pbonzini at redhat.com> Cc: Stefan Hajnoczi <stefanha at redhat.com> Cc: "James E.J. Bottomley" <jejb at linux.ibm.com> Cc: "Martin K. Petersen" <martin.petersen at oracle.com> Cc: linux-scsi at vger.kernel.org Cc: virtualization at lists.linux-foundation.org --- drivers/scsi/virtio_scsi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lnx-517-rc8.orig/drivers/scsi/virtio_scsi.c +++ lnx-517-rc8/drivers/scsi/virtio_scsi.c @@ -988,7 +988,7 @@ static struct virtio_driver virtio_scsi_ .remove = virtscsi_remove, }; -static int __init init(void) +static int __init virtio_scsi_init(void) { int ret = -ENOMEM; @@ -1020,14 +1020,14 @@ error: return ret; } -static void __exit fini(void) +static void __exit virtio_scsi_fini(void) { unregister_virtio_driver(&virtio_scsi_driver); mempool_destroy(virtscsi_cmd_pool); kmem_cache_destroy(virtscsi_cmd_cache); } -module_init(init); -module_exit(fini); +module_init(virtio_scsi_init); +module_exit(virtio_scsi_fini); MODULE_DEVICE_TABLE(virtio, id_table); MODULE_DESCRIPTION("Virtio SCSI HBA driver");
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 6/9] usb: gadget: eliminate anonymous module_init & module_exit
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: bd25a14edb75 ("usb: gadget: legacy/serial: allow dynamic removal") Fixes: 7bb5ea54be47 ("usb gadget serial: use composite gadget framework") Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Felipe Balbi <felipe.balbi at linux.intel.com> Cc: Micha? Miros?aw <mirq-linux at rere.qmqm.pl> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de> Cc: linux-usb at vger.kernel.org --- drivers/usb/gadget/legacy/inode.c | 8 ++++---- drivers/usb/gadget/legacy/serial.c | 10 +++++----- drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- 3 files changed, 13 insertions(+), 13 deletions(-) --- lnx-517-rc8.orig/drivers/usb/gadget/legacy/serial.c +++ lnx-517-rc8/drivers/usb/gadget/legacy/serial.c @@ -273,7 +273,7 @@ static struct usb_composite_driver gseri static int switch_gserial_enable(bool do_enable) { if (!serial_config_driver.label) - /* init() was not called, yet */ + /* gserial_init() was not called, yet */ return 0; if (do_enable) @@ -283,7 +283,7 @@ static int switch_gserial_enable(bool do return 0; } -static int __init init(void) +static int __init gserial_init(void) { /* We *could* export two configs; that'd be much cleaner... * but neither of these product IDs was defined that way. @@ -314,11 +314,11 @@ static int __init init(void) return usb_composite_probe(&gserial_driver); } -module_init(init); +module_init(gserial_init); -static void __exit cleanup(void) +static void __exit gserial_cleanup(void) { if (enable) usb_composite_unregister(&gserial_driver); } -module_exit(cleanup); +module_exit(gserial_cleanup); --- lnx-517-rc8.orig/drivers/usb/gadget/udc/dummy_hcd.c +++ lnx-517-rc8/drivers/usb/gadget/udc/dummy_hcd.c @@ -2765,7 +2765,7 @@ static struct platform_driver dummy_hcd_ static struct platform_device *the_udc_pdev[MAX_NUM_UDC]; static struct platform_device *the_hcd_pdev[MAX_NUM_UDC]; -static int __init init(void) +static int __init dummy_hcd_init(void) { int retval = -ENOMEM; int i; @@ -2887,9 +2887,9 @@ err_alloc_udc: platform_device_put(the_hcd_pdev[i]); return retval; } -module_init(init); +module_init(dummy_hcd_init); -static void __exit cleanup(void) +static void __exit dummy_hcd_cleanup(void) { int i; @@ -2905,4 +2905,4 @@ static void __exit cleanup(void) platform_driver_unregister(&dummy_udc_driver); platform_driver_unregister(&dummy_hcd_driver); } -module_exit(cleanup); +module_exit(dummy_hcd_cleanup); --- lnx-517-rc8.orig/drivers/usb/gadget/legacy/inode.c +++ lnx-517-rc8/drivers/usb/gadget/legacy/inode.c @@ -2101,7 +2101,7 @@ MODULE_ALIAS_FS("gadgetfs"); /*----------------------------------------------------------------------*/ -static int __init init (void) +static int __init gadgetfs_init (void) { int status; @@ -2111,12 +2111,12 @@ static int __init init (void) shortname, driver_desc); return status; } -module_init (init); +module_init (gadgetfs_init); -static void __exit cleanup (void) +static void __exit gadgetfs_cleanup (void) { pr_debug ("unregister %s\n", shortname); unregister_filesystem (&gadgetfs_type); } -module_exit (cleanup); +module_exit (gadgetfs_cleanup);
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 7/9] usb: usbip: eliminate anonymous module_init & module_exit
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: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Krzysztof Opasiak <k.opasiak at samsung.com> Cc: Igor Kotrasinski <i.kotrasinsk at samsung.com> Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> Cc: Valentina Manea <valentina.manea.m at gmail.com> Cc: Shuah Khan <shuah at kernel.org> Cc: Shuah Khan <skhan at linuxfoundation.org> Cc: linux-usb at vger.kernel.org --- drivers/usb/usbip/vudc_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lnx-517-rc8.orig/drivers/usb/usbip/vudc_main.c +++ lnx-517-rc8/drivers/usb/usbip/vudc_main.c @@ -28,7 +28,7 @@ static struct platform_driver vudc_drive static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); -static int __init init(void) +static int __init vudc_init(void) { int retval = -ENOMEM; int i; @@ -86,9 +86,9 @@ cleanup: out: return retval; } -module_init(init); +module_init(vudc_init); -static void __exit cleanup(void) +static void __exit vudc_cleanup(void) { struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; @@ -103,7 +103,7 @@ static void __exit cleanup(void) } platform_driver_unregister(&vudc_driver); } -module_exit(cleanup); +module_exit(vudc_cleanup); MODULE_DESCRIPTION("USB over IP Device Controller"); MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski");
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 8/9] x86/crypto: eliminate anonymous module_init & module_exit
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: 64b94ceae8c1 ("crypto: blowfish - add x86_64 assembly implementation") Fixes: 676a38046f4f ("crypto: camellia-x86_64 - module init/exit functions should be static") Fixes: 0b95ec56ae19 ("crypto: camellia - add assembler implementation for x86_64") Fixes: 56d76c96a9f3 ("crypto: serpent - add AVX2/x86_64 assembler implementation of serpent cipher") Fixes: b9f535ffe38f ("[CRYPTO] twofish: i586 assembly version") Fixes: ff0a70fe0536 ("crypto: twofish-x86_64-3way - module init/exit functions should be static") Fixes: 8280daad436e ("crypto: twofish - add 3-way parallel x86_64 assembler implemention") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Jussi Kivilinna <jussi.kivilinna at mbnet.fi> Cc: Joachim Fritschi <jfritschi at freenet.de> Cc: Herbert Xu <herbert at gondor.apana.org.au> Cc: "David S. Miller" <davem at davemloft.net> Cc: linux-crypto at vger.kernel.org Cc: x86 at kernel.org --- arch/x86/crypto/blowfish_glue.c | 8 ++++---- arch/x86/crypto/camellia_glue.c | 8 ++++---- arch/x86/crypto/serpent_avx2_glue.c | 8 ++++---- arch/x86/crypto/twofish_glue.c | 8 ++++---- arch/x86/crypto/twofish_glue_3way.c | 8 ++++---- 5 files changed, 20 insertions(+), 20 deletions(-) --- lnx-517-rc8.orig/arch/x86/crypto/blowfish_glue.c +++ lnx-517-rc8/arch/x86/crypto/blowfish_glue.c @@ -315,7 +315,7 @@ static int force; module_param(force, int, 0); MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); -static int __init init(void) +static int __init blowfish_init(void) { int err; @@ -339,15 +339,15 @@ static int __init init(void) return err; } -static void __exit fini(void) +static void __exit blowfish_fini(void) { crypto_unregister_alg(&bf_cipher_alg); crypto_unregister_skciphers(bf_skcipher_algs, ARRAY_SIZE(bf_skcipher_algs)); } -module_init(init); -module_exit(fini); +module_init(blowfish_init); +module_exit(blowfish_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Blowfish Cipher Algorithm, asm optimized"); --- lnx-517-rc8.orig/arch/x86/crypto/camellia_glue.c +++ lnx-517-rc8/arch/x86/crypto/camellia_glue.c @@ -1377,7 +1377,7 @@ static int force; module_param(force, int, 0); MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); -static int __init init(void) +static int __init camellia_init(void) { int err; @@ -1401,15 +1401,15 @@ static int __init init(void) return err; } -static void __exit fini(void) +static void __exit camellia_fini(void) { crypto_unregister_alg(&camellia_cipher_alg); crypto_unregister_skciphers(camellia_skcipher_algs, ARRAY_SIZE(camellia_skcipher_algs)); } -module_init(init); -module_exit(fini); +module_init(camellia_init); +module_exit(camellia_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Camellia Cipher Algorithm, asm optimized"); --- lnx-517-rc8.orig/arch/x86/crypto/serpent_avx2_glue.c +++ lnx-517-rc8/arch/x86/crypto/serpent_avx2_glue.c @@ -96,7 +96,7 @@ static struct skcipher_alg serpent_algs[ static struct simd_skcipher_alg *serpent_simd_algs[ARRAY_SIZE(serpent_algs)]; -static int __init init(void) +static int __init serpent_avx2_init(void) { const char *feature_name; @@ -115,14 +115,14 @@ static int __init init(void) serpent_simd_algs); } -static void __exit fini(void) +static void __exit serpent_avx2_fini(void) { simd_unregister_skciphers(serpent_algs, ARRAY_SIZE(serpent_algs), serpent_simd_algs); } -module_init(init); -module_exit(fini); +module_init(serpent_avx2_init); +module_exit(serpent_avx2_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Serpent Cipher Algorithm, AVX2 optimized"); --- lnx-517-rc8.orig/arch/x86/crypto/twofish_glue.c +++ lnx-517-rc8/arch/x86/crypto/twofish_glue.c @@ -81,18 +81,18 @@ static struct crypto_alg alg = { } }; -static int __init init(void) +static int __init twofish_glue_init(void) { return crypto_register_alg(&alg); } -static void __exit fini(void) +static void __exit twofish_glue_fini(void) { crypto_unregister_alg(&alg); } -module_init(init); -module_exit(fini); +module_init(twofish_glue_init); +module_exit(twofish_glue_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION ("Twofish Cipher Algorithm, asm optimized"); --- lnx-517-rc8.orig/arch/x86/crypto/twofish_glue_3way.c +++ lnx-517-rc8/arch/x86/crypto/twofish_glue_3way.c @@ -140,7 +140,7 @@ static int force; module_param(force, int, 0); MODULE_PARM_DESC(force, "Force module load, ignore CPU blacklist"); -static int __init init(void) +static int __init twofish_3way_init(void) { if (!force && is_blacklisted_cpu()) { printk(KERN_INFO @@ -154,13 +154,13 @@ static int __init init(void) ARRAY_SIZE(tf_skciphers)); } -static void __exit fini(void) +static void __exit twofish_3way_fini(void) { crypto_unregister_skciphers(tf_skciphers, ARRAY_SIZE(tf_skciphers)); } -module_init(init); -module_exit(fini); +module_init(twofish_3way_init); +module_exit(twofish_3way_fini); MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Twofish Cipher Algorithm, 3-way parallel asm optimized");
Randy Dunlap
2022-Mar-16 19:20 UTC
[PATCH 9/9] testmmiotrace: eliminate anonymous module_init & module_exit
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: 8b7d89d02ef3 ("x86: mmiotrace - trace memory mapped IO") Signed-off-by: Randy Dunlap <rdunlap at infradead.org> Cc: Thomas Gleixner <tglx at linutronix.de> Cc: Steven Rostedt <rostedt at goodmis.org> Cc: Ingo Molnar <mingo at kernel.org> Cc: Karol Herbst <karolherbst at gmail.com> Cc: Pekka Paalanen <ppaalanen at gmail.com> Cc: Dave Hansen <dave.hansen at linux.intel.com> Cc: Andy Lutomirski <luto at kernel.org> Cc: Peter Zijlstra <peterz at infradead.org> Cc: Borislav Petkov <bp at alien8.de> Cc: "H. Peter Anvin" <hpa at zytor.com> Cc: nouveau at lists.freedesktop.org Cc: x86 at kernel.org --- arch/x86/mm/testmmiotrace.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- lnx-517-rc8.orig/arch/x86/mm/testmmiotrace.c +++ lnx-517-rc8/arch/x86/mm/testmmiotrace.c @@ -113,7 +113,7 @@ static void do_test_bulk_ioremapping(voi synchronize_rcu(); } -static int __init init(void) +static int __init testmmiotrace_init(void) { unsigned long size = (read_far) ? (8 << 20) : (16 << 10); int ret = security_locked_down(LOCKDOWN_MMIOTRACE); @@ -136,11 +136,11 @@ static int __init init(void) return 0; } -static void __exit cleanup(void) +static void __exit testmmiotrace_cleanup(void) { pr_debug("unloaded.\n"); } -module_init(init); -module_exit(cleanup); +module_init(testmmiotrace_init); +module_exit(testmmiotrace_cleanup); MODULE_LICENSE("GPL");
Ira Weiny
2022-Mar-17 03:32 UTC
[PATCH 0/9] treewide: eliminate anonymous module_init & module_exit
On Wed, Mar 16, 2022 at 12:20:01PM -0700, Randy Dunlap wrote:> There are a number of drivers that use "module_init(init)" and > "module_exit(exit)", which are anonymous names and 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.I'm not fully sure about the Fixes tags but I don't see that it hurts anything. For the series: Reviewed-by: Ira Weiny <ira.weiny at intel.com>> > Example 1: (System.map) > ffffffff832fc78c t init > ffffffff832fc79e t init > ffffffff832fc8f8 t init > ffffffff832fca05 t init > ffffffff832fcbd2 t init > ffffffff83328f0e t init > ffffffff8332c5b1 t init > ffffffff8332d9eb t init > ffffffff8332f0aa t init > ffffffff83330e25 t init > ffffffff833317a5 t init > ffffffff8333dd6b 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 > calling init+0x0/0x73 @ 1 > initcall init+0x0/0x73 returned 0 after 6 usecs > calling init+0x0/0x73 @ 1 > initcall init+0x0/0x73 returned 0 after 4 usecs > calling init+0x0/0xf5 @ 1 > initcall init+0x0/0xf5 returned 0 after 27 usecs > calling init+0x0/0x7d @ 1 > initcall init+0x0/0x7d returned 0 after 11 usecs > calling init+0x0/0xc9 @ 1 > initcall init+0x0/0xc9 returned 0 after 19 usecs > calling init+0x0/0x9d @ 1 > initcall init+0x0/0x9d returned 0 after 37 usecs > calling init+0x0/0x63f @ 1 > initcall init+0x0/0x63f returned 0 after 411 usecs > calling init+0x0/0x171 @ 1 > initcall init+0x0/0x171 returned 0 after 61 usecs > calling init+0x0/0xef @ 1 > initcall init+0x0/0xef returned 0 after 3 usecs > > Cc: "Michael S. Tsirkin" <mst at redhat.com> > Cc: Jason Wang <jasowang at redhat.com> > Cc: Paolo Bonzini <pbonzini at redhat.com> > Cc: Stefan Hajnoczi <stefanha at redhat.com> > Cc: Jens Axboe <axboe at kernel.dk> > Cc: Amit Shah <amit at kernel.org> > Cc: Arnd Bergmann <arnd at arndb.de> > Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> > Cc: Eli Cohen <eli at mellanox.com> > Cc: Saeed Mahameed <saeedm at nvidia.com> > Cc: Leon Romanovsky <leon at kernel.org> > Cc: Pablo Neira Ayuso <pablo at netfilter.org> > Cc: Jozsef Kadlecsik <kadlec at netfilter.org> > Cc: Florian Westphal <fw at strlen.de> > Cc: "David S. Miller" <davem at davemloft.net> > Cc: Jakub Kicinski <kuba at kernel.org> > Cc: "James E.J. Bottomley" <jejb at linux.ibm.com> > Cc: "Martin K. Petersen" <martin.petersen at oracle.com> > Cc: Felipe Balbi <felipe.balbi at linux.intel.com> > Cc: Micha? Miros?aw <mirq-linux at rere.qmqm.pl> > Cc: Sebastian Andrzej Siewior <bigeasy at linutronix.de> > Cc: Krzysztof Opasiak <k.opasiak at samsung.com> > Cc: Igor Kotrasinski <i.kotrasinsk at samsung.com> > Cc: Valentina Manea <valentina.manea.m at gmail.com> > Cc: Shuah Khan <shuah at kernel.org> > Cc: Shuah Khan <skhan at linuxfoundation.org> > Cc: Jussi Kivilinna <jussi.kivilinna at mbnet.fi> > Cc: Joachim Fritschi <jfritschi at freenet.de> > Cc: Herbert Xu <herbert at gondor.apana.org.au> > Cc: Thomas Gleixner <tglx at linutronix.de> > Cc: Steven Rostedt <rostedt at goodmis.org> > Cc: Ingo Molnar <mingo at kernel.org> > Cc: Karol Herbst <karolherbst at gmail.com> > Cc: Pekka Paalanen <ppaalanen at gmail.com> > Cc: Dave Hansen <dave.hansen at linux.intel.com> > Cc: Andy Lutomirski <luto at kernel.org> > Cc: Peter Zijlstra <peterz at infradead.org> > Cc: Borislav Petkov <bp at alien8.de> > Cc: "H. Peter Anvin" <hpa at zytor.com> > Cc: netfilter-devel at vger.kernel.org > Cc: coreteam at netfilter.org > Cc: netdev at vger.kernel.org > Cc: linux-block at vger.kernel.org > Cc: linux-crypto at vger.kernel.org > Cc: linux-rdma at vger.kernel.org > Cc: linux-scsi at vger.kernel.org > Cc: linux-usb at vger.kernel.org > Cc: nouveau at lists.freedesktop.org > Cc: virtualization at lists.linux-foundation.org > Cc: x86 at kernel.org > > patches: > [PATCH 1/9] virtio_blk: eliminate anonymous module_init & module_exit > [PATCH 2/9] virtio_console: eliminate anonymous module_init & module_exit > [PATCH 3/9] net: mlx5: eliminate anonymous module_init & module_exit > [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit > [PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit > [PATCH 6/9] usb: gadget: eliminate anonymous module_init & module_exit > [PATCH 7/9] usb: usbip: eliminate anonymous module_init & module_exit > [PATCH 8/9] x86/crypto: eliminate anonymous module_init & module_exit > [PATCH 9/9] testmmiotrace: eliminate anonymous module_init & module_exit > > diffstat: > arch/x86/crypto/blowfish_glue.c | 8 ++++---- > arch/x86/crypto/camellia_glue.c | 8 ++++---- > arch/x86/crypto/serpent_avx2_glue.c | 8 ++++---- > arch/x86/crypto/twofish_glue.c | 8 ++++---- > arch/x86/crypto/twofish_glue_3way.c | 8 ++++---- > arch/x86/mm/testmmiotrace.c | 8 ++++---- > drivers/block/virtio_blk.c | 8 ++++---- > drivers/char/virtio_console.c | 8 ++++---- > drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 ++++---- > drivers/scsi/virtio_scsi.c | 8 ++++---- > drivers/usb/gadget/legacy/inode.c | 8 ++++---- > drivers/usb/gadget/legacy/serial.c | 10 +++++----- > drivers/usb/gadget/udc/dummy_hcd.c | 8 ++++---- > drivers/usb/usbip/vudc_main.c | 8 ++++---- > net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- > 15 files changed, 61 insertions(+), 61 deletions(-)
Pablo Neira Ayuso
2022-Mar-17 15:49 UTC
[Nouveau] [PATCH 4/9] netfilter: h323: eliminate anonymous module_init & module_exit
On Wed, Mar 16, 2022 at 12:20:05PM -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 usecsLGTM. Should I route this through the netfilter tree?> Fixes: f587de0e2feb ("[NETFILTER]: nf_conntrack/nf_nat: add H.323 helper port") > Signed-off-by: Randy Dunlap <rdunlap at infradead.org> > Cc: Pablo Neira Ayuso <pablo at netfilter.org> > Cc: Jozsef Kadlecsik <kadlec at netfilter.org> > Cc: Florian Westphal <fw at strlen.de> > Cc: netfilter-devel at vger.kernel.org > Cc: coreteam at netfilter.org > Cc: "David S. Miller" <davem at davemloft.net> > Cc: Jakub Kicinski <kuba at kernel.org> > Cc: netdev at vger.kernel.org > --- > net/ipv4/netfilter/nf_nat_h323.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- lnx-517-rc8.orig/net/ipv4/netfilter/nf_nat_h323.c > +++ lnx-517-rc8/net/ipv4/netfilter/nf_nat_h323.c > @@ -580,7 +580,7 @@ static struct nf_ct_helper_expectfn call > }; > > /****************************************************************************/ > -static int __init init(void) > +static int __init nf_nat_h323_init(void) > { > BUG_ON(set_h245_addr_hook != NULL); > BUG_ON(set_h225_addr_hook != NULL); > @@ -607,7 +607,7 @@ static int __init init(void) > } > > /****************************************************************************/ > -static void __exit fini(void) > +static void __exit nf_nat_h323_fini(void) > { > RCU_INIT_POINTER(set_h245_addr_hook, NULL); > RCU_INIT_POINTER(set_h225_addr_hook, NULL); > @@ -624,8 +624,8 @@ static void __exit fini(void) > } > > /****************************************************************************/ > -module_init(init); > -module_exit(fini); > +module_init(nf_nat_h323_init); > +module_exit(nf_nat_h323_fini); > > MODULE_AUTHOR("Jing Min Zhao <zhaojingmin at users.sourceforge.net>"); > MODULE_DESCRIPTION("H.323 NAT helper");
Jens Axboe
2022-Mar-17 16:11 UTC
(subset) [PATCH 0/9] treewide: eliminate anonymous module_init & module_exit
On Wed, 16 Mar 2022 12:20:01 -0700, Randy Dunlap wrote:> There are a number of drivers that use "module_init(init)" and > "module_exit(exit)", which are anonymous names and 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. > > [...]Applied, thanks! [1/9] virtio_blk: eliminate anonymous module_init & module_exit commit: bcfe9b6cbb4438b8c1cc4bd475221652c8f9301b Best regards, -- Jens Axboe
Shuah Khan
2022-Mar-18 22:45 UTC
[Nouveau] [PATCH 7/9] usb: usbip: eliminate anonymous module_init & module_exit
On 3/16/22 1:20 PM, 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: 80fd9cd52de6 ("usbip: vudc: Add VUDC main file") > Signed-off-by: Randy Dunlap <rdunlap at infradead.org> > Cc: Krzysztof Opasiak <k.opasiak at samsung.com> > Cc: Igor Kotrasinski <i.kotrasinsk at samsung.com> > Cc: Greg Kroah-Hartman <gregkh at linuxfoundation.org> > Cc: Valentina Manea <valentina.manea.m at gmail.com> > Cc: Shuah Khan <shuah at kernel.org> > Cc: Shuah Khan <skhan at linuxfoundation.org> > Cc: linux-usb at vger.kernel.org > --- > drivers/usb/usbip/vudc_main.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > --- lnx-517-rc8.orig/drivers/usb/usbip/vudc_main.c > +++ lnx-517-rc8/drivers/usb/usbip/vudc_main.c > @@ -28,7 +28,7 @@ static struct platform_driver vudc_drive > > static struct list_head vudc_devices = LIST_HEAD_INIT(vudc_devices); > > -static int __init init(void) > +static int __init vudc_init(void) > { > int retval = -ENOMEM; > int i; > @@ -86,9 +86,9 @@ cleanup: > out: > return retval; > } > -module_init(init); > +module_init(vudc_init); > > -static void __exit cleanup(void) > +static void __exit vudc_cleanup(void) > { > struct vudc_device *udc_dev = NULL, *udc_dev2 = NULL; > > @@ -103,7 +103,7 @@ static void __exit cleanup(void) > } > platform_driver_unregister(&vudc_driver); > } > -module_exit(cleanup); > +module_exit(vudc_cleanup); > > MODULE_DESCRIPTION("USB over IP Device Controller"); > MODULE_AUTHOR("Krzysztof Opasiak, Karol Kosik, Igor Kotrasinski"); >Thanks for fixing this. Acked-by: Shuah Khan <skhan at linuxfoundation.org> thanks, -- Shuah
Herbert Xu
2022-Apr-08 08:31 UTC
[PATCH 8/9] x86/crypto: eliminate anonymous module_init & module_exit
On Wed, Mar 16, 2022 at 12:20:09PM -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: 64b94ceae8c1 ("crypto: blowfish - add x86_64 assembly implementation") > Fixes: 676a38046f4f ("crypto: camellia-x86_64 - module init/exit functions should be static") > Fixes: 0b95ec56ae19 ("crypto: camellia - add assembler implementation for x86_64") > Fixes: 56d76c96a9f3 ("crypto: serpent - add AVX2/x86_64 assembler implementation of serpent cipher") > Fixes: b9f535ffe38f ("[CRYPTO] twofish: i586 assembly version") > Fixes: ff0a70fe0536 ("crypto: twofish-x86_64-3way - module init/exit functions should be static") > Fixes: 8280daad436e ("crypto: twofish - add 3-way parallel x86_64 assembler implemention") > Signed-off-by: Randy Dunlap <rdunlap at infradead.org> > Cc: Jussi Kivilinna <jussi.kivilinna at mbnet.fi> > Cc: Joachim Fritschi <jfritschi at freenet.de> > Cc: Herbert Xu <herbert at gondor.apana.org.au> > Cc: "David S. Miller" <davem at davemloft.net> > Cc: linux-crypto at vger.kernel.org > Cc: x86 at kernel.org > --- > arch/x86/crypto/blowfish_glue.c | 8 ++++---- > arch/x86/crypto/camellia_glue.c | 8 ++++---- > arch/x86/crypto/serpent_avx2_glue.c | 8 ++++---- > arch/x86/crypto/twofish_glue.c | 8 ++++---- > arch/x86/crypto/twofish_glue_3way.c | 8 ++++---- > 5 files changed, 20 insertions(+), 20 deletions(-)Patch applied. Thanks. -- Email: Herbert Xu <herbert at gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt