From patchwork Sun Feb 28 15:03:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 389069 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42ED0C4332B for ; Sun, 28 Feb 2021 15:05:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1256464EC4 for ; Sun, 28 Feb 2021 15:05:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230450AbhB1PFA (ORCPT ); Sun, 28 Feb 2021 10:05:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50036 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbhB1PEx (ORCPT ); Sun, 28 Feb 2021 10:04:53 -0500 Received: from mail-pl1-x632.google.com (mail-pl1-x632.google.com [IPv6:2607:f8b0:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 168A2C061756; Sun, 28 Feb 2021 07:04:13 -0800 (PST) Received: by mail-pl1-x632.google.com with SMTP id z7so8243847plk.7; Sun, 28 Feb 2021 07:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=MqxUHxHYo8+c1jYpL0L/dr5SR36XdEsRZ+oLrFj9d94=; b=R4eMTeyo0ic2t0JxgzfoCsZippm5DdR632ssqn04mpQStF/jtaI+bYwRaB/nJ33Opj mfO3AfHeKLW9UFSGLp33DaHcOjitQHihjKiksFdzmfUk5cvBMPD0zHFCjmeGCb5bsLG1 siwNNUA3xBXndbWP6Op7A3VEURlHN1s/hbtHXH43is7U7R+lXYcail/S1EiEJ/mjEy6B edxFJA5BZIuHfXfiFVchp1fkxd7MMtuHvslPTchKWzauKNBiwWzkorQZXJp4iQoFNcKz ceJos9/2tjT1fUvaPXZgjNoxaLCS3l58UjVwRQIT5GhFYitgj7nkliDysqQvP/dse9cY fzow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=MqxUHxHYo8+c1jYpL0L/dr5SR36XdEsRZ+oLrFj9d94=; b=rqnEUDSvScVjtrASxi2wwHcIl8nh0IQVgIyg+n27TmTQ86kvN7HGo81PvDpIUwi93r GK68ib8c5VjmRKSwdESLrvQJk27mrBx4g3jeXPM6tROP5aIVZVJ0U3lQIQGh1FXeZbtG qhiTr9uZIE14CNtbtBCYV2hpvUz4zqW8VLH9SuMyuzkB1iqEwAkvyzPkSfpXs0lNb+jX VCi5NN9TMS/gpDdN43PG/CvBG+2RazT6fIpQ6CQLlrw+BD5QUdRndm5i27vFAWI/zCIH oTpC6tlZV+hORFPlwWTbC+/xZKXrvP9cBQhFDPzjLeOOhDd6vyVN9t9SfSNhwYzG8HXh wQNA== X-Gm-Message-State: AOAM530AiLpuXUfn36WROB+kVKswsMWidxpQvyD6VoL334fi2s4SHu/J VeYBQ5EJYuUGpkN9sJ3vQ4YiqdEbVQVMXA== X-Google-Smtp-Source: ABdhPJzCEJC6JXx0EENDqxZeKuB3gtuSR5ouT4RMMypteX5DkJE+5KD/22D5GDlkJ4t3WLz+AoKOaQ== X-Received: by 2002:a17:90a:ce92:: with SMTP id g18mr6579833pju.52.1614524652573; Sun, 28 Feb 2021 07:04:12 -0800 (PST) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:0:561f:afde:af07:8820]) by smtp.gmail.com with ESMTPSA id 142sm8391331pfz.196.2021.02.28.07.04.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 07:04:12 -0800 (PST) From: Tianyu Lan To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, davem@davemloft.net, kuba@kernel.org, gregkh@linuxfoundation.org Cc: Tianyu Lan , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, vkuznets@redhat.com, thomas.lendacky@amd.com, brijesh.singh@amd.com, sunilmut@microsoft.com Subject: [RFC PATCH 1/12] x86/Hyper-V: Add visibility parameter for vmbus_establish_gpadl() Date: Sun, 28 Feb 2021 10:03:04 -0500 Message-Id: <20210228150315.2552437-2-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210228150315.2552437-1-ltykernel@gmail.com> References: <20210228150315.2552437-1-ltykernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tianyu Lan Add visibility parameter for vmbus_establish_gpadl() and prepare to change host visibility when create gpadl for buffer. Signed-off-by: Sunil Muthuswamy Co-Developed-by: Sunil Muthuswamy Signed-off-by: Tianyu Lan --- arch/x86/include/asm/hyperv-tlfs.h | 9 +++++++++ drivers/hv/channel.c | 20 +++++++++++--------- drivers/net/hyperv/netvsc.c | 8 ++++++-- drivers/uio/uio_hv_generic.c | 7 +++++-- include/linux/hyperv.h | 3 ++- 5 files changed, 33 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index e6cd3fee562b..fb1893a4c32b 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -236,6 +236,15 @@ enum hv_isolation_type { /* TSC invariant control */ #define HV_X64_MSR_TSC_INVARIANT_CONTROL 0x40000118 +/* Hyper-V GPA map flags */ +#define HV_MAP_GPA_PERMISSIONS_NONE 0x0 +#define HV_MAP_GPA_READABLE 0x1 +#define HV_MAP_GPA_WRITABLE 0x2 + +#define VMBUS_PAGE_VISIBLE_READ_ONLY HV_MAP_GPA_READABLE +#define VMBUS_PAGE_VISIBLE_READ_WRITE (HV_MAP_GPA_READABLE|HV_MAP_GPA_WRITABLE) +#define VMBUS_PAGE_NOT_VISIBLE HV_MAP_GPA_PERMISSIONS_NONE + /* * Declare the MSR used to setup pages used to communicate with the hypervisor. */ diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index 0bd202de7960..daa21cc72beb 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -242,7 +242,7 @@ EXPORT_SYMBOL_GPL(vmbus_send_modifychannel); */ static int create_gpadl_header(enum hv_gpadl_type type, void *kbuffer, u32 size, u32 send_offset, - struct vmbus_channel_msginfo **msginfo) + struct vmbus_channel_msginfo **msginfo, u32 visibility) { int i; int pagecount; @@ -391,7 +391,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) + u32 *gpadl_handle, u32 visibility) { struct vmbus_channel_gpadl_header *gpadlmsg; struct vmbus_channel_gpadl_body *gpadl_body; @@ -405,7 +405,8 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel, next_gpadl_handle = (atomic_inc_return(&vmbus_connection.next_gpadl_handle) - 1); - ret = create_gpadl_header(type, kbuffer, size, send_offset, &msginfo); + ret = create_gpadl_header(type, kbuffer, size, send_offset, + &msginfo, visibility); if (ret) return ret; @@ -496,10 +497,10 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel, * @gpadl_handle: some funky thing */ int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, - u32 size, u32 *gpadl_handle) + u32 size, u32 *gpadl_handle, u32 visibility) { return __vmbus_establish_gpadl(channel, HV_GPADL_BUFFER, kbuffer, size, - 0U, gpadl_handle); + 0U, gpadl_handle, visibility); } EXPORT_SYMBOL_GPL(vmbus_establish_gpadl); @@ -610,10 +611,11 @@ static int __vmbus_open(struct vmbus_channel *newchannel, newchannel->ringbuffer_gpadlhandle = 0; err = __vmbus_establish_gpadl(newchannel, HV_GPADL_RING, - page_address(newchannel->ringbuffer_page), - (send_pages + recv_pages) << PAGE_SHIFT, - newchannel->ringbuffer_send_offset << PAGE_SHIFT, - &newchannel->ringbuffer_gpadlhandle); + page_address(newchannel->ringbuffer_page), + (send_pages + recv_pages) << PAGE_SHIFT, + newchannel->ringbuffer_send_offset << PAGE_SHIFT, + &newchannel->ringbuffer_gpadlhandle, + VMBUS_PAGE_VISIBLE_READ_WRITE); if (err) goto error_clean_ring; diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 2353623259f3..bb72c7578330 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -333,7 +333,8 @@ static int netvsc_init_buf(struct hv_device *device, */ ret = vmbus_establish_gpadl(device->channel, net_device->recv_buf, buf_size, - &net_device->recv_buf_gpadl_handle); + &net_device->recv_buf_gpadl_handle, + VMBUS_PAGE_VISIBLE_READ_WRITE); if (ret != 0) { netdev_err(ndev, "unable to establish receive buffer's gpadl\n"); @@ -422,10 +423,13 @@ static int netvsc_init_buf(struct hv_device *device, /* Establish the gpadl handle for this buffer on this * channel. Note: This call uses the vmbus connection rather * than the channel to establish the gpadl handle. + * Send buffer should theoretically be only marked as "read-only", but + * the netvsp for some reason needs write capabilities on it. */ ret = vmbus_establish_gpadl(device->channel, net_device->send_buf, buf_size, - &net_device->send_buf_gpadl_handle); + &net_device->send_buf_gpadl_handle, + VMBUS_PAGE_VISIBLE_READ_WRITE); if (ret != 0) { netdev_err(ndev, "unable to establish send buffer's gpadl\n"); diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c index 0330ba99730e..813a7bee5139 100644 --- a/drivers/uio/uio_hv_generic.c +++ b/drivers/uio/uio_hv_generic.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "../hv/hyperv_vmbus.h" @@ -295,7 +296,8 @@ hv_uio_probe(struct hv_device *dev, } ret = vmbus_establish_gpadl(channel, pdata->recv_buf, - RECV_BUFFER_SIZE, &pdata->recv_gpadl); + RECV_BUFFER_SIZE, &pdata->recv_gpadl, + VMBUS_PAGE_VISIBLE_READ_WRITE); if (ret) goto fail_close; @@ -315,7 +317,8 @@ hv_uio_probe(struct hv_device *dev, } ret = vmbus_establish_gpadl(channel, pdata->send_buf, - SEND_BUFFER_SIZE, &pdata->send_gpadl); + SEND_BUFFER_SIZE, &pdata->send_gpadl, + VMBUS_PAGE_VISIBLE_READ_ONLY); if (ret) goto fail_close; diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index f1d74dcf0353..016fdca20d6e 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1179,7 +1179,8 @@ extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, extern int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, u32 size, - u32 *gpadl_handle); + u32 *gpadl_handle, + u32 visibility); extern int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle); From patchwork Sun Feb 28 15:03:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 388591 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 029CCC433DB for ; Sun, 28 Feb 2021 15:05:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9E30D64E56 for ; Sun, 28 Feb 2021 15:05:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230480AbhB1PFI (ORCPT ); Sun, 28 Feb 2021 10:05:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230408AbhB1PEy (ORCPT ); Sun, 28 Feb 2021 10:04:54 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF2F0C061786; Sun, 28 Feb 2021 07:04:13 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id u12so9437064pjr.2; Sun, 28 Feb 2021 07:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=afDh1ezD+1nZvgNHAzBZmDH+i7mNNVna0YI1LzLuZk4=; b=F6AOTF9aaRw70RjmvFvKFwDEI+xlUD5/9YCEMhLVTMAqBak/RKEeOax3ElrdXBMhGH uS8TdBkUqJ8+z6s63H4yZ7qu/ocBkQj1KfZ0yKz2skXQZDqs7r39IjB9a1hIedJIhTSp 6wbKE2egPKO7qYTsdFDDWPvPPJaSnLo4nHNgFy2LY3LE/KJfmxKbiWtQ2URkkjvRpN8v SudiPFpEdVLMDTccu5+amC4/npNfqnhRKHH94SoYPnI1nT3lI8lkHmTiLYwpil5m7GrY /b9ydhTcN4RDxh4ilYXlmSb2cMnCPnAo3FDqNtaglg5Zi8BZ9YbkJ0ue8YWvqXBLnlHN yZzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=afDh1ezD+1nZvgNHAzBZmDH+i7mNNVna0YI1LzLuZk4=; b=bQsI1fgkLy5GiOBFJIj8q0QQqP4KYAENMqssEXWzb6mX9MlU0Q8gRiB8mZ4tI3p1Ri Vk3IYf9DSipnIZhFLntLXaI420/CrXQTzOG4JPTbVPht3mrtieoa9JDRk1KoJyvS3KAk V/HKjr+izPob/hX9VZjYHtt2E3blfodm+zMulsBSms5LhnE6o2WtUAz5HFWer7La0n/t kjZ7QG6e4gM0INzLCmh8Fn4GfAxnd+H7A8XsY+AuwW5rjkVpt5a+e0OSyveHQDYpnxdi g67xnqVZZ+ydLcP9GqJYvvuGc8lSr2KeAnkIqHlvzXAIGdLxkCr/ZwdFymwNLccki46s GfCA== X-Gm-Message-State: AOAM530m8zlI2E98KuXzFqHS0ryubD45DJg8QnQDPs4CR2R7Ss4iKNlq QJiRI2qp4eEJh6L5S/6Nk04= X-Google-Smtp-Source: ABdhPJx5m2fsI8Kmpe9Q2F0GcqjRQzrE6put3+t6RaMSSlY52R4Lkc+tj0QgE21NSefk7DITqp5uSA== X-Received: by 2002:a17:90a:4fc1:: with SMTP id q59mr13214973pjh.129.1614524653406; Sun, 28 Feb 2021 07:04:13 -0800 (PST) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:0:561f:afde:af07:8820]) by smtp.gmail.com with ESMTPSA id 142sm8391331pfz.196.2021.02.28.07.04.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 07:04:13 -0800 (PST) From: Tianyu Lan To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, x86@kernel.org, hpa@zytor.com, davem@davemloft.net, kuba@kernel.org, gregkh@linuxfoundation.org, arnd@arndb.de Cc: Tianyu Lan , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-arch@vger.kernel.org, vkuznets@redhat.com, thomas.lendacky@amd.com, brijesh.singh@amd.com, sunilmut@microsoft.com Subject: [RFC PATCH 2/12] x86/Hyper-V: Add new hvcall guest address host visibility support Date: Sun, 28 Feb 2021 10:03:05 -0500 Message-Id: <20210228150315.2552437-3-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210228150315.2552437-1-ltykernel@gmail.com> References: <20210228150315.2552437-1-ltykernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tianyu Lan Add new hvcall guest address host visibility support. Mark vmbus ring buffer visible to host when create gpadl buffer and mark back to not visible when tear down gpadl buffer. Signed-off-by: Sunil Muthuswamy Co-Developed-by: Sunil Muthuswamy Signed-off-by: Tianyu Lan --- arch/x86/include/asm/hyperv-tlfs.h | 13 ++++++++ arch/x86/include/asm/mshyperv.h | 4 +-- arch/x86/kernel/cpu/mshyperv.c | 46 ++++++++++++++++++++++++++ drivers/hv/channel.c | 53 ++++++++++++++++++++++++++++-- drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc.c | 9 +++-- drivers/uio/uio_hv_generic.c | 6 ++-- include/asm-generic/hyperv-tlfs.h | 1 + include/linux/hyperv.h | 3 +- 9 files changed, 126 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index fb1893a4c32b..d22b1c3f425a 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h @@ -573,4 +573,17 @@ enum hv_interrupt_type { #include +/* All input parameters should be in single page. */ +#define HV_MAX_MODIFY_GPA_REP_COUNT \ + ((PAGE_SIZE - 2 * sizeof(u64)) / (sizeof(u64))) + +/* HvCallModifySparseGpaPageHostVisibility hypercall */ +struct hv_input_modify_sparse_gpa_page_host_visibility { + u64 partition_id; + u32 host_visibility:2; + u32 reserved0:30; + u32 reserved1; + u64 gpa_page_list[HV_MAX_MODIFY_GPA_REP_COUNT]; +} __packed; + #endif diff --git a/arch/x86/include/asm/mshyperv.h b/arch/x86/include/asm/mshyperv.h index ccf60a809a17..1e8275d35c1f 100644 --- a/arch/x86/include/asm/mshyperv.h +++ b/arch/x86/include/asm/mshyperv.h @@ -262,13 +262,13 @@ static inline void hv_set_msi_entry_from_desc(union hv_msi_entry *msi_entry, msi_entry->address.as_uint32 = msi_desc->msg.address_lo; msi_entry->data.as_uint32 = msi_desc->msg.data; } - struct irq_domain *hv_create_pci_msi_domain(void); int hv_map_ioapic_interrupt(int ioapic_id, bool level, int vcpu, int vector, struct hv_interrupt_entry *entry); int hv_unmap_ioapic_interrupt(int ioapic_id, struct hv_interrupt_entry *entry); - +int hv_set_mem_host_visibility(void *kbuffer, u32 size, u32 visibility); +int hv_mark_gpa_visibility(u16 count, const u64 pfn[], u32 visibility); #else /* CONFIG_HYPERV */ static inline void hyperv_init(void) {} static inline void hyperv_setup_mmu_ops(void) {} diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c index e88bc296afca..347c32eac8fd 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -37,6 +37,8 @@ bool hv_root_partition; EXPORT_SYMBOL_GPL(hv_root_partition); +#define HV_PARTITION_ID_SELF ((u64)-1) + struct ms_hyperv_info ms_hyperv; EXPORT_SYMBOL_GPL(ms_hyperv); @@ -477,3 +479,47 @@ const __initconst struct hypervisor_x86 x86_hyper_ms_hyperv = { .init.msi_ext_dest_id = ms_hyperv_msi_ext_dest_id, .init.init_platform = ms_hyperv_init_platform, }; + +int hv_mark_gpa_visibility(u16 count, const u64 pfn[], u32 visibility) +{ + struct hv_input_modify_sparse_gpa_page_host_visibility **input_pcpu; + struct hv_input_modify_sparse_gpa_page_host_visibility *input; + u16 pages_processed; + u64 hv_status; + unsigned long flags; + + /* no-op if partition isolation is not enabled */ + if (!hv_is_isolation_supported()) + return 0; + + if (count > HV_MAX_MODIFY_GPA_REP_COUNT) { + pr_err("Hyper-V: GPA count:%d exceeds supported:%lu\n", count, + HV_MAX_MODIFY_GPA_REP_COUNT); + return -EINVAL; + } + + local_irq_save(flags); + input_pcpu = (struct hv_input_modify_sparse_gpa_page_host_visibility **) + this_cpu_ptr(hyperv_pcpu_input_arg); + input = *input_pcpu; + if (unlikely(!input)) { + local_irq_restore(flags); + return -1; + } + + input->partition_id = HV_PARTITION_ID_SELF; + input->host_visibility = visibility; + input->reserved0 = 0; + input->reserved1 = 0; + memcpy((void *)input->gpa_page_list, pfn, count * sizeof(*pfn)); + hv_status = hv_do_rep_hypercall( + HVCALL_MODIFY_SPARSE_GPA_PAGE_HOST_VISIBILITY, count, + 0, input, &pages_processed); + local_irq_restore(flags); + + if (!(hv_status & HV_HYPERCALL_RESULT_MASK)) + return 0; + + return -EFAULT; +} +EXPORT_SYMBOL(hv_mark_gpa_visibility); diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index daa21cc72beb..204e6f3598a5 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -237,6 +237,38 @@ int vmbus_send_modifychannel(u32 child_relid, u32 target_vp) } EXPORT_SYMBOL_GPL(vmbus_send_modifychannel); +/* + * hv_set_mem_host_visibility - Set host visibility for specified memory. + */ +int hv_set_mem_host_visibility(void *kbuffer, u32 size, u32 visibility) +{ + int i, pfn; + int pagecount = size >> HV_HYP_PAGE_SHIFT; + u64 *pfn_array; + int ret = 0; + + if (!hv_isolation_type_snp()) + return 0; + + pfn_array = vzalloc(HV_HYP_PAGE_SIZE); + if (!pfn_array) + return -ENOMEM; + + for (i = 0, pfn = 0; i < pagecount; i++) { + pfn_array[pfn] = virt_to_hvpfn(kbuffer + i * HV_HYP_PAGE_SIZE); + pfn++; + + if (pfn == HV_MAX_MODIFY_GPA_REP_COUNT || i == pagecount - 1) { + ret |= hv_mark_gpa_visibility(pfn, pfn_array, visibility); + pfn = 0; + } + } + + vfree(pfn_array); + return ret; +} +EXPORT_SYMBOL_GPL(hv_set_mem_host_visibility); + /* * create_gpadl_header - Creates a gpadl for the specified buffer */ @@ -410,6 +442,12 @@ static int __vmbus_establish_gpadl(struct vmbus_channel *channel, if (ret) return ret; + ret = hv_set_mem_host_visibility(kbuffer, size, visibility); + if (ret) { + pr_warn("Failed to set host visibility.\n"); + return ret; + } + init_completion(&msginfo->waitevent); msginfo->waiting_channel = channel; @@ -693,7 +731,9 @@ static int __vmbus_open(struct vmbus_channel *newchannel, error_free_info: kfree(open_info); error_free_gpadl: - vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle); + vmbus_teardown_gpadl(newchannel, newchannel->ringbuffer_gpadlhandle, + page_address(newchannel->ringbuffer_page), + newchannel->ringbuffer_pagecount << PAGE_SHIFT); newchannel->ringbuffer_gpadlhandle = 0; error_clean_ring: hv_ringbuffer_cleanup(&newchannel->outbound); @@ -740,7 +780,8 @@ 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, u32 gpadl_handle, + void *kbuffer, u32 size) { struct vmbus_channel_gpadl_teardown *msg; struct vmbus_channel_msginfo *info; @@ -793,6 +834,10 @@ int vmbus_teardown_gpadl(struct vmbus_channel *channel, u32 gpadl_handle) spin_unlock_irqrestore(&vmbus_connection.channelmsg_lock, flags); kfree(info); + + if (hv_set_mem_host_visibility(kbuffer, size, VMBUS_PAGE_NOT_VISIBLE)) + pr_warn("Fail to set mem host visibility.\n"); + return ret; } EXPORT_SYMBOL_GPL(vmbus_teardown_gpadl); @@ -869,7 +914,9 @@ static int vmbus_close_internal(struct vmbus_channel *channel) /* Tear down the gpadl for the channel's ring buffer */ else if (channel->ringbuffer_gpadlhandle) { ret = vmbus_teardown_gpadl(channel, - channel->ringbuffer_gpadlhandle); + channel->ringbuffer_gpadlhandle, + page_address(channel->ringbuffer_page), + channel->ringbuffer_pagecount << PAGE_SHIFT); if (ret) { pr_err("Close failed: teardown gpadl return %d\n", ret); /* diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 2a87cfa27ac0..b3a43c4ec8ab 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -1034,6 +1034,7 @@ struct netvsc_device { /* Send buffer allocated by us */ void *send_buf; + u32 send_buf_size; u32 send_buf_gpadl_handle; u32 send_section_cnt; u32 send_section_size; diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index bb72c7578330..08d73401bb28 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -245,7 +245,9 @@ static void netvsc_teardown_recv_gpadl(struct hv_device *device, if (net_device->recv_buf_gpadl_handle) { ret = vmbus_teardown_gpadl(device->channel, - net_device->recv_buf_gpadl_handle); + net_device->recv_buf_gpadl_handle, + net_device->recv_buf, + net_device->recv_buf_size); /* If we failed here, we might as well return and have a leak * rather than continue and a bugchk @@ -267,7 +269,9 @@ static void netvsc_teardown_send_gpadl(struct hv_device *device, if (net_device->send_buf_gpadl_handle) { ret = vmbus_teardown_gpadl(device->channel, - net_device->send_buf_gpadl_handle); + net_device->send_buf_gpadl_handle, + net_device->send_buf, + net_device->send_buf_size); /* If we failed here, we might as well return and have a leak * rather than continue and a bugchk @@ -419,6 +423,7 @@ static int netvsc_init_buf(struct hv_device *device, ret = -ENOMEM; goto cleanup; } + net_device->send_buf_size = buf_size; /* Establish the gpadl handle for this buffer on this * channel. Note: This call uses the vmbus connection rather diff --git a/drivers/uio/uio_hv_generic.c b/drivers/uio/uio_hv_generic.c index 813a7bee5139..c8d4704fc90c 100644 --- a/drivers/uio/uio_hv_generic.c +++ b/drivers/uio/uio_hv_generic.c @@ -181,13 +181,15 @@ 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); + vmbus_teardown_gpadl(dev->channel, pdata->send_gpadl, + pdata->send_buf, SEND_BUFFER_SIZE); pdata->send_gpadl = 0; vfree(pdata->send_buf); } if (pdata->recv_gpadl) { - vmbus_teardown_gpadl(dev->channel, pdata->recv_gpadl); + vmbus_teardown_gpadl(dev->channel, pdata->recv_gpadl, + pdata->recv_buf, RECV_BUFFER_SIZE); pdata->recv_gpadl = 0; vfree(pdata->recv_buf); } diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index 83448e837ded..ad19f4199f90 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -158,6 +158,7 @@ struct ms_hyperv_tsc_page { #define HVCALL_RETARGET_INTERRUPT 0x007e #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 +#define HVCALL_MODIFY_SPARSE_GPA_PAGE_HOST_VISIBILITY 0x00db #define HV_FLUSH_ALL_PROCESSORS BIT(0) #define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES BIT(1) diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index 016fdca20d6e..41cbaa2db567 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1183,7 +1183,8 @@ extern int vmbus_establish_gpadl(struct vmbus_channel *channel, u32 visibility); extern int vmbus_teardown_gpadl(struct vmbus_channel *channel, - u32 gpadl_handle); + u32 gpadl_handle, + void *kbuffer, u32 size); void vmbus_reset_channel_cb(struct vmbus_channel *channel); From patchwork Sun Feb 28 15:03:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 389067 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE15DC433E0 for ; Sun, 28 Feb 2021 15:07:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 57B5E64DED for ; Sun, 28 Feb 2021 15:07:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231176AbhB1PHA (ORCPT ); Sun, 28 Feb 2021 10:07:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230505AbhB1PFh (ORCPT ); Sun, 28 Feb 2021 10:05:37 -0500 Received: from mail-pg1-x535.google.com (mail-pg1-x535.google.com [IPv6:2607:f8b0:4864:20::535]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 624DBC061797; Sun, 28 Feb 2021 07:04:19 -0800 (PST) Received: by mail-pg1-x535.google.com with SMTP id x29so1484754pgk.6; Sun, 28 Feb 2021 07:04:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IlP+UqaTTH6S778JlrTl0GossJzFFQBlG/jMumY6xKg=; b=J0QoRw2N/2yfzZ3toJcfKV7iDJelt9eUQKb6RRq4Kd6ay2raOQT9S/TwUdFfypau8h vjkHtPR1oSYaI4rJmrZaf6IUip0nmHA0rrHfe6CTGDCPXaLBZnsZ3grf0BrWLWMPbiCj JHcYaTcEbMGmgQ17OPUu1z7YG4Gcz6hldTjKLlsW5QNTFZH0sNSUy1pqnR6uNsMhnChq wRSgVqWI3aKKA1T4jXyBX0kT+HZfQVX+oeIXWwMhyAs3/jIXBA0rRl5df/erDwToudUm zPi8NTk6eCUd+2cxVKP6i/4Mjr6QA85zeSp4eqkLMry2KrwuQTFlYt0s5cOBCq8Aw3Eg 6ikA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IlP+UqaTTH6S778JlrTl0GossJzFFQBlG/jMumY6xKg=; b=PGzPaAfZFlOeQHX/NC0tGUeTwcyO7RGi99yTYRb1eNP4AWgqu63Vhm+GuQv3lbLkph Z2gpn6yZR1sAhWp/GlTzeynuI2Bknpev5kDPXwkK4k8nfaLtCL8su43ncSR5956bBKjv TdXVFkTvzoDf+Qmdsb946MKWVNzabgN9aKdaL+Zx1/JaiOODu8kzONUyp/ddHkHDKpT4 VegeK3dM5yVxRCLWHLWo4gZ18enRq/Tp90B+2+48DbHhK1NtMm/uVDEP3WP0T/aIEuIf vaRGMEJrR6mmimLwM+kD2EtsgRIHm+iKPze+viO1WnJANmQyrJRLFUm6ZVkK3e7Z2bl4 28yw== X-Gm-Message-State: AOAM531sGMfxMJcggRiXDlKsMqzxxuzmqWjUSk2AXt132OCR4KKqpu0N XDtsUyKZenocVdm4UkENJovcO9NeO05jIQ== X-Google-Smtp-Source: ABdhPJzt3j/jSpIF5FDNrIEGk8aix6RpyugpCS9ngRugRC+2zmIkhMDolzJWu2IRrQWYFPZmlfzD9g== X-Received: by 2002:a65:6107:: with SMTP id z7mr10290870pgu.435.1614524658971; Sun, 28 Feb 2021 07:04:18 -0800 (PST) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:0:561f:afde:af07:8820]) by smtp.gmail.com with ESMTPSA id 142sm8391331pfz.196.2021.02.28.07.04.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 07:04:18 -0800 (PST) From: Tianyu Lan To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org, davem@davemloft.net, kuba@kernel.org, jejb@linux.ibm.com, martin.petersen@oracle.com Cc: Tianyu Lan , linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, linux-scsi@vger.kernel.org, vkuznets@redhat.com, thomas.lendacky@amd.com, brijesh.singh@amd.com, sunilmut@microsoft.com Subject: [RFC PATCH 9/12] x86/Hyper-V: Add new parameter for vmbus_sendpacket_pagebuffer()/mpb_desc() Date: Sun, 28 Feb 2021 10:03:12 -0500 Message-Id: <20210228150315.2552437-10-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210228150315.2552437-1-ltykernel@gmail.com> References: <20210228150315.2552437-1-ltykernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tianyu Lan Add new parameter io_type and struct bounce_pkt for vmbus_sendpacket_pagebuffer() and vmbus_sendpacket_mpb_desc() in order to add bounce buffer support later. Signed-off-by: Sunil Muthuswamy Co-Developed-by: Sunil Muthuswamy Signed-off-by: Tianyu Lan --- drivers/hv/channel.c | 7 +++++-- drivers/hv/hyperv_vmbus.h | 12 ++++++++++++ drivers/net/hyperv/hyperv_net.h | 1 + drivers/net/hyperv/netvsc.c | 5 ++++- drivers/scsi/storvsc_drv.c | 23 +++++++++++++++++------ include/linux/hyperv.h | 16 ++++++++++++++-- 6 files changed, 53 insertions(+), 11 deletions(-) diff --git a/drivers/hv/channel.c b/drivers/hv/channel.c index 4c05b1488649..976ef99dda28 100644 --- a/drivers/hv/channel.c +++ b/drivers/hv/channel.c @@ -1044,7 +1044,8 @@ EXPORT_SYMBOL(vmbus_sendpacket); int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, struct hv_page_buffer pagebuffers[], u32 pagecount, void *buffer, u32 bufferlen, - u64 requestid) + u64 requestid, u8 io_type, + struct hv_bounce_pkt **bounce_pkt) { int i; struct vmbus_channel_packet_page_buffer desc; @@ -1101,7 +1102,9 @@ EXPORT_SYMBOL_GPL(vmbus_sendpacket_pagebuffer); int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, struct vmbus_packet_mpb_array *desc, u32 desc_size, - void *buffer, u32 bufferlen, u64 requestid) + void *buffer, u32 bufferlen, u64 requestid, + u32 pfn_count, u8 io_type, + struct hv_bounce_pkt **bounce_pkt) { u32 packetlen; u32 packetlen_aligned; diff --git a/drivers/hv/hyperv_vmbus.h b/drivers/hv/hyperv_vmbus.h index 7edf2be60d2c..7677f083d33a 100644 --- a/drivers/hv/hyperv_vmbus.h +++ b/drivers/hv/hyperv_vmbus.h @@ -57,6 +57,18 @@ union hv_monitor_trigger_state { }; }; +/* + * Hyper-V bounce packet. Each in-use bounce packet is mapped to a vmbus + * transaction and contains a list of bounce pages for that transaction. + */ +struct hv_bounce_pkt { + /* Link to the next bounce packet, when it is in the free list */ + struct list_head link; + struct list_head bounce_page_head; + u32 flags; +}; + + /* * All vmbus channels initially start with zero bounce pages and are required * to set any non-zero size, if needed. diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index b3a43c4ec8ab..11266b92bcf0 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -130,6 +130,7 @@ struct hv_netvsc_packet { u32 total_bytes; u32 send_buf_index; u32 total_data_buflen; + struct hv_bounce_pkt *bounce_pkt; }; #define NETVSC_HASH_KEYLEN 40 diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 08d73401bb28..77657c5acc65 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -926,14 +926,17 @@ static inline int netvsc_send_pkt( trace_nvsp_send_pkt(ndev, out_channel, rpkt); + packet->bounce_pkt = NULL; if (packet->page_buf_cnt) { if (packet->cp_partial) pb += packet->rmsg_pgcnt; + /* The I/O type is always 'write' for netvsc */ ret = vmbus_sendpacket_pagebuffer(out_channel, pb, packet->page_buf_cnt, &nvmsg, sizeof(nvmsg), - req_id); + req_id, IO_TYPE_WRITE, + &packet->bounce_pkt); } else { ret = vmbus_sendpacket(out_channel, &nvmsg, sizeof(nvmsg), diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 2e4fa77445fd..c5b4974eb41f 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c @@ -31,6 +31,7 @@ #include #include #include +#include /* * All wire protocol details (storage protocol between the guest and the host) @@ -427,6 +428,7 @@ struct storvsc_cmd_request { u32 payload_sz; struct vstor_packet vstor_packet; + struct hv_bounce_pkt *bounce_pkt; }; @@ -1390,7 +1392,8 @@ static struct vmbus_channel *get_og_chn(struct storvsc_device *stor_device, static int storvsc_do_io(struct hv_device *device, - struct storvsc_cmd_request *request, u16 q_num) + struct storvsc_cmd_request *request, u16 q_num, + u32 pfn_count) { struct storvsc_device *stor_device; struct vstor_packet *vstor_packet; @@ -1493,14 +1496,18 @@ static int storvsc_do_io(struct hv_device *device, vstor_packet->operation = VSTOR_OPERATION_EXECUTE_SRB; + request->bounce_pkt = NULL; if (request->payload->range.len) { + struct vmscsi_request *vm_srb = &request->vstor_packet.vm_srb; ret = vmbus_sendpacket_mpb_desc(outgoing_channel, request->payload, request->payload_sz, vstor_packet, (sizeof(struct vstor_packet) - vmscsi_size_delta), - (unsigned long)request); + (unsigned long)request, + pfn_count, + vm_srb->data_in, &request->bounce_pkt); } else { ret = vmbus_sendpacket(outgoing_channel, vstor_packet, (sizeof(struct vstor_packet) - @@ -1510,8 +1517,10 @@ static int storvsc_do_io(struct hv_device *device, VMBUS_DATA_PACKET_FLAG_COMPLETION_REQUESTED); } - if (ret != 0) + if (ret != 0) { + request->bounce_pkt = NULL; return ret; + } atomic_inc(&stor_device->num_outstanding_req); @@ -1825,14 +1834,16 @@ static int storvsc_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *scmnd) cmd_request->payload_sz = payload_sz; /* Invokes the vsc to start an IO */ - ret = storvsc_do_io(dev, cmd_request, get_cpu()); + ret = storvsc_do_io(dev, cmd_request, get_cpu(), sg_count); put_cpu(); - if (ret == -EAGAIN) { + if (ret) { if (payload_sz > sizeof(cmd_request->mpb)) kfree(payload); /* no more space */ - return SCSI_MLQUEUE_DEVICE_BUSY; + if (ret == -EAGAIN || ret == -ENOSPC) + return SCSI_MLQUEUE_DEVICE_BUSY; + return ret; } return 0; diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index d518aba17565..d1a936091665 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1184,19 +1184,31 @@ extern int vmbus_sendpacket(struct vmbus_channel *channel, enum vmbus_packet_type type, u32 flags); +#define IO_TYPE_WRITE 0 +#define IO_TYPE_READ 1 +#define IO_TYPE_UNKNOWN 2 + +struct hv_bounce_pkt; + extern int vmbus_sendpacket_pagebuffer(struct vmbus_channel *channel, struct hv_page_buffer pagebuffers[], u32 pagecount, void *buffer, u32 bufferlen, - u64 requestid); + u64 requestid, + u8 io_type, + struct hv_bounce_pkt **bounce_pkt); extern int vmbus_sendpacket_mpb_desc(struct vmbus_channel *channel, struct vmbus_packet_mpb_array *mpb, u32 desc_size, void *buffer, u32 bufferlen, - u64 requestid); + u64 requestid, + u32 pfn_count, + u8 io_type, + struct hv_bounce_pkt **bounce_pkt); + extern int vmbus_establish_gpadl(struct vmbus_channel *channel, void *kbuffer, From patchwork Sun Feb 28 15:03:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tianyu Lan X-Patchwork-Id: 388590 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0E830C433E6 for ; Sun, 28 Feb 2021 15:06:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C3B2864E56 for ; Sun, 28 Feb 2021 15:06:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231157AbhB1PG0 (ORCPT ); Sun, 28 Feb 2021 10:06:26 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50216 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230514AbhB1PFj (ORCPT ); Sun, 28 Feb 2021 10:05:39 -0500 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0C23AC0617A9; Sun, 28 Feb 2021 07:04:21 -0800 (PST) Received: by mail-pj1-x1029.google.com with SMTP id e9so6562920pjs.2; Sun, 28 Feb 2021 07:04:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8/x+hLQ6Qn9/Q906STHQruoSKlP5avG/u3tHWEaX0FM=; b=RFTVUV6tYZAmjZRY2rFgfYLVtz+E6R/jpo4P9wrRSQYVmXuv7bbdHXX5gx2WsW9dCt hU9zrzrjUJkTCHaZaLY6NdGgKn4H5bp3brYUZ8IpTCeq8OHgmlR1H4p6Wju0agRExtWi Jsrnya/FeeMuYtZb0HatALdChEwn0iI4COH5jPphCkLDVrzvezOmcWaioLxJABLFh7pM oR3EN8i+n3+ZBfcJSg6yrMQ5BqXZEsMnCfb4+CnQJbdpg2GLwTlzU0hdWW2TAUkjYnkO FP8tKNwEnpXtp33dHfGrEtVta0uLj4cmnRWEJz5VrVi83fV9XRWMapxEg45JQ7/wdI78 g+lQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8/x+hLQ6Qn9/Q906STHQruoSKlP5avG/u3tHWEaX0FM=; b=DUEPynholg2Le82zEsGJcrCO9XwgWyZ2kuqqy5MuFtj83mFkvkRFcvashmDU3Welol 6b6Xl8pLGA/mop3VIQh+QyBc7352LHmkeE8bbPvM+T1UEIjKgFESjKrLaeqBVtZ5fOK7 JtW7LYTAZ2Gu1TMsTkSuZ41wp6Lmwseo1sbzcw6qiN8XPFa8IdY9Up9VGEZMkcsA01l5 db4nOepBOwwMQ0PMLYUL1TXZ2m28goluDHY/qSAw4ORHTN2jTd2lbVMrrVyI1hBdw0ij XivJ7/Sx8Bm4Tz+JJNcWaE95G0h4HweUqC+yBmTJzd2v6GfBr8RYLImp0kz1CE+H5vzi 6CYA== X-Gm-Message-State: AOAM532NM9oP5AKb2mRXlTRvOStmJWLv0XlPStENDcUP8IvBdyaUccIz zTW3tk8n79Lk9txxdOfO1Ds= X-Google-Smtp-Source: ABdhPJwbnd69QV1i2bRwIq+NDb286ER4bmQYpVSIiuHfVU93sV0hMKrG7MiVfJKJF0263tFDFALA7Q== X-Received: by 2002:a17:903:22d2:b029:e3:f6cf:9408 with SMTP id y18-20020a17090322d2b02900e3f6cf9408mr11576503plg.8.1614524660652; Sun, 28 Feb 2021 07:04:20 -0800 (PST) Received: from ubuntu-Virtual-Machine.corp.microsoft.com ([2001:4898:80e8:0:561f:afde:af07:8820]) by smtp.gmail.com with ESMTPSA id 142sm8391331pfz.196.2021.02.28.07.04.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 28 Feb 2021 07:04:20 -0800 (PST) From: Tianyu Lan To: kys@microsoft.com, haiyangz@microsoft.com, sthemmin@microsoft.com, wei.liu@kernel.org, davem@davemloft.net, kuba@kernel.org Cc: Tianyu Lan , linux-hyperv@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, vkuznets@redhat.com, thomas.lendacky@amd.com, brijesh.singh@amd.com, sunilmut@microsoft.com Subject: [RFC PATCH 11/12] HV/Netvsc: Add Isolation VM support for netvsc driver Date: Sun, 28 Feb 2021 10:03:14 -0500 Message-Id: <20210228150315.2552437-12-ltykernel@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210228150315.2552437-1-ltykernel@gmail.com> References: <20210228150315.2552437-1-ltykernel@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Tianyu Lan Add Isolation VM support for netvsc driver. Map send/receive ring buffer in extra address space in SNP isolation VM, reserve bounce buffer for packets sent via vmbus_sendpacket_pagebuffer() and release bounce buffer via hv_pkt_bounce() when get send complete response from host. Signed-off-by: Sunil Muthuswamy Co-Developed-by: Sunil Muthuswamy Signed-off-by: Tianyu Lan --- drivers/net/hyperv/hyperv_net.h | 3 + drivers/net/hyperv/netvsc.c | 97 ++++++++++++++++++++++++++++++--- 2 files changed, 92 insertions(+), 8 deletions(-) diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 11266b92bcf0..45d5838ff128 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h @@ -1027,14 +1027,17 @@ struct netvsc_device { /* Receive buffer allocated by us but manages by NetVSP */ void *recv_buf; + void *recv_original_buf; u32 recv_buf_size; /* allocated bytes */ u32 recv_buf_gpadl_handle; u32 recv_section_cnt; u32 recv_section_size; u32 recv_completion_cnt; + /* Send buffer allocated by us */ void *send_buf; + void *send_original_buf; u32 send_buf_size; u32 send_buf_gpadl_handle; u32 send_section_cnt; diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 77657c5acc65..171af85e055d 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c @@ -26,7 +26,7 @@ #include "hyperv_net.h" #include "netvsc_trace.h" - +#include "../../hv/hyperv_vmbus.h" /* * Switch the data path from the synthetic interface to the VF * interface. @@ -119,8 +119,21 @@ static void free_netvsc_device(struct rcu_head *head) int i; kfree(nvdev->extension); - vfree(nvdev->recv_buf); - vfree(nvdev->send_buf); + + if (nvdev->recv_original_buf) { + iounmap(nvdev->recv_buf); + vfree(nvdev->recv_original_buf); + } else { + vfree(nvdev->recv_buf); + } + + if (nvdev->send_original_buf) { + iounmap(nvdev->send_buf); + vfree(nvdev->send_original_buf); + } else { + vfree(nvdev->send_buf); + } + kfree(nvdev->send_section_map); for (i = 0; i < VRSS_CHANNEL_MAX; i++) { @@ -241,13 +254,18 @@ static void netvsc_teardown_recv_gpadl(struct hv_device *device, struct netvsc_device *net_device, struct net_device *ndev) { + void *recv_buf; int ret; if (net_device->recv_buf_gpadl_handle) { + if (net_device->recv_original_buf) + recv_buf = net_device->recv_original_buf; + else + recv_buf = net_device->recv_buf; + ret = vmbus_teardown_gpadl(device->channel, net_device->recv_buf_gpadl_handle, - net_device->recv_buf, - net_device->recv_buf_size); + recv_buf, net_device->recv_buf_size); /* If we failed here, we might as well return and have a leak * rather than continue and a bugchk @@ -265,13 +283,18 @@ static void netvsc_teardown_send_gpadl(struct hv_device *device, struct netvsc_device *net_device, struct net_device *ndev) { + void *send_buf; int ret; if (net_device->send_buf_gpadl_handle) { + if (net_device->send_original_buf) + send_buf = net_device->send_original_buf; + else + send_buf = net_device->send_buf; + ret = vmbus_teardown_gpadl(device->channel, net_device->send_buf_gpadl_handle, - net_device->send_buf, - net_device->send_buf_size); + send_buf, net_device->send_buf_size); /* If we failed here, we might as well return and have a leak * rather than continue and a bugchk @@ -306,9 +329,19 @@ static int netvsc_init_buf(struct hv_device *device, struct nvsp_1_message_send_receive_buffer_complete *resp; struct net_device *ndev = hv_get_drvdata(device); struct nvsp_message *init_packet; + struct vm_struct *area; + u64 extra_phys; unsigned int buf_size; + unsigned long vaddr; size_t map_words; - int ret = 0; + int ret = 0, i; + + ret = hv_bounce_resources_reserve(device->channel, + PAGE_SIZE * 1024); + if (ret) { + pr_warn("Fail to reserve bounce buffer.\n"); + return -ENOMEM; + } /* Get receive buffer area. */ buf_size = device_info->recv_sections * device_info->recv_section_size; @@ -345,6 +378,28 @@ static int netvsc_init_buf(struct hv_device *device, goto cleanup; } + if (hv_isolation_type_snp()) { + area = get_vm_area(buf_size, VM_IOREMAP); + if (!area) + goto cleanup; + + vaddr = (unsigned long)area->addr; + for (i = 0; i < buf_size / HV_HYP_PAGE_SIZE; i++) { + extra_phys = (virt_to_hvpfn(net_device->recv_buf + i * HV_HYP_PAGE_SIZE) + << HV_HYP_PAGE_SHIFT) + ms_hyperv.shared_gpa_boundary; + ret |= ioremap_page_range(vaddr + i * HV_HYP_PAGE_SIZE, + vaddr + (i + 1) * HV_HYP_PAGE_SIZE, + extra_phys, PAGE_KERNEL_IO); + } + + if (ret) + goto cleanup; + + net_device->recv_original_buf = net_device->recv_buf; + net_device->recv_buf = (void*)vaddr; + } + + /* Notify the NetVsp of the gpadl handle */ init_packet = &net_device->channel_init_pkt; memset(init_packet, 0, sizeof(struct nvsp_message)); @@ -435,12 +490,36 @@ static int netvsc_init_buf(struct hv_device *device, buf_size, &net_device->send_buf_gpadl_handle, VMBUS_PAGE_VISIBLE_READ_WRITE); + if (ret != 0) { netdev_err(ndev, "unable to establish send buffer's gpadl\n"); goto cleanup; } + if (hv_isolation_type_snp()) { + area = get_vm_area(buf_size , VM_IOREMAP); + if (!area) + goto cleanup; + + vaddr = (unsigned long)area->addr; + + for (i = 0; i < buf_size / HV_HYP_PAGE_SIZE; i++) { + extra_phys = (virt_to_hvpfn(net_device->send_buf + i * HV_HYP_PAGE_SIZE) + << HV_HYP_PAGE_SHIFT) + ms_hyperv.shared_gpa_boundary; + ret |= ioremap_page_range(vaddr + i * HV_HYP_PAGE_SIZE, + vaddr + (i + 1) * HV_HYP_PAGE_SIZE, + extra_phys, PAGE_KERNEL_IO); + } + + if (ret) + goto cleanup; + + net_device->send_original_buf = net_device->send_buf; + net_device->send_buf = (void*)vaddr; + } + + /* Notify the NetVsp of the gpadl handle */ init_packet = &net_device->channel_init_pkt; memset(init_packet, 0, sizeof(struct nvsp_message)); @@ -747,6 +826,8 @@ static void netvsc_send_tx_complete(struct net_device *ndev, tx_stats->bytes += packet->total_bytes; u64_stats_update_end(&tx_stats->syncp); + if (desc->type == VM_PKT_COMP && packet->bounce_pkt) + hv_pkt_bounce(channel, packet->bounce_pkt); napi_consume_skb(skb, budget); }