From: Tianyu Lan <ltykernel@gmail.com>
To: kys@microsoft.com, haiyangz@microsoft.com,
sthemmin@microsoft.com, wei.liu@kernel.org, decui@microsoft.com,
tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
x86@kernel.org, hpa@zytor.com, dave.hansen@linux.intel.com,
luto@kernel.org, peterz@infradead.org, konrad.wilk@oracle.com,
boris.ostrovsky@oracle.com, jgross@suse.com,
sstabellini@kernel.org, joro@8bytes.org, will@kernel.org,
davem@davemloft.net, kuba@kernel.org, jejb@linux.ibm.com,
martin.petersen@oracle.com, arnd@arndb.de, hch@lst.de,
m.szyprowski@samsung.com, robin.murphy@arm.com,
thomas.lendacky@amd.com, brijesh.singh@amd.com, ardb@kernel.org,
Tianyu.Lan@microsoft.com, rientjes@google.com,
martin.b.radev@gmail.com, akpm@linux-foundation.org,
rppt@kernel.org, kirill.shutemov@linux.intel.com,
aneesh.kumar@linux.ibm.com, krish.sadhukhan@oracle.com,
saravanand@fb.com, xen-devel@lists.xenproject.org,
pgonda@google.com, david@redhat.com, keescook@chromium.org,
hannes@cmpxchg.org, sfr@canb.auug.org.au,
michael.h.kelley@microsoft.com
Cc: iommu@lists.linux-foundation.org, linux-arch@vger.kernel.org,
linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-scsi@vger.kernel.org, netdev@vger.kernel.org,
vkuznets@redhat.com, anparri@microsoft.com
Subject: [PATCH 13/13] HV/Storvsc: Add Isolation VM support for storvsc driver
Date: Wed, 28 Jul 2021 10:52:28 -0400 [thread overview]
Message-ID: <20210728145232.285861-14-ltykernel@gmail.com> (raw)
In-Reply-To: <20210728145232.285861-1-ltykernel@gmail.com>
From: Tianyu Lan <Tianyu.Lan@microsoft.com>
In Isolation VM, all shared memory with host needs to mark visible
to host via hvcall. vmbus_establish_gpadl() has already done it for
storvsc rx/tx ring buffer. The page buffer used by vmbus_sendpacket_
mpb_desc() still need to handle. Use DMA API to map/umap these
memory during sending/receiving packet and Hyper-V DMA ops callback
will use swiotlb function to allocate bounce buffer and copy data
from/to bounce buffer.
Signed-off-by: Tianyu Lan <Tianyu.Lan@microsoft.com>
---
drivers/scsi/storvsc_drv.c | 68 +++++++++++++++++++++++++++++++++++---
1 file changed, 63 insertions(+), 5 deletions(-)
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
index 328bb961c281..78320719bdd8 100644
--- a/drivers/scsi/storvsc_drv.c
+++ b/drivers/scsi/storvsc_drv.c
@@ -21,6 +21,8 @@
#include <linux/device.h>
#include <linux/hyperv.h>
#include <linux/blkdev.h>
+#include <linux/io.h>
+#include <linux/dma-mapping.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
@@ -427,6 +429,8 @@ struct storvsc_cmd_request {
u32 payload_sz;
struct vstor_packet vstor_packet;
+ u32 hvpg_count;
+ struct hv_dma_range *dma_range;
};
@@ -509,6 +513,14 @@ struct storvsc_scan_work {
u8 tgt_id;
};
+#define storvsc_dma_map(dev, page, offset, size, dir) \
+ dma_map_page(dev, page, offset, size, dir)
+
+#define storvsc_dma_unmap(dev, dma_range, dir) \
+ dma_unmap_page(dev, dma_range.dma, \
+ dma_range.mapping_size, \
+ dir ? DMA_FROM_DEVICE : DMA_TO_DEVICE)
+
static void storvsc_device_scan(struct work_struct *work)
{
struct storvsc_scan_work *wrk;
@@ -1260,6 +1272,7 @@ static void storvsc_on_channel_callback(void *context)
struct hv_device *device;
struct storvsc_device *stor_device;
struct Scsi_Host *shost;
+ int i;
if (channel->primary_channel != NULL)
device = channel->primary_channel->device_obj;
@@ -1314,6 +1327,15 @@ static void storvsc_on_channel_callback(void *context)
request = (struct storvsc_cmd_request *)scsi_cmd_priv(scmnd);
}
+ if (request->dma_range) {
+ for (i = 0; i < request->hvpg_count; i++)
+ storvsc_dma_unmap(&device->device,
+ request->dma_range[i],
+ request->vstor_packet.vm_srb.data_in == READ_TYPE);
+
+ kfree(request->dma_range);
+ }
+
storvsc_on_receive(stor_device, packet, request);
continue;
}
@@ -1810,7 +1832,9 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
unsigned int hvpgoff, hvpfns_to_add;
unsigned long offset_in_hvpg = offset_in_hvpage(sgl->offset);
unsigned int hvpg_count = HVPFN_UP(offset_in_hvpg + length);
+ dma_addr_t dma;
u64 hvpfn;
+ u32 size;
if (hvpg_count > MAX_PAGE_BUFFER_COUNT) {
@@ -1824,6 +1848,13 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
payload->range.len = length;
payload->range.offset = offset_in_hvpg;
+ cmd_request->dma_range = kcalloc(hvpg_count,
+ sizeof(*cmd_request->dma_range),
+ GFP_ATOMIC);
+ if (!cmd_request->dma_range) {
+ ret = -ENOMEM;
+ goto free_payload;
+ }
for (i = 0; sgl != NULL; sgl = sg_next(sgl)) {
/*
@@ -1847,9 +1878,29 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
* last sgl should be reached at the same time that
* the PFN array is filled.
*/
- while (hvpfns_to_add--)
- payload->range.pfn_array[i++] = hvpfn++;
+ while (hvpfns_to_add--) {
+ size = min(HV_HYP_PAGE_SIZE - offset_in_hvpg,
+ (unsigned long)length);
+ dma = storvsc_dma_map(&dev->device, pfn_to_page(hvpfn++),
+ offset_in_hvpg, size,
+ scmnd->sc_data_direction);
+ if (dma_mapping_error(&dev->device, dma)) {
+ ret = -ENOMEM;
+ goto free_dma_range;
+ }
+
+ if (offset_in_hvpg) {
+ payload->range.offset = dma & ~HV_HYP_PAGE_MASK;
+ offset_in_hvpg = 0;
+ }
+
+ cmd_request->dma_range[i].dma = dma;
+ cmd_request->dma_range[i].mapping_size = size;
+ payload->range.pfn_array[i++] = dma >> HV_HYP_PAGE_SHIFT;
+ length -= size;
+ }
}
+ cmd_request->hvpg_count = hvpg_count;
}
cmd_request->payload = payload;
@@ -1860,13 +1911,20 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd)
put_cpu();
if (ret == -EAGAIN) {
- if (payload_sz > sizeof(cmd_request->mpb))
- kfree(payload);
/* no more space */
- return SCSI_MLQUEUE_DEVICE_BUSY;
+ ret = SCSI_MLQUEUE_DEVICE_BUSY;
+ goto free_dma_range;
}
return 0;
+
+free_dma_range:
+ kfree(cmd_request->dma_range);
+
+free_payload:
+ if (payload_sz > sizeof(cmd_request->mpb))
+ kfree(payload);
+ return ret;
}
static struct scsi_host_template scsi_driver = {
--
2.25.1
next prev parent reply other threads:[~2021-07-28 14:54 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-28 14:52 [PATCH 00/13] x86/Hyper-V: Add Hyper-V Isolation VM support Tianyu Lan
2021-07-28 14:52 ` [PATCH 01/13] x86/HV: Initialize GHCB page in Isolation VM Tianyu Lan
2021-08-02 11:53 ` Joerg Roedel
2021-08-02 12:35 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 02/13] x86/HV: Initialize shared memory boundary in the " Tianyu Lan
2021-07-28 14:52 ` [PATCH 03/13] x86/HV: Add new hvcall guest address host visibility support Tianyu Lan
2021-07-28 15:29 ` Dave Hansen
2021-07-29 12:49 ` Tianyu Lan
2021-08-02 12:01 ` Joerg Roedel
2021-08-02 12:59 ` Tianyu Lan
2021-08-02 13:11 ` Juergen Gross
2021-08-02 13:30 ` Joerg Roedel
2021-07-28 17:06 ` Dave Hansen
2021-07-29 13:01 ` Tianyu Lan
2021-07-29 14:09 ` Dave Hansen
2021-07-29 15:02 ` Tianyu Lan
2021-07-29 16:05 ` Dave Hansen
2021-07-30 2:52 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 04/13] HV: Mark vmbus ring buffer visible to host in Isolation VM Tianyu Lan
2021-08-02 12:07 ` Joerg Roedel
2021-08-02 12:56 ` Tianyu Lan
2021-08-02 12:59 ` Joerg Roedel
2021-08-02 13:08 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 05/13] HV: Add Write/Read MSR registers via ghcb page Tianyu Lan
2021-08-02 12:28 ` Joerg Roedel
2021-08-02 13:18 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 06/13] HV: Add ghcb hvcall support for SNP VM Tianyu Lan
2021-08-02 12:39 ` Joerg Roedel
2021-08-02 13:32 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 07/13] HV/Vmbus: Add SNP support for VMbus channel initiate message Tianyu Lan
2021-08-02 12:58 ` Joerg Roedel
2021-07-28 14:52 ` [PATCH 08/13] HV/Vmbus: Initialize VMbus ring buffer for Isolation VM Tianyu Lan
2021-07-28 14:52 ` [PATCH 09/13] DMA: Add dma_map_decrypted/dma_unmap_encrypted() function Tianyu Lan
2021-07-29 15:13 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 10/13] x86/Swiotlb: Add Swiotlb bounce buffer remap function for HV IVM Tianyu Lan
2021-07-29 16:29 ` Konrad Rzeszutek Wilk
2021-07-30 4:10 ` Tianyu Lan
2021-07-28 14:52 ` [PATCH 11/13] HV/IOMMU: Enable swiotlb bounce buffer for Isolation VM Tianyu Lan
2021-07-28 14:52 ` [PATCH 12/13] HV/Netvsc: Add Isolation VM support for netvsc driver Tianyu Lan
2021-07-28 14:52 ` Tianyu Lan [this message]
2021-08-02 13:20 ` [PATCH 13/13] HV/Storvsc: Add Isolation VM support for storvsc driver Joerg Roedel
2021-08-02 14:08 ` Tianyu Lan
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=20210728145232.285861-14-ltykernel@gmail.com \
--to=ltykernel@gmail.com \
--cc=Tianyu.Lan@microsoft.com \
--cc=akpm@linux-foundation.org \
--cc=aneesh.kumar@linux.ibm.com \
--cc=anparri@microsoft.com \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=boris.ostrovsky@oracle.com \
--cc=bp@alien8.de \
--cc=brijesh.singh@amd.com \
--cc=dave.hansen@linux.intel.com \
--cc=davem@davemloft.net \
--cc=david@redhat.com \
--cc=decui@microsoft.com \
--cc=haiyangz@microsoft.com \
--cc=hannes@cmpxchg.org \
--cc=hch@lst.de \
--cc=hpa@zytor.com \
--cc=iommu@lists.linux-foundation.org \
--cc=jejb@linux.ibm.com \
--cc=jgross@suse.com \
--cc=joro@8bytes.org \
--cc=keescook@chromium.org \
--cc=kirill.shutemov@linux.intel.com \
--cc=konrad.wilk@oracle.com \
--cc=krish.sadhukhan@oracle.com \
--cc=kuba@kernel.org \
--cc=kys@microsoft.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-hyperv@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=luto@kernel.org \
--cc=m.szyprowski@samsung.com \
--cc=martin.b.radev@gmail.com \
--cc=martin.petersen@oracle.com \
--cc=michael.h.kelley@microsoft.com \
--cc=mingo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=pgonda@google.com \
--cc=rientjes@google.com \
--cc=robin.murphy@arm.com \
--cc=rppt@kernel.org \
--cc=saravanand@fb.com \
--cc=sfr@canb.auug.org.au \
--cc=sstabellini@kernel.org \
--cc=sthemmin@microsoft.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.com \
--cc=vkuznets@redhat.com \
--cc=wei.liu@kernel.org \
--cc=will@kernel.org \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xenproject.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).