From: Christoph Hellwig <hch@lst.de> To: Jens Axboe <axboe@kernel.dk> Cc: Sebastian Ott <sebott@linux.ibm.com>, Sagi Grimberg <sagi@grimberg.me>, Max Gurtovoy <maxg@mellanox.com>, Bart Van Assche <bvanassche@acm.org>, Ulf Hansson <ulf.hansson@linaro.org>, Alan Stern <stern@rowland.harvard.edu>, Oliver Neukum <oneukum@suse.com>, linux-block@vger.kernel.org, linux-rdma@vger.kernel.org, linux-mmc@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, megaraidlinux.pdl@broadcom.com, MPT-FusionLinux.pdl@broadcom.com, linux-hyperv@vger.kernel.org, linux-usb@vger.kernel.org, usb-storage@lists.one-eyed-alien.net, linux-kernel@vger.kernel.org Subject: [PATCH 10/13] megaraid_sas: set virt_boundary_mask in the scsi host Date: Wed, 5 Jun 2019 21:08:33 +0200 [thread overview] Message-ID: <20190605190836.32354-11-hch@lst.de> (raw) In-Reply-To: <20190605190836.32354-1-hch@lst.de> This ensures all proper DMA layer handling is taken care of by the SCSI midlayer. Note that the effect is global, as the IOMMU merging is based off a paramters in struct device. We could still turn if off if no PCIe devices are present, but I don't know how to find that out. Also remove the bogus nomerges flag, merges do take the virt_boundary into account. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/scsi/megaraid/megaraid_sas_base.c | 46 +++++---------------- drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 ++++ 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 3dd1df472dc6..20b3b3f8bc16 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -1870,39 +1870,6 @@ void megasas_set_dynamic_target_properties(struct scsi_device *sdev, } } -/* - * megasas_set_nvme_device_properties - - * set nomerges=2 - * set virtual page boundary = 4K (current mr_nvme_pg_size is 4K). - * set maximum io transfer = MDTS of NVME device provided by MR firmware. - * - * MR firmware provides value in KB. Caller of this function converts - * kb into bytes. - * - * e.a MDTS=5 means 2^5 * nvme page size. (In case of 4K page size, - * MR firmware provides value 128 as (32 * 4K) = 128K. - * - * @sdev: scsi device - * @max_io_size: maximum io transfer size - * - */ -static inline void -megasas_set_nvme_device_properties(struct scsi_device *sdev, u32 max_io_size) -{ - struct megasas_instance *instance; - u32 mr_nvme_pg_size; - - instance = (struct megasas_instance *)sdev->host->hostdata; - mr_nvme_pg_size = max_t(u32, instance->nvme_page_size, - MR_DEFAULT_NVME_PAGE_SIZE); - - blk_queue_max_hw_sectors(sdev->request_queue, (max_io_size / 512)); - - blk_queue_flag_set(QUEUE_FLAG_NOMERGES, sdev->request_queue); - blk_queue_virt_boundary(sdev->request_queue, mr_nvme_pg_size - 1); -} - - /* * megasas_set_static_target_properties - * Device property set by driver are static and it is not required to be @@ -1961,8 +1928,10 @@ static void megasas_set_static_target_properties(struct scsi_device *sdev, max_io_size_kb = le32_to_cpu(instance->tgt_prop->max_io_size_kb); } - if (instance->nvme_page_size && max_io_size_kb) - megasas_set_nvme_device_properties(sdev, (max_io_size_kb << 10)); + if (instance->nvme_page_size && max_io_size_kb) { + blk_queue_max_hw_sectors(sdev->request_queue, + (max_io_size_kb << 10) / 512); + } scsi_change_queue_depth(sdev, device_qd); @@ -6258,6 +6227,7 @@ static int megasas_start_aen(struct megasas_instance *instance) static int megasas_io_attach(struct megasas_instance *instance) { struct Scsi_Host *host = instance->host; + u32 nvme_page_size = instance->nvme_page_size; /* * Export parameters required by SCSI mid-layer @@ -6298,6 +6268,12 @@ static int megasas_io_attach(struct megasas_instance *instance) host->max_lun = MEGASAS_MAX_LUN; host->max_cmd_len = 16; + if (nvme_page_size) { + if (nvme_page_size > MR_DEFAULT_NVME_PAGE_SIZE) + nvme_page_size = MR_DEFAULT_NVME_PAGE_SIZE; + host->virt_boundary_mask = nvme_page_size - 1; + } + /* * Notify the mid-layer about the new controller */ diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 4dfa0685a86c..a9ff3a648e7b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -1935,6 +1935,13 @@ megasas_is_prp_possible(struct megasas_instance *instance, build_prp = true; } +/* + * XXX: All the code following should go away. The block layer guarantees + * merging according to the virt boundary. And while we might have had some + * issues with that in the past we fixed them, and any new bug should be fixed + * in the core code as well. + */ + /* * Below code detects gaps/holes in IO data buffers. * What does holes/gaps mean? -- 2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: hch@lst.de (Christoph Hellwig) Subject: [PATCH 10/13] megaraid_sas: set virt_boundary_mask in the scsi host Date: Wed, 5 Jun 2019 21:08:33 +0200 [thread overview] Message-ID: <20190605190836.32354-11-hch@lst.de> (raw) In-Reply-To: <20190605190836.32354-1-hch@lst.de> This ensures all proper DMA layer handling is taken care of by the SCSI midlayer. Note that the effect is global, as the IOMMU merging is based off a paramters in struct device. We could still turn if off if no PCIe devices are present, but I don't know how to find that out. Also remove the bogus nomerges flag, merges do take the virt_boundary into account. Signed-off-by: Christoph Hellwig <hch at lst.de> --- drivers/scsi/megaraid/megaraid_sas_base.c | 46 +++++---------------- drivers/scsi/megaraid/megaraid_sas_fusion.c | 7 ++++ 2 files changed, 18 insertions(+), 35 deletions(-) diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 3dd1df472dc6..20b3b3f8bc16 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -1870,39 +1870,6 @@ void megasas_set_dynamic_target_properties(struct scsi_device *sdev, } } -/* - * megasas_set_nvme_device_properties - - * set nomerges=2 - * set virtual page boundary = 4K (current mr_nvme_pg_size is 4K). - * set maximum io transfer = MDTS of NVME device provided by MR firmware. - * - * MR firmware provides value in KB. Caller of this function converts - * kb into bytes. - * - * e.a MDTS=5 means 2^5 * nvme page size. (In case of 4K page size, - * MR firmware provides value 128 as (32 * 4K) = 128K. - * - * @sdev: scsi device - * @max_io_size: maximum io transfer size - * - */ -static inline void -megasas_set_nvme_device_properties(struct scsi_device *sdev, u32 max_io_size) -{ - struct megasas_instance *instance; - u32 mr_nvme_pg_size; - - instance = (struct megasas_instance *)sdev->host->hostdata; - mr_nvme_pg_size = max_t(u32, instance->nvme_page_size, - MR_DEFAULT_NVME_PAGE_SIZE); - - blk_queue_max_hw_sectors(sdev->request_queue, (max_io_size / 512)); - - blk_queue_flag_set(QUEUE_FLAG_NOMERGES, sdev->request_queue); - blk_queue_virt_boundary(sdev->request_queue, mr_nvme_pg_size - 1); -} - - /* * megasas_set_static_target_properties - * Device property set by driver are static and it is not required to be @@ -1961,8 +1928,10 @@ static void megasas_set_static_target_properties(struct scsi_device *sdev, max_io_size_kb = le32_to_cpu(instance->tgt_prop->max_io_size_kb); } - if (instance->nvme_page_size && max_io_size_kb) - megasas_set_nvme_device_properties(sdev, (max_io_size_kb << 10)); + if (instance->nvme_page_size && max_io_size_kb) { + blk_queue_max_hw_sectors(sdev->request_queue, + (max_io_size_kb << 10) / 512); + } scsi_change_queue_depth(sdev, device_qd); @@ -6258,6 +6227,7 @@ static int megasas_start_aen(struct megasas_instance *instance) static int megasas_io_attach(struct megasas_instance *instance) { struct Scsi_Host *host = instance->host; + u32 nvme_page_size = instance->nvme_page_size; /* * Export parameters required by SCSI mid-layer @@ -6298,6 +6268,12 @@ static int megasas_io_attach(struct megasas_instance *instance) host->max_lun = MEGASAS_MAX_LUN; host->max_cmd_len = 16; + if (nvme_page_size) { + if (nvme_page_size > MR_DEFAULT_NVME_PAGE_SIZE) + nvme_page_size = MR_DEFAULT_NVME_PAGE_SIZE; + host->virt_boundary_mask = nvme_page_size - 1; + } + /* * Notify the mid-layer about the new controller */ diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 4dfa0685a86c..a9ff3a648e7b 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c @@ -1935,6 +1935,13 @@ megasas_is_prp_possible(struct megasas_instance *instance, build_prp = true; } +/* + * XXX: All the code following should go away. The block layer guarantees + * merging according to the virt boundary. And while we might have had some + * issues with that in the past we fixed them, and any new bug should be fixed + * in the core code as well. + */ + /* * Below code detects gaps/holes in IO data buffers. * What does holes/gaps mean? -- 2.20.1
next prev parent reply other threads:[~2019-06-05 19:09 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-05 19:08 properly communicate queue limits to the DMA layer Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 01/13] nvme-pci: don't limit DMA segement size Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 02/13] rsxx: don't call dma_set_max_seg_size Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 03/13] mtip32xx: also set max_segment_size in the device Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 04/13] mmc: " Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 05/13] scsi: add a host / host template field for the virt boundary Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 06/13] ufshcd: set max_segment_size in the scsi host template Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 07/13] storvsc: set virt_boundary_mask " Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 08/13] IB/iser: set virt_boundary_mask in the scsi host Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 20:22 ` Jason Gunthorpe 2019-06-05 20:22 ` Jason Gunthorpe 2019-06-05 23:35 ` Sagi Grimberg 2019-06-05 23:35 ` Sagi Grimberg 2019-06-06 6:24 ` Christoph Hellwig 2019-06-06 6:24 ` Christoph Hellwig 2019-06-06 12:59 ` Jason Gunthorpe 2019-06-06 12:59 ` Jason Gunthorpe 2019-06-06 14:19 ` Christoph Hellwig 2019-06-06 14:19 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 09/13] IB/srp: " Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig [this message] 2019-06-05 19:08 ` [PATCH 10/13] megaraid_sas: " Christoph Hellwig 2019-06-06 6:02 ` Hannes Reinecke 2019-06-06 6:02 ` Hannes Reinecke 2019-06-06 6:41 ` Christoph Hellwig 2019-06-06 6:41 ` Christoph Hellwig 2019-06-06 15:37 ` Kashyap Desai 2019-06-06 15:37 ` Kashyap Desai 2019-06-08 8:14 ` Christoph Hellwig 2019-06-08 8:14 ` Christoph Hellwig 2019-06-13 19:58 ` Kashyap Desai 2019-06-13 19:58 ` Kashyap Desai 2019-06-13 19:58 ` Kashyap Desai 2019-06-17 8:44 ` Christoph Hellwig 2019-06-17 8:44 ` Christoph Hellwig 2019-06-17 9:10 ` Kashyap Desai 2019-06-17 9:10 ` Kashyap Desai 2019-06-13 8:44 ` Christoph Hellwig 2019-06-13 8:44 ` Christoph Hellwig 2019-06-13 20:04 ` Kashyap Desai 2019-06-13 20:04 ` Kashyap Desai 2019-06-05 19:08 ` [PATCH 11/13] mpt3sas: " Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 12/13] usb-storage: " Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:08 ` [PATCH 13/13] uas: " Christoph Hellwig 2019-06-05 19:08 ` Christoph Hellwig 2019-06-05 19:17 ` properly communicate queue limits to the DMA layer Jens Axboe 2019-06-05 19:17 ` Jens Axboe 2019-06-05 19:24 ` Christoph Hellwig 2019-06-05 19:24 ` Christoph Hellwig 2019-06-07 5:52 ` Jens Axboe 2019-06-07 5:52 ` Jens Axboe 2019-06-07 17:30 ` Martin K. Petersen 2019-06-07 17:30 ` Martin K. Petersen 2019-06-08 8:10 ` Jens Axboe 2019-06-08 8:10 ` Jens Axboe
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190605190836.32354-11-hch@lst.de \ --to=hch@lst.de \ --cc=MPT-FusionLinux.pdl@broadcom.com \ --cc=axboe@kernel.dk \ --cc=bvanassche@acm.org \ --cc=linux-block@vger.kernel.org \ --cc=linux-hyperv@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-rdma@vger.kernel.org \ --cc=linux-scsi@vger.kernel.org \ --cc=linux-usb@vger.kernel.org \ --cc=maxg@mellanox.com \ --cc=megaraidlinux.pdl@broadcom.com \ --cc=oneukum@suse.com \ --cc=sagi@grimberg.me \ --cc=sebott@linux.ibm.com \ --cc=stern@rowland.harvard.edu \ --cc=ulf.hansson@linaro.org \ --cc=usb-storage@lists.one-eyed-alien.net \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.