From: Michael Kelley <mikelley@microsoft.com>
To: Boqun Feng <boqun.feng@gmail.com>,
"linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
"linux-input@vger.kernel.org" <linux-input@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"netdev@vger.kernel.org" <netdev@vger.kernel.org>,
"linux-scsi@vger.kernel.org" <linux-scsi@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Cc: KY Srinivasan <kys@microsoft.com>,
Haiyang Zhang <haiyangz@microsoft.com>,
Stephen Hemminger <sthemmin@microsoft.com>,
Wei Liu <wei.liu@kernel.org>, Jiri Kosina <jikos@kernel.org>,
Benjamin Tissoires <benjamin.tissoires@redhat.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>,
"David S. Miller" <davem@davemloft.net>,
Jakub Kicinski <kuba@kernel.org>,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
"will@kernel.org" <will@kernel.org>,
"ardb@kernel.org" <ardb@kernel.org>,
"arnd@arndb.de" <arnd@arndb.de>,
"catalin.marinas@arm.com" <catalin.marinas@arm.com>,
"Mark.Rutland@arm.com" <Mark.Rutland@arm.com>,
"maz@kernel.org" <maz@kernel.org>
Subject: RE: [PATCH v3 11/11] scsi: storvsc: Support PAGE_SIZE larger than 4K
Date: Sat, 12 Sep 2020 19:55:15 +0000 [thread overview]
Message-ID: <MW2PR2101MB1052215E0AC097F7BE439794D7250@MW2PR2101MB1052.namprd21.prod.outlook.com> (raw)
In-Reply-To: <20200910143455.109293-12-boqun.feng@gmail.com>
From: Boqun Feng <boqun.feng@gmail.com> Sent: Thursday, September 10, 2020 7:35 AM
>
> Hyper-V always use 4k page size (HV_HYP_PAGE_SIZE), so when
> communicating with Hyper-V, a guest should always use HV_HYP_PAGE_SIZE
> as the unit for page related data. For storvsc, the data is
> vmbus_packet_mpb_array. And since in scsi_cmnd, sglist of pages (in unit
> of PAGE_SIZE) is used, we need convert pages in the sglist of scsi_cmnd
> into Hyper-V pages in vmbus_packet_mpb_array.
>
> This patch does the conversion by dividing pages in sglist into Hyper-V
> pages, offset and indexes in vmbus_packet_mpb_array are recalculated
> accordingly.
>
> Signed-off-by: Boqun Feng <boqun.feng@gmail.com>
> ---
> drivers/scsi/storvsc_drv.c | 54 +++++++++++++++++++++++++++++++++-----
> 1 file changed, 47 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 8f5f5dc863a4..119b76ca24a1 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1739,23 +1739,63 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct
> scsi_cmnd *scmnd)
> payload_sz = sizeof(cmd_request->mpb);
>
> if (sg_count) {
> - if (sg_count > MAX_PAGE_BUFFER_COUNT) {
> + unsigned int hvpgoff = 0;
> + unsigned long hvpg_offset = sgl->offset & ~HV_HYP_PAGE_MASK;
This is a minor nit. The above expression uses sgl->offset. Code below uses
sgl[0].offset. They're the same but the inconsistency sticks out a bit.
> + unsigned int hvpg_count = HVPFN_UP(hvpg_offset + length);
> + u64 hvpfn;
>
> - payload_sz = (sg_count * sizeof(u64) +
> + if (hvpg_count > MAX_PAGE_BUFFER_COUNT) {
> +
> + payload_sz = (hvpg_count * sizeof(u64) +
> sizeof(struct vmbus_packet_mpb_array));
> payload = kzalloc(payload_sz, GFP_ATOMIC);
> if (!payload)
> return SCSI_MLQUEUE_DEVICE_BUSY;
> }
>
> + /*
> + * sgl is a list of PAGEs, and payload->range.pfn_array
> + * expects the page number in the unit of HV_HYP_PAGE_SIZE (the
> + * page size that Hyper-V uses, so here we need to divide PAGEs
> + * into HV_HYP_PAGE in case that PAGE_SIZE > HV_HYP_PAGE_SIZE.
> + */
> payload->range.len = length;
> - payload->range.offset = sgl[0].offset;
> + payload->range.offset = sgl[0].offset & ~HV_HYP_PAGE_MASK;
Another nit. The right hand side of the above assignment is already calculated as
hvpg_offset.
Nits aside,
Reviewed-by: Michael Kelley <mikelley@microsoft.com>
> + hvpgoff = sgl[0].offset >> HV_HYP_PAGE_SHIFT;
>
> cur_sgl = sgl;
> - for (i = 0; i < sg_count; i++) {
> - payload->range.pfn_array[i] =
> - page_to_pfn(sg_page((cur_sgl)));
> - cur_sgl = sg_next(cur_sgl);
> + for (i = 0; i < hvpg_count; i++) {
> + /*
> + * 'i' is the index of hv pages in the payload and
> + * 'hvpgoff' is the offset (in hv pages) of the first
> + * hv page in the the first page. The relationship
> + * between the sum of 'i' and 'hvpgoff' and the offset
> + * (in hv pages) in a payload page ('hvpgoff_in_page')
> + * is as follow:
> + *
> + * |------------------ PAGE -------------------|
> + * | NR_HV_HYP_PAGES_IN_PAGE hvpgs in total |
> + * |hvpg|hvpg| ... |hvpg|... |hvpg|
> + * ^ ^ ^ ^
> + * +-hvpgoff-+ +-hvpgoff_in_page-+
> + * ^ |
> + * +--------------------- i ---------------------------+
> + */
> + unsigned int hvpgoff_in_page =
> + (i + hvpgoff) % NR_HV_HYP_PAGES_IN_PAGE;
> +
> + /*
> + * Two cases that we need to fetch a page:
> + * 1) i == 0, the first step or
> + * 2) hvpgoff_in_page == 0, when we reach the boundary
> + * of a page.
> + */
> + if (hvpgoff_in_page == 0 || i == 0) {
> + hvpfn = page_to_hvpfn(sg_page(cur_sgl));
> + cur_sgl = sg_next(cur_sgl);
> + }
> +
> + payload->range.pfn_array[i] = hvpfn + hvpgoff_in_page;
> }
> }
>
> --
> 2.28.0
prev parent reply other threads:[~2020-09-12 19:55 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-10 14:34 [PATCH v3 00/11] Hyper-V: Support PAGE_SIZE larger than 4K Boqun Feng
2020-09-10 14:34 ` [PATCH v3 01/11] Drivers: hv: vmbus: Always use HV_HYP_PAGE_SIZE for gpadl Boqun Feng
2020-09-12 19:23 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 02/11] Drivers: hv: vmbus: Move __vmbus_open() Boqun Feng
2020-09-12 19:24 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 03/11] Drivers: hv: vmbus: Introduce types of GPADL Boqun Feng
2020-09-12 19:29 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 04/11] Drivers: hv: Use HV_HYP_PAGE in hv_synic_enable_regs() Boqun Feng
2020-09-12 19:30 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 05/11] Drivers: hv: vmbus: Move virt_to_hvpfn() to hyperv header Boqun Feng
2020-09-12 19:32 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 06/11] hv: hyperv.h: Introduce some hvpfn helper functions Boqun Feng
2020-09-12 19:33 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 07/11] hv_netvsc: Use HV_HYP_PAGE_SIZE for Hyper-V communication Boqun Feng
2020-09-12 19:36 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 08/11] Input: hyperv-keyboard: Make ringbuffer at least take two pages Boqun Feng
2020-09-12 19:37 ` Michael Kelley
2020-09-13 16:59 ` Dmitry Torokhov
2020-09-14 8:46 ` Boqun Feng
2020-09-14 9:30 ` Wei Liu
2020-09-14 10:22 ` Boqun Feng
2020-09-10 14:34 ` [PATCH v3 09/11] HID: hyperv: " Boqun Feng
2020-09-12 19:38 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 10/11] Driver: hv: util: " Boqun Feng
2020-09-12 19:40 ` Michael Kelley
2020-09-10 14:34 ` [PATCH v3 11/11] scsi: storvsc: Support PAGE_SIZE larger than 4K Boqun Feng
2020-09-12 19:55 ` Michael Kelley [this message]
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=MW2PR2101MB1052215E0AC097F7BE439794D7250@MW2PR2101MB1052.namprd21.prod.outlook.com \
--to=mikelley@microsoft.com \
--cc=Mark.Rutland@arm.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=benjamin.tissoires@redhat.com \
--cc=boqun.feng@gmail.com \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=dmitry.torokhov@gmail.com \
--cc=haiyangz@microsoft.com \
--cc=jejb@linux.ibm.com \
--cc=jikos@kernel.org \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=maz@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=sthemmin@microsoft.com \
--cc=wei.liu@kernel.org \
--cc=will@kernel.org \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).