From nobody Wed Sep 10 02:57:15 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA1D4C04FDF for ; Thu, 27 Jul 2023 19:55:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232288AbjG0TzE (ORCPT ); Thu, 27 Jul 2023 15:55:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34702 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230425AbjG0Ty7 (ORCPT ); Thu, 27 Jul 2023 15:54:59 -0400 Received: from linux.microsoft.com (linux.microsoft.com [13.77.154.182]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 42F562D7B; Thu, 27 Jul 2023 12:54:57 -0700 (PDT) Received: from linuxonhyperv3.guj3yctzbm1etfxqx2vob5hsef.xx.internal.cloudapp.net (linux.microsoft.com [13.77.154.182]) by linux.microsoft.com (Postfix) with ESMTPSA id AA90623834D8; Thu, 27 Jul 2023 12:54:56 -0700 (PDT) DKIM-Filter: OpenDKIM Filter v2.11.0 linux.microsoft.com AA90623834D8 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com; s=default; t=1690487696; bh=lX/Yd7rNSCr3YxLFCMt412GXyk0hTSxOqqx3DJg2Au0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hKg2RCzpK8sWiO1Zk8WE7f2f+pRbakMoY4KRfHPmRzADZqhlgwFznmmpm2xPHcmdf kyyYQD3dD4x38M5X7P3WBiFbQno75H1CNM9xiNbskS4r44H+uR5Uwhj9LX6vf/m6oA 9pGEs2KT9vdqOA6pnkwVFUcKqPmhwEAvgbuDq5FY= From: Nuno Das Neves To: linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-arm-kernel@lists.infradead.org, linux-arch@vger.kernel.org Cc: mikelley@microsoft.com, kys@microsoft.com, wei.liu@kernel.org, haiyangz@microsoft.com, decui@microsoft.com, ssengar@linux.microsoft.com, mukeshrathor@microsoft.com, stanislav.kinsburskiy@gmail.com, jinankjain@linux.microsoft.com, apais@linux.microsoft.com, Tianyu.Lan@microsoft.com, vkuznets@redhat.com, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, will@kernel.org, catalin.marinas@arm.com Subject: [PATCH 03/15] mshyperv: Introduce numa_node_to_proximity_domain_info Date: Thu, 27 Jul 2023 12:54:38 -0700 Message-Id: <1690487690-2428-4-git-send-email-nunodasneves@linux.microsoft.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1690487690-2428-1-git-send-email-nunodasneves@linux.microsoft.com> References: <1690487690-2428-1-git-send-email-nunodasneves@linux.microsoft.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Factor out logic for converting numa node to proximity domain info into a helper function, and export it. Signed-off-by: Nuno Das Neves Reviewed-by: Wei Liu --- arch/x86/hyperv/hv_proc.c | 8 ++------ drivers/acpi/numa/srat.c | 1 + include/asm-generic/mshyperv.h | 18 ++++++++++++++++++ 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/arch/x86/hyperv/hv_proc.c b/arch/x86/hyperv/hv_proc.c index 68a0843d4750..5ba5ca1b2089 100644 --- a/arch/x86/hyperv/hv_proc.c +++ b/arch/x86/hyperv/hv_proc.c @@ -121,7 +121,6 @@ int hv_call_add_logical_proc(int node, u32 lp_index, u3= 2 apic_id) u64 status; unsigned long flags; int ret =3D HV_STATUS_SUCCESS; - int pxm =3D node_to_pxm(node); =20 /* * When adding a logical processor, the hypervisor may return @@ -137,11 +136,8 @@ int hv_call_add_logical_proc(int node, u32 lp_index, u= 32 apic_id) =20 input->lp_index =3D lp_index; input->apic_id =3D apic_id; - input->flags =3D 0; - input->proximity_domain_info.domain_id =3D pxm; - input->proximity_domain_info.flags.reserved =3D 0; - input->proximity_domain_info.flags.proximity_info_valid =3D 1; - input->proximity_domain_info.flags.proximity_preferred =3D 1; + input->proximity_domain_info =3D + numa_node_to_proximity_domain_info(node); status =3D hv_do_hypercall(HVCALL_ADD_LOGICAL_PROCESSOR, input, output); local_irq_restore(flags); diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c index 1f4fc5f8a819..0cf9f0574495 100644 --- a/drivers/acpi/numa/srat.c +++ b/drivers/acpi/numa/srat.c @@ -48,6 +48,7 @@ int node_to_pxm(int node) return PXM_INVAL; return node_to_pxm_map[node]; } +EXPORT_SYMBOL(node_to_pxm); =20 static void __acpi_map_pxm_to_node(int pxm, int node) { diff --git a/include/asm-generic/mshyperv.h b/include/asm-generic/mshyperv.h index 233c976344e5..447e7ebe67ee 100644 --- a/include/asm-generic/mshyperv.h +++ b/include/asm-generic/mshyperv.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -28,6 +29,23 @@ =20 #define VTPM_BASE_ADDRESS 0xfed40000 =20 +static inline union hv_proximity_domain_info +numa_node_to_proximity_domain_info(int node) +{ + union hv_proximity_domain_info proximity_domain_info; + + if (node !=3D NUMA_NO_NODE) { + proximity_domain_info.domain_id =3D node_to_pxm(node); + proximity_domain_info.flags.reserved =3D 0; + proximity_domain_info.flags.proximity_info_valid =3D 1; + proximity_domain_info.flags.proximity_preferred =3D 1; + } else { + proximity_domain_info.as_uint64 =3D 0; + } + + return proximity_domain_info; +} + struct ms_hyperv_info { u32 features; u32 priv_high; --=20 2.25.1