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=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 972ACC433E0 for ; Thu, 18 Mar 2021 20:14:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 53FC964F1B for ; Thu, 18 Mar 2021 20:14:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232970AbhCRUO2 (ORCPT ); Thu, 18 Mar 2021 16:14:28 -0400 Received: from mail-dm6nam08on2094.outbound.protection.outlook.com ([40.107.102.94]:33889 "EHLO NAM04-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S232917AbhCRUOE (ORCPT ); Thu, 18 Mar 2021 16:14:04 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Xyn6c8qstZaQEpiC4ipOJI1HuxTFqe/32T8a7/dTXjVDXpZ//3YyRhgQKT9Jqif8LPDGmjRXZz3xrumE1mOCc466Q6Ld/UlqzOMW7qI36qCo3WKzQ7avci9xk3u28DR7KhEzOvXrgEWVr1H2nSzwWCTRir021T3DhcublEc3IvLlLHNGNRTCuRSSVI8WzFGrdc0muCGAiLNFLc4+ggg7rkek5IO3gcMN62r1ACLGc5TivBcMk4El80vVeGgxSMsMzpGwyr35iFG6tHYgwWfpxPH+OZoqH50axVFATo8lxv3CzjMnzow1YF6dweLyv5+56T+qrmbsI9i0DD0TiE8tUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Aze9JPgsAzabm2V4MDlaDbHCbgQWeRTVc+oNbsb3WJc=; b=WYaTZRnmTbgaK+SQ1oItKRkvfbNvoIMgjNDT2/lbTDyyxDR90u4N/IxxdGCg0hs7ztfHlWzrvzf9GZJqQm0Nu4eL2YNl4PI5RG5IUxHBB0jC6bBOLwmPkoLJcn3NEIRyAmW0voWmsij3BRdD7jTh0MUucIHZNQbphhmROQaJSVRgw9WHTYOiP5Fsi2rDQxUE6n617+IXNgL3E8Q5K5QOiU6E4VfflASjurlLIPNOqhl1t7PRFQEFUO40iH1LAC0hwTiUqovd6bWxzjATZpGSQJZmyO61AcjJznY7RhALWAxuPbithyTn39mII2LPTk3QvWNWmfliYGXDAMZFufBbig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Aze9JPgsAzabm2V4MDlaDbHCbgQWeRTVc+oNbsb3WJc=; b=X1n5exzWQEMJYrnLYDfhEjXXtnTRvJxh8kPGM7jU6412Q1JEMjF0f+78l78xRPKwGfUIwkejmhHJrtPXLsh4qEJ+eR9AYut271vw3xmzLN9ep6asoAXLQBY/ic5ijw9qAcItaA8IHljjY6LBs1lKZLjZhwTPg6QvO/2ohA4djvw= Received: from SN4PR2101MB0880.namprd21.prod.outlook.com (2603:10b6:803:51::33) by SN6PR2101MB1325.namprd21.prod.outlook.com (2603:10b6:805:107::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3977.4; Thu, 18 Mar 2021 20:14:00 +0000 Received: from SN4PR2101MB0880.namprd21.prod.outlook.com ([fe80::9c4:80e2:3dca:bbeb]) by SN4PR2101MB0880.namprd21.prod.outlook.com ([fe80::9c4:80e2:3dca:bbeb%3]) with mapi id 15.20.3977.014; Thu, 18 Mar 2021 20:14:00 +0000 From: Sunil Muthuswamy To: Michael Kelley , Matheus Castello , "linux-hyperv@vger.kernel.org" , Haiyang Zhang , Stephen Hemminger , Wei Liu , Tianyu Lan , Wei Liu , vkuznets CC: KY Srinivasan , "linux-kernel@vger.kernel.org" Subject: [PATCH v4] x86/Hyper-V: Support for free page reporting Thread-Topic: [PATCH v4] x86/Hyper-V: Support for free page reporting Thread-Index: AdccMlTLMSKb9zjfQ5ekuWl72W2QRg== Date: Thu, 18 Mar 2021 20:14:00 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: microsoft.com; dkim=none (message not signed) header.d=none;microsoft.com; dmarc=none action=none header.from=microsoft.com; x-originating-ip: [2601:602:9400:570:5922:17a6:69c3:4faf] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 901c3883-74e0-4407-97ef-08d8ea4a5e83 x-ms-traffictypediagnostic: SN6PR2101MB1325: x-ms-exchange-transport-forked: True x-ld-processed: 72f988bf-86f1-41af-91ab-2d7cd011db47,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: pjyARS7rMxeY/QwKTr+9/DUmyOsRfV6E8zfs0m9E8bShzYWDUDZSEPaDNZU+9G2tfrKJAKpk1VVeJ+OaLVsXRnzIVxq+URHtHN7ZRDh8gkIAyY7xPhZl7YwJ9pUfSGKOYSBg4aZJ30iygAPAou+7XJpNG3GX4ORD+nMvOYXyhIj+J5Y1NVQrvKn1ocJG7tRM5SU4VkKmiRJ1873hbpLB14zoq6HZGoWvvXV5SQr1q0WeXt44sjb8cJ0PDOM2e8jEraGA0Dnkp/HhCjGjZsjv4AftKNYVxubJfihmeUY2P/k7YsoJyR4rsu6fLJqUZKLxMVDKR3ISp6q1jC0SOHWnAVZDWKiBBmIhJLb+PDSVvVixal2XJgxboxLXKCoReaa7HpkD8YWBbjEYO+G2O7vrURfP6JEfe+RnWqiZYdiTX+3w8rd+JPyhsMMrE78jrd7ECBuqWMVdNuv5U8em6F7O09CU5LQaygo3/4LZ+2phxJjtpI/ad9Np0uvMd7NqbvwgTku9NbX5QX1zahGwR2eus8rcSQ2a2ZB2eZR03xik9ZpcuEfGV+GFEhYnshRfdTBpH/ejldov15o0V8RJmPc/2e9UYrowXWmamxgD8vdKj12mB7sLY7kpjcfQNUfQSOBbXsfJ2LztJ7Yo33wpZa0iHh1XQ83gnAq2cyZZ+LFFRBM= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN4PR2101MB0880.namprd21.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(396003)(346002)(136003)(376002)(39860400002)(366004)(4326008)(478600001)(8990500004)(86362001)(30864003)(38100700001)(8936002)(10290500003)(83380400001)(66946007)(64756008)(66446008)(66556008)(66476007)(186003)(55016002)(82960400001)(316002)(7696005)(71200400001)(76116006)(8676002)(9686003)(33656002)(52536014)(6506007)(5660300002)(2906002)(54906003)(110136005)(82950400001)(21314003)(4533004);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?5ZVrTbuI61EFRwuKIoKW2I71oFyzplZoq8s759RzrusjSljqYnPK9zCZQZ+b?= =?us-ascii?Q?LIX88V4Ugx3QLlQwZkqthe4vFafnOLwu7q1b1Uqr3U8Qam9YPSaUD70zbSPj?= =?us-ascii?Q?Ne/QseL1K651RkkRJY1leXvQx0jE4ZnH5wBajiXE9udR3atMNbyyOjPCqpkn?= =?us-ascii?Q?+fANy1ASme0Ba7EgAynIdCWDRI64WpZCbVIfvPD9/wSaMWVpEFqrVsDO5YnN?= =?us-ascii?Q?bd//0OOU7wuLzuEarm+nAQRWN/roWpo9+GctcTI7rvYxRAvhhsf5MAKpjN/3?= =?us-ascii?Q?wsdjVVjUtVXAS8TWwIaAQEL5Dec5cNDNIOhUosYcYPa6FleVa8T9bilj9OvD?= =?us-ascii?Q?BteZAd00ME8x2JTomxKXMRa/6GnowE/KPAixBdoEud4zQznT0SpzYoH/wLjk?= =?us-ascii?Q?aWRDrEmh4MoD81aO9yaiKMlOs09dE8B1J9j6XR5skYCaZvbJT3hD9QCNPcZ6?= =?us-ascii?Q?fGqpchfLtXefaauD3uKRilQeSgVNFZlND/nw+7axzfnTfF+N3BxpA7/L72D1?= =?us-ascii?Q?PTkSV04/yNJCJ2nuLv+LTxDx+Raow9aHL/FXjTaajpDP2+AA7rmwz/CXH9Sz?= =?us-ascii?Q?v1rCv+ew3pZTpI0uTnrmzeL3wfmajwWWBvS+rLchYjq68HjsRrPlkdI3OKLz?= =?us-ascii?Q?t2pdfEGnr9Uu98A9qX7neueT4wGcata/ePpMBZ7+Q0V0/PF8URXOnTFjITMc?= =?us-ascii?Q?go1nUIw3pvKjsDR6I57fIfGohKK4LQq3FeKKBQXFKv8JNxd8+jdMqtO1A7FO?= =?us-ascii?Q?Awl/AQ1XJ+Olgrs2gx1H5PJy4GieA/Y74wzmyxSrRt5pnM6RX4eKAqePzdus?= =?us-ascii?Q?vzk7tj7tTRWxFNFfDnIEjdnw/+rs1d8Cu+8qDK5oX79vDi5vYShdVWYSdyFe?= =?us-ascii?Q?LOHQZ/Rr4x/AwY2Mriv91f586oA1ZFy5JvwALwEKyBp1HfxASt769zjOxzxu?= =?us-ascii?Q?nG67d3DyQ/06DEVxLCH6Cdd4z8eRtG7f1el7e57UNh2B4rcg37YHDA4PvlvQ?= =?us-ascii?Q?/7Cp6nzF1JiOxM1VsB0MMVkA+4pwWZrC9S7gW6soM4FCg5YH3TXlVo6hxU3d?= =?us-ascii?Q?PVIqARo8e8VqDresZofGUoYpboz8/DVEIxNmmirFNBNRUSkiPeMqKyyeh9/w?= =?us-ascii?Q?XAtw7Ik/LMg0TbVAy2UrDx3LOd+GhBlpLhu6RIfXpGf045CDcQzTQJR/AFpJ?= =?us-ascii?Q?2Mm4txTy+uDdUGGiEzAp44MZRIfZLhKYSQcNLSI96wX3jQeVAVuv0Gascpsb?= =?us-ascii?Q?KXDndrhKE+8HfHTqIhkpqHu8gwM4/2GC2LY5zc1ugyNvQJZj8d2v60R0Us+I?= =?us-ascii?Q?0WJpgd6Xba8CcE/a50bPsEkAJLmeT0mKi6egzA6UotEXk7rIkT1uNUdcltOw?= =?us-ascii?Q?a4wbaalAIgS8z0IsKs8DclBaOazg?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN4PR2101MB0880.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 901c3883-74e0-4407-97ef-08d8ea4a5e83 X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Mar 2021 20:14:00.5478 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 8I0/bdjkFDp1tNhaE8qbrSlEw8i6i8InILTtnIRAox21MWVZQ5l67GfNKsdZjiknLFzSlcGA2WUYTglyQv/4vL2vNWvSdQLXZwviXyJrSm8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR2101MB1325 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Linux has support for free page reporting now (36e66c554b5c) for virtualized environment. On Hyper-V when virtually backed VMs are configured, Hyper-V will advertise cold memory discard capability, when supported. This patch adds the support to hook into the free page reporting infrastructure and leverage the Hyper-V cold memory discard hint hypercall to report/free these pages back to the host. Signed-off-by: Sunil Muthuswamy Tested-by: Matheus Castello --- In V2: - Addressed feedback comments - Added page reporting config option tied to hyper-v balloon config In V3: - Addressed feedback from Vitaly In V4: - Queried and cached the Hyper-V extended capability for the lifetime of the VM - Addressed feedback from Michael Kelley. --- arch/x86/hyperv/hv_init.c | 45 +++++++++++++++- arch/x86/kernel/cpu/mshyperv.c | 9 ++-- drivers/hv/Kconfig | 1 + drivers/hv/hv_balloon.c | 89 +++++++++++++++++++++++++++++++ include/asm-generic/hyperv-tlfs.h | 35 +++++++++++- include/asm-generic/mshyperv.h | 3 +- 6 files changed, 174 insertions(+), 8 deletions(-) diff --git a/arch/x86/hyperv/hv_init.c b/arch/x86/hyperv/hv_init.c index 9d100257b3af..3937c56145b5 100644 --- a/arch/x86/hyperv/hv_init.c +++ b/arch/x86/hyperv/hv_init.c @@ -498,6 +498,8 @@ void __init hyperv_init(void) x86_init.irqs.create_pci_msi_domain =3D hv_create_pci_msi_domain; #endif =20 + /* Query the VMs extended capability once, so that it can be cached. */ + hv_query_ext_cap(0); return; =20 remove_cpuhp_state: @@ -601,7 +603,7 @@ EXPORT_SYMBOL_GPL(hv_is_hibernation_supported); =20 enum hv_isolation_type hv_get_isolation_type(void) { - if (!(ms_hyperv.features_b & HV_ISOLATION)) + if (!(ms_hyperv.priv_high & HV_ISOLATION)) return HV_ISOLATION_TYPE_NONE; return FIELD_GET(HV_ISOLATION_TYPE, ms_hyperv.isolation_config_b); } @@ -612,3 +614,44 @@ bool hv_is_isolation_supported(void) return hv_get_isolation_type() !=3D HV_ISOLATION_TYPE_NONE; } EXPORT_SYMBOL_GPL(hv_is_isolation_supported); + +/* Bit mask of the extended capability to query: see HV_EXT_CAPABILITY_xxx= */ +bool hv_query_ext_cap(u64 cap_query) +{ + /* + * The address of the 'hv_extended_cap' variable will be used as an + * output parameter to the hypercall below and so it should be + * compatible with 'virt_to_phys'. Which means, it's address should be + * directly mapped. Use 'static' to keep it compatible; stack variables + * can be virtually mapped, making them imcompatible with + * 'virt_to_phys'. + * Hypercall input/output addresses should also be 8-byte aligned. + */ + static u64 hv_extended_cap __aligned(8); + static bool hv_extended_cap_queried; + u64 status; + + /* + * Querying extended capabilities is an extended hypercall. Check if the + * partition supports extended hypercall, first. + */ + if (!(ms_hyperv.priv_high & HV_ENABLE_EXTENDED_HYPERCALLS)) + return false; + + /* Extended capabilities do not change at runtime. */ + if (hv_extended_cap_queried) + return hv_extended_cap & cap_query; + + status =3D hv_do_hypercall(HV_EXT_CALL_QUERY_CAPABILITIES, NULL, + &hv_extended_cap); + hv_extended_cap_queried =3D true; + status &=3D HV_HYPERCALL_RESULT_MASK; + if (status !=3D HV_STATUS_SUCCESS) { + pr_err("Hyper-V: Extended query capabilities hypercall failed 0x%llx\n", + status); + return false; + } + + return hv_extended_cap & cap_query; +} +EXPORT_SYMBOL_GPL(hv_query_ext_cap); diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.= c index cebed535ec56..3546d3e21787 100644 --- a/arch/x86/kernel/cpu/mshyperv.c +++ b/arch/x86/kernel/cpu/mshyperv.c @@ -265,12 +265,13 @@ static void __init ms_hyperv_init_platform(void) * Extract the features and hints */ ms_hyperv.features =3D cpuid_eax(HYPERV_CPUID_FEATURES); - ms_hyperv.features_b =3D cpuid_ebx(HYPERV_CPUID_FEATURES); + ms_hyperv.priv_high =3D cpuid_ebx(HYPERV_CPUID_FEATURES); ms_hyperv.misc_features =3D cpuid_edx(HYPERV_CPUID_FEATURES); ms_hyperv.hints =3D cpuid_eax(HYPERV_CPUID_ENLIGHTMENT_INFO); =20 - pr_info("Hyper-V: features 0x%x, hints 0x%x, misc 0x%x\n", - ms_hyperv.features, ms_hyperv.hints, ms_hyperv.misc_features); + pr_info("Hyper-V: privilege flags low 0x%x, high 0x%x, hints 0x%x, misc 0= x%x\n", + ms_hyperv.features, ms_hyperv.priv_high, ms_hyperv.hints, + ms_hyperv.misc_features); =20 ms_hyperv.max_vp_index =3D cpuid_eax(HYPERV_CPUID_IMPLEMENT_LIMITS); ms_hyperv.max_lp_index =3D cpuid_ebx(HYPERV_CPUID_IMPLEMENT_LIMITS); @@ -316,7 +317,7 @@ static void __init ms_hyperv_init_platform(void) x86_platform.calibrate_cpu =3D hv_get_tsc_khz; } =20 - if (ms_hyperv.features_b & HV_ISOLATION) { + if (ms_hyperv.priv_high & HV_ISOLATION) { ms_hyperv.isolation_config_a =3D cpuid_eax(HYPERV_CPUID_ISOLATION_CONFIG= ); ms_hyperv.isolation_config_b =3D cpuid_ebx(HYPERV_CPUID_ISOLATION_CONFIG= ); =20 diff --git a/drivers/hv/Kconfig b/drivers/hv/Kconfig index 79e5356a737a..66c794d92391 100644 --- a/drivers/hv/Kconfig +++ b/drivers/hv/Kconfig @@ -23,6 +23,7 @@ config HYPERV_UTILS config HYPERV_BALLOON tristate "Microsoft Hyper-V Balloon driver" depends on HYPERV + select PAGE_REPORTING help Select this option to enable Hyper-V Balloon driver. =20 diff --git a/drivers/hv/hv_balloon.c b/drivers/hv/hv_balloon.c index 2f776d78e3c1..58af84e30144 100644 --- a/drivers/hv/hv_balloon.c +++ b/drivers/hv/hv_balloon.c @@ -21,6 +21,7 @@ #include #include #include +#include =20 #include #include @@ -563,6 +564,8 @@ struct hv_dynmem_device { * The negotiated version agreed by host. */ __u32 version; + + struct page_reporting_dev_info pr_dev_info; }; =20 static struct hv_dynmem_device dm_device; @@ -1568,6 +1571,89 @@ static void balloon_onchannelcallback(void *context) =20 } =20 +/* Hyper-V only supports reporting 2MB pages or higher */ +#define HV_MIN_PAGE_REPORTING_ORDER 9 +#define HV_MIN_PAGE_REPORTING_LEN (HV_HYP_PAGE_SIZE << HV_MIN_PAGE_REPORTI= NG_ORDER) +static int hv_free_page_report(struct page_reporting_dev_info *pr_dev_info= , + struct scatterlist *sgl, unsigned int nents) +{ + unsigned long flags; + struct hv_memory_hint *hint; + int i; + u64 status; + struct scatterlist *sg; + + WARN_ON_ONCE(nents > HV_MEMORY_HINT_MAX_GPA_PAGE_RANGES); + WARN_ON_ONCE(sgl->length < HV_MIN_PAGE_REPORTING_LEN); + local_irq_save(flags); + hint =3D *(struct hv_memory_hint **)this_cpu_ptr(hyperv_pcpu_input_arg); + if (!hint) { + local_irq_restore(flags); + return -ENOSPC; + } + + hint->type =3D HV_EXT_MEMORY_HEAT_HINT_TYPE_COLD_DISCARD; + hint->reserved =3D 0; + for_each_sg(sgl, sg, nents, i) { + union hv_gpa_page_range *range; + + range =3D &hint->ranges[i]; + range->address_space =3D 0; + /* page reporting only reports 2MB pages or higher */ + range->page.largepage =3D 1; + range->page.additional_pages =3D + (sg->length / HV_MIN_PAGE_REPORTING_LEN) - 1; + range->page_size =3D HV_GPA_PAGE_RANGE_PAGE_SIZE_2MB; + range->base_large_pfn =3D + page_to_hvpfn(sg_page(sg)) >> HV_MIN_PAGE_REPORTING_ORDER; + } + + status =3D hv_do_rep_hypercall(HV_EXT_CALL_MEMORY_HEAT_HINT, nents, 0, + hint, NULL); + local_irq_restore(flags); + if ((status & HV_HYPERCALL_RESULT_MASK) !=3D HV_STATUS_SUCCESS) { + pr_err("Cold memory discard hypercall failed with status %llx\n", + status); + return -EINVAL; + } + + return 0; +} + +static void enable_page_reporting(void) +{ + int ret; + + /* Essentially, validating 'PAGE_REPORTING_MIN_ORDER' is big enough. */ + if (pageblock_order < HV_MIN_PAGE_REPORTING_ORDER) { + pr_debug("Cold memory discard is only supported on 2MB pages and above\n= "); + return; + } + + if (!hv_query_ext_cap(HV_EXT_CAPABILITY_MEMORY_COLD_DISCARD_HINT)) { + pr_debug("Cold memory discard hint not supported by Hyper-V\n"); + return; + } + + BUILD_BUG_ON(PAGE_REPORTING_CAPACITY > HV_MEMORY_HINT_MAX_GPA_PAGE_RANGES= ); + dm_device.pr_dev_info.report =3D hv_free_page_report; + ret =3D page_reporting_register(&dm_device.pr_dev_info); + if (ret < 0) { + dm_device.pr_dev_info.report =3D NULL; + pr_err("Failed to enable cold memory discard: %d\n", ret); + } else { + pr_info("Cold memory discard hint enabled\n"); + } +} + +static void disable_page_reporting(void) +{ + if (dm_device.pr_dev_info.report) { + page_reporting_unregister(&dm_device.pr_dev_info); + dm_device.pr_dev_info.report =3D NULL; + } +} + static int balloon_connect_vsp(struct hv_device *dev) { struct dm_version_request version_req; @@ -1713,6 +1799,7 @@ static int balloon_probe(struct hv_device *dev, if (ret !=3D 0) return ret; =20 + enable_page_reporting(); dm_device.state =3D DM_INITIALIZED; =20 dm_device.thread =3D @@ -1727,6 +1814,7 @@ static int balloon_probe(struct hv_device *dev, probe_error: dm_device.state =3D DM_INIT_ERROR; dm_device.thread =3D NULL; + disable_page_reporting(); vmbus_close(dev->channel); #ifdef CONFIG_MEMORY_HOTPLUG unregister_memory_notifier(&hv_memory_nb); @@ -1749,6 +1837,7 @@ static int balloon_remove(struct hv_device *dev) cancel_work_sync(&dm->ha_wrk.wrk); =20 kthread_stop(dm->thread); + disable_page_reporting(); vmbus_close(dev->channel); #ifdef CONFIG_MEMORY_HOTPLUG unregister_memory_notifier(&hv_memory_nb); diff --git a/include/asm-generic/hyperv-tlfs.h b/include/asm-generic/hyperv= -tlfs.h index 9cf10837d005..515c3fb06ab3 100644 --- a/include/asm-generic/hyperv-tlfs.h +++ b/include/asm-generic/hyperv-tlfs.h @@ -89,9 +89,9 @@ #define HV_ACCESS_STATS BIT(8) #define HV_DEBUGGING BIT(11) #define HV_CPU_MANAGEMENT BIT(12) +#define HV_ENABLE_EXTENDED_HYPERCALLS BIT(20) #define HV_ISOLATION BIT(22) =20 - /* * TSC page layout. */ @@ -159,11 +159,18 @@ struct ms_hyperv_tsc_page { #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_SPACE 0x00af #define HVCALL_FLUSH_GUEST_PHYSICAL_ADDRESS_LIST 0x00b0 =20 +/* Extended hypercalls */ +#define HV_EXT_CALL_QUERY_CAPABILITIES 0x8001 +#define HV_EXT_CALL_MEMORY_HEAT_HINT 0x8003 + #define HV_FLUSH_ALL_PROCESSORS BIT(0) #define HV_FLUSH_ALL_VIRTUAL_ADDRESS_SPACES BIT(1) #define HV_FLUSH_NON_GLOBAL_MAPPINGS_ONLY BIT(2) #define HV_FLUSH_USE_EXTENDED_RANGE_FORMAT BIT(3) =20 +/* Extended capability bits */ +#define HV_EXT_CAPABILITY_MEMORY_COLD_DISCARD_HINT BIT(8) + enum HV_GENERIC_SET_FORMAT { HV_GENERIC_SET_SPARSE_4K, HV_GENERIC_SET_ALL, @@ -408,8 +415,10 @@ struct hv_guest_mapping_flush { * by the bitwidth of "additional_pages" in union hv_gpa_page_range. */ #define HV_MAX_FLUSH_PAGES (2048) +#define HV_GPA_PAGE_RANGE_PAGE_SIZE_2MB 0 +#define HV_GPA_PAGE_RANGE_PAGE_SIZE_1GB 1 =20 -/* HvFlushGuestPhysicalAddressList hypercall */ +/* HvFlushGuestPhysicalAddressList, HvExtCallMemoryHeatHint hypercall */ union hv_gpa_page_range { u64 address_space; struct { @@ -417,6 +426,12 @@ union hv_gpa_page_range { u64 largepage:1; u64 basepfn:52; } page; + struct { + u64 reserved:12; + u64 page_size:1; + u64 reserved1:8; + u64 base_large_pfn:43; + }; }; =20 /* @@ -774,4 +789,20 @@ struct hv_input_unmap_device_interrupt { #define HV_SOURCE_SHADOW_NONE 0x0 #define HV_SOURCE_SHADOW_BRIDGE_BUS_RANGE 0x1 =20 +/* + * The whole argument should fit in a page to be able to pass to the hyper= visor + * in one hypercall. + */ +#define HV_MEMORY_HINT_MAX_GPA_PAGE_RANGES \ + ((HV_HYP_PAGE_SIZE - sizeof(struct hv_memory_hint)) / \ + sizeof(union hv_gpa_page_range)) + +/* HvExtCallMemoryHeatHint hypercall */ +#define HV_EXT_MEMORY_HEAT_HINT_TYPE_COLD_DISCARD 2 +struct hv_memory_hint { + u64 type:2; + u64 reserved:62; + union hv_gpa_page_range ranges[]; +} __packed; + #endif diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.= h index 2d1b6cd9f000..63c0e579bf6d 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -27,7 +27,7 @@ =20 struct ms_hyperv_info { u32 features; - u32 features_b; + u32 priv_high; u32 misc_features; u32 hints; u32 nested_features; @@ -179,6 +179,7 @@ bool hv_is_hibernation_supported(void); enum hv_isolation_type hv_get_isolation_type(void); bool hv_is_isolation_supported(void); void hyperv_cleanup(void); +bool hv_query_ext_cap(u64 cap_query); #else /* CONFIG_HYPERV */ static inline bool hv_is_hyperv_initialized(void) { return false; } static inline bool hv_is_hibernation_supported(void) { return false; } --=20 2.17.1