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");
Jason Wang
2022-Mar-17 03:25 UTC
[PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit
On Thu, Mar 17, 2022 at 3:24 AM Randy Dunlap <rdunlap at infradead.org> 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: 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.orgAcked-by: Jason Wang <jasowang at redhat.com>> --- > 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"); >
Stefan Hajnoczi
2022-Mar-17 08:46 UTC
[PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit
On Wed, Mar 16, 2022 at 12:20:06PM -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: 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"); >Reviewed-by: Stefan Hajnoczi <stefanha at redhat.com> -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 488 bytes Desc: not available URL: <http://lists.linuxfoundation.org/pipermail/virtualization/attachments/20220317/255ec388/attachment.sig>
Michael S. Tsirkin
2022-Mar-20 12:04 UTC
[PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit
On Wed, Mar 16, 2022 at 12:20:06PM -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: 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.orgIf this is done tree-wide, it's ok to do it for virtio too. Acked-by: Michael S. Tsirkin <mst at redhat.com> No real opinion on whether it's a good idea.> --- > 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");
Martin K. Petersen
2022-Mar-30 03:51 UTC
[PATCH 5/9] virtio-scsi: eliminate anonymous module_init & module_exit
Randy,> 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.Applied to 5.18/scsi-staging, thanks! -- Martin K. Petersen Oracle Linux Engineering