From nobody Fri Apr 19 13:42:45 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=1631626808; cv=none; d=zohomail.com; s=zohoarc; b=a/wlTgrePMaSj3FbCDCqPdOxCGphkOmpy3qVPOo/jNo1Nimb4UYWdY6xIgvkByUhSfz07vV1ct90qW0zaf2+4pPZ5kmtZndONTKBo18NSB9g9g50HfhvQEV1fI60xGP6/Z4HQEZYLLjkDMris77IZwwiCKRiyUfj1CpBiP84yPw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631626808; 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=02yTUUUdT/7RUZ1OmKs0RzX0RhFgmF+tfZ6adAfAN0Q=; b=dyFkto3Xo/+NHLTj5Hjbjs+A2HjkYjrEg4hzhav7IqHPWWmaIln5Gs173OtJuJvcJJKt++R0rP2fLUrKMC1KWaB2wnBB13TJx4G4F4Kwy2PUbIxe+AvJgd68n1OUKfU77GVsBZxPPq0up2ESZkdpGLxRqsAlDg6TfE1g+1Uo17M= 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 1631626808174676.9687807944783; Tue, 14 Sep 2021 06:40:08 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.186654.335420 (Exim 4.92) (envelope-from ) id 1mQ8f9-0003cj-1V; Tue, 14 Sep 2021 13:39:51 +0000 Received: by outflank-mailman (output) from mailman id 186654.335420; Tue, 14 Sep 2021 13:39:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mQ8f8-0003cW-TJ; Tue, 14 Sep 2021 13:39:50 +0000 Received: by outflank-mailman (input) for mailman id 186654; Tue, 14 Sep 2021 13:39:49 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1mQ8f7-0001wz-RQ for xen-devel@lists.xenproject.org; Tue, 14 Sep 2021 13:39:49 +0000 Received: from mail-pf1-x42a.google.com (unknown [2607:f8b0:4864:20::42a]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 0c1cf805-08fe-4e35-9547-26d1d010eea5; Tue, 14 Sep 2021 13:39:35 +0000 (UTC) Received: by mail-pf1-x42a.google.com with SMTP id j16so12255448pfc.2 for ; Tue, 14 Sep 2021 06:39:35 -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.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Sep 2021 06:39:33 -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: 0c1cf805-08fe-4e35-9547-26d1d010eea5 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=02yTUUUdT/7RUZ1OmKs0RzX0RhFgmF+tfZ6adAfAN0Q=; b=ArjBR52nkO4bzAaOf5wvfC4rn632GJGm1maXaaJ0TgHHpjedDqm+WJBv+1VeIaZgH8 5flQwVivXRx6pq+gRBaVASuOXo4ymVynu6o0WucDl6BnBxy/91jZ+nwMIgdhlKICaUAN fL2xHyxJgQNN+aDYvnsnscMMXj3E3OC8kfXdFSGOUc0+WouUasML3nSV8Cf8i+dRrNsL SBZXPNecPo4cfaG1kwB4eYB7mQqvkhfeKDY6slY3Csa2hCRcX2Jhc3s7mqeRwF6/hgpa VplUwV00fbi/jQIiWIZD05ygm/4jJojIcYosTkxoDhhh7QGJk2WMeezVJnuWZVbEcLJ2 7OGw== 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=02yTUUUdT/7RUZ1OmKs0RzX0RhFgmF+tfZ6adAfAN0Q=; b=adH0pCISCGDrI3QbxvZ4akEWsxwYW7CPESIhHZGIMhaKt96J7om7vPgKenfJ1/ZrFq WqeKGzVfdD6EvVHEbs/dGFeNXrZ7e7cnPCETN1E/iViAY7HWRR6/2H34H1TQQ6LwdRlb WLAAyE5w+6dBJGHFT7dgoJPRKiV8MUGiaP6FLmybCj+GcAiFAgO6da7F+jm2DLZoWjxR kR1/N7h6KhJAmiVCPeJYFv3Zk4lpynbjfR3dlLDDDDwlTy4SHCErzWLuAw8yniWd3k6Y x5p97oPD8uur47Sh+FRIzgB0vzPJ5bVEMZNGyOaAiGfnPav6FWMVsgdl2Oh4BEB7IT6g Srgg== X-Gm-Message-State: AOAM531Z8PlRy5qXZXvnW+oYr2dRDwMHMn5PCbhMgrRS2j430bBmCeWf NOMD2OCFUFG9YSKJATKjHLY= X-Google-Smtp-Source: ABdhPJzPDtIgzdi7XXhZ9rLdA7pHLUxlkJdK1Y4rWJkJJlHJjwPXRjwfsPAQ3lITRYtRblyGoAlIXQ== X-Received: by 2002:a63:6544:: with SMTP id z65mr15696367pgb.325.1631626774304; Tue, 14 Sep 2021 06:39:34 -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 04/12] Drivers: hv: vmbus: Mark vmbus ring buffer visible to host in Isolation VM Date: Tue, 14 Sep 2021 09:39:05 -0400 Message-Id: <20210914133916.1440931-5-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: 1631626810202100003 Content-Type: text/plain; charset="utf-8" From: Tianyu Lan Mark vmbus ring buffer visible with set_memory_decrypted() when establish gpadl handle. Signed-off-by: Tianyu Lan --- Change sincv v4 * Change gpadl handle in netvsc and uio driver from u32 to struct vmbus_gpadl. * Change vmbus_establish_gpadl()'s gpadl_handle parameter to vmbus_gpadl data structure. Change since v3: * Change vmbus_teardown_gpadl() parameter and put gpadl handle, buffer and buffer size in the struct vmbus_gpadl. --- drivers/hv/channel.c | 54 ++++++++++++++++++++++++--------- drivers/net/hyperv/hyperv_net.h | 5 +-- drivers/net/hyperv/netvsc.c | 17 ++++++----- drivers/uio/uio_hv_generic.c | 20 ++++++------ include/linux/hyperv.h | 12 ++++++-- 5 files changed, 71 insertions(+), 37 deletions(-) diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index f3761c73b074..cf419eb1de77 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -17,6 +17,7 @@ #include #include #include +#include #include #include =20 @@ -456,7 +457,7 @@ static int create_gpadl_header(enum hv_gpadl_type type,= void *kbuffer, static int __vmbus_establish_gpadl(struct vmbus_channel *channel, enum hv_gpadl_type type, void *kbuffer, u32 size, u32 send_offset, - u32 *gpadl_handle) + struct vmbus_gpadl *gpadl) { struct vmbus_channel_gpadl_header *gpadlmsg; struct vmbus_channel_gpadl_body *gpadl_body; @@ -474,6 +475,15 @@ static int __vmbus_establish_gpadl(struct vmbus_channe= l *channel, if (ret) return ret; =20 + ret =3D set_memory_decrypted((unsigned long)kbuffer, + HVPFN_UP(size)); + if (ret) { + dev_warn(&channel->device_obj->device, + "Failed to set host visibility for new GPADL %d.\n", + ret); + return ret; + } + init_completion(&msginfo->waitevent); msginfo->waiting_channel =3D channel; =20 @@ -537,7 +547,10 @@ static int __vmbus_establish_gpadl(struct vmbus_channe= l *channel, } =20 /* At this point, we received the gpadl created msg */ - *gpadl_handle =3D gpadlmsg->gpadl; + gpadl->gpadl_handle =3D gpadlmsg->gpadl; + gpadl->buffer =3D kbuffer; + gpadl->size =3D size; + =20 cleanup: spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); @@ -549,6 +562,11 @@ static int __vmbus_establish_gpadl(struct vmbus_channe= l *channel, } =20 kfree(msginfo); + + if (ret) + set_memory_encrypted((unsigned long)kbuffer, + HVPFN_UP(size)); + return ret; } =20 @@ -561,10 +579,10 @@ static int __vmbus_establish_gpadl(struct vmbus_chann= el *channel, * @gpadl_handle: some funky thing */ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, - u32 size, u32 *gpadl_handle) + u32 size, struct vmbus_gpadl *gpadl) { return __vmbus_establish_gpadl(channel, HV_GPADL_BUFFER, kbuffer, size, - 0U, gpadl_handle); + 0U, gpadl); } EXPORT_SYMBOL_GPL(vmbus_establish_gpadl); =20 @@ -639,6 +657,7 @@ static int __vmbus_open(struct vmbus_channel *newchanne= l, struct vmbus_channel_open_channel *open_msg; struct vmbus_channel_msginfo *open_info =3D NULL; struct page *page =3D newchannel->ringbuffer_page; + struct vmbus_gpadl gpadl; u32 send_pages, recv_pages; unsigned long flags; int err; @@ -675,7 +694,7 @@ static int __vmbus_open(struct vmbus_channel *newchanne= l, goto error_clean_ring; =20 /* Establish the gpadl for the ring buffer */ - newchannel->ringbuffer_gpadlhandle =3D 0; + newchannel->ringbuffer_gpadlhandle.gpadl_handle =3D 0; =20 err =3D __vmbus_establish_gpadl(newchannel, HV_GPADL_RING, page_address(newchannel->ringbuffer_page), @@ -701,7 +720,8 @@ static int __vmbus_open(struct vmbus_channel *newchanne= l, open_msg->header.msgtype =3D CHANNELMSG_OPENCHANNEL; open_msg->openid =3D newchannel->offermsg.child_relid; open_msg->child_relid =3D newchannel->offermsg.child_relid; - open_msg->ringbuffer_gpadlhandle =3D newchannel->ringbuffer_gpadlhandle; + open_msg->ringbuffer_gpadlhandle + =3D newchannel->ringbuffer_gpadlhandle.gpadl_handle; /* * The unit of ->downstream_ringbuffer_pageoffset is HV_HYP_PAGE and * the unit of ->ringbuffer_send_offset (i.e. send_pages) is PAGE, so @@ -759,8 +779,8 @@ static int __vmbus_open(struct vmbus_channel *newchanne= l, error_free_info: kfree(open_info); error_free_gpadl: - vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle); - newchannel->ringbuffer_gpadlhandle =3D 0; + vmbus_teardown_gpadl(newchannel, &newchannel->ringbuffer_gpadlhandle); + newchannel->ringbuffer_gpadlhandle.gpadl_handle =3D 0; error_clean_ring: hv_ringbuffer_cleanup(&newchannel->outbound); hv_ringbuffer_cleanup(&newchannel->inbound); @@ -806,7 +826,7 @@ EXPORT_SYMBOL_GPL(vmbus_open); /* * vmbus_teardown_gpadl -Teardown the specified GPADL handle */ -int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) +int vmbus_teardown_gpadl(struct vmbus_channel *channel, struct vmbus_gpadl= *gpadl) { struct vmbus_channel_gpadl_teardown *msg; struct vmbus_channel_msginfo *info; @@ -825,7 +845,7 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel,= u32 gpadl_handle) =20 msg->header.msgtype =3D CHANNELMSG_GPADL_TEARDOWN; msg->child_relid =3D channel->offermsg.child_relid; - msg->gpadl =3D gpadl_handle; + msg->gpadl =3D gpadl->gpadl_handle; =20 spin_lock_irqsave(&vmbus_connection.channelmsg_lock, flags); list_add_tail(&info->msglistentry, @@ -859,6 +879,12 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel= , u32 gpadl_handle) spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); =20 kfree(info); + + ret =3D set_memory_encrypted((unsigned long)gpadl->buffer, + HVPFN_UP(gpadl->size)); + if (ret) + pr_warn("Fail to set mem host visibility in GPADL teardown %d.\n", ret); + return ret; } EXPORT_SYMBOL_GPL(vmbus_teardown_gpadl); @@ -896,6 +922,7 @@ void vmbus_reset_channel_cb(struct vmbus_channel *chann= el) static int vmbus_close_internal(struct vmbus_channel *channel) { struct vmbus_channel_close_channel *msg; + struct vmbus_gpadl gpadl; int ret; =20 vmbus_reset_channel_cb(channel); @@ -933,9 +960,8 @@ static int vmbus_close_internal(struct vmbus_channel *c= hannel) } =20 /* Tear down the gpadl for the channel's ring buffer */ - else if (channel->ringbuffer_gpadlhandle) { - ret =3D vmbus_teardown_gpadl(channel, - channel->ringbuffer_gpadlhandle); + else if (channel->ringbuffer_gpadlhandle.gpadl_handle) { + ret =3D vmbus_teardown_gpadl(channel, &channel->ringbuffer_gpadlhandle); if (ret) { pr_err("Close failed: teardown gpadl return %d\n", ret); /* @@ -944,7 +970,7 @@ static int vmbus_close_internal(struct vmbus_channel *c= hannel) */ } =20 - channel->ringbuffer_gpadlhandle =3D 0; + channel->ringbuffer_gpadlhandle.gpadl_handle =3D 0; } =20 if (!ret) diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_ne= t.h index bc48855dff10..315278a7cf88 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -1075,14 +1075,15 @@ struct netvsc_device { /* Receive buffer allocated by us but manages by NetVSP */ void *recv_buf; u32 recv_buf_size; /* allocated bytes */ - u32 recv_buf_gpadl_handle; + struct vmbus_gpadl recv_buf_gpadl_handle; u32 recv_section_cnt; u32 recv_section_size; u32 recv_completion_cnt; =20 /* Send buffer allocated by us */ void *send_buf; - u32 send_buf_gpadl_handle; + u32 send_buf_size; + struct vmbus_gpadl send_buf_gpadl_handle; u32 send_section_cnt; u32 send_section_size; unsigned long *send_section_map; diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 7bd935412853..1f87e570ed2b 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -278,9 +278,9 @@ static void netvsc_teardown_recv_gpadl(struct hv_device= *device, { int ret; =20 - if (net_device->recv_buf_gpadl_handle) { + if (net_device->recv_buf_gpadl_handle.gpadl_handle) { ret =3D vmbus_teardown_gpadl(device->channel, - net_device->recv_buf_gpadl_handle); + &net_device->recv_buf_gpadl_handle); =20 /* If we failed here, we might as well return and have a leak * rather than continue and a bugchk @@ -290,7 +290,7 @@ static void netvsc_teardown_recv_gpadl(struct hv_device= *device, "unable to teardown receive buffer's gpadl\n"); return; } - net_device->recv_buf_gpadl_handle =3D 0; + net_device->recv_buf_gpadl_handle.gpadl_handle =3D 0; } } =20 @@ -300,9 +300,9 @@ static void netvsc_teardown_send_gpadl(struct hv_device= *device, { int ret; =20 - if (net_device->send_buf_gpadl_handle) { + if (net_device->send_buf_gpadl_handle.gpadl_handle) { ret =3D vmbus_teardown_gpadl(device->channel, - net_device->send_buf_gpadl_handle); + &net_device->send_buf_gpadl_handle); =20 /* If we failed here, we might as well return and have a leak * rather than continue and a bugchk @@ -312,7 +312,7 @@ static void netvsc_teardown_send_gpadl(struct hv_device= *device, "unable to teardown send buffer's gpadl\n"); return; } - net_device->send_buf_gpadl_handle =3D 0; + net_device->send_buf_gpadl_handle.gpadl_handle =3D 0; } } =20 @@ -380,7 +380,7 @@ static int netvsc_init_buf(struct hv_device *device, memset(init_packet, 0, sizeof(struct nvsp_message)); init_packet->hdr.msg_type =3D NVSP_MSG1_TYPE_SEND_RECV_BUF; init_packet->msg.v1_msg.send_recv_buf. - gpadl_handle =3D net_device->recv_buf_gpadl_handle; + gpadl_handle =3D net_device->recv_buf_gpadl_handle.gpadl_handle; init_packet->msg.v1_msg. send_recv_buf.id =3D NETVSC_RECEIVE_BUFFER_ID; =20 @@ -463,6 +463,7 @@ static int netvsc_init_buf(struct hv_device *device, ret =3D -ENOMEM; goto cleanup; } + net_device->send_buf_size =3D buf_size; =20 /* Establish the gpadl handle for this buffer on this * channel. Note: This call uses the vmbus connection rather @@ -482,7 +483,7 @@ static int netvsc_init_buf(struct hv_device *device, memset(init_packet, 0, sizeof(struct nvsp_message)); init_packet->hdr.msg_type =3D NVSP_MSG1_TYPE_SEND_SEND_BUF; init_packet->msg.v1_msg.send_send_buf.gpadl_handle =3D - net_device->send_buf_gpadl_handle; + net_device->send_buf_gpadl_handle.gpadl_handle; init_packet->msg.v1_msg.send_send_buf.id =3D NETVSC_SEND_BUFFER_ID; =20 trace_nvsp_send(ndev, init_packet); diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c index 652fe2547587..548243dcd895 100644 --- a/drivers/uio/uio_hv_generic.c +++ b/drivers/uio/uio_hv_generic.c @@ -58,11 +58,11 @@ struct hv_uio_private_data { atomic_t refcnt; =20 void *recv_buf; - u32 recv_gpadl; + struct vmbus_gpadl recv_gpadl; char recv_name[32]; /* "recv_4294967295" */ =20 void *send_buf; - u32 send_gpadl; + struct vmbus_gpadl send_gpadl; char send_name[32]; }; =20 @@ -179,15 +179,15 @@ hv_uio_new_channel(struct vmbus_channel *new_sc) static void hv_uio_cleanup(struct hv_device *dev, struct hv_uio_private_data *pdata) { - if (pdata->send_gpadl) { - vmbus_teardown_gpadl(dev->channel, pdata->send_gpadl); - pdata->send_gpadl =3D 0; + if (pdata->send_gpadl.gpadl_handle) { + vmbus_teardown_gpadl(dev->channel, &pdata->send_gpadl); + pdata->send_gpadl.gpadl_handle =3D 0; vfree(pdata->send_buf); } =20 - if (pdata->recv_gpadl) { - vmbus_teardown_gpadl(dev->channel, pdata->recv_gpadl); - pdata->recv_gpadl =3D 0; + if (pdata->recv_gpadl.gpadl_handle) { + vmbus_teardown_gpadl(dev->channel, &pdata->recv_gpadl); + pdata->recv_gpadl.gpadl_handle =3D 0; vfree(pdata->recv_buf); } } @@ -303,7 +303,7 @@ hv_uio_probe(struct hv_device *dev, =20 /* put Global Physical Address Label in name */ snprintf(pdata->recv_name, sizeof(pdata->recv_name), - "recv:%u", pdata->recv_gpadl); + "recv:%u", pdata->recv_gpadl.gpadl_handle); pdata->info.mem[RECV_BUF_MAP].name =3D pdata->recv_name; pdata->info.mem[RECV_BUF_MAP].addr =3D (uintptr_t)pdata->recv_buf; @@ -324,7 +324,7 @@ hv_uio_probe(struct hv_device *dev, } =20 snprintf(pdata->send_name, sizeof(pdata->send_name), - "send:%u", pdata->send_gpadl); + "send:%u", pdata->send_gpadl.gpadl_handle); pdata->info.mem[SEND_BUF_MAP].name =3D pdata->send_name; pdata->info.mem[SEND_BUF_MAP].addr =3D (uintptr_t)pdata->send_buf; diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index ddc8713ce57b..a9e0bc3b1511 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -803,6 +803,12 @@ struct vmbus_device { =20 #define VMBUS_DEFAULT_MAX_PKT_SIZE 4096 =20 +struct vmbus_gpadl { + u32 gpadl_handle; + u32 size; + void *buffer; +}; + struct vmbus_channel { struct list_head listentry; =20 @@ -822,7 +828,7 @@ struct vmbus_channel { bool rescind_ref; /* got rescind msg, got channel reference */ struct completion rescind_event; =20 - u32 ringbuffer_gpadlhandle; + struct vmbus_gpadl ringbuffer_gpadlhandle; =20 /* Allocated memory for ring buffer */ struct page *ringbuffer_page; @@ -1192,10 +1198,10 @@ extern int vmbus_sendpacket_mpb_desc(struct vmbus_c= hannel *channel, extern int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, u32 size, - u32 *gpadl_handle); + struct vmbus_gpadl *gpadl); =20 extern int vmbus_teardown_gpadl(struct vmbus_channel *channel, - u32 gpadl_handle); + struct vmbus_gpadl *gpadl); =20 void vmbus_reset_channel_cb(struct vmbus_channel *channel); =20 --=20 2.25.1