From nobody Fri Apr 26 01:02:10 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1631627248; cv=none; d=zohomail.com; s=zohoarc; b=fIfqPy/YGctQ0VdRbMNlI9o9+tOgSj8xmh3jGaBZpQVskYktw36BG7FA+v4y1oFNdQ36pNxisPSk/EzxdJmhboF4rcfXryHGihVBmIEaud7YkG9x5saSnlcyFoEaAeUMHlpxYA2uddPkH4HMpDIZBFl9y08/YOO+i/KvmxFaz+Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631627248; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=LkmXj6KxjUvBaz8z0a8dNOFjY1uabCCopAH/jkVX7K0=; b=JAbZYfuu4d7vJUvNG7l104zrt5K3TwMojGSViJFMHn/CU17lKHuyfM547S1H+vLMqo8Y+Ao0LPKnWCY/E01uq+Ie+R0kb6wIKIqsowLf97Ibwwheli6u0nNk8sMGsmpAfU28N8ezMv/5Oqe5Q8koaWxW3Se5nTlA/I2Fe1/I3RI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1631627248346227.925519882289; Tue, 14 Sep 2021 06:47:28 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.186698.335464 (Exim 4.92) (envelope-from ) id 1mQ8mG-0007Yw-RX; Tue, 14 Sep 2021 13:47:12 +0000 Received: by outflank-mailman (output) from mailman id 186698.335464; Tue, 14 Sep 2021 13:47:12 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mQ8mG-0007YE-OE; Tue, 14 Sep 2021 13:47:12 +0000 Received: by outflank-mailman (input) for mailman id 186698; Tue, 14 Sep 2021 13:47:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mQ8gP-0001wz-Tz for xen-devel@lists.xenproject.org; Tue, 14 Sep 2021 13:41:09 +0000 Received: from mail-pl1-x630.google.com (unknown [2607:f8b0:4864:20::630]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id e1b20c67-e05b-4253-910b-5c3d6b9844ff; Tue, 14 Sep 2021 13:39:54 +0000 (UTC) Received: by mail-pl1-x630.google.com with SMTP id n18so8199569plp.7 for ; Tue, 14 Sep 2021 06:39:54 -0700 (PDT) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:7:6ea2:a529:4af3:5057]) by smtp.gmail.com with ESMTPSA id v13sm10461234pfm.16.2021.09.14.06.39.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 06:39:53 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: e1b20c67-e05b-4253-910b-5c3d6b9844ff DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LkmXj6KxjUvBaz8z0a8dNOFjY1uabCCopAH/jkVX7K0=; b=H0oAe82GjXdTdE+tPELa3975j1MGt/XfBwybJVWm9rXqcL3sZBlP4N3dVxqejuMmCR fTxH2exCC64AO/wTOZvdNd7kolrZ/irkjYbpTtFRFS52HpEJiYpKx7tvDB22KmzcCOv7 c9DS1KJW86b06AqUV3XvHCJsPD24m0nR2St4Gm7JJGLUJisEPWa/XBbIzSmSmqfr13m7 8k2iUw5lq4EvEwGop+B0nMUmtEgs3N2LwGcdbL1UtdAgaL9kn7ZyWDVSGWcSLQCnunTP f35mOoI/LXthKpV4WOGUGrXrLzkkUj0AyvgnRnOwf8rvVBG3C6mESM16QWBrymuP71V7 1ddg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LkmXj6KxjUvBaz8z0a8dNOFjY1uabCCopAH/jkVX7K0=; b=l1cv9P85CrKZMgyqGgPGyY2W8XxgU25LdyxOpOvSA9KjsxoAyAMOX+eycZ1NOpGhz1 f4ZXdJTqvq7VDTIo+Jh2k6zObUYMwZd9CAsVncwVy62rZne8UsgE6s+1TiFA7JWV4dh3 HDAZlT17ymCSi6dJSnGjH4+8K6G3SrwNsTOXtE5Y652Fct08jhbwXMOGESCBCthx+Eu5 nZDbUYrnpIPJuZWhWditkTf4XeCCxY0f9BjnyvpQwua2e0qerZOTovyF22fBWm6H3CIt nqm8SiLe4kBb23mhrhuwGiNYoumKF0JHzdud+0u3Qk1vjOpeVkPDdfHvlGO5Bo1aqkm3 VGDA== X-Gm-Message-State: AOAM530fYqm9o5JpJnHB042fGb6LgulULOAgkMxNj1tD8cGOpEvDSjH9 x86P9Y1l/I7HwAPGNIS+elI= X-Google-Smtp-Source: ABdhPJzd50JbAXqZtpTD7xpue98Virh8fDhY7VdwfyRuohNOtMS2fLTQ6Ka6cqdkhWO9Ql38QPYNrQ== X-Received: by 2002:a17:902:da89:b0:13b:7d3d:59e9 with SMTP id j9-20020a170902da8900b0013b7d3d59e9mr14413893plx.41.1631626794081; Tue, 14 Sep 2021 06:39:54 -0700 (PDT) From: Tianyu Lan 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, gregkh@linuxfoundation.org, arnd@arndb.de, hch@lst.de, m.szyprowski@samsung.com, robin.murphy@arm.com, brijesh.singh@amd.com, Tianyu.Lan@microsoft.com, thomas.lendacky@amd.com, pgonda@google.com, akpm@linux-foundation.org, kirill.shutemov@linux.intel.com, rppt@kernel.org, sfr@canb.auug.org.au, aneesh.kumar@linux.ibm.com, saravanand@fb.com, krish.sadhukhan@oracle.com, xen-devel@lists.xenproject.org, tj@kernel.org, rientjes@google.com, 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, parri.andrea@gmail.com, dave.hansen@intel.com Subject: [PATCH V5 12/12] net: netvsc: Add Isolation VM support for netvsc driver Date: Tue, 14 Sep 2021 09:39:13 -0400 Message-Id: <20210914133916.1440931-13-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210914133916.1440931-1-ltykernel@gmail.com> References: <20210914133916.1440931-1-ltykernel@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1631627250104100002 Content-Type: text/plain; charset="utf-8" From: Tianyu Lan In Isolation VM, all shared memory with host needs to mark visible to host via hvcall. vmbus_establish_gpadl() has already done it for netvsc rx/tx ring buffer. The page buffer used by vmbus_sendpacket_ pagebuffer() stills need to be handled. Use DMA API to map/umap these memory during sending/receiving packet and Hyper-V swiotlb bounce buffer dma address will be returned. The swiotlb bounce buffer has been masked to be visible to host during boot up. Allocate rx/tx ring buffer via alloc_pages() in Isolation VM and map these pages via vmap(). After calling vmbus_establish_gpadl() which marks these pages visible to host, unmap these pages to release the virtual address mapped with physical address below shared_gpa_boundary and map them in the extra address space via vmap_pfn(). Signed-off-by: Tianyu Lan Reviewed-by: Haiyang Zhang --- Change since v4: * Allocate rx/tx ring buffer via alloc_pages() in Isolation VM * Map pages after calling vmbus_establish_gpadl(). * set dma_set_min_align_mask for netvsc driver. Change since v3: * Add comment to explain why not to use dma_map_sg() * Fix some error handle. --- drivers/net/hyperv/hyperv_net.h | 7 + drivers/net/hyperv/netvsc.c | 287 +++++++++++++++++++++++++++++- drivers/net/hyperv/netvsc_drv.c | 1 + drivers/net/hyperv/rndis_filter.c | 2 + include/linux/hyperv.h | 5 + 5 files changed, 296 insertions(+), 6 deletions(-) diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_ne= t.h index 315278a7cf88..87e8c74398a5 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -164,6 +164,7 @@ struct hv_netvsc_packet { u32 total_bytes; u32 send_buf_index; u32 total_data_buflen; + struct hv_dma_range *dma_range; }; =20 #define NETVSC_HASH_KEYLEN 40 @@ -1074,6 +1075,8 @@ struct netvsc_device { =20 /* Receive buffer allocated by us but manages by NetVSP */ void *recv_buf; + struct page **recv_pages; + u32 recv_page_count; u32 recv_buf_size; /* allocated bytes */ struct vmbus_gpadl recv_buf_gpadl_handle; u32 recv_section_cnt; @@ -1082,6 +1085,8 @@ struct netvsc_device { =20 /* Send buffer allocated by us */ void *send_buf; + struct page **send_pages; + u32 send_page_count; u32 send_buf_size; struct vmbus_gpadl send_buf_gpadl_handle; u32 send_section_cnt; @@ -1731,4 +1736,6 @@ struct rndis_message { #define RETRY_US_HI 10000 #define RETRY_MAX 2000 /* >10 sec */ =20 +void netvsc_dma_unmap(struct hv_device *hv_dev, + struct hv_netvsc_packet *packet); #endif /* _HYPERV_NET_H */ diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 1f87e570ed2b..7d5254bf043e 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -20,6 +20,7 @@ #include #include #include +#include =20 #include #include @@ -150,11 +151,33 @@ static void free_netvsc_device(struct rcu_head *head) { struct netvsc_device *nvdev =3D container_of(head, struct netvsc_device, rcu); + unsigned int alloc_unit; int i; =20 kfree(nvdev->extension); - vfree(nvdev->recv_buf); - vfree(nvdev->send_buf); + + if (nvdev->recv_pages) { + alloc_unit =3D (nvdev->recv_buf_size / + nvdev->recv_page_count) >> PAGE_SHIFT; + + vunmap(nvdev->recv_buf); + for (i =3D 0; i < nvdev->recv_page_count; i++) + __free_pages(nvdev->recv_pages[i], alloc_unit); + } else { + vfree(nvdev->recv_buf); + } + + if (nvdev->send_pages) { + alloc_unit =3D (nvdev->send_buf_size / + nvdev->send_page_count) >> PAGE_SHIFT; + + vunmap(nvdev->send_buf); + for (i =3D 0; i < nvdev->send_page_count; i++) + __free_pages(nvdev->send_pages[i], alloc_unit); + } else { + vfree(nvdev->send_buf); + } + kfree(nvdev->send_section_map); =20 for (i =3D 0; i < VRSS_CHANNEL_MAX; i++) { @@ -330,6 +353,108 @@ int netvsc_alloc_recv_comp_ring(struct netvsc_device = *net_device, u32 q_idx) return nvchan->mrc.slots ? 0 : -ENOMEM; } =20 +void *netvsc_alloc_pages(struct page ***pages_array, unsigned int *array_l= en, + unsigned long size) +{ + struct page *page, **pages, **vmap_pages; + unsigned long pg_count =3D size >> PAGE_SHIFT; + int alloc_unit =3D MAX_ORDER_NR_PAGES; + int i, j, vmap_page_index =3D 0; + void *vaddr; + + if (pg_count < alloc_unit) + alloc_unit =3D 1; + + /* vmap() accepts page array with PAGE_SIZE as unit while try to + * allocate high order pages here in order to save page array space. + * vmap_pages[] is used as input parameter of vmap(). pages[] is to + * store allocated pages and map them later. + */ + vmap_pages =3D kmalloc_array(pg_count, sizeof(*vmap_pages), GFP_KERNEL); + if (!vmap_pages) + return NULL; + +retry: + *array_len =3D pg_count / alloc_unit; + pages =3D kmalloc_array(*array_len, sizeof(*pages), GFP_KERNEL); + if (!pages) + goto cleanup; + + for (i =3D 0; i < *array_len; i++) { + page =3D alloc_pages(GFP_KERNEL | __GFP_ZERO, + get_order(alloc_unit << PAGE_SHIFT)); + if (!page) { + /* Try allocating small pages if high order pages are not available. */ + if (alloc_unit =3D=3D 1) { + goto cleanup; + } else { + memset(vmap_pages, 0, + sizeof(*vmap_pages) * vmap_page_index); + vmap_page_index =3D 0; + + for (j =3D 0; j < i; j++) + __free_pages(pages[j], alloc_unit); + + kfree(pages); + alloc_unit =3D 1; + goto retry; + } + } + + pages[i] =3D page; + for (j =3D 0; j < alloc_unit; j++) + vmap_pages[vmap_page_index++] =3D page++; + } + + vaddr =3D vmap(vmap_pages, vmap_page_index, VM_MAP, PAGE_KERNEL); + kfree(vmap_pages); + + *pages_array =3D pages; + return vaddr; + +cleanup: + for (j =3D 0; j < i; j++) + __free_pages(pages[i], alloc_unit); + + kfree(pages); + kfree(vmap_pages); + return NULL; +} + +static void *netvsc_map_pages(struct page **pages, int count, int alloc_un= it) +{ + int pg_count =3D count * alloc_unit; + struct page *page; + unsigned long *pfns; + int pfn_index =3D 0; + void *vaddr; + int i, j; + + if (!pages) + return NULL; + + pfns =3D kcalloc(pg_count, sizeof(*pfns), GFP_KERNEL); + if (!pfns) + return NULL; + + for (i =3D 0; i < count; i++) { + page =3D pages[i]; + if (!page) { + pr_warn("page is not available %d.\n", i); + return NULL; + } + + for (j =3D 0; j < alloc_unit; j++) { + pfns[pfn_index++] =3D page_to_pfn(page++) + + (ms_hyperv.shared_gpa_boundary >> PAGE_SHIFT); + } + } + + vaddr =3D vmap_pfn(pfns, pg_count, PAGE_KERNEL_IO); + kfree(pfns); + return vaddr; +} + static int netvsc_init_buf(struct hv_device *device, struct netvsc_device *net_device, const struct netvsc_device_info *device_info) @@ -337,7 +462,7 @@ static int netvsc_init_buf(struct hv_device *device, struct nvsp_1_message_send_receive_buffer_complete *resp; struct net_device *ndev =3D hv_get_drvdata(device); struct nvsp_message *init_packet; - unsigned int buf_size; + unsigned int buf_size, alloc_unit; size_t map_words; int i, ret =3D 0; =20 @@ -350,7 +475,14 @@ static int netvsc_init_buf(struct hv_device *device, buf_size =3D min_t(unsigned int, buf_size, NETVSC_RECEIVE_BUFFER_SIZE_LEGACY); =20 - net_device->recv_buf =3D vzalloc(buf_size); + if (hv_isolation_type_snp()) + net_device->recv_buf =3D + netvsc_alloc_pages(&net_device->recv_pages, + &net_device->recv_page_count, + buf_size); + else + net_device->recv_buf =3D vzalloc(buf_size); + if (!net_device->recv_buf) { netdev_err(ndev, "unable to allocate receive buffer of size %u\n", @@ -375,6 +507,27 @@ static int netvsc_init_buf(struct hv_device *device, goto cleanup; } =20 + if (hv_isolation_type_snp()) { + alloc_unit =3D (buf_size / net_device->recv_page_count) + >> PAGE_SHIFT; + + /* Unmap previous virtual address and map pages in the extra + * address space(above shared gpa boundary) in Isolation VM. + */ + vunmap(net_device->recv_buf); + net_device->recv_buf =3D + netvsc_map_pages(net_device->recv_pages, + net_device->recv_page_count, + alloc_unit); + if (!net_device->recv_buf) { + netdev_err(ndev, + "unable to allocate receive buffer of size %u\n", + buf_size); + ret =3D -ENOMEM; + goto cleanup; + } + } + /* Notify the NetVsp of the gpadl handle */ init_packet =3D &net_device->channel_init_pkt; memset(init_packet, 0, sizeof(struct nvsp_message)); @@ -456,13 +609,21 @@ static int netvsc_init_buf(struct hv_device *device, buf_size =3D device_info->send_sections * device_info->send_section_size; buf_size =3D round_up(buf_size, PAGE_SIZE); =20 - net_device->send_buf =3D vzalloc(buf_size); + if (hv_isolation_type_snp()) + net_device->send_buf =3D + netvsc_alloc_pages(&net_device->send_pages, + &net_device->send_page_count, + buf_size); + else + net_device->send_buf =3D vzalloc(buf_size); + if (!net_device->send_buf) { netdev_err(ndev, "unable to allocate send buffer of size %u\n", buf_size); ret =3D -ENOMEM; goto cleanup; } + net_device->send_buf_size =3D buf_size; =20 /* Establish the gpadl handle for this buffer on this @@ -478,6 +639,27 @@ static int netvsc_init_buf(struct hv_device *device, goto cleanup; } =20 + if (hv_isolation_type_snp()) { + alloc_unit =3D (buf_size / net_device->send_page_count) + >> PAGE_SHIFT; + + /* Unmap previous virtual address and map pages in the extra + * address space(above shared gpa boundary) in Isolation VM. + */ + vunmap(net_device->send_buf); + net_device->send_buf =3D + netvsc_map_pages(net_device->send_pages, + net_device->send_page_count, + alloc_unit); + if (!net_device->send_buf) { + netdev_err(ndev, + "unable to allocate receive buffer of size %u\n", + buf_size); + ret =3D -ENOMEM; + goto cleanup; + } + } + /* Notify the NetVsp of the gpadl handle */ init_packet =3D &net_device->channel_init_pkt; memset(init_packet, 0, sizeof(struct nvsp_message)); @@ -768,7 +950,7 @@ static void netvsc_send_tx_complete(struct net_device *= ndev, =20 /* Notify the layer above us */ if (likely(skb)) { - const struct hv_netvsc_packet *packet + struct hv_netvsc_packet *packet =3D (struct hv_netvsc_packet *)skb->cb; u32 send_index =3D packet->send_buf_index; struct netvsc_stats *tx_stats; @@ -784,6 +966,7 @@ static void netvsc_send_tx_complete(struct net_device *= ndev, tx_stats->bytes +=3D packet->total_bytes; u64_stats_update_end(&tx_stats->syncp); =20 + netvsc_dma_unmap(ndev_ctx->device_ctx, packet); napi_consume_skb(skb, budget); } =20 @@ -948,6 +1131,87 @@ static void netvsc_copy_to_send_buf(struct netvsc_dev= ice *net_device, memset(dest, 0, padding); } =20 +void netvsc_dma_unmap(struct hv_device *hv_dev, + struct hv_netvsc_packet *packet) +{ + u32 page_count =3D packet->cp_partial ? + packet->page_buf_cnt - packet->rmsg_pgcnt : + packet->page_buf_cnt; + int i; + + if (!hv_is_isolation_supported()) + return; + + if (!packet->dma_range) + return; + + for (i =3D 0; i < page_count; i++) + dma_unmap_single(&hv_dev->device, packet->dma_range[i].dma, + packet->dma_range[i].mapping_size, + DMA_TO_DEVICE); + + kfree(packet->dma_range); +} + +/* netvsc_dma_map - Map swiotlb bounce buffer with data page of + * packet sent by vmbus_sendpacket_pagebuffer() in the Isolation + * VM. + * + * In isolation VM, netvsc send buffer has been marked visible to + * host and so the data copied to send buffer doesn't need to use + * bounce buffer. The data pages handled by vmbus_sendpacket_pagebuffer() + * may not be copied to send buffer and so these pages need to be + * mapped with swiotlb bounce buffer. netvsc_dma_map() is to do + * that. The pfns in the struct hv_page_buffer need to be converted + * to bounce buffer's pfn. The loop here is necessary because the + * entries in the page buffer array are not necessarily full + * pages of data. Each entry in the array has a separate offset and + * len that may be non-zero, even for entries in the middle of the + * array. And the entries are not physically contiguous. So each + * entry must be individually mapped rather than as a contiguous unit. + * So not use dma_map_sg() here. + */ +static int netvsc_dma_map(struct hv_device *hv_dev, + struct hv_netvsc_packet *packet, + struct hv_page_buffer *pb) +{ + u32 page_count =3D packet->cp_partial ? + packet->page_buf_cnt - packet->rmsg_pgcnt : + packet->page_buf_cnt; + dma_addr_t dma; + int i; + + if (!hv_is_isolation_supported()) + return 0; + + packet->dma_range =3D kcalloc(page_count, + sizeof(*packet->dma_range), + GFP_KERNEL); + if (!packet->dma_range) + return -ENOMEM; + + for (i =3D 0; i < page_count; i++) { + char *src =3D phys_to_virt((pb[i].pfn << HV_HYP_PAGE_SHIFT) + + pb[i].offset); + u32 len =3D pb[i].len; + + dma =3D dma_map_single(&hv_dev->device, src, len, + DMA_TO_DEVICE); + if (dma_mapping_error(&hv_dev->device, dma)) { + kfree(packet->dma_range); + return -ENOMEM; + } + + packet->dma_range[i].dma =3D dma; + packet->dma_range[i].mapping_size =3D len; + pb[i].pfn =3D dma >> HV_HYP_PAGE_SHIFT; + pb[i].offset =3D offset_in_hvpage(dma); + pb[i].len =3D len; + } + + return 0; +} + static inline int netvsc_send_pkt( struct hv_device *device, struct hv_netvsc_packet *packet, @@ -988,14 +1252,24 @@ static inline int netvsc_send_pkt( =20 trace_nvsp_send_pkt(ndev, out_channel, rpkt); =20 + packet->dma_range =3D NULL; if (packet->page_buf_cnt) { if (packet->cp_partial) pb +=3D packet->rmsg_pgcnt; =20 + ret =3D netvsc_dma_map(ndev_ctx->device_ctx, packet, pb); + if (ret) { + ret =3D -EAGAIN; + goto exit; + } + ret =3D vmbus_sendpacket_pagebuffer(out_channel, pb, packet->page_buf_cnt, &nvmsg, sizeof(nvmsg), req_id); + + if (ret) + netvsc_dma_unmap(ndev_ctx->device_ctx, packet); } else { ret =3D vmbus_sendpacket(out_channel, &nvmsg, sizeof(nvmsg), @@ -1003,6 +1277,7 @@ static inline int netvsc_send_pkt( VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); } =20 +exit: if (ret =3D=3D 0) { atomic_inc_return(&nvchan->queue_sends); =20 diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_dr= v.c index 382bebc2420d..c3dc884b31e3 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@ -2577,6 +2577,7 @@ static int netvsc_probe(struct hv_device *dev, list_add(&net_device_ctx->list, &netvsc_dev_list); rtnl_unlock(); =20 + dma_set_min_align_mask(&dev->device, HV_HYP_PAGE_SIZE - 1); netvsc_devinfo_put(device_info); return 0; =20 diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_f= ilter.c index f6c9c2a670f9..448fcc325ed7 100644 --- a/drivers/net/hyperv/rndis_filter.c +++ b/drivers/net/hyperv/rndis_filter.c @@ -361,6 +361,8 @@ static void rndis_filter_receive_response(struct net_de= vice *ndev, } } =20 + netvsc_dma_unmap(((struct net_device_context *) + netdev_priv(ndev))->device_ctx, &request->pkt); complete(&request->wait_event); } else { netdev_err(ndev, diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index c94c534a944e..81e58dd582dc 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1597,6 +1597,11 @@ struct hyperv_service_callback { void (*callback)(void *context); }; =20 +struct hv_dma_range { + dma_addr_t dma; + u32 mapping_size; +}; + #define MAX_SRV_VER 0x7ffffff extern bool vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, u8 *buf= , u32 buflen, const int *fw_version, int fw_vercnt, --=20 2.25.1