From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2043.outbound.protection.outlook.com [40.107.94.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF2B12749E7; Tue, 29 Apr 2025 06:10:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907048; cv=fail; b=mcdCOv2Di9+vdzW/etot9lHmWdYQz+e2gRfECQc8Ttpj6r6sOjeGepD4Jp3mKMB6wKKoSEpkOcLtht9EtYgcI/dEQzys5cyIM4cDme3O9z8zOtevqDZ2MZ1W/Hm3EXqVOYjuYqKGHXPGHIRuC86S6qR5A0PWel2Q1bjl9I1GsYg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907048; c=relaxed/simple; bh=fUS6a3X/O4o5ZlFFjDZfEXjtWLGIOOxEIiyN25dgaPs=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=szTQu90dnPh1YJARMFSA5E7sm1AnlYI2dvlxF0fxLER0CWy+aqeo4JbaQynqHamDJ/AsvJk35EKXj+NkCxytlYD98FRp+dc5Z27f4iMPGJpPNQUefV+kBgZ7n9yakAm5mza5xD80qWqLxkjamOW/M3RIVbjUdDPJzOD5wLr3ToA= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=YJX2vMjr; arc=fail smtp.client-ip=40.107.94.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="YJX2vMjr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HdFUe4+/LkpS2ujru/ojV8aafP2dRBVdoKafjWC10P7DgvILBj0yx9nrJ/odi0txSp7/Axy0qI3YoXIiYFiVxUng99bZb/QJRhnej5Ex3x4IbSpt/UIwR3VgpoqyZm1DvZQTIjNKShl6HHgEChnlpnonZgdCdbD13GwfpB5LgvB93mlYJ7uZmVeLJUafTx5bwuIhV7HEvveYVbmluXdhs8Q8nW91V+FtosIDW+K9hvJsAJSlVTrJ6icuTb8k1GKaMhPJ0PdU1JAo4jQl7kVQfgUESjGKmfYXzka/+7YOvjhUJPiIEcD6lJNh7IEDX4DADdBmczl+0G8Bf5O/r6mb5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/F4DJwp0V3reNt+0W7E+AjNDtBMP5ONLkcUvx/YuZSA=; b=xSp0Dri7I9vnQgnM4COFBweIzTFK4PHaUKgC6oiyFl6pYv+CKs6HwOnfsPkGrnrZc0QkBNwzKFF0T0+PcAc2mQsWs1DDdmme7Ti7oE4BD5KCmWxThPtVgtKmV3ZWkhwhmEQCqwKeeg1PMiu9CNNZig0QFWOFWAug+9qWbNAZHlp9QRyW3KJ2g5qqH6DW0SNN4F0IR7OI78u5C7uUGdXTNcMWFUVxxZVah+YxECo3Pt6wEuLqgAbeQQiVWARTlPwI1YRZkOTBwgi15uUTnMymqZOxUTAkivCj0Lk20sVj9mWQ6/Rbo2uBC18IK8VGWCcDCKx6IPcDgFLUseVGevjgkA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/F4DJwp0V3reNt+0W7E+AjNDtBMP5ONLkcUvx/YuZSA=; b=YJX2vMjrWpiZc4yesJvXj/mIwwYgj6BgzveeX/eroVqeAm3bQ/7ETwgFbCcCAt2JYdYxdH6OsVMSV6tgLLvkysm8QXZKkzYfrm4m99Rw8QG+dOfl7FBFkYLDF93Jtt4dj5iuRwzUe939hXRsgOoO401+pwyrxptWrJTGzE8yL+8= Received: from MN2PR12CA0019.namprd12.prod.outlook.com (2603:10b6:208:a8::32) by SN7PR12MB8102.namprd12.prod.outlook.com (2603:10b6:806:359::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.32; Tue, 29 Apr 2025 06:10:44 +0000 Received: from BL6PEPF0001AB54.namprd02.prod.outlook.com (2603:10b6:208:a8:cafe::2d) by MN2PR12CA0019.outlook.office365.com (2603:10b6:208:a8::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:10:43 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB54.mail.protection.outlook.com (10.167.241.6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:10:43 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:10:34 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 01/20] KVM: x86: Move find_highest_vector() to a common header Date: Tue, 29 Apr 2025 11:39:45 +0530 Message-ID: <20250429061004.205839-2-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB54:EE_|SN7PR12MB8102:EE_ X-MS-Office365-Filtering-Correlation-Id: 929a1c69-9d25-4dd6-217d-08dd86e49340 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?+uG1tZLM2PkpFm0zb1VelAm0nhTjbgwZTpELiAD17aR9l/Cf/eWRo9puqbfj?= =?us-ascii?Q?bQ5XYsxNEfSYpfCrzhYFst6qWkPjPGNPC/RPx1ATspABBB3xAnRuGuwhl6pz?= =?us-ascii?Q?KLOJFVyAEYyH6CRi7nGi4iYXHHYda1QnUjX/yH692uudZexCEOsq3BqTv5ni?= =?us-ascii?Q?MrAjS9pH0gFXJr6d6Icskh17fv7+ZBFQKyKYw2JMPcv1GR5N3CdC0GLz2nYd?= =?us-ascii?Q?75tgOEicMP4Apg54U4lxAvgBCwe3j83RHCMnSop0OENAnBWqBhGq7mhoL8vP?= =?us-ascii?Q?0vdN4KJRWmIWVG90OVZkgVQIqv9FF1jqqOEs1ZCfNApNO1Dgdma8Zsh2V4Dq?= =?us-ascii?Q?pNPfQmr0N/hivcowSi03Ktmpuu6kQxfFWeM/NMBKIr9PEfcDFb58Ac/JlcWq?= =?us-ascii?Q?Rqc2sZiRAzQKkeu/qd1PdnUQ+SoERGdnkWd2zpXcldUyeEaiRjSEVfqahkY1?= =?us-ascii?Q?u9zP3lt6YYcaExSDlxq+aBXO0SHRbFggaNZBukwku2XL/0gTPcHuveqQKty0?= =?us-ascii?Q?2O/qrV4hruq4bYjw1Qr1Mg4YQHkQD7HPUQX3qydclQx7ljsy8ra5GoJA+3xz?= =?us-ascii?Q?MgaD9DzEwE0OwYI1//VtmJGLzBOk0FBBWjH+kdB7d2AbUrxTdXPix2dlRtkt?= =?us-ascii?Q?qb3T5bAY69tCITSgpwkuJOC0iz3YqxUDAdt2N9elBD6oy+AJZ4lLt8MMxP2V?= =?us-ascii?Q?ztjznTjsRHeKhbBJPUgurL4A9w7SyOz99GCw1QY0z4yLtPbbwRkKt0OWrtYz?= =?us-ascii?Q?n05UAaYCf0Epvk8pIIVX869+sBqG/os2a/bR7FZ5M4aeTDyWN55o0aGYlvNw?= =?us-ascii?Q?UewOhzqQHC8Rxs+r22Zb9OGBOyP2nYrkDylEAtUuKRvux1t8VgZmE29kAZh6?= =?us-ascii?Q?bSC+5qyCKagZo6iBZtSXTIoSQQY8ykaBg2hoNtRaNba7BwIrr0jRgEJkpS/G?= =?us-ascii?Q?eOul6JrkwQt26ppvyimDVhu0JHeLWVN6VUFArlR1UXM1Mj0N335+nQ91Xjdr?= =?us-ascii?Q?wzO9sYDODhM10/V94AFcGNTf6hr55CnfsXckgy71q/aD3o37hYFawv1yewVB?= =?us-ascii?Q?zrBRHYEFQx4juwN+s4aJOa00P2dBHgYJyFZP62+VzHyb8ZTjMlLm6MRKJuUE?= =?us-ascii?Q?ZpKFdfQ1pTU2P/ve16+cWkRxzXzEWY4ZFTs17ul97ro2ieMDcStNKjihfTlz?= =?us-ascii?Q?1eaz+xRJwgQk6EtTYyPmSc1Fg98nBVn4SoZTWM09weDuLpaF1yGhIUNCllpQ?= =?us-ascii?Q?wCWG8tzNw7juVnu0TceyO0xDqYrzcg7jOcTF+fLljhjI4NYoF41uL/pSScHn?= =?us-ascii?Q?Mzs45jduM7/0hoaGQOyPmJDhYK1HBOYfO5qSYU8SxJHWVHnX7/ylyGIUxQUg?= =?us-ascii?Q?dGe7wuB2HDGvoAX3jP5uipctEKD7pUqNH7eHBj4w83vsatMIc89N15vH7Kza?= =?us-ascii?Q?N2hPprcSrEkEoHFwoTDEtZwAPLntJJDLUQqLuYpiQ76TtZUnFG7Q5Uy5MTqb?= =?us-ascii?Q?FeKv0VykXMzYTKAh3ALCqVH/55S2kqDnemZy?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(82310400026)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:10:43.7158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 929a1c69-9d25-4dd6-217d-08dd86e49340 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB54.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8102 Content-Type: text/plain; charset="utf-8" In preparation for using find_highest_vector() in Secure AVIC guest APIC driver, move (and rename) find_highest_vector() to apic.h. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change arch/x86/include/asm/apic.h | 23 +++++++++++++++++++++++ arch/x86/kvm/lapic.c | 23 +++-------------------- 2 files changed, 26 insertions(+), 20 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 1c136f54651c..c63c2fe8ad13 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -500,6 +500,29 @@ static inline bool is_vector_pending(unsigned int vect= or) return lapic_vector_set_in_irr(vector) || pi_pending_this_cpu(vector); } =20 +#define MAX_APIC_VECTOR 256 +#define APIC_VECTORS_PER_REG 32 + +static inline int apic_find_highest_vector(void *bitmap) +{ + unsigned int regno; + unsigned int vec; + u32 *reg; + + /* + * The registers in the bitmap are 32-bit wide and 16-byte + * aligned. State of a vector is stored in a single bit. + */ + for (regno =3D MAX_APIC_VECTOR / APIC_VECTORS_PER_REG - 1; regno >=3D 0; = regno--) { + vec =3D regno * APIC_VECTORS_PER_REG; + reg =3D bitmap + regno * 16; + if (*reg) + return __fls(*reg) + vec; + } + + return -1; +} + /* * Warm reset vector position: */ diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 28e3317124fd..775eb742d110 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -27,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -55,9 +56,6 @@ /* 14 is the version for Xeon and Pentium 8.4.8*/ #define APIC_VERSION 0x14UL #define LAPIC_MMIO_LENGTH (1 << 12) -/* followed define is not in apicdef.h */ -#define MAX_APIC_VECTOR 256 -#define APIC_VECTORS_PER_REG 32 =20 /* * Enable local APIC timer advancement (tscdeadline mode only) with adapti= ve @@ -626,21 +624,6 @@ static const unsigned int apic_lvt_mask[KVM_APIC_MAX_N= R_LVT_ENTRIES] =3D { [LVT_CMCI] =3D LVT_MASK | APIC_MODE_MASK }; =20 -static int find_highest_vector(void *bitmap) -{ - int vec; - u32 *reg; - - for (vec =3D MAX_APIC_VECTOR - APIC_VECTORS_PER_REG; - vec >=3D 0; vec -=3D APIC_VECTORS_PER_REG) { - reg =3D bitmap + REG_POS(vec); - if (*reg) - return __fls(*reg) + vec; - } - - return -1; -} - static u8 count_vectors(void *bitmap) { int vec; @@ -704,7 +687,7 @@ EXPORT_SYMBOL_GPL(kvm_apic_update_irr); =20 static inline int apic_search_irr(struct kvm_lapic *apic) { - return find_highest_vector(apic->regs + APIC_IRR); + return apic_find_highest_vector(apic->regs + APIC_IRR); } =20 static inline int apic_find_highest_irr(struct kvm_lapic *apic) @@ -779,7 +762,7 @@ static inline int apic_find_highest_isr(struct kvm_lapi= c *apic) if (likely(apic->highest_isr_cache !=3D -1)) return apic->highest_isr_cache; =20 - result =3D find_highest_vector(apic->regs + APIC_ISR); + result =3D apic_find_highest_vector(apic->regs + APIC_ISR); ASSERT(result =3D=3D -1 || result >=3D 16); =20 return result; --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2073.outbound.protection.outlook.com [40.107.220.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AFB0D2356BC; Tue, 29 Apr 2025 06:11:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.73 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907073; cv=fail; b=Ef/YyuCSxJEML4umc1h4MlsUaNaUPCIltegNkjXODsZBWVQwUVAkZzY1MrDt4GIxvE805FeS2P/3I8OjxLce79PY/V5CPtCxJtHdl0Wh7mrC3AeZsRV5T9C8OQ4Khtz9pfTYXNoVJwkeXCyovmdBsalLyBtv6cMIxfoOZ0jju6A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907073; c=relaxed/simple; bh=NVnBOc9W+YDyith+Fvp5R/PW9u6dvkkMrhemqu2ISmc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=GD6Nfp1Ky1FVXG1rHOmnwMbkuc5eO2Ip6kgtButgXaWDyOGITWxO83SF5Yiqf5sggMq4WwM6HLeAotgIPwRtzb1uCZZkWAeAdzNa1wjgE6qHmWNN+B7ZRT1oCl8IIO+Mpx0RDxXYK/+SJgkOPLbeDHzcRWIg4LGSoNw3UfUnRaM= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=oXX/W0PY; arc=fail smtp.client-ip=40.107.220.73 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="oXX/W0PY" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tCeVqfh4F2/xk+9k/U0wppaQGlJSyTPKOywKlCjNTjqdargcEESSColg5bprz13e32ZPQqccmdxepv9/x5+dssvPUO0lrWAVrgaL0TGshNb+rw8Xe/G+Mfh222dkc2CbxvwIe3cKA577Smfq1y7T+IXux+UiRJ72Io53RNpFearrguL71GnJ8CzMCI/+VQGMgly1L8cL6Wq+FzY72TED8PKRkMES98FqAA0Rn+8jYzJbcNgPzx7HRDriccMaOeoVFB4Sq5oNYt8cyhy8K+njPgJMRZwHbAVFpodnd1v/M/D2Fon244i2i3R02Texrtmz4I9piBzbY+6zcsoAz9zQLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=bhsP4aNj11LWVC17yJL2Hwi1H1ogWfjtFbyZ6AZOdpg=; b=kDezXQ65YK6/9h4gri8M3/tVW/JjXjJ2wtI2jxyXQiGZqcRDaMwy98xD3Sb+NbMaZtUcdJlFXtwK1HwJI/TvA0i6C/LKNoxrA/Q33BlgceRNKXma5sK6ealF++W9l1170Iu8m+g7LIJ7PFYRXeU7v0gI252+6Ec8zjGQAXipEjMAAi+NrLFRVYrFIEciBi/ON4B9Bsb/sSUrgqXZMyE0oi8hn7i1McBgRngo71cIFmw2pw3ghI2X98SmXOzPh/tkS/Z4OhyvJe9jD8a9NN4SqQznMffXpoabno05/gCED2qq5Dn2zbUAMpsKBDFWTmAkDFOwWmpQAIqRmkjtv3s9Hg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bhsP4aNj11LWVC17yJL2Hwi1H1ogWfjtFbyZ6AZOdpg=; b=oXX/W0PYjM4GrRaaHNC2YhcwlBK+6URztEfdrlApCSUr0ukA2owldynLHRzVb63YCUdhoIdo9OGqbledbA3ZLULvGta+b8bMO9TL/Pj/RuyxEUFG8pnBxMGLmL1+Qb87jlEAwFwbgAcS4c68nq08oZuHrQyza89F1Kn8q02LCy4= Received: from BN0PR04CA0164.namprd04.prod.outlook.com (2603:10b6:408:eb::19) by SA0PR12MB4446.namprd12.prod.outlook.com (2603:10b6:806:71::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:11:08 +0000 Received: from BL6PEPF0001AB58.namprd02.prod.outlook.com (2603:10b6:408:eb:cafe::6e) by BN0PR04CA0164.outlook.office365.com (2603:10b6:408:eb::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.25 via Frontend Transport; Tue, 29 Apr 2025 06:11:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB58.mail.protection.outlook.com (10.167.241.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:11:08 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:10:57 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 02/20] x86: apic: Move apic_update_irq_cfg() calls to apic_update_vector() Date: Tue, 29 Apr 2025 11:39:46 +0530 Message-ID: <20250429061004.205839-3-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB58:EE_|SA0PR12MB4446:EE_ X-MS-Office365-Filtering-Correlation-Id: 3b960498-3199-4cdb-350e-08dd86e4a1f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?4w2idpcXknH08pN1JX2lzDRwNFSlqar08nh7N0uPt/EXihgZUYuVi/PpFP2r?= =?us-ascii?Q?+tDKNmWpkMo4aGhLEBN1EBlODgbrB9wiqT0FUtlxZFgjZ++jlYrGAVijMbT5?= =?us-ascii?Q?QDJJeMmEadLrPEKUYJVQxcjk5HvljSXEx5dtFvizc1ex69Bga0AEdDrAsr58?= =?us-ascii?Q?+P4DGjIWQZRHVWvmZocVMbDPU3zmunkSSGVR7ZMtd8djdR3NV//7tzmhH2xe?= =?us-ascii?Q?h9cD5uZW5DWMx7ORggWzAeap//7wftYCfgd7WZOiLkvPJ9M9nJFvgMf8zEsV?= =?us-ascii?Q?pXhUdGkVyh4h3dVP9GYt3m6CgEbefC2QXjlm1Kzofiff6DtBZw0pkzEqcDlp?= =?us-ascii?Q?cNfA+nh0JzZq9zN+Jtc9AIx7qUo7rVVdmq4k0ZAUB+fn0BGjNWlDX2Q2fVyA?= =?us-ascii?Q?Ykes/2jmNURMRz8gwEWJKq8Iicjvo18JDjsiERXQr3iTstPV9e9DBWfK8I6U?= =?us-ascii?Q?E6JGi1nsF+RJ4CAPKQYneS21ydDwzuP37g/g6GnW+Si6hFIUhXvv9XQ5epzd?= =?us-ascii?Q?KFWWKBrpzt1a5b3tkt2bYvMhIPFK2tK3y3hxgHmpImrP2nsh4KWzOfX0VSGs?= =?us-ascii?Q?P+61Dtx/SbJK0teiO3OFzKEhfItibFyuKLnRy0TRImhD+MnwUoCFcfzPRGkA?= =?us-ascii?Q?jVnEqrK+WYBwZ9ZqwDhbD3U0kvTfXVbZgsx6CyoN5QNPc5RJzYm6FV+fltUI?= =?us-ascii?Q?fV4/8GPBhQZCGzGVG6Y/eAvTxP/zHtu9LqqDfdpuY0p5Y51jGLxi9XrW0Hnp?= =?us-ascii?Q?RopLbb4CT+cVjEBnS4w/IZITCO2W64xvLAus+JAZxsweHNcRHrO/WKCzOP1T?= =?us-ascii?Q?hQA25WHjudRY8fcXXt9+1wFqr25DOJF7JZ/21QYRQP4wAv2Ap1nmKR9U62bV?= =?us-ascii?Q?+2svpCvblF+0xCWXI2+3vZ2Arl7QqM2nX/VnfG/BYv+foi2r5fqSc1jEcAPE?= =?us-ascii?Q?k2yKja7yLe4VflzWYsle19+l7u130J2afFvTwYP/jEq4C8qGHsZhnmHN5Gmi?= =?us-ascii?Q?3TZpXKNr8LBXs7MXOsu5LdL4u+SerxU9+xWvLz9tP4dF2Fto3wsLO9rZWU6p?= =?us-ascii?Q?WtNfhCh965rmIvvEkACJFtRuZ3/dLIckwvZ9769dAZIcyBr4F+ZUFEdkHeks?= =?us-ascii?Q?ipSEOenCXbNnynAFLXlPUoxLmF3qp6ZY4VrBvSt1uELW0GNVQ0GPWbsFPxd9?= =?us-ascii?Q?+eW6VeIbuWMocQA3pBcKCCziHTA2AfB+UfhQcEDIy0lS5eWb6iV4a1MirOb4?= =?us-ascii?Q?n22TptOuHb8A5Vsim4mtyKxBoRfSLGqy85Kdixu68/ClZ1WcnEC9FpbfYdr4?= =?us-ascii?Q?GVFmLsNHlc3mg22Jvz/SJNjI9m/o1EcCHX85N7GocTZWxcVJDApSVb/4Y61g?= =?us-ascii?Q?4QAnVg1u3zqxTI+e8hSWbhiEsNMEwistps53RFMMR7ut9aQOvE5vqdMc7p03?= =?us-ascii?Q?LwZHve1TNrF24Ou17/5JvaUfJ49jw9gfuQBO3ezCDDoU9/FDD0kOiEJeZ3Is?= =?us-ascii?Q?o5sNkJ4IuuKZG3fbFUSE7M/smzEXFR5stF5v?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:11:08.3978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3b960498-3199-4cdb-350e-08dd86e4a1f6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB58.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4446 Content-Type: text/plain; charset="utf-8" All callers of apic_update_vector() also call apic_update_irq_cfg() after it. So, simplify code by moving all such apic_update_irq_cfg() calls to apic_update_vector(). No functional change intended. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - New patch. arch/x86/kernel/apic/vector.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index fee42a73d64a..155253af3deb 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -183,6 +183,7 @@ static void apic_update_vector(struct irq_data *irqd, u= nsigned int newvec, apicd->cpu =3D newcpu; BUG_ON(!IS_ERR_OR_NULL(per_cpu(vector_irq, newcpu)[newvec])); per_cpu(vector_irq, newcpu)[newvec] =3D desc; + apic_update_irq_cfg(irqd, newvec, newcpu); } =20 static void vector_assign_managed_shutdown(struct irq_data *irqd) @@ -261,7 +262,6 @@ assign_vector_locked(struct irq_data *irqd, const struc= t cpumask *dest) if (vector < 0) return vector; apic_update_vector(irqd, vector, cpu); - apic_update_irq_cfg(irqd, vector, cpu); =20 return 0; } @@ -338,7 +338,7 @@ assign_managed_vector(struct irq_data *irqd, const stru= ct cpumask *dest) if (vector < 0) return vector; apic_update_vector(irqd, vector, cpu); - apic_update_irq_cfg(irqd, vector, cpu); + return 0; } =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2077.outbound.protection.outlook.com [40.107.220.77]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3BBB2741C8; Tue, 29 Apr 2025 06:11:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.77 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907098; cv=fail; b=IE++tb0SmxKKjjSfF6Dpv/bi9eYMSfdRxgbc5+n0Oql8PWW14XpjjJS1AmWpLXrMqqnxUkp/0WxZK63HSbvruSo9+gEyU8M+ogL8vvlPmePuErfO3Hk+lMILnMpVepYD+Co1LNBzrxcsNpkJrglS+NENRfETlAOKhXimgusP3/Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907098; c=relaxed/simple; bh=jLd6XQ9S8cJssxDuNdqUObyaVe2dT0d7KWCQe5rsIF8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=ncFMpbCDuOIz7YBLZNySH+rGcG7OmQexHlk3riMYDe4wCNwlWb4feeQruifCcbCJ8p4ejuD3i61el9PfwFaQ6ejl9tnHTe3PfjNwrgFB9W0W2RDS+PMH4UeaccvoZ0SRB6Ckh7ptcv3o3Dj7UP2apSIhvz9HtM/kqv239sYdjpo= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=WPQisdVL; arc=fail smtp.client-ip=40.107.220.77 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="WPQisdVL" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=NT2MYTfV1Mmb0mCy0K7gEN5uzKHo3VBEtJwAPbiKzY+JRq8tTga3hvHVgoyIl+rTi1tqaxBdHIc2TOWtrnFVE0IebDN1M96mBPLhGGoaRziB6ytlPtqX2kj9WK4lBDl7s0QnBNVuZOFU7MIUdA8HWCfXe+wc1bT0tFA2AclRVz2piiElQNl05eUGmzkooLNBZzDl54rsDgfV5zS5Ial18l7ewVIKAC9J4ngwkUP8nyXPMzqIkxXMrSF/FIDqwJtNpK/0CtBQ4DtG3aVbMn8fWDRlYVOhJj91LlvFi9zMujJWdJQd0Z3d8m6IRVhujxpu/ND3WskiYYBiQxchHEE9/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4ybKsW75ceHcs3MwENBEDaSxvdOHGRiWsprw8BAtmQI=; b=nNncieCWuv02YDIksAe4TWckh5yiw34x9AUB3wxkogJMF848d+wYtk5ASIilbXo6Cdy8T0FCAbvJ0HzJc9+IfyAR7WhhsBC/EjyDvY/2e9xNCypQxBPF/NABy7U1OqO0TaTUcSMzQE5FN3IoO5bSlWW1v8r0i2DNljJYVwc1IpI1dgSZDVXRk06vbnAcneafCPKoCxIkRsBbVol97vt5K93QjPU9HAuiuxKWTykgvQTADyS+CB+F8mG8ZuT0A+9KCjkbxQGW4RmQjLvRfMGYriw8XVA+ncTuyCi/LfnAct/5qEkjXPtZtrR2D9C2xB2U5AoVJOKj1/Ar4kT63hgy4g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=4ybKsW75ceHcs3MwENBEDaSxvdOHGRiWsprw8BAtmQI=; b=WPQisdVL9/54f4OaG1hic0/O1Av8UXIblkSLbthU7fMDrBPvPcRr/YULgA2tkdEqKn1ueNUtt/OdRKItJqa+Nw6qlVOWZHppzSEWxgj2Kvawpx1MVGEatMCZVZm4ihs9xmGG0EIXOD7Xhy2yptwlzqWbFlkpfkn0PiuzrEriHgk= Received: from MN2PR14CA0026.namprd14.prod.outlook.com (2603:10b6:208:23e::31) by SJ0PR12MB6685.namprd12.prod.outlook.com (2603:10b6:a03:478::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:11:30 +0000 Received: from BL6PEPF0001AB53.namprd02.prod.outlook.com (2603:10b6:208:23e:cafe::e8) by MN2PR14CA0026.outlook.office365.com (2603:10b6:208:23e::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.38 via Frontend Transport; Tue, 29 Apr 2025 06:11:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB53.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8699.20 via Frontend Transport; Tue, 29 Apr 2025 06:11:29 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:11:22 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 03/20] x86/apic: Add new driver for Secure AVIC Date: Tue, 29 Apr 2025 11:39:47 +0530 Message-ID: <20250429061004.205839-4-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB53:EE_|SJ0PR12MB6685:EE_ X-MS-Office365-Filtering-Correlation-Id: f043ed10-3697-4222-9adc-08dd86e4aeb4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?h02Y/PMkB8l8TDz2Yu0UN90lIL81rUzbRgHiPs6NEI95cgfeUt1SnuB3iJ+D?= =?us-ascii?Q?lKd89bnbFj7JrwtXk1099pk2jXcW3vlplzIDvAdci3F14cCDqvwiYmUyikBT?= =?us-ascii?Q?yRSDoXahOoNdwjLcXvyYVY9c8V6qGKFb6OFOdIjBzwV4SqQzC1ALGKMKUyk/?= =?us-ascii?Q?3rPyJCgb0tyXsSnxziOfn0ykxyRkE7OzWTMeDW4XYgM00ngTSOzXjJaGmmkl?= =?us-ascii?Q?SB7EjcWepBWS995wFM7ZuUQsr+7/UiKRPbHikkT9H8M+KpKqTDzlxFc2Y6i/?= =?us-ascii?Q?efMAtmZLWj7SsJFOpuZap64WpUGyFPJv8TT+qwSAkpHVviEhR/8+v65bQ4Ls?= =?us-ascii?Q?Cn6ch3MJNrXey/p0gsjwsh0ZgihsySrlVwPjGeTlnhWQwQo2hW/vrZIUmkHJ?= =?us-ascii?Q?nOqB8GMqnFIBXUbJUilOkM3vQK2Hgdqkp2izHFuxp+YNhRyh0AaNAMx2g1Sy?= =?us-ascii?Q?D2fuqUeYQD5daHLWBvZXmYEFyyb0Ru96P+tL+jRfPSaqySSkDsevnV8fSA/a?= =?us-ascii?Q?PSHUqo7ef9VgNRnYSv8diduipAIqnKTU51V7i4JksMSGbqzZOYeHujK4F38o?= =?us-ascii?Q?wpudXWUvSjCnBNFCyHv0K1z7r1byNCpjKcI5a2tlc715utS9zf1Tvz1Gh5EF?= =?us-ascii?Q?AThlhGvGS37Tl7uyZZkN1EI0FU7uZQOTh54sJ4399Je/GMwd1MEZAK7epST0?= =?us-ascii?Q?R8bw1vMzXrJ8ny78MKqrM1qOn28OL1VS8LOweW1JvKiksrvYP0VlDwuuMhkw?= =?us-ascii?Q?QfekXijh9uq080jBQe6alzsNz8OFa9Fk0N+8u6fMvO+wMrkBf2BrikhyfL6H?= =?us-ascii?Q?//eXk8LCgdxcAZbWw3vvtEgHghF4Sq4hpxjuh1BQDqvY5JdX8lolt9Tlzl5w?= =?us-ascii?Q?hrMLQqP+TAvkOMuzz1LfNC5eSJLIrvlMz1CVg+N5ynzhyzf4XYSDpv3bUgRT?= =?us-ascii?Q?IfktNx5EoBjBcSDbtJwt4/jsTCFwr7HsZAW3mkF7KTGEneEKdMUUqBTjE+vc?= =?us-ascii?Q?x/wTIOk66BZFR882j1pRUQUKUjenGKD0EcY/OHGhQAkzxXteh2I7Qg8Ip1Zq?= =?us-ascii?Q?Y6D8BJd714kzg7AQ/cuxj+kF+sEGHIVzrqsCbzjqKcLvIBjtCnWmnLZ2KI0B?= =?us-ascii?Q?pAWRN18icGE2KrRYMIWq69LUXCcoW/9b91fYqiftdyWs32Fgoi8mbDZu09Nw?= =?us-ascii?Q?xh6QMSFWlrLi25OOJD+pMGY8g3NYcORBmCdnBY7G9tYc5nSY67eGA4LOHXqx?= =?us-ascii?Q?JGRlvnZGUCKBDXdCWSpqiLRgYJpbIINPtpQk299sMocG6Zg5E1gfOvpFVTtR?= =?us-ascii?Q?tfszpzoZy2kCoKNNy4+xlLabrH2H303WtznFaNIsqdeif+RceOb7DjjCjcJP?= =?us-ascii?Q?hSg2SHE3ZjS49oqxj7QP0sYpJ8kNXzzjBMAz31fwg3KTYtGaUlgs0frqEkEE?= =?us-ascii?Q?NAIEL0W+21ez7aM5i38sTWCm97Fg8PoZ+AK2gO0o20biAz3HPQW3aDPRekSD?= =?us-ascii?Q?BoFPrZqTQVNp4cMb3INCgBlr4XkAefI68yrb?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(82310400026)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:11:29.7772 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f043ed10-3697-4222-9adc-08dd86e4aeb4 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB53.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB6685 Content-Type: text/plain; charset="utf-8" The Secure AVIC feature provides SEV-SNP guests hardware acceleration for performance sensitive APIC accesses while securely managing the guest-owned APIC state through the use of a private APIC backing page. This helps prevent hypervisor from generating unexpected interrupts for a vCPU or otherwise violate architectural assumptions around APIC behavior. Add a new x2APIC driver that will serve as the base of the Secure AVIC support. It is initially the same as the x2APIC phys driver (without IPI callbacks), but will be modified as features of Secure AVIC are implemented. As the new driver does not implement Secure AVIC features yet, if the hypervisor sets the Secure AVIC bit in SEV_STATUS, maintain the existing behavior to enforce the guest termination. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change arch/x86/Kconfig | 13 ++++++ arch/x86/boot/compressed/sev.c | 1 + arch/x86/coco/core.c | 3 ++ arch/x86/include/asm/msr-index.h | 4 +- arch/x86/kernel/apic/Makefile | 1 + arch/x86/kernel/apic/x2apic_savic.c | 63 +++++++++++++++++++++++++++++ include/linux/cc_platform.h | 8 ++++ 7 files changed, 92 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/apic/x2apic_savic.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index aeac63b11fc2..d2a505000a9b 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -486,6 +486,19 @@ config X86_X2APIC =20 If in doubt, say Y. =20 +config AMD_SECURE_AVIC + bool "AMD Secure AVIC" + depends on AMD_MEM_ENCRYPT && X86_X2APIC + help + Enable this to get AMD Secure AVIC support on guests that have this fea= ture. + + AMD Secure AVIC provides hardware acceleration for performance sensitive + APIC accesses and support for managing guest owned APIC state for SEV-S= NP + guests. Secure AVIC does not support xapic mode. It has functional + dependency on x2apic being enabled in the guest. + + If you don't know what to do here, say N. + config X86_POSTED_MSI bool "Enable MSI and MSI-x delivery by posted interrupts" depends on X86_64 && IRQ_REMAP diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index 478c65149cf0..795c1bd74141 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -364,6 +364,7 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned l= ong exit_code) MSR_AMD64_SNP_VMSA_REG_PROT | \ MSR_AMD64_SNP_RESERVED_BIT13 | \ MSR_AMD64_SNP_RESERVED_BIT15 | \ + MSR_AMD64_SNP_SECURE_AVIC | \ MSR_AMD64_SNP_RESERVED_MASK) =20 /* diff --git a/arch/x86/coco/core.c b/arch/x86/coco/core.c index 9a0ddda3aa69..3d7bf37e2155 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -102,6 +102,9 @@ static bool noinstr amd_cc_platform_has(enum cc_attr at= tr) case CC_ATTR_HOST_SEV_SNP: return cc_flags.host_sev_snp; =20 + case CC_ATTR_SNP_SECURE_AVIC: + return sev_status & MSR_AMD64_SNP_SECURE_AVIC; + default: return false; } diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-in= dex.h index ac21dc19dde2..d32908b93b30 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -689,7 +689,9 @@ #define MSR_AMD64_SNP_VMSA_REG_PROT BIT_ULL(MSR_AMD64_SNP_VMSA_REG_PROT_BI= T) #define MSR_AMD64_SNP_SMT_PROT_BIT 17 #define MSR_AMD64_SNP_SMT_PROT BIT_ULL(MSR_AMD64_SNP_SMT_PROT_BIT) -#define MSR_AMD64_SNP_RESV_BIT 18 +#define MSR_AMD64_SNP_SECURE_AVIC_BIT 18 +#define MSR_AMD64_SNP_SECURE_AVIC BIT_ULL(MSR_AMD64_SNP_SECURE_AVIC_BIT) +#define MSR_AMD64_SNP_RESV_BIT 19 #define MSR_AMD64_SNP_RESERVED_MASK GENMASK_ULL(63, MSR_AMD64_SNP_RESV_BIT) #define MSR_AMD64_RMP_BASE 0xc0010132 #define MSR_AMD64_RMP_END 0xc0010133 diff --git a/arch/x86/kernel/apic/Makefile b/arch/x86/kernel/apic/Makefile index 52d1808ee360..581db89477f9 100644 --- a/arch/x86/kernel/apic/Makefile +++ b/arch/x86/kernel/apic/Makefile @@ -18,6 +18,7 @@ ifeq ($(CONFIG_X86_64),y) # APIC probe will depend on the listing order here obj-$(CONFIG_X86_NUMACHIP) +=3D apic_numachip.o obj-$(CONFIG_X86_UV) +=3D x2apic_uv_x.o +obj-$(CONFIG_AMD_SECURE_AVIC) +=3D x2apic_savic.o obj-$(CONFIG_X86_X2APIC) +=3D x2apic_phys.o obj-$(CONFIG_X86_X2APIC) +=3D x2apic_cluster.o obj-y +=3D apic_flat_64.o diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c new file mode 100644 index 000000000000..bea844f28192 --- /dev/null +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -0,0 +1,63 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * AMD Secure AVIC Support (SEV-SNP Guests) + * + * Copyright (C) 2024 Advanced Micro Devices, Inc. + * + * Author: Neeraj Upadhyay + */ + +#include + +#include +#include + +#include "local.h" + +static int savic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) +{ + return x2apic_enabled() && cc_platform_has(CC_ATTR_SNP_SECURE_AVIC); +} + +static int savic_probe(void) +{ + if (!cc_platform_has(CC_ATTR_SNP_SECURE_AVIC)) + return 0; + + if (!x2apic_mode) { + pr_err("Secure AVIC enabled in non x2APIC mode\n"); + snp_abort(); + /* unreachable */ + } + + return 1; +} + +static struct apic apic_x2apic_savic __ro_after_init =3D { + + .name =3D "secure avic x2apic", + .probe =3D savic_probe, + .acpi_madt_oem_check =3D savic_acpi_madt_oem_check, + + .dest_mode_logical =3D false, + + .disable_esr =3D 0, + + .cpu_present_to_apicid =3D default_cpu_present_to_apicid, + + .max_apic_id =3D UINT_MAX, + .x2apic_set_max_apicid =3D true, + .get_apic_id =3D x2apic_get_apic_id, + + .calc_dest_apicid =3D apic_default_calc_apicid, + + .nmi_to_offline_cpu =3D true, + + .read =3D native_apic_msr_read, + .write =3D native_apic_msr_write, + .eoi =3D native_apic_msr_eoi, + .icr_read =3D native_x2apic_icr_read, + .icr_write =3D native_x2apic_icr_write, +}; + +apic_driver(apic_x2apic_savic); diff --git a/include/linux/cc_platform.h b/include/linux/cc_platform.h index 0bf7d33a1048..7fcec025c5e0 100644 --- a/include/linux/cc_platform.h +++ b/include/linux/cc_platform.h @@ -96,6 +96,14 @@ enum cc_attr { * enabled to run SEV-SNP guests. */ CC_ATTR_HOST_SEV_SNP, + + /** + * @CC_ATTR_SNP_SECURE_AVIC: Secure AVIC mode is active. + * + * The host kernel is running with the necessary features enabled + * to run SEV-SNP guests with full Secure AVIC capabilities. + */ + CC_ATTR_SNP_SECURE_AVIC, }; =20 #ifdef CONFIG_ARCH_HAS_CC_PLATFORM --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2053.outbound.protection.outlook.com [40.107.220.53]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61E3C1D6DA9; Tue, 29 Apr 2025 06:11:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907117; cv=fail; b=mLmZaZv9/FwWj4BCDkvSBe1/Mah98MLaAycTScjxFWwaYv5RrN8/AiHc/PqBV+mOUNVnjxDnb/qPn5ORiKzl6meFOPthIM7Gwf78cEGiLXcQx9O6COd/Hru95ZZP0jXm+LOTtZ3fqc2pARx6eZhPUCz7UHeBMU76gskvk5NZy6M= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907117; c=relaxed/simple; bh=hAg3tXE8NmqrNc/XQlhIO3ZUdJGEwoXTTo2ATdT1ey0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=FD8TP4ISpohf2JeDehDRv1N43R2MBcA6l3yyf0weQzK5Wv7PY4cebWUAUbtLW2InVIk35Dd3tpgv0jINy7fzG/L8CQx7baMMmEOG+p8Kbx74ODD3dO4EC2c9JKuJiU8HQbELQH0KqEBM1jHI5HR2YFjoHBZP9p6Mugg13sn5zw8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=5apUASze; arc=fail smtp.client-ip=40.107.220.53 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="5apUASze" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=URrAPp3cDbsVO9r3pyAXCrM3sERMEUXjnIEeZgOQpknS86LtawIoK0o+6Yvnh2ylsQHcEzP7vDY+SgXiS5fPB00Q14mmIDB1QPHt7iN7G+/uixlveCqTG/x9HaLxsoeuxKLeDP0MGnBxOTHerk2q8KIlDYBReX7iuen9pwtw8c1THLlpFnkZpMcYHbNP5JCtesqHFj8JZEOR2HV0oUFv3A0fzIxCqbAnVCs8se9MtjUs8rIQq12/ZijwNcwwHtX60Mff7wZJLs2A3z511nwjH9UZMAWEI+ss8bdtatcVfMR1NsoUQZLW8ub2h8415yU9JitTGUnyXhcxVjgmsneD6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2BzkIfKp9BLbxRqevF4qHCyseB33su/PE/dLm1OEpK4=; b=fXDjDIs6dzI8I/A0fOrFRoBOtgZuyWRiOjQNB9r1Qs5etlZOtKvW1aIn6eTJFo2WpU3OZPxIwwVeOSzoEVF0Eu9rClwrSPn7NCfvY+oRotJA7mvq2e94v0Cm5Sb9C3qeEwZHqM6jc4EKDhR+JFW8fDv8rPBRR0W9n/7Pqq4Htq3NXl5d26Yc1Cr+LSr5LWg7BEasj607H+KgaD0e59DsJTIwXmy4qb9bBkiCwjVBjXvgKDsJHrFKFmtQw0IeKWn741/3lLsxfqZdk7Mzi/2A3XfZjkp5MGfLBwbekM9tuW7A1P2wyZJ3OzD7A4JOFr3edzsDfSSZMlAyIWbp8Ig6wQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2BzkIfKp9BLbxRqevF4qHCyseB33su/PE/dLm1OEpK4=; b=5apUASzeHwoWW5A+g9nPk3Rfe4Yx0NbcTOqLa87JhKsACMn9jG1Nl4EQSAy3occ1W4CnvvOybwhAN7tir9QGsFSSdt4r1cgX5U6x+El3y1ikofKbtDCM3HCf/YuDmQug2UQjjUgSI2QgC6m4+/0SMGKlVkl0lbFes6HzUKTCQ5w= Received: from MN2PR14CA0008.namprd14.prod.outlook.com (2603:10b6:208:23e::13) by MW6PR12MB8913.namprd12.prod.outlook.com (2603:10b6:303:247::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:11:51 +0000 Received: from BL6PEPF0001AB53.namprd02.prod.outlook.com (2603:10b6:208:23e:cafe::b3) by MN2PR14CA0008.outlook.office365.com (2603:10b6:208:23e::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:11:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB53.mail.protection.outlook.com (10.167.241.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8699.20 via Frontend Transport; Tue, 29 Apr 2025 06:11:50 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:11:43 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 04/20] x86/apic: Initialize Secure AVIC APIC backing page Date: Tue, 29 Apr 2025 11:39:48 +0530 Message-ID: <20250429061004.205839-5-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB53:EE_|MW6PR12MB8913:EE_ X-MS-Office365-Filtering-Correlation-Id: 39a923f8-7de3-4ae3-49dc-08dd86e4bb3b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?8rzIgsOWtZS0e5BvZDoAhzHB5wEbQdoen2IoGLRFpbTtnLPmf5ArrqVQtiTl?= =?us-ascii?Q?d6fInAoDThskTk6rkyeWPosnkihF1sudckED/WbFbKIhkm6KSWm9GaIh1ulj?= =?us-ascii?Q?svhy51HtBrMhW0EpQgl1XJKx2utTZUigLRjNAxNq3EkWwXHF6QFo4Nj2hDar?= =?us-ascii?Q?stLFjFodVuaz+ipumorVLoMF0/3UiXSYBahgZrQsXzjcpdWwqjXJVXIown8g?= =?us-ascii?Q?8YP/1ohvgJ0diIZn/1A1Gl/uPy07J0R3onn9QaLsP5EdZZe23Rqn9Y+KN/P/?= =?us-ascii?Q?YEKHLjXQEmd84c4l/mxQGAZSbBMzLfaGv8jBhKpazdxt3ziEGa7S7bZRq1pv?= =?us-ascii?Q?AS66tVTLDfEHFfu4gOFZmEhzRtc3li4fZnMpQ44w02Wvhw1oHCcBETJYLRsX?= =?us-ascii?Q?CFD4ZkPs1A6UOpQRWuf2z9GfhyIECmzQ2hmYYWGmyL7I5xUA6by6lEoV/F9S?= =?us-ascii?Q?xJq2oRp47gMAL/elEcgY4QzzK2NUayuLQXyVqpx6Aj00Yf5cmvNtSmyKJQw5?= =?us-ascii?Q?wRiqHFTl/diPX+RxgZ+DECZzHA/0i63UgwMbVRr6H3ydDQVu4QzSsnz9q+fg?= =?us-ascii?Q?92dYjN/FBS4V9+UcuIZ95pl7A32uiaoM4Re0WszOCDXbiWLyk4QXRvS0e5ju?= =?us-ascii?Q?O8uIaPGx5GGXhEDXhW1uhbOEwXpWtpb271eebFXSscd3V0BNLueSvaQL4Jj2?= =?us-ascii?Q?B00rae+JRAzKSe+Rf89aZ5xFkZD2RLOhRP9ii97kh6PZCr4AbnTVXM2kP4Vb?= =?us-ascii?Q?jxbDm/qzkPkZ6B8Qvt09f7+8qfYMtEEqDwjrfA9SI125ro07LSXpa7hAdMUL?= =?us-ascii?Q?erED5MAcuFKkV+/VRCrVQ6bd5uXqn039VGJmNu5io0wNWZBleLNo8zG4sTY3?= =?us-ascii?Q?MQn/+I7vb5G5EBLIj/a6xNYiFtlDVGFy5YbMsUn+4UQWVaZUyHLAUq2yC42c?= =?us-ascii?Q?/OsKJHKv0WTvgNej95dNE5dQwT0m2ogtKFMUIGgIeSXuiL4XVzblbldvZjXK?= =?us-ascii?Q?1jL0W3I9K+Hz7sXIrsRaGoVb6ue235bzbbCigmaKHgxaQ1khlDqN26+oCiL4?= =?us-ascii?Q?hKFDQNtwWX6quBq50hFZyrKqgJ6e93kSpti8mi3RSS9WRiGAFwCQNlebaVVh?= =?us-ascii?Q?m3lM5U/hrP54TgyJMHJQLB3/lpebdhS+gQOK/TsgI562hTuxEiJZrb9V8BYn?= =?us-ascii?Q?7LfLgHsCvmpkpdC5Ozu3SMcBtCfgqu5AfhCxz1rS2zb60Dza8ayEUJ9ytLpy?= =?us-ascii?Q?FuWc6Yc/tP5ACbnCJFW15tB5Hp4fUd1Dd81taxyMv0QKtPORbzeglEHOdbax?= =?us-ascii?Q?VyFcDow5C6Tme6WSzBZeTAvJVKWdrvVJHbHdOGT6jRDUtjoHIr21+hspVRXB?= =?us-ascii?Q?0suijbExQXnuOrjFviJX3cEThr61dcIkSrwyMouLxCqk5GzNkq57OLwOVQ8E?= =?us-ascii?Q?Jb9RHnYGOqP45dLHYgpUBOtPGWf3pfC3FO0sxldQ6lO61hy5B4sGKd08A3j5?= =?us-ascii?Q?SOmlMs/lSGgGZcEtZcdPXSUlXqY03qmzn9rc?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:11:50.7927 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39a923f8-7de3-4ae3-49dc-08dd86e4bb3b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB53.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB8913 Content-Type: text/plain; charset="utf-8" With Secure AVIC, the APIC backing page is owned and managed by guest. Allocate and initialize APIC backing page for all guest CPUs. The NPT entry for a vCPU's APIC backing page must always be present when the vCPU is running, in order for Secure AVIC to function. A VMEXIT_BUSY is returned on VMRUN and the vCPU cannot be resumed if the NPT entry for the APIC backing page is not present. To handle this, notify GPA of the vCPU's APIC backing page to the hypervisor by using the SVM_VMGEXIT_SECURE_AVIC GHCB protocol event. Before executing VMRUN, the hypervisor makes use of this information to make sure the APIC backing page is mapped in NPT. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/coco/sev/core.c | 22 +++++++++++++++ arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/sev.h | 2 ++ arch/x86/include/uapi/asm/svm.h | 4 +++ arch/x86/kernel/apic/apic.c | 3 +++ arch/x86/kernel/apic/x2apic_savic.c | 42 +++++++++++++++++++++++++++++ 6 files changed, 74 insertions(+) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 5b145446e991..bf03eaa6fd31 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1004,6 +1004,28 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd) return 0; } =20 +enum es_result savic_register_gpa(u64 gpa) +{ + struct ghcb_state state; + struct es_em_ctxt ctxt; + enum es_result res; + struct ghcb *ghcb; + + guard(irqsave)(); + + ghcb =3D __sev_get_ghcb(&state); + vc_ghcb_invalidate(ghcb); + + ghcb_set_rax(ghcb, SVM_VMGEXIT_SAVIC_SELF_GPA); + ghcb_set_rbx(ghcb, gpa); + res =3D sev_es_ghcb_hv_call(ghcb, &ctxt, SVM_VMGEXIT_SAVIC, + SVM_VMGEXIT_SAVIC_REGISTER_GPA, 0); + + __sev_put_ghcb(&state); + + return res; +} + static void snp_register_per_cpu_ghcb(void) { struct sev_es_runtime_data *data; diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index c63c2fe8ad13..562115100038 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -305,6 +305,7 @@ struct apic { =20 /* Probe, setup and smpboot functions */ int (*probe)(void); + void (*setup)(void); int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); =20 void (*init_apic_ldr)(void); diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 13a88a4b52a0..4246fdc31afa 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -520,6 +520,7 @@ int snp_svsm_vtpm_send_command(u8 *buffer); =20 void __init snp_secure_tsc_prepare(void); void __init snp_secure_tsc_init(void); +enum es_result savic_register_gpa(u64 gpa); =20 static __always_inline void vc_ghcb_invalidate(struct ghcb *ghcb) { @@ -570,6 +571,7 @@ static inline int snp_send_guest_request(struct snp_msg= _desc *mdesc, struct snp_ static inline int snp_svsm_vtpm_send_command(u8 *buffer) { return -ENODEV;= } static inline void __init snp_secure_tsc_prepare(void) { } static inline void __init snp_secure_tsc_init(void) { } +static inline enum es_result savic_register_gpa(u64 gpa) { return ES_UNSUP= PORTED; } =20 #endif /* CONFIG_AMD_MEM_ENCRYPT */ =20 diff --git a/arch/x86/include/uapi/asm/svm.h b/arch/x86/include/uapi/asm/sv= m.h index ec1321248dac..436266183413 100644 --- a/arch/x86/include/uapi/asm/svm.h +++ b/arch/x86/include/uapi/asm/svm.h @@ -117,6 +117,10 @@ #define SVM_VMGEXIT_AP_CREATE 1 #define SVM_VMGEXIT_AP_DESTROY 2 #define SVM_VMGEXIT_SNP_RUN_VMPL 0x80000018 +#define SVM_VMGEXIT_SAVIC 0x8000001a +#define SVM_VMGEXIT_SAVIC_REGISTER_GPA 0 +#define SVM_VMGEXIT_SAVIC_UNREGISTER_GPA 1 +#define SVM_VMGEXIT_SAVIC_SELF_GPA ~0ULL #define SVM_VMGEXIT_HV_FEATURES 0x8000fffd #define SVM_VMGEXIT_TERM_REQUEST 0x8000fffe #define SVM_VMGEXIT_TERM_REASON(reason_set, reason_code) \ diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index a05871c85183..16e88449dc62 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1502,6 +1502,9 @@ static void setup_local_APIC(void) return; } =20 + if (apic->setup) + apic->setup(); + /* * If this comes from kexec/kcrash the APIC might be enabled in * SPIV. Soft disable it before doing further initialization. diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index bea844f28192..0a2cb1c03d08 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -8,17 +8,54 @@ */ =20 #include +#include =20 #include #include =20 #include "local.h" =20 +/* APIC_EILVTn(3) is the last defined APIC register. */ +#define NR_APIC_REGS (APIC_EILVTn(4) >> 2) + +struct apic_page { + union { + u32 regs[NR_APIC_REGS]; + u8 bytes[PAGE_SIZE]; + }; +} __aligned(PAGE_SIZE); + +static struct apic_page __percpu *apic_page __ro_after_init; + static int savic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return x2apic_enabled() && cc_platform_has(CC_ATTR_SNP_SECURE_AVIC); } =20 +static void savic_setup(void) +{ + void *backing_page; + enum es_result res; + unsigned long gpa; + + backing_page =3D this_cpu_ptr(apic_page); + gpa =3D __pa(backing_page); + + /* + * The NPT entry for a vCPU's APIC backing page must always be + * present when the vCPU is running in order for Secure AVIC to + * function. A VMEXIT_BUSY is returned on VMRUN and the vCPU cannot + * be resumed if the NPT entry for the APIC backing page is not + * present. Notify GPA of the vCPU's APIC backing page to the + * hypervisor by calling savic_register_gpa(). Before executing + * VMRUN, the hypervisor makes use of this information to make sure + * the APIC backing page is mapped in NPT. + */ + res =3D savic_register_gpa(gpa); + if (res !=3D ES_OK) + snp_abort(); +} + static int savic_probe(void) { if (!cc_platform_has(CC_ATTR_SNP_SECURE_AVIC)) @@ -30,6 +67,10 @@ static int savic_probe(void) /* unreachable */ } =20 + apic_page =3D alloc_percpu(struct apic_page); + if (!apic_page) + snp_abort(); + return 1; } =20 @@ -38,6 +79,7 @@ static struct apic apic_x2apic_savic __ro_after_init =3D { .name =3D "secure avic x2apic", .probe =3D savic_probe, .acpi_madt_oem_check =3D savic_acpi_madt_oem_check, + .setup =3D savic_setup, =20 .dest_mode_logical =3D false, =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2079.outbound.protection.outlook.com [40.107.102.79]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6DD7A1DB366; Tue, 29 Apr 2025 06:12:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907145; cv=fail; b=ZsgvfKzJdgQ5ZqwhQnOa4PcW1zo+vc0muTgtypDabA6/1uxQQLxaBJNiC5kMUJa+nc/msIcCEtXMcqZ/ah/K+yBkigBGvFeHZJkHtfZxg4iRZx7kOaD93nT09PmV7JU4icw5i3cOaMCncyvwWFZLpgF7Ng3ZqN5oHcGDOpW+6ng= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907145; c=relaxed/simple; bh=4k0dJ+qV6NGzq9vZDCe/1A9a3Qk2simLHn5vj7BRkws=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=QppwgESTyEilaHeR1pgviPO2xqutpI6CCAs5n9gqmHXiuo4aWWz24Lyga/0lHKxbammzvXDdfA2+o2TGSMWiUk44mUIwLZBFwW3TB50GaRWWQlECAL2n3rj5aqopOPz1UN+Sgr4cOxQTA8ZiG01hEoA7H6ZpVGpRR1yIc+iTK40= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=0Y4LFr74; arc=fail smtp.client-ip=40.107.102.79 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="0Y4LFr74" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=dsrS0nK72S1fH8qpVL191tQgxZlmZqRqaNHbuJX2l092BzzoNyZwDJ8pY+ffPWwST5/7thMHLMye1b2PurYczURcuzZLnEg5tIhtyuofwoxL8Mb6z+CG5297QhI6b9mNoGDV5BJIHhf8qYK4G89x9BQXeG048F55QJ0xcN80htbGWk7ZAPlZCs9jjWfgfOloNcjuqx9d71UxpcXim6MCBsV2hVx9kyJJm9pQJIGRr1v5z3KRde/iUq3L2WUr33ibEoQ6yc+rfZOBuXaAACF4YwcZjJk8CeYAWRpgUHg4DIBR+AnrFjGPmRP4fX1GFH+d2ERlingHSKCi4KYWnu6sjA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=1dOA9IaDU8aHJj0Zo2MhX6c2yQ2Se0n9W/kFEFT91e4=; b=WHmlDvdaC/P5DkF24irmL/i0ckImoaZ9FrgT6/KKa9c/g3ESiS2Du2Yt9u/JMPTXBDMbFbSHDphukaLQlEFvFzTxTT9bt0+mifLkLNQNQZLoWVVhP6eY/o0XXWv9LgNlzWucao1pP8avtZuwPVlOEa+xPragktg2WCcsokVZL8o2C2IUjv3uopJoaBcuzNXCR472Fql8n4t29ezz1gwZWPQ9eE8KABjVqFZ+nKEqzrneSVqkSn1LuJtK7nGP9MNo5pOf1KZIN6eJ6zKFqqtAr6fv8X/wCLHQIMBCyhw/rQ8zQxG6rR7QP2RjgZGEkdZtuFkNgZXdNp2pBD0Ta0aPCQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=1dOA9IaDU8aHJj0Zo2MhX6c2yQ2Se0n9W/kFEFT91e4=; b=0Y4LFr749snx52F7ceST22C2IkG6uBP+YhhzD8WBIfOMM3JRsvYT0fzjxrvKgXf6XqibR3bN9YWHHIZdZ+VZpLQtbOpFuryvP5jR9lJaX6l8ECP63mfRsGpVELCX4fd10qORdX91Oy/ynh2kx5ZT+YyFSW7XjQjRXPSeFZ6kleA= Received: from BLAPR03CA0079.namprd03.prod.outlook.com (2603:10b6:208:329::24) by SA1PR12MB7271.namprd12.prod.outlook.com (2603:10b6:806:2b8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.26; Tue, 29 Apr 2025 06:12:18 +0000 Received: from BL6PEPF0001AB56.namprd02.prod.outlook.com (2603:10b6:208:329:cafe::c) by BLAPR03CA0079.outlook.office365.com (2603:10b6:208:329::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Tue, 29 Apr 2025 06:12:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB56.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:12:18 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:12:05 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 05/20] x86/apic: Populate .read()/.write() callbacks of Secure AVIC driver Date: Tue, 29 Apr 2025 11:39:49 +0530 Message-ID: <20250429061004.205839-6-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB56:EE_|SA1PR12MB7271:EE_ X-MS-Office365-Filtering-Correlation-Id: 405a6434-36b4-4411-9222-08dd86e4cb98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|376014|82310400026|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?I2nMVoRMvB5AZpGyrH3NiD52AC+Pg9phjhC3e7vh798LdeFOKghA/mEVEcCS?= =?us-ascii?Q?8Vv+NIeSjscVgQBJ5bHQya0iIPj6wg3vMFomYgt32Aa0OgsayvXZx4xguBt1?= =?us-ascii?Q?PP9NY8WQCYc7Y4RVXVFtsw+6TWsheyrdLNwEIrTrKPTKoQWpQ+r0ecup7JG4?= =?us-ascii?Q?kRKl5r3cUaDh1ueyy4zRRi/Gloi05yMFhbU6hYuyytjjouGn4wHPulvPo86M?= =?us-ascii?Q?CG5LxK4BVEFVzEXBc4arEiRQScZ2iFXzLRdHXOkZ/obo2Bc0vUd1UFWKjfEt?= =?us-ascii?Q?GNtA6NoheIkPfQRq0VqKYxYWnDB6bqzKKhkiBLa53PMCiucW5KNUSNI0RhNq?= =?us-ascii?Q?nvcrTeLqboGiuPI6hG/RNGveJVYkU2cBg+ERRCR8S7wuV/UJMFRIRnI5DIx1?= =?us-ascii?Q?qsiSQiT5IBy5RGIhos2U4MEn4n/W6sNdhaPrA8Nz4ApJZC0iUuRRhbzkgvqE?= =?us-ascii?Q?CelVqP6asdzUMxfzM6YpejQIW49tS/Ftc+aot3pn1b6Rgh3v6YRdSZI21Wo7?= =?us-ascii?Q?0FhfV3VfZtHWERNWjiS7bt+bJV0QRAPiYdiUXOVJ9jpzYl27S4eCZNIpmlCn?= =?us-ascii?Q?BCNAO9hPzqvXLgcC2tOl7KVzytDw4NHv2Cc0l+xEKZwLcKdynnFNZ53dBIW7?= =?us-ascii?Q?PUyjwaruj4/oRw1fQcXf/FqQjAU6zDczxrP/drlFRO2hff8O9SQetsdbkEg8?= =?us-ascii?Q?uOfkHOvAFABgZ5u5fU5lkQLtOrPE2H9v4cqkxRK10JPWhTYmszzSnSZCfC+j?= =?us-ascii?Q?P9CaBlNb+ict6lPY4hn2B2omZ46vc6TRWQRL5BPdlO2aLk4eEf+GiWkYtDNk?= =?us-ascii?Q?xBFXJ6iq3NCTY4nNIw42Tky4NsVUpK6A2mUS8VFI4WYJaKGiaHj1GGtRNneO?= =?us-ascii?Q?oGzQ9L8VqWfeWym5GGW2J0qGwZXeoJqcTsKzyORfiMNrU6svfP8WmQIYNCVn?= =?us-ascii?Q?+znmmTcFasriC7kh9FYAz2hLJMbFcNniuMwiGpYLooq6f+NznCWz1I09AWTW?= =?us-ascii?Q?Sdk48jRutSe7C2fTXMV0fovKL2iECpO9jOcw3Szh5dUDqneuJhvJ1SeeWcG2?= =?us-ascii?Q?N1lEh5dhBoU3D9OROINkey3nXStjIJn+zcGHh7RxjCW5Q43iqCE626j2/eXb?= =?us-ascii?Q?pQ3ml9k2VxXUgtihdGyEiREnr7ahR0SZsZlJWgFNdyhs3ecuimM7ITVDcBGR?= =?us-ascii?Q?6NGjnlzJ894/RukSjInkV56vA+WVYrrC+3ZvEei0yj/ZzsAPBBy+/3Q3DNkS?= =?us-ascii?Q?eqwgnyr3fbM7OIurKJh8O3I7o4CBmSXrF9pXTQ/QJ1WDPMlioEJdWUk48Cqp?= =?us-ascii?Q?HPMFQqP76swznn1JKYvkMoRhDqgnxzqKsZW17GmIU7spjfrO9OB2ht8AckD3?= =?us-ascii?Q?xqbIjOeKO1a69/CrPhzmSxIfLsmAsWwsI6IlAUWI66lD2eRSs2uARrs/AScM?= =?us-ascii?Q?TSbVRODGQi+hV2axDHgU0xSEqiG5WFCFVDv3rSt+Ad1ASwCnJrt8xRsFTqZp?= =?us-ascii?Q?jjbGFyPdRRhhhNNA6w8lDpmQImUUyHqVQIwS?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(376014)(82310400026)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:12:18.2501 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 405a6434-36b4-4411-9222-08dd86e4cb98 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB56.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7271 Content-Type: text/plain; charset="utf-8" Add read() and write() APIC callback functions to read and write x2APIC registers directly from the guest APIC backing page of a vCPU. The x2APIC registers are mapped at an offset within the guest APIC backing page which is same as their x2APIC MMIO offset. Secure AVIC adds new registers such as ALLOWED_IRRs (which are at 4-byte offset within the IRR register offset range) and NMI_REQ to the APIC register space. When Secure AVIC is enabled, guest's rdmsr/wrmsr of APIC registers result in VC exception (for non-accelerated register accesses) with error code VMEXIT_AVIC_NOACCEL. The VC exception handler can read/write the x2APIC register in the guest APIC backing page to complete the rdmsr/wrmsr. Since doing this would increase the latency of accessing x2APIC registers, instead of doing rdmsr/wrmsr based reg accesses and handling reads/writes in VC exception, directly read/write APIC registers from/to the guest APIC backing page of the vCPU in read() and write() callbacks of the Secure AVIC APIC driver. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/include/asm/apicdef.h | 2 + arch/x86/kernel/apic/x2apic_savic.c | 116 +++++++++++++++++++++++++++- 2 files changed, 116 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 094106b6a538..be39a543fbe5 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h @@ -135,6 +135,8 @@ #define APIC_TDR_DIV_128 0xA #define APIC_EFEAT 0x400 #define APIC_ECTRL 0x410 +#define APIC_SEOI 0x420 +#define APIC_IER 0x480 #define APIC_EILVTn(n) (0x500 + 0x10 * n) #define APIC_EILVT_NR_AMD_K8 1 /* # of extended interrupts */ #define APIC_EILVT_NR_AMD_10H 4 diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 0a2cb1c03d08..4761afc7527d 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -9,6 +9,7 @@ =20 #include #include +#include =20 #include #include @@ -32,6 +33,117 @@ static int savic_acpi_madt_oem_check(char *oem_id, char= *oem_table_id) return x2apic_enabled() && cc_platform_has(CC_ATTR_SNP_SECURE_AVIC); } =20 +static __always_inline u32 get_reg(unsigned int offset) +{ + return READ_ONCE(this_cpu_ptr(apic_page)->regs[offset >> 2]); +} + +static __always_inline void set_reg(unsigned int offset, u32 val) +{ + WRITE_ONCE(this_cpu_ptr(apic_page)->regs[offset >> 2], val); +} + +#define SAVIC_ALLOWED_IRR 0x204 + +static u32 savic_read(u32 reg) +{ + /* + * When Secure AVIC is enabled, rdmsr/wrmsr of APIC registers + * result in VC exception (for non-accelerated register accesses) + * with VMEXIT_AVIC_NOACCEL error code. The VC exception handler + * can read/write the x2APIC register in the guest APIC backing page. + * Since doing this would increase the latency of accessing x2APIC + * registers, instead of doing rdmsr/wrmsr based accesses and + * handling apic register reads/writes in VC exception, the read() + * and write() callbacks directly read/write APIC register from/to + * the vCPU APIC backing page. + */ + switch (reg) { + case APIC_LVTT: + case APIC_TMICT: + case APIC_TMCCT: + case APIC_TDCR: + case APIC_ID: + case APIC_LVR: + case APIC_TASKPRI: + case APIC_ARBPRI: + case APIC_PROCPRI: + case APIC_LDR: + case APIC_SPIV: + case APIC_ESR: + case APIC_ICR: + case APIC_LVTTHMR: + case APIC_LVTPC: + case APIC_LVT0: + case APIC_LVT1: + case APIC_LVTERR: + case APIC_EFEAT: + case APIC_ECTRL: + case APIC_SEOI: + case APIC_IER: + case APIC_EILVTn(0) ... APIC_EILVTn(3): + return get_reg(reg); + case APIC_ISR ... APIC_ISR + 0x70: + case APIC_TMR ... APIC_TMR + 0x70: + if (WARN_ONCE(!IS_ALIGNED(reg, 16), + "APIC reg read offset 0x%x not aligned at 16 bytes", reg)) + return 0; + return get_reg(reg); + /* IRR and ALLOWED_IRR offset range */ + case APIC_IRR ... APIC_IRR + 0x74: + /* + * Either aligned at 16 bytes for valid IRR reg offset or a + * valid Secure AVIC ALLOWED_IRR offset. + */ + if (WARN_ONCE(!(IS_ALIGNED(reg, 16) || + IS_ALIGNED(reg - SAVIC_ALLOWED_IRR, 16)), + "Misaligned IRR/ALLOWED_IRR APIC reg read offset 0x%x", reg)) + return 0; + return get_reg(reg); + default: + pr_err("Permission denied: read of Secure AVIC reg offset 0x%x\n", reg); + return 0; + } +} + +#define SAVIC_NMI_REQ 0x278 + +static void savic_write(u32 reg, u32 data) +{ + switch (reg) { + case APIC_LVTT: + case APIC_LVT0: + case APIC_LVT1: + case APIC_TMICT: + case APIC_TDCR: + case APIC_SELF_IPI: + case APIC_TASKPRI: + case APIC_EOI: + case APIC_SPIV: + case SAVIC_NMI_REQ: + case APIC_ESR: + case APIC_ICR: + case APIC_LVTTHMR: + case APIC_LVTPC: + case APIC_LVTERR: + case APIC_ECTRL: + case APIC_SEOI: + case APIC_IER: + case APIC_EILVTn(0) ... APIC_EILVTn(3): + set_reg(reg, data); + break; + /* ALLOWED_IRR offsets are writable */ + case SAVIC_ALLOWED_IRR ... SAVIC_ALLOWED_IRR + 0x70: + if (IS_ALIGNED(reg - SAVIC_ALLOWED_IRR, 16)) { + set_reg(reg, data); + break; + } + fallthrough; + default: + pr_err("Permission denied: write to Secure AVIC reg offset 0x%x\n", reg); + } +} + static void savic_setup(void) { void *backing_page; @@ -95,8 +207,8 @@ static struct apic apic_x2apic_savic __ro_after_init =3D= { =20 .nmi_to_offline_cpu =3D true, =20 - .read =3D native_apic_msr_read, - .write =3D native_apic_msr_write, + .read =3D savic_read, + .write =3D savic_write, .eoi =3D native_apic_msr_eoi, .icr_read =3D native_x2apic_icr_read, .icr_write =3D native_x2apic_icr_write, --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2064.outbound.protection.outlook.com [40.107.243.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E43A92749D1; Tue, 29 Apr 2025 06:12:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.64 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907168; cv=fail; b=f+kf9G4CUrZ6keontQSVu079be/1eOxJhAdJlaeOgsGwQDNkxj2m+lhX9YUNcW4yt5l38WiAp6ft/d5TNo45pU3yj7uKAPgSevvcG+nt6w885Fjc5TojVJ2tGujYcKJCZTD8NiGTAxtBPqAJHTyc3rXmY7dPFqu5zNFnwEzz9ac= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907168; c=relaxed/simple; bh=Vj9aPVoFE0lc/VCiUgUvC8VYsukPtunUbI7oOtafwlk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=hdFWhdmiB0a+/KD6GKtLm3ChYEoZGluu8RJEIIVMRjvP/1aQrTwZwiUImDETnssIzOJ3ev6KuDLq2MR7NJT7t7Q8Mwoqo5M+CLVxU1IxebykAXUX9v/h2w6a1zxrG6jBLnv7x0/9Vnew6nboiPsu7fm/aELGAgCVF9IVnXbjGYk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=tu9eBw1Y; arc=fail smtp.client-ip=40.107.243.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="tu9eBw1Y" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=iLEn34/KSQ+EtC8pvBbSyYc6m+QdIBdZdZXvSd9Qju8o8GfR/uJ2/KZqZL05kj8gohhjGgtIh7jMK9NP3szxjHasJsQHikSyrMzOVflYLlFm8qTtCHtGwm8RUXySzrJoTLeQ22V3wU5oEiH3HEuZX/RutjV+nhzHMpedyenj8XdgwC/ipWMKFixqD5rmXznZHthroGRZnY+6UfKAnEfB/cGIzfV+r5y0+Wi+iY/6FISYpjanz1xq6UUQ2JM9D4Td2lNh85iWZUTmz6ZdkKxbU+RCDULayWFCTRYG8RKcu05vKgOrX8ltECcMSnr0edvodCLzsEvvvvlHMXcBV7Mo4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=7DMA1CeMoOY3QDLEVblI8olHvRz0JxoRY5p8GLyY+Bk=; b=kCSH0CMRf6ok4hieLlx/hNQo4bOC7G1AEr9/gi0FrZgIJ70+aYIdrZGcwhxkI6P2BYOFLMPmPEPXQp/Ngh4qZZasG80QficRJ3O5vf9og3b/JFNW6xJa4CD+nE7NAJ6UWTRiNTwuGK9R6IR3M4TFT1FxNZ2PJuxl3dRWHNcgXfZgvpgzHnxf/qjbJWePT4RcRfUmsdzOfU6jjeL/4A9SijkVQFEgwLcj368fgbnzmc9C7LD0LZu9zqwKFFgjYXcQJqiNQ+QYBL6Rf19ZlCDSCeqNCACpSqQwx0E4N3DCVRe1WCQNNZmkY86XZepsWweoVRLZQPId56RIlFuqD+Kanw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=7DMA1CeMoOY3QDLEVblI8olHvRz0JxoRY5p8GLyY+Bk=; b=tu9eBw1YX3GUEo5Bbf7FOo7sb2iso3txMKu9CAKTJbZuEaOVgp31jZ9jkQGDy01ERLxReYV4LTA2YUOwaBWYixZ2h30anFocj6IfpZk0VGcZ7OvJAby0PmvHgvFR5sWmnxc0n7gc4hujXS6QFPwf7U4zrNhpREGmFtDLM2JKSGI= Received: from BLAPR03CA0071.namprd03.prod.outlook.com (2603:10b6:208:329::16) by MN6PR12MB8589.namprd12.prod.outlook.com (2603:10b6:208:47d::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8632.34; Tue, 29 Apr 2025 06:12:40 +0000 Received: from BL6PEPF0001AB56.namprd02.prod.outlook.com (2603:10b6:208:329:cafe::7) by BLAPR03CA0071.outlook.office365.com (2603:10b6:208:329::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Tue, 29 Apr 2025 06:12:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB56.mail.protection.outlook.com (10.167.241.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:12:39 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:12:31 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 06/20] x86/apic: Initialize APIC ID for Secure AVIC Date: Tue, 29 Apr 2025 11:39:50 +0530 Message-ID: <20250429061004.205839-7-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB56:EE_|MN6PR12MB8589:EE_ X-MS-Office365-Filtering-Correlation-Id: 1ceee002-b076-4aa0-4cdb-08dd86e4d88b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|376014|82310400026|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?ZP+YSqEKmaEY3eAwFcZPCFRg+2NlMVM5iZv/7+Y9+GAngZAnH+zoAnaLdhIt?= =?us-ascii?Q?vraSpRSvV4+IG1LbLsJixYc4ScgBCL3QCuUMgcyTZLIXSLD5yCrrxvrI+AAs?= =?us-ascii?Q?Z4RovsVMkmJlBSOlwFEA/xe9LwpavyKukmYyRsdM1sMlVKR8qvmXr4X9grzm?= =?us-ascii?Q?vLrFfzBolnqLEVfygY+4SbXQHrYdL/Yayns4HJGjtuAllV5L4lZHh3WBo7+z?= =?us-ascii?Q?65tWYTaOw0amhUskTuewy7HgHKNDSdCQgNhHPVF5FaNa/lN9qb1T2Dsw6DtB?= =?us-ascii?Q?J6GO9WiKnQnHZdVqlJFg+KDHYneMZxP6IIQflTuYEVJkeyJgsVKdRrGFLAE7?= =?us-ascii?Q?KbeG25+Xeylo6hn21j/QhV6GEcakTDkMt45WkpnuJrheZH+4cjJZIpgFkGND?= =?us-ascii?Q?REjg5l9l+p977DvhJ4RyaAwvIKuHlpgEhR0DMMV9uIgp7IEsRa8tvAkQaZ1U?= =?us-ascii?Q?/pVqBZZH4LjcHnd5pVAngL0CqLHZwRyDBUbugPbksqIc6/ZT7i/OsGW9RuhY?= =?us-ascii?Q?6e2BYAdEd3pFuPDMSswW3gwrcfFDMLcb9k4SHLL/50NA6vF7B1hKE4Up4M6B?= =?us-ascii?Q?dNRM6U7VtGHiXc5aT+THJCjazLAkr68sSX1m+DqIT0rCreGvL6cGSq1IDFqe?= =?us-ascii?Q?pyPf3W4iZwesHz14aBZOUEq8ZKFXeYbKdWXnSEvOWSLOZNlUYK3SsDQINbdv?= =?us-ascii?Q?54/QGQC+Q1KfyaD7baI54y6Ig250tZ01WsTq0O3JxKax+/JsII3Jf9XeldiG?= =?us-ascii?Q?ESgSa5s7/Du7krWlbILP3wZMsybauT/pgVvO5w23hvezbtYRHZQebOMxvrvS?= =?us-ascii?Q?5eYXDFnGNuyIjze+mukR3EJjDUfjfzDgbbch0ZQBlymxFGtgzFFFihu3DgDx?= =?us-ascii?Q?vUED+bIqp6F5wIy2PAufXAPfcQ42HziWMLI9QNChXzTjwC9Ok3axryXmy0BY?= =?us-ascii?Q?UDqQvACyTK7+A6a6g5QQiYgyHk/A+Nb/ET0TwStdw+Cdxo44VmXM/dv1Tcxo?= =?us-ascii?Q?XttBQote8rAwZg0Miwcf8i5bfgmvB9YZ/ekmeJnYMQCybYGuAwTpqB+b/Vnn?= =?us-ascii?Q?aILL4YWX17NuUr6I25rXB11Z9lFs84DLyiQBv2DI63syBCLONng3HnyG/Xks?= =?us-ascii?Q?ZF7TeNtBH1FuObXWB3sbJTT/Bp6uno3qnKa7djpPIVOv+HnDYZElGQqRBIKr?= =?us-ascii?Q?wvkS7CLaqw88fpi1UyCeAzH2KeGubvw+/u6kU+ob0D/2aFbLE3pKOXvf4T15?= =?us-ascii?Q?qllzDfFhPoqfVnipTwstUes69Q/lCs8Gx2xBEOJdKdP+XlHJAxwlRP2r9eDO?= =?us-ascii?Q?LHzrAdU5dyLPx9PKuifkj9qRVZHM1p+Vwgkd0dHp3KK/J0Fdjw0rWO+VQQvm?= =?us-ascii?Q?HbdJpDbQjBUyOTtxS+l3CCeSNv/wJ1B6mIFrdT4TV2FV1KsIIVIRxW8DgvqU?= =?us-ascii?Q?py7nrDB1JFu2nFVfD8DEuJBuj5qwG6syRlImEMHM5SvEb9khrt4OqVY99mWO?= =?us-ascii?Q?p12dvqnz4Gbi1C7vNJpE8vzCNbkZVyUACVtR?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(376014)(82310400026)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:12:39.9724 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ceee002-b076-4aa0-4cdb-08dd86e4d88b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB56.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN6PR12MB8589 Content-Type: text/plain; charset="utf-8" Initialize the APIC ID in the Secure AVIC APIC backing page with the APIC_ID msr value read from Hypervisor. CPU topology evaluation later during boot would catch and report any duplicate APIC ID for two CPUs. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/kernel/apic/x2apic_savic.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 4761afc7527d..81d932061b7b 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -144,12 +144,25 @@ static void savic_write(u32 reg, u32 data) } } =20 +static void init_apic_page(void) +{ + u32 apic_id; + + /* + * Before Secure AVIC is enabled, APIC msr reads are intercepted. + * APIC_ID msr read returns the value from the Hypervisor. + */ + apic_id =3D native_apic_msr_read(APIC_ID); + set_reg(APIC_ID, apic_id); +} + static void savic_setup(void) { void *backing_page; enum es_result res; unsigned long gpa; =20 + init_apic_page(); backing_page =3D this_cpu_ptr(apic_page); gpa =3D __pa(backing_page); =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76F45270544; Tue, 29 Apr 2025 06:13:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907193; cv=fail; b=rexWtmtFoq4h4iseFZJvZ9O5H4HaiMaIw4+l0H876SPWpuzeBsYPutd4IyJ0dFbI7raqchPzKxiOl+Q24Bi1bi8C3MKkdaSsZrUpqFstHfvg8ApjA3PQze6oegy7ox8O54cuSrC06G3fqn4j0QCAjiG1wDw4i4cwzxKqC9a6yiU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907193; c=relaxed/simple; bh=Sd8W4WC6C73BsC2I8Wsu3tr2VpSypnIXUxAHwHMKn94=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=HmnZapvs50tMkJTKLyPgAMH7qw9c0zlcsCcpzCkhVDM4JYU6azv8X/qzQT7biEoi2gNAMzpAQCglibElhpPS260JqEbivXag2YHJHgxMZiOTqjAoDeh1AcLBf9dZWnQ5+YT4UFekvJsInBTzT2UWYbEjtinBjGTkRLL2qBDjRVk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=L5vJwBZ5; arc=fail smtp.client-ip=40.107.237.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="L5vJwBZ5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=cnHcl//lSFy+5SvpSS24cJ/8vo4XzM7y/LRdINjWJAwOmCzssvYTVT4gYnFpz0l0a9DmQeeHjVHPRchnRQDBElb2JYLlWag/MHh4hXvdDuiHjk9sFdpHWUHhS4RpB1FnUj7vzb0IeT2DCgBy3c4JmnxOlgN9gRxBalQC2yzqBfmvNzG7YM/UoPyw0J69ldds+CKpthwO5Cb8yZYT41soWaKVRaqZSkYq+XBIWE+A6XQ2k82c9DzPPNDQeoQSJ0MOthjICVBPpWsC0JsVQEc9bPYdura2qzPO2FAo+mq0fRY7KgvPcV+x2PgNkeklAp++fI9bShCp6BFixPrM0caOQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=+svRvz1p62egVWWTd6n8/mcGj9fd5R223mR6J+9XQwc=; b=BlPVLXe/v/SZfnqAsJD2e8UUOsMVC3VTtj+ZiHO8b8B08mGKDJXjXx6GYS5g3qn5QqqcGXP+VC2XK9C4hohFO1IZ+W6hu27cAtJptoUG1oyJbIQD8V/+dVY3KJ7nuEnWnVsjWoJOgqgYt3ZAvYDdsfm+uJLZqJfhQPZ6FZVsmpmt5ceuKjQ4frUO50L8wkJJMwW1UvjswM1nX6DhHCvO23FIRC6QHlZOcnCUA0xgmKFa7BSOlhdxp4urGtEz+Q3fLzFbd1uF8Tm/C8CnTJVRgrCzV7Q+FGJ6l0pUWek0YkIbKAx2uXPldAO0+alJTl73TxTPQ/O0vT45df4hBnLpqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=+svRvz1p62egVWWTd6n8/mcGj9fd5R223mR6J+9XQwc=; b=L5vJwBZ5KxPQLpy4qNEpZatAlA+7eUaic9fP/5h9Eb4It9czYYYjXli/UX3sgmLRshMWoJN2APFhu0x3VHQ1mF8sQYNxTBaG1YGj3immlAVuheId3wEQxn2m9AC1bNaQVBDJUZ48scrTMSrFo37O750+iX1tB+kbznjNnccmv9s= Received: from BL1PR13CA0418.namprd13.prod.outlook.com (2603:10b6:208:2c2::33) by CH3PR12MB7691.namprd12.prod.outlook.com (2603:10b6:610:151::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.34; Tue, 29 Apr 2025 06:13:05 +0000 Received: from BL6PEPF0001AB55.namprd02.prod.outlook.com (2603:10b6:208:2c2:cafe::99) by BL1PR13CA0418.outlook.office365.com (2603:10b6:208:2c2::33) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.15 via Frontend Transport; Tue, 29 Apr 2025 06:13:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB55.mail.protection.outlook.com (10.167.241.7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:13:04 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:12:57 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 07/20] x86/apic: Add update_vector() callback for apic drivers Date: Tue, 29 Apr 2025 11:39:51 +0530 Message-ID: <20250429061004.205839-8-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB55:EE_|CH3PR12MB7691:EE_ X-MS-Office365-Filtering-Correlation-Id: edac3851-9986-495d-f263-08dd86e4e758 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?MCSgxb9WpQjNSupI8ADo9r564Urd4XJa/mh/uMKG86srCduUPU14VxXXd/s/?= =?us-ascii?Q?uRHjHUKrsof8P6giVghXpeA1b8eV5na5U6QrJXipf/9w1ZtkBL5tzLEkDhwA?= =?us-ascii?Q?iZv7Qo1u6uZa67kqMuCwf93EPEKbawtxHVM2VLV4JxgbfxMsqSWu+PUF5PfT?= =?us-ascii?Q?JD+qXdFvip+95Fy7gGAhB7uQkMDm6muVqBHmibsPPREZ7gNNmXdHSta5L6lX?= =?us-ascii?Q?+a+brCnJs1qjhqCBRnf5gHThFQ8FU5qKCjw3WqroNE9uKo4+NUspass6Pob5?= =?us-ascii?Q?lUVWXrktv1ffmMRIb8ZS2qSi1oNg/izhWB/sJFSDoEmKLSLEkTUKG/S7+no5?= =?us-ascii?Q?GOfLf6JpatBCqKam5Edv1vbL3DnrAv/VaGA81+djU+5H+MMZoE/KrVq81hOd?= =?us-ascii?Q?anaud0Sd16/KU8w25W7cOq3Hx/gM4bJgLB0gVNprKCk3KykeW+eIY0h/WOOk?= =?us-ascii?Q?6klqHPLgN0BJdOGerZJeYJHviop9zwSha0WJ3ybug7YBWxaifmOv+N0K1QvT?= =?us-ascii?Q?qUoKYm3maaQDa5DiMH8vmgZnc3/BECJDZIDBQju/DY+0/m3EMwwPB1Dochs+?= =?us-ascii?Q?62KiqBpImt8Wd3ResaF/RH2i538F4ZPeE/6vhDj5icasG9uRsBYTQFuTBfpI?= =?us-ascii?Q?89G8AbX8m7jMuj5X6MOZfu7ntworeu1huqDWTvMDsveH6xtrT7byxGmAfgU1?= =?us-ascii?Q?WvbR8m2er/ySu7NoRDeMNwM4OR6P5jdiQj+CweWzRhzPwp1X8bWB6d6bO0x3?= =?us-ascii?Q?fItR1UYlU++fYg/K3iAKAyRBiEyKUuG9V0HoS2jKhpPutXgPIS74Bwct1XRo?= =?us-ascii?Q?jm1Gdn6qhFClyTNmQdDDRA8El8b31PuT+hLAMX20kZNueFhPu4gxZmZiu+7/?= =?us-ascii?Q?ZFgLOy8guo//R52lJJtUWHbkJ0JW18DbsVap2JtoShbk7eJm9zeGj6WcXkwV?= =?us-ascii?Q?0Zdkt7O4E0kVRrK+Yi3oqbYl16fSS7GmgNP8IqojanZL06Viyn+aBNRYlhJx?= =?us-ascii?Q?aCreWGZrdY/FpRPumDAl0eYabtwXXvplTlPsNf3BL38tWWBHA6+FLCmZm7yq?= =?us-ascii?Q?loJflSemnfRZZNAaMJt38S6jryOJR1Tg/D+ozA0rfEnJhc0sMx8Zf3Rwfr3Q?= =?us-ascii?Q?KVl3riK/x2eJNwM4lcsDdvi9t8S/bEtqXOfYY231yFbWyvzTQ57SayWROihM?= =?us-ascii?Q?8Hxi90z0N9z/tuahpcYDEqEVICNqwNGADrwyK5L42/zWc5YQsZzOgOQONcqF?= =?us-ascii?Q?uVLqz27bmOmgyfRhZVman7q+1I2e4UdDHErih+xd3Vk5+0AijQBO5MubTR2j?= =?us-ascii?Q?gWj9V+ONEA3joetFGj2x68hCvmFuHtES6OXMjkM450lxbrc0v68bcktgN+u5?= =?us-ascii?Q?4cND08Oo14ihdfcWVGsFKZv6SGfhl5TtEDQJ9ow4372xrCAMUs9HRm2YTvU6?= =?us-ascii?Q?ZauvQuiovDWGBsFARZa/j8hYsiKnShK78QdbecNVeg6tRFPDqMFV/J1+L/sQ?= =?us-ascii?Q?f5UZ4PLeag0btGIcrICgUGwr8Rv16iv7O89/?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:13:04.8066 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: edac3851-9986-495d-f263-08dd86e4e758 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB55.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB7691 Content-Type: text/plain; charset="utf-8" Add an update_vector() callback to allow apic drivers to perform driver specific operations on external vector allocation/teardown on a CPU. This callback will be used in subsequent commits by Secure AVIC apic driver to configure the vectors which a guest vCPU allows the hypervisor to send to it. As system vectors have fixed vector assignments and are not dynamically allocated, add apic_update_vector() public api to facilitate update_vector() callback invocation for them. This will be used for Secure AVIC enabled guests to allow the hypervisor to inject system vectors which are emulated by the hypervisor such as APIC timer vector and HYPERVISOR_CALLBACK_VECTOR. While at it, cleanup line break in apic_update_irq_cfg(). Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Separated out generic update_vector callback addition code to a new patch. - Removed irq_alloc_vector() and irq_alloc_managed_vector(). Moved apic_update_vector() calls to apic_update_irq_cfg(). - Renamed irq_free_vector to apic_free_vector. - Commit log refresh. arch/x86/include/asm/apic.h | 9 +++++++++ arch/x86/kernel/apic/vector.c | 29 ++++++++++++++++++----------- 2 files changed, 27 insertions(+), 11 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 562115100038..c359cce60b22 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -318,6 +318,8 @@ struct apic { /* wakeup secondary CPU using 64-bit wakeup point */ int (*wakeup_secondary_cpu_64)(u32 apicid, unsigned long start_eip); =20 + void (*update_vector)(unsigned int cpu, unsigned int vector, bool set); + char *name; }; =20 @@ -471,6 +473,12 @@ static __always_inline bool apic_id_valid(u32 apic_id) return apic_id <=3D apic->max_apic_id; } =20 +static __always_inline void apic_update_vector(unsigned int cpu, unsigned = int vector, bool set) +{ + if (apic->update_vector) + apic->update_vector(cpu, vector, set); +} + #else /* CONFIG_X86_LOCAL_APIC */ =20 static inline u32 apic_read(u32 reg) { return 0; } @@ -482,6 +490,7 @@ static inline void apic_wait_icr_idle(void) { } static inline u32 safe_apic_wait_icr_idle(void) { return 0; } static inline void apic_native_eoi(void) { WARN_ON_ONCE(1); } static inline void apic_setup_apic_calls(void) { } +static inline void apic_update_vector(unsigned int cpu, unsigned int vecto= r, bool set) { } =20 #define apic_update_callback(_callback, _fn) do { } while (0) =20 diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c index 155253af3deb..e1f570aed9d2 100644 --- a/arch/x86/kernel/apic/vector.c +++ b/arch/x86/kernel/apic/vector.c @@ -134,13 +134,21 @@ static void apic_update_irq_cfg(struct irq_data *irqd= , unsigned int vector, =20 apicd->hw_irq_cfg.vector =3D vector; apicd->hw_irq_cfg.dest_apicid =3D apic->calc_dest_apicid(cpu); + + apic_update_vector(cpu, vector, true); + irq_data_update_effective_affinity(irqd, cpumask_of(cpu)); - trace_vector_config(irqd->irq, vector, cpu, - apicd->hw_irq_cfg.dest_apicid); + trace_vector_config(irqd->irq, vector, cpu, apicd->hw_irq_cfg.dest_apicid= ); } =20 -static void apic_update_vector(struct irq_data *irqd, unsigned int newvec, - unsigned int newcpu) +static void apic_free_vector(unsigned int cpu, unsigned int vector, bool m= anaged) +{ + apic_update_vector(cpu, vector, false); + irq_matrix_free(vector_matrix, cpu, vector, managed); +} + +static void apic_chipd_update_vector(struct irq_data *irqd, unsigned int n= ewvec, + unsigned int newcpu) { struct apic_chip_data *apicd =3D apic_chip_data(irqd); struct irq_desc *desc =3D irq_data_to_desc(irqd); @@ -174,8 +182,7 @@ static void apic_update_vector(struct irq_data *irqd, u= nsigned int newvec, apicd->prev_cpu =3D apicd->cpu; WARN_ON_ONCE(apicd->cpu =3D=3D newcpu); } else { - irq_matrix_free(vector_matrix, apicd->cpu, apicd->vector, - managed); + apic_free_vector(apicd->cpu, apicd->vector, managed); } =20 setnew: @@ -261,7 +268,7 @@ assign_vector_locked(struct irq_data *irqd, const struc= t cpumask *dest) trace_vector_alloc(irqd->irq, vector, resvd, vector); if (vector < 0) return vector; - apic_update_vector(irqd, vector, cpu); + apic_chipd_update_vector(irqd, vector, cpu); =20 return 0; } @@ -337,7 +344,7 @@ assign_managed_vector(struct irq_data *irqd, const stru= ct cpumask *dest) trace_vector_alloc_managed(irqd->irq, vector, vector); if (vector < 0) return vector; - apic_update_vector(irqd, vector, cpu); + apic_chipd_update_vector(irqd, vector, cpu); =20 return 0; } @@ -357,7 +364,7 @@ static void clear_irq_vector(struct irq_data *irqd) apicd->prev_cpu); =20 per_cpu(vector_irq, apicd->cpu)[vector] =3D VECTOR_SHUTDOWN; - irq_matrix_free(vector_matrix, apicd->cpu, vector, managed); + apic_free_vector(apicd->cpu, vector, managed); apicd->vector =3D 0; =20 /* Clean up move in progress */ @@ -366,7 +373,7 @@ static void clear_irq_vector(struct irq_data *irqd) return; =20 per_cpu(vector_irq, apicd->prev_cpu)[vector] =3D VECTOR_SHUTDOWN; - irq_matrix_free(vector_matrix, apicd->prev_cpu, vector, managed); + apic_free_vector(apicd->prev_cpu, vector, managed); apicd->prev_vector =3D 0; apicd->move_in_progress =3D 0; hlist_del_init(&apicd->clist); @@ -905,7 +912,7 @@ static void free_moved_vector(struct apic_chip_data *ap= icd) * affinity mask comes online. */ trace_vector_free_moved(apicd->irq, cpu, vector, managed); - irq_matrix_free(vector_matrix, cpu, vector, managed); + apic_free_vector(cpu, vector, managed); per_cpu(vector_irq, cpu)[vector] =3D VECTOR_UNUSED; hlist_del_init(&apicd->clist); apicd->prev_vector =3D 0; --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2070.outbound.protection.outlook.com [40.107.223.70]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0624327466B; Tue, 29 Apr 2025 06:13:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907219; cv=fail; b=KcVzkOJDAFq2xcc0EWnCGDW6d5Bh9/fw7FckjXayuGhfvx0Ht/DdkwMjWh1gDLe0AMVlveNyupyDzFvXSNsnJbrhxOTfj/EG/tJAa06lNvFmE1TfGZ0lWp++0y8zztYMjU00hnlSHgfo/tGOw3fP81EVgbeAIDksFC8V9DKFz8Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907219; c=relaxed/simple; bh=srF16KdSj2kgtm8RSI2RVkSeg6DVtXeNWhyTNTDwpc0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=f1VpifXbV6UG+DrzGk3nrqtyVODTA5+1pRGOC2lP1MSn5fcVRHtwHMCO8hNasbGs5GIXlDHdd5FjnSIULVwCuiAobzGzLayQ7XxkaDq7knuHP1PlEgxBiDMk/yjrQItWV1X1d+McUHLPy02LBoifYeamJ9cWX5qP75YO/iL9N/g= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=gOTbLCYx; arc=fail smtp.client-ip=40.107.223.70 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="gOTbLCYx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jKlbj1DDGz1SA9gLfjkVPLZC2eJtqkZ14o1vFVyMpdHTFGStY1BrBU2abtBH/jOy9TmWi3lWOyLDAsTgWOst3e3PcnN2D589WBoBLXjfVxE1yKjLIfXZINUfsaFXal3muqDOjPGToaN6zMulRGtxx20D0QvfxMQYkrIG4l14wjjcLq4f961aqGVvnOsRPQvWE1YxqITVt/jcRwCoKiI/B7tNg6Ft5ieK0isKtRCQcjA00gG1UYM0coPOZ+KL+QXUMm84xBTNTdFjMA61gTWHST3o6kQI9AlpWq9ttHshNrUcOMz/XMVrfwqXD0RFmD0bYi5sm/ENPWX8IYjfJinPWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=T+PWd6AgBw5blmdjkuIzrNdcmRiYNUMa4OdsgJcXMgw=; b=gWLVjF3QKNECbsiDoAhtNI1JmMiy/85C0NIANG6/orANPhlqYynw/ifEbtyOvGaRFSZyp+ANvp2CPSSM1/gYc5vyZyB2CAuRJ5q/9EThm4sdTDZwCZJKd3sdl6bd0PlDrNnqnoDEk6M/0iYOqxr/DtHMWUGKcYpGR+4RMhvf3ziHTfWOJCK0qkjNV12xkuP6LjcxXwfDvqJw9QuMa4sjfnj5bqAgfq0AKtAcCVdNFiXT6JMDrD9yM1Kb5UKRUaPr8TgC1wYdHgaBzhLbjFTa429eROnTRU9TjgWU5377Xn+jHYu6IPnKEWaRcvSaxkJphDZroTigUf+FqKdKhiYNlA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=T+PWd6AgBw5blmdjkuIzrNdcmRiYNUMa4OdsgJcXMgw=; b=gOTbLCYxGF67T1AbRh5F9aKFe4yBVpzyzdtptl+kUwoXea7yOCb+SYdYNLEFRLhQU8Dzs624DNfOoS3ZTDSdIijK7U+FsegnWhhbeaQ++zkLUwKPaOMVvl1cJCFc6b/07NeX7ceyL9o9gFtqcI418fq3WQgOi1B9uBvGggPRp4o= Received: from MN2PR19CA0044.namprd19.prod.outlook.com (2603:10b6:208:19b::21) by SN7PR12MB7347.namprd12.prod.outlook.com (2603:10b6:806:29a::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.30; Tue, 29 Apr 2025 06:13:33 +0000 Received: from BL6PEPF0001AB52.namprd02.prod.outlook.com (2603:10b6:208:19b:cafe::3c) by MN2PR19CA0044.outlook.office365.com (2603:10b6:208:19b::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Tue, 29 Apr 2025 06:13:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB52.mail.protection.outlook.com (10.167.241.4) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:13:33 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:13:19 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 08/20] x86/apic: Add update_vector() callback for Secure AVIC Date: Tue, 29 Apr 2025 11:39:52 +0530 Message-ID: <20250429061004.205839-9-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB52:EE_|SN7PR12MB7347:EE_ X-MS-Office365-Filtering-Correlation-Id: 49fbc694-bbb5-4938-7bb1-08dd86e4f836 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|82310400026|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?F9NTga7PptbAIG+TKed6zgiuwOuldVu/Cmq37vIXsDeQYc/tF9kX6/lQEL5r?= =?us-ascii?Q?N6rBDNwOUmDy3lLALMP5ulqjzPtmf2243f9osQku+NCzV+N2p97akPG+F28A?= =?us-ascii?Q?j5eVW3yoxlGFZsvs3JJB3ZBN057GXOXagMENEPOspPW6i26Y05nD+ezUV7Iw?= =?us-ascii?Q?4FRyw84AKeutlUmCXtRxh5COqMTC4s4i6AHZfmE1lzcs8t6/EZJQ0u27OpCQ?= =?us-ascii?Q?iyk4i2DiKmTbV5q87Ima36+oemvxM5BEYHZ4qiMEwf2S/4j98w59po9ITDdM?= =?us-ascii?Q?7aouNvy1jggofbaOXIsl9pML9gyRYur8l3zdRkRRdih85tKa7OZlTfMxodd/?= =?us-ascii?Q?3jrc+S6wHokkhfFz7fB4nTziaysac86MHjAXa7qEKXI2GIYkN2XECXqYqlXZ?= =?us-ascii?Q?viegYPNUet3w05RmYSBm4TPn40o7tsBr6WVuIvgLfz66G6NvreA0TlSXKMEV?= =?us-ascii?Q?QcKGY5Kmx+3VpYP9wr5ckK1+QCDhKY1LFXylf221Xb3BBQsApOZODI3gUfMp?= =?us-ascii?Q?GEsyLY7QaPnt1vbRr+PdHxrCSa8/dbXv5Q145nKi2Qe7OgO5kUgGDwzhHj4F?= =?us-ascii?Q?H8KSqw8KaEyp4hkQplbI/mufgco+Gp58ciR5gx96VhSGpwRxwwqwM3GzivP+?= =?us-ascii?Q?q4ofeB7rulosRHfqSESx8JTVFi04PoEqdsYptTUaO/DKyV+9wr0ufYtHufHX?= =?us-ascii?Q?NKb0A5rjYb7DOBhVd7enQWpC/jUXQ7ynIlCC8gEi1PNFfPsig73BLJREMlDX?= =?us-ascii?Q?zZ5GMheNnIhSx5v3OMUOzU+aPjbxfPktpusU4iNsbOWQdbqWM4OkpEymqioA?= =?us-ascii?Q?FdmKGiKI9pgtvFFQN3EvVZf9qqUMBK6UBhbN2kH+hBnxarA4VT3bvfTHwwZJ?= =?us-ascii?Q?hMcIxm4WBdGH+B66huhNbpFE8BB0vkPssONlzjS7/t8ixVAlGuWvA4ahxyzv?= =?us-ascii?Q?yNqtf41pOKACxYCLNZjPFQF+h9dfc5qClbLgwwJUZooxla+gSnxf2lgLafNQ?= =?us-ascii?Q?Bmu8uOoTORWGlWmMHZC0zzq3J0LtloNqo7MxZwiMiuKROtx3tVgNgHPJV9pV?= =?us-ascii?Q?HJgz3mMLmHJQ4sO4q+X9vBd2l8O2bH5Ra8fQX3BLF+sBLcq+OQuZ4yHBCy5z?= =?us-ascii?Q?eYh7lyKreEioKpa5BDiaPKYYkYb5hSQXMSWFXVrbtXKkHUFQk9n2uLs+NqHp?= =?us-ascii?Q?k8MyaL4qMIpczn8WjlwHoJmEB1Fetd6DLNsQM6vHharWXkxDmuUi/0LE50sQ?= =?us-ascii?Q?xn6MI5y/7gkQGTb93zkHOgyT4SLgksJit/dasiQdI97roSBliLcjYVqNjCGW?= =?us-ascii?Q?1eJagOQuWmoFL55RZxKLF0W4jiaZR8RshYNzc8unVnTau7yG7o7c37SN9xVN?= =?us-ascii?Q?tj3qxOX/ypHzg++8GWJJ0F4VFA5lm1GHxgxzOgPdzVDGIfSBno4761gaBRbW?= =?us-ascii?Q?Cl7d+0odA+UtZiRBuNnRLMYlE/cUn+IBNDrDyiiDt+tenRSL6gNlCu2PqIUE?= =?us-ascii?Q?36D6UBBEqD619ScueNtg1eOWi69C1ct202jy?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(376014)(82310400026)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:13:33.1021 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 49fbc694-bbb5-4938-7bb1-08dd86e4f836 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB52.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7347 Content-Type: text/plain; charset="utf-8" Add update_vector() callback to set/clear ALLOWED_IRR field in a vCPU's APIC backing page for vectors which are emulated by the hypervisor. The ALLOWED_IRR field indicates the interrupt vectors which the guest allows the hypervisor to inject (typically for emulated devices). Interrupt vectors used exclusively by the guest itself and the vectors which are not emulated by the hypervisor, such as IPI vectors, should not be set by the guest in the ALLOWED_IRR fields. As clearing/setting state of a vector will also be used in subsequent commits for other APIC regs (such as APIC_IRR update for sending IPI), add a common update_vector() in Secure AVIC driver. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Moved Secure AVIC driver update_vector() addition to this patch. - Commit log updates. arch/x86/kernel/apic/x2apic_savic.c | 35 +++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 81d932061b7b..9d2e93656037 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -43,6 +43,34 @@ static __always_inline void set_reg(unsigned int offset,= u32 val) WRITE_ONCE(this_cpu_ptr(apic_page)->regs[offset >> 2], val); } =20 +static inline unsigned long *get_reg_bitmap(unsigned int cpu, unsigned int= offset) +{ + struct apic_page *ap =3D per_cpu_ptr(apic_page, cpu); + + return (unsigned long *) &ap->bytes[offset]; +} + +static inline unsigned int get_vec_bit(unsigned int vector) +{ + /* + * The registers are 32-bit wide and 16-byte aligned. + * Compensate for the resulting bit number spacing. + */ + return vector + 96 * (vector / 32); +} + +static inline void update_vector(unsigned int cpu, unsigned int offset, + unsigned int vector, bool set) +{ + unsigned long *reg =3D get_reg_bitmap(cpu, offset); + unsigned int bit =3D get_vec_bit(vector); + + if (set) + set_bit(bit, reg); + else + clear_bit(bit, reg); +} + #define SAVIC_ALLOWED_IRR 0x204 =20 static u32 savic_read(u32 reg) @@ -144,6 +172,11 @@ static void savic_write(u32 reg, u32 data) } } =20 +static void savic_update_vector(unsigned int cpu, unsigned int vector, boo= l set) +{ + update_vector(cpu, SAVIC_ALLOWED_IRR, vector, set); +} + static void init_apic_page(void) { u32 apic_id; @@ -225,6 +258,8 @@ static struct apic apic_x2apic_savic __ro_after_init = =3D { .eoi =3D native_apic_msr_eoi, .icr_read =3D native_x2apic_icr_read, .icr_write =3D native_x2apic_icr_write, + + .update_vector =3D savic_update_vector, }; =20 apic_driver(apic_x2apic_savic); --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2071.outbound.protection.outlook.com [40.107.92.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 66429274678; Tue, 29 Apr 2025 06:13:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.71 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907242; cv=fail; b=eEpCMIFSgVg9HwvL7eEJeUEmpUfvgqETBPf+tkPYiiDoI+uVlO5or9SI0BbsxmwfztIZIbE+9QI9pSdaA+/7kIEHsYrNYJlfaulVim3qBy1vSrLLWDnwIU+wgjYBIx/oCQABb96eN6Iq3D3LF5S1YU53neL7WQKp5domyKwVK+A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907242; c=relaxed/simple; bh=ywgQEYEB0V3GwpgocRz6rzElCJj4HisNKKPX2hHRFu4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DKLp/c1hE7PDIo4Z81cp9RU7YG9X9pTnhbu8TdnFYzF1S8BQRzKap6AA7Zg/la2BSe9vWDknxjnKWOdlICvY/MK11CzxC9s6Js5XLJcV7D5hN3pvCrSKzL+8sC9VK4JGeRNm7Nyi5qy2MIRM2kZymz59Q5tA/tpeOoAfW9R43RE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=SiaC41+k; arc=fail smtp.client-ip=40.107.92.71 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="SiaC41+k" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=JnFDOX9mVKGEIohzPVjcqf5HntTnejvqdtCCz1WEavnTzHBkTJM1PE1Hfeq1lfQTPTMCQH7sikKQ647gmpk82CGCLfcHSqXeng0xvPRi7PbdadyPupdr1flcsTOtTFHeJf+vF9wkio3+q6djteHEWdxrj3mah5vD/+thQDH7PXQfnjMJZVfij42h9RJb0GhVDaiTQqOpFcNImPMW0gpYDuohevJOHjjzaYuTMP13vGM8mE0JQQ2KIwDW4jka1fPzNO/fPQPNWnHVZD5MkkmtfZ47VG7tme2cqM1X4zn1uuhJ/+3TgckpyRfg9eQ5H+7zMLhcNr9Ae5EfFo8kgjKG+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jFEuTrvrzuRI8l+UZ8gvROO5P7lQrSKSt2kQeAqi3YY=; b=H4FvsiPdTCC2R5yl8Z1A2gRkpJSBvd0h4cLeo9ShDs3JwW6fCcVwR4u+suMVF0J3rRdgym9wWAihfmPqEVbNuwauv0/7YryDN9r9rFZS55gYs/gkk069kg8VenDOwwZxl0uJdE7NEZh3efkRWpoBb+VWqZnyor94Ba3+T+W98A41e2epxlTw8P1OxbbHzVc08/YB0IaFvnALz4UQwDBsbP76Xcw6CmXNu7uVQ5ZwbWsBR7RxrPU+KcEuQkHDSLtGceEf+JPxNdjfDiwUJ/IyH4XrGOI6EGvRR0iY55+CLqnP4S4Fo2vpQEUf8++nq9A1im+d/vVIh+rcojdYDxDJKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jFEuTrvrzuRI8l+UZ8gvROO5P7lQrSKSt2kQeAqi3YY=; b=SiaC41+kYsW8j8r/oIGpZvdzcPt/EYZmDMzFGi4saUSfVwVPs0xt7WDVjXSDpjWrnROUvOMUvCZbiYZGjw2Afv2YQ2ldN52jhFt2cgho+iia22KJf3lc0GY5WyekgUCSO8GSDF88pTGqCbedw2WQqcGJ7GiLNiROi7NWktsYG2k= Received: from BN9PR03CA0086.namprd03.prod.outlook.com (2603:10b6:408:fc::31) by SA1PR12MB7410.namprd12.prod.outlook.com (2603:10b6:806:2b4::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.31; Tue, 29 Apr 2025 06:13:54 +0000 Received: from BL6PEPF0001AB57.namprd02.prod.outlook.com (2603:10b6:408:fc:cafe::52) by BN9PR03CA0086.outlook.office365.com (2603:10b6:408:fc::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Tue, 29 Apr 2025 06:13:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB57.mail.protection.outlook.com (10.167.241.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:13:54 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:13:46 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 09/20] x86/apic: Add support to send IPI for Secure AVIC Date: Tue, 29 Apr 2025 11:39:53 +0530 Message-ID: <20250429061004.205839-10-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB57:EE_|SA1PR12MB7410:EE_ X-MS-Office365-Filtering-Correlation-Id: 399266e3-e989-43b4-dd30-08dd86e504cb X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?O2bHRgq6OlXyfpkFMfFtp5BsVj3v0DqahAj1cO02//i+gRW+EmlAuig4gR/w?= =?us-ascii?Q?HCAuCc8RatTLkKf8S5wMjY5p0R94wjE7k53VNk5X5r9oOt/Gq4+iw98v+Y55?= =?us-ascii?Q?2vHGGpqLVsSroeM+43EhWEkedIsXxT4cA/C9IsGxYHhlWd+xCmniAx+Nn7TE?= =?us-ascii?Q?NKIZYUAMdtg5DI6SGRWnNewEIQTqfg6KMC9Au+i8L4yO7opjOOLJ40XHiIN0?= =?us-ascii?Q?21px+MI4ne73lspvmlkVWiuDjExXaUwmIo42E3wnzp8gUj9bx4swvmLNJEEm?= =?us-ascii?Q?PUf/y3PRH4DA8wR+VcoIUBMbZUwYJs1VqeyBzEBEa4dtorGjJel9GJGIrwzy?= =?us-ascii?Q?6s5Djn4EfiIbEzYmX5WeOuHvANNnXyfNgf26hApfGoTisqwzMrhQlN4pi7+4?= =?us-ascii?Q?p+yExTjrsG2qc771cauu851rIumyhhPTw7aj0R+JSvEtVWxjMP8rBZly6LEJ?= =?us-ascii?Q?aQyq5chxYlUu3uLC9gqKHxpSpHxpy4+nC/P4FdJ+/e1JRFy+yi0WANldwtj2?= =?us-ascii?Q?62Zgu81Sm1KZGtWPAyK+iBOq9YbYMHuItb539Gd0krQOUEBNyVz8TTJ0BezK?= =?us-ascii?Q?jD7fx3gB9HPnQxCT70nPWz8RQDStsR7AVC3bx/snhn7Aexb5vPDDx2sCBEe7?= =?us-ascii?Q?f+A2e18ndq69XWWAnHO56DO79yPGQFZ2ur0bGP0RB2MZHOzNu6qyz4nKBNoE?= =?us-ascii?Q?9WJBQUiW4aEiokFxbAa2lgot6xWRwEH78K/YXNLyI/TaDPSIBM0tTx/cQmqZ?= =?us-ascii?Q?qNV33FnebSEGtqLDrT+pkvAwf3mfLZ3IxvxRHK8uvJ/fl4sF1DFRxKrr4EnB?= =?us-ascii?Q?AB6X9TwDra+0o7EzcBXnOV03aBagDrJKoHyG0UwkifozdBY/frujrm2a0C4y?= =?us-ascii?Q?md2G8uAvlWLuEhnZDV+qyy6Bk3DlgBQ7LOjTMkQbKRxCxjkvzg+w6qlHXnEU?= =?us-ascii?Q?axe+fLXyGYPpMxqpT3bmT3A0pbqFDrMeVCz3rSiNZeCCxVcgMLBIzr2Ls+wj?= =?us-ascii?Q?TrOWuechJKPbM+mx9nVueehpcQSzRQCui9qkXk+WmoULEGYUb6iY2u9RbWZw?= =?us-ascii?Q?Hrxek7MrqAW/HsrKhlQsBBG9tpW8dxAyjjaChgPvZQVSwUhUNdT7/nbw1rDO?= =?us-ascii?Q?QVvQ4pFsB/fkC9siBjEUrf3U4wwTHCF51CMoKaxTXHj/9IsJfZgdqYaSNxB0?= =?us-ascii?Q?MDb22VqBGDNwjIiCc3LKbV0zROehzcN3DoZjN9eOmemTe+Dw3rcOPyWHD66L?= =?us-ascii?Q?GwC8lmCZoIMxGVhV4jUVK7O1vkaoAnJP7hB8+Jnz2ojKF92IJyK3ez+CN7Mw?= =?us-ascii?Q?EG1Ik+1sU2GoBPKEPxIsOaFYktpCGxHZQRJBRqXOFDeCGwISef8sZ/D0S5IV?= =?us-ascii?Q?lgMzmT8Gtf6xNUv2mWYKR8cXINNxx5oV0Srnvo3CvVdvGgPXY+C8Ww4iNvWp?= =?us-ascii?Q?c7qVrKHfTj741HlrQ6WjcRwIF3K3a5c79yvhmXJFne2HhpNaibMrVX2WCY1g?= =?us-ascii?Q?/a30ZEV3m2v1qQ2SzcBv/xo2zLCGnAXCNqbD?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:13:54.2142 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 399266e3-e989-43b4-dd30-08dd86e504cb X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB57.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7410 Content-Type: text/plain; charset="utf-8" With Secure AVIC only Self-IPI is accelerated. To handle all the other IPIs, add new callbacks for sending IPI. These callbacks write to the IRR of the target guest vCPU's APIC backing page and issue GHCB protocol MSR write event for the hypervisor to notify the target vCPU about the new interrupt request. For Secure AVIC GHCB APIC MSR writes, reuse GHCB msr handling code in vc_handle_msr() by exposing a sev-internal sev_es_ghcb_handle_msr(). Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Resolve merge conflicts with new sev-startup.c addition in mainline. - Add a sev-internal sev_es_ghcb_handle_msr() to reuse GHCB msr handling bits for savic GHCB msr writes. arch/x86/boot/startup/sev-startup.c | 11 +-- arch/x86/coco/sev/core.c | 28 ++++++ arch/x86/include/asm/sev-internal.h | 2 + arch/x86/include/asm/sev.h | 2 + arch/x86/kernel/apic/x2apic_savic.c | 135 +++++++++++++++++++++++++++- 5 files changed, 171 insertions(+), 7 deletions(-) diff --git a/arch/x86/boot/startup/sev-startup.c b/arch/x86/boot/startup/se= v-startup.c index f901ce9680e6..af7ba9aab46d 100644 --- a/arch/x86/boot/startup/sev-startup.c +++ b/arch/x86/boot/startup/sev-startup.c @@ -610,14 +610,10 @@ static enum es_result __vc_handle_secure_tsc_msrs(str= uct pt_regs *regs, bool wri return ES_OK; } =20 -static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *= ctxt) +enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt= *ctxt, bool write) { struct pt_regs *regs =3D ctxt->regs; enum es_result ret; - bool write; - - /* Is it a WRMSR? */ - write =3D ctxt->insn.opcode.bytes[1] =3D=3D 0x30; =20 switch (regs->cx) { case MSR_SVSM_CAA: @@ -647,6 +643,11 @@ static enum es_result vc_handle_msr(struct ghcb *ghcb,= struct es_em_ctxt *ctxt) return ret; } =20 +static enum es_result vc_handle_msr(struct ghcb *ghcb, struct es_em_ctxt *= ctxt) +{ + return sev_es_ghcb_handle_msr(ghcb, ctxt, ctxt->insn.opcode.bytes[1] =3D= =3D 0x30); +} + static void __init vc_early_forward_exception(struct es_em_ctxt *ctxt) { int trapnr =3D ctxt->fi.vector; diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index bf03eaa6fd31..545d314f4a83 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1004,6 +1004,34 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd) return 0; } =20 +void savic_ghcb_msr_write(u32 reg, u64 value) +{ + u64 msr =3D APIC_BASE_MSR + (reg >> 4); + struct pt_regs regs =3D { + .cx =3D msr, + .ax =3D lower_32_bits(value), + .dx =3D upper_32_bits(value) + }; + struct es_em_ctxt ctxt =3D { .regs =3D ®s }; + struct ghcb_state state; + enum es_result res; + struct ghcb *ghcb; + + guard(irqsave)(); + + ghcb =3D __sev_get_ghcb(&state); + vc_ghcb_invalidate(ghcb); + + res =3D sev_es_ghcb_handle_msr(ghcb, &ctxt, true); + if (res !=3D ES_OK) { + pr_err("Secure AVIC msr (0x%llx) write returned error (%d)\n", msr, res); + /* MSR writes should never fail. Any failure is fatal error for SNP gues= t */ + snp_abort(); + } + + __sev_put_ghcb(&state); +} + enum es_result savic_register_gpa(u64 gpa) { struct ghcb_state state; diff --git a/arch/x86/include/asm/sev-internal.h b/arch/x86/include/asm/sev= -internal.h index a78f97208a39..7d44b1772704 100644 --- a/arch/x86/include/asm/sev-internal.h +++ b/arch/x86/include/asm/sev-internal.h @@ -100,6 +100,8 @@ static __always_inline void sev_es_wr_ghcb_msr(u64 val) native_wrmsr(MSR_AMD64_SEV_ES_GHCB, low, high); } =20 +enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghcb, struct es_em_ctxt= *ctxt, bool write); + enum es_result sev_es_ghcb_hv_call(struct ghcb *ghcb, struct es_em_ctxt *ctxt, u64 exit_code, u64 exit_info_1, diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 4246fdc31afa..2056e7be41d0 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -521,6 +521,7 @@ int snp_svsm_vtpm_send_command(u8 *buffer); void __init snp_secure_tsc_prepare(void); void __init snp_secure_tsc_init(void); enum es_result savic_register_gpa(u64 gpa); +void savic_ghcb_msr_write(u32 reg, u64 value); =20 static __always_inline void vc_ghcb_invalidate(struct ghcb *ghcb) { @@ -572,6 +573,7 @@ static inline int snp_svsm_vtpm_send_command(u8 *buffer= ) { return -ENODEV; } static inline void __init snp_secure_tsc_prepare(void) { } static inline void __init snp_secure_tsc_init(void) { } static inline enum es_result savic_register_gpa(u64 gpa) { return ES_UNSUP= PORTED; } +static inline void savic_ghcb_msr_write(u32 reg, u64 value) { } =20 #endif /* CONFIG_AMD_MEM_ENCRYPT */ =20 diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 9d2e93656037..9398b34a5184 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -8,6 +8,7 @@ */ =20 #include +#include #include #include =20 @@ -136,6 +137,17 @@ static u32 savic_read(u32 reg) =20 #define SAVIC_NMI_REQ 0x278 =20 +static inline void self_ipi_reg_write(unsigned int vector) +{ + /* + * Secure AVIC hardware accelerates guest's MSR write to SELF_IPI + * register. It updates the IRR in the APIC backing page, evaluates + * the new IRR for interrupt injection and continues with guest + * code execution. + */ + native_apic_msr_write(APIC_SELF_IPI, vector); +} + static void savic_write(u32 reg, u32 data) { switch (reg) { @@ -144,7 +156,6 @@ static void savic_write(u32 reg, u32 data) case APIC_LVT1: case APIC_TMICT: case APIC_TDCR: - case APIC_SELF_IPI: case APIC_TASKPRI: case APIC_EOI: case APIC_SPIV: @@ -160,6 +171,9 @@ static void savic_write(u32 reg, u32 data) case APIC_EILVTn(0) ... APIC_EILVTn(3): set_reg(reg, data); break; + case APIC_SELF_IPI: + self_ipi_reg_write(data); + break; /* ALLOWED_IRR offsets are writable */ case SAVIC_ALLOWED_IRR ... SAVIC_ALLOWED_IRR + 0x70: if (IS_ALIGNED(reg - SAVIC_ALLOWED_IRR, 16)) { @@ -172,6 +186,116 @@ static void savic_write(u32 reg, u32 data) } } =20 +static void send_ipi_dest(unsigned int cpu, unsigned int vector) +{ + update_vector(cpu, APIC_IRR, vector, true); +} + +static void send_ipi_allbut(unsigned int vector) +{ + unsigned int cpu, src_cpu; + + guard(irqsave)(); + + src_cpu =3D raw_smp_processor_id(); + + for_each_cpu(cpu, cpu_online_mask) { + if (cpu =3D=3D src_cpu) + continue; + send_ipi_dest(cpu, vector); + } +} + +static inline void self_ipi(unsigned int vector) +{ + u32 icr_low =3D APIC_SELF_IPI | vector; + + native_x2apic_icr_write(icr_low, 0); +} + +static void savic_icr_write(u32 icr_low, u32 icr_high) +{ + unsigned int dsh, vector; + u64 icr_data; + + dsh =3D icr_low & APIC_DEST_ALLBUT; + vector =3D icr_low & APIC_VECTOR_MASK; + + switch (dsh) { + case APIC_DEST_SELF: + self_ipi(vector); + break; + case APIC_DEST_ALLINC: + self_ipi(vector); + fallthrough; + case APIC_DEST_ALLBUT: + send_ipi_allbut(vector); + break; + default: + send_ipi_dest(icr_high, vector); + break; + } + + icr_data =3D ((u64)icr_high) << 32 | icr_low; + if (dsh !=3D APIC_DEST_SELF) + savic_ghcb_msr_write(APIC_ICR, icr_data); +} + +static void send_ipi(u32 dest, unsigned int vector, unsigned int dsh) +{ + unsigned int icr_low; + + icr_low =3D __prepare_ICR(dsh, vector, APIC_DEST_PHYSICAL); + savic_icr_write(icr_low, dest); +} + +static void savic_send_ipi(int cpu, int vector) +{ + u32 dest =3D per_cpu(x86_cpu_to_apicid, cpu); + + send_ipi(dest, vector, 0); +} + +static void send_ipi_mask(const struct cpumask *mask, unsigned int vector,= bool excl_self) +{ + unsigned int cpu, this_cpu; + + guard(irqsave)(); + + this_cpu =3D raw_smp_processor_id(); + + for_each_cpu(cpu, mask) { + if (excl_self && cpu =3D=3D this_cpu) + continue; + send_ipi(per_cpu(x86_cpu_to_apicid, cpu), vector, 0); + } +} + +static void savic_send_ipi_mask(const struct cpumask *mask, int vector) +{ + send_ipi_mask(mask, vector, false); +} + +static void savic_send_ipi_mask_allbutself(const struct cpumask *mask, int= vector) +{ + send_ipi_mask(mask, vector, true); +} + +static void savic_send_ipi_allbutself(int vector) +{ + send_ipi(0, vector, APIC_DEST_ALLBUT); +} + +static void savic_send_ipi_all(int vector) +{ + send_ipi(0, vector, APIC_DEST_ALLINC); +} + +static void savic_send_ipi_self(int vector) +{ + self_ipi_reg_write(vector); +} + static void savic_update_vector(unsigned int cpu, unsigned int vector, boo= l set) { update_vector(cpu, SAVIC_ALLOWED_IRR, vector, set); @@ -251,13 +375,20 @@ static struct apic apic_x2apic_savic __ro_after_init = =3D { =20 .calc_dest_apicid =3D apic_default_calc_apicid, =20 + .send_IPI =3D savic_send_ipi, + .send_IPI_mask =3D savic_send_ipi_mask, + .send_IPI_mask_allbutself =3D savic_send_ipi_mask_allbutself, + .send_IPI_allbutself =3D savic_send_ipi_allbutself, + .send_IPI_all =3D savic_send_ipi_all, + .send_IPI_self =3D savic_send_ipi_self, + .nmi_to_offline_cpu =3D true, =20 .read =3D savic_read, .write =3D savic_write, .eoi =3D native_apic_msr_eoi, .icr_read =3D native_x2apic_icr_read, - .icr_write =3D native_x2apic_icr_write, + .icr_write =3D savic_icr_write, =20 .update_vector =3D savic_update_vector, }; --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2040.outbound.protection.outlook.com [40.107.94.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1F30127465F; Tue, 29 Apr 2025 06:14:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907270; cv=fail; b=uc9fBy4xI12BDXSeqTdIsUv3RhV9nzvnWmwT25ffg4H3BaUuflb+fkjpHyG7ynW35tMsaVELb1/T81uKpLI8u0llCkNSV9qcuM/eNxIHbd7e8JKAu9YoeVxXn7aWHWIaMTyWMXkiOh4fGrrZmYzINDumjBhO93qWxmGxwMxnk2E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907270; c=relaxed/simple; bh=TIwRMpDHOnudrZILPi/EIXt9M+KBYkSfYbedmGnqaU4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pmEQrST9NRx0gQgcA/bA1tPxScFpm+OrkksbPmOM/uGbiiVkm4KC/9LjAfJMgmEdin9Ekz5A6NXmXf0UysgZn4wLIduh60jtQY5+HlEn5jB5ji3HU/QOHtlb1M/aY6ZYO3pc8hRRjHYkHfkS4w4Dn8hWkJCuxHfsGApD1Dhe1ME= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=p17Z1jCi; arc=fail smtp.client-ip=40.107.94.40 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="p17Z1jCi" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=oTmZ0PZwrr55JRCAL4xjbSyNcGPIBqhVp68JthcLulSKuZ/Tk6h+DDLwC3zwB/buVjm/kPxslPv8+dp+8zjovY906e8VIsXa+dvO5VhRk6O69CSvtP3fDcK0+GBuqg/P4sx55MpxfJncsKR7pGCS1mCGln3+HSvotZ8+MzvBXyO+9EaysHboGjCLMY0pWOt115y00j02KC7bYbnB3GyD1yER6erlzZ503jaL3Lpi8gg+uydMarIZhPeujiAn6ApZFWuiOTAecKGizs159rZroaPE0s1AZjDQ2ykkfDUiK4dMiiTvwiyPnnVmFBmy1uCe00w1qGjN/18vz/GOxmPUFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iH0o+6eyncMjY2WVaLwmKrFPPoVeJy4woEAPpYabzLA=; b=X6TTGCC1qyVJ9Vhi4NuXYCvuExOLaTnAVLpiGm2UIAmxcOOeS8A93XTq0GRjn9kbpemLVRL8QpfAsQYmopZ0oYcgBT2etLJPipcalWC4jYlrYhBw8DZEIcg7Y8V8QA775pSZR4V7D7PuxGtXncUsmqTNF2d5F3i6Sckb28uZhxsxVOzUDA/JCuX53sbU/XCBybY2eCjKUzklhWPe1EUWFkRlGoWgChCuLaPpZLT0b0/qW4Pm+O7+/pRTUAkORAvDybqjP1DuK2rYBg7dOQ01+SAmc8vDTEUGXWX4z54kJTMKaSmlDZuH6f5Awb9J01ihLFykDKyp8RzV3XEdruTatA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iH0o+6eyncMjY2WVaLwmKrFPPoVeJy4woEAPpYabzLA=; b=p17Z1jCia2XdGE/055Fa25+eD3yga2E3tzkDxEmUP8PZscZ3pcff0+ILHOt1FwZG/IXLvv2sk1FzpqDgwWvEnfFmdTdXzNZBCuTcKdcrFgak6M/AjfIq1VuapqdgUS/1R84ARvVmLkuyDb850ep9nW8znPTVB/wUt0hAbiY6KOk= Received: from BLAPR03CA0026.namprd03.prod.outlook.com (2603:10b6:208:32b::31) by DS7PR12MB5813.namprd12.prod.outlook.com (2603:10b6:8:75::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.31; Tue, 29 Apr 2025 06:14:25 +0000 Received: from BL6PEPF0001AB59.namprd02.prod.outlook.com (2603:10b6:208:32b:cafe::82) by BLAPR03CA0026.outlook.office365.com (2603:10b6:208:32b::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:14:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BL6PEPF0001AB59.mail.protection.outlook.com (10.167.241.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:14:25 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:14:13 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 10/20] x86/apic: Support LAPIC timer for Secure AVIC Date: Tue, 29 Apr 2025 11:39:54 +0530 Message-ID: <20250429061004.205839-11-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF0001AB59:EE_|DS7PR12MB5813:EE_ X-MS-Office365-Filtering-Correlation-Id: 5be1d1fa-a84b-4e80-66ea-08dd86e5176b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?vyNnAufa9VXpmP8rIidtmlGlR02vMzlnJ/FlvEvDNQnzBDGChJIX0OgZB+5j?= =?us-ascii?Q?H5cOFp80XJ151x01dzqfE+8NFjpVimMeY56J2/jJ8dB8rlyv82clC/W/OAQZ?= =?us-ascii?Q?DIYN23TMIcZ535uQmxxL0s2/kUQGdOlwD+X/XQMKUZpJ2W9jpap026jXJcmI?= =?us-ascii?Q?8biGpvo/KSLaMizx1GSKKcG5QrK24T+ud4bBC3KVHpACnmeddtcJkXnbtIQl?= =?us-ascii?Q?UINSHQpG7oyI1Nx9yHlfIPY2+e4n5MLbEWgzXGVmfUG7lhi39LnHTwPKJjfS?= =?us-ascii?Q?YydvHoRi/8DhqNT+Xh4OWNXrZXTXlvULiMlpLeC5A/9GLTnQ0QTom570mLbn?= =?us-ascii?Q?kESIgD5yrIeE/KvV7bC9/1ru5O5TOsn/35SAvWxzvbUxslojg7+kZLi4wtNa?= =?us-ascii?Q?+c0elFRxkXET/cyJ2fZfJ2Zt/lfz4PIST/gtidTnHesLE/Ioh63sZ4SiYZd6?= =?us-ascii?Q?K5o4WgNpQCZ/fLOGs6I1AVGytdebIvRCl2lGE0jXiAFt9qQMrwpXAeh1hPCf?= =?us-ascii?Q?7KfDNmhCno0w1HHhf3lDaVRMA1kIRpQKEbM3pmsk+Zz3G0vMrA7vI+PxfPUz?= =?us-ascii?Q?sLKzH1aqflYtF90CPVxJKVcJ+6xC9/oYrtr09jLTf/powcF1lvnW200Uj54V?= =?us-ascii?Q?zOgqZHIp8dP0jhxUK7qG9Soe2PC/z/AL+LSwI3w3+m7mJdEdY/FuG5TZqceE?= =?us-ascii?Q?FC+pnSS6UsCCAVbZyYCe1y2ChrY3ros88aaDK7ZI7ywKJjGTXNoZCg8OkoMq?= =?us-ascii?Q?j//92dQfqcOA20aUAnI9CMlOSTBz1Z+OkPFltdkItyGa9dTshGrShprMqAwI?= =?us-ascii?Q?Y4/aMpV5WkiUN6AOAtFTZIoWUcX77cbivnK8czX5pDLhty+7yyT5s99O30Vr?= =?us-ascii?Q?YdikgEP+7+5R7TKc6DIS9/6M/XNHnELtQ9r0fl2ZYYrAct6egp2fw3SPam01?= =?us-ascii?Q?OW3QNHYzoXUcFE/cqNE41V0CAStx/catZY1S+MTFlC3PedDuMLcJcn64nazj?= =?us-ascii?Q?q1Hy6weemAGwEli0g67ZKtX4sS8fFyf7iiAGHrxzx5ADVekNqdudt7F942sy?= =?us-ascii?Q?MbDxaHZYrnA64YVADpjYEBdETlp/+Ln+nntdmHwl7eRdxBezsX619X/8JH8h?= =?us-ascii?Q?EhZIDn5WUprv8UI7K5moZQUqLIkiZoMKd28S/B0ruMBH+TCbL0nXtwObGhME?= =?us-ascii?Q?mKsrDz2h2W5pC5pjiXilwRQDbw9a2hmBvqpG3XPuJRxb0qjZJYaTnO60gWSi?= =?us-ascii?Q?cLvc+OLpp9DRHrspJyyJt+dhMIets1jQ7A8njxxaq4pUHlivmiQ4bh491+wK?= =?us-ascii?Q?CXzzYO8ASidk9M3ZaPiU9aKtwCUv7S2N+w1J7d0E3CO1Cv1eNoZjeIcPMusY?= =?us-ascii?Q?ZnR229z1rxPVLABaeTCKdC4s2+zGDwI0l3l4m84a+7qrYdUkDBhMzkw4/AF0?= =?us-ascii?Q?7q/Ci3TnzmTiFJyob7qRvFuNDelPt0Hxi1Tey3WecQEB333pFsHCG3DKK6Tw?= =?us-ascii?Q?jeKYZ1JyPxwbwwHRfY4ytZMR/B3lZ39bkB/C?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:14:25.4561 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5be1d1fa-a84b-4e80-66ea-08dd86e5176b X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF0001AB59.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5813 Content-Type: text/plain; charset="utf-8" Secure AVIC requires LAPIC timer to be emulated by the hypervisor. KVM already supports emulating LAPIC timer using hrtimers. In order to emulate LAPIC timer, APIC_LVTT, APIC_TMICT and APIC_TDCR register values need to be propagated to the hypervisor for arming the timer. APIC_TMCCT register value has to be read from the hypervisor, which is required for calibrating the APIC timer. So, read/write all APIC timer registers from/to the hypervisor. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Resolve merge conflicts due to addition of new sev-startup.c arch/x86/coco/sev/core.c | 26 ++++++++++++++++++++++++++ arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/apic/apic.c | 2 ++ arch/x86/kernel/apic/x2apic_savic.c | 7 +++++-- 4 files changed, 35 insertions(+), 2 deletions(-) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 545d314f4a83..d62075379a33 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1004,6 +1004,32 @@ int __init sev_es_efi_map_ghcbs(pgd_t *pgd) return 0; } =20 +u64 savic_ghcb_msr_read(u32 reg) +{ + u64 msr =3D APIC_BASE_MSR + (reg >> 4); + struct pt_regs regs =3D { .cx =3D msr }; + struct es_em_ctxt ctxt =3D { .regs =3D ®s }; + struct ghcb_state state; + enum es_result res; + struct ghcb *ghcb; + + guard(irqsave)(); + + ghcb =3D __sev_get_ghcb(&state); + vc_ghcb_invalidate(ghcb); + + res =3D sev_es_ghcb_handle_msr(ghcb, &ctxt, false); + if (res !=3D ES_OK) { + pr_err("Secure AVIC msr (0x%llx) read returned error (%d)\n", msr, res); + /* MSR read failures are treated as fatal errors */ + snp_abort(); + } + + __sev_put_ghcb(&state); + + return regs.ax | regs.dx << 32; +} + void savic_ghcb_msr_write(u32 reg, u64 value) { u64 msr =3D APIC_BASE_MSR + (reg >> 4); diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 2056e7be41d0..fab71d311135 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -521,6 +521,7 @@ int snp_svsm_vtpm_send_command(u8 *buffer); void __init snp_secure_tsc_prepare(void); void __init snp_secure_tsc_init(void); enum es_result savic_register_gpa(u64 gpa); +u64 savic_ghcb_msr_read(u32 reg); void savic_ghcb_msr_write(u32 reg, u64 value); =20 static __always_inline void vc_ghcb_invalidate(struct ghcb *ghcb) @@ -574,6 +575,7 @@ static inline void __init snp_secure_tsc_prepare(void) = { } static inline void __init snp_secure_tsc_init(void) { } static inline enum es_result savic_register_gpa(u64 gpa) { return ES_UNSUP= PORTED; } static inline void savic_ghcb_msr_write(u32 reg, u64 value) { } +static inline u64 savic_ghcb_msr_read(u32 reg) { return 0; } =20 #endif /* CONFIG_AMD_MEM_ENCRYPT */ =20 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 16e88449dc62..88e4bddff5ba 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -591,6 +591,8 @@ static void setup_APIC_timer(void) 0xF, ~0UL); } else clockevents_register_device(levt); + + apic_update_vector(smp_processor_id(), LOCAL_TIMER_VECTOR, true); } =20 /* diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 9398b34a5184..0935a1da6d72 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -92,6 +92,7 @@ static u32 savic_read(u32 reg) case APIC_TMICT: case APIC_TMCCT: case APIC_TDCR: + return savic_ghcb_msr_read(reg); case APIC_ID: case APIC_LVR: case APIC_TASKPRI: @@ -152,10 +153,12 @@ static void savic_write(u32 reg, u32 data) { switch (reg) { case APIC_LVTT: - case APIC_LVT0: - case APIC_LVT1: case APIC_TMICT: case APIC_TDCR: + savic_ghcb_msr_write(reg, data); + break; + case APIC_LVT0: + case APIC_LVT1: case APIC_TASKPRI: case APIC_EOI: case APIC_SPIV: --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2051.outbound.protection.outlook.com [40.107.237.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DF2BC26C3B5; Tue, 29 Apr 2025 06:14:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907291; cv=fail; b=kye54BUo3XunNK6shvp4862BnTaWjZvrDgy3urEVrtuaqytNAGRWvZRMValYpSPswEs0Wxiyrra3Lh88DQz6sg9eMrqoFQbmpaoEgiXNaVP/16JIz4vCNSVUQUcXihNLa6QLqeoTITGDEeSle4+RSL6NHmG9Pe01JV5/qupAZWE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907291; c=relaxed/simple; bh=LHFkdVZVrXopoUPAjVYWnZvZKlaHYUt+1A0NoaGVo30=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=SrPn15gQ5pK4SUxIUbcf6g7lIswb5znaHFTnYlxac2+5w1aKfmz2twNDv7vCd+uoCv1RArkYZdBxk4q1xsURzg5EFpajs1W1F0oWl5o8xznF5wO7x3USpww98euUBSYYxpcY4ARlI+ZpGlKECcf6bodlqyWhH+n/6cX2kdn5DXY= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=h8a6FaiP; arc=fail smtp.client-ip=40.107.237.51 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="h8a6FaiP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qvGmkge9chKed+NIfmvfwbxBnD6PxwxPt1DxeEvcJtPBbklog5TJbS3ZGIUjATLzGjccuKVBmho8b4XOnVGFZYwigTLhzC+PZeIC0bzqpHJMlR5ybffNoHyRNP5OfWCoEBeH2O6e0S6+T/0q/YpvsQG9fAQLsrBQWZbQnigWcT8iqgh4OUMJ3VF6k3SVjkiTplTmvC4L+Uv+XDSWw91jqj46rls4XepphuLJHlOLTx7RfECkIdxqbWIDANFbs6jr1Pkz8ivQuAAOP2XgAKmFJUT72Hpf+Y3EC19Pb27WjK0uNMFYnYpsONKU7PO7qPv0yLmEAwSY6C1XsYRzlaRCVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=gzfFYZvP1PlDChO0iz/QckYWiu6we29wxbg47MZ5XE8=; b=FPUQNMZH/1n8xoh5i5x/7Pk3mdLAJmzJaKnJTWciVteUElAYxryk/7rJ/S1bvfk2ZphLDawieaWYjTbkJaVhJK+Q8HguRMj0CWRDeaW6g74F6kG4xGemExcLh+M7uYsO+1x7zr2zSw4Ei0/b5XRkP1ywO8p7hCAPOoS2r7jIv3KWjJEwiPe58Fo1hEnhWXxF9m5czD7HP7izvrR+dQbmZaICY1sGxkxY014CjtLWkh7calVwtqoozL6FfODCLM42scuV+CbN2LvUoQjAJdV9gE+N/kUzED5hVudgC9xfGVHfE7mB2757yIbSyv5xjo5BmG0eDFqLHC0Rc8rVF4P+gQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gzfFYZvP1PlDChO0iz/QckYWiu6we29wxbg47MZ5XE8=; b=h8a6FaiPLsz9jOyse/K/IKLN3rNGv5OKUvIkYhDcY31ybsiWDc233mkcvzVx3E0nqhZyGUqJf4TWnPRNjSXp+AXu7bEczyAb7d6OJvWSh+X7V3gDPUDXCKX4jZBW8bEFJDSCYlJTTRx5DpzHzV7P1SKUr9Rl6ZdPAhJSUFF2gqg= Received: from DM6PR03CA0028.namprd03.prod.outlook.com (2603:10b6:5:40::41) by CYXPR12MB9441.namprd12.prod.outlook.com (2603:10b6:930:dc::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.29; Tue, 29 Apr 2025 06:14:46 +0000 Received: from DS2PEPF00003439.namprd02.prod.outlook.com (2603:10b6:5:40:cafe::c5) by DM6PR03CA0028.outlook.office365.com (2603:10b6:5:40::41) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:14:46 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF00003439.mail.protection.outlook.com (10.167.18.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8699.20 via Frontend Transport; Tue, 29 Apr 2025 06:14:46 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:14:38 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 11/20] x86/sev: Initialize VGIF for secondary VCPUs for Secure AVIC Date: Tue, 29 Apr 2025 11:39:55 +0530 Message-ID: <20250429061004.205839-12-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF00003439:EE_|CYXPR12MB9441:EE_ X-MS-Office365-Filtering-Correlation-Id: ba74c013-00dd-4ecd-0207-08dd86e523e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|7416014|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AeZcgkkAsSGKUPYJsI8/y4Db/rYQpkGRlLP0GUbOqzpB/XQAjgkbloeMYwFQ?= =?us-ascii?Q?qz72R+TDx6WaqtRY88kg+v7dp+Y7eaaTXnsA0Yp9Ka5RvAIqLkqkjHSyiZcp?= =?us-ascii?Q?wy2k2TlkC9rNrq9vFARmfn6jBqXxpuAg1kbuLf2DdjP/hHxgjxm/IRjH1G8t?= =?us-ascii?Q?WrntEJcfqoIDUPes2ywej2wt0hS8PZi/PnxqmQxaYajQjhEGrE/XPXqIJK/3?= =?us-ascii?Q?q0tHNkXKHwwCgP9ZfDOrXbQX24Jk/JTVxbFCBVuP0SgUlxql5bctMYNGWAE/?= =?us-ascii?Q?J3WInUod/j2NLEcSNm41+32Gijbpuz+3qdpxd1zB76fJO7LSouEUlWvvgneo?= =?us-ascii?Q?Xua7znHOmtrOw35X2YQ3fWoDwEThgqqk4zWhMffkDxZP8wiu0JqzQ8uoaoQL?= =?us-ascii?Q?i3+nIb3OifeotoTSBxXG6vGOpuwfE9NUc9S0UnA3p1jFG54ck93szjvuo4JI?= =?us-ascii?Q?BP34T8ahI0Ui0VdPxg1m99yvP2v9gnBjqpfsn949jS4Tu/HvgElgKkU5QJWa?= =?us-ascii?Q?jaoTTZ7V73igf+CGMdMG4YT7WfnyIv8xVjGMe+bh2uNqH/p/e7J94sHXOOUt?= =?us-ascii?Q?AG4hVEl/JwAIOmhQOlkiSZLnPHo+fftWuPvvDRKab5LYh+hKCnb8Igswxmpk?= =?us-ascii?Q?9UDYX4FoK2XDlgtFY5RS+VMbqIgiqP4CDDs0UPPBRJGInT5PaUmWKp6XkINN?= =?us-ascii?Q?00P1YX3W5ownvee0+GB1qCXT3dzaZL+zVYe8uovvNTboUF0tzQByiGEBY3Jo?= =?us-ascii?Q?cjCg8sax7QZ/s4Yf3FIJ7+5ikQ2Pz13OIzj3F1kNy5DFG+EN96wJ36sdRPzJ?= =?us-ascii?Q?5HcuMSLVM43mvGHuuGJpMtqZkA6Ik/GHTtZ5wTb851RAVsEeu4OlwB4xywhL?= =?us-ascii?Q?Yq0w8Az4dGhxjh9t1oPfEBd+o/0JKkfxJHfyo1s+ob5mUSbuZtFPqqErX/Z0?= =?us-ascii?Q?pUPLrk85Y1iSZkyZ5iq4AQlLmIuJZlln1VzW+GHKiReyfqbf9xSPbqDRO8cg?= =?us-ascii?Q?E3pEMLk30mK3FSpUH1g/rPErN0FWOW43HrKRF0FBTOTUgJTIhUAuzCxn8zxZ?= =?us-ascii?Q?U48LYKtD2hUtQuVcUPoqZohEUw3nJu/x945/peEOnH8RjYLkUveqnFzmbCTF?= =?us-ascii?Q?KE49FVkQeEhMUMzXV+rJB5VkIBfT4/BXrjmQdbq2eeEzAIqSfCJu9s8ZraXI?= =?us-ascii?Q?0Q8nx93vUiwGskruWeI176gnv2WWHrY22+CzYYHmPbBqio8fFPV/25lrgubs?= =?us-ascii?Q?NTNpqFjGik0ovmY++Wl4wVj55DotiPbwwNh98wMJ89BocgDPhfHGShIvEA+R?= =?us-ascii?Q?x04gt7+lI8IphXvIiJaajCcOcu8ujslLGaRPqlxZ9sNchhy8vvsfZQTWUnJO?= =?us-ascii?Q?NPv42Xst4UwelTeOHK9zyuPI0TOxtuIy0kISPEUMs7LjsP3me7naEXlkjTdF?= =?us-ascii?Q?Qeq36Jd2sHqFcDzNKu7p7xwlp5DNC5IwIZOQ94KKlfoey9Ffggo4TR/Xjm/c?= =?us-ascii?Q?KxYNbzHi03PCgfs3IT/LfP1TELgIUYDnU1Ml?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(82310400026)(36860700013)(7416014)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:14:46.3592 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ba74c013-00dd-4ecd-0207-08dd86e523e6 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF00003439.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9441 Content-Type: text/plain; charset="utf-8" From: Kishon Vijay Abraham I Secure AVIC requires VGIF to be configured in VMSA. Configure for secondary vCPUs (the configuration for boot CPU is done by the hypervisor). Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/coco/sev/core.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index d62075379a33..1c6028f2ff3c 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -857,6 +857,9 @@ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned= long start_ip) vmsa->x87_ftw =3D AP_INIT_X87_FTW_DEFAULT; vmsa->x87_fcw =3D AP_INIT_X87_FCW_DEFAULT; =20 + if (cc_platform_has(CC_ATTR_SNP_SECURE_AVIC)) + vmsa->vintr_ctrl |=3D V_GIF_MASK; + /* SVME must be set. */ vmsa->efer =3D EFER_SVME; =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2068.outbound.protection.outlook.com [40.107.94.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 571C125D548; Tue, 29 Apr 2025 06:15:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907318; cv=fail; b=MaW8n6CPTNbvQKS+GjSb6aUxavILoKY95THhBFvVnn86ljorNaSoZCij1xWGsYF3peXHjnGQ1ZX6s679RysiO98G0GI84FPgxaxiIh9zdmhIuuXbXLKqur5dK7dvtZ/5ge1+0W9mefQtldMwXv/29WaldGo1u4OusserenMdvxc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907318; c=relaxed/simple; bh=unqtASnZA8/13YGLRDqYigMYNVDsmeCNQBw0O/fW7WI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Ej182cHRSlHuQaKyPHyJV1FMw7ZLv3i/O71w/PuZound5Kv5HWuwOWbVepg8+TPPzkSYAYUmSNb2X4YViGan+KXXMqhtZ3VZr26DK2JxiEtTguLq7TvfRkXN8TvubyYaCbL3bJU3sQr0mAtQBoL8E3wz615Hczncph/TsQAZUNc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=dXxIemZO; arc=fail smtp.client-ip=40.107.94.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="dXxIemZO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FG1UMNtsc2OgqdvS6ElsXKoxpaFk9niIIT5I3jU1iipe2CHsDcxXV70D1ZXPUuq+1ANz56Kypd2M1rGEh7xAGZZUGAZm/Asb4QwzVhqQ3APg35zW3b71ZgMTw51aFfsR0ZW5E32Cj08JWLQux8sxV7L9k0EXAlzFQrS7fbTIIp1LSoSgvNqQIQ6tc2eja1DAIT/HXtm83OxcMYZ2iYrdIf2pFARExdNEJht4ZTwui7OfLNFID/mKQ6xAfKAG5pOkz1lL63Uz/fZTS2oMcVIi1x/TIJtGYS9gDPTMng1nrO5lJQd//147vu547iyzKZF/JaIAzbV5qasnox8jVYHKFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jZtLnEg4thBb8VH0CE8x5/LSOvpxTNfakOFkg24DTIQ=; b=fCh+vPrskZLpAUmI4gObQgJKpixKZxOvE7/8Uu/D2flxA713UU/EZkv4fagEQAUVohGJKvMsRwK7i1zCbXuMNohquIhFKAIaTz28rP0i8gcsE51+PhxetDSIT9FC8ZUbHNVrhxhgeWTORGYU/Fwgy6MHHfKoGRf+yZwjbIN82mGdcUsHAVnHlZ0NxGngv1VFAZfO4LvK4z+9SwWJPTvc99PLNhIOuUdyBwNV2Th9YrnUwyhG9TBQj9esqUawem3cfcYKkdYrFHou7Ovm04lyr/QutSeEIh9Bobehl6RrImgm3o/YSJa0Vo4EN750rtEQnpQVhk4atBz7Ai0D/r4oHw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jZtLnEg4thBb8VH0CE8x5/LSOvpxTNfakOFkg24DTIQ=; b=dXxIemZOlZMTUE4Jk4M2Echs5irMeBEI8JcoOLoXyvBQ5RIl1ywCrbfYjpQ2xawFZG5LFTZSFv1omauSY3OuHZSvKZksrxD601ePSA7No7Cy+RbM+/HWCaLIEvYPueirG6Zi3Ox7syEsCTgXW1SRDZCwglwED8wJVMN0+aho/po= Received: from DS0PR17CA0013.namprd17.prod.outlook.com (2603:10b6:8:191::11) by PH8PR12MB7373.namprd12.prod.outlook.com (2603:10b6:510:217::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.31; Tue, 29 Apr 2025 06:15:12 +0000 Received: from DS2PEPF0000343E.namprd02.prod.outlook.com (2603:10b6:8:191:cafe::f6) by DS0PR17CA0013.outlook.office365.com (2603:10b6:8:191::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.41 via Frontend Transport; Tue, 29 Apr 2025 06:15:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343E.mail.protection.outlook.com (10.167.18.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:15:12 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:15:04 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 12/20] x86/apic: Add support to send NMI IPI for Secure AVIC Date: Tue, 29 Apr 2025 11:39:56 +0530 Message-ID: <20250429061004.205839-13-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343E:EE_|PH8PR12MB7373:EE_ X-MS-Office365-Filtering-Correlation-Id: c0239908-a5d9-4475-9a77-08dd86e53335 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|36860700013|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TxA/tlW3EH+2VO8VWdKjyVBux5ciznOocQjUlE8Vw5dmiS+0fQqympDhLfAj?= =?us-ascii?Q?NYih8tyGafOoRYHMVCvcC85hq5vW/j5DQFy//MuK/OzHIavN6xzb3A4qD5Kw?= =?us-ascii?Q?lZxIrLZoHq1UWjDb2DUQNiG6MUP5PNmPumO6ATXRO6A884ibQQlNDmaRpiXd?= =?us-ascii?Q?UOqakmCsCjaflH7LaKG+NnVUudDaquc+FNmTc+jYpLNvS7yYtrqfZHgJb8n8?= =?us-ascii?Q?CaIPULeJW5VZYeoYx8qTx3q9uTpdt2AlW+1GdqnxM1zqVbv11hFewtTNat9f?= =?us-ascii?Q?nACF7ki0SHAj6T7GyOFuHVZ4MWwIKUVaaGgrg47p9yAu3TgZzOLe7m0eKJDi?= =?us-ascii?Q?8gM7bw4kTyRxBStBJzZQ1ogPVKusHF7VIjpXrbq8B7TRtJH/jPRKxFSI2Yb3?= =?us-ascii?Q?QLUfsep8nSxCfrZ3BnGVSW/S7ecNbHrh6GINqG/u5SEL2naosBqnnoDGw0cZ?= =?us-ascii?Q?8wJrB3s+kIquHeEWSOtbLKlcfPE5P1wV28neTxLjQv+rBbBa7ll0c49yeMGH?= =?us-ascii?Q?jI0r6zXdRGxg5iFyiqJVH85OrpHl5/GykVZYummurA+VcatengMdZheIhntm?= =?us-ascii?Q?N3mHCm+tahImw9Haj2aUTCiZOl3jyvuvQhi6fTHyZhb53TbjrU9GCIJbF5vx?= =?us-ascii?Q?Clx6g5rCGww6F/sBlM9cBUF7ax9kjMSFiIRae51CD/ubSVxddTl4bTXPoNqi?= =?us-ascii?Q?e0Fp/X59e8KC1sbB6FS17FbQq/t2T97dQi9+sflgUkuX4ysZcKUAAEhamRhj?= =?us-ascii?Q?KMfC6a4icAEOhyadBy38CDaAV5+PbeC1DkfWmSYEJByA0MdANp7oae2kGpgQ?= =?us-ascii?Q?sUQ8ZGeTseibU+Ta/YnVnHHSSi+DmMrDUw6Btf5wY14w84OlJbHyi902mdeJ?= =?us-ascii?Q?+qRyBsgv+4+0hf3HvlnL8u43rPFllvEMnjqns2vUVLcaWQIPdDd/BsiXwF0A?= =?us-ascii?Q?HbHK3I2nhm2wRLm2tbQuSyYeOFH+NLxaDHivKBaLF11ulNiNr6tl1SYz54CY?= =?us-ascii?Q?CViAmi0eFAUon7NrsI6J/cff8tVUQvYIlNgR9aG4zER0JaBAr89OeQnQT1cf?= =?us-ascii?Q?X8oHogvV7xVLoPIyvfaKH5lLjLjQP2MBNszW6p/j76NqGT14+aUEdJIOcTCN?= =?us-ascii?Q?odkgt+iwfmkWbz16/YEskKQx+dtv0hjSTiJ1AtqJkwCyWKg9sfK1sUKOw4L0?= =?us-ascii?Q?BXRA2viVVhoXadjSWO3qBv35YAT2khLaSQeCSjz5rhLLmQuVlVsYhYI09GTk?= =?us-ascii?Q?quZ7Ew0Vg0GPtt61t/FRbtduRRl19OgtXeEjdutO7KOBfG/jA5dJeDa2RBpN?= =?us-ascii?Q?uS/+f7XwX010nle0FU0jVwPWllRR7xGR5QydBhoiMRsnpb+y4ZMtDNiYNAFX?= =?us-ascii?Q?qk8NNipZNzCP/K1rIyHXWl2XKwZTeYXPtx1wldkkSkikMtZXmCJorzEUADCx?= =?us-ascii?Q?CMNigs4bDHKazT/MKdkLX3IEm1MVumGvMDLPWF5RovQ5r36hnIHSBJZoazBb?= =?us-ascii?Q?9F5fnmQFBqFbttKM1mYhoFYT97y26/tje0oA?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(36860700013)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:15:12.0479 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c0239908-a5d9-4475-9a77-08dd86e53335 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7373 Content-Type: text/plain; charset="utf-8" Secure AVIC has introduced a new field in the APIC backing page "NmiReq" that has to be set by the guest to request a NMI IPI through APIC_ICR write. Add support to set NmiReq appropriately to send NMI IPI. Sending NMI IPI also requires Virtual NMI feature to be enabled in VINTRL_CTRL field in the VMSA. However, this would be added by a later commit after adding support for injecting NMI from the hypervisor. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Commit log update. arch/x86/kernel/apic/x2apic_savic.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 0935a1da6d72..97abea90eed6 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -189,12 +189,19 @@ static void savic_write(u32 reg, u32 data) } } =20 -static void send_ipi_dest(unsigned int cpu, unsigned int vector) +static void send_ipi_dest(unsigned int cpu, unsigned int vector, bool nmi) { + if (nmi) { + struct apic_page *ap =3D per_cpu_ptr(apic_page, cpu); + + WRITE_ONCE(ap->regs[SAVIC_NMI_REQ >> 2], 1); + return; + } + update_vector(cpu, APIC_IRR, vector, true); } =20 -static void send_ipi_allbut(unsigned int vector) +static void send_ipi_allbut(unsigned int vector, bool nmi) { unsigned int cpu, src_cpu; =20 @@ -205,14 +212,17 @@ static void send_ipi_allbut(unsigned int vector) for_each_cpu(cpu, cpu_online_mask) { if (cpu =3D=3D src_cpu) continue; - send_ipi_dest(cpu, vector); + send_ipi_dest(cpu, vector, nmi); } } =20 -static inline void self_ipi(unsigned int vector) +static inline void self_ipi(unsigned int vector, bool nmi) { u32 icr_low =3D APIC_SELF_IPI | vector; =20 + if (nmi) + icr_low |=3D APIC_DM_NMI; + native_x2apic_icr_write(icr_low, 0); } =20 @@ -220,22 +230,24 @@ static void savic_icr_write(u32 icr_low, u32 icr_high) { unsigned int dsh, vector; u64 icr_data; + bool nmi; =20 dsh =3D icr_low & APIC_DEST_ALLBUT; vector =3D icr_low & APIC_VECTOR_MASK; + nmi =3D ((icr_low & APIC_DM_FIXED_MASK) =3D=3D APIC_DM_NMI); =20 switch (dsh) { case APIC_DEST_SELF: - self_ipi(vector); + self_ipi(vector, nmi); break; case APIC_DEST_ALLINC: - self_ipi(vector); + self_ipi(vector, nmi); fallthrough; case APIC_DEST_ALLBUT: - send_ipi_allbut(vector); + send_ipi_allbut(vector, nmi); break; default: - send_ipi_dest(icr_high, vector); + send_ipi_dest(icr_high, vector, nmi); break; } =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2072.outbound.protection.outlook.com [40.107.236.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D724227057C; Tue, 29 Apr 2025 06:15:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907347; cv=fail; b=tN34ZvjQ5CIJy0C/aBoJFpsznEuBaaavgl9xnyXB2eXMcDfiwkQ/MuXfYoFUIl0XXbX68JituK08TrJj0QrRTqeVynuJugB310I78Db96g3XHU1Tx+mXlLLr4mO7dPeVEE6BR/Ov78V4cFbQHilimOeNO6gmyl54aY63MzrGp3E= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907347; c=relaxed/simple; bh=0UOiL9UqgPmSKRUghChpP8cqKFvlvjYYVby+Fus4rjY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=mgH94kReNgcMpd+/kj2aHvIROG4n+g9Enjj0jtoqtM3enZH2ZXKITTzdSrj1k7YtjJrFzV2pYOJrsdU6cTWelQxC/VgUK9uOscXfbVWM1oeczkhQCj9IUFx+LGIgDvqe4fOhlQQm/EUheVbQ/08ZEyq3NTstc9yB1015S8VoAJc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=NPj9rj5k; arc=fail smtp.client-ip=40.107.236.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="NPj9rj5k" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=SNynLog6sHssDoiLvBgbGW3GGx5c9MMwLNlNb5uyH7YPDE/0FFGr3tTM8TVOeTbKIJ5igTZjmnwWES/GH3MT6ELwkZg9PUv1fvH8TkKZImtIutVytlqMeB0Ye7sM3O8MBLOndUhzMmMoAWGSaTqe+NqxkP1rZYkqk3vCt3N6m/+bx/wMZLaZT+S5WiiIFT1xFhBUf7o8bRypPvnUQcVVdiU35+lIBfCf6neUew97rsjkztxSiUeGkGvnvhaqsD8HcudZgYon9hOvb2kdOKCjMh+NqexsJmkaRq14tu2turBstplyu9a4NYOPZ8W448XFDnu2FFhXqsoGhwLix2S/Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Cg7fliYLKsG3PSHRY34jUkTpXHqL37Cq8/x/NmILQoQ=; b=EfFNOCG9qtIbWpg7Elf4ufDZFI4c1T2IoMSQAllHSPiIOL7UcGdSmZcG/oeAXjjXrwCnZUCIXqQKkPBuKmlhTwPj3NdLfthozdgffZ+pw7EeLsYVAHFQ6QnYcd0qqL6bE8Y+ul78l2aaNpw8n07gtmOzYzlgu6uPTjjJ5/6Et0zdofDsTfHWTO6G3O5cB4M4/sBGmRvFIGh0H0f421QVqZZhC4bkooQUHTz54O9lbwGlHS6uRAwq9IAl2eM8hpn5bdd1ZXXPB6fsBq8JiqdGlYTh4OTatDjDKo1xYuRqsHWOndyXa7Zzp8oHBCGlCVRtV8ewdfXUk+/T53B4bMQ/7g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Cg7fliYLKsG3PSHRY34jUkTpXHqL37Cq8/x/NmILQoQ=; b=NPj9rj5kLmJtjkAIC8Y52RWNmi8wsyA1kCI71JMjncO6JlovcqoeXgDkihvutDP1PDOoQ8Ybg+Ht8dIY/qf6ZsEkucla9n2JBuRY78z2w5Us4boML9Z7Lmqb/IVwMohVCiZJ5FMDjrcVZWxDuIqJsMUd0PE3a8zzDJsmVCX1PQU= Received: from DM6PR07CA0110.namprd07.prod.outlook.com (2603:10b6:5:330::26) by DM4PR12MB8572.namprd12.prod.outlook.com (2603:10b6:8:17d::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.21; Tue, 29 Apr 2025 06:15:40 +0000 Received: from DS2PEPF0000343A.namprd02.prod.outlook.com (2603:10b6:5:330:cafe::a2) by DM6PR07CA0110.outlook.office365.com (2603:10b6:5:330::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Tue, 29 Apr 2025 06:15:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343A.mail.protection.outlook.com (10.167.18.37) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:15:40 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:15:28 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 13/20] x86/apic: Allow NMI to be injected from hypervisor for Secure AVIC Date: Tue, 29 Apr 2025 11:39:57 +0530 Message-ID: <20250429061004.205839-14-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343A:EE_|DM4PR12MB8572:EE_ X-MS-Office365-Filtering-Correlation-Id: 9911e161-e67f-420d-45bc-08dd86e5442d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|82310400026|36860700013|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?dTVQAt8X/MIOHzIh/TBUkl4EAo9tvZl6C6tey7w4h6tL7jMS6jOOWZza1HnZ?= =?us-ascii?Q?uKT0mh8qlmLZd7rr9MQ2X7n+V0XWtsA3Hp0J/yNK1mKRpE+Jk4vfDouMF46V?= =?us-ascii?Q?8Mlxwg9kB1YP0Ubswt+69xloWKkWaz3UXyG5hhlVhFpzSJwQsZRX5XG6kIYE?= =?us-ascii?Q?Io9BjPDm21nDWNvfXhdpKC+gEnDSC7HyPi0SEVwT3ditnDuiOHOfd7uBi5hq?= =?us-ascii?Q?qhHLrydxu7WbMU7OoMwBL5Nnw1OsvtcMiMVlyQ/RRhSA8QWoeloXqJ88zAqp?= =?us-ascii?Q?PNAlOBHn7hXESM8vBUxQ/XsTSMbz9X8Rf/VajCJRcYRkWgOKiERKkMZYcyit?= =?us-ascii?Q?oQIaXTZFx6gvX/kp6I6nQGX4vxUs4PQPeXEvna6g7cGo3YNQEtGqvyQ2eovz?= =?us-ascii?Q?iUcPqLYgmjl19KbdpEbxlpmY23svGfojKIGRIpkj4oAOYrQ4/Ox0j9viup+5?= =?us-ascii?Q?F20IZ2XlPzAE4dAqmxKnOof9w3E/BPiFYQ4y2B4yVDGapy7S/zsLnPBwn70R?= =?us-ascii?Q?KlvoZzOHvU1oJWKmgwxdQVNYp7RLrgivRtobNW+Yrs3irm3QZH1zIkw9p1wd?= =?us-ascii?Q?vCwUz56VXXHHPVjjDhYU8AN7oEuZmWWkh5R8824GvpypzKpu8D5QNVcQOUgf?= =?us-ascii?Q?KPRsqIyIB+PdxuGeMPigAzPMQhIl4BbU1Mo91onssEp8hYxSnvAAChLnsi2m?= =?us-ascii?Q?tpaVUV84elO0Ch7Io7MRVtRtXFJd4CFzNFgsJ6fayirxPg7zztk4p0Aqe0m8?= =?us-ascii?Q?rqFgRgq58iCfCdLb+lA+DcsCfi+j7XfXkLM3pXzP8Dxy+IMK5K9DC0GDs6tU?= =?us-ascii?Q?j2PTkFv3iZaJLxcMi1fyYI+l0xlDMnBxa3tWXN8N1/payPVNlynawe7Be7iJ?= =?us-ascii?Q?EttzIYbOU7WrCL/Hbuph8PYRumNZJhx5zN99iLPksejCPFgyvwuOzmaiag+n?= =?us-ascii?Q?WHbKObVazwExx0g2jil+dIiK7Ixe4mD9VXEBN5O1LWZcUme8tVXwUJD3AJuX?= =?us-ascii?Q?L4HpVddMM/MmiwNkIlFVMUprLTo2hNm2TP5HrhqroJF5d+V5HELzf9QpTAQq?= =?us-ascii?Q?5JvKYg0s/KU3BV64NWWr1n78btcUrPHCqP3bogGQQud8/iBO4ASkgcKZqB6f?= =?us-ascii?Q?kLOLzGsrGy6KRSbvXxnZ1GTRb/c3QENYsnqi0oO+x1/arCJO1Xc8xwTo/03a?= =?us-ascii?Q?95CR2kPP+5qXW9hWlRAE4OQvuN3J/zgXGkgSq8YgYHPEzmiPTUUIOWS/zAsn?= =?us-ascii?Q?vfne5DXasUp+Rt/QOxSk4939hMcXQey+nRHcp+1Uh6ag+SxqXmHONYdQ/f3u?= =?us-ascii?Q?hdffUwF3KuO572/dBB9phFl69WGYDBnztGzBzbvbpe7ZnstUfEf3XvPtrEHR?= =?us-ascii?Q?o2qoOowzE245ZuONudZVZ9S8lcDypMv72aqQ9lc/fcAdH7FYeYXH+ZtFBp5F?= =?us-ascii?Q?p+yCfTlVOqJQjelYbNLy3071xKXrVkU1AbDhT3DJOboXqk5Idr3k3aOmZANn?= =?us-ascii?Q?DH28HLmhnJU3Hbt5nR/MDgwAEuwa2j+TZMtS?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(82310400026)(36860700013)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:15:40.5135 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9911e161-e67f-420d-45bc-08dd86e5442d X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343A.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB8572 Content-Type: text/plain; charset="utf-8" Secure AVIC requires "AllowedNmi" bit in the Secure AVIC Control MSR to be set for NMI to be injected from hypervisor. Set "AllowedNmi" bit in Secure AVIC Control MSR to allow NMI interrupts to be injected from hypervisor. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/include/asm/msr-index.h | 3 +++ arch/x86/kernel/apic/x2apic_savic.c | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-in= dex.h index d32908b93b30..9f3c4dbd6385 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -693,6 +693,9 @@ #define MSR_AMD64_SNP_SECURE_AVIC BIT_ULL(MSR_AMD64_SNP_SECURE_AVIC_BIT) #define MSR_AMD64_SNP_RESV_BIT 19 #define MSR_AMD64_SNP_RESERVED_MASK GENMASK_ULL(63, MSR_AMD64_SNP_RESV_BIT) +#define MSR_AMD64_SECURE_AVIC_CONTROL 0xc0010138 +#define MSR_AMD64_SECURE_AVIC_ALLOWEDNMI_BIT 1 +#define MSR_AMD64_SECURE_AVIC_ALLOWEDNMI BIT_ULL(MSR_AMD64_SECURE_AVIC_ALL= OWEDNMI_BIT) #define MSR_AMD64_RMP_BASE 0xc0010132 #define MSR_AMD64_RMP_END 0xc0010133 #define MSR_AMD64_RMP_CFG 0xc0010136 diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 97abea90eed6..d7b9067fe996 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -29,6 +29,11 @@ struct apic_page { =20 static struct apic_page __percpu *apic_page __ro_after_init; =20 +static inline void savic_wr_control_msr(u64 val) +{ + native_wrmsr(MSR_AMD64_SECURE_AVIC_CONTROL, lower_32_bits(val), upper_32_= bits(val)); +} + static int savic_acpi_madt_oem_check(char *oem_id, char *oem_table_id) { return x2apic_enabled() && cc_platform_has(CC_ATTR_SNP_SECURE_AVIC); @@ -351,6 +356,7 @@ static void savic_setup(void) res =3D savic_register_gpa(gpa); if (res !=3D ES_OK) snp_abort(); + savic_wr_control_msr(gpa | MSR_AMD64_SECURE_AVIC_ALLOWEDNMI); } =20 static int savic_probe(void) --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2059.outbound.protection.outlook.com [40.107.237.59]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C7F6279786; Tue, 29 Apr 2025 06:16:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907370; cv=fail; b=DseLZjZq5JNxiCZRO2nWjEg2pX3VugHN8j0coKgxT3hRq6ui9G9qBcYgrMly/RQAj5tymuiwpyp8e7pyf49/vHJuE2DLAz8S/ubXwOcbcgUX3LWrDVI8uHJhF3UuzJM8hLE4zAaH758JieFYyMDS/hpOVaCiemWLCcq0ibwYtiQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907370; c=relaxed/simple; bh=eKX2kWxR2HKd81OsxRF3xsRokltvx+kMpIKsWuXnw4w=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=d9gxegjJjQSL8janonVKQnO1N6KO41BR3lYRmx6Zd7cpfOxZrgJutmoQBg1pGdr3qppqFTZhvl6+WHiWYvOjrv5apAMqN8jfIQ+8cLb3yCYZguqpPc1ctSEWrp5mrfBtGWkOqiT1Zw1+TJPJj7uQA07N4+uUfMDCYufuyp56Y4I= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=Qtjo85gp; arc=fail smtp.client-ip=40.107.237.59 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="Qtjo85gp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Ukhz9FpN9mG5DyrdQpR5qGBGnEBDHhhF/RxFVcSz3z61yo9wqXWqDkg4/a/LSWI9xfoDtz55/+8XXmNdo0a2ihgxuXorLlqjdGp42Lgyx90mMLew6zKYxCnBFLbT+6zU6DL8bC1OgO6TlECaKEiSrC9cD9JqmawrYhzCG8KzKjahynPCImWzgI19RUT+xZ5o0YZE44uA0L1Yiy/mfr6qB5MmZCJaP6yGN7N4EsabZMjiJmLCKYLlzm+Y2btb9s6m9n1wBr/jyNL59iE+dblT7CFmXzdmQEaaHPhxVO7UvCOpALtis45sc6Fd8uXr0c1ltEkCD0DsEVdZTOsw/f2Bdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=/+djcHnnu6CouS9Hedj74obr+8GS2Rn5z884OSRBarc=; b=R61okxPfxkP87bkpwvcB9EGeBdxdwnsYLpbt8jHIsxzAW+wEu6pl7ph2L1IA/cM4SxK4sSXTu79Rtmmw9jQnoBxk3Jz97zKhAnbXWofAQggKrmDVMsYXYay4wR/AJWr18q1pWAM3wc6u4wSVXDjSD+wowUMwD4W70g3hlLdlQP0brZH1KqsUMLcBNcKpf77jDFCqWeyvL0qaNoqwb/vM2okniUzMDoGeDUUoQOR21zTDQChKSRwfbkDNRsmhl0ZOtv7EP+T8qNoJ+fwDvaYTYjAMixwtwguqC1hBSqWMnByCkVv8xKuigCWqFjXDI6ui63aKH3hkVJcg6zwNcyD7SQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=/+djcHnnu6CouS9Hedj74obr+8GS2Rn5z884OSRBarc=; b=Qtjo85gpT6JLVNiU1pXJCLswIlZIswwEEjnb97yuu6IrweKtyuDPzJ4FGpNuzs54nGloTf4e24AbsuJur07g1ITs+tSdsxNlEhcXX7UEUVGlNo9Enj0zraBfxbkqMoS9W/0dkRO+3kSMPUC87Uo3NSSODZx0RVI0ND7MoGWyI20= Received: from CH5PR02CA0016.namprd02.prod.outlook.com (2603:10b6:610:1ed::13) by SN7PR12MB7204.namprd12.prod.outlook.com (2603:10b6:806:2ab::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.31; Tue, 29 Apr 2025 06:16:05 +0000 Received: from DS2PEPF0000343F.namprd02.prod.outlook.com (2603:10b6:610:1ed:cafe::ea) by CH5PR02CA0016.outlook.office365.com (2603:10b6:610:1ed::13) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:16:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343F.mail.protection.outlook.com (10.167.18.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:16:05 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:15:55 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 14/20] x86/sev: Enable NMI support for Secure AVIC Date: Tue, 29 Apr 2025 11:39:58 +0530 Message-ID: <20250429061004.205839-15-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343F:EE_|SN7PR12MB7204:EE_ X-MS-Office365-Filtering-Correlation-Id: 47341fa3-8c63-40c7-0f81-08dd86e552da X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iiQnkl7TdBV+o9ggL1o11+xcDyL60kzqPERpvPhYGtFMBU3SOUgjovjoq+fY?= =?us-ascii?Q?wZbwCV1t5O+jvBKzq1bVLJmfGKG/ZzHwsdHM5Wj+0ub1AlRnhA5LTI0Gc6Vp?= =?us-ascii?Q?YKmmMn7VoM0gft2+ce/LETgHl39IDrNHmfmH79Gsaxt1kVPlI7igyquVy1b7?= =?us-ascii?Q?gvkznDZ1NnBuQEUdb1jDT8HWnDxvm7KQ2LgWNVqw+WaZ+0sxXC0JDxREpESA?= =?us-ascii?Q?YlFhrP4g7jRSn3P8VG8Pv+y8JM1kvRl7WFCM7FnQMN7xPKuiLBi31fDO/BmH?= =?us-ascii?Q?3nBhdE67NaUfUxixJdTc8+Ff7wF29EFBsPcjouD93Ers/+DFklKVY2+GVcHF?= =?us-ascii?Q?XchOfF4+qHBXCU5zeQxf8TcS9dPMOoX3dbCb3q6iiH+hhcyvgVYV1NlhYdvT?= =?us-ascii?Q?8iBs9Uo9d/5LnYR8HvuXGXrKXGvnuQNMwbddOzvX0GwSfBq4dNSYYpyf78xX?= =?us-ascii?Q?JPROmqV7vrEt7m2fMXxPw23GJpUp8oBUTP87/LzdRINjcFob6no5hpc/vsfF?= =?us-ascii?Q?89oXS0rsnFrsXjyyqWSsMTJLK1GSW4cDq5yJLGM7WbfnebXStz9ReZi13XF6?= =?us-ascii?Q?oHalTfKe54yuylorsQGDHVt6tCfCbb7/0OXMqiJdm3MlV5WwlcNKb5wDLR4x?= =?us-ascii?Q?PUnPr4+l+zCEMu+CUHLcdKcRHrsNph40la5TF+OzoUfVmPu7PBE0sOnHheZG?= =?us-ascii?Q?Aj1L+3Gm136hi/rkR+07CKIOPI/4Y09tPf6VBy3eIreo1CUZDEHrVFXiJEfy?= =?us-ascii?Q?1XVil0Go0mlPWYzp9DZvhKsWbfSSTS/q5hi9Hq2cEjCPOjT/AU0FiXoUe1Te?= =?us-ascii?Q?mFdtaVR6jocBTmUkQ8kIGZ8LKn7S2WkUpxpjqjIisPowhfaHOlDMTFV9T5OO?= =?us-ascii?Q?UNOC5yQ9IDnCS0NudxoY8uvdmEHdoVWda4HyMm2Z4R/yq3UCUxHr16V8Lsu+?= =?us-ascii?Q?eWmoyigUxLginQp9X222ClyB+875bUv2KEg87A3pgOVzrzNSxXhCwUhJRHPz?= =?us-ascii?Q?/b05B9WobESq9YYzVuoPeV/4OzWeKBCJRl2bv7oauOH6Iht+8ealIbKGLFXq?= =?us-ascii?Q?rwFRghVyeW27fQDz5ScttAYK6gWhNb8lhFiCKNGt0BTaU2xh9NGYLIkPakxm?= =?us-ascii?Q?uIOEeY3AXOoxbmos0EprSagjo7fT+hsc0Ev8jZw+wvZkOj7CswDH7+9kMa/E?= =?us-ascii?Q?j6yuiEeRdeuz46xnQrfR5XZc3bT/ehO82CC1B83OGuVdcqia5VLT0IUwRB0U?= =?us-ascii?Q?ln718e7ktYkWVynkkrzH/kcMpSgtdM80TsGiilGwPX2CapXTuCW1yZsT/zda?= =?us-ascii?Q?15AY/mUlRFahKM49Xlx7r9f2MQokA1GUkFIbFGwSaZAilsSf8/UQPDZgOa4E?= =?us-ascii?Q?pDL1ODZdIZik+NwS8Al6cQphk8e+qYgmSsEpvwvj3s0fRbzMouITxu93KmBL?= =?us-ascii?Q?f3C/jR5ZML6nw76iZyMwyNImsBMqXAw6IzDqDk2QLfUraC+AUhvB71lRzd8C?= =?us-ascii?Q?z3a5IyTg2xJNF/ZRUuI8vfv7xHCMpWOUmTei?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:16:05.1331 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47341fa3-8c63-40c7-0f81-08dd86e552da X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7204 Content-Type: text/plain; charset="utf-8" From: Kishon Vijay Abraham I Now that support to send NMI IPI and support to inject NMI from the hypervisor has been added, set V_NMI_ENABLE in VINTR_CTRL field of VMSA to enable NMI for Secure AVIC guests. Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/coco/sev/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 1c6028f2ff3c..4cc8c4361b97 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -858,7 +858,7 @@ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned= long start_ip) vmsa->x87_fcw =3D AP_INIT_X87_FCW_DEFAULT; =20 if (cc_platform_has(CC_ATTR_SNP_SECURE_AVIC)) - vmsa->vintr_ctrl |=3D V_GIF_MASK; + vmsa->vintr_ctrl |=3D (V_GIF_MASK | V_NMI_ENABLE_MASK); =20 /* SVME must be set. */ vmsa->efer =3D EFER_SVME; --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2087.outbound.protection.outlook.com [40.107.94.87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A4E02741D3; Tue, 29 Apr 2025 06:16:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907395; cv=fail; b=kPhvXI4MoJJ7Q+SsqeBMb+HFwct7I1I/sIqz+VxfeV5MKzu3lRv7In5x/anCK/ADiTIaaWuxTPHi3BHZHjcDuIrz2Zejl9ntrgkQDF2DRJarXb3oWuzMoZFxe140BZhneXaKkFuO/gLt1ONUNiaSJ81oOxHlpRsA/dAoCPClvv4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907395; c=relaxed/simple; bh=9mCL5reqQT8MAa0H6IebqaADY09ZqRXFQjjEXXLUDIQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=OS1C3tyEDa5uV2IFJxBQ/Z7XfaTvc8pAw9mahCJXHvF/ukFm899b28/J4qHqn2/407zOjgYpn7L3ji6odCoygd+2mcB4hup1nEA+xQJdmXn/c8qxZ6A+KKgoRxhsnEozrkZ2mGcoAnW5mTZneMG8EwNGFQnRovKOLCy6whad9nI= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=m6MvDUQg; arc=fail smtp.client-ip=40.107.94.87 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="m6MvDUQg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=vmo0kFXduZwdiB4mA8WOgKXH6FM/vWFN9RJ+84fPxVgH1UAMthDMjjYKCuYX2jOkdQnq1at4CXHHBtC6mY+eC04y87Ga4hVvEiihP2NkQEM5FX/uUuc14E8JOZdO1XMG1Q+zsvRJzPv3Yl1K0IMA0gnDvYnTB7afKa+flEgYzd5DND8RjmuUyg1Sgud8wSrfCjYHjIzSJ5OnkFX1OMbLbko95OPjPcOVLE3z9LqLCrTxOOACSUSPKnW+8uQ8Bsf4trq2oakS3ETQJvqc5fiNlFfCO3Ehmsn+zTTphmZCzXNIYHwQ/+i0/yosXreECsiLnBmILI+KXW8MMM+2P22rYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=FdyIoOnNxAqUftB6RClTFZll3s/0YsMOUQfYtnZ0gfI=; b=L5YsNl+WOqsLiA4rVKsS3Yv8CQQEF0MmrXLOrji9wplzulbCxfZDQ11+uA/zqtL/AD+BagfxgOALDZMc1PFHqhGV4Tjd6e83iv648atKo/YGSNGD9nNyOqO3aBp3rzMc/Jp7x/XApDYJI/xGoSDTHPL/dG131UrgPzsJQ+VpkovCscrJNanYOqV7/GFUXqZLXcNZAPS84nhmCOooFNrMqBCQxddPYlY4jbg9j7mb32sNSRiwIWIPGM8FofLbOaoXdsD5xGGPsePKTWg9XO2NN1O5eQ1KfPhz12EhJFo1pphZi/ZGBcoTJNeAR5IbnOxNpuax5cMUaq6n14IvEYyOEw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=FdyIoOnNxAqUftB6RClTFZll3s/0YsMOUQfYtnZ0gfI=; b=m6MvDUQgNooPsKU9E7RPaJJfTBkn2CFuyepX66pxu2n9HTvFr0yFPmf2cqQR1fLcMO9A/3vOWDkRVDodg8YPR1X5Uvll1INIAE3e0E5nENi5X1uKfjvosbnW+a3B/Qjay7IgW7n5VwPBBVRaUYyTrM1GVPIr6N2L8683LruV5w0= Received: from CH2PR16CA0021.namprd16.prod.outlook.com (2603:10b6:610:50::31) by MW4PR12MB7032.namprd12.prod.outlook.com (2603:10b6:303:1e9::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.34; Tue, 29 Apr 2025 06:16:30 +0000 Received: from DS2PEPF0000343B.namprd02.prod.outlook.com (2603:10b6:610:50:cafe::76) by CH2PR16CA0021.outlook.office365.com (2603:10b6:610:50::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.41 via Frontend Transport; Tue, 29 Apr 2025 06:16:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343B.mail.protection.outlook.com (10.167.18.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:16:29 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:16:18 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 15/20] x86/apic: Read and write LVT* APIC registers from HV for SAVIC guests Date: Tue, 29 Apr 2025 11:39:59 +0530 Message-ID: <20250429061004.205839-16-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343B:EE_|MW4PR12MB7032:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a170967-6cda-449e-6ac2-08dd86e5617f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?XHVL82JvU5itpVE4x4Sbqs2f5REUsX1Oky/ZukhVtUl1Lyt9TRczRoIuOQMH?= =?us-ascii?Q?pmlrpOfLJeM21IrR3AwqUdX3pPywB+lcSoiJXH4o0yHltnQcFKaHS1WlPPKF?= =?us-ascii?Q?/SIcEtf4MWidWA3a1OifEtQ4GOZisXGXzL5dkssrPhJBvePdvEyHo4RQswyj?= =?us-ascii?Q?BGxNMhhw8NM5G9ni5ukPFhT2ZSPzIDsnQ9VUTx+ObkWqln6weaWCvrF2J3U4?= =?us-ascii?Q?kXawy0iEc//Bba1eegmWXMhVHOgo8We3k6ZSt30hY9XRdkVFB6TRT2OIlMK5?= =?us-ascii?Q?ikcbE/dZG5yfrA2aGkg0qX66hXBh7S9QHPI+E8v0uWmQokyBj//W3nNumy4d?= =?us-ascii?Q?EvHWNAL1M1/Zoz7UqdT6m20SOIC7yOcrEH7VGC7YghLPzBpazEc18WvhTqtB?= =?us-ascii?Q?xiixc1llGQKRurm5u0/wCWs4PG/aWYL3dU1KAy+q4DhOt+P9/ZEJFmbqu3Z2?= =?us-ascii?Q?nJAjJMohaw2CrVj6qhAzpEiznSWZbVyHNV6M3QmmRnjVIqpB77eiJVOg5rhi?= =?us-ascii?Q?Zf2YQDPtK42tDVri+XyOy77sfHFJYIsLadlck/d7UhnGK0FANyd/BNcaXeLs?= =?us-ascii?Q?aodE5MNJrQsWcPoyKLXCEtHw8ZrxRrdWGq/hac22fgmuiynevwx8umljZhwk?= =?us-ascii?Q?qtGH+HoiNOt+gBqwgAABSLcvrAQ9jQNBT17tsypjQaaa7/D52nxzdadw9Roh?= =?us-ascii?Q?3VAeuPjYGBO72QuOjdchuboHxJi4BN5pdRMpdtEzdKpqVWq9j4ihFq0+gBS+?= =?us-ascii?Q?ELuKY9b22IKcN2CYVuUghErrYXqFmQlXXzVeQX8Om0KUjbUf3xE2o+DOgD1U?= =?us-ascii?Q?S8ycQ2sG7BlQzqkwd8HbTi/NAp5GjRPxvxGtJgKDTCi/JkhQdA4oHqoWsq3q?= =?us-ascii?Q?xBuPd9wYf3xpTNVnfFEOiVxmBnMn1NH1TkqoNlDqhCfxTuLlLQ3aWa5GPFl1?= =?us-ascii?Q?bsYRTcTxornEcPZvHc09+bLbCbXyq0hDA082x3wPKUGMJW6rRXWjogEMrBnA?= =?us-ascii?Q?t+0PtdCz/MtdbhLCVEIoQ6cUljTAxtboX3Eoo0Qg4BtaHUKJFnbI1cj6Dj7/?= =?us-ascii?Q?dsEmpUBjXH9meoCSrEaELaCo1GvdkIJ+u86sGYawgC95w7hN2Pi/BF7N2Y96?= =?us-ascii?Q?gzVtTBrcqZLOlcq9+j9yScjHp8oHkwSTtSYjnuE7IP2ubB0VLp1uPojxZKjx?= =?us-ascii?Q?AwURXPyvhEXLwkMKUBq2Hft1RUyAGWea/zXOXwnE7s2OBwgrYvGZ2fnhU13e?= =?us-ascii?Q?uqW1sCW1pO+8714vuUwt4yHqyMWvmqEqgIukOfMqpwAoXYXsT73DXhMFJoLj?= =?us-ascii?Q?GYYRqsN/KHEppP1duUY6eiRnX/XSNU3XhIzE7OJc0qyoxtcElh0PsTRtL+jb?= =?us-ascii?Q?r6EAUlCdjzfKw8KzX/xzs5ZtOp4vDWghbCF/8DKYzXd2U65cC7s4f0ZBJvMD?= =?us-ascii?Q?Yq3+vdyG+z5OQ00BcKo4EDUyfs1V46WLvquUiNvr/ZRGraKc62ZshNGyg6hU?= =?us-ascii?Q?Mq/PwD4bsAzTV1F1kWpUHrQv4iJUwRf8MxFq?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:16:29.7082 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a170967-6cda-449e-6ac2-08dd86e5617f X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343B.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW4PR12MB7032 Content-Type: text/plain; charset="utf-8" Hypervisor need information about the current state of LVT registers for device emulation and NMI. So, forward reads and write of these registers to the hypervisor for Secure AVIC enabled guests. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/kernel/apic/x2apic_savic.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index d7b9067fe996..fda1bd13aff6 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -97,6 +97,11 @@ static u32 savic_read(u32 reg) case APIC_TMICT: case APIC_TMCCT: case APIC_TDCR: + case APIC_LVTTHMR: + case APIC_LVTPC: + case APIC_LVT0: + case APIC_LVT1: + case APIC_LVTERR: return savic_ghcb_msr_read(reg); case APIC_ID: case APIC_LVR: @@ -107,11 +112,6 @@ static u32 savic_read(u32 reg) case APIC_SPIV: case APIC_ESR: case APIC_ICR: - case APIC_LVTTHMR: - case APIC_LVTPC: - case APIC_LVT0: - case APIC_LVT1: - case APIC_LVTERR: case APIC_EFEAT: case APIC_ECTRL: case APIC_SEOI: @@ -160,19 +160,19 @@ static void savic_write(u32 reg, u32 data) case APIC_LVTT: case APIC_TMICT: case APIC_TDCR: - savic_ghcb_msr_write(reg, data); - break; case APIC_LVT0: case APIC_LVT1: + case APIC_LVTTHMR: + case APIC_LVTPC: + case APIC_LVTERR: + savic_ghcb_msr_write(reg, data); + break; case APIC_TASKPRI: case APIC_EOI: case APIC_SPIV: case SAVIC_NMI_REQ: case APIC_ESR: case APIC_ICR: - case APIC_LVTTHMR: - case APIC_LVTPC: - case APIC_LVTERR: case APIC_ECTRL: case APIC_SEOI: case APIC_IER: --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C5DB023370C; Tue, 29 Apr 2025 06:16:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.80 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907419; cv=fail; b=rfQ/oLQ3A7gL//OT71ceLZOcU1kq4mrgkolySCMsOAqOediye7LCToggLf8WvAE6ZYv1L8s50rKV6yZYE3lK1kJ199ORx/ZaMW7Zy6BTH9B1E9ds4N3SMicxDpoepSoo4Vv0T5ELsiaOijKNpYXN78Kzi3tPwRF6+xuqBb1Nlvk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907419; c=relaxed/simple; bh=KcUCjD9Pm22jGJTWbYnkoLwh8NtiJ4bqAmBccrMv51o=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eZjG5z68lNsD7a8LF7mBmbhNwMRApRbjpICAkvkToEQ7mLX1jiqdRsLVP8AD/gVt2hkpNXJea6yGIGtg5j5WTlH6WpF3oHuh5b0qgihxFESr5ZNjPdMzHwoo4nSEjaFTKzX3f9nt4zziXLSKCXbithbAzZ4LTcJaGIczwWobE+s= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=u6l9BB6U; arc=fail smtp.client-ip=40.107.237.80 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="u6l9BB6U" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f5P5N7epZg5LrutWh0hJh802Wtg8mqnlIVYfX3sy7tBYJtDTx5KNVeRcV0FzmVL6+1E++7TuEWOMOisLlLC004Bo4jq/1kjyyzODSmSQZVQpiCtjwFp8gl4Z7JqUx4VDwAld7w8mIhLXVtgwPhlbmuRFOhkHmIC0Da8UyNkBGCOLmSxWYqC8U4JAVIZLWc/trBmNTZqqPbVo91fL/gxIYzZIAKggsaImqngejRvujp4EPvB6FTw7dG7criFLsLzLGcOt2VqllSn+dfmanAH71BlahHwTeVE3aneIxNAR7J3y4N5qqUuC3FtvfJN9AVnqMA8j3wpOY31KwaUJkPzU/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=63vbnsghLMHEGOmKZ+QPiy0Dc3tMd87xDStLg7YgHKs=; b=R7ItHB5+UXzHsBmvUGQIDEA8a5m4+2rlEfPE2z+3BkLE6wbhpW5uvjF+736KrGm7ZzVxtA29EEVGvqG6EyrtPur5HbQ5x5R7cs5SrJU4uli2UT9E3P2/8XZDqk9dkEa2JdZnnk9VuY0CPCDQkoGkkdjn2t0I4xUDvbagKVtqqs8CvpSrm1O6249Ax8nqq+mJKueqGgS7IS5ug1GOlflgwcryxzIJ41HguZsYq+/3Txt8E/W8lfoU0JRaeVc/8MaHoywUGYBYFkTCPvIxtJjVqAKdYQi2YvihTP2CyQAOiHb61WFrbrGQsHVSTvFE4QKfszJwglRCinzJQc/GSYtnzQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=63vbnsghLMHEGOmKZ+QPiy0Dc3tMd87xDStLg7YgHKs=; b=u6l9BB6U6Hj42bBBxiR09byCs0+oX9JqsVOiO5v3eXa01OjYr53pcTj8k9zi/0NInAjLbIj8RB9BLkBB+M2o0uykjw6Y4T4KUMOOPs4+YyLu27BvRxOJI5anIzP1mmQRVT7EHlEkyLrpzq0gBG0LvJow6ZL4VtKG7zBwzGMecEQ= Received: from CH2PR20CA0021.namprd20.prod.outlook.com (2603:10b6:610:58::31) by PH7PR12MB7987.namprd12.prod.outlook.com (2603:10b6:510:27c::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:16:52 +0000 Received: from DS2PEPF0000343C.namprd02.prod.outlook.com (2603:10b6:610:58:cafe::ce) by CH2PR20CA0021.outlook.office365.com (2603:10b6:610:58::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.38 via Frontend Transport; Tue, 29 Apr 2025 06:16:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343C.mail.protection.outlook.com (10.167.18.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:16:51 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:16:44 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 16/20] x86/apic: Handle EOI writes for Secure AVIC guests Date: Tue, 29 Apr 2025 11:40:00 +0530 Message-ID: <20250429061004.205839-17-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343C:EE_|PH7PR12MB7987:EE_ X-MS-Office365-Filtering-Correlation-Id: 00f4c344-9b7e-440b-933e-08dd86e56e83 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|376014|82310400026|7416014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?irnlIXK7ruARTrcuf/CZdt3ZE3X9SjHH+JVXSm9LeqAGMIf5bJmNf8bKmA8M?= =?us-ascii?Q?YZXRWrwoMx40UkVW/05/RICp2chh/LOHaF6Gr4j+5DrYbh024QvYuvor6d/o?= =?us-ascii?Q?AaCwn4fzaufOfZJVFyVPB5J9rg2Xyb6qrVqlE69HP4pyH7T2u02IfUL7Oqya?= =?us-ascii?Q?JhNBk9Zp5McrMOmJhcSfmPLzFCQQjmAVG1EqRlfU3hs1GvRDNY6EjHsfpJg1?= =?us-ascii?Q?PHHC123iqJ2VyiNUPhSZ2t9oKjQmhawYUjIw2juXZsYukcLWb4xKEQ3PyOt+?= =?us-ascii?Q?ynCwI6WzZ5/ynvwPp8/vn0S+YzCxYi4UlhP1Jv5CP9i1IohrJnY8kcIILoRe?= =?us-ascii?Q?Z5n09Ai5NGKgr8sqeIra884UHjwPTsToHKFX596YzgO8ctDMxV/iCykacx+U?= =?us-ascii?Q?8pGT5pTse7W2vYSOzuCsBjEE+DsbenxoI0DlmKgO2NGxOeGg5pHwbqGzNwK2?= =?us-ascii?Q?TZDIa5T1tIzfSL50Rrekm3qNTMjuYLnAZLYxO7sHk/bRgOWWac9bE4nZtPj2?= =?us-ascii?Q?ZLR8KFmQvNLIYqZ6VMDK2qA6PlB6mbdw0FJ10q8OQYr+kIKVm0dy1gnSf84V?= =?us-ascii?Q?2cGn7ytlFaLfXy4GDt+a3m2+ULjKjKErA08DYuAg6OxqolI1GKGVEIK8lEWC?= =?us-ascii?Q?5uIayLLxu/HrCxGtdfQQlf/HSxUe9qsWxBK3qNHRlcstYNG9xrULGaLfMRYj?= =?us-ascii?Q?TXytAxLo7xKNd643BiwgSzjlg0bW8o0djAAnX1jemalwimiosJbagfV4sqCW?= =?us-ascii?Q?TInupebq8Kr66SO8JmKGlaQSWcCgMgYfF2LC8i9Ii9n1INy9lUpa8P4ViLP3?= =?us-ascii?Q?jWGb5+bKRFQmNUnc2+Flffa0jVS9dkWiKmBg3M0Dw4C72ZdpYIApQgf8V7qn?= =?us-ascii?Q?fs/7rvTPL/0kHssjlj3VndbWUDJeTc3qvAUNzQHo6avtI3jTOy5VZYjDfb2Z?= =?us-ascii?Q?SH2ALmE1kXduyqoBfM6IMidj+JECTriCdzMhXB5sC79KMkdQQhR9gcNtcXYB?= =?us-ascii?Q?T6T+l11i/k5y86RTR5rrxgzMf09cc0ZZXqVCT6uomAZmM5ipsSjQATp1TPwb?= =?us-ascii?Q?yLi1BpM04ieFQiwdmPI7XA4dX51mB4TpyEk257/vU5rpvfIOQjUfWSGx1muA?= =?us-ascii?Q?WKvTV0cQ0Sewx0vrLHx6P8cf2FAfe7BbaiVQDa8apjfM1P+hu0SI6BFV+4wo?= =?us-ascii?Q?g2hJYdYUDrzhDPNTSbPY4x9Wl7Qsszo4MuQIDpY89Stc+9p1kmW46kVW399k?= =?us-ascii?Q?KUGok9m5cBXuL5qhPbs95M5K/oCrs6F/plTYDi5nFTp7xggymPEKHjOX2rIp?= =?us-ascii?Q?SQUWksCOxBQpZ6My8K4nbJQyhg4ix9e4FjlyWHkXUUfv6lh+5YID/NFLctCB?= =?us-ascii?Q?KICErGIMLEeYIHj76y3WMeEAt4vbIn2aNpsDEvPOPqvrVnHZmpvFhjKWZt++?= =?us-ascii?Q?2PPm2FmDp7COgk/5qTQUdORi+ODTrZV/U0ymk5FI0a3PXK9T5MhW09LjggXq?= =?us-ascii?Q?BzMyV9O61EEDkJx2IZBPm0ITbzLzwihXeiJG?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(376014)(82310400026)(7416014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:16:51.5389 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 00f4c344-9b7e-440b-933e-08dd86e56e83 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB7987 Content-Type: text/plain; charset="utf-8" Secure AVIC accelerates guest's EOI msr writes for edge-triggered interrupts. For level-triggered interrupts, EOI msr writes trigger VC exception with SVM_EXIT_AVIC_UNACCELERATED_ACCESS error code. To complete EOI handling, the VC exception handler would need to trigger a GHCB protocol MSR write event to notify the hypervisor about completion of the level-triggered interrupt. Hypervisor notification is required for cases like emulated IOAPIC, to complete and clear interrupt in the IOAPIC's interrupt state. However, VC exception handling adds extra performance overhead for APIC register writes. In addition, for Secure AVIC, some unaccelerated APIC register msr writes are trapped, whereas others are faulted. This results in additional complexity in VC exception handling for unacclerated APIC msr accesses. So, directly do a GHCB protocol based APIC EOI msr write from apic->eoi() callback for level-triggered interrupts. Use wrmsr for edge-triggered interrupts, so that hardware re-evaluates any pending interrupt which can be delivered to guest vCPU. For level- triggered interrupts, re-evaluation happens on return from VMGEXIT corresponding to the GHCB event for APIC EOI msr write. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Commit log updates. arch/x86/kernel/apic/x2apic_savic.c | 38 ++++++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index fda1bd13aff6..c517abdae314 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -377,6 +377,42 @@ static int savic_probe(void) return 1; } =20 +static inline bool is_vector_level_trig(unsigned int cpu, unsigned int vec= tor) +{ + unsigned long *reg =3D get_reg_bitmap(cpu, APIC_TMR); + unsigned int bit =3D get_vec_bit(vector); + + return test_bit(bit, reg); +} + +static void savic_eoi(void) +{ + unsigned int cpu; + int vec; + + cpu =3D raw_smp_processor_id(); + vec =3D apic_find_highest_vector(get_reg_bitmap(cpu, APIC_ISR)); + if (WARN_ONCE(vec =3D=3D -1, "EOI write while no active interrupt in APIC= _ISR")) + return; + + if (is_vector_level_trig(cpu, vec)) { + update_vector(cpu, APIC_ISR, vec, false); + /* + * Propagate the EOI write to hv for level-triggered interrupts. + * Return to guest from GHCB protocol event takes care of + * re-evaluating interrupt state. + */ + savic_ghcb_msr_write(APIC_EOI, 0); + } else { + /* + * Hardware clears APIC_ISR and re-evaluates the interrupt state + * to determine if there is any pending interrupt which can be + * delivered to CPU. + */ + native_apic_msr_eoi(); + } +} + static struct apic apic_x2apic_savic __ro_after_init =3D { =20 .name =3D "secure avic x2apic", @@ -407,7 +443,7 @@ static struct apic apic_x2apic_savic __ro_after_init = =3D { =20 .read =3D savic_read, .write =3D savic_write, - .eoi =3D native_apic_msr_eoi, + .eoi =3D savic_eoi, .icr_read =3D native_x2apic_icr_read, .icr_write =3D savic_icr_write, =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2069.outbound.protection.outlook.com [40.107.220.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4CC701519AD; Tue, 29 Apr 2025 06:17:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907439; cv=fail; b=Ikn9Oh+3zzaKjtNszNl2kF2tDITBxsj45qhq1eJTOTuQg9aBxkdSpmjFAtUcUNUnDlrGd9xW/WfAos1BkqQomcsCefGP7INg+wvjPYauzo0SSVnZzxuaYDBJGIskpXjuSIC68P+hp7DVIOa+bOEszZ6RTtOlzOTrtj94zdfGjkE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907439; c=relaxed/simple; bh=2l7CMopLgKI0nitDW1Q/anoB0rzBZKURpHTMJMrmjgQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=bCR6Gi6RYfm9vDSDCP/gToFYonPDsXV8fNcSA/Ag6QbwjmxjpGg8QF6FBk/gocRHmW7iCaRbemdHngDtPaKrCTxH9kNg0PXD3VCFJ7FmJjzOytVcvsAWSGCInawO0LujysbwVqGkcU6tqL4dRp/+aDWDzswXARvrzYbQZkS+KUw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=bJwgEBbN; arc=fail smtp.client-ip=40.107.220.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="bJwgEBbN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gDDThC16c9TPcMj10pR49lSX+tti+VZwCxydm1+GuX2B8UxPyKTae4ERp6ekzZ9OY+TP3q04TixKilWAFoINjfJMi9bhg2b7ggDNsEj/bN2zZMXNrlrcA5DsT2J+Y3dR492BjkbVefKGNkYACLHgqQrg/82dWPBo8VF298VmBewXEylqh5+fzSuFijl8lx2vIVrh7zpK20Sh4NZoKOVMfBqHjyGcq9TcFaBbgsfzE86fAmkQFEDt/4ZdaYlDcIIXUYJG3AJqqzF3Ws4dMFV43uQy/xVd/KPs8e5JfKtjwyWrmUniUbb2mUv3OrgKE6Kd7Gyzzo2p7cs6h4rATBjlbw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=rJQINksgkJl56rTeU7migrcohrtOv+ByBHKWAh/Tl0w=; b=rhtSJ3KX466UW+FlICgyqdjfAs30tWZ6kWB4iaWu2Il+pbqV/Sl9xvGUeTb9qbS42m0LG2MrBr3haInD/SLG4HPS7JdQocPm63wmm2za6hXJKyCE/U+FHHxYTkXIZ0lmwx6Tfv6ZjKRLKkuod7Faeykm0e3ej8FCfqCXclVcG1JzQ/djGbTybkXZfzl/M2cy3p38EOmu921j0T+Vr/xA9V2UjoUMyOWYAu/j9dmE805NNB+wjhxXhmOrdsLu17o5yCx6MsHhu3X7ThEx5Tz/qfgzk1WDycCVFGyY3vFi00rR1ZKcFSdTxaLKJ16mZlyHgan6QdUT8aK2rzp/5hrTjg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=rJQINksgkJl56rTeU7migrcohrtOv+ByBHKWAh/Tl0w=; b=bJwgEBbNRWrEl3GPdjr0+R9UaEIoGMo6DapYZPOTsL1Jrqs+E4Q7/OX5KZ3l6LmK+ydhuWWmBoRZ1biP+ER5KcyaE6NRdzRPCy4Q5+6tm9KpTf46W3/h4AaCy5m0sD0OL9Crlj9k9sJtjR9jazW7n6+DdBnESe73c3PHdQSSgTk= Received: from DS0PR17CA0014.namprd17.prod.outlook.com (2603:10b6:8:191::10) by MN0PR12MB5977.namprd12.prod.outlook.com (2603:10b6:208:37c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:17:12 +0000 Received: from DS2PEPF0000343E.namprd02.prod.outlook.com (2603:10b6:8:191:cafe::15) by DS0PR17CA0014.outlook.office365.com (2603:10b6:8:191::10) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:17:12 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343E.mail.protection.outlook.com (10.167.18.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:17:12 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:17:04 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 17/20] x86/apic: Add kexec support for Secure AVIC Date: Tue, 29 Apr 2025 11:40:01 +0530 Message-ID: <20250429061004.205839-18-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343E:EE_|MN0PR12MB5977:EE_ X-MS-Office365-Filtering-Correlation-Id: 6a7b1c1b-5211-4c9e-b896-08dd86e57add X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?iWfXW7FYjlDuF7mF12k+cRm6t1d+bOpynE+bTK0lGppLDs+2B/rAAxtSKl4s?= =?us-ascii?Q?TzEPJ/tvnhqksX+KYO9Wch3Af2h0dRC/l+ZYnrw2N0A8xzPebC3OL7Ki6Kmm?= =?us-ascii?Q?194VPcOJFJ5W9o8PaIzXOCm9sGj/sdsaV7LF8m0jvABNH0yCh2HVVn4PX6NW?= =?us-ascii?Q?BSVi3FvbxG9ujT7XsWJAvNBSKv/w5EOq6lTBOB25MBc3b7d8EBFZRNYY/Nrb?= =?us-ascii?Q?0WR+uY8IL+3oB9jHlyhZlZ61rFDM/07tdXm+zBB7Umf0CzaEWoD5D77/ezOM?= =?us-ascii?Q?DyeJWW5nAmrIRNm95n4FNh4gOMuSeqOfY5uF1FrQ0TleqLQZ6nQrJCX5A/p6?= =?us-ascii?Q?YQQmIa8d9QRtHt36xT95URmb74m6HUZqs9E3hMoE5zTm4t5DtJPd3BmIMtSk?= =?us-ascii?Q?do7Dp9/sFQ4ZoxUyhoz4HHsrV5oObWV65BxJKUW9/pfzTQaY2j369C4IWiNk?= =?us-ascii?Q?eqD3GZSnaUk5UU400m3FBaFKuZ5JQhWyZif0H95LcyhYeCShoJ2Z62RK0hJZ?= =?us-ascii?Q?wNkl48oTTjip4tFJJKw+HoYZCGGOZMnsP7ymoFtdZ/NlThmuSkmHIFvt8XdV?= =?us-ascii?Q?w11C5sngxxMT/FO2U3agXOnAU+hzaAyqnZlQgpijD9OavUjB8r5v368jZ3Ge?= =?us-ascii?Q?UiA/pv6gMcKvMBUgeLJS2m0MvP56kOvTeA3U466r+Huuppm903VGdKW4kfjL?= =?us-ascii?Q?SF6uwP9vTjas3jQJaia3EPaBuNTlgnm/Y/Zf1UFJT4aRZaIv8nm+Ux+HYFBa?= =?us-ascii?Q?JW/FmAhDXXeuTDIqSWIC7sm/696UzrLmuomIcsnPMhij4zIY2TwMjbPHeIzM?= =?us-ascii?Q?fmwildJJxL//YGG35D/F8QLnkLh8Yp+JH1G2geHd8R3baH51gmslFb3sfmGp?= =?us-ascii?Q?KkXb72a1BFPTqpxayU7/e5/KVKOieBsJ/qDN0IKs9/QH948IpAQLvK8aPha6?= =?us-ascii?Q?sbt40w0rrFOprlZx69rHVX+GUlP2fXRgLim8t2T6Xod73xCv8O5UguJL+OUR?= =?us-ascii?Q?AfirsB+YERgYHuNTm64BFgXLU/zNBvnBTovihWSlUjsm7CQ2Z7qPPaWoCR80?= =?us-ascii?Q?w+KvPr99Pp3ZLOWKPbtPOsr/wuqCIaW+k2Uj0OnArwO6sQ8J6N0aDjzMYg/l?= =?us-ascii?Q?sHSMODYwNZvYL5ZE8BQwD50MmM2Men9yWCFdvpnV7w/DcNoGCSgXk8Qy9lbr?= =?us-ascii?Q?QHhBN3g5rk/uw/41uMikNJVS+4EkD06xk/TJmOe2w45o8TU/POjqWDKO+y5o?= =?us-ascii?Q?DHaamViw975CKyy6fS1RrAQgV7CZZd5PmLKHPd+ge3fzmc+JGHm4fMuLKZy6?= =?us-ascii?Q?RB8PS2RSFkpYyedilg3+WxysQe7DimJ7144zEIjU5hr9LlONBjbNHs5XdFye?= =?us-ascii?Q?t5AAxV0EvYVLx4y8siAK/kgKap/j9vVLGeQQkCJ0oHVRV/JdjnKADDPt2/no?= =?us-ascii?Q?HXE1FklMp1mW1GvUQw10ao6tDd8v4JJKLWNl7WTQZtQEfSOvtdSh828OSrT9?= =?us-ascii?Q?Q5PrZRngfg2r8Z0PA18BCziaOo3FwFIHrIII?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(7416014)(376014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:17:12.2701 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6a7b1c1b-5211-4c9e-b896-08dd86e57add X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343E.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5977 Content-Type: text/plain; charset="utf-8" Add a apic->teardown() callback to disable Secure AVIC before rebooting into the new kernel. This ensures that the new kernel does not access the old APIC backing page which was allocated by the previous kernel. Such accesses can happen if there are any APIC accesses done during guest boot before Secure AVIC driver probe is done by the new kernel (as Secure AVIC would have remained enabled in the Secure AVIC control msr). Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/coco/sev/core.c | 23 +++++++++++++++++++++++ arch/x86/include/asm/apic.h | 1 + arch/x86/include/asm/sev.h | 2 ++ arch/x86/kernel/apic/apic.c | 3 +++ arch/x86/kernel/apic/x2apic_savic.c | 8 ++++++++ 5 files changed, 37 insertions(+) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 4cc8c4361b97..2dccfe411b14 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1083,6 +1083,29 @@ enum es_result savic_register_gpa(u64 gpa) return res; } =20 +enum es_result savic_unregister_gpa(u64 *gpa) +{ + struct ghcb_state state; + struct es_em_ctxt ctxt; + enum es_result res; + struct ghcb *ghcb; + + guard(irqsave)(); + + ghcb =3D __sev_get_ghcb(&state); + vc_ghcb_invalidate(ghcb); + + ghcb_set_rax(ghcb, SVM_VMGEXIT_SAVIC_SELF_GPA); + res =3D sev_es_ghcb_hv_call(ghcb, &ctxt, SVM_VMGEXIT_SAVIC, + SVM_VMGEXIT_SAVIC_UNREGISTER_GPA, 0); + if (gpa && res =3D=3D ES_OK) + *gpa =3D ghcb->save.rbx; + + __sev_put_ghcb(&state); + + return res; +} + static void snp_register_per_cpu_ghcb(void) { struct sev_es_runtime_data *data; diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index c359cce60b22..37317d914c05 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -306,6 +306,7 @@ struct apic { /* Probe, setup and smpboot functions */ int (*probe)(void); void (*setup)(void); + void (*teardown)(void); int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); =20 void (*init_apic_ldr)(void); diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index fab71d311135..feeff8418bb7 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -521,6 +521,7 @@ int snp_svsm_vtpm_send_command(u8 *buffer); void __init snp_secure_tsc_prepare(void); void __init snp_secure_tsc_init(void); enum es_result savic_register_gpa(u64 gpa); +enum es_result savic_unregister_gpa(u64 *gpa); u64 savic_ghcb_msr_read(u32 reg); void savic_ghcb_msr_write(u32 reg, u64 value); =20 @@ -574,6 +575,7 @@ static inline int snp_svsm_vtpm_send_command(u8 *buffer= ) { return -ENODEV; } static inline void __init snp_secure_tsc_prepare(void) { } static inline void __init snp_secure_tsc_init(void) { } static inline enum es_result savic_register_gpa(u64 gpa) { return ES_UNSUP= PORTED; } +static inline enum es_result savic_unregister_gpa(u64 *gpa) { return ES_UN= SUPPORTED; } static inline void savic_ghcb_msr_write(u32 reg, u64 value) { } static inline u64 savic_ghcb_msr_read(u32 reg) { return 0; } =20 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index 88e4bddff5ba..e33a25ebd694 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1169,6 +1169,9 @@ void disable_local_APIC(void) if (!apic_accessible()) return; =20 + if (apic->teardown) + apic->teardown(); + apic_soft_disable(); =20 #ifdef CONFIG_X86_32 diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index c517abdae314..7ba296ba26e3 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -333,6 +333,13 @@ static void init_apic_page(void) set_reg(APIC_ID, apic_id); } =20 +static void savic_teardown(void) +{ + /* Disable Secure AVIC */ + native_wrmsr(MSR_AMD64_SECURE_AVIC_CONTROL, 0, 0); + savic_unregister_gpa(NULL); +} + static void savic_setup(void) { void *backing_page; @@ -419,6 +426,7 @@ static struct apic apic_x2apic_savic __ro_after_init = =3D { .probe =3D savic_probe, .acpi_madt_oem_check =3D savic_acpi_madt_oem_check, .setup =3D savic_setup, + .teardown =3D savic_teardown, =20 .dest_mode_logical =3D false, =20 --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2072.outbound.protection.outlook.com [40.107.93.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 90BD926B96E; Tue, 29 Apr 2025 06:17:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907466; cv=fail; b=EBcv4NrRxoDYeBpSkTpyxbiqlDamMiZILOFYxzWs2UsgSfFQs1JQhce/pFXAS6yLizWOtK6uG2yuhCuSDySgT3JT8qo53N4VIgucnPQrIqQUzD+D+HedmO+1f6L/92qf/R7w+gvbq0k0pFWpMMy9bBdcQJG8RRBEF7jJk/hhaJA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907466; c=relaxed/simple; bh=XwInE5mPgD65k5j3rTdS0DS5cTa47PE3BCPfzEoYWA0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qAAOqkIqNTbpNYb0HUX6lCdESM7NOHwkodh2g971SIESEhhhPy6VfgPOjQaVgkGkGYOjhZuGaTXvvG0xchTR741VhqdRyEX5NVHnrwWFSBYPdi5D//+Z73uYoS8cVFYM4DLBOQSZBYL1EJgQJk3gAq2FAEbxo1ZMEpxOOx62Msc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=aM6zCCWz; arc=fail smtp.client-ip=40.107.93.72 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="aM6zCCWz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ATTJY+xO+66Ltr3Ndbxyml+lihAeQCGfdeuY7Dn3F14So75KHLeaO9VHfx84k5Wz3dDGyXSJlpbNXLEKGqt4BzgSqrqwHHr3DlEiClCianCW23EjlSzHjHCL4AwcXMcJPbhs0WeeBW6tZGytZuoGZLn6jDGoh2IvMH0kC2ZkKVxSmTKxkp5pTdL/BEr8mnBGglxJoEHuO5WRZs79vYsrypdC0gGeqZtETpIi2leADA4xNYbc9Tmd+1ygFI3e3M2OH2dkxqjndZIlD2KgGQb7jV9sLVX1WYnRhcdc4Oqou9wo63RpfBzwRX449qBagXmz3BM/yAsErIYprRNlr1m+nQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=00Oo2atKXUAjC2g68QjmtzuVISNPgu1yhjPgmKSQSzM=; b=KexBufAzVMXFhx3RkRGoroVwUaOng7fQmeGz01yCkWeIPiYL6sRgtif2yRxDzqpmwVgNXNxHtRDSfKkAN2bXb9fN2DXn21TItbDGf/nvCEQKf1jWCWXd0yIXud909UZleL0rz29eSzqGb/A9M0LrlnJ9Pus3e6fpoXVUMDXjOyBfpJyexAYe393XJ9tPYFTUCbT9Y48vPA7om9bTHZG7YUr8zI1F/Aug+V+VN3/V5FNIUE6qEu8lYm38PkPXNCpcHF08dUMfKOUHCTBEaCsBLkuw3qzIpqRbMXKIaMj2+HzQ3ekycWPbsCr/6wvkRJ8ggxF1IIeJyaX/2XjtkVefxw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=00Oo2atKXUAjC2g68QjmtzuVISNPgu1yhjPgmKSQSzM=; b=aM6zCCWzsAXeKPqIceCHmver4L03TVMPJSkdRKH9NPNR+nOmrzEAh+9FyRMZsvqoMPOGCdaWFrcCT3q6jFIgzGyqPNIgh9w9zLWcJM971Wr+3ARsOrMlaa8XQDRn+qqee5/EN3zVUrXhuPELrZqLL8C5choJnhFO2JBOtSzjucQ= Received: from DM6PR01CA0012.prod.exchangelabs.com (2603:10b6:5:296::17) by SN7PR12MB8170.namprd12.prod.outlook.com (2603:10b6:806:32c::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:17:40 +0000 Received: from DS2PEPF0000343F.namprd02.prod.outlook.com (2603:10b6:5:296:cafe::e) by DM6PR01CA0012.outlook.office365.com (2603:10b6:5:296::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.41 via Frontend Transport; Tue, 29 Apr 2025 06:17:44 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343F.mail.protection.outlook.com (10.167.18.42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:17:39 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:17:27 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 18/20] x86/apic: Enable Secure AVIC in Control MSR Date: Tue, 29 Apr 2025 11:40:02 +0530 Message-ID: <20250429061004.205839-19-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343F:EE_|SN7PR12MB8170:EE_ X-MS-Office365-Filtering-Correlation-Id: 29bc1006-2cbc-416b-dafa-08dd86e58b3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|7416014|376014|36860700013|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?a9brD43VfN8nSsuq+gwMwvMux72WYUNyoJb08muSpJGYgdO5+pBFwQ9FzVcV?= =?us-ascii?Q?ZF3uJ+MVe9Vg5MjcD9vFz80P2SpMMJit/Z4iMXL9SXTV4ABngEfrsNwEtagp?= =?us-ascii?Q?K8rccAoJxTwFa7b1Ya5Jx9b6GVzS3AoDiI0L7CSzft4NPTn1Siaa0V4UxC7Y?= =?us-ascii?Q?tMSDg1dua4Jb0YvtdgG/r6og2bMIYDaxcohedW3o1r/vS+3Uwd0BKJp2be9r?= =?us-ascii?Q?p78SUlpXp9VfvI92ujNGftWn6XBdjOP5jgMPyNCuayN6tsVKxNvTQfqsWYbT?= =?us-ascii?Q?Yl0BnOEVAfnsRV25rYLWFwRDKMfZsIlNFaCttE8k72zhXq+SCZjnDGB2MptB?= =?us-ascii?Q?Cw8vQwOeSAbjsnwUGBZKJP50f9txbKBsBD2+SwzOAw7e4QwOWb1qE9Jl4wYo?= =?us-ascii?Q?QAGfoJ2fx9DFZI8udpch1Q/o/JpwgrCI0j7+i24PsHfVASGbuZ24CLt/dH2i?= =?us-ascii?Q?f+HgwqVgE/WNAn7oh77mLobdIe9v7qL2mb2Nca9vy16Xqm2saLRpAnNWrLIc?= =?us-ascii?Q?8QNcFpodqaYa6nfJFOmc22LV1jlsIiLRJQ6vXVaFuZ0PDHRyOwr0Us09Og4R?= =?us-ascii?Q?yPyZZYD5HKScG58gi4KQ2T7BWxH2Izz6XNdAWw1lcATrIfQmhhfdAYXG+ue2?= =?us-ascii?Q?n9bxAkdgB3gt7nun9Cvfnt6cwAQexNP/u0JsEfJDLv/VTdMX2jSSbQpZt6cN?= =?us-ascii?Q?RK1M+CJMWQjjeywO5P7KU0Qhh2IutzjncSCc13KeG8ayT6bEdi5Ods67QUWd?= =?us-ascii?Q?2wE5DntKZKL7hoh/O8wmDplUJWdILuMAjdSllqpXdG30Sc5mijsRnBv5uYm0?= =?us-ascii?Q?6uoIZA259jabwrXO/kr9h7lcg0VP6TIGMhUIfpbBJ2H+kmcCp7m/fn6XPJjY?= =?us-ascii?Q?cAmDWsxbNbcORSlEUFB2e0OY0wyz61y1hr/RBp9A2lz9+Gw9EJypeqKsjQFR?= =?us-ascii?Q?FyHiH5ztnx9zxbznSyaLFJhk3AcP/LLtVRLJSsPenvaQpbinBETbukwSe0MJ?= =?us-ascii?Q?5XRVPB9yr1YVq2JQusPq8tmkpt+hdnk5G5AfJANReMIWUFEtSoXZb35zPpPq?= =?us-ascii?Q?SrqVxU+rE4AGMjLhS2RrXug2TR/TrMMKCULkeB632qc/0ovtAwRiNjFMSYlD?= =?us-ascii?Q?H3sZenYHnIgP9iAGsG4IiJPzoaHTicxSxMvY9vwGr3WABjA0q8RdsMaLt33l?= =?us-ascii?Q?SrkRtKVyMYkdCQJZosHb7lVIpCPaPlNVZ1Da32uSF8ojHWamX0gPdKgID+YC?= =?us-ascii?Q?qUKckcu/7J73yOiBNxDCuMOZoa/Ezm/fd/6b4Ci95IjURrL2rXoKeQCgVWSS?= =?us-ascii?Q?NxHPG5cOocrrnsQKSPPbfgTUUNE6PFG9urr2jZ+WSOEi63uXCPlqeMPdlA6a?= =?us-ascii?Q?H9kRZ9y504UCl2JUsjfgBi5Jj8+EDvh8W0R6eR5DwfssjvYm7DZQo1QcQA1c?= =?us-ascii?Q?nX8M+fgv8adEpdjyLCv10iJSynwe0gMqtt9h8JbpJiTZd6n1n5aApTaTU+vK?= =?us-ascii?Q?w/tsQYXzNBvJv+gHGGYUIS8SN3+s/WTxTr6l?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(1800799024)(7416014)(376014)(36860700013)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:17:39.7287 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 29bc1006-2cbc-416b-dafa-08dd86e58b3c X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343F.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB8170 Content-Type: text/plain; charset="utf-8" With all the pieces in place now, enable Secure AVIC in Secure AVIC Control MSR. Any access to x2APIC MSRs are emulated by the hypervisor before Secure AVIC is enabled in the control MSR. Post Secure AVIC enablement, all x2APIC MSR accesses (whether accelerated by AVIC hardware or trapped as VC exception) operate on vCPU's APIC backing page. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/apic/x2apic_savic.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-in= dex.h index 9f3c4dbd6385..c5ce1c256f1d 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -694,6 +694,8 @@ #define MSR_AMD64_SNP_RESV_BIT 19 #define MSR_AMD64_SNP_RESERVED_MASK GENMASK_ULL(63, MSR_AMD64_SNP_RESV_BIT) #define MSR_AMD64_SECURE_AVIC_CONTROL 0xc0010138 +#define MSR_AMD64_SECURE_AVIC_EN_BIT 0 +#define MSR_AMD64_SECURE_AVIC_EN BIT_ULL(MSR_AMD64_SECURE_AVIC_EN_BIT) #define MSR_AMD64_SECURE_AVIC_ALLOWEDNMI_BIT 1 #define MSR_AMD64_SECURE_AVIC_ALLOWEDNMI BIT_ULL(MSR_AMD64_SECURE_AVIC_ALL= OWEDNMI_BIT) #define MSR_AMD64_RMP_BASE 0xc0010132 diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 7ba296ba26e3..b7caadd1b33a 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -363,7 +363,7 @@ static void savic_setup(void) res =3D savic_register_gpa(gpa); if (res !=3D ES_OK) snp_abort(); - savic_wr_control_msr(gpa | MSR_AMD64_SECURE_AVIC_ALLOWEDNMI); + savic_wr_control_msr(gpa | MSR_AMD64_SECURE_AVIC_EN | MSR_AMD64_SECURE_AV= IC_ALLOWEDNMI); } =20 static int savic_probe(void) --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2057.outbound.protection.outlook.com [40.107.94.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B4CDF1D6AA; Tue, 29 Apr 2025 06:18:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.94.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907501; cv=fail; b=oByjktHc0xsrD7AWv35v0nK1CwQTk5ibhYsvTrNMntIMTBdGo8Q2TWJoXRVaMalZPbcuxjY/JJiM9B1JTtxFPBw6nn9qgT/ZXoiDqnc8ZckCkEOfqRieOo9SzzHusfS68kxmRJ4CQjLU6xJmMYDWDW9X+cP9NCpPWMSNk9Cz854= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907501; c=relaxed/simple; bh=SFEG7BZx5zbUFu5YS2+vLSMLQqbmV0DZoZxjnBDLUAg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=TVzBjxzLQixBoGlXYr/iMmScGLvBZyfLmRUSbgBC+nY0lXi0PQNGiPlLGir5lX4wkG1G+VYSxbiZ+nIMxC3u7H1GRADXFRURoIoU1PEA8zyAW2uyOFIirlgqjvvspHsJzNxVCFXOoPu03DkgCnijTWgYBoh3WYvN3eGRw3BATEk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=ihERkzLs; arc=fail smtp.client-ip=40.107.94.57 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="ihERkzLs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nexiOA/yTnpjB1HKmVydTDqbEAdLCE7NhbKsniBrmjNcjhi5QkTNmFXUgOZjLzL2Xbyzr8ZL/q3AVFEug8f1FqS+q/UsP0gw0UDY1tDi/5Vljh0s+l1EedLKUc9vPkRADzXiYM5E4X79rpJIC+M4yHrPCvZ7Kofh1SR7Jltd5Q/KyuAUYdQvIWkBY581rJbfngHjuQlhMuLHFZCRjBypcPj3FqrXK5huXDBn20L6YSNA50WPKhM6FuA8c4h+i2yGILRQUBKQFfLJtNkD4pHh6vVgJuABjonU28zTI44/+9aBJvmbHnRFMw1c+jzkJJC5x5MXfEWvdLM2t7Ez5+hbHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jDLlvLT2mRP3NS4ypSR9MagrzfdU7pEp1rzaRbKT3os=; b=rrnIQbxRRfPbuhoL1DyvrCWeo7ccoEySRDzG5sqIpDLKc7EyasjiMl7MJdTnEnx5oa4ZEucO1o1PyMsF0ghdcmORKAfz+jqiGDbcZYhFH5dllpLw1XDTlYzKtliP9ygjUTyNsHov7yTJyYstirhaM4MxXIV2DzqERllsHB1h1SyTLjBqxssAQJzJV0G2nZ+LEFRvdogJ+m9LVozpXJ8Fn0PFVeSd/pCtWyIepuW0YshmG5qqEwRACXpH4ZPjYzV4gtuqB1wZ/tLTlaNEaWJhiJFrXA8SUBHxXFegQJBAAQC5V3rzolDJiNfiSX/4owq2ACoQaHcSaHCHUvN8tFysHA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jDLlvLT2mRP3NS4ypSR9MagrzfdU7pEp1rzaRbKT3os=; b=ihERkzLsWj3unnPodh1xDOpKm+mlomyt3+fgeIM90ofmyaCmYyRjGHau42kR00kmJrHjmxy0OZ27r0zjJC3xJ/LEG3eIHj5UifoKZC5sr+DBioe+4b/nyjpOava3RJO1g9NdiHnF6FRf0LCqmWFjWWMOuGXnALYxkFhgsh4wiHI= Received: from DS7PR05CA0105.namprd05.prod.outlook.com (2603:10b6:8:56::19) by DS0PR12MB7850.namprd12.prod.outlook.com (2603:10b6:8:146::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.34; Tue, 29 Apr 2025 06:18:14 +0000 Received: from DS2PEPF0000343D.namprd02.prod.outlook.com (2603:10b6:8:56:cafe::f3) by DS7PR05CA0105.outlook.office365.com (2603:10b6:8:56::19) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.36 via Frontend Transport; Tue, 29 Apr 2025 06:18:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343D.mail.protection.outlook.com (10.167.18.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:18:14 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:17:59 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 19/20] x86/sev: Prevent SECURE_AVIC_CONTROL MSR interception for Secure AVIC guests Date: Tue, 29 Apr 2025 11:40:03 +0530 Message-ID: <20250429061004.205839-20-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343D:EE_|DS0PR12MB7850:EE_ X-MS-Office365-Filtering-Correlation-Id: c7e990f6-604e-45bf-0804-08dd86e59fcc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|36860700013|1800799024|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5jr7cW/mg7JjDk9xRnD0TZaQxgBXXQWcE6+jq9CVixD1lfLe3hrbmEoBW515?= =?us-ascii?Q?m7jXrXEl0ZA+Pxjqw7DZAoGX53pAjCsl9xnd67ZJpvSAr4koNFCslbsdB60A?= =?us-ascii?Q?IV/I1xHwqsiQftfQJahw2ZUM1vpYg1OvVrVkdBxDIQWVFtZ3oGECQANIPGdE?= =?us-ascii?Q?HTlxuvbr1QDx5HIv+YhPhv3x/lvrJEGabMI8nPtesz633VfnKVA3mapMkQgl?= =?us-ascii?Q?u8tXaoFGlv4J3gVhOkTdEtayyDhsNuzKz7JPGSsO7IbNfdVlr/6D9ITga+xW?= =?us-ascii?Q?S4zHOR4k148fBUzQUMzUCbxwSFMmAwqSNjIJUAx83Q98B7kAC4phIHCgVR8y?= =?us-ascii?Q?pkWlQ1bzEvJXG3GrlEXll4Wgt0flCdqF4/sfiS6hj79Yboi+lyaBaeqw8MV4?= =?us-ascii?Q?kWriXppKo5uGuI+lQpjPN8S33X8gZYtyadHdmrMbhomluYS4BEJALMo0nHLu?= =?us-ascii?Q?Q2LikUwf0v7aGLPBklnp1VgnPUWyL8Esq0WqzlTZkeI5LIgj/XhYxVPzgTS/?= =?us-ascii?Q?Z2Q58dEvLRt85pLTRKO9eX9XACwKqa0UAcFc1U6393R2AJH8hTbk70uPbhhK?= =?us-ascii?Q?T0cOVXV47oQB3zoOjM1MbMaLjiXPxN48Uc3SlVlFuprvr/cZssxnfpR1YpyX?= =?us-ascii?Q?dBBppTlOs0iJX8sSPfIN+kKBweapWXO1DJKLqfEfBL/f+4Op0yO/Cvb73ZGJ?= =?us-ascii?Q?SjA9gd3ZWlk2jSuyTtfYF2L1HS0q6N5MEI3mi9r06V2JcoM8QJtZYgt3YnY0?= =?us-ascii?Q?v3w5tdTvIPdQtWB8zHSEVVXUeZ8pc+j6UFi/pTukKq9xMfaDqdnNlMRpyZlk?= =?us-ascii?Q?0wp4yJ4wMzLeeZui8WZ0oU7aOpTHfnSeoWojJbTLq0VHwz/M64CIlgpE05ca?= =?us-ascii?Q?0X9Wg3N4RHSokgR9CTHefin+Sdk+fxhw3mcZUDBOKaXmK3R6kueyYE6WAwyZ?= =?us-ascii?Q?bkSito+/H+tIL+6RpsvIqBXdZ2+V48sBUcyrV9rsj8OiZ8B5eyPa054E5n2e?= =?us-ascii?Q?J4jpJzTbimDe7OCGGhAQG5wcenKXzCLjbQ1z9vt1Z536+/ERLJaiERepArOO?= =?us-ascii?Q?KQDOiSXDCEL9lJppRKguU5ICOaFouxlGprHe7/XsSDXgL9oovLny/tl1E803?= =?us-ascii?Q?VIgEEyzAaP90zT4zdAy3DTyFFOUxHs+QCIe4UUCOyWJYGQMnHzN4NcRawe5P?= =?us-ascii?Q?KYEbsqGiYJ5INZw5okkGwyeR/AuYc//VbXIotgn7ictTT9EoOmQGc3BCtBRp?= =?us-ascii?Q?GgDBG/kArKmbKTmYWBtIBUl9sXxmfF0kTiKZcrkpzigRxsKHN1PbMr7Utus7?= =?us-ascii?Q?di37VvpChR3cOhMHmSKpsr57UR2FtXSkDadz501DRDaOtaR8zUIlXW89HV1a?= =?us-ascii?Q?nVNWBSj6aGD/MXI4iAHR+p4iq0mMO+Z2L9W9oIjNYPE7Q97fJLj9TuWc73Nx?= =?us-ascii?Q?d8E9WlllMhzeCtnbCaLAV/0nbylGZ+vGcykqm8nX1FEKadO2M32Ing3+0ktl?= =?us-ascii?Q?YZu9W2OoeWK6TumI79kGXnF7jlgCf7R2cKFK?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(376014)(7416014)(36860700013)(1800799024)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:18:14.2290 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c7e990f6-604e-45bf-0804-08dd86e59fcc X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343D.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7850 Content-Type: text/plain; charset="utf-8" The SECURE_AVIC_CONTROL MSR holds the GPA of the guest APIC backing page and bitfields to control enablement of Secure AVIC and NMI by guest vCPUs. This MSR is populated by the guest and the hypervisor should not intercept it. A #VC exception will be generated otherwise. If this occurs and Secure AVIC is enabled, terminate guest execution. Signed-off-by: Neeraj Upadhyay --- Changes since v4: - Resolve merge conflicts due to addition of sev-startup.c in mainline. arch/x86/boot/startup/sev-startup.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/boot/startup/sev-startup.c b/arch/x86/boot/startup/se= v-startup.c index af7ba9aab46d..0f9cb02cb54e 100644 --- a/arch/x86/boot/startup/sev-startup.c +++ b/arch/x86/boot/startup/sev-startup.c @@ -623,6 +623,15 @@ enum es_result sev_es_ghcb_handle_msr(struct ghcb *ghc= b, struct es_em_ctxt *ctxt if (sev_status & MSR_AMD64_SNP_SECURE_TSC) return __vc_handle_secure_tsc_msrs(regs, write); break; + case MSR_AMD64_SECURE_AVIC_CONTROL: + /* + * AMD64_SECURE_AVIC_CONTROL should not be intercepted when + * Secure AVIC is enabled. Terminate the Secure AVIC guest + * if the interception is enabled. + */ + if (cc_platform_has(CC_ATTR_SNP_SECURE_AVIC)) + return ES_VMM_ERROR; + break; default: break; } --=20 2.34.1 From nobody Sun Feb 8 11:07:02 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2045.outbound.protection.outlook.com [40.107.244.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 944CC27CB0D; Tue, 29 Apr 2025 06:18:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907519; cv=fail; b=EdRYWeIs6uqJr/uJNGAp2C74sjmSLYyybJmaE8Ywjqltvhqw89yKXzULPzdLxGnyrUFV6x+UJtLDdwe2DSZ8uguv1NvnO4lJO+vQPyoQ09EpqHd5FOKeAPu1IltyjOWriYgq/sveAeNtLkz3Xgg4hAt3FThRDsLSCPsgWa3xhlA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745907519; c=relaxed/simple; bh=xjko/FTzFuviV9UTBy5BL79v8mB3wi9jZXj57smE8w4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tzpMZ3HAwkpH5PmAdQLnM3MbA0oDvlpwCu1RrkPzxg3fk5C2JS4rDGeIOfdRm7pgaG0Lo0ViniTuPJD3QmLEHIMa0BFr0Bq8HEZttRHMMWz6eEGJOZUeSNIEKnYiSN6XPwdq99BrdZQ3dJnqmpGTiKnVyYCYEUABJq76WYGsexw= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com; spf=fail smtp.mailfrom=amd.com; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b=HCRZ6gdA; arc=fail smtp.client-ip=40.107.244.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amd.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=amd.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=amd.com header.i=@amd.com header.b="HCRZ6gdA" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=y0kSeJ1PbbpWQYymlrTIc9rD+Mn9WhP6PHhoqLsi2tA510f9mWC4FmlzGLBa7ZWBlblGqNLzurTBFSfJz3QHml+/zq4Bxk5oahLawxa8wuu/Zn1M+0LI1QiEsrU7nMLsFrtYLNWkwLoqiRlD6evSGsduTPtOPdsDXzOWi4EQWWHhhL2D61CSyFg8cSPxdW+mXfTcNeDtsPmUF9M7irc3xny51YbuaN6Y1ljzAHpVdkDcGrqMcQPMuI3ZR7zENVPh6ZH1srtw3OUMDLmdBDOp3thXqM4SuhSRc9ZUeuhvKSVhtp0Vhbpd7i4MGTpGc1fKqF+Ha0kHTZUS0mZxHpRt6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=GcXKAWMRCNpxrJVxK7t7TP9oh5AhMPrkXgfznXTW+0U=; b=ajvtzqW+W6S3TheKm4ksf1P1tk9l8ohw4M0W0I44yloc6kAYJFBRcIrhXmGCzsnvL15rOZWQm/jfq4UH32AXDsmYKNfT5jjWjKOcreOfpHVkYNB/A2mckxyNBG6hZ6nCFMwKBxPxOkNzX2I9mhkYn5uLXEhofo908yByCCzRd/sZpMGoKAavM4DC3c8JGYQl26Pav1IbGA+8RVa6Ir50MAwMLrN+YN+NfWfiUAufqjLEdcRImUO4lmqOUd0ZyPR0+n8C6xSdKjIwz2asvuJX8uIVaKeoKJW1hwfP6s1a1fZeJHDjI2yjXUg9ewM/dktgImaMhCa5N9hBjpAk9Gjl2A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=GcXKAWMRCNpxrJVxK7t7TP9oh5AhMPrkXgfznXTW+0U=; b=HCRZ6gdA3cVxT7Tt1ZQql/y/z4UecUyYM7T8zKVnACs4PL4FFojkrtXmjm5QBSWer1UUE29yBxNme8o5gUeStShVSjyXGFSH90g3kUgLs9Ttpf+g7DhLHfwy5teSJvnnBI3I0mPWfwO3U2lMkZZGx1SUiCO7WedSc8kYktvjRLk= Received: from CH2PR20CA0027.namprd20.prod.outlook.com (2603:10b6:610:58::37) by BL4PR12MB9536.namprd12.prod.outlook.com (2603:10b6:208:590::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8678.33; Tue, 29 Apr 2025 06:18:34 +0000 Received: from DS2PEPF0000343C.namprd02.prod.outlook.com (2603:10b6:610:58:cafe::e0) by CH2PR20CA0027.outlook.office365.com (2603:10b6:610:58::37) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8655.37 via Frontend Transport; Tue, 29 Apr 2025 06:18:34 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DS2PEPF0000343C.mail.protection.outlook.com (10.167.18.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8678.33 via Frontend Transport; Tue, 29 Apr 2025 06:18:34 +0000 Received: from BLR-L-NUPADHYA.xilinx.com (10.180.168.240) by SATLEXMB04.amd.com (10.181.40.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.39; Tue, 29 Apr 2025 01:18:26 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [PATCH v5 20/20] x86/sev: Indicate SEV-SNP guest supports Secure AVIC Date: Tue, 29 Apr 2025 11:40:04 +0530 Message-ID: <20250429061004.205839-21-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> References: <20250429061004.205839-1-Neeraj.Upadhyay@amd.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS2PEPF0000343C:EE_|BL4PR12MB9536:EE_ X-MS-Office365-Filtering-Correlation-Id: 1dea360a-8d3d-43eb-b977-08dd86e5abef X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|376014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?A0lLmx0G4fNkGL0/twz0M390FzPTiM6L4GVlQ2ZkI7PrMI8h9p0hjcuuwV2Z?= =?us-ascii?Q?QPn+ySxmzv7SwQ8YBN6ZYE60gByHTOLLm/0clVbJ4aphQyKVin98r5K/d1eL?= =?us-ascii?Q?8tGCZSz1aEcxq5ZJdIU9SUDsr8rMfgrx206G1POA62S2grj/61y2mkdIToeO?= =?us-ascii?Q?YcrXkeQ4TyH12Jm/YPU1/9e8weYb+RCXQ4Jat1GHLigeBv/QEgY89CCy9cv2?= =?us-ascii?Q?hOMyaW2Z0zhQtvyppX77FfBBZRL7D68KxBNfko0QAS4JzXMr2G5NFqjx+zaw?= =?us-ascii?Q?KqC0olRz2Jby3l76mEXgZeH8GrDh7TIaZyEcj7b+Bj4m+Mg5hxqt4AnztENh?= =?us-ascii?Q?BzxxTZwN9MN4Jlg9rqdH+ebk9BZlHiaMBfpkhap0PeqMjE81Td38TjNrDhh7?= =?us-ascii?Q?acYCL5XwoI/qbvfznW7ooL1qGm9oN98ZTZbDaJIrv3TziG0WKKlsO5cPDojC?= =?us-ascii?Q?HS+4fCRt7hKx/PRVCQLL26rBgsPn4D7+vpNH5K8K45jOYmZwQZoofAVWW7mJ?= =?us-ascii?Q?5KpkcLxOmPkR9MuxZ7Li7Afqnj4B3xXKg99B6KwS3JAJGMcV+oFkOzga2W26?= =?us-ascii?Q?PPdC9Lw2WRrCUswV64xHDrFq6WFbjZECQByxpnSDXsxe7amkPpQ7nWBAfUEq?= =?us-ascii?Q?Q619Nsvhkm9cKuYPWheuIxa1DfVNagh+Eui09fbP7TCzQ8ZXdH+6x+aNrZYg?= =?us-ascii?Q?13MN0FBN3kqUS7nn/xZdqseIYXV/IdMY5RqvvQ4CFw1gO4nTyYyAVSLGg/WA?= =?us-ascii?Q?IiTFm6dPPTzNVKTjIgzkfw0NJ6Y/mAxq/gi/iFUbxmb+XS6RVG8/8K2mhhIN?= =?us-ascii?Q?hafIWijWNnRnCuRunlWQGiiG+EYTluzUjCqExIFlO0WT8bpzJRxMCQp9d4ki?= =?us-ascii?Q?T4lDaEZt4bbC5T7ovmWdIIgIvUF9wjQuubdKrmUaf44m3MZR4E8i57hM49K1?= =?us-ascii?Q?CX3UOLQZ2Od/vjHmJXLywG8FfQsc0bjbNT8B67JRk6A5MdCNl/xDSCVIiHnZ?= =?us-ascii?Q?bfVKamduJUrMNnHws8+SVni7JSwslllioi/tjWGu8M4yTjymrZtXA4lLZk3H?= =?us-ascii?Q?up2257BX2BG/J1KxatoMaOEAjws2Q6Ya1UGvsUW679TnmM146GzTK2FX06WZ?= =?us-ascii?Q?t5ATGJewCD/pKf6IQg+sDVLbteXYsD5j0SW84wHuPPMd7+MLsmEm/HwcwiiV?= =?us-ascii?Q?3Fg7bJJldn2QdnqXBF9nDMojs5Lqf2RK6Rd2kthue5d6SvG0/dcwoX6qdg+e?= =?us-ascii?Q?pgi7/MrKEMhrS4qs2B4lRrdWzSne+0LV4S2LMW1UmmNmhzhcnlg9hWPbNct2?= =?us-ascii?Q?KxWX28uG6V4wFfqsvWZovMsz0YzkPxpY7gDY/tA54bIugPi7Fp8dX4RilqOr?= =?us-ascii?Q?mzHGCQ83hfrSokk7+7t1KmBICLDzHN+I5THETPOUNyOyyDWvv2c2vsnSPqgM?= =?us-ascii?Q?IVyw7OQe1xq3k7U/60iVgtqUedXMtvk/paLxlFllvwD5zY3CWUe1EthcArRX?= =?us-ascii?Q?uP9lkQ/iTJ4XjMYIqZTI6IKOWfwbpTTzoTtC?= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230040)(36860700013)(7416014)(82310400026)(376014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Apr 2025 06:18:34.5888 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1dea360a-8d3d-43eb-b977-08dd86e5abef X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: DS2PEPF0000343C.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL4PR12MB9536 Content-Type: text/plain; charset="utf-8" Now that Secure AVIC support is added in the guest, indicate SEV-SNP guest supports Secure AVIC feature if AMD_SECURE_AVIC config is enabled. Co-developed-by: Kishon Vijay Abraham I Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay --- Changes since v4: - No change. arch/x86/boot/compressed/sev.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/arch/x86/boot/compressed/sev.c b/arch/x86/boot/compressed/sev.c index 795c1bd74141..e53d3562d02c 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -367,13 +367,20 @@ void do_boot_stage2_vc(struct pt_regs *regs, unsigned= long exit_code) MSR_AMD64_SNP_SECURE_AVIC | \ MSR_AMD64_SNP_RESERVED_MASK) =20 +#ifdef CONFIG_AMD_SECURE_AVIC +#define SNP_FEATURE_SECURE_AVIC MSR_AMD64_SNP_SECURE_AVIC +#else +#define SNP_FEATURE_SECURE_AVIC 0 +#endif + /* * SNP_FEATURES_PRESENT is the mask of SNP features that are implemented * by the guest kernel. As and when a new feature is implemented in the * guest kernel, a corresponding bit should be added to the mask. */ #define SNP_FEATURES_PRESENT (MSR_AMD64_SNP_DEBUG_SWAP | \ - MSR_AMD64_SNP_SECURE_TSC) + MSR_AMD64_SNP_SECURE_TSC | \ + SNP_FEATURE_SECURE_AVIC) =20 u64 snp_get_unsupported_features(u64 status) { --=20 2.34.1