Commit 81101540 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

nvme: move command size checks to the core 



Most command aren't PCIe specific, so move the size checking for them
to core.c

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Reviewed-by: default avatarKeith Busch <keith.busch@intel.com>
Reviewed-by: default avatarChaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
parent a2faf94e

drivers/nvme/host/core.c

+27 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;
@@ -2988,6 +2961,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);

}
@@ -2996,7 +2972,6 @@ static void __exit nvme_exit(void) 
{

	pci_unregister_driver(&nvme_driver);

	flush_workqueue(nvme_wq);

	_nvme_check_size();

}



MODULE_AUTHOR("Matthew Wilcox <willy@linux.intel.com>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE