From mboxrd@z Thu Jan 1 00:00:00 1970 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=-26.2 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT, USER_IN_DEF_DKIM_WL autolearn=ham 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 A9BEFC47091 for ; Fri, 28 May 2021 22:43:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8BEB2613E3 for ; Fri, 28 May 2021 22:43:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229786AbhE1WpU (ORCPT ); Fri, 28 May 2021 18:45:20 -0400 Received: from linux.microsoft.com ([13.77.154.182]:55864 "EHLO linux.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229704AbhE1WpS (ORCPT ); Fri, 28 May 2021 18:45:18 -0400 Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id BC98220B8016; Fri, 28 May 2021 15:43:42 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com BC98220B8016 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1622241822; bh=Eh+KXp87Z2egKgvMk++Cs9qBahgcczRHBG8LxOOp8qE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=alATu5o++1M0p1JMgH9yUY9RhiNYUgGISHpFeUIgVn7v0VLFN3ehgjb7KU1tgAmeh vAm5qkLVV81ma3H4ufXkTL+xi2198/+7ArBkUcvLeCTq7bRpKlcPzz9MpIG43HBFKB 68AEEO9kk4El474XK5k6wLTmaDiHhqCblWcSXkhg= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Cc: virtualization@lists.linux-foundation.org, mikelley@microsoft.com, viremana@linux.microsoft.com, sunilmut@microsoft.com, wei.liu@kernel.org, vkuznets@redhat.com, ligrassi@microsoft.com, kys@microsoft.com Subject: [PATCH 07/19] drivers/hv: withdraw memory hypercall Date: Fri, 28 May 2021 15:43:27 -0700 Message-Id: <1622241819-21155-8-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1622241819-21155-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1622241819-21155-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-hyperv@vger.kernel.org Withdraw the memory from a finalized partition and free the pages. The partition is now cleaned up correctly when the fd is released. Co-developed-by: Lillian Grassin-Drake Signed-off-by: Lillian Grassin-Drake Signed-off-by: Nuno Das Neves --- drivers/hv/hv_call.c | 53 +++++++++++++++++++++++++++++++ drivers/hv/mshv.h | 6 ++++ drivers/hv/mshv_main.c | 5 +-- include/asm-generic/hyperv-tlfs.h | 11 +++++++ 4 files changed, 73 insertions(+), 2 deletions(-) diff --git a/drivers/hv/hv_call.c b/drivers/hv/hv_call.c index 7d85f1bd959a..73cc1fb59e60 100644 --- a/drivers/hv/hv_call.c +++ b/drivers/hv/hv_call.c @@ -14,6 +14,59 @@ #include "mshv.h" +int hv_call_withdraw_memory(u64 count, int node, u64 partition_id) +{ + struct hv_withdraw_memory_in *input_page; + struct hv_withdraw_memory_out *output_page; + struct page *page; + u16 completed; + unsigned long remaining = count; + u64 status; + int i; + unsigned long flags; + + page = alloc_page(GFP_KERNEL); + if (!page) + return -ENOMEM; + output_page = page_address(page); + + while (remaining) { + local_irq_save(flags); + + input_page = (struct hv_withdraw_memory_in *)(*this_cpu_ptr( + hyperv_pcpu_input_arg)); + + input_page->partition_id = partition_id; + input_page->proximity_domain_info.as_uint64 = 0; + status = hv_do_rep_hypercall( + HVCALL_WITHDRAW_MEMORY, + min(remaining, HV_WITHDRAW_BATCH_SIZE), 0, input_page, + output_page); + + local_irq_restore(flags); + + completed = hv_repcomp(status); + + for (i = 0; i < completed; i++) + __free_page(pfn_to_page(output_page->gpa_page_list[i])); + + if (!hv_result_success(status)) { + if (hv_result(status) == HV_STATUS_NO_RESOURCES) + status = HV_STATUS_SUCCESS; + else + pr_err("%s: %s\n", __func__, + hv_status_to_string(status)); + break; + } + + remaining -= completed; + } + free_page((unsigned long)output_page); + + return hv_status_to_errno(status); +} + + int hv_call_create_partition( u64 flags, struct hv_partition_creation_properties creation_properties, diff --git a/drivers/hv/mshv.h b/drivers/hv/mshv.h index 46121bd30592..cf48ec5840b7 100644 --- a/drivers/hv/mshv.h +++ b/drivers/hv/mshv.h @@ -11,12 +11,18 @@ #ifndef _MSHV_H_ #define _MSHV_H_ +#include + /* Determined empirically */ #define HV_INIT_PARTITION_DEPOSIT_PAGES 208 +#define HV_WITHDRAW_BATCH_SIZE (HV_HYP_PAGE_SIZE / sizeof(u64)) + /* * Hyper-V hypercalls */ + +int hv_call_withdraw_memory(u64 count, int node, u64 partition_id); int hv_call_create_partition( u64 flags, struct hv_partition_creation_properties creation_properties, diff --git a/drivers/hv/mshv_main.c b/drivers/hv/mshv_main.c index c32618357da8..41afaa86de73 100644 --- a/drivers/hv/mshv_main.c +++ b/drivers/hv/mshv_main.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -52,7 +53,6 @@ static struct miscdevice mshv_dev = { .mode = 600, }; - static long mshv_partition_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg) { @@ -89,7 +89,8 @@ destroy_partition(struct mshv_partition *partition) /* Deallocates and unmaps everything including vcpus, GPA mappings etc */ hv_call_finalize_partition(partition->id); - /* TODO: Withdraw and free all pages we deposited */ + /* Withdraw and free all pages we deposited */ + hv_call_withdraw_memory(U64_MAX, NUMA_NO_NODE, partition->id); hv_call_delete_partition(partition->id); diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv-tlfs.h index 49099b7e0f71..2e1573978569 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -149,6 +149,7 @@ struct ms_hyperv_tsc_page { #define HVCALL_DELETE_PARTITION 0x0043 #define HVCALL_GET_PARTITION_ID 0x0046 #define HVCALL_DEPOSIT_MEMORY 0x0048 +#define HVCALL_WITHDRAW_MEMORY 0x0049 #define HVCALL_CREATE_VP 0x004e #define HVCALL_GET_VP_REGISTERS 0x0050 #define HVCALL_SET_VP_REGISTERS 0x0051 @@ -515,6 +516,16 @@ union hv_proximity_domain_info { u64 as_uint64; } __packed; +struct hv_withdraw_memory_in { + u64 partition_id; + union hv_proximity_domain_info proximity_domain_info; +} __packed; + +struct hv_withdraw_memory_out { + /* Hack - compiler doesn't like empty array size in struct with no other members */ + u64 gpa_page_list[0]; +} __packed; + struct hv_lp_startup_status { u64 hv_status; u64 substatus1; -- 2.25.1