nvme: move command size checks to the core
Christoph Hellwig
maintainerPATCH 1/2 nvme: move command size checks to the core
Most command aren't PCIe specific, so move the size checking for them to core.c
--- drivers/nvme/host/core.c | 27 +++++++++++++++++++++++++++ drivers/nvme/host/pci.c | 31 +++---------------------------- 2 files changed, 30 insertions(+), 28 deletions(-)
drivers/nvme/host/core.c +27 -0
@@ -3879,10 +3879,37 @@ void nvme_start_queues(struct nvme_ctrl *ctrl) }EXPORT_SYMBOL_GPL (nvme_start_queues); +/* +* Check we didn't inadvertently grow the command structure sizes: +*/ +static inline void _nvme_check_size (void ) +{ +BUILD_BUG_ON (sizeof (struct nvme_common_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_rw_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_identify ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_features ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_download_firmware ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_format_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_dsm_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_write_zeroes_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_abort_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_get_log_page_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_id_ctrl ) !=NVME_IDENTIFY_DATA_SIZE ); +BUILD_BUG_ON (sizeof (struct nvme_id_ns ) !=NVME_IDENTIFY_DATA_SIZE ); +BUILD_BUG_ON (sizeof (struct nvme_lba_range_type ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_smart_log ) !=512 ); +BUILD_BUG_ON (sizeof (struct nvme_dbbuf ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_directive_cmd ) !=64 ); +} + +int __init nvme_core_init (void ) {int result = -ENOMEM ; +_nvme_check_size (); + nvme_wq =alloc_workqueue ("nvme-wq" ,WQ_UNBOUND |WQ_MEM_RECLAIM |WQ_SYSFS ,0 );if (!nvme_wq)
drivers/nvme/host/pci.c +3 -28
@@ -226,33 +226,6 @@ struct nvme_iod {struct scatterlist *sg; }; -/* -* Check we didin't inadvertently grow the command struct -*/ -static inline void _nvme_check_size (void ) -{ -BUILD_BUG_ON (sizeof (struct nvme_common_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_rw_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_identify ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_create_cq ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_create_sq ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_delete_queue ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_features ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_download_firmware ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_format_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_dsm_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_write_zeroes_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_abort_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_get_log_page_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_id_ctrl ) !=NVME_IDENTIFY_DATA_SIZE ); -BUILD_BUG_ON (sizeof (struct nvme_id_ns ) !=NVME_IDENTIFY_DATA_SIZE ); -BUILD_BUG_ON (sizeof (struct nvme_lba_range_type ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_smart_log ) !=512 ); -BUILD_BUG_ON (sizeof (struct nvme_dbbuf ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_directive_cmd ) !=64 ); -} -static unsigned int max_io_queues (void ) {return num_possible_cpus () + write_queues + poll_queues;
@@ -2981,6 +2954,9 @@ static struct pci_driver nvme_driver = {static int __init nvme_init (void ) { +BUILD_BUG_ON (sizeof (struct nvme_create_cq ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_create_sq ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_delete_queue ) !=64 );BUILD_BUG_ON (IRQ_AFFINITY_MAX_SETS <2 );return pci_register_driver (&nvme_driver); }
@@ -2989,7 +2965,6 @@ static void __exit nvme_exit(void) {pci_unregister_driver (&nvme_driver);flush_workqueue (nvme_wq); -_nvme_check_size (); }MODULE_AUTHOR ("Matthew Wilcox <willy at linux.intel.com>" );
Signature · 1 line
2.20.1
Christoph Hellwig
maintainerPATCH 2/2 nvme: mark nvme_core_init and nvme_core_exit static
--- drivers/nvme/host/core.c | 4 ++-- drivers/nvme/host/nvme.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/nvme/host/core.c +2 -2
@@ -3904,7 +3904,7 @@ static inline void _nvme_check_size(void) } -int __init nvme_core_init (void ) +static int __init nvme_core_init (void ) {int result = -ENOMEM ;
@@ -3956,7 +3956,7 @@ int __init nvme_core_init(void)return result; } -void __exit nvme_core_exit(void) +static void __exit nvme_core_exit(void) {ida_destroy (&nvme_subsystems_ida);class_destroy (nvme_subsys_class);
drivers/nvme/host/nvme.h +0 -3
@@ -577,7 +577,4 @@ static inline struct nvme_ns *nvme_get_ns_from_dev(struct device *dev) return dev_to_disk(dev)->private_data; } -int __init nvme_core_init (void ); -void __exit nvme_core_exit(void); -#endif /* _NVME_H */
Signature · 1 line
2.20.1
Keith Busch
maintainerPATCH 2/2 nvme: mark nvme_core_init and nvme_core_exit static
Good catch.
PATCH 2/2 nvme: mark nvme_core_init and nvme_core_exit static
In reply to Christoph HellwigQuoted 1 line · Christoph Hellwig
[ ... ]
PATCH 2/2 nvme: mark nvme_core_init and nvme_core_exit static
In reply to Christoph HellwigQuoted 41 lines · Christoph Hellwig
Signed-off-by Christoph Hellwig <hch at lst.de>--- drivers/nvme/host/core.c | 4 ++-- drivers/nvme/host/nvme.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-)drivers/nvme/host/core.c +2
-2@@ -3904,7 +3904,7 @@ static inline void _nvme_check_size(void) } -int __init nvme_core_init (void ) +static int __init nvme_core_init (void ) {int result = -ENOMEM ;@@ -3956,7 +3956,7 @@ int __init nvme_core_init(void)return result; } -void __exit nvme_core_exit(void) +static void __exit nvme_core_exit(void) {ida_destroy (&nvme_subsystems_ida);class_destroy (nvme_subsys_class);drivers/nvme/host/nvme.h +0
-3@@ -577,7 +577,4 @@ static inline struct nvme_ns *nvme_get_ns_from_dev(struct device *dev) return dev_to_disk(dev)->private_data; } -int __init nvme_core_init (void ); -void __exit nvme_core_exit(void); -#endif /* _NVME_H */
Keith Busch
maintainerPATCH 1/2 nvme: move command size checks to the core
In reply to Christoph HellwigQuoted 4 lines · Christoph Hellwig
Most command aren't PCIe specific, so move the size checking for them to
core.cSigned-off-by Christoph Hellwig <hch at lst.de>
Looks good.
PATCH 1/2 nvme: move command size checks to the core
In reply to Christoph HellwigQuoted 2 lines · Christoph Hellwig
Most command aren't PCIe specific, so move the size checking for them to
core.c
PATCH 1/2 nvme: move command size checks to the core
In reply to Christoph HellwigLooks good. Just one question about _nvme_check_size(), is there any significance for one _ over __ ?
Quoted 108 lines · Christoph Hellwig
Most command aren't PCIe specific, so move the size checking for them to
core.cSigned-off-by Christoph Hellwig <hch at lst.de>--- drivers/nvme/host/core.c | 27 +++++++++++++++++++++++++++ drivers/nvme/host/pci.c | 31 +++---------------------------- 2 files changed, 30 insertions(+), 28 deletions(-)drivers/nvme/host/core.c +27
-0@@ -3879,10 +3879,37 @@ void nvme_start_queues(struct nvme_ctrl *ctrl) }EXPORT_SYMBOL_GPL (nvme_start_queues); +/* +* Check we didn't inadvertently grow the command structure sizes: +*/ +static inline void _nvme_check_size (void ) +{ +BUILD_BUG_ON (sizeof (struct nvme_common_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_rw_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_identify ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_features ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_download_firmware ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_format_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_dsm_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_write_zeroes_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_abort_cmd ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_get_log_page_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_command ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_id_ctrl ) !=NVME_IDENTIFY_DATA_SIZE ); +BUILD_BUG_ON (sizeof (struct nvme_id_ns ) !=NVME_IDENTIFY_DATA_SIZE ); +BUILD_BUG_ON (sizeof (struct nvme_lba_range_type ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_smart_log ) !=512 ); +BUILD_BUG_ON (sizeof (struct nvme_dbbuf ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_directive_cmd ) !=64 ); +} + +int __init nvme_core_init (void ) {int result = -ENOMEM ; +_nvme_check_size (); + nvme_wq =alloc_workqueue ("nvme-wq" ,WQ_UNBOUND |WQ_MEM_RECLAIM |WQ_SYSFS ,0 );if (!nvme_wq)drivers/nvme/host/pci.c +3
-28@@ -226,33 +226,6 @@ struct nvme_iod {struct scatterlist *sg; }; -/* -* Check we didin't inadvertently grow the command struct -*/ -static inline void _nvme_check_size (void ) -{ -BUILD_BUG_ON (sizeof (struct nvme_common_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_rw_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_identify ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_create_cq ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_create_sq ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_delete_queue ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_features ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_download_firmware ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_format_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_dsm_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_write_zeroes_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_abort_cmd ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_get_log_page_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_command ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_id_ctrl ) !=NVME_IDENTIFY_DATA_SIZE ); -BUILD_BUG_ON (sizeof (struct nvme_id_ns ) !=NVME_IDENTIFY_DATA_SIZE ); -BUILD_BUG_ON (sizeof (struct nvme_lba_range_type ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_smart_log ) !=512 ); -BUILD_BUG_ON (sizeof (struct nvme_dbbuf ) !=64 ); -BUILD_BUG_ON (sizeof (struct nvme_directive_cmd ) !=64 ); -} -static unsigned int max_io_queues (void ) {return num_possible_cpus () + write_queues + poll_queues;@@ -2981,6 +2954,9 @@ static struct pci_driver nvme_driver = {static int __init nvme_init (void ) { +BUILD_BUG_ON (sizeof (struct nvme_create_cq ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_create_sq ) !=64 ); +BUILD_BUG_ON (sizeof (struct nvme_delete_queue ) !=64 );BUILD_BUG_ON (IRQ_AFFINITY_MAX_SETS <2 );return pci_register_driver (&nvme_driver); }@@ -2989,7 +2965,6 @@ static void __exit nvme_exit(void) {pci_unregister_driver (&nvme_driver);flush_workqueue (nvme_wq); -_nvme_check_size (); }MODULE_AUTHOR ("Matthew Wilcox <willy at linux.intel.com>" );
Christoph Hellwig
maintainerPATCH 1/2 nvme: move command size checks to the core
Quoted 2 lines · Chaitanya Kulkarni
Looks good. Just one question about
_nvme_check_size(), is there any significance for one _ over __ ?
None. I have just copied over what we had before.