From nobody Thu Oct 2 20:46:45 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 55F6926CE26; Wed, 10 Sep 2025 23:14:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546094; cv=none; b=hX5p5EvL02tV5eOaaQQ8ryxNmpeugxUTwlsUQFNjPZNUuBGKEm4tIm2RTE6LTBDwImJPelG0ipqPc9EHkB6LW7sI4/g4M8Y2ncqW++1QWI9P1wRf3dm6i+l30/0WV31eE2cIPdM2kqcSa4C9z1hcgDPTI+LSpT+U4jEnLrVPk1g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546094; c=relaxed/simple; bh=UxGnvZTqfVMwqR+6oXhusmF727Q7xr8fIkkNq4k84CA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=h307LQoyrKRfIjr/BfEb3ShU8YfwFVh2TovLWSuvdrXZNALBncPfGqhKQz9NbNq2Ta22Ns4BlLM1xExPgXxPoYK45ssYoOiagS4vqfBEW9aUscoh4wI/3MA5TEw+FUG7HA78Ern8l8WFq0bKPezgy81QC8jW/Gg+XIRTT1+AyGA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=YZFfEExa; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="YZFfEExa" Received: by linux.microsoft.com (Postfix, from userid 1032) id F039820171D9; Wed, 10 Sep 2025 16:14:52 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com F039820171D9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1757546092; bh=7i5aUGbbHrkn65yck0kCNqpX4hm9ShUUKImb3igG/7k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YZFfEExa2m/tNzX6nQfNcmaGAnSxTEanxQBho/wyNE9eB/b00tI37wCE5yCnAv8zG HXEVFP9pBbfhyoTlIHkef/U4Nbc1cCZG1cFZ2rxREBBetQJmgnLiPBIwvknGUWQofA htRr1ckftyWnj6nmZ+ffIVfA3Ucx4m3ndMvCEayk= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, prapal@linux.microsoft.com, easwar.hariharan@linux.microsoft.com, tiala@microsoft.com, anirudh@anirudhrb.com, paekkaladevi@linux.microsoft.com Cc: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, Nuno Das Neves Subject: [PATCH v2 1/5] mshv: Only map vp->vp_stats_pages if on root scheduler Date: Wed, 10 Sep 2025 16:14:45 -0700 Message-Id: <1757546089-2002-2-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This mapping is only used for checking if the dispatch thread is blocked. This is only relevant for the root scheduler, so check the scheduler type to determine whether to map/unmap these pages, instead of the current check, which is incorrect. Signed-off-by: Nuno Das Neves Reviewed-by: Anirudh Rayabharam Reviewed-by: Praveen K Paladugu Reviewed-by: Easwar Hariharan Reviewed-by: Tianyu Lan --- drivers/hv/mshv_root_main.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index e3b2bd417c46..24df47726363 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -934,7 +934,11 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *= partition, goto unmap_register_page; } =20 - if (hv_parent_partition()) { + /* + * This mapping of the stats page is for detecting if dispatch thread + * is blocked - only relevant for root scheduler + */ + if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) { ret =3D mshv_vp_stats_map(partition->pt_id, args.vp_index, stats_pages); if (ret) @@ -963,7 +967,7 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *p= artition, if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) vp->vp_ghcb_page =3D page_to_virt(ghcb_page); =20 - if (hv_parent_partition()) + if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) memcpy(vp->vp_stats_pages, stats_pages, sizeof(stats_pages)); =20 /* @@ -986,7 +990,7 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *p= artition, free_vp: kfree(vp); unmap_stats_pages: - if (hv_parent_partition()) + if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) mshv_vp_stats_unmap(partition->pt_id, args.vp_index); unmap_ghcb_page: if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) { @@ -1740,7 +1744,7 @@ static void destroy_partition(struct mshv_partition *= partition) if (!vp) continue; =20 - if (hv_parent_partition()) + if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) mshv_vp_stats_unmap(partition->pt_id, vp->vp_index); =20 if (vp->vp_register_page) { --=20 2.34.1 From nobody Thu Oct 2 20:46:45 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9B3E1304989; Wed, 10 Sep 2025 23:14:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546095; cv=none; b=Z7TsEzL4rXLTB9Af+jn6TzFTcAgxXvmf9zWI0HmJ4JbVcxBXPrP0V3u4DhIOXAvyBuvMFK8haH7q8DmavxH376/GjoZDhUg068G9JJZD93nbkUm77411GV3pVp03hn80lF3OB7cxcuuZmRUiqrabTc85TK048an917SEsSRM3wQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546095; c=relaxed/simple; bh=55hBT8yCuXOz4MzQRiPmd9+OMrYJFsFGCg3LBWx6M7k=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=kKJQwQWTPNmToDzuQgzEFBUZLmKqFizh7wZ4TS+aQNWrppEpVv3iPmUnvr/u6NJbSquSMbp/rk8LBpqbUVg4/ezebxm4p/C5puC3+2tVfznlWrESVZSNntZXMZ9V4G9thf9nZO2bko7raYl0E1Rrigvqy7w64/XZlJAD+FQRP84= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=UowRf1ue; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="UowRf1ue" Received: by linux.microsoft.com (Postfix, from userid 1032) id 4FC232018E6E; Wed, 10 Sep 2025 16:14:53 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4FC232018E6E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1757546093; bh=pG2+LgTlAE6D9tHHcO1DiwSmVeFVhK6YP52OuF8fCJ0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=UowRf1ueL3jTZ6NWKVd/jL2JBVtWmhiaqvKXp2m/6+iDG5Jrq4lumcxbf8a0l2G1B HIuiZ2izgul5KVGy5T7mUqtn2aHd6lGom2kqyEldA2pQgQzA+t1iTizz8zbLuTnVbw v5yDBj5DzjvimvmaVjFgZ6+mu8YgXMg4ZFqTz+IE= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, prapal@linux.microsoft.com, easwar.hariharan@linux.microsoft.com, tiala@microsoft.com, anirudh@anirudhrb.com, paekkaladevi@linux.microsoft.com Cc: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, Nuno Das Neves Subject: [PATCH v2 2/5] mshv: Add the HVCALL_GET_PARTITION_PROPERTY_EX hypercall Date: Wed, 10 Sep 2025 16:14:46 -0700 Message-Id: <1757546089-2002-3-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Purna Pavan Chandra Aekkaladevi This hypercall can be used to fetch extended properties of a partition. Extended properties are properties with values larger than a u64. Some of these also need additional input arguments. Add helper function for using the hypercall in the mshv_root driver. Signed-off-by: Purna Pavan Chandra Aekkaladevi Signed-off-by: Nuno Das Neves Reviewed-by: Anirudh Rayabharam Reviewed-by: Praveen K Paladugu Reviewed-by: Easwar Hariharan --- drivers/hv/mshv_root.h | 2 ++ drivers/hv/mshv_root_hv_call.c | 31 ++++++++++++++++++++++++++ include/hyperv/hvgdk_mini.h | 1 + include/hyperv/hvhdk.h | 40 ++++++++++++++++++++++++++++++++++ include/hyperv/hvhdk_mini.h | 26 ++++++++++++++++++++++ 5 files changed, 100 insertions(+) diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h index e3931b0f1269..4aeb03bea6b6 100644 --- a/drivers/hv/mshv_root.h +++ b/drivers/hv/mshv_root.h @@ -303,6 +303,8 @@ int hv_call_unmap_stat_page(enum hv_stats_object_type t= ype, int hv_call_modify_spa_host_access(u64 partition_id, struct page **pages, u64 page_struct_count, u32 host_access, u32 flags, u8 acquire); +int hv_call_get_partition_property_ex(u64 partition_id, u64 property_code,= u64 arg, + void *property_value, size_t property_value_sz); =20 extern struct mshv_root mshv_root; extern enum hv_scheduler_type hv_scheduler_type; diff --git a/drivers/hv/mshv_root_hv_call.c b/drivers/hv/mshv_root_hv_call.c index c9c274f29c3c..3fd3cce23f69 100644 --- a/drivers/hv/mshv_root_hv_call.c +++ b/drivers/hv/mshv_root_hv_call.c @@ -590,6 +590,37 @@ int hv_call_unmap_vp_state_page(u64 partition_id, u32 = vp_index, u32 type, return hv_result_to_errno(status); } =20 +int hv_call_get_partition_property_ex(u64 partition_id, u64 property_code, + u64 arg, void *property_value, + size_t property_value_sz) +{ + u64 status; + unsigned long flags; + struct hv_input_get_partition_property_ex *input; + struct hv_output_get_partition_property_ex *output; + + local_irq_save(flags); + input =3D *this_cpu_ptr(hyperv_pcpu_input_arg); + output =3D *this_cpu_ptr(hyperv_pcpu_output_arg); + + memset(input, 0, sizeof(*input)); + input->partition_id =3D partition_id; + input->property_code =3D property_code; + input->arg =3D arg; + status =3D hv_do_hypercall(HVCALL_GET_PARTITION_PROPERTY_EX, input, outpu= t); + + if (!hv_result_success(status)) { + hv_status_debug(status, "\n"); + local_irq_restore(flags); + return hv_result_to_errno(status); + } + memcpy(property_value, &output->property_value, property_value_sz); + + local_irq_restore(flags); + + return 0; +} + int hv_call_clear_virtual_interrupt(u64 partition_id) { diff --git a/include/hyperv/hvgdk_mini.h b/include/hyperv/hvgdk_mini.h index 1be7f6a02304..ff4325fb623a 100644 --- a/include/hyperv/hvgdk_mini.h +++ b/include/hyperv/hvgdk_mini.h @@ -490,6 +490,7 @@ union hv_vp_assist_msr_contents { /* HV_REGISTER_VP_AS= SIST_PAGE */ #define HVCALL_GET_VP_STATE 0x00e3 #define HVCALL_SET_VP_STATE 0x00e4 #define HVCALL_GET_VP_CPUID_VALUES 0x00f4 +#define HVCALL_GET_PARTITION_PROPERTY_EX 0x0101 #define HVCALL_MMIO_READ 0x0106 #define HVCALL_MMIO_WRITE 0x0107 =20 diff --git a/include/hyperv/hvhdk.h b/include/hyperv/hvhdk.h index b4067ada02cf..b91358b9c929 100644 --- a/include/hyperv/hvhdk.h +++ b/include/hyperv/hvhdk.h @@ -376,6 +376,46 @@ struct hv_input_set_partition_property { u64 property_value; } __packed; =20 +union hv_partition_property_arg { + u64 as_uint64; + struct { + union { + u32 arg; + u32 vp_index; + }; + u16 reserved0; + u8 reserved1; + u8 object_type; + }; +} __packed; + +struct hv_input_get_partition_property_ex { + u64 partition_id; + u32 property_code; /* enum hv_partition_property_code */ + u32 padding; + union { + union hv_partition_property_arg arg_data; + u64 arg; + }; +} __packed; + +/* + * NOTE: Should use hv_input_set_partition_property_ex_header to compute t= his + * size, but hv_input_get_partition_property_ex is identical so it suffices + */ +#define HV_PARTITION_PROPERTY_EX_MAX_VAR_SIZE \ + (HV_HYP_PAGE_SIZE - sizeof(struct hv_input_get_partition_property_ex)) + +union hv_partition_property_ex { + u8 buffer[HV_PARTITION_PROPERTY_EX_MAX_VAR_SIZE]; + struct hv_partition_property_vmm_capabilities vmm_capabilities; + /* More fields to be filled in when needed */ +} __packed; + +struct hv_output_get_partition_property_ex { + union hv_partition_property_ex property_value; +} __packed; + enum hv_vp_state_page_type { HV_VP_STATE_PAGE_REGISTERS =3D 0, HV_VP_STATE_PAGE_INTERCEPT_MESSAGE =3D 1, diff --git a/include/hyperv/hvhdk_mini.h b/include/hyperv/hvhdk_mini.h index 858f6a3925b3..bf2ce27dfcc5 100644 --- a/include/hyperv/hvhdk_mini.h +++ b/include/hyperv/hvhdk_mini.h @@ -96,8 +96,34 @@ enum hv_partition_property_code { HV_PARTITION_PROPERTY_XSAVE_STATES =3D 0x00060007, HV_PARTITION_PROPERTY_MAX_XSAVE_DATA_SIZE =3D 0x00060008, HV_PARTITION_PROPERTY_PROCESSOR_CLOCK_FREQUENCY =3D 0x00060009, + + /* Extended properties with larger property values */ + HV_PARTITION_PROPERTY_VMM_CAPABILITIES =3D 0x00090007, }; =20 +#define HV_PARTITION_VMM_CAPABILITIES_BANK_COUNT 1 +#define HV_PARTITION_VMM_CAPABILITIES_RESERVED_BITFIELD_COUNT 59 + +struct hv_partition_property_vmm_capabilities { + u16 bank_count; + u16 reserved[3]; + union { + u64 as_uint64[HV_PARTITION_VMM_CAPABILITIES_BANK_COUNT]; + struct { + u64 map_gpa_preserve_adjustable: 1; + u64 vmm_can_provide_overlay_gpfn: 1; + u64 vp_affinity_property: 1; +#if IS_ENABLED(CONFIG_ARM64) + u64 vmm_can_provide_gic_overlay_locations: 1; +#else + u64 reservedbit3: 1; +#endif + u64 assignable_synthetic_proc_features: 1; + u64 reserved0: HV_PARTITION_VMM_CAPABILITIES_RESERVED_BITFIELD_COUNT; + } __packed; + }; +} __packed; + enum hv_snp_status { HV_SNP_STATUS_NONE =3D 0, HV_SNP_STATUS_AVAILABLE =3D 1, --=20 2.34.1 From nobody Thu Oct 2 20:46:46 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D179E3064BA; Wed, 10 Sep 2025 23:14:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546095; cv=none; b=VeAaQUAYDuntwl3MauDk0zmiQXF31xwuuZ4GrFRTSKEOT0xjaO5Mm1o6KmQA1/xVloR1Avnz/Jqas7CetwCYGupjtKltWl1qBbQre8eHvTMv3KfYi6w0//ouXYffUFUJiTMwpxHtpfv7xSnKZ99dTfwdkHVumsLif02/Npw7uO8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546095; c=relaxed/simple; bh=JKG2hrISRHt0TewSEFAEtrgOmkR+vtp8APLClCnXgmI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=bsEPqQofEUcN9kxmBOITMthY5R1KvHZzR2RtI3zkkcCT7eU4WKNQiSBMiZyBE0JSNoevNvN+dTJ6xsq3pOEZOPyQ++85dAZ9qg82cJa27gKy8lbE7fNKFe4H8MuU5PZQlsKof34xAKCwG/oigf6V7XhROlmsOslEqUmfbgAsTtQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=AuGqc7Tw; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="AuGqc7Tw" Received: by linux.microsoft.com (Postfix, from userid 1032) id 9F47A2018E71; Wed, 10 Sep 2025 16:14:53 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 9F47A2018E71 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1757546093; bh=YCh3wgVuB2vh0c+UXuVPwE26nnFHIhu86EFs4zuEOig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AuGqc7TwHV3NW9CxbpgutRESHvI6kN3x1xW65SOx0A/hn5jPrkpwmzv3OamnTOdoo wA6GgAX/+hfX1RYiK0SmvYYP06sMZ0wdFXCQz6VNbHXU9C+af/Ijw94la0kaYVsuYX FrIAA2gsG+77I0MHIz4wlspu+pgnJq27qJnHYECA= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, prapal@linux.microsoft.com, easwar.hariharan@linux.microsoft.com, tiala@microsoft.com, anirudh@anirudhrb.com, paekkaladevi@linux.microsoft.com Cc: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, Nuno Das Neves Subject: [PATCH v2 3/5] mshv: Get the vmm capabilities offered by the hypervisor Date: Wed, 10 Sep 2025 16:14:47 -0700 Message-Id: <1757546089-2002-4-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Purna Pavan Chandra Aekkaladevi Some hypervisor APIs are gated by feature bits in the "vmm capabilities" partition property. Store the capabilities on mshv_root module init, using HVCALL_GET_PARTITION_PROPERTY_EX. This is not supported on all hypervisors. In that case, just set the capabilities to 0 and proceed as normal. Signed-off-by: Purna Pavan Chandra Aekkaladevi Signed-off-by: Nuno Das Neves Reviewed-by: Praveen K Paladugu Reviewed-by: Easwar Hariharan Reviewed-by: Tianyu Lan --- drivers/hv/mshv_root.h | 1 + drivers/hv/mshv_root_main.c | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h index 4aeb03bea6b6..0cb1e2589fe1 100644 --- a/drivers/hv/mshv_root.h +++ b/drivers/hv/mshv_root.h @@ -178,6 +178,7 @@ struct mshv_root { struct hv_synic_pages __percpu *synic_pages; spinlock_t pt_ht_lock; DECLARE_HASHTABLE(pt_htable, MSHV_PARTITIONS_HASH_BITS); + struct hv_partition_property_vmm_capabilities vmm_caps; }; =20 /* diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index 24df47726363..f7738cefbdf3 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -2201,6 +2201,26 @@ static int __init mshv_root_partition_init(struct de= vice *dev) return err; } =20 +static void mshv_init_vmm_caps(struct device *dev) +{ + int ret; + + memset(&mshv_root.vmm_caps, 0, sizeof(mshv_root.vmm_caps)); + ret =3D hv_call_get_partition_property_ex(HV_PARTITION_ID_SELF, + HV_PARTITION_PROPERTY_VMM_CAPABILITIES, + 0, &mshv_root.vmm_caps, + sizeof(mshv_root.vmm_caps)); + + /* + * HVCALL_GET_PARTITION_PROPERTY_EX or HV_PARTITION_PROPERTY_VMM_CAPABILI= TIES + * may not be supported. Leave them as 0 in that case. + */ + if (ret) + dev_warn(dev, "Unable to get VMM capabilities\n"); + + dev_dbg(dev, "vmm_caps=3D0x%llx\n", mshv_root.vmm_caps.as_uint64[0]); +} + static int __init mshv_parent_partition_init(void) { int ret; @@ -2253,6 +2273,8 @@ static int __init mshv_parent_partition_init(void) if (ret) goto remove_cpu_state; =20 + mshv_init_vmm_caps(dev); + ret =3D mshv_irqfd_wq_init(); if (ret) goto exit_partition; --=20 2.34.1 From nobody Thu Oct 2 20:46:46 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 49045307482; Wed, 10 Sep 2025 23:14:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546095; cv=none; b=lo3drqK2nU3iWmetWgK7/o6g56URYY5fA1IWbCyYpNSO8TeEw217R9lIexGNDvnIrVf8D6rCE/uYaEpk/fZZ4TFaFitnaW6+ULxtYJb9pIrMsQy+rdtMYAbWTMZP3u6xQzUMo4d2zU/zQKpeQ6R4AgWclVmz5sAOUICMljAIVeU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546095; c=relaxed/simple; bh=uj50oLn4W9iWHkkYQDAPW8zCrvObomKxnCFUGAGVFT4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=gXfzi+Tw6wvx8nZa9Xfbcg30qgQ8csPurEix0OaG2/Z9dKnztiIDrj+fOzIBs8kwZc4g9zxVuqADvMBgCCBOI/Z6/wssbU9nBMJr2eRYigHCe+H4UGzOTJwJSTL1tXePBPE6ziDUA2fO7o2UL8M8pW06xmZtI8qckvpVXU6TRVk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=Ow8yQQZ9; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="Ow8yQQZ9" Received: by linux.microsoft.com (Postfix, from userid 1032) id 006BF2018E74; Wed, 10 Sep 2025 16:14:53 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 006BF2018E74 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1757546094; bh=03tUE7CG2ivdaFF099uiMNS7w+LteJOOTbhg5vbu3Zc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ow8yQQZ9lY9t35U3XryscEwDveWK96NNeuvVfER4qFD7mbXYl7KPERgeycDwiQxB4 f/DKsg9tWtjYuYTcVUMAL8xhDDbrYDiQ9UxbBJyeU+wsEJz/1Ho2bg9RgeIfSHZ8sS 4zPUy39G/D8RNK3gTbecPFQxbXk+W2uJlNShQwZo= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, prapal@linux.microsoft.com, easwar.hariharan@linux.microsoft.com, tiala@microsoft.com, anirudh@anirudhrb.com, paekkaladevi@linux.microsoft.com Cc: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, Jinank Jain , Nuno Das Neves Subject: [PATCH v2 4/5] mshv: Allocate vp state page for HVCALL_MAP_VP_STATE_PAGE on L1VH Date: Wed, 10 Sep 2025 16:14:48 -0700 Message-Id: <1757546089-2002-5-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jinank Jain Introduce mshv_use_overlay_gpfn() to check if a page needs to be allocated and passed to the hypervisor to map VP state pages. This is only needed on L1VH, and only on some (newer) versions of the hypervisor, hence the need to check vmm_capabilities. Introduce functions hv_map/unmap_vp_state_page() to handle the allocation and freeing. Signed-off-by: Jinank Jain Signed-off-by: Nuno Das Neves Reviewed-by: Praveen K Paladugu Reviewed-by: Easwar Hariharan --- drivers/hv/mshv_root.h | 11 +++--- drivers/hv/mshv_root_hv_call.c | 61 +++++++++++++++++++++++++--- drivers/hv/mshv_root_main.c | 72 +++++++++++++++++----------------- 3 files changed, 96 insertions(+), 48 deletions(-) diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h index 0cb1e2589fe1..d7c9520ef788 100644 --- a/drivers/hv/mshv_root.h +++ b/drivers/hv/mshv_root.h @@ -279,11 +279,12 @@ int hv_call_set_vp_state(u32 vp_index, u64 partition_= id, /* Choose between pages and bytes */ struct hv_vp_state_data state_data, u64 page_count, struct page **pages, u32 num_bytes, u8 *bytes); -int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type, - union hv_input_vtl input_vtl, - struct page **state_page); -int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type, - union hv_input_vtl input_vtl); +int hv_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type, + union hv_input_vtl input_vtl, + struct page **state_page); +int hv_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type, + void *page_addr, + union hv_input_vtl input_vtl); int hv_call_create_port(u64 port_partition_id, union hv_port_id port_id, u64 connection_partition_id, struct hv_port_info *port_info, u8 port_vtl, u8 min_connection_vtl, int node); diff --git a/drivers/hv/mshv_root_hv_call.c b/drivers/hv/mshv_root_hv_call.c index 3fd3cce23f69..1132ba7b2399 100644 --- a/drivers/hv/mshv_root_hv_call.c +++ b/drivers/hv/mshv_root_hv_call.c @@ -526,9 +526,9 @@ int hv_call_set_vp_state(u32 vp_index, u64 partition_id, return ret; } =20 -int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type, - union hv_input_vtl input_vtl, - struct page **state_page) +static int hv_call_map_vp_state_page(u64 partition_id, u32 vp_index, u32 t= ype, + union hv_input_vtl input_vtl, + struct page **state_page) { struct hv_input_map_vp_state_page *input; struct hv_output_map_vp_state_page *output; @@ -547,7 +547,14 @@ int hv_call_map_vp_state_page(u64 partition_id, u32 vp= _index, u32 type, input->type =3D type; input->input_vtl =3D input_vtl; =20 - status =3D hv_do_hypercall(HVCALL_MAP_VP_STATE_PAGE, input, output); + if (*state_page) { + input->flags.map_location_provided =3D 1; + input->requested_map_location =3D + page_to_pfn(*state_page); + } + + status =3D hv_do_hypercall(HVCALL_MAP_VP_STATE_PAGE, input, + output); =20 if (hv_result(status) !=3D HV_STATUS_INSUFFICIENT_MEMORY) { if (hv_result_success(status)) @@ -565,8 +572,39 @@ int hv_call_map_vp_state_page(u64 partition_id, u32 vp= _index, u32 type, return ret; } =20 -int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type, - union hv_input_vtl input_vtl) +static bool mshv_use_overlay_gpfn(void) +{ + return hv_l1vh_partition() && + mshv_root.vmm_caps.vmm_can_provide_overlay_gpfn; +} + +int hv_map_vp_state_page(u64 partition_id, u32 vp_index, u32 type, + union hv_input_vtl input_vtl, + struct page **state_page) +{ + int ret =3D 0; + struct page *allocated_page =3D NULL; + + if (mshv_use_overlay_gpfn()) { + allocated_page =3D alloc_page(GFP_KERNEL); + if (!allocated_page) + return -ENOMEM; + *state_page =3D allocated_page; + } else { + *state_page =3D NULL; + } + + ret =3D hv_call_map_vp_state_page(partition_id, vp_index, type, input_vtl, + state_page); + + if (ret && allocated_page) + __free_page(allocated_page); + + return ret; +} + +static int hv_call_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32= type, + union hv_input_vtl input_vtl) { unsigned long flags; u64 status; @@ -590,6 +628,17 @@ int hv_call_unmap_vp_state_page(u64 partition_id, u32 = vp_index, u32 type, return hv_result_to_errno(status); } =20 +int hv_unmap_vp_state_page(u64 partition_id, u32 vp_index, u32 type, + void *page_addr, union hv_input_vtl input_vtl) +{ + int ret =3D hv_call_unmap_vp_state_page(partition_id, vp_index, type, inp= ut_vtl); + + if (mshv_use_overlay_gpfn() && page_addr) + __free_page(virt_to_page(page_addr)); + + return ret; +} + int hv_call_get_partition_property_ex(u64 partition_id, u64 property_code, u64 arg, void *property_value, size_t property_value_sz) diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index f7738cefbdf3..7352c4f9652e 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -908,28 +908,25 @@ mshv_partition_ioctl_create_vp(struct mshv_partition = *partition, if (ret) return ret; =20 - ret =3D hv_call_map_vp_state_page(partition->pt_id, args.vp_index, - HV_VP_STATE_PAGE_INTERCEPT_MESSAGE, - input_vtl_zero, - &intercept_message_page); + ret =3D hv_map_vp_state_page(partition->pt_id, args.vp_index, + HV_VP_STATE_PAGE_INTERCEPT_MESSAGE, + input_vtl_zero, &intercept_message_page); if (ret) goto destroy_vp; =20 if (!mshv_partition_encrypted(partition)) { - ret =3D hv_call_map_vp_state_page(partition->pt_id, args.vp_index, - HV_VP_STATE_PAGE_REGISTERS, - input_vtl_zero, - ®ister_page); + ret =3D hv_map_vp_state_page(partition->pt_id, args.vp_index, + HV_VP_STATE_PAGE_REGISTERS, + input_vtl_zero, ®ister_page); if (ret) goto unmap_intercept_message_page; } =20 if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) { - ret =3D hv_call_map_vp_state_page(partition->pt_id, args.vp_index, - HV_VP_STATE_PAGE_GHCB, - input_vtl_normal, - &ghcb_page); + ret =3D hv_map_vp_state_page(partition->pt_id, args.vp_index, + HV_VP_STATE_PAGE_GHCB, + input_vtl_normal, &ghcb_page); if (ret) goto unmap_register_page; } @@ -993,21 +990,19 @@ mshv_partition_ioctl_create_vp(struct mshv_partition = *partition, if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) mshv_vp_stats_unmap(partition->pt_id, args.vp_index); unmap_ghcb_page: - if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) { - hv_call_unmap_vp_state_page(partition->pt_id, args.vp_index, - HV_VP_STATE_PAGE_GHCB, - input_vtl_normal); - } + if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) + hv_unmap_vp_state_page(partition->pt_id, args.vp_index, + HV_VP_STATE_PAGE_GHCB, vp->vp_ghcb_page, + input_vtl_normal); unmap_register_page: - if (!mshv_partition_encrypted(partition)) { - hv_call_unmap_vp_state_page(partition->pt_id, args.vp_index, - HV_VP_STATE_PAGE_REGISTERS, - input_vtl_zero); - } + if (!mshv_partition_encrypted(partition)) + hv_unmap_vp_state_page(partition->pt_id, args.vp_index, + HV_VP_STATE_PAGE_REGISTERS, + vp->vp_register_page, input_vtl_zero); unmap_intercept_message_page: - hv_call_unmap_vp_state_page(partition->pt_id, args.vp_index, - HV_VP_STATE_PAGE_INTERCEPT_MESSAGE, - input_vtl_zero); + hv_unmap_vp_state_page(partition->pt_id, args.vp_index, + HV_VP_STATE_PAGE_INTERCEPT_MESSAGE, + vp->vp_intercept_msg_page, input_vtl_zero); destroy_vp: hv_call_delete_vp(partition->pt_id, args.vp_index); return ret; @@ -1748,24 +1743,27 @@ static void destroy_partition(struct mshv_partition= *partition) mshv_vp_stats_unmap(partition->pt_id, vp->vp_index); =20 if (vp->vp_register_page) { - (void)hv_call_unmap_vp_state_page(partition->pt_id, - vp->vp_index, - HV_VP_STATE_PAGE_REGISTERS, - input_vtl_zero); + (void)hv_unmap_vp_state_page(partition->pt_id, + vp->vp_index, + HV_VP_STATE_PAGE_REGISTERS, + vp->vp_register_page, + input_vtl_zero); vp->vp_register_page =3D NULL; } =20 - (void)hv_call_unmap_vp_state_page(partition->pt_id, - vp->vp_index, - HV_VP_STATE_PAGE_INTERCEPT_MESSAGE, - input_vtl_zero); + (void)hv_unmap_vp_state_page(partition->pt_id, + vp->vp_index, + HV_VP_STATE_PAGE_INTERCEPT_MESSAGE, + vp->vp_intercept_msg_page, + input_vtl_zero); vp->vp_intercept_msg_page =3D NULL; =20 if (vp->vp_ghcb_page) { - (void)hv_call_unmap_vp_state_page(partition->pt_id, - vp->vp_index, - HV_VP_STATE_PAGE_GHCB, - input_vtl_normal); + (void)hv_unmap_vp_state_page(partition->pt_id, + vp->vp_index, + HV_VP_STATE_PAGE_GHCB, + vp->vp_ghcb_page, + input_vtl_normal); vp->vp_ghcb_page =3D NULL; } =20 --=20 2.34.1 From nobody Thu Oct 2 20:46:46 2025 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7B39930F959; Wed, 10 Sep 2025 23:14:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=13.77.154.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546096; cv=none; b=TysL8B/JMHaMji/UqrOdo7bT2Nd4EiebYGYfjpfCKDIflu8lFoERvIU3YXhsXOHQNYBeULnvnsHFZDfhi2ZjrSe2wqVfBI/8neCQyMzjUOaZ1xQXUUvq6fLoHS6c/pQiUEpXOdQKAAyvxPqXRwsIwvzwjKlAhUg/l4VzALFx2Po= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1757546096; c=relaxed/simple; bh=xB0NC5vuU3Dv2yhqrKKRPwahYTastpbYtsw8yrlCi9I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=kHqyR6q1AReZ/OBpyOeyaMCGvh1y43fTdZMdMuz0ZbdWoV5J8QcKU7AYttcWDOsTyFveAh1J1JiIshgIn1uP3kcesrT+lAt0vFQEetciRceH34AngNI73uIUi/I9iF7BBVDv1fJGnrAR2mxauAONK/h3A8aaJnyb1w3E0uK2BIo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com; spf=pass smtp.mailfrom=linux.microsoft.com; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b=P9dF7S52; arc=none smtp.client-ip=13.77.154.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.microsoft.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.microsoft.com header.i=@linux.microsoft.com header.b="P9dF7S52" Received: by linux.microsoft.com (Postfix, from userid 1032) id 4AF612018E75; Wed, 10 Sep 2025 16:14:54 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com 4AF612018E75 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1757546094; bh=+Y4bVDeBFmyRTpawheWUIjQ5+FQwnQLgbB7820RIerU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P9dF7S52uSsrZVcrHxx6zOhUChJUgURHQjGo6gbXPsQv+/cZ4vrF11vbrW4OyXERD clBWvl/uw4SPntBYi69yOW2x9iRUTJ8cSSA8i47xsh0caFiRxdFDCTHIZbJ1rraQ/I DYZDP7bMOLT/fwTyothfmn1H8yM3R7wnxhPfiVVw= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, prapal@linux.microsoft.com, easwar.hariharan@linux.microsoft.com, tiala@microsoft.com, anirudh@anirudhrb.com, paekkaladevi@linux.microsoft.com Cc: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, Jinank Jain , Nuno Das Neves Subject: [PATCH v2 5/5] mshv: Introduce new hypercall to map stats page for L1VH partitions Date: Wed, 10 Sep 2025 16:14:49 -0700 Message-Id: <1757546089-2002-6-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1757546089-2002-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Jinank Jain Introduce HVCALL_MAP_STATS_PAGE2 which provides a map location (GPFN) to map the stats to. This hypercall is required for L1VH partitions, depending on the hypervisor version. This uses the same check as the state page map location; mshv_use_overlay_gpfn(). Add mshv_map_vp_state_page() helpers to use this new hypercall or the old one depending on availability. For unmapping, the original HVCALL_UNMAP_STATS_PAGE works for both cases. Signed-off-by: Jinank Jain Signed-off-by: Nuno Das Neves Reviewed-by: Easwar Hariharan --- drivers/hv/mshv_root.h | 10 ++-- drivers/hv/mshv_root_hv_call.c | 89 ++++++++++++++++++++++++++++++++-- drivers/hv/mshv_root_main.c | 25 ++++++---- include/hyperv/hvgdk_mini.h | 1 + include/hyperv/hvhdk_mini.h | 7 +++ 5 files changed, 112 insertions(+), 20 deletions(-) diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h index d7c9520ef788..d16a020ae0ee 100644 --- a/drivers/hv/mshv_root.h +++ b/drivers/hv/mshv_root.h @@ -297,11 +297,11 @@ int hv_call_connect_port(u64 port_partition_id, union= hv_port_id port_id, int hv_call_disconnect_port(u64 connection_partition_id, union hv_connection_id connection_id); int hv_call_notify_port_ring_empty(u32 sint_index); -int hv_call_map_stat_page(enum hv_stats_object_type type, - const union hv_stats_object_identity *identity, - void **addr); -int hv_call_unmap_stat_page(enum hv_stats_object_type type, - const union hv_stats_object_identity *identity); +int hv_map_stats_page(enum hv_stats_object_type type, + const union hv_stats_object_identity *identity, + void **addr); +int hv_unmap_stats_page(enum hv_stats_object_type type, void *page_addr, + const union hv_stats_object_identity *identity); int hv_call_modify_spa_host_access(u64 partition_id, struct page **pages, u64 page_struct_count, u32 host_access, u32 flags, u8 acquire); diff --git a/drivers/hv/mshv_root_hv_call.c b/drivers/hv/mshv_root_hv_call.c index 1132ba7b2399..a8cb91ce11cc 100644 --- a/drivers/hv/mshv_root_hv_call.c +++ b/drivers/hv/mshv_root_hv_call.c @@ -804,9 +804,47 @@ hv_call_notify_port_ring_empty(u32 sint_index) return hv_result_to_errno(status); } =20 -int hv_call_map_stat_page(enum hv_stats_object_type type, - const union hv_stats_object_identity *identity, - void **addr) +static int hv_call_map_stats_page2(enum hv_stats_object_type type, + const union hv_stats_object_identity *identity, + u64 map_location) +{ + unsigned long flags; + struct hv_input_map_stats_page2 *input; + u64 status; + int ret; + + if (!map_location || !mshv_use_overlay_gpfn()) + return -EINVAL; + + do { + local_irq_save(flags); + input =3D *this_cpu_ptr(hyperv_pcpu_input_arg); + + memset(input, 0, sizeof(*input)); + input->type =3D type; + input->identity =3D *identity; + input->map_location =3D map_location; + + status =3D hv_do_hypercall(HVCALL_MAP_STATS_PAGE2, input, NULL); + + local_irq_restore(flags); + if (hv_result(status) !=3D HV_STATUS_INSUFFICIENT_MEMORY) { + if (hv_result_success(status)) + break; + hv_status_debug(status, "\n"); + return hv_result_to_errno(status); + } + + ret =3D hv_call_deposit_pages(NUMA_NO_NODE, + hv_current_partition_id, 1); + } while (!ret); + + return ret; +} + +static int hv_call_map_stats_page(enum hv_stats_object_type type, + const union hv_stats_object_identity *identity, + void **addr) { unsigned long flags; struct hv_input_map_stats_page *input; @@ -845,8 +883,36 @@ int hv_call_map_stat_page(enum hv_stats_object_type ty= pe, return ret; } =20 -int hv_call_unmap_stat_page(enum hv_stats_object_type type, - const union hv_stats_object_identity *identity) +int hv_map_stats_page(enum hv_stats_object_type type, + const union hv_stats_object_identity *identity, + void **addr) +{ + int ret; + struct page *allocated_page =3D NULL; + + if (!addr) + return -EINVAL; + + if (mshv_use_overlay_gpfn()) { + allocated_page =3D alloc_page(GFP_KERNEL); + if (!allocated_page) + return -ENOMEM; + + ret =3D hv_call_map_stats_page2(type, identity, + page_to_pfn(allocated_page)); + *addr =3D page_address(allocated_page); + } else { + ret =3D hv_call_map_stats_page(type, identity, addr); + } + + if (ret && allocated_page) + __free_page(allocated_page); + + return ret; +} + +static int hv_call_unmap_stats_page(enum hv_stats_object_type type, + const union hv_stats_object_identity *identity) { unsigned long flags; struct hv_input_unmap_stats_page *input; @@ -865,6 +931,19 @@ int hv_call_unmap_stat_page(enum hv_stats_object_type = type, return hv_result_to_errno(status); } =20 +int hv_unmap_stats_page(enum hv_stats_object_type type, void *page_addr, + const union hv_stats_object_identity *identity) +{ + int ret; + + ret =3D hv_call_unmap_stats_page(type, identity); + + if (mshv_use_overlay_gpfn() && page_addr) + __free_page(virt_to_page(page_addr)); + + return ret; +} + int hv_call_modify_spa_host_access(u64 partition_id, struct page **pages, u64 page_struct_count, u32 host_access, u32 flags, u8 acquire) diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index 7352c4f9652e..27fcf8a13faa 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -841,7 +841,8 @@ mshv_vp_release(struct inode *inode, struct file *filp) return 0; } =20 -static void mshv_vp_stats_unmap(u64 partition_id, u32 vp_index) +static void mshv_vp_stats_unmap(u64 partition_id, u32 vp_index, + void *stats_pages[]) { union hv_stats_object_identity identity =3D { .vp.partition_id =3D partition_id, @@ -849,10 +850,13 @@ static void mshv_vp_stats_unmap(u64 partition_id, u32= vp_index) }; =20 identity.vp.stats_area_type =3D HV_STATS_AREA_SELF; - hv_call_unmap_stat_page(HV_STATS_OBJECT_VP, &identity); + hv_unmap_stats_page(HV_STATS_OBJECT_VP, NULL, &identity); + + if (stats_pages[HV_STATS_AREA_PARENT] =3D=3D stats_pages[HV_STATS_AREA_SE= LF]) + return; =20 identity.vp.stats_area_type =3D HV_STATS_AREA_PARENT; - hv_call_unmap_stat_page(HV_STATS_OBJECT_VP, &identity); + hv_unmap_stats_page(HV_STATS_OBJECT_VP, NULL, &identity); } =20 static int mshv_vp_stats_map(u64 partition_id, u32 vp_index, @@ -865,14 +869,14 @@ static int mshv_vp_stats_map(u64 partition_id, u32 vp= _index, int err; =20 identity.vp.stats_area_type =3D HV_STATS_AREA_SELF; - err =3D hv_call_map_stat_page(HV_STATS_OBJECT_VP, &identity, - &stats_pages[HV_STATS_AREA_SELF]); + err =3D hv_map_stats_page(HV_STATS_OBJECT_VP, &identity, + &stats_pages[HV_STATS_AREA_SELF]); if (err) return err; =20 identity.vp.stats_area_type =3D HV_STATS_AREA_PARENT; - err =3D hv_call_map_stat_page(HV_STATS_OBJECT_VP, &identity, - &stats_pages[HV_STATS_AREA_PARENT]); + err =3D hv_map_stats_page(HV_STATS_OBJECT_VP, &identity, + &stats_pages[HV_STATS_AREA_PARENT]); if (err) goto unmap_self; =20 @@ -880,7 +884,7 @@ static int mshv_vp_stats_map(u64 partition_id, u32 vp_i= ndex, =20 unmap_self: identity.vp.stats_area_type =3D HV_STATS_AREA_SELF; - hv_call_unmap_stat_page(HV_STATS_OBJECT_VP, &identity); + hv_unmap_stats_page(HV_STATS_OBJECT_VP, NULL, &identity); return err; } =20 @@ -988,7 +992,7 @@ mshv_partition_ioctl_create_vp(struct mshv_partition *p= artition, kfree(vp); unmap_stats_pages: if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) - mshv_vp_stats_unmap(partition->pt_id, args.vp_index); + mshv_vp_stats_unmap(partition->pt_id, args.vp_index, stats_pages); unmap_ghcb_page: if (mshv_partition_encrypted(partition) && is_ghcb_mapping_available()) hv_unmap_vp_state_page(partition->pt_id, args.vp_index, @@ -1740,7 +1744,8 @@ static void destroy_partition(struct mshv_partition *= partition) continue; =20 if (hv_scheduler_type =3D=3D HV_SCHEDULER_TYPE_ROOT) - mshv_vp_stats_unmap(partition->pt_id, vp->vp_index); + mshv_vp_stats_unmap(partition->pt_id, vp->vp_index, + (void **)vp->vp_stats_pages); =20 if (vp->vp_register_page) { (void)hv_unmap_vp_state_page(partition->pt_id, diff --git a/include/hyperv/hvgdk_mini.h b/include/hyperv/hvgdk_mini.h index ff4325fb623a..f66565106d21 100644 --- a/include/hyperv/hvgdk_mini.h +++ b/include/hyperv/hvgdk_mini.h @@ -493,6 +493,7 @@ union hv_vp_assist_msr_contents { /* HV_REGISTER_VP_AS= SIST_PAGE */ #define HVCALL_GET_PARTITION_PROPERTY_EX 0x0101 #define HVCALL_MMIO_READ 0x0106 #define HVCALL_MMIO_WRITE 0x0107 +#define HVCALL_MAP_STATS_PAGE2 0x0131 =20 /* HV_HYPERCALL_INPUT */ #define HV_HYPERCALL_RESULT_MASK GENMASK_ULL(15, 0) diff --git a/include/hyperv/hvhdk_mini.h b/include/hyperv/hvhdk_mini.h index bf2ce27dfcc5..064bf735cab6 100644 --- a/include/hyperv/hvhdk_mini.h +++ b/include/hyperv/hvhdk_mini.h @@ -177,6 +177,13 @@ struct hv_input_map_stats_page { union hv_stats_object_identity identity; } __packed; =20 +struct hv_input_map_stats_page2 { + u32 type; /* enum hv_stats_object_type */ + u32 padding; + union hv_stats_object_identity identity; + u64 map_location; +} __packed; + struct hv_output_map_stats_page { u64 map_location; } __packed; --=20 2.34.1