From nobody Tue Oct 7 14:45:08 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2056.outbound.protection.outlook.com [40.107.244.56]) (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 E2000224FA; Wed, 9 Jul 2025 03:33:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032001; cv=fail; b=MGmtbyL0bB8rqGeputh/eha0Gw1TSr6vZZiuUcsDYLh6XeyRc2SObrI4BtrGuug6LVupxx0NSFi7KGLztO20Ls41gT+Z9x6CeGurHEbNsxf+xRC5Xh06S2XTSVYLsX+OKtRzFSuQbGWF0Q4qvMAjU355fC5WZYljY8zMT6GiSjw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032001; c=relaxed/simple; bh=O2KtX/Iur5DIZ9hdnhuZMv42db8splBeBBHwvMje56U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rZS1qk5RSodhQiFXKmXbVCYpKPSiCKF5yNoWZkZqkqboG304o6Z+EQuHUCNJOjkwmCPfGqy2DEv+xQgFrea4MeM1IB51oJJAS7zKfL65JdARI/rOifuQ25lR+dvjdejMcqHNlQw3bKcbz72OoYq9muN48D/oYYkarWx222+h9qk= 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=pzu1C/rT; arc=fail smtp.client-ip=40.107.244.56 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="pzu1C/rT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Uc6wD+QmIrDltOvU0lAFOrOgs3gG3Tbq0BHPLpMH+X2vH5wvRVz/FZhRce2YnnfaHt/jfbF4EF1EDmLszaGW6CZ4W6Z0zg8t8/lfo0VSOjCkJRQ/avmy3IBRNjTVyt/PsyK3NH2Owb8yaloDLG/5TJgcFy/h4MrzGR8ISq9xVEuSE4BENIF/ynk52rgB49HIuRwQIXBRNeOoAX+MZUoUu+9uirHrlkevHsTPgoPdez/dP8xoissZAeDFOofXHfU3ZMmkeJy2S6RJ0E4yLYvbhhz6qB1iwe2nqnzAKgM28/kvofYZt7gpRNalDtS6EHMExv2Ac0fzrXqc9I3xcAA45Q== 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=lBbEbCdSBq6aqu+ZSNqTQdc6254VALPVQ4Cj6e8I7KE=; b=LWcWNIstj7JL6c2AnRG/XKrHLhlimDsbh152eN9VRFWIgw/4dF+UoHOAaQfAxItZZJb/rksk/h6YDgN07z4ptgvf7Qvc/RDZmbQo8oLdkFvOVq913Ha1BjZ9OEFBh/S86AatnIqn6HQyRDhFYM/aO0Lso75YStEUDeqru7WpBUcxbngIED9POe1s5ebtrPbzeQYeC7sfnwpc2HT2vzDR9y9EnkFB/ZgXM/7fgv9nzLSIOGBgYDM1KfojgScvO/ds0UqvPvHxu/e7Ifuo2364ADqgJ3zlKKtR8UP2FQvoUrUxsjqoK3E8fke94YNLWEtwF2az4rf8n4D+tSh3zwVBbA== 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=lBbEbCdSBq6aqu+ZSNqTQdc6254VALPVQ4Cj6e8I7KE=; b=pzu1C/rTcxHdC4hqTkQM3J1E5PwP98vAIo/xma0CQUxENnaEpFnpHwMhlUi9GgHGlc3QcEsWRv8z+FDM7X+aYCoOgchifH2FZhl0KJVHZUPb9+u4BFoP1MLflV48e5aKtGkVzUY5FODbvUjzOgt6NrJLCLfnm/tD4nx3X88Djzk= Received: from CY5PR19CA0097.namprd19.prod.outlook.com (2603:10b6:930:83::23) by SA0PR12MB4461.namprd12.prod.outlook.com (2603:10b6:806:9c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Wed, 9 Jul 2025 03:33:15 +0000 Received: from CY4PEPF0000EE3C.namprd03.prod.outlook.com (2603:10b6:930:83:cafe::2d) by CY5PR19CA0097.outlook.office365.com (2603:10b6:930:83::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:33: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 CY4PEPF0000EE3C.mail.protection.outlook.com (10.167.242.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:33:14 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:33:08 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 01/35] KVM: x86: Open code setting/clearing of bits in the ISR Date: Wed, 9 Jul 2025 09:02:08 +0530 Message-ID: <20250709033242.267892-2-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3C:EE_|SA0PR12MB4461:EE_ X-MS-Office365-Filtering-Correlation-Id: 316beae5-838a-4c6f-62de-08ddbe99566c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?l2jmtuBro+F2nFAYWGdxL9kVAvGoBq0k/S5ZWIkYnUrrJxyBUUPB3CbantSQ?= =?us-ascii?Q?Ipi8KYfcbUh0ePYcd0+XTE5d3NU36dYotdhQamtrwNE682w4Ujhfr9mxiyk8?= =?us-ascii?Q?3PqR7Oyyf+oVz2xlhaI/IjCzh3Rm7c7BnUyv1LORGMuV4EDM/yZoDFC+6JcI?= =?us-ascii?Q?H6Wz+SASGZrfh4gaXXqIJ9y2jMk9mO+iZ2Fz4IYmd5WK/pxaJyFKcwBi/zoI?= =?us-ascii?Q?TxqJz8eW1T4y022iZqNliyFX1/ZZKFOyXrJ+tg8swrR3akVl4dJELuaPKjm7?= =?us-ascii?Q?kMExA0YOm48DT0sDTUROy0X9lG+UdpezrvdYFwkpTS2XXzv91YFB5yy21qD8?= =?us-ascii?Q?uuvHtXKq58mwolK8Dno1q9P3HLtDeMvxA5wAWAfWZ9Dtvc0spbl03mKixuo5?= =?us-ascii?Q?+6nfHtydX9s/+2OJYU0hPJDQn8TwPHQ1fCmid1feU4V84bMoyo/RHlPXpFRK?= =?us-ascii?Q?XVFeE3V7QEMaODvHGU9H05UC4rFDR0rXkf6P/74zXM4Hif1CguQ9T80y+e+B?= =?us-ascii?Q?s3w82/fix8VxZ4AH0vJsc/STez/ByBlP+cIwnHDFIilZDpMwjU5mcM/REeVe?= =?us-ascii?Q?CjOfwS2gSBvnB2AoZ96+KXZBjDHwKT1G07eU0la45aHC1M9WQPk+Js+yCrWx?= =?us-ascii?Q?EZSJ7hZJpo1ikHhYGQ3j+TOSRHz0E9wqNaEejb2tbqFMkxiObg+VvkjblmDd?= =?us-ascii?Q?yCZHcHLdREn/o7lsx3g/FwZhbUBlyxeD1a4vKNJl1KRUdyhSiOL25QMva7yF?= =?us-ascii?Q?D7m7MusUAIlvJ/YMKOcyJ2cXRYQZzwj+VgT2eMeLXbXlQeg2s6GQH0r/NfoI?= =?us-ascii?Q?x78pNZAQAv5zUmJbJaEVvqYHWmqg3Iz5cUrgKYGv6+Y0Rak4PaXwLffeV15r?= =?us-ascii?Q?u/SY2sFtgiMu6tkF43tEBvqsHXdbSBgnebDBpXHDB+uSVV3TUSaMxeV6Blig?= =?us-ascii?Q?IyvodsHjfJ29HKGI2TMoFByWNBrJng6AQoJ7AjgS5sOUjuyoOfNiMboEbRfe?= =?us-ascii?Q?fivzRp/42x1308sVqExX2pm4QK1qW0BY5mr/kQOD19Zh5jl2e95RNp703hcf?= =?us-ascii?Q?SG/nG9yYKeC5Qwup+cwNls6QaJSAh9qYkZ3sYoeUwl7Ark/Ba3T8XA+i7i0d?= =?us-ascii?Q?Mka+qc9dOAMvAPs7Bae7FoiXC5mTZqumhMOXBwjoxVmyrtMKcI9IFC4lxTOn?= =?us-ascii?Q?xc5CcJKOq7w1ra6LMNopKQtAQGKIHYSpZdeozHSwjGagYptUj/FjVlN8I6iQ?= =?us-ascii?Q?WkAfdFM45txbmxhuepqKXKKJxn49mKMFTkWXlWl76MYBX4DHL4nWivnM/Jzz?= =?us-ascii?Q?1zb+K0HdEqdRGAZdZ0kFfpszjOVJnZdN9CzYYH1jYFjkoBoJP/dQwayhOY70?= =?us-ascii?Q?f9VRQxkhK5rCZy3Hk4Dluz7YJ9YKNsBZu/5ory45jaLz6wBWYyHEcPPhq8g2?= =?us-ascii?Q?Dah3Xfi4CfJ2xCFgH08WTjsWLJev9FzjWKvE0qlzRKW5bWy26Xh5wUDrHFC9?= =?us-ascii?Q?+syks1YNMp9/jvcFlK5BfYm6ON5hb6JtoNrG?= 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)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:33:14.4820 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 316beae5-838a-4c6f-62de-08ddbe99566c 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: CY4PEPF0000EE3C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4461 Content-Type: text/plain; charset="utf-8" Remove __apic_test_and_set_vector() and __apic_test_and_clear_vector(), because the _only_ register that's safe to modify with a non-atomic operation is ISR, because KVM isn't running the vCPU, i.e. hardware can't service an IRQ or process an EOI for the relevant (virtual) APIC. No functional change intended. Suggested-by: Sean Christopherson Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Removed "inline" from apic_vector_to_isr(). - Commit log updates. arch/x86/kvm/lapic.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 73418dc0ebb2..013e8681247f 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -125,16 +125,6 @@ bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int v= ector) apic_test_vector(vector, apic->regs + APIC_IRR); } =20 -static inline int __apic_test_and_set_vector(int vec, void *bitmap) -{ - return __test_and_set_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); -} - -static inline int __apic_test_and_clear_vector(int vec, void *bitmap) -{ - return __test_and_clear_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); -} - __read_mostly DEFINE_STATIC_KEY_FALSE(kvm_has_noapic_vcpu); EXPORT_SYMBOL_GPL(kvm_has_noapic_vcpu); =20 @@ -744,9 +734,14 @@ void kvm_apic_clear_irr(struct kvm_vcpu *vcpu, int vec) } EXPORT_SYMBOL_GPL(kvm_apic_clear_irr); =20 +static void *apic_vector_to_isr(int vec, struct kvm_lapic *apic) +{ + return apic->regs + APIC_ISR + REG_POS(vec); +} + static inline void apic_set_isr(int vec, struct kvm_lapic *apic) { - if (__apic_test_and_set_vector(vec, apic->regs + APIC_ISR)) + if (__test_and_set_bit(VEC_POS(vec), apic_vector_to_isr(vec, apic))) return; =20 /* @@ -789,7 +784,7 @@ static inline int apic_find_highest_isr(struct kvm_lapi= c *apic) =20 static inline void apic_clear_isr(int vec, struct kvm_lapic *apic) { - if (!__apic_test_and_clear_vector(vec, apic->regs + APIC_ISR)) + if (!__test_and_clear_bit(VEC_POS(vec), apic_vector_to_isr(vec, apic))) return; =20 /* --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2043.outbound.protection.outlook.com [40.107.237.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 DC43E1F866A; Wed, 9 Jul 2025 03:33:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032020; cv=fail; b=eM3sI+RKTKG+vAvjhYMhUrG9B1CashQaMU8PooLjsKsDRebsjtsbVgRkOjRu5WHBqDS2V9YhlbZ26PUyRak0/YkgIdkjKqaND2BnwE34sru+62f6MSBf+/Mq2eHetcuLho8i5/MzPHlzUk+hSR1ng+dc39rvZbIXrGSCY482tJk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032020; c=relaxed/simple; bh=08n80cV4ol+axWQGUc9PVqXM6dOl8dokDnjnBycVINE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=j0nfHcZ031ipcqPPZ39c8Ddm7MAwaDQzjA4TEW4CA/wc/0IQrPxHYmCQU8+RkoJnvhTCOT/dcpe1ZrEtCCa7VRyhinS8jP2UVGGgEMmCTZQp22k90Pjd99l9ZFbKmxkHJBUr/2N91O8gOHnLzpXy3P4ciN6c/JC59R29OU6Z1z4= 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=x8YMRlEU; arc=fail smtp.client-ip=40.107.237.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="x8YMRlEU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LzBcKKlohRY2CXf/5JFs8kBiUav/tCT/txub2xCW5lW4z2omNa5CUCyUpRw2cu2H/GUg6TqFE6Sl7PV1k0lnFsWjomTycvHhRv/TcB3i9azqUb7ETwqrJI6Y+UgbIh6ZDxTw2MkAY3IKMWhFDx5O885gdz0eBYRpD4wdeN6/WGyKpGKD027b0jQBKNS2lhuxHmC5CNlSK93Cs+NxntgxlwkhOG86HADGyAMW7Y2UzwXwE2axhJfSxZ9MJHzgkZjwNKX3QU22/v1j8+Xqeg4xRkAsZhR3i5yBWpHlvbyLc1sA3InLjNirLa/wLEMWCi3V73h16W1NtogbTGCzCVf/HA== 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=9cMnJba8t3uYUFZVIrfaCWJ6HjwCaCfqEIwzwJKnHOU=; b=cyyQNM8g+OqmXrPZxi9EsgDiKnMzK3Sy4MNR/8dXdzs00Cbhm9uKRgk9Rk9J1ocHej0rZ2TUFmJNsgwUFe08q8K13AGrx+jgSolvNZVzo85rUT8GvyjhKAOFRMOe96PoUEXsfH6qgV60fqQ65slqo+sC1esbUSL/IBzflYlsUo+gq9SME/MI86bq/6d9cyRTjgFXKfrbKsu0+8tan8jEKeU3//ksQSZP9Abo0SnUo/QJXFrCiqxshwJExKRcTBPzxYTCUBoqAWbOjMHTnUOFnUIiotUCyDVm/u4h3UoqjDbEoEoiwZD3/Qi2qahX20TNm2/8NlYLFEOteTuazWwROg== 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=9cMnJba8t3uYUFZVIrfaCWJ6HjwCaCfqEIwzwJKnHOU=; b=x8YMRlEUAdtDalG3ERPRlF2UhWryH+4+4OF8Lek8Xtb75AH3cbl6M/wMGa468HuBDMlogWAIyjKB0gY3xZCvXKQ3eXGv9whcwqKRiYti4707wqtZYPVT9BYZBPg5rYHXqPnUrMhIsOneo7xhd5OC3EI4Zrx4VJ6+gCP4UHu31vc= Received: from PH8PR07CA0013.namprd07.prod.outlook.com (2603:10b6:510:2cd::14) by BY5PR12MB4146.namprd12.prod.outlook.com (2603:10b6:a03:20d::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 03:33:33 +0000 Received: from CY4PEPF0000EE38.namprd03.prod.outlook.com (2603:10b6:510:2cd:cafe::c0) by PH8PR07CA0013.outlook.office365.com (2603:10b6:510:2cd::14) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:33: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 CY4PEPF0000EE38.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:33:33 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:33:27 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 02/35] KVM: x86: Remove redundant parentheses around 'bitmap' Date: Wed, 9 Jul 2025 09:02:09 +0530 Message-ID: <20250709033242.267892-3-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE38:EE_|BY5PR12MB4146:EE_ X-MS-Office365-Filtering-Correlation-Id: f91cd624-869d-4aa7-796b-08ddbe9961a0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|7416014|1800799024|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?g9YJId69wSzmuULFJWH6e58bNRdfvwbV/yaqTiPN23xvwPHxkdnaEHyo3YLK?= =?us-ascii?Q?xRhLQfzzpQIMkXKAMXm2DtRiEC8aGiWjgiuogR3PnnyB91R+5zEWfJI0XhMV?= =?us-ascii?Q?dKESK4Heuc5RiN1q7h48qHKhoXTObSb2UmxGagTZsqbT5I1zmxakvHdWpe/J?= =?us-ascii?Q?aUjeRXlffvm9El4T85//wNHAKcH6aIBc9rTHo7KO2D54uyoD5wNQlO6ojzV6?= =?us-ascii?Q?GmbYyunXfJicqGm2Hhqcvn3GFQQB26igK4n4NZhLJpcPn0CBQjrbpFagymqy?= =?us-ascii?Q?6TY2b3zNQYqJIuT8/gZ/pz7E2kHyfN+j3NWuJpp1mkVe6j7ZZNcVyjRtRb2i?= =?us-ascii?Q?yPVdsoaSRpftuthzdIk2kUciGlpaVFrWsv7j4RvribMtaJO96BkcS6uPL1+W?= =?us-ascii?Q?rCs8weJpi9CpbAifL/63PTrItcwkkaizNW6vBYn6XGswGI1+6g2a8RLqNC8P?= =?us-ascii?Q?Vh3okw8pwWIXCcms00QXk5c8P0Dnt+lzVmKyKFbgth8DrjhQ5gMZbVVw6W4z?= =?us-ascii?Q?3beGDMELH8PWwSgqDFVyB3OcebEukGgF28FHS86386xlLHgwLW5elO9V0pXG?= =?us-ascii?Q?lseOKOtAvOnJDtncU5EAcuwWxKfSWXp+THj6vlUNrrhntTK2sDn7E7aXWKxx?= =?us-ascii?Q?lvfhVmCK9CSNuXlFI5/c1m3o53Sg4Y1rB6qZtkLrF1/18HSYIZ/P+CLJbJzg?= =?us-ascii?Q?KjWOhw01f9Qx5helqTzTqYiMKPCITy1kqnxvwquIcom3SEmRE1T1sIFVbfWA?= =?us-ascii?Q?MH6DYH1N3wvuBdDjEFFcAKqt72QUgXy/K3kQZ/t/qkZwcvekaYe24YFPg1sC?= =?us-ascii?Q?nBvYb3txhW/whXaw2PiRQ5Qs8JdA4Cx85rFzqrKhwrJAgDUPnLa2CCt2+Fme?= =?us-ascii?Q?LqwZRfQ9xqyE0EmRi2qdoSyOVUTgaq442QXEtcxDt1ZVtpGtUiOQ2URBePSc?= =?us-ascii?Q?MGnolr42+osnz+vqTgoE3AWKZH63XKJVurdo7MiJTmk2sngj6DPsQcIgfi0E?= =?us-ascii?Q?/rsqT4YU3c3i4+WjRPSVEu4LuT8D8eVvMN6VzxSHm/mNKs5wBHlveEu7IMYg?= =?us-ascii?Q?MtJlGXbRYKAV5zDL3SDHUTvWhtj/VyWGuIJtUmC3LoCaRQlllMa7QXQ20GAn?= =?us-ascii?Q?1TJfOezNWT6wBaoZI/twuV/+ZqUhkNkbTvGzKwolWvYf3oC04GHqph2MM44p?= =?us-ascii?Q?qBb07ELi9Q9+ejJcIKdcr9Z27axYghSOZUIP67nz9q+JIRIAYkAR9SGedoK2?= =?us-ascii?Q?SXtjOGXfCOBJdPpHTy+J59rY0zGdLJittpp/nZfYnnwpNVo8BJmOnI1+tcTP?= =?us-ascii?Q?Ud0LfA3u3qXrYTdiNDicjuXONfymsfbrd5hG6beP6ARtBYwiaOkewrmJBgVE?= =?us-ascii?Q?6sE1BufUiBb74MDTKXlZZaegu0wkW3ZF2oL9GgIdY+KjbE95/5/+ZJUUfeGM?= =?us-ascii?Q?Eq01UDLNTeT1+5ZjmHM7/5H8egqh3qHU7z0c1RNtCfhGWNBrt32t3WoVn4lG?= =?us-ascii?Q?Vj4AlgZOSu41hhaGIq3jYZCHs6bhNgcVXLfP?= 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)(376014)(7416014)(1800799024)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:33:33.2778 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f91cd624-869d-4aa7-796b-08ddbe9961a0 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: CY4PEPF0000EE38.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4146 Content-Type: text/plain; charset="utf-8" When doing pointer arithmetic in apic_test_vector() and kvm_lapic_{set|clear}_vector(), remove the unnecessary parentheses surrounding the 'bitmap' parameter. No functional change intended. Reviewed-by: Borislav Petkov (AMD) Signed-off-by: Neeraj Upadhyay --- Changes since v7: - Applied Boris's Reviewed-by. - Commit shortlog update. arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/lapic.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 013e8681247f..533daf6dd1b1 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -114,7 +114,7 @@ static __always_inline void kvm_lapic_set_reg64(struct = kvm_lapic *apic, =20 static inline int apic_test_vector(int vec, void *bitmap) { - return test_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); + return test_bit(VEC_POS(vec), bitmap + REG_POS(vec)); } =20 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector) diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 4ce30db65828..1638a3da383a 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -150,12 +150,12 @@ u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *api= c); =20 static inline void kvm_lapic_clear_vector(int vec, void *bitmap) { - clear_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); + clear_bit(VEC_POS(vec), bitmap + REG_POS(vec)); } =20 static inline void kvm_lapic_set_vector(int vec, void *bitmap) { - set_bit(VEC_POS(vec), (bitmap) + REG_POS(vec)); + set_bit(VEC_POS(vec), bitmap + REG_POS(vec)); } =20 static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic) --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2070.outbound.protection.outlook.com [40.107.93.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 A1E101DE2C2; Wed, 9 Jul 2025 03:33:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032039; cv=fail; b=UkTPCB4MMeC/xywRaEM+oVvp+nwTfYZuzT1bCh7M9WKAEoNSpRoU3RcXVsKYSsWgaEPlnjcP7YWzCU02ELE8W4CtwpiYlxU/DJRGIc760rOjngcj/cPT6nkZpEoaZ6wKBkP8WPg56LpI5Xxr0vuZmOZ5TBz/ui+wtiI8MfBE2y0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032039; c=relaxed/simple; bh=gKag/YYmjVfUlL///DuKuHw71DqA0VGKJkXtyFZmay0=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=sHryytX0UXgh/Gd1A1lcjYTz8r2gdynol1A1KrrE90ixCFSbWjYh5WJsDnHUakz5tWX8gHDcDqzPYY2jAr9DvXXWomI4zf3sTXN1SrQl15Q5Q/tSQI3jaiGghKbEWOqbUEEQVbKfwAweo9zNiSqbvsuiQ2rtBOTUMDgAqMMIjAw= 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=o4pEOk7C; arc=fail smtp.client-ip=40.107.93.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="o4pEOk7C" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VRIA7iB27JM7EGcS4n4L84J8vyfyUokHLwV0UHXUMXsh1jy6q5Z2Q3L3BjSE14VRjsjT0qqFzYdxo5OqKbkF/KlclBXb4ssg35ahYqo+Ej6rBRR2wOnTIuVoZCY0qCCrHfPSoGGvzASA2Z2tLlBxpFlz702GwKDOWE+sriq9DQe4Yn4i3lb9jjeGUCVJ4l8YtJviseEZOgnXHFX4YAl0uaQq/aOgjmRGNliq57StCNoSw/Rz8uraay8/TbemN73RTxRkvcNsyVMxhlIBL8TqGq69VnZK8FtZnP8Fi2rE114Ic2UvuSTBt7UmNBkSPEuF6Y9KiMZvLcM5i7Tp3lbnrQ== 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=KMYmA8N6qDUh56yowVOby32oPPpbXkSiY75xTe7tfHc=; b=dxcMe1vmspWJAMGbJc7gJnBQbcqzWi1TUNFSHFCq+qmNZMD60q+osKk2fwbU+UM1UjJWLmE4bhTY5PiRHm7C6G5EpGajcPzQM9PSawxvvI41vfzh+pmd+IXfYpSptiML2HO3fllJj+Orf6nqo2L/t4N2BkjvQIEDrZzpSlpRCpU2s8Sfk3EetAfCGwHzsQLIFSDHBQ+DMeEf2+HOyUTiQPikTdN82L6TNbrNeRmkPANodqiMbRuJb+7g1ME6+UXhxdWFVyXQrQXVlv0LJSEeMHLgIkmIcpvXZ5quZaosCnbHSYFt3Y5fEqmLK0ph4RnW5apnsjXa5U0v1Hs8BAf1lQ== 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=KMYmA8N6qDUh56yowVOby32oPPpbXkSiY75xTe7tfHc=; b=o4pEOk7C8Vvz1UHIeD3RIo5HrZIbux7uB0Ws2khkagKB95YP/+HI9xKpDNGm4SsWVPW9FNrFmMdmQQZaVb0zAaVgLhqco7nvdnFVOXApnVqn3vzMpjIn6CfHO5btjgGVQKD9Gr4nJc3W324AohKl0Bq0rYLhHb/XOCVt1xUSarI= Received: from PH0PR07CA0116.namprd07.prod.outlook.com (2603:10b6:510:4::31) by PH8PR12MB6771.namprd12.prod.outlook.com (2603:10b6:510:1c6::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 03:33:52 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:510:4:cafe::68) by PH0PR07CA0116.outlook.office365.com (2603:10b6:510:4::31) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:33: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 CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:33:51 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:33:45 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 03/35] x86/apic: KVM: Deduplicate APIC vector => register+bit math Date: Wed, 9 Jul 2025 09:02:10 +0530 Message-ID: <20250709033242.267892-4-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3F:EE_|PH8PR12MB6771:EE_ X-MS-Office365-Filtering-Correlation-Id: 7bce798e-3db3-4a67-dfce-08ddbe996c95 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?elS2QR66yk4c2ZxnTGaeGP+Yjzi+WQyO06BL1Xjazr7Kkwc3jzHa2pcdqTX+?= =?us-ascii?Q?cn/Q3GD0F6cNY/2S7XQu91L/lMwykKIwPP0vYFEqSKgLI4Z8xcOlHqYv87Oq?= =?us-ascii?Q?xTiZ4IBShCL0BmGXFmLwi/BG/Tl2GrOaVVyMwwZ79B1z8ojNfQwhdQk0kHMd?= =?us-ascii?Q?X2Nfr0LypllTQ0eUNruZUd8rHLWkHrMc5yEgqSO9u09i3abixiWYqUOcz5Vq?= =?us-ascii?Q?o4TXXg/7wVMsitNOnPjrty24hpQaese1C04IY8YEgx8VFT+ZPxim93ioK32I?= =?us-ascii?Q?qIGqDkZxKC1WuP07p64JEUFWB9VsQ4c1L0gq5zLHBYMzNSfKKg3yELl2HnDs?= =?us-ascii?Q?7jc7MnUh4k2mhGlAQsFTa9Nc6iZmwtoFn5SN5gSexRXwHR/du49Z5VEk3V0p?= =?us-ascii?Q?hK0Rs5+bcMHViwsKVIBOn6NyiUzbpQvJkfH5ff13rg7ZIhK3KUIGw+Sug0r7?= =?us-ascii?Q?gOAENYG9sPQt1zu8hNyMwtlJWSc3XVeux3mD2nFaHEpWv3UGCzEPozC+vhsa?= =?us-ascii?Q?Dmgn0owGVxphh0jdaSG27CvoLuauFXa9b7kMZgwGjzC2tjsRCsVEUj8Sdujl?= =?us-ascii?Q?mtIybXpBqdyQlKgJQcReyij0Jib176nTTgHyKyRiK/4b0TkeNjcKDZIMWAHh?= =?us-ascii?Q?rxx0RdN4NGLUy6nNLh5jwn4R4kb6W2mRRkEK/h7Lamwa9vuTJ2yD9NfARZ2m?= =?us-ascii?Q?/EbfKMNbcfbyNm3OmFfIfGfOXBWWHtUA5dISeSsNkOYfRCkQKaxE530eGRGH?= =?us-ascii?Q?yQ4xvQ9uOuQ97UhAEVyYeB9LTBP/Zvonz/sbHh88OHMsD/s09vaEXII4JA5J?= =?us-ascii?Q?XnZ+PVBxzT7pw9vnoNBMnlGQa3nTbiTl4y7voI7JYcu5gtI5/StPzvtyBQ/O?= =?us-ascii?Q?EvO3kaFyQZDUA6G+cCbl5Kwq7AHiB6MpJdLuexdaZR7zedEPSUu9pNbw8J4u?= =?us-ascii?Q?JxZ8pNVdy/kU+XVjxupvAQKp54KJzjwZttWwlwj08vtzIfnl5wIICdDKTKRW?= =?us-ascii?Q?boUPSjFOtfQ5la2uucrtn1GQbK8+Q7AcQURs0eks3tZJmwYaXjfzfTSRt4CJ?= =?us-ascii?Q?P2b7EcLSMtESK2HJzqH2PF0xfh8HHv2/w6e4SCgW67lpLsbv+GaNLAaKHqQf?= =?us-ascii?Q?r1VZrIPQPgx4bh6R9pTJyLyzknOXcUHGVu4UCyfX4TtAcBs2CB93sD7JlGlg?= =?us-ascii?Q?kIttKGHy0xqiGc9nOUEXrGqRTRTaKHOWjtPUQJ5GQAVHBwC/IpU32LPfuUy0?= =?us-ascii?Q?evE7hcdgu0u3WOlvJEZu92enFTc4/wRvOkmC3klqUSS6NxN89NDvoF1k1XFK?= =?us-ascii?Q?COZr1JLruc6xVE0flJPlyJjkGw3gy/XMUgex+XfbEPzeVE5AHdBI8eiKzZ2x?= =?us-ascii?Q?AJAz7DcYZD4p/j9GF5sZUP5/7w2sWCjmjvjf7YhHcWSxNk5Fb4SJneNQYkNW?= =?us-ascii?Q?0MST+1zMRD/WgAu8ylqV6tqgPYr+m9jyiUIBMaSA4She42ocs7MPu/h8Ytpw?= =?us-ascii?Q?Ozx+BFeha05L1vVFdoiyBD+8iVDZlHYNbNp/?= 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)(1800799024)(36860700013)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:33:51.6628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7bce798e-3db3-4a67-dfce-08ddbe996c95 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: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB6771 Content-Type: text/plain; charset="utf-8" From: Sean Christopherson Consolidate KVM's {REG,VEC}_POS() macros and lapic_vector_set_in_irr()'s open coded equivalent logic in anticipation of the kernel gaining more usage of vector =3D> reg+bit lookups. Use lapic_vector_set_in_irr()'s math as using divides for both the bit number and register offset makes it easier to connect the dots, and for at least one user, fixup_irqs(), "/ 32 * 0x10" generates ever so slightly better code with gcc-14 (shaves a whole 3 bytes from the code stream): ((v) >> 5) << 4: c1 ef 05 shr $0x5,%edi c1 e7 04 shl $0x4,%edi 81 c7 00 02 00 00 add $0x200,%edi (v) / 32 * 0x10: c1 ef 05 shr $0x5,%edi 83 c7 20 add $0x20,%edi c1 e7 04 shl $0x4,%edi Keep KVM's tersely named macros as "wrappers" to avoid unnecessary churn in KVM, and because the shorter names yield more readable code overall in KVM. The new macros type cast the vector parameter to "unsigned int". This is required from better code generation for cases where an "int" is passed to these macros in KVM code. int v; ((v) >> 5) << 4: c1 f8 05 sar $0x5,%eax c1 e0 04 shl $0x4,%eax ((v) / 32 * 0x10): 85 ff test %edi,%edi 8d 47 1f lea 0x1f(%rdi),%eax 0f 49 c7 cmovns %edi,%eax c1 f8 05 sar $0x5,%eax c1 e0 04 shl $0x4,%eax ((unsigned int)(v) / 32 * 0x10): c1 f8 05 sar $0x5,%eax c1 e0 04 shl $0x4,%eax (v) & (32 - 1): 89 f8 mov %edi,%eax 83 e0 1f and $0x1f,%eax (v) % 32 89 fa mov %edi,%edx c1 fa 1f sar $0x1f,%edx c1 ea 1b shr $0x1b,%edx 8d 04 17 lea (%rdi,%rdx,1),%eax 83 e0 1f and $0x1f,%eax 29 d0 sub %edx,%eax (unsigned int)(v) % 32: 89 f8 mov %edi,%eax 83 e0 1f and $0x1f,%eax Overall kvm.ko text size is impacted if "unsigned int" is not used. Bin Orig New (w/o unsigned int) New (w/ unsigned int) lapic.o 28580 28772 28580 kvm.o 670810 671002 670810 kvm.ko 708079 708271 708079 No functional change intended. [Neeraj: Type cast vec macro param to "unsigned int", provide data in commit log on "unsigned int" requirement] Signed-off-by: Sean Christopherson Signed-off-by: Neeraj Upadhyay --- Changes since v7: - No change. arch/x86/include/asm/apic.h | 7 +++++-- arch/x86/kvm/lapic.h | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 23d86c9750b9..c84d4e86fe4e 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -488,11 +488,14 @@ static inline void apic_setup_apic_calls(void) { } =20 extern void apic_ack_irq(struct irq_data *data); =20 +#define APIC_VECTOR_TO_BIT_NUMBER(v) ((unsigned int)(v) % 32) +#define APIC_VECTOR_TO_REG_OFFSET(v) ((unsigned int)(v) / 32 * 0x10) + static inline bool lapic_vector_set_in_irr(unsigned int vector) { - u32 irr =3D apic_read(APIC_IRR + (vector / 32 * 0x10)); + u32 irr =3D apic_read(APIC_IRR + APIC_VECTOR_TO_REG_OFFSET(vector)); =20 - return !!(irr & (1U << (vector % 32))); + return !!(irr & (1U << APIC_VECTOR_TO_BIT_NUMBER(vector))); } =20 static inline bool is_vector_pending(unsigned int vector) diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 1638a3da383a..56369d331bfc 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -145,8 +145,8 @@ void kvm_lapic_exit(void); =20 u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic); =20 -#define VEC_POS(v) ((v) & (32 - 1)) -#define REG_POS(v) (((v) >> 5) << 4) +#define VEC_POS(v) APIC_VECTOR_TO_BIT_NUMBER(v) +#define REG_POS(v) APIC_VECTOR_TO_REG_OFFSET(v) =20 static inline void kvm_lapic_clear_vector(int vec, void *bitmap) { --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2059.outbound.protection.outlook.com [40.107.95.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 345A81DE2C2; Wed, 9 Jul 2025 03:34:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.95.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032061; cv=fail; b=iRbZ6UekSVCAU0xif8QKA7EYou5u3OCvgJbXrnJnWc3M5YPHnUWohUoZWw4z3RuODzZ7SQaM9cjSsvgK+IEAbIFPWYiQBp39zSzSHo3kJzU7FPOPTPhCPPbwaG99TYhGKJilHlJ3k3c8syK+b2d15cZaWuyg6zSDA1o6DtIaUnA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032061; c=relaxed/simple; bh=4mXo8Ob53HdPp3NYES0MeOhD/BUB3x7XVvG+nUbNivc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tWLtPAxckirXEaBc2jV2r3qPJ0HN43lWeMq+sCr4yfQDhn7tfIzL5rWYdEXIzzTsjbwkQ5gsyQTcStaq3AsX9LEa/iBqtqhcqd7iTBrltR1mH1PEMS81M6RRe0ZGri7uOp0pEFKdWNaoHaOBppisvACUuqFTw7D3GOK+wMdP4DE= 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=HHmzyibn; arc=fail smtp.client-ip=40.107.95.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="HHmzyibn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=p6/M0AWy4EJW3TE3fijTIrbFRoM2QjmRRf7XqF8NRXDZb/Hq6vIcImotTvZZAubvg4lQxmZFDWPudOLw9+Z27TFx9nYCdR61rH8rTSyZV9VV3PwDDYDmVDbLnSaM0CWaLSnc5nZ2cZVh30OZv3Y+Ef4mm7IdwctAdp9hRIjIYBzeStUoR/BFd8AJtlIprUvacztvfgJFroLlluiKoK4MPCCBNK9AGsdcTIrkKRg4ALfLCLR8D0+38wKDSH5Xbzj9zwkDZRrf2RHFNuqeRIFfUsBh+oDbsBWW9b3eZ56Td1wdlU+RgzAOx8qU9jRD+Mmgf+RCbM/y79OELTUCAaxefA== 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=S//FiANr8z+daB3W5wyjyXlpUZHYgECT4OFNQGfdFsw=; b=uinhzbkowxWqyqdbuzEaMhPuepFbyBL0FmC3rkmQhH3Tw7DkcJnvOdE35yX+s6EhhqqQfqM8p7OkRXCAHQ2fbXEBbZwF4ZzdwRqYYH+enowGP0Qn/WtVqwKHD8e0GpB845PmdylsABV+Iy3eOthnCeMVwKk0hvjbOdAmdwVeIR7/npS/cTbAhEDrwxWMYs7h8h3vXf2HJMdcge6fz9/nu548ATKwYX8IjZOdKBuXR1Gm4XNF9wVwQP2PKIITpLi8/7z+zVM11c3vvwzxbunsFZuGdeSRqEfNJMIi1VdBbgAohQ52myHmTEvJu+5n05lMycpoQzhoXnBEQw621TIQ6w== 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=S//FiANr8z+daB3W5wyjyXlpUZHYgECT4OFNQGfdFsw=; b=HHmzyibnu98fDPnqwA2Tg7XbwEO9iEzlf+0drsxtPnSDEOsebc2YdzsRTVPKy9x6ygYupBZnbMJ+CEXZ7T4j3wkuZiRghiBub9cimkYt8mrcaR9F+TXIyGzdL8Wv+KSHgOknPa1wnSDfMYdhGHdPWi8FafJB9HuYfPDZHrXS/YA= Received: from DM6PR07CA0092.namprd07.prod.outlook.com (2603:10b6:5:337::25) by DS4PR12MB9681.namprd12.prod.outlook.com (2603:10b6:8:281::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 03:34:15 +0000 Received: from CY4PEPF0000EE39.namprd03.prod.outlook.com (2603:10b6:5:337:cafe::d3) by DM6PR07CA0092.outlook.office365.com (2603:10b6:5:337::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:34:15 +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 CY4PEPF0000EE39.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:34:15 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:34:09 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 04/35] KVM: x86: Rename VEC_POS/REG_POS macro usages Date: Wed, 9 Jul 2025 09:02:11 +0530 Message-ID: <20250709033242.267892-5-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE39:EE_|DS4PR12MB9681:EE_ X-MS-Office365-Filtering-Correlation-Id: ef71ca1a-d420-43e7-a234-08ddbe997a80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?1053aq5hz9bYRgjMJBs35Jqk7wGoipWtQgpl4wQAarZyzBsG18ayg8ANdQQG?= =?us-ascii?Q?xs9XMhl4DAT43vlDDPahr8VsO7JPa11LnQIbqXkI/jd4azXD/G3YS7gyqutf?= =?us-ascii?Q?+kRt4lzyfu29/d3KkNna2f2zGKZ7kMOl5Ik5rRP306/WqEyGMN4U12rWoL+g?= =?us-ascii?Q?usAh289KlJgxBhQB9SkM6eV0SFOEwzVm7XHqoYXxBCPxy8VIwVx17wk/pXPl?= =?us-ascii?Q?qeSvSmbFevIuXMSNhpFOEt49b3/xwz7CXBK+P+aPp7BsW/yPnWWWKyhziflH?= =?us-ascii?Q?uYoa9wy5dKGPBvJt90zC82rvFy989yYJ/B2vTnHh9/kWjge67IQ30N232lGp?= =?us-ascii?Q?+eBxhhHDzxIzx4SgDhd7RbT+z1dL4nM3UQXBpBxqgznH4eNcZ9qAqZvkRb9h?= =?us-ascii?Q?wToSzM1KbqIP06gb87klOlkWALo1/y1QaVBAmOtGLa94F0mjjCgQMarKna+i?= =?us-ascii?Q?Mz8Wxyfkdc6QBHx3KDV/NcNFJwtsGhPXk/lAZo4iiWB9xJvehMAWHBrSqW6f?= =?us-ascii?Q?ID3+/oUCYqcIXOAEBIMr25x+Npj90P4QHQNKzpFq0BhChNjVe11fiCliHPVD?= =?us-ascii?Q?vArQG3Q/Y0PNOn+CyEiitoVU54kaBwCkLZGiX2VVvFMDtBz/p50XK1PRK60R?= =?us-ascii?Q?uzSe4L6h5GmCykxN9gqFTBfgKsKbIxQEErZAPVUGVQ4aDx3Cr8/vEWcE7v0n?= =?us-ascii?Q?PJcOT2qQ6HaPJ/umvfW2FYSXIDZxpiFeKSYw9cwwnVc4DyL084yyCKsx6nxj?= =?us-ascii?Q?fOlX8kVpHA1rdnA3Htmc/uLXoVsONDKojQWpWFVUCWQDZp8af4qUnSaHecDy?= =?us-ascii?Q?OB+JG5+Davqxi6D6fMWq2lGsS3XB0tFqitjz65EkjHSsEEiiXsFkG9ysASy6?= =?us-ascii?Q?6e60H1erm3BGZsjZpx7o+3WwOUHqN/5/SeJuU8duSPH5n7FSVWvdpypeP4Ip?= =?us-ascii?Q?PDSRJFzTJpQO7nYWRuktoRKjluTfrT3q1OcYuVqC6Mw1cLTjbzJZ+Z92dOin?= =?us-ascii?Q?g1H+IzddADZUtjX5W6pkfN0TCKu8+OsVlHPvzKaiXr242uVOetTchOHQHZ3r?= =?us-ascii?Q?h2ELEIhBUOKM8+NWMEqOHsmW3PaEVNc8Ap2LBHJtc/wq8UOw7667F0Ale8Y4?= =?us-ascii?Q?gYrfBiWL9Z8F1ZsJ3+X6YoU+UqHvK95cCTQ0pL60vajNiY2fCKqtNohIa5Nk?= =?us-ascii?Q?3wWLPsSU9B+R2nJQMMjKqlRw6MRSqc3LGTKi9X+neKQDaiOhAouXHzmQRSHU?= =?us-ascii?Q?zBBQNDR6qCJoNoOOiYVd21cvpironsfGw0aTSa7lhOQr11Le0wdXObJ0vfBD?= =?us-ascii?Q?Jcg9nr32cQdoVGmemvF+3Asdo3lZxIzxQUJ87ao2i9A9IzDgxV6XcoZ3M1u3?= =?us-ascii?Q?VCHJMmeRpc2PtQBLPMdHkL4wGfMgs36NLkFbxES4fKaZ5OMrc4+zAK1szsgQ?= =?us-ascii?Q?TetY04X0BARmnnNa6clnHaNSWWXnjnPFCXEABHX5Euy88Bh4myoASqqjRJFC?= =?us-ascii?Q?yTa6qvfXZpPXzgvVdjPBp379sO2P9ksxIsOL?= 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)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:34:15.0124 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ef71ca1a-d420-43e7-a234-08ddbe997a80 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: CY4PEPF0000EE39.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9681 Content-Type: text/plain; charset="utf-8" In preparation for moving most of the KVM's lapic helpers which use VEC_POS/REG_POS macros to common APIC header for use in Secure AVIC APIC driver, rename all VEC_POS/REG_POS macro usages to APIC_VECTOR_TO_BIT_NUMBER/APIC_VECTOR_TO_REG_OFFSET and remove VEC_POS/REG_POS. While at it, clean up line wrap in find_highest_vector(). No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log update. arch/x86/kvm/lapic.c | 15 +++++++-------- arch/x86/kvm/lapic.h | 7 ++----- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 533daf6dd1b1..1dbc1643c675 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -114,7 +114,7 @@ static __always_inline void kvm_lapic_set_reg64(struct = kvm_lapic *apic, =20 static inline int apic_test_vector(int vec, void *bitmap) { - return test_bit(VEC_POS(vec), bitmap + REG_POS(vec)); + return test_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_R= EG_OFFSET(vec)); } =20 bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector) @@ -621,9 +621,8 @@ static int find_highest_vector(void *bitmap) int vec; u32 *reg; =20 - 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); + for (vec =3D MAX_APIC_VECTOR - APIC_VECTORS_PER_REG; vec >=3D 0; vec -=3D= APIC_VECTORS_PER_REG) { + reg =3D bitmap + APIC_VECTOR_TO_REG_OFFSET(vec); if (*reg) return __fls(*reg) + vec; } @@ -638,7 +637,7 @@ static u8 count_vectors(void *bitmap) u8 count =3D 0; =20 for (vec =3D 0; vec < MAX_APIC_VECTOR; vec +=3D APIC_VECTORS_PER_REG) { - reg =3D bitmap + REG_POS(vec); + reg =3D bitmap + APIC_VECTOR_TO_REG_OFFSET(vec); count +=3D hweight32(*reg); } =20 @@ -736,12 +735,12 @@ EXPORT_SYMBOL_GPL(kvm_apic_clear_irr); =20 static void *apic_vector_to_isr(int vec, struct kvm_lapic *apic) { - return apic->regs + APIC_ISR + REG_POS(vec); + return apic->regs + APIC_ISR + APIC_VECTOR_TO_REG_OFFSET(vec); } =20 static inline void apic_set_isr(int vec, struct kvm_lapic *apic) { - if (__test_and_set_bit(VEC_POS(vec), apic_vector_to_isr(vec, apic))) + if (__test_and_set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), apic_vector_to_isr= (vec, apic))) return; =20 /* @@ -784,7 +783,7 @@ static inline int apic_find_highest_isr(struct kvm_lapi= c *apic) =20 static inline void apic_clear_isr(int vec, struct kvm_lapic *apic) { - if (!__test_and_clear_bit(VEC_POS(vec), apic_vector_to_isr(vec, apic))) + if (!__test_and_clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), apic_vector_to_= isr(vec, apic))) return; =20 /* diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 56369d331bfc..eb9bda52948c 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -145,17 +145,14 @@ void kvm_lapic_exit(void); =20 u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic); =20 -#define VEC_POS(v) APIC_VECTOR_TO_BIT_NUMBER(v) -#define REG_POS(v) APIC_VECTOR_TO_REG_OFFSET(v) - static inline void kvm_lapic_clear_vector(int vec, void *bitmap) { - clear_bit(VEC_POS(vec), bitmap + REG_POS(vec)); + clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFF= SET(vec)); } =20 static inline void kvm_lapic_set_vector(int vec, void *bitmap) { - set_bit(VEC_POS(vec), bitmap + REG_POS(vec)); + set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSE= T(vec)); } =20 static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic) --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2068.outbound.protection.outlook.com [40.107.220.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 51BDA20458A; Wed, 9 Jul 2025 03:34:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032081; cv=fail; b=ZasQzffaF1rZJ/h60CKnjTJxcW+wSBptrZmIrM8okN3U+jp6/SGdF8TCKxhBycv0isTGXuWCD1/ZfP/YyE2d730KXrqDKP52F0a3K4bCmiZUsbUb7Qk/fLAKmRAEQhKYnO9OeLKdjORf05e3v8xMCGiw5HMt3SYyK7WNsmIR/uo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032081; c=relaxed/simple; bh=ld56DKkbc1sCtOLiIgC5ZKda6CCmaW19KGsI+nl9XGE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NT0lHrT0HK3068/4UhMD63TUZn5wyJzf5zQrBPrnzsTvQBm71dwvv3gQY9ETTLWmY8FR1beQ0Uj9GyIsLDmlaj5f1qOgOtay+e3GfVrilj7AdXtxJiXQ1F2tzEj7jo9pXYUr0ZlhMP1umTKzSPp2vKBKmxFx2/aTBeerOPsvFTs= 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=hIBeHRcF; arc=fail smtp.client-ip=40.107.220.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="hIBeHRcF" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DvJbQwiiRYlaJiZvPqF+WcS2bYVs92OWOSde/62Ziz6ZJ3EeNBnrDDlpRLax5gHUHSGxIWe21UssesBJB453iScc+kPZViL+/x4Q8o3T/iCJZjXEnw0Ob/fkHzzn0+jbX3i0nx5WpSRP6FZPkcmMZUDu1TEMaRZumRlKveHm+J2NrVkwNvOBZx5UV4ffjfmJgjKCyNSVZ5uvD55B0jbDgb8fz5goMQCJr8b7z0xcK4GxiXZ/IfCXmJQvAsFAkhi/fbp19gLv/DT2kcn4Hg0jpqTwco7o+HMSqrJBpeMnRoOlC5LkuT/aMhe2YlArkkwSPI6QOrfRNKPNtTbq1yOz0g== 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=B2Y8tKBHaD6rzie9nKksMpUhMc7MRiayVkcbJrPBqok=; b=t6CBilKWuKZwB6WKhl9tcMeeNxQCRf9HCaOeRV33U3x265EPkiIc5Wd8fzi8XhxbdAleoT9dBM2SjuODLXYOwtQ7tpAFMq+f9u8M0/0DuSSfgEc4n2Hew3IBUafXqg/Q1Ld7ejxkFxu7zWfMSIyqpy2p/jEdmHmrtzkByVYQMyyE2jITJO96SpTfLaDmq15Z3h1moWPBPRiPohtl58Rikj8wjOryd59KS4O+b2+PmVjlNStUSb2Q4WSa9QosdtEuLWwEUb2Yg1d3uqpRJuYJsv/a9E5+nBwwmHBzi1C60RlmpvAG6C8Kv4JT3CoJpDcsR59Y3+M9Tm6BP4OJpVgxpQ== 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=B2Y8tKBHaD6rzie9nKksMpUhMc7MRiayVkcbJrPBqok=; b=hIBeHRcFCDJU1MfZXY7wZVuhQXSEuIUEyWkZx/zXMhu0lhIyxaOKFixl0vd4qm1YF+3wpSXU28g3q3M9Eui7tKmyqvmhZyCOMNHdsRgQdG8jFtM6UeJSOlBZsQyU8H3TsXZhA3JTg1Ac5iavDMNkYSlHiimVkI6awmTXM6z6p0E= Received: from CY5PR19CA0094.namprd19.prod.outlook.com (2603:10b6:930:83::20) by DM4PR12MB6302.namprd12.prod.outlook.com (2603:10b6:8:a4::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:34:34 +0000 Received: from CY4PEPF0000EE3C.namprd03.prod.outlook.com (2603:10b6:930:83:cafe::ce) by CY5PR19CA0094.outlook.office365.com (2603:10b6:930:83::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:34: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 CY4PEPF0000EE3C.mail.protection.outlook.com (10.167.242.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:34:34 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:34:27 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 05/35] KVM: x86: Change lapic regs base address to void pointer Date: Wed, 9 Jul 2025 09:02:12 +0530 Message-ID: <20250709033242.267892-6-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3C:EE_|DM4PR12MB6302:EE_ X-MS-Office365-Filtering-Correlation-Id: e24d2cdf-715b-4685-c470-08ddbe9985fd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|30052699003|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DIWwM+1zFWZNuGzFiP43A3RMSyS71PZFTNIP4RFhujQd/WomDsXRso84TZfq?= =?us-ascii?Q?0OcAwvLjcLwh0vP/aN3OXTPdo4aRKYiRLxKpDNrlOWvxsHepO/QGX2vJtl5t?= =?us-ascii?Q?Do7438yXxkCjywjSf0C+rdR/wb51PlzTxEI/9GKCPs9u+FApBoWmM+WrxIJF?= =?us-ascii?Q?NH+4NO5LLazj8gi5325sadvvGoZjdTu5cWL9uQWU1jX727mdjk4II+nvpMSV?= =?us-ascii?Q?gSj2JTju+dUNQdjpuv5+LAsOki6RmwQucbGPacze6xVdYYzGBHgLjC8S6XSN?= =?us-ascii?Q?S/H3QCP7f9uNk2uJt7gumgfzu5xyfQHCkFX7WzRGMZd9+OyZyK9dvhrKV9sV?= =?us-ascii?Q?fA62y8GQw8ZsRV2J/3WBJXn+s8/Zx/xn6qvtIrPIniVWiQ0ex3p7WBNfST2D?= =?us-ascii?Q?9+NEgTnC2oCPG5X3cdbm/QBFYDcji3kqpnwBr9pG08v3kK7LcIkc8JUMbFtF?= =?us-ascii?Q?zcdwI23fHVUxCDr4I1bIq2HF8HVXVVGEYnpU/2L74wFuaGRqHsuryrw5XUh7?= =?us-ascii?Q?8sCs6KkPV+mdzrhU5QBBk56NpZpvXUaprkGlBSWuQxdHAb2nG0NaDIsWHB2J?= =?us-ascii?Q?4nntHv1I2U47x/R4ogb4nkons9u+gUfN7/6h0i9eAUTt19kxywBmetqaJOAf?= =?us-ascii?Q?7BZlMZ7Om8lOxqq+m6fDaANXosjfHsondFjyL7qPqtNh2cewIZOlZ2iudkFB?= =?us-ascii?Q?9Oh4yqsp+39I1ASGTCLx780Iy7hF9qXnJCfGCaCGLhRIYsX+e6UFJKkGjqJy?= =?us-ascii?Q?ho7tO46AjpK5E9TyFuKy+mFlTCTqGwY73OT03uuOY1DwF5gQFAjWi11++0LD?= =?us-ascii?Q?fhvDIGrbNfiSOuLtKn936ERrUntgVQ0wyy9eCtjMTJysf3o9XBExLwnHzw1P?= =?us-ascii?Q?o3owlP58GUUxSTlVDrjmvbsd48LjVpPHH8rzpAj1n/MbRoJOXvUBO03s/Pk4?= =?us-ascii?Q?zEHlMwZq/f2ABHpire9mmFlb3wQwwwnN1RttBElOBUJK0YLpfj5DgmJvaHWl?= =?us-ascii?Q?tgdhUEoS6/te68CcQvxUhj/DoGzvgxwwTcuv7+w9DZrKPyRHY+VcWIwZnjI/?= =?us-ascii?Q?M3vArdUbOA8eoeJbbXgxSD0GfHNNPTyDZEqBVUC0jazW67vJ+2cjYzIrLzpR?= =?us-ascii?Q?qMJaJoNvStrqNQKdXB5SuvTfcdJ4hr1/RrQbOFhQx3PIifx+SI7SQ/UHQmPW?= =?us-ascii?Q?bk3Umg/TsGNWy1rCkQRYB/50M8FABDadRjiBcw35sc4DhfA6ofMzg7opvCN8?= =?us-ascii?Q?xI/Tgm8nDlZhsPNGS7cLgZjglrKQA9cs9X7unEJc7UE6uoGWsOC5ak9UwIt1?= =?us-ascii?Q?wNYLMKUIaD7Zktqw+uZ1Nf5gBo+Vlw4Yl6Gqs3daWQ92laP3SY1E5c2Q5XAl?= =?us-ascii?Q?164UwBFmQnTK0woz57O+kyAoKpCenJWLWP+WD976VjwYVNb5h0RaYyEOt8kN?= =?us-ascii?Q?l4A2/Vh3DYmvZm3UjJ23S3B7vI+L3eTqnkemGo4QSwie3Ny7FwtY27Yn2c91?= =?us-ascii?Q?ii5ZY4jOnCBZmV3XXVUqqasUc9ldXj/EowiT?= 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)(30052699003)(36860700013)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:34:34.2868 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e24d2cdf-715b-4685-c470-08ddbe9985fd 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: CY4PEPF0000EE3C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6302 Content-Type: text/plain; charset="utf-8" Change APIC base address from "char *" to "void *" in KVM lapic's set/get helper functions. Pointer arithmetic for "void *" and "char *" operate identically. With "void *" there is less of a chance of doing the wrong thing, e.g. neglecting to cast and reading a byte instead of the desired APIC register size. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log update. arch/x86/kvm/lapic.c | 6 +++--- arch/x86/kvm/lapic.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 1dbc1643c675..3be5f0db892c 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -79,7 +79,7 @@ module_param(lapic_timer_advance, bool, 0444); static int kvm_lapic_msr_read(struct kvm_lapic *apic, u32 reg, u64 *data); static int kvm_lapic_msr_write(struct kvm_lapic *apic, u32 reg, u64 data); =20 -static inline void __kvm_lapic_set_reg(char *regs, int reg_off, u32 val) +static inline void __kvm_lapic_set_reg(void *regs, int reg_off, u32 val) { *((u32 *) (regs + reg_off)) =3D val; } @@ -89,7 +89,7 @@ static inline void kvm_lapic_set_reg(struct kvm_lapic *ap= ic, int reg_off, u32 va __kvm_lapic_set_reg(apic->regs, reg_off, val); } =20 -static __always_inline u64 __kvm_lapic_get_reg64(char *regs, int reg) +static __always_inline u64 __kvm_lapic_get_reg64(void *regs, int reg) { BUILD_BUG_ON(reg !=3D APIC_ICR); return *((u64 *) (regs + reg)); @@ -100,7 +100,7 @@ static __always_inline u64 kvm_lapic_get_reg64(struct k= vm_lapic *apic, int reg) return __kvm_lapic_get_reg64(apic->regs, reg); } =20 -static __always_inline void __kvm_lapic_set_reg64(char *regs, int reg, u64= val) +static __always_inline void __kvm_lapic_set_reg64(void *regs, int reg, u64= val) { BUILD_BUG_ON(reg !=3D APIC_ICR); *((u64 *) (regs + reg)) =3D val; diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index eb9bda52948c..7ce89bf0b974 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -165,7 +165,7 @@ static inline void kvm_lapic_set_irr(int vec, struct kv= m_lapic *apic) apic->irr_pending =3D true; } =20 -static inline u32 __kvm_lapic_get_reg(char *regs, int reg_off) +static inline u32 __kvm_lapic_get_reg(void *regs, int reg_off) { return *((u32 *) (regs + reg_off)); } --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2060.outbound.protection.outlook.com [40.107.100.60]) (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 9AA91FC1D; Wed, 9 Jul 2025 03:34:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.100.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032098; cv=fail; b=NJmfsGnMoCuIKCjGNUqSEpRKkkYXOOCnHawiMfM0T3jq2b3lSKwmNV7AMT9Lwv1MacBTLV07vvRHywo+UIj/apg5KKcl3+WZUbhVH443DRwrkXFZD5sSlLUDwQF/KUhKF1o49Ye3eHgybAEKrjPqdmcBcfm6pdnd+50YN0Kq3vI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032098; c=relaxed/simple; bh=/Sf8/GlUskh7YBTH0kvepuMQpKgY0K5YKN7LIVQc0jk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DRFh9W4KLN2Hi9Ft1lBk/cwk0xR3vztgAYTvSZAGF2YWNny7uzqFVQ3d5CBMnmYa8CIP+Jo3RxZF4p75GuJRFKQoBRF0KS94lHtg5oJttGUaV+etWkj6hS+SE6gsAIoxBi7m9IHTvurZw9KHsXrNwcvqYMJ2Qz4nLjlU2ggw3L8= 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=gTaEDvl8; arc=fail smtp.client-ip=40.107.100.60 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="gTaEDvl8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AB+tEf70cYuvO2XDOCdf3jd7MaYvdGd9XVn8G4wNeyPTKcH6LDQnnQuU04xhYRE2pv6nMQQ5rtdZX06AVR70pyhNKvQwFi2PGefFMCcFo0hLVjx4ALfhNbntwxWftPetfsvg4aXgIMNtjA3BhoQCk66CzRTVnjXLmgU7yth6fH3I6iCpGLPLQ1BdC80BfyapMnNfbuzyE6WoOA19NOFl6LzEgbCFKM0fE/kml1ZqGtJjusZD9K2OziGlL7T6CTRUu+HjY89a9yBk3Xc14a6zCJWBKdS8VQoDDLx53uTdC9WqPUNvHQGpUM1dNdDCA8C74jfFYF9Jg42pNyZ/32yPcQ== 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=BqnI3YLjmCuJFKwi2G5vbMdM3w7IwOj3fLSLFKCuepA=; b=Fr6DFy/Y0QaXiXV6sbx51Ri6zjysJDVYSuCcxNHGyh+feJKB4yS5lw2h6aZiuw7B+tNN135rLL39YrzvmAqXAlPIM9hedNNT7Um1UOydI9VNiJt0Rm6uKp0SWPumr5SqcYm5iL/PLGulJknk3gp3wWoyrqzgrkz5cIQPNay4U2cJsRGwdq6eiASENMGbxHML1J++flm+mEg8IO4fqhddGq6KDV4O7MVvpeWnLy0ATk7AUGDKwl1ye4gBc2HblCHkRFGho/jtXWV2QykyQFzpim/P/51gj91iwjnapBJB3yYhafI6gGDoc7zenqDqO1eSUvYGTGv2Nlh9rvFhmdNqHw== 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=BqnI3YLjmCuJFKwi2G5vbMdM3w7IwOj3fLSLFKCuepA=; b=gTaEDvl8EdS3u3tJAZnIlyZvwbtjJHrjYH2Njfuy81rMNU/LH+OO2+08+xauQmAyOG1Jq7kUhVFcR8AQ8DmoO6fs5fZF/FNI3sT+PYqNxImKM8cuE7m/1VUylrmPB40RkgLLRXDRi6bahw2rxbTFVl0/KPR7LLCCYqc/z6XbwQY= Received: from PH8PR07CA0019.namprd07.prod.outlook.com (2603:10b6:510:2cd::18) by PH7PR12MB5880.namprd12.prod.outlook.com (2603:10b6:510:1d8::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21; Wed, 9 Jul 2025 03:34:52 +0000 Received: from CY4PEPF0000EE38.namprd03.prod.outlook.com (2603:10b6:510:2cd:cafe::40) by PH8PR07CA0019.outlook.office365.com (2603:10b6:510:2cd::18) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:34:52 +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 CY4PEPF0000EE38.mail.protection.outlook.com (10.167.242.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:34:51 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:34:45 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 06/35] KVM: x86: Rename find_highest_vector() Date: Wed, 9 Jul 2025 09:02:13 +0530 Message-ID: <20250709033242.267892-7-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE38:EE_|PH7PR12MB5880:EE_ X-MS-Office365-Filtering-Correlation-Id: 9a7cc0a5-530f-4519-31b2-08ddbe999071 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?aVN0Ghiahy+68WIXjKumh62AYiQIq5xQiT0cdR7eza4RqT2Yp2WpkHk18o0p?= =?us-ascii?Q?6uZMu4M0CNK5hz/8vaMleuGbXMhht2x06+YkzoYTI/VzaXTD+b/pfEe2FdOL?= =?us-ascii?Q?m0LblmL9IInw4H3IKW0icEeP6LBKNosmwIVtrskhxT5M0FlTvjoDwl9z8cTI?= =?us-ascii?Q?K4zef7JePMfRhRPquHKSmJY7V7sbPFaUIJed8G5jmi7cftoxSBv0iwDTUwLo?= =?us-ascii?Q?HHthHOfXJKFSqBEIyuo2dQpIjodDD15ddcX3fcoSg/306zoCelmmCqVBWfW/?= =?us-ascii?Q?qcFGaqgjFe8qkKsBNnBSNe8b1gGa1afS4toGYPhiac62nimQ2uYoIk7A8yae?= =?us-ascii?Q?Lsce/fHUyBGeMJxdI5D/sj/cwn9260wm9tWUskSzLDTItja4Vn528ILYwWrm?= =?us-ascii?Q?gwjhxh45V4U9cBxduvXFCvWtbwPekSbOG5CJOP27K8l5Nx7A0B5ErbkrCDWq?= =?us-ascii?Q?48O3b1/jo8ofHuEPCb9+f0Z4CnNa+ucE1kX7vU7XsvyHq1B0BSHgzbb23j3Q?= =?us-ascii?Q?np6NXDcJFBOA/+pFe80ggp/zxT8Xmd/aitU4YwohsLDKD3kbnHLkQDCcIDei?= =?us-ascii?Q?+GYe9/vSKREmBrdjdpQue3NJvEMCMdJPcYzMvwKx/k6UIQ1N+SpQp19S2ica?= =?us-ascii?Q?nAThDhXNht9PJU5qJ8zhAGE+3/mzqNEq6dE+yJbEcppnYHGiTuhH60eKQhj1?= =?us-ascii?Q?kUVpKLN3iAv8OL28H3vP0IoVjY7sqA7FzTT308uPwlposWO9kUy6gKIi6v/g?= =?us-ascii?Q?ty5EUpnzmh7opwCCP8JUp9DIL4VUGgHHZMWQZJEefwKemZUyrQGAqngzk6rv?= =?us-ascii?Q?dWwPRya6CDaAKYB4SyKa3RQDfCFK+JJEIs0V8lNcCgGZfYt0AnYzDQ8UBp8+?= =?us-ascii?Q?BktIWzHdCvpkihG5Dm2T2cFE/Bwk3qJknpsAJ9HR/8VsQ4MNnBigbL/V8f7d?= =?us-ascii?Q?ge6YWRf4L1tbnPZ8cCeQRyonR3YTdGgvWoAcvBIOZS71HNV4vOIeuboVKe0Q?= =?us-ascii?Q?RxmhTbi5nGrn7l69QqcfbW+gmudyTp7fqhctYxg9IAUoY78lca1w2ZcLR0F0?= =?us-ascii?Q?tbJo54kEO3Q6zHLQW3dI94oruRs+m0bV7qm38Chr6ihdSJk6icacrj4g39c1?= =?us-ascii?Q?zFJh6MDIiXJX9Iv4NVlQw0kuCE7IaNI2z4VwsjSo9HxiJwYygeBAJy+6oJFM?= =?us-ascii?Q?ZfPZ4DGUypicNyWVVwWIky/EGoePsNTBwnJHB0gHzSRNMQAzT09LrXd/E+zX?= =?us-ascii?Q?W0ZGPchVxPCeEY//bvJSk3NbH7kHHOJH0/n0HWAZR6QVb2OKkGtgOo9I3I1m?= =?us-ascii?Q?grAtVnY4EDiZUcIYjHBM+5iELh+cX52lc/AGSup/3tYxw+FafQljtATW3tgj?= =?us-ascii?Q?vTij3Lb3/8oeqNfY9LDpl/Cnea74Et6MhQaoh7UE37hMljDOdfihIpZKW43S?= =?us-ascii?Q?cELHnL+ObaeWhg0HR3c16cSi2VC5sjyHFGpNPcz21YF/lRCrcb/zhXBlJSqp?= =?us-ascii?Q?wjMdBeTkZY+vNmd9Qw0CpHq+zYGl5fu2N5JP?= 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: 09 Jul 2025 03:34:51.8213 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9a7cc0a5-530f-4519-31b2-08ddbe999071 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: CY4PEPF0000EE38.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB5880 Content-Type: text/plain; charset="utf-8" In preparation for moving kvm-internal find_highest_vector() to apic.h for use in Secure AVIC APIC driver, rename find_highest_vector() to apic_find_highest_vector() as part of the APIC API. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log update. arch/x86/kvm/lapic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 3be5f0db892c..d71878a3748c 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -616,7 +616,7 @@ static const unsigned int apic_lvt_mask[KVM_APIC_MAX_NR= _LVT_ENTRIES] =3D { [LVT_CMCI] =3D LVT_MASK | APIC_MODE_MASK }; =20 -static int find_highest_vector(void *bitmap) +static int apic_find_highest_vector(void *bitmap) { int vec; u32 *reg; @@ -695,7 +695,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) @@ -775,7 +775,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 Tue Oct 7 14:45:08 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2081.outbound.protection.outlook.com [40.107.220.81]) (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 26DC3FC1D; Wed, 9 Jul 2025 03:35:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.81 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032119; cv=fail; b=o7kSFUvww8EBmjJr3kixU11dPBuBWdekhclEgyjxy/98ntuVK6osue1VWLujSLnM0+YjLYgKZ/WC12cZm3BEn1cCz/zknV1Oo21inr7JYiDBCD0u7VZtBeUw5LMUY+ZZo5C+wIREhoR+CekFibgft7A8/8A+2TR1dbHYCUx9zC8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032119; c=relaxed/simple; bh=r5YVg8b5o9xn1HXVeOu1oti0ruEDO8Cj8uQ0wTLMID4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iX4Z+FgLD7P2CSdLm+CgF/4e7z80YmMzb+Xy40UrVYgydDJBQS8G7SyQHAtatg7v6If+DFpXsm/UOxikU77BJIvjNz5m1wzPsIj4IPYJRDVkHBBK3FSI55/BiNMI5+86oVE/KPbfYt8HkNpRsurC6ZJUkfLXj/zyOPeWVYPiDh4= 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=UuRQ6EaI; arc=fail smtp.client-ip=40.107.220.81 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="UuRQ6EaI" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=w7WuNjVHmr6Nlo7qsLah/Jb5gYyVOLKr7zAwuK03LbTw571ZrspLsFlmcPv5OEVjcKaAGFu3flkKPAILf2JFtOwyY9Mu+OhBw4Lcyc+kVa9OjSODMfNPdc6GmhkaRYixgx7SZeNMndkNcg7WWNI4L5XVjhvhsZCYzpBjBQOdsRuL56T5ygc3TMYmLvOQagS7JNlUZGUp765GlRjj++35/G1Zqft0qY7ZDkYrCGvU/AN92eKJwWjrsUViBMRfREKvZDmHhX2flSRcOJu4/HLj4WH0v4TpPqDYqO3Q4WbaXzWLiiQkWh7qNh7TrTKUL3I0iBCeIiK5y6+P8qc8uIcwyw== 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=kFe6FOD+L5WOCkpQaHW2ewrKvgItm8WGXhJsGUji258=; b=wbu8cJv9rLFtqFdyfSveWyKbvq7+Ctp45sH0grf+D0YrK40D6INbtECqd5Vxr3EzZrA/SLbgMhZc8ZN7f83MpZUYPsnj5UCTYjbVZU/AmxluMBkv42WbocDr31viwYgVPffuSI3fMctRg/Fbn5vihUJgAkqSQUh8PzN+0tSs5Vl3oa6nHFySqudGe6v+56EQPMqtjzDKvwwnBdciYBYj6cgEEZ0NaP9Rch1Dz17PJz8ugEpxPtegJHfRiqFHbOX0O93vl6AZyOsUhKLT+leqD1lSrfsM3x2ADUCPt2XRSFO2Ge2fStu1Jr4f2uUg2CdXcw2Au5nCa4EVuPlVN8schA== 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=kFe6FOD+L5WOCkpQaHW2ewrKvgItm8WGXhJsGUji258=; b=UuRQ6EaI4boQJc2zTeIy/6a8mbJsiLp+q/PbiBWGRmm8DnhfPsJ//2bMimLtCY7DZcaxliEAE2h5B5C1lOVbpcXE8eq3jrxb3VjeY94Pw3bxamct3zB0gD5HqWWxofyFAOzBXXLWn/dzAjssy1QyvWVN2yObZwm4D0aM8ONATwc= Received: from DM6PR07CA0097.namprd07.prod.outlook.com (2603:10b6:5:337::30) by SJ2PR12MB8135.namprd12.prod.outlook.com (2603:10b6:a03:4f3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:35:13 +0000 Received: from CY4PEPF0000EE39.namprd03.prod.outlook.com (2603:10b6:5:337:cafe::47) by DM6PR07CA0097.outlook.office365.com (2603:10b6:5:337::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:35: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 CY4PEPF0000EE39.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:35:12 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:35:04 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 07/35] KVM: x86: Rename lapic get/set_reg() helpers Date: Wed, 9 Jul 2025 09:02:14 +0530 Message-ID: <20250709033242.267892-8-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE39:EE_|SJ2PR12MB8135:EE_ X-MS-Office365-Filtering-Correlation-Id: 82941724-ab93-42cf-d7f8-08ddbe999cf1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|36860700013|1800799024|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BlniXYXktCxe+eEf6rg9kScx+kwJB0UHbnx69nvoyzNgNGUXogSt0wg3ana4?= =?us-ascii?Q?SDK8EW3gHWzJp3stFK5I01vmX+8mLBoRN0n8XhHqiB5+WxD5iJWv5CSoWYn+?= =?us-ascii?Q?OzhioOaeneBptJcPAgk/bWUMQgxUBXI3PaE4/lzyyBH4escc677sjWSQH+R1?= =?us-ascii?Q?dcfDfs7LxV3FhLbWCwVjbDtVFECGLObBiPA7ouG9tFHasHfXrLqGAgFij1OJ?= =?us-ascii?Q?JApIwyagCvuByiR9I3J6mv35bF6KIemA0qhLv2ehqz3UWxbxPvWVE8TMBWdn?= =?us-ascii?Q?8Ng/0s545QWZ5owZFpNQGFCyujLDVWve0AOXCyds7WFyIOlgiANMU/IhGsLS?= =?us-ascii?Q?VOmb2stzwtiKI+F/izQYYpREANmyRAPDZ1iaAGERCeYnVCC9vrQhFj32ZlKx?= =?us-ascii?Q?Ge6GBVAV0qbditMm5GN1hnB43xWqqfGR61JKrVUWcPkqrG1iaRd6Q9iUsVvN?= =?us-ascii?Q?OzXgC09lJsWYKBYeumgONrPuFRbXAZyujCVNiwYyeSx/fXQVn8nsTJzw25c/?= =?us-ascii?Q?Vie9NT1MAAvrXb22TSocWR+LrptDOiiVhwmfCE4u7n1rrX1GWITmg4tr3lMS?= =?us-ascii?Q?a+jJzB0TAact7MlHit87p9ef6qm1SZqWSuXaIvxWpWy+YG7fWINK0LNEAx3X?= =?us-ascii?Q?KEBbI0Icqu8xHauTtYAKVtzbv6Fc6yoclWYBFd0SHKpFQ9eZu8A/qIFWvV6D?= =?us-ascii?Q?z9m0pemncP++WCAaDaqIGzvAc/tuR9CdReHJ4CRaTtyAris4X++Yx/BGOth4?= =?us-ascii?Q?npfHWwC1I5AJ/RHNJy7bzHnQaLYwLczJs3SlaIPcX09NQjHqp/Kdsns7lXrg?= =?us-ascii?Q?Iu26HH8kNEB15L1JH5K0yXOw4rmf0TKCalV2coFm3bEJ9bKT+p8CoJ0dPqvn?= =?us-ascii?Q?teinITvaopw6QH3Ke8d6VzCajmbXnr+k9VGKLsojcJlXyd+gSlkaOWE0GU8j?= =?us-ascii?Q?LLlJADaevKQXQgkc87wLVMNRmX7OGa0E4lCB0I/NCSvLMsiPLUc3Y4OshmhF?= =?us-ascii?Q?/sZ8oI3cyR1M/eSi/50QkxdnIBvk2nfNEhczPuyf+pQaWWPGvS/Rk6THOuvf?= =?us-ascii?Q?fsS45XmuWRt+0BOZYnSODTJXzkN66FzZ8/DIbEaQpMrkJoqsi92qXIrNZj/x?= =?us-ascii?Q?iL/w2Bzy0XHbAmUfMCECTJDSeYj2VXUqk25ZFk7o0OwH2BTtdcKmjcgl/WvO?= =?us-ascii?Q?89l9WLePTnXMcEoLdVQ0vHNqTXX+g7uPLpVqo9MikRBJamkHtlZgpUnkN5gY?= =?us-ascii?Q?2Vv5jz4SnKIK91J0o+7nvhFpIX67VR3u1UDxNM0SAqYWdEh+rqf2iEHKQsJw?= =?us-ascii?Q?xqTkIKzjeRWn20qCs/MrXx7NfnNObMPftX8JVFnGzg1mO0FiuL6+jdNUxysp?= =?us-ascii?Q?ZB0VRC3PyoRIO+bxPk3fFmEqoqxZMjAmKuwUalWUgYTgt6ASy2fh9/gGyl3l?= =?us-ascii?Q?YBhKfHAYWZfXBcL0wH8nBlaKC5AKQYRloQgzpOmh/c2CNxnMGwYnGSqVa4ij?= =?us-ascii?Q?efaWb7Jl3szDr4WKaDaZRS4gAsjjY7BNy8oU?= 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)(1800799024)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:35:12.7912 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82941724-ab93-42cf-d7f8-08ddbe999cf1 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: CY4PEPF0000EE39.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ2PR12MB8135 Content-Type: text/plain; charset="utf-8" In preparation for moving kvm-internal __kvm_lapic_set_reg(), __kvm_lapic_get_reg() to apic.h for use in Secure AVIC APIC driver, rename them as part of the APIC API. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log updates. arch/x86/kvm/lapic.c | 13 ++++++------- arch/x86/kvm/lapic.h | 4 ++-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index d71878a3748c..da48e5bb1818 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -79,14 +79,14 @@ module_param(lapic_timer_advance, bool, 0444); static int kvm_lapic_msr_read(struct kvm_lapic *apic, u32 reg, u64 *data); static int kvm_lapic_msr_write(struct kvm_lapic *apic, u32 reg, u64 data); =20 -static inline void __kvm_lapic_set_reg(void *regs, int reg_off, u32 val) +static inline void apic_set_reg(void *regs, int reg_off, u32 val) { *((u32 *) (regs + reg_off)) =3D val; } =20 static inline void kvm_lapic_set_reg(struct kvm_lapic *apic, int reg_off, = u32 val) { - __kvm_lapic_set_reg(apic->regs, reg_off, val); + apic_set_reg(apic->regs, reg_off, val); } =20 static __always_inline u64 __kvm_lapic_get_reg64(void *regs, int reg) @@ -3078,12 +3078,12 @@ static int kvm_apic_state_fixup(struct kvm_vcpu *vc= pu, =20 if (!kvm_x86_ops.x2apic_icr_is_split) { if (set) { - icr =3D __kvm_lapic_get_reg(s->regs, APIC_ICR) | - (u64)__kvm_lapic_get_reg(s->regs, APIC_ICR2) << 32; + icr =3D apic_get_reg(s->regs, APIC_ICR) | + (u64)apic_get_reg(s->regs, APIC_ICR2) << 32; __kvm_lapic_set_reg64(s->regs, APIC_ICR, icr); } else { icr =3D __kvm_lapic_get_reg64(s->regs, APIC_ICR); - __kvm_lapic_set_reg(s->regs, APIC_ICR2, icr >> 32); + apic_set_reg(s->regs, APIC_ICR2, icr >> 32); } } } @@ -3099,8 +3099,7 @@ int kvm_apic_get_state(struct kvm_vcpu *vcpu, struct = kvm_lapic_state *s) * Get calculated timer current count for remaining timer period (if * any) and store it in the returned register set. */ - __kvm_lapic_set_reg(s->regs, APIC_TMCCT, - __apic_read(vcpu->arch.apic, APIC_TMCCT)); + apic_set_reg(s->regs, APIC_TMCCT, __apic_read(vcpu->arch.apic, APIC_TMCCT= )); =20 return kvm_apic_state_fixup(vcpu, s, false); } diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 7ce89bf0b974..a49e4c21db35 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -165,14 +165,14 @@ static inline void kvm_lapic_set_irr(int vec, struct = kvm_lapic *apic) apic->irr_pending =3D true; } =20 -static inline u32 __kvm_lapic_get_reg(void *regs, int reg_off) +static inline u32 apic_get_reg(void *regs, int reg_off) { return *((u32 *) (regs + reg_off)); } =20 static inline u32 kvm_lapic_get_reg(struct kvm_lapic *apic, int reg_off) { - return __kvm_lapic_get_reg(apic->regs, reg_off); + return apic_get_reg(apic->regs, reg_off); } =20 DECLARE_STATIC_KEY_FALSE(kvm_has_noapic_vcpu); --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2089.outbound.protection.outlook.com [40.107.244.89]) (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 703FA20127D; Wed, 9 Jul 2025 03:35:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.89 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032134; cv=fail; b=H7Gc+BXh4O832BcWppbjVYQakaAHGHRE1H+Xm0Uot2kaS6coP7/8ZhOS4k3HXyNgY40dZ6I5ZRiXo2FaCLlGW8NEM0LAn0L1WUA+33y31fk1PEB7iobSP/6Fjv2J2IfSz0///Y5QFncIM7SsbYrMbvmIILx9W0a4wT2Qq3kd02I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032134; c=relaxed/simple; bh=/6TqBMzwPeauEO3yqgBMloh5+Ue1n2nhBvHBSgx7+YM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=f61elOW7/NOT2p4iiEWntJDKiXHN71TtiqQ0ho0kACnSeomw7jA2K2W1X6KYzHfkiMo5jNhNpvNCzReqcICwdvr037Ok2gFgCfZnkOWEnWFHOwmtUQdrGP0qETGMNAqRHrdGoBgbF6TMCkRtHrqCJFKYTQ/W7gUOT0mixQqv0o0= 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=R6rDAOBz; arc=fail smtp.client-ip=40.107.244.89 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="R6rDAOBz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=B/x6KCPGogXEqQIBknFXfUoqQHSEIYzT7URFSR5eHcuVCtMaekWQ2mM91vNwPVUYcDOaeB9UbgII0TtZJ1INu2jHZmmPTKZO/X16y0SbLF27RUMDLNXXU+hQUF8aFIVLztA3eLgsdgh8g2KrP5qDI79j/+1mAjOQtrGZL/zbPgk9mVvDBk9ZH3W+CN3vTC+KqORaADI/W3uBV2vGjN8wu+J1a7F8Sj+ZYB1IdZ+QVAI16wqmQjy2spcBED/1zrk8a3/5QS34U585HBmHslGHTlqc8CcV4XDXuugKGFmX0HXVB47R3rsWzV6+hjwyjWF4xwxAR/TEIkljoynbImEudg== 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=sPIdg+vV0yswG9LpHfH0xvdB7xe7oeqcssLhBe9DoUg=; b=wOv0pEiUuHBO3YulA27U7UvPGSmv9MgPHIhJwcnWR/6n0/0KJYLsuAC9Iyu0Wti1CJkBCgWYOATINemA4kB3FfZEo1sgMzM6gyLhZo8POUAzMrVltwUcmb7E4Br9ARwqlfBNm2dHas5tjdifi786qdigi5sAO+ffaRFZXN6zeVITHYm67loKZ9bwnTDVPEFQ8nbO8VOdO3kz+mvqGia5nDMmh2PZr10WXAleD93i/vYli2rcU+c5ouJecnIJTbbIKjNEkAYS6zyhByzYtr3D7jVxHBh7NiO9IzGwWXZWzr8CC0qd9L2imQLjau83IttbaKShoDoJ8i7924pwU+Ixew== 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=sPIdg+vV0yswG9LpHfH0xvdB7xe7oeqcssLhBe9DoUg=; b=R6rDAOBzDb9OidiBou00pEY6vjLH3Vigo5mctODzQgvqMYv8RmBrf0+CshUu4mQNFcFOGUyK+ybS8KwR7sstsi7mSBiXnaYLRhKE9GOqDlrczOxYgiEvDtU6AOkAayS17nUMoO4Y/M6QSPysbqJiQCfrQmFO4PCucBSIJPYcFOY= Received: from DS2PEPF00004560.namprd21.prod.outlook.com (2603:10b6:f:fc00::50e) by IA1PR12MB8496.namprd12.prod.outlook.com (2603:10b6:208:446::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:35:29 +0000 Received: from CY4PEPF0000EE3D.namprd03.prod.outlook.com (2603:10b6:92f::1004:0:11) by DS2PEPF00004560.outlook.office365.com (2603:10b6:f:fc00::50e) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.7 via Frontend Transport; Wed, 9 Jul 2025 03:35:28 +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 CY4PEPF0000EE3D.mail.protection.outlook.com (10.167.242.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:35:28 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:35:22 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 08/35] KVM: x86: Rename lapic get/set_reg64() helpers Date: Wed, 9 Jul 2025 09:02:15 +0530 Message-ID: <20250709033242.267892-9-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3D:EE_|IA1PR12MB8496:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e446042-f7bd-4c5c-5e03-08ddbe99a66f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|7416014|82310400026|1800799024|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Y9UTx6YDzR7cfCDVObDAt6toiQsOkAJnxZgcP45rZkFfzfDesGtJH+VPFYtN?= =?us-ascii?Q?xXP/RcA3qac8qv+hz2NMkrZXLbqcrOM4BvuC5wVmdx/pqbrDFSuuq9XsJxA3?= =?us-ascii?Q?OMtE7Ogl3O4RF4+Uf1q/iF1VVWz5cK842Ws26EbgA+wEfKrdaPK1OkTgmE7x?= =?us-ascii?Q?QNMU1Qn+TdJ9U6bRjPrNE15EDupHNtGUoVz5SIVUoWcQXmdxQAfs0v1LV9Fw?= =?us-ascii?Q?hrwosMJLKazt/M0DyaPaEFrVLM8ydBIG7YKffvtbUX8H0zgTEOlsw2sKvJYl?= =?us-ascii?Q?/7w7U9rIT9/QS20HKuI8Seh8IcSkZpWjxbBAsEG/7SjPEzJ0LLkpNOFyHk4M?= =?us-ascii?Q?T82HXOY+2ZyoVdyz4E3hVjlU7KIJtjh1SYvdBLD0WfaJUPDJajNy1TAEgwYr?= =?us-ascii?Q?6ebHLxzAHSTo1rq7KM3pkn20+sKqJ+a/e+IGwjonB6C4JaP/C/fLzkdM22Bg?= =?us-ascii?Q?VGhoPVyIZdF4XDxhNE1osEmMwp3xjrXXdVJBWZKu1/MjKY/Jfyuz4wXsTmFG?= =?us-ascii?Q?qTTlmSgf+yHHEF63AeIFrXK/2nGd9TzNIJAvGzgN7cZZlB55waLZHW7VCZm7?= =?us-ascii?Q?SgRNnOvr2R35ljhQtHIUDTpWHVHFGv5OwSpcYRSUtYD70+ex/zOgTyagjfzK?= =?us-ascii?Q?ag4c1M4CkaB873v+uXjS5DNRj05llmY+GtiysNr6HBQyJGPFPGaEcFoeZoJT?= =?us-ascii?Q?zyD2mMTk76cLg28XbdgoAIxU/pcH5nouyQUqBT6bnDr4Bl+m2ja0bs9vgj/u?= =?us-ascii?Q?Bc0NOvrPcwepxYIEw5zEPdAObJghMnxbLl2K4ZlbTCyv75cLAe2A3BE4ppRi?= =?us-ascii?Q?9P+i3yQKwf2l2NeJ1hQv25wRnVj6M9IuDHPzeRYJpV30y9ZqWpJrcCW6OjvB?= =?us-ascii?Q?Mi7jwPV1y/581olPrCG5dQM2KqD0AfhVSZxx0XjC9jNNJmio75syGZztdAAf?= =?us-ascii?Q?kpqOBSG8Fzygg4PCb931ehS1VZy1HhpOcbF4JPGSZccOKlzmlxM8bvT+kIKs?= =?us-ascii?Q?OdcyeNJear/kB6klB8rpGXsSoNEv26k9srKKVcml/HhPKbrlzFgrgh7GSZeb?= =?us-ascii?Q?lutsJ9sDDsOQLnuvnUUqAgrxeAHrXSqdLq6+BtNS5eW1XPXtVrM69DFy12Z7?= =?us-ascii?Q?5ukiAxiOnqYwsIWFh53UiYmFvm52jX2pejNachnFAvizgAtkcPIMk4zVU91d?= =?us-ascii?Q?fzD9dbAhGpUU5oO1dyeb0U9BtfPRRlQ/Mpwf+4B8WkiSxS9klPZNYCX1Tnqt?= =?us-ascii?Q?GUwaQWpGBfsbcll5nBQdNwx8+TjP4LGzNur1f74nYNzr6os0kNSV34gGeu06?= =?us-ascii?Q?i5YChWQcfzivFzOYh9UFfLY7WKwNVe6LZ5P95hwalsdEzPjs+Fk15awwkxrv?= =?us-ascii?Q?0AUfSHQCQRJ1gsdbu7IRGJ2Asy95DttGelbHrP62NaoFl4skSZsYwxRq336B?= =?us-ascii?Q?izVdSkR3mkG39tK2tPrJDzRLwCosPGIVorM0g85UjB0GepCu+9og1lK5zOry?= =?us-ascii?Q?U1ZvWKinS31svBqE2FjdjqcVq8e76IGAYNVX?= 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)(1800799024)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:35:28.7172 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e446042-f7bd-4c5c-5e03-08ddbe99a66f 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: CY4PEPF0000EE3D.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8496 Content-Type: text/plain; charset="utf-8" In preparation for moving kvm-internal __kvm_lapic_set_reg64(), __kvm_lapic_get_reg64() to apic.h for use in Secure AVIC APIC driver, rename them as part of the APIC API. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log update. arch/x86/kvm/lapic.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index da48e5bb1818..06d33919c47d 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -89,7 +89,7 @@ static inline void kvm_lapic_set_reg(struct kvm_lapic *ap= ic, int reg_off, u32 va apic_set_reg(apic->regs, reg_off, val); } =20 -static __always_inline u64 __kvm_lapic_get_reg64(void *regs, int reg) +static __always_inline u64 apic_get_reg64(void *regs, int reg) { BUILD_BUG_ON(reg !=3D APIC_ICR); return *((u64 *) (regs + reg)); @@ -97,10 +97,10 @@ static __always_inline u64 __kvm_lapic_get_reg64(void *= regs, int reg) =20 static __always_inline u64 kvm_lapic_get_reg64(struct kvm_lapic *apic, int= reg) { - return __kvm_lapic_get_reg64(apic->regs, reg); + return apic_get_reg64(apic->regs, reg); } =20 -static __always_inline void __kvm_lapic_set_reg64(void *regs, int reg, u64= val) +static __always_inline void apic_set_reg64(void *regs, int reg, u64 val) { BUILD_BUG_ON(reg !=3D APIC_ICR); *((u64 *) (regs + reg)) =3D val; @@ -109,7 +109,7 @@ static __always_inline void __kvm_lapic_set_reg64(void = *regs, int reg, u64 val) static __always_inline void kvm_lapic_set_reg64(struct kvm_lapic *apic, int reg, u64 val) { - __kvm_lapic_set_reg64(apic->regs, reg, val); + apic_set_reg64(apic->regs, reg, val); } =20 static inline int apic_test_vector(int vec, void *bitmap) @@ -3080,9 +3080,9 @@ static int kvm_apic_state_fixup(struct kvm_vcpu *vcpu, if (set) { icr =3D apic_get_reg(s->regs, APIC_ICR) | (u64)apic_get_reg(s->regs, APIC_ICR2) << 32; - __kvm_lapic_set_reg64(s->regs, APIC_ICR, icr); + apic_set_reg64(s->regs, APIC_ICR, icr); } else { - icr =3D __kvm_lapic_get_reg64(s->regs, APIC_ICR); + icr =3D apic_get_reg64(s->regs, APIC_ICR); apic_set_reg(s->regs, APIC_ICR2, icr >> 32); } } --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2056.outbound.protection.outlook.com [40.107.102.56]) (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 AF755200127; Wed, 9 Jul 2025 03:35:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032153; cv=fail; b=SfOQsDTFF/G7FZCByfVO9Ytkk/h49eMomoFYTyTC7sTtG5FKoswNo+3NLG3Fe7xHgXSZnMobDDtNdlTxJ8F1yToqc6qQPzqc24pmtabH8iEDAcDwk3HLWeZhdemm5oBpjaI8DhPvIp0OHkalSAcPmaEl+0bGwq7TPIS/EhO0/Lo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032153; c=relaxed/simple; bh=QfIAaTkDpPliWRLkA/iNVSh9WNiR8AEy/WUdx4/Aia8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iIQGmqMgHXVvKSUa/YGGY783vnyegVsb7Dmj1xrQYhyyaAZAWmMhhtjALsT2JCgf2oqFjJSYEa3qtNa1nm/1njCC61XXUiB83jUOfpwt0cPrdvsD/vN1hAnKgDVDIKA2hMMTlh4U5s40T6nkji0SaRsoGSTjUfZCvQOlYTZBIVA= 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=jOjBfoFx; arc=fail smtp.client-ip=40.107.102.56 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="jOjBfoFx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=O8STnK9FiOdfL1jV+f9orrXfchtJkONgrZP6NvlBKk/gV0R5AbCYFlR77bQbTwIQpVP3vSmhrzoln64dFa2VsTTt3xWj5jd9yF7pRARQnSbTnjQTfRSp3EJzeuu1hZrlYBJ/tsWBifHbeGckZX8pkzXLXQRHllX1L1xS85SH0pDrQcSEI+merm+SuWLZYXlsu6oPZjUNhLI0AcV8fJUt/N5Fx3mC3pQp2Tzc0fDrj2seGziJNngB9Li2Rf5Brjv4YxXrOOuJ2mZYX5mXSKuywe5pN5nf6XiTvq9yxm2KwS4FfvMOXrPnefGRUCm24kDYLRPKZ3HkzDYlLyNh9tbWgg== 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=w9rkr/4BA5Fg2U1K342dQy01ORzClP5nu0O6F0SVAeo=; b=KoOQLRNFPftzySpeQYtxZDj00ZEAXnt77tHj+F9cWnJnp+7gQfS8NP12ETfMHfrX+UA/C3kWf+JGAfxpuMahZzKMlv9/Mogd6zUZZTPWsxY3c70Yx2wpwXwcVNWeP8jFPHfiu4VsnjA/d7qZ7gkWc+NYL+GcC4Lh4A+l2DVujdcu5aV1ep5ncr5KAssOK0iyKyv56Mtl592znqeaVpin3TSGRy+ruN0kBckOdR7kc+YAj3IVIayVXOK/BK7xSltWTL0ijJV7d5Zn7yARtKkasEuBnmkIX3LI0ktWUIYze5VHfsnFP3Felv2AG96SfGcj6EpTSPtSBLx9LeM2WrSzgg== 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=w9rkr/4BA5Fg2U1K342dQy01ORzClP5nu0O6F0SVAeo=; b=jOjBfoFx5KuBfllfsU/tc7S2QjHzXFRV/7EG2pUu0KQ+147IQBAtycBoZdoJ3Vx1MXUvAYXh2tXNmsRHb8sHimNW4MRm6oWQMtB8OrAPc44IGT95mjWbvgax3u+liOawJBHTi/lWukPmOA3amnn3SXfbtJoKSDX1rmKvZiEhcb8= Received: from DS2PEPF00004566.namprd21.prod.outlook.com (2603:10b6:f:fc00::508) by CYXPR12MB9280.namprd12.prod.outlook.com (2603:10b6:930:e4::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 03:35:47 +0000 Received: from CY4PEPF0000EE3D.namprd03.prod.outlook.com (2603:10b6:92f::1004:0:11) by DS2PEPF00004566.outlook.office365.com (2603:10b6:f:fc00::508) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.5 via Frontend Transport; Wed, 9 Jul 2025 03:35:47 +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 CY4PEPF0000EE3D.mail.protection.outlook.com (10.167.242.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:35:47 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:35:41 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 09/35] KVM: x86: Rename lapic set/clear vector helpers Date: Wed, 9 Jul 2025 09:02:16 +0530 Message-ID: <20250709033242.267892-10-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3D:EE_|CYXPR12MB9280:EE_ X-MS-Office365-Filtering-Correlation-Id: 1877a9d4-cd6e-40dc-0174-08ddbe99b175 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?uQEvCIrfx2f2k7RGasUu02O7fB8GUAaWtl7LRQitCQEALEUKPBybRtzpRhqY?= =?us-ascii?Q?6rDw3MwRgvluMnea3pl8BSTTXmUAHLLtPzt+N4Mz7/Fw1sTDSInNAw39AhXO?= =?us-ascii?Q?DpDeGrdhXUCgzCAxk1kQHapmm176ppoEeEUIo5s03QoY+yx37EhIJpgfrr7e?= =?us-ascii?Q?YppcT7Unq+C9q/WFKjhiq0dqBgSFgun35qvfE6kn5HBFe583e8q5Je0A/kVY?= =?us-ascii?Q?dYB7WMuVlCcLckee/ZrWcHSS5CAYOU1D2dkKnvvraDgOOZkUiL9vMIDwKmOQ?= =?us-ascii?Q?sDQCxiu2p+0EgkqBu9aFGC1yR4M/w/f8JgP3h2jmsNw6N2UF7DUyYe1G2fNM?= =?us-ascii?Q?vlnOq+RJ+88DjxpFpRcQYKgOjLFDN7w7iJEnIzWeQjrD3xjqNNIcKEo5UqXs?= =?us-ascii?Q?gv8JyRdsDC4KFM7NAzyU1CU42gVkKSOMMOwWYeY0rLmtUwkRe5v1T+0KiIPP?= =?us-ascii?Q?i6o1AJCbNEVdOWoRqxTwETiR/vUjIEAhrz/QNO22qsY95slmfYaaajiKVdr7?= =?us-ascii?Q?KvCGFzyImdXccQyDxMcO/mE9SRlyce0kZcE957UPY3IaKbT+U3pOnl1V45Am?= =?us-ascii?Q?inmvCl/xied+h0qxDGx/kAS/E2a8FFodNf6vSICz4ftzCg3TY9/EZJ5uMqLq?= =?us-ascii?Q?9v+hchl1g2Bk+SN/Q2m7FaSs4z+MwhuT89U9kYr1ZCzor9J4Jfp9cmJKAVT8?= =?us-ascii?Q?My00blgH5M2jyN1Pn1xlrtbDG928umke0WZap+/yU9Y9Ktb694CawMZc6j7O?= =?us-ascii?Q?KWdducCAeZh5qBeYYsDToTQjdvOsGNtgYuV8IYrpub9uj5F9wpDLySYW5dhm?= =?us-ascii?Q?yMe8DoBjLBV6KbPd0Nj0cxOPXEeB7uNHlKpOAbqUMx/d8Crwz6fj7O7y6mGJ?= =?us-ascii?Q?+khjtcXs9ZCRmHu26Gyw1+ik1L7ZvhLg6dRBOEAs+UXpg+uUAjlK4beUlhHX?= =?us-ascii?Q?IzWktg61jqjzcIvoAlAcLXkYGCJZlIsIPdlt27nEK1FCqbLcr9damE0KK2H3?= =?us-ascii?Q?qKuPvva/A1mMZ9fMNgapiftiFg8YsnuXnRojsp5LDhIXIWjRe6g5PYisd6vU?= =?us-ascii?Q?nsIMpzHWPSONuIMct2/GxNMkBaTWMBPZzc3lh3HO4cA3qp3HSBVLrmYxwNT6?= =?us-ascii?Q?NYaUj4zS3wDC+QlvVAhQAGFH3BCgbuWzzTyxCU3HlWcLQFqNykau16j1qHxS?= =?us-ascii?Q?70bnYfbmB7bngjIdOCX+6YY4lDJQmcNlbudWemhaP34hYSfAYwHX0uo7bbrQ?= =?us-ascii?Q?KB1IhGRDr67l4omiT8g/9chSf72lVGXcUahBU2KoBf89drReEoscuVb5YvdQ?= =?us-ascii?Q?HnsmsjHVZNM4fvmEXeGzabN/Fkc3PrY45McbThTxQW4gidr5GKFK8cmBNKqt?= =?us-ascii?Q?cHghK3tgrmBuRAXEpu5OSSzzwVrdFbsx3+FFi6rkT9dZ0GKSmMFLAbsvPYeT?= =?us-ascii?Q?pi+DotzF6A1tftME4mzf+mUOJ84sRhKJ9q+zBFRDMoImw72mGTSD0Mpfu5XL?= =?us-ascii?Q?69s3cKg3CYUyKJZbXuhGC+hI+4J4w4ih0ZR5?= 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)(1800799024)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:35:47.2111 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1877a9d4-cd6e-40dc-0174-08ddbe99b175 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: CY4PEPF0000EE3D.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYXPR12MB9280 Content-Type: text/plain; charset="utf-8" In preparation for moving kvm-internal kvm_lapic_set_vector(), kvm_lapic_clear_vector() to apic.h for use in Secure AVIC APIC driver, rename them as part of the APIC API. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log updates. arch/x86/kvm/lapic.c | 10 ++++------ arch/x86/kvm/lapic.h | 6 +++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 06d33919c47d..069f3fe58def 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -718,10 +718,10 @@ static inline int apic_find_highest_irr(struct kvm_la= pic *apic) static inline void apic_clear_irr(int vec, struct kvm_lapic *apic) { if (unlikely(apic->apicv_active)) { - kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR); + apic_clear_vector(vec, apic->regs + APIC_IRR); } else { apic->irr_pending =3D false; - kvm_lapic_clear_vector(vec, apic->regs + APIC_IRR); + apic_clear_vector(vec, apic->regs + APIC_IRR); if (apic_search_irr(apic) !=3D -1) apic->irr_pending =3D true; } @@ -1326,11 +1326,9 @@ static int __apic_accept_irq(struct kvm_lapic *apic,= int delivery_mode, =20 if (apic_test_vector(vector, apic->regs + APIC_TMR) !=3D !!trig_mode) { if (trig_mode) - kvm_lapic_set_vector(vector, - apic->regs + APIC_TMR); + apic_set_vector(vector, apic->regs + APIC_TMR); else - kvm_lapic_clear_vector(vector, - apic->regs + APIC_TMR); + apic_clear_vector(vector, apic->regs + APIC_TMR); } =20 kvm_x86_call(deliver_interrupt)(apic, delivery_mode, diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index a49e4c21db35..c7babae8af83 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -145,19 +145,19 @@ void kvm_lapic_exit(void); =20 u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic); =20 -static inline void kvm_lapic_clear_vector(int vec, void *bitmap) +static inline void apic_clear_vector(int vec, void *bitmap) { clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFF= SET(vec)); } =20 -static inline void kvm_lapic_set_vector(int vec, void *bitmap) +static inline void apic_set_vector(int vec, void *bitmap) { set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSE= T(vec)); } =20 static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic) { - kvm_lapic_set_vector(vec, apic->regs + APIC_IRR); + apic_set_vector(vec, apic->regs + APIC_IRR); /* * irr_pending must be true if any interrupt is pending; set it after * APIC_IRR to avoid race with apic_clear_irr --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2051.outbound.protection.outlook.com [40.107.102.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 A68B11DE2C2; Wed, 9 Jul 2025 03:36:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032176; cv=fail; b=YyizYHhHeyX2ts3HZs1bIxENf195LJKL1JgjQVjq4+XXQIfwaH4BztXbg9RMmfZOBTCZiJ0np7GjfVaOqvohRfcbW2DOXDeyRZ1ils5I5gdjph2hzfnqGGF0PPnbs3aYU+JpzaV2idk4zdjU3xDHcWuIGcQHrBVtApNCdB+o1Zs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032176; c=relaxed/simple; bh=cY+TVSWR6om78RXjh9DaktbTe7dOqmIknzEkxe7PZGk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=k1bq4Um0vZ8zCxqfRECmzQn/aol/KrhB0eEGSz9aLMQ83i+0MDiChPVJSU83H8TpJtA3+IydBYDZh462MdZBk1kvFanQKtkD7f8M23rzVtLuDMkJhPz7faj7HnuAqW4XMYNaA2N/vAkAY7qJ2YwNw4wSEr4HKEVSD4SoK7FGKuI= 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=D36dAc8w; arc=fail smtp.client-ip=40.107.102.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="D36dAc8w" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IzB0HxHmukHRCm5T5zLsMoCeOX3Al+QF7uX99/qt+h9O7BUX7ISIGPIXfzSzwfaGjfd4il6IPPDSKxZh+Bf1DhLaIdyk71Iw85GqBhIhQLOSgA2FV4oLDKTikLTeuWJ/kOio9saBKI4iQ+EVPrBIsKBSxg8ds1ogNKJ7eVsK59lDUU7mw+NNGZT5XKpAlr77AWaiibZtvwLlAWS2s9fZieknRC/uH646wDhMq81/8gUBd/5kuGWsv0zE8yunt7ZtFoomFereLC1I5ZAZ+PnJm85f0KqLNrbJ8SMwALBogb6MHky1bKB65QhueSNMJvshS++B9fMnxCAe1c0Z0v7JoQ== 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=IX7Ax/0IY5mkn+BVIGyYGKMVjKgiPzBFsTfZ3drsWr4=; b=of5KZWcYmCT22ebEg9I/O9sLTFO5SgYXx6jUwUvQZJH+k68QV87y8W/zU4lYu5xwPJImKfg4egf/FA5l3Mpk4oAR0bHT15NPOwOI5M7IL+e/SMGvdUbZ1Oldv062Aj9NPAYLfUTuvBvhVRjhG8AAByglRbl9mUbsFCBIl/Hy38+mKhbo1FcUqoktZ5TT9xDLb0Uqw2XbdxYCzjDMfMm5R2dczO1rwt/bZyRfkIZ7bGjMfXEihfCwMNYFXtAN8zJNmLtOFO7jqBotW54dRh2fhDP12CJwsXkVQ5ll+UdAoSsM5avBWMQgQvho9NrLm0wuj/KVWxLerddrZYR44DmzMQ== 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=IX7Ax/0IY5mkn+BVIGyYGKMVjKgiPzBFsTfZ3drsWr4=; b=D36dAc8wr8mIuWemniSK+M4u/928XVh0fq9rsaDwIz/nM6OsS3imeJv5iG69QkWoFRJCM52M+l0Uq0BQ7wDmBNEhldXCZI+7TZ6qlglUr1WkrLmsSR2ufwyv2yxt4zPF2Y7pSxcSJRhYsBdx9R8ptNUKjseWVrs0BorlMmKhkuU= Received: from PH0PR07CA0105.namprd07.prod.outlook.com (2603:10b6:510:4::20) by SN7PR12MB6840.namprd12.prod.outlook.com (2603:10b6:806:264::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Wed, 9 Jul 2025 03:36:10 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:510:4:cafe::7c) by PH0PR07CA0105.outlook.office365.com (2603:10b6:510:4::20) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8901.27 via Frontend Transport; Wed, 9 Jul 2025 03:36:10 +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 CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:36:10 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:35:59 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 10/35] x86/apic: KVM: Move apic_find_highest_vector() to a common header Date: Wed, 9 Jul 2025 09:02:17 +0530 Message-ID: <20250709033242.267892-11-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3F:EE_|SN7PR12MB6840:EE_ X-MS-Office365-Filtering-Correlation-Id: 1e397c23-c0b6-403e-596d-08ddbe99bf69 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|36860700013|1800799024|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?BwHUNC2s416KmE5ZxXuv5ms0geEl28GEAhwCQqENrwY8MdPy0JyUEobKc1va?= =?us-ascii?Q?O21mtZMAuDlv98tP6Sr9XJ7Pjh3iLduGyWnlQO2wScRhhhLOKJSY9VoU57+3?= =?us-ascii?Q?5CyuSD1PG/SWUkeXYxkQCuFu0S/mPPn/ybHNMR9xQ9u1AT1DxQmORdJ5W+XU?= =?us-ascii?Q?jrO57kNxXcYmDvErEi7ZTGCS7tpLmJQT8nyTYqq/gbUnmiAL4sUeYn9Bq9W+?= =?us-ascii?Q?qfkr0+UWF8tAf2bD6kYju5Yi/gnjz44PrDs4lh7hXLVg2+dupR7e5Hw8i96k?= =?us-ascii?Q?eghbikV6zt6Fq2dcYAYqaoi95MtJykQTn71XRPopF/G9p6gc8wsNx2ykSI/7?= =?us-ascii?Q?plqa/J/eNu893FBZ17lCMcByIF1W6+u/8wrtyXBbMewuXS19ub41VijS/zNy?= =?us-ascii?Q?cYDTe2oyVq9M9MdEbblKZ2DttUJTSfxZS5XF7lkJ/U9PuYDoW8uIgAwTUMg0?= =?us-ascii?Q?/kBj2XUQn7/LpIGi6RN2ZapacoHtGjgby2/owIZ8Z9GdUOiDP8W4gw60L+t2?= =?us-ascii?Q?c7/vn00SXRDI3qSfMvjFiXhCB+OireZuA6lVL/m1QPnlq4CQeWERhWCmnRW6?= =?us-ascii?Q?SHg+Zzpe/1Py6SKjzOSdvcfu++sAq4MYiIiH7zpPSegPpzwphJE8/TDC2z/o?= =?us-ascii?Q?jvRa/9EMkwa90t1e56wYKBaV40uwGfQyQb0lzuOnudvWCr0T8VoXVCUplVu+?= =?us-ascii?Q?xLAL5e8+tGE/GQDaoeBPH3Z+ht+EsilnJ1OMytd9Bv0QDmWt54LKEe2z0Dsy?= =?us-ascii?Q?UtORzW9xdb4FxmK8xoykcXME36S+PsRTXpMV/3fD0C6FWVbyzEGpNTdRPl6w?= =?us-ascii?Q?zM4H1PqLa4S9TpUuQMq7wAo9TIlBClbujLdr8LM02Qk0TRKVaULWSpW60d+a?= =?us-ascii?Q?rxvHgkgjn8Bk4LTZGTHNTlOpOIecpMhbxyNmIhoHnGrNQ59G9orVyr5ALMIx?= =?us-ascii?Q?qVBye9sAlzb3d6Mn+dp0ZngzWUnkr4eL1vBmscaIK3vrTE/nuKs9sirEvczX?= =?us-ascii?Q?wQ2I+ylunC4S8S7G3NvfXZDirtJ3JFYblkJqkwoNNaXbS5Bv0xTCQzGnE4hQ?= =?us-ascii?Q?xddFtpKgQbo5r5oik2jsOC8YDklq0/OWqk0ElZQAaCG7u4QACscKS08ewPVu?= =?us-ascii?Q?1wXqjhoWLjzTGix5gL70xuCbWtXKbX7WLc+A7TDoROklG4KphK5QnhOr2m2F?= =?us-ascii?Q?R4cIcPBfqP0jx3PFF5aFpUvBe1OpcbfSixb0HvNFoVp8q/bd6hBSHotwX5UG?= =?us-ascii?Q?qoKXqPlk6olI1wIYmJjVA3w7lePU8+n3ARYu+nliVXlZemhBO1Ac+clUO5Bk?= =?us-ascii?Q?cSTRqw/CMW2WC0db0OB8coovkmPbVa0pY/sJim4hoajjXBgI+b3cr7sdCLky?= =?us-ascii?Q?oEDY9NZQynUoQRPfGyioxOumaH/hDP6tWFRJNZo7SCosnJnWSeAbTpxVo7CH?= =?us-ascii?Q?OaQj6p5qBwHHfNhf8FmayNlSg6budoO7rd449Zx3OKLjN3HleVSAfF1lOjAT?= =?us-ascii?Q?Ym8f3qCHeGU3M1EJC9fN9qzz9HH6do1oM8oS?= 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)(36860700013)(1800799024)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:36:10.6225 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1e397c23-c0b6-403e-596d-08ddbe99bf69 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: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB6840 Content-Type: text/plain; charset="utf-8" In preparation for using apic_find_highest_vector() in Secure AVIC guest APIC driver, move it and associated macros to apic.h. No functional change intended. Acked-by: Sean Christopherson Signed-off-by: Neeraj Upadhyay --- Changes since v7: - Squash marking apic_find_highest_vector() inline in this patch. - Applied Sean's Acked-by. arch/x86/include/asm/apic.h | 22 ++++++++++++++++++++++ arch/x86/kvm/lapic.c | 18 +----------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index c84d4e86fe4e..c7355bcbfd60 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -503,6 +503,28 @@ 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 + +/* + * Vector states are maintained by APIC in 32-bit registers that are + * 16 bytes aligned. The status of each vector is kept in a single + * bit. + */ +static inline int apic_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 + APIC_VECTOR_TO_REG_OFFSET(vec); + 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 069f3fe58def..018abf2ff890 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 @@ -616,20 +614,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 apic_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 + APIC_VECTOR_TO_REG_OFFSET(vec); - if (*reg) - return __fls(*reg) + vec; - } - - return -1; -} - static u8 count_vectors(void *bitmap) { int vec; --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2050.outbound.protection.outlook.com [40.107.212.50]) (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 7BD861F4E57; Wed, 9 Jul 2025 03:36:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.50 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032196; cv=fail; b=cod8IM28Q+eGfoMK5FeWCE+fDWtabPI3NhPK/gZpuIjqanzJQwLsIGMdDIimooSu8PxsvyaDuXXc9ZXWXOhg8bWWe2MVTu5Qvzg5CrlzPQgJrTAUdXtRyLslnf9YqNRz+q/yLHA+FLJ7wSfil+/PC4Q3d9DReFpUPJNKQCtZGVc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032196; c=relaxed/simple; bh=RN4hbLPNeY7ul8uB6UWwwXFwMw5AE1/vPqHhi3kYBDw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eiPYpSx75ghswv3HfIMmYgwzXtBNfVGmD3dTo1o+8t+JBmLrZ/49MDniNtKanU+hnQAlQLwE2xCprbJ2duTstFoPqSs+wZIiryGkHwMGC0chv1z1L/7mm5XLReuhNzwX73zsQ+BBU+PIcarBEFYMAr/MgTVDQ76L5oxW9cZ4ty4= 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=Aez28lm0; arc=fail smtp.client-ip=40.107.212.50 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="Aez28lm0" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AOZN/IWmjP7qw5JBgM5NO356oGC2Io+M8gc2MnMW/MNqc65Ubj3W2cUyVVHDmc5Po/kyWprUjx/CbMRFHfBLFatxEYAdA4mq/vnPehe8on6VRDIBHMar0259FF947yuoRJoDxqPtGPEUWCtykanoA3HfALjuzTg788lTmbfVH+PDJpTwHzKSVnwsx7UKOLWkN8jTZJ0DFuc8SSk2hAZ2xqsYshIaTYI5HtYPuvHzN2iIvcDq0w9O7AY90pIJUWvm57O85zW1xVWx90/1Ac8upsDPA6dmDRpSz5iTw2N6ovJ+/QheeLU8MTsuhs+896xwidNMZuRJ9qcX3VcPhNuF4A== 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=LpTawitvebANqZEr7DgCOvSWvjUtxuJfwqp7YLakRAA=; b=qJvGQb8n/vJS8RMp38GQfUz1ax+eANkJPYxskR6idJxxTiCQBrSSPzE/dd0sXkjvYs2LINFpJqMrfyGi6iXAd1JifcMDfj/4rW/R8V2bVEu8haSQDsoP1zlpMb1Oc/fp4ehiyd1n80N8SToi9pJv3I7P3Q0nM6SXSy+2TfRfJ7x/F8cUg32X4CeYvB7s6rLUcNRza4IuviNkroQsV2Gh9NotlK3t3TX2PxiZyMs2Z5Rq3mGbNFCoiNNQOo0DSLXTPatwp7uQxc1p9dXxNPQTnOLn44LJJE1Bt+1hkr3E8AsoC/9lQDRQABYDyi8z7Ow3EVBnXH73IWW/O1VfWQFScw== 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=LpTawitvebANqZEr7DgCOvSWvjUtxuJfwqp7YLakRAA=; b=Aez28lm0BLX3Sw2wZEIB/jp0cQO+5c3tSMn0MpcGhJxo/ITimXL06YErzr9votTU/l0Mf/3rOOQ3yj20/DyTLhde27OMtHmzpgz/xUT6uLH0f3FaNMpDVZZ+GT53Q9g/1XMxdOXexOSJYeZmkShtiFun/6VF58MiNr/fRciUoaw= Received: from PH0PR07CA0110.namprd07.prod.outlook.com (2603:10b6:510:4::25) by CH2PR12MB9459.namprd12.prod.outlook.com (2603:10b6:610:27d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.28; Wed, 9 Jul 2025 03:36:25 +0000 Received: from CY4PEPF0000EE3F.namprd03.prod.outlook.com (2603:10b6:510:4:cafe::4b) by PH0PR07CA0110.outlook.office365.com (2603:10b6:510:4::25) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:36: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 CY4PEPF0000EE3F.mail.protection.outlook.com (10.167.242.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:36:25 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:36:18 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 11/35] x86/apic: KVM: Move lapic get/set helpers to common code Date: Wed, 9 Jul 2025 09:02:18 +0530 Message-ID: <20250709033242.267892-12-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3F:EE_|CH2PR12MB9459:EE_ X-MS-Office365-Filtering-Correlation-Id: 174a4d37-b40b-4957-ed22-08ddbe99c80d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?G6bf4cscKHG9o4xy4UifNGidLi9/dSrMUWWRPy75qsNR5tKW+Ns+ns8XBnEn?= =?us-ascii?Q?rjzTOVRPMS2rtpROxiPt1c1fyoA62oN0Y4o4cD2TXLIqSAlXg8OhsdiG/PSi?= =?us-ascii?Q?nW+QHx1bcZbzZ3HIUbjkU4J0fgtu7Tmh0rpeBxzlnos6oJ/6mT+v0A1jNHgd?= =?us-ascii?Q?VT7fUlTnDItjoOnQAeAPKYFHTNd0O7NT4txT4Dm829+Cg5ITLJTxAL39IAIY?= =?us-ascii?Q?Hs11GwQ52nh175iVp3NO1uFXDN2RAYtodiVuFuILOiF40FBlxSYv3eJ4Cq8L?= =?us-ascii?Q?sge2z73yYKck3BWZO8ocit4Pn9WmUXkxJ9Q1VTq78jvrPtx75fDW7rn00EPB?= =?us-ascii?Q?ziGZRMA2xakKdautVV4UXKVRWQUbfgpc/uIsc/X/Ip5dP5aEbEeGop1ZjnDC?= =?us-ascii?Q?KZ/H+WV/K3xBducHptc9HTVdLfYj/pZvxOSXNNoQSXbNNwgs0+IAXnQWWQY9?= =?us-ascii?Q?ai9aBX1eCtIOx83CyocGMuodPOd2y5d0UU1Au2OVnTBMGopFB1rhiUr+CZk3?= =?us-ascii?Q?Kj3EuXnzV5/8ix4ZA0MeLHfCgHpRK+xnMARm3xyOryFVQ2cBODbHSeZPBymk?= =?us-ascii?Q?qlXibgq56Gkz20kmXM2GwO4NRz0VHoG3V+m3Sh2/rQsQ3HOa5mt98Vdbrs4l?= =?us-ascii?Q?8P5EIUicBX9pUajUEsZigrw6flFnAUJzoIPL/nthhxCUKFA5vEZGhJqRdZmi?= =?us-ascii?Q?tnLf+D4FhKUD1EJj86cWM08en/xrZmjz8GVV4LjYF77Y0vtQ+3GQWOEEyAni?= =?us-ascii?Q?94rkqtKKwbbL1wprDy+vdxzFFaNyGO7kJW10XOHZ2edJqWPnK9rLxcW8MVLv?= =?us-ascii?Q?BgJa+u/DrklfLMMM9uKhtWN/YPuI1igkVzJ90JemoldEcgigdvZp+WPhXpKA?= =?us-ascii?Q?drHDJdxml71iByCKb93zvqcJsOjNZc6S1OuF15VeFSTpOC/H7t7IQ3tji9Yi?= =?us-ascii?Q?r0AtPel+jSpXxpzSPWoQ5NkVNrvJ/FiplFwPNlXRespKPAL4l3h2faNVPP0y?= =?us-ascii?Q?LRh6a1A//xU/JOiEkGl6ANLoEY+NfmMlNau/so6mGzn1P27H7Tb0aaaAb42F?= =?us-ascii?Q?rkXhmeBTQfa9nvbOB65spVwDzinVCYJLQrMGWSpv748fM/5f+S/WftYaXDwn?= =?us-ascii?Q?8uN++gCVPCzoMJ0IYVQw/wZDbO897npUc+3BrY+NVP4pFcLTKElyYz6zCU7V?= =?us-ascii?Q?kkNCRsFEIHFJAmfQyKlMi1VEWZjzUsP9j9C1LoMvJTV2wTLDJVyK6MctAhNb?= =?us-ascii?Q?7w1UjOwfO7YwaBuwzZa0AmUc5sOVlGoKAoaL/k3fX2EqJWbrPIUWcGyjx4x9?= =?us-ascii?Q?WLr+w2W0HacOra1vweZd/JDgv2HTvCbBynPFv2hJ9kJeWOrh3Yidvyl+/Gts?= =?us-ascii?Q?qlNRy/ewhjZ7eQ3JUGUNqcPyeSeemQYaONnbNix1F1EMxDez77pVcPNjd8Z+?= =?us-ascii?Q?tou9dVaf/478gYDZjvM5Otvd5h4yOkDObxeCPVFcqEaB8U6GMRmQeYEtSvoh?= =?us-ascii?Q?qmPIl0cgdqEQB6qdezGyuh/2/syqlJAUYaj6?= 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)(36860700013)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:36:25.1234 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 174a4d37-b40b-4957-ed22-08ddbe99c80d 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: CY4PEPF0000EE3F.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB9459 Content-Type: text/plain; charset="utf-8" Move the apic_get_reg(), apic_set_reg(), apic_get_reg64() and apic_set_reg64() helper functions to apic.h in order to reuse them in the Secure AVIC guest APIC driver in later patches to read/write registers from/to the APIC backing page. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Squash 64-bit accessors movement to this patch. arch/x86/include/asm/apic.h | 22 ++++++++++++++++++++++ arch/x86/kvm/lapic.c | 17 ----------------- arch/x86/kvm/lapic.h | 7 ++----- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index c7355bcbfd60..b8b5fe875bde 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -525,6 +525,28 @@ static inline int apic_find_highest_vector(void *bitma= p) return -1; } =20 +static inline u32 apic_get_reg(void *regs, int reg_off) +{ + return *((u32 *) (regs + reg_off)); +} + +static inline void apic_set_reg(void *regs, int reg_off, u32 val) +{ + *((u32 *) (regs + reg_off)) =3D val; +} + +static __always_inline u64 apic_get_reg64(void *regs, int reg) +{ + BUILD_BUG_ON(reg !=3D APIC_ICR); + return *((u64 *) (regs + reg)); +} + +static __always_inline void apic_set_reg64(void *regs, int reg, u64 val) +{ + BUILD_BUG_ON(reg !=3D APIC_ICR); + *((u64 *) (regs + reg)) =3D val; +} + /* * Warm reset vector position: */ diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 018abf2ff890..c7c609171a40 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -77,33 +77,16 @@ module_param(lapic_timer_advance, bool, 0444); static int kvm_lapic_msr_read(struct kvm_lapic *apic, u32 reg, u64 *data); static int kvm_lapic_msr_write(struct kvm_lapic *apic, u32 reg, u64 data); =20 -static inline void apic_set_reg(void *regs, int reg_off, u32 val) -{ - *((u32 *) (regs + reg_off)) =3D val; -} - static inline void kvm_lapic_set_reg(struct kvm_lapic *apic, int reg_off, = u32 val) { apic_set_reg(apic->regs, reg_off, val); } =20 -static __always_inline u64 apic_get_reg64(void *regs, int reg) -{ - BUILD_BUG_ON(reg !=3D APIC_ICR); - return *((u64 *) (regs + reg)); -} - static __always_inline u64 kvm_lapic_get_reg64(struct kvm_lapic *apic, int= reg) { return apic_get_reg64(apic->regs, reg); } =20 -static __always_inline void apic_set_reg64(void *regs, int reg, u64 val) -{ - BUILD_BUG_ON(reg !=3D APIC_ICR); - *((u64 *) (regs + reg)) =3D val; -} - static __always_inline void kvm_lapic_set_reg64(struct kvm_lapic *apic, int reg, u64 val) { diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index c7babae8af83..174df6996404 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -4,6 +4,8 @@ =20 #include =20 +#include + #include =20 #include "hyperv.h" @@ -165,11 +167,6 @@ static inline void kvm_lapic_set_irr(int vec, struct k= vm_lapic *apic) apic->irr_pending =3D true; } =20 -static inline u32 apic_get_reg(void *regs, int reg_off) -{ - return *((u32 *) (regs + reg_off)); -} - static inline u32 kvm_lapic_get_reg(struct kvm_lapic *apic, int reg_off) { return apic_get_reg(apic->regs, reg_off); --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on2060.outbound.protection.outlook.com [40.107.96.60]) (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 9A4231FBCB1; Wed, 9 Jul 2025 03:36:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.96.60 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032208; cv=fail; b=R7PJhKBe978gVIr9Et3d6DLjwcZXy2a/x/xcVCIcU4UQpGprBrJCTcupvnZvobTxGID8hY6GCfNmuuayMGgR3+PvHLP7BhRLX7gk+7jn83sjbAz+bjN6sWEXOEshZ3QZ1d/C97udtYxvIkHANzL/w90LVT0GoPG+4JWADL6Ky20= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032208; c=relaxed/simple; bh=2WN8cewqKubiOM7Vcsz6SOOsNHrAh8zSawJ5b8hH/4U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DrgorfVpR/kMRIOW93+0nbf5q060dANrVSaeN4QJMeY3KAL5HDLp6e3y5CwiUX4EpYawoGF+ivXXWKi4hHnE+YphClDWvo88UOz3MtM4beupO6M7K6XFjeawnD6iIcLj6a5BSfPiJBFAnAkq9pwFirvKx5MIhRH0bE5t87+0DIw= 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=XbJtsRMU; arc=fail smtp.client-ip=40.107.96.60 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="XbJtsRMU" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DhYLKxfjGPNKKDsaF8maRSMcjSLDDzFVC83sN/qCrX2nQAsazrEaVaeWsijRA7mA62IIOuBsfkFTfhkqOkuBRW4h/iTaw280LmwDyHQim79n4TVbkhVpJKItsQDIUZSk/1ThZX8Q3SNjuXH/c/A+VM9A1yoaQ8Et5A463rSnD8V+j7VspKfkWDAukamJbMi3E6Ls/p3qix1aUoLLUl4DaTJTdMiC8GjVPmqq+ZUPHALzebMpdyyb6R28ZJnptc4Y4NSUJs5iFeGuu38lGLsm7IAwQW0Lli1twGkzOk1GoEU23NhGbrwsO64bOYAMC0H9L1K84Tzinz07POBFoDoVkA== 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=WO3eTxIIKiGrWIROyfpyplMc9sCPiyO2Z8H0FYMoaGU=; b=olumf21uoZaIkl5wc6JLTmnVzLvPLAOLqTse4guXJsO7m44AaTXjhtF2lt+DNky79gZHhx1jKzAqYqp2fn1To2QIY/QYzKKdUmOqd7LWyh49X9iyboy493WqRYqbU9GJqLzk0wcXenUjTp3NwOz0oOfc5q56ghRMtqV/qXFLirIMDJaZ6GCo0HxPnhm6NCjI2WNW+MpOxWZCt8z/hAJcjRu9JkqgijS01zw0mzq5Nld2j18JKCSit0CCdrVxwxR09uwOn+68E8jIiR+ACgFxg7mytHIeFb0wOI55PRJXiYEIWmH1I2litLrF2VaQrg+JvdXqGGqxoLPORSbGZXgcaQ== 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=WO3eTxIIKiGrWIROyfpyplMc9sCPiyO2Z8H0FYMoaGU=; b=XbJtsRMUoqiAd80GbbX/EbZ8KU0hYFdMvlk+cRowlhnV/T1boZINOodriyEDlObG8cxG4FXtfF6GkyC8DFrHH+nD/4Xmv/J/SDfyekq6l06lVeVdcoE+1ERHBEmaAvbq1PGMJ/3YQDkhnUdM3Od+NBJBOD3QKXJ6jvVImEPeOSs= Received: from SJ0PR13CA0183.namprd13.prod.outlook.com (2603:10b6:a03:2c3::8) by BY5PR12MB4308.namprd12.prod.outlook.com (2603:10b6:a03:20a::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Wed, 9 Jul 2025 03:36:42 +0000 Received: from CY4PEPF0000EE39.namprd03.prod.outlook.com (2603:10b6:a03:2c3:cafe::a0) by SJ0PR13CA0183.outlook.office365.com (2603:10b6:a03:2c3::8) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.5 via Frontend Transport; Wed, 9 Jul 2025 03:36:42 +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 CY4PEPF0000EE39.mail.protection.outlook.com (10.167.242.11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:36:42 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:36:36 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 12/35] x86/apic: KVM: Move lapic set/clear_vector() helpers to common code Date: Wed, 9 Jul 2025 09:02:19 +0530 Message-ID: <20250709033242.267892-13-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE39:EE_|BY5PR12MB4308:EE_ X-MS-Office365-Filtering-Correlation-Id: 13ffd6e2-5ae5-420c-3dbf-08ddbe99d277 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Rz5K5yI01wl+7yH2xQHLQyJoN/kHrtK8uFcIgPEvg+gL9ztZD1WnU2vbO/UB?= =?us-ascii?Q?SfR3tshfBzzxbzukxVpqfFixYHKatsOnTDcseDxeTmaoK+sXuwHqLsnzhItO?= =?us-ascii?Q?P2AJtsjifgUh1r0+oyTLpN7wkwjR0Yh/Vq+cIRdXqozxmGDkWzymZIz7yM25?= =?us-ascii?Q?QoYDeZaZasaNidDZWvnBFl5Qns9jN7T56eCVOhaQUszv36ctDIcWLY+6S1vP?= =?us-ascii?Q?j+4u2O1h+qNye8bqOjBItVAJSNJOw35tuGLkf/SzZaWW9b90A82CkajcPBno?= =?us-ascii?Q?rCJY4j1hONvbdWh+WWyXHlB+Iq92wG7038gqa3r4UWQ7m+HS5KKMGGnQeVFn?= =?us-ascii?Q?HNp51F2tt06fltSYhJRFNEzw6uBlEWLb+7iH6bCNLX0uW5dBehB2O/fpB0UY?= =?us-ascii?Q?N7YoMWxnYs5xPENKd3ohn7ix7ZaAAvOrACTvdu25mpR92S/6700eKX8pghuM?= =?us-ascii?Q?gLnwIekArCkgbv2lrsSvEUS8Ouw9LdphaxQJI9UEa6bdvPujXZDf8nY8tqrN?= =?us-ascii?Q?bjo90JHifQ9btvx4EeJC/UyX1esLgLcX20RMPOKH85OC692l7yFXjFkS6mWh?= =?us-ascii?Q?aj0HX1sKqVOdJIaR4j2F0yAAwunm4wI4eMO1ef1kpHXtYsWd5q2DxCefHkNt?= =?us-ascii?Q?Aqv6i4R9wy6jeBJgE/rKCwywfu8KAiLtTcquqsbiTbiB+8563+Cf6LVfiGej?= =?us-ascii?Q?i52SbNW0jl6q59sohJ6sXLTDQ9mbHnAbhgl7WeT1NT3aWBDYRcA+ytX4s/p2?= =?us-ascii?Q?CiIDmBYkDdqEg0eR7jmfpZa7f2WjIlPX7fy8sNgf0UnEruD6OkB4QD9bJdvn?= =?us-ascii?Q?xJfgw4xrt9rgWIAFnHpi6/aWjRWmoRsUckJVR1WorTQVfEVaXQszJOmJEgd2?= =?us-ascii?Q?c+ecTv5O7Lj37Uc0M9HwDbGaH54Gp1e9gH6Z2OuZMc42rhMfZLBHlq9U6XJX?= =?us-ascii?Q?rWHiKqHg9GFR87elN1NOHvsvsFG5mo9DofoxzzKNawOhBmia6wGnm2NRKaiW?= =?us-ascii?Q?hT4u3Y4hHxEOiS04wv8jXBD4jbjFOqRDf2OmmOwgs1lBDVo92+x4F7oDwMFT?= =?us-ascii?Q?zizJTG+WI6rTvmJ5oO6X1lsN5x1sx0XnMvuJ24wi4M1hwzEnXQzaUMSzicZf?= =?us-ascii?Q?EYn1O3bMRrPj0cv8fVXXS5MvNJjZRywnH4+Az7JOu99sgWdNq4S6f4wwFQEE?= =?us-ascii?Q?MdmnmyPHDnCkoH44j07aqLcYrXROUw3Eq5GGOFVbvWHkGsotcAnf8GhTGWrY?= =?us-ascii?Q?gPUu97EIz1x/TNRyzzooGbKLISdH8PMkxVKUdUA3JUKuBfMuP9N/ZmjOfeHf?= =?us-ascii?Q?hlji0taFPerB/rS26Xcqp6i+rFpGeLh0NYv5pTcKRIYYL45Wrd3QXapiXonY?= =?us-ascii?Q?40hEXd/e0lRnrvUTPLgD4/vscMWqH1ospYKTAk77T9tKqVAa6BMNJKvBAz3+?= =?us-ascii?Q?IrEjB/th+LGrjBrfRZTELqvOsP9hOD5UpC2vfCNT3P/6YdU7UZ3Vf6NFYie2?= =?us-ascii?Q?04zX+ogFjTLyD1Pvul7K5USowmCdaZXoW+5J?= 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)(1800799024)(36860700013)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:36:42.5911 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 13ffd6e2-5ae5-420c-3dbf-08ddbe99d277 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: CY4PEPF0000EE39.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4308 Content-Type: text/plain; charset="utf-8" Move apic_clear_vector() and apic_set_vector() helper functions to apic.h in order to reuse them in the Secure AVIC guest APIC driver in later patches to atomically set/clear vectors in the APIC backing page. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- Changes since v7: - Commit log update. arch/x86/include/asm/apic.h | 10 ++++++++++ arch/x86/kvm/lapic.h | 10 ---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index b8b5fe875bde..c6d1c51f71ec 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -547,6 +547,16 @@ static __always_inline void apic_set_reg64(void *regs,= int reg, u64 val) *((u64 *) (regs + reg)) =3D val; } =20 +static inline void apic_clear_vector(int vec, void *bitmap) +{ + clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFF= SET(vec)); +} + +static inline void apic_set_vector(int vec, void *bitmap) +{ + set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSE= T(vec)); +} + /* * Warm reset vector position: */ diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 174df6996404..31284ec61a6a 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -147,16 +147,6 @@ void kvm_lapic_exit(void); =20 u64 kvm_lapic_readable_reg_mask(struct kvm_lapic *apic); =20 -static inline void apic_clear_vector(int vec, void *bitmap) -{ - clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFF= SET(vec)); -} - -static inline void apic_set_vector(int vec, void *bitmap) -{ - set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSE= T(vec)); -} - static inline void kvm_lapic_set_irr(int vec, struct kvm_lapic *apic) { apic_set_vector(vec, apic->regs + APIC_IRR); --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2079.outbound.protection.outlook.com [40.107.220.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 2DBE51FBCB1; Wed, 9 Jul 2025 03:37:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.79 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032231; cv=fail; b=tRg3t30QUFXjp5LvbIJ5O2BWkdlZkZgyOTp9RSTz+KJFqQA4idFmR5xDTeRmtSl2eIIwA1js99449PLZt59KXTRwZ0ZY2G3xu18Nhn4SM/p3ncpjaNac6rpw0IxkZOMf/FT2TSv0JoMkuS135FjxbRT/HjC87Zbd6+YRWYOZVYI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032231; c=relaxed/simple; bh=4aD2enaeIJJEgY5abImzuRWN0Ti0AolXKFmH09GXcDw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=E9yaPUiTKi8b2hic11Q5S0/5JLX4nyDUDIcwLTJ7qULEyHbK1oAmsp6sm5d6sjo9T3/H4at1CzjZTaGhcZ1Vny7qd3FQnin5SGJOIKHi9KF1613MF5a6bI6twcggA8JAIFPHNdgj9nCX0gBFtRgVpHuRcSgBHVv8kiopANqKshs= 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=1GWPhiVO; arc=fail smtp.client-ip=40.107.220.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="1GWPhiVO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ErgiNm6ZrMKO0wD2ND1my1+VyLYzXO6AC9JqWwYbddHaweSBOCKzyNwWRDuidXvYlsIztoJvZSXaIbNQ1hEPpIZUXePZ0VfCPjo3P8aO4McYV//PziWcBNkyT/+sLaoCpr2g7AGZaJWWHtpOdNlAPeXVQG5LdxJDNHCEBKoPRviFPoQh4P25AskwBhs3cQnsIHYcSPHzUsWQ4nipI2bjiP8YKPFo6uW9Hi3CwjvSIZzLb7ntkpFK89ynLNpP7IWlHdNOJEpgDIAsjtvlqnvjhJZ+ICQzlhqpWpI14jrx0TZPLtxWEHfu5ofUGeBbAoUPPH5ABB+p+K9n6ZLczXGO4A== 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=s6LyWQVXv6Awul8BYJUB1A8aueGA4Bga8rbD4gWwxiU=; b=xcEwN5FVV4EgPrYtxe7NNC7F+C+osnvaDD2lNcLtkteWcMDEiQtKd8DHj7tjtMoridEyvQWCdLvRVOJJMNkeFiYSGKHBSCvgFRQzU6jcHk7SmOhwlw0q33MNzJPVNdj5ZOozAK13IHW9Wg661scktHVriOxzXS2oRK5ZwyJSCI9mFCgtBerrQp3L/2MAVFi2fAVV70mkgjJZ0vrZHsqXrLAB+wudaJps7vwR19O7XXIu/ZsTWNk/k7janqj4DISJwWMWYx9HkDYv3x1HUavM4NNFm9SUQHzZviH6bizL1aa4SLk4dfp4hd7H5Xi4eUbg0tBrps0OadWqzlL+zhk+Ag== 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=s6LyWQVXv6Awul8BYJUB1A8aueGA4Bga8rbD4gWwxiU=; b=1GWPhiVOXBRk4kBAKC2zdS4SAfQpQl4YcmNd5KERVCqBMe8fYkdDzI8wLIs5rRBJlI28CRo/RfokQ3xggUs789IxkCIl3leLTKpowzCEgbucaxfziAwDc9rBC03gehVUmfl0ML5GT1RA9Rz1MIzUigcT2D7PXFNwL8uQ+MnIalw= Received: from CY5PR16CA0013.namprd16.prod.outlook.com (2603:10b6:930:10::32) by SA1PR12MB6799.namprd12.prod.outlook.com (2603:10b6:806:25b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.29; Wed, 9 Jul 2025 03:37:06 +0000 Received: from CY4PEPF0000EE3C.namprd03.prod.outlook.com (2603:10b6:930:10:cafe::8a) by CY5PR16CA0013.outlook.office365.com (2603:10b6:930:10::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:37:01 +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 CY4PEPF0000EE3C.mail.protection.outlook.com (10.167.242.13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:37:01 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:36:55 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 13/35] x86/apic: KVM: Move apic_test)vector() to common code Date: Wed, 9 Jul 2025 09:02:20 +0530 Message-ID: <20250709033242.267892-14-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3C:EE_|SA1PR12MB6799:EE_ X-MS-Office365-Filtering-Correlation-Id: c011e76e-ddd5-4421-ea64-08ddbe99dda8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?mMkEeVzbDBkTK5e0Y1H440eKZ7/dkNPy3K6EKfOE/sBGjBvLgkCw/ffw0nfl?= =?us-ascii?Q?S0QziRdHmBj0M4CB6hgIhtwa9iHnNHhJ9RsLJAT22MDIjROaRxJmxE4F4dwZ?= =?us-ascii?Q?0dUZGHysUDdZip1UF6+UENfEob4sKkUnr47Mbb7CIgEKjeiy6TC6kTc9Yq16?= =?us-ascii?Q?UhJeuX/PZANS0E2mxWqsYQykwoeNKmINupaQWwQARLZ8R4myVqh/5nZihV1o?= =?us-ascii?Q?h0deLW3GX8mVKNr58BncnF0vAU80yB0kLbXgp/tmizf5e+NcCcFQpfvz4O62?= =?us-ascii?Q?HPwwTZNphJu5Sj2pYFR38TfXpSDhP/brCnN4Y0itdHooi0WXq2FloK0pv3zB?= =?us-ascii?Q?XhJxrLqC/vZXE5CFEB/0M9lZ9VWv/nf8IqCmYQWL2FDdaCSLu+OcgcA3ZSVC?= =?us-ascii?Q?5vPUjA8alKDyIwUnkJEHapckLP+vz8HU0pw6NRag0XCWgkNC2xq8KMoz2cIS?= =?us-ascii?Q?dYqdRQpdSUNHyvVwXm9bJBOKcaW9qa41wY3K7Ln0lXgto4+I5WIkwOQKnnnB?= =?us-ascii?Q?O4/2oviq4S8f6PF6nUxRJuXGi817Opr306maD5v7qDKex4bRRj4TW0mvl+zb?= =?us-ascii?Q?Xb5zHIVwOUuAEfk0n66TfKe2jhV59c7pLsWxD0K9OtLxrcZ5LTNvLcHuH7OJ?= =?us-ascii?Q?yDyuyfOkqYQZqmpUSqV1MartGBfv4svWGT583hnnAGL/XYusRF+E08BJmEGI?= =?us-ascii?Q?/Be8/8A2MVEgsCX+Oua8l3yIAOFoe2D6IaVqFUpgNmeFe+gHBZZvG1akbzGx?= =?us-ascii?Q?fyDnJmA8YGz5YJwtmpC/SjDJVv53fF/KMeiysn7Si0M/je2jYUZumw5/4FBt?= =?us-ascii?Q?6ZAqiNfGiUM9738VpRnalKU1L5uohfk+1JKOWVuKfnmcraOtwK2imxWu4xKp?= =?us-ascii?Q?A+iQfRAZnor1xq6Z7SIqYgNZbG+6pGr0S39wFNLAWdLOJC5Lw1RXbExmVNKI?= =?us-ascii?Q?/ATKa0JRul4oOPJvU4LXx0QbJ4qVy4yZuFqzOD/X5mTs8VBn1OXqPd7+uuGY?= =?us-ascii?Q?mTIjiD7IhrEIXdiTBrNgD9q6rGlOuq+EWVKwdxCjNIlv9rw9KnDbk9EUlMVJ?= =?us-ascii?Q?fVE3OqVbAT3L65WOstIGWF5jOYkUf46wOjzYYWSFF5eBaNZ9mPSBoVLZGUNU?= =?us-ascii?Q?6SF3fO3/Op5sn46JlQQwCafstDbcOa23dubRtTPfkt8k7hEYs+D9nZDGluU4?= =?us-ascii?Q?uyFIXOlW6ZvGXRELOzET6lq5wKE1EmO9DfHRfFMAGXDALrCkDsMIOtfm7T7o?= =?us-ascii?Q?gj6CzPDA7jfXxnwtK9Il13eE9IaVH9XaMYG9m4csb+QWI0H1OOWcyK7Aj661?= =?us-ascii?Q?o6OFVQC3RA4frvJ3OyqGXb+dzNmmWOZXeOyfIxpjNv0UDSiDqb41Ygc5lFOJ?= =?us-ascii?Q?71biqOgQK/jJk/lWZsbQ4mLdYAMeoGJq8dKL2GKHm/8eTr/i4FKrM2u18zES?= =?us-ascii?Q?cXoGRdij5/Y+GfreAJQJANAfhWIlNgJIr5vA1SFwrLSMM9qnxBf/nYKyIYoz?= =?us-ascii?Q?XmRw6snw/WD3ZZk4tBw6Unl9sUKcejQ5RMSI?= 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)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:37:01.3707 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c011e76e-ddd5-4421-ea64-08ddbe99dda8 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: CY4PEPF0000EE3C.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6799 Content-Type: text/plain; charset="utf-8" Move apic_test_vector() to apic.h in order to reuse it in the Secure AVIC guest APIC driver in later patches to test vector state in the APIC backing page. No functional change intended. Signed-off-by: Neeraj Upadhyay Acked-by: Sean Christopherson --- arch/x86/include/asm/apic.h | 5 +++++ arch/x86/kvm/lapic.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index c6d1c51f71ec..34e9b43d8940 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -557,6 +557,11 @@ static inline void apic_set_vector(int vec, void *bitm= ap) set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSE= T(vec)); } =20 +static inline int apic_test_vector(int vec, void *bitmap) +{ + return test_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_R= EG_OFFSET(vec)); +} + /* * Warm reset vector position: */ diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index c7c609171a40..bcb7bf9c0fb5 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -93,11 +93,6 @@ static __always_inline void kvm_lapic_set_reg64(struct k= vm_lapic *apic, apic_set_reg64(apic->regs, reg, val); } =20 -static inline int apic_test_vector(int vec, void *bitmap) -{ - return test_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_R= EG_OFFSET(vec)); -} - bool kvm_apic_pending_eoi(struct kvm_vcpu *vcpu, int vector) { struct kvm_lapic *apic =3D vcpu->arch.apic; --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2052.outbound.protection.outlook.com [40.107.237.52]) (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 273161DE2C2; Wed, 9 Jul 2025 03:37:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032244; cv=fail; b=cG0mQzWTlMAHnDK/jUB3RsseH/VrFWLKf79Jo/ucyDD4RIvXDXER4JKCEduqpEHBwecS8890a2vhFx6hwUleclxr2IUh2rfzgJt0478lvFBxkM2geGxIuwbUwnd/WoJ8H+jNz/9yZiddl3pxOCjV6VOzVD299SC0k6NxoML1Mgk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032244; c=relaxed/simple; bh=Ie7XCMa/WO1ihheDv2s7lOBgdplBDlsu2ZWSzLKLOYQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Auh/3y/fG+TqoGr0Ifl5NBUiK1NQxeBvnFprCHK7I0GovWa86REw3Nxt/Woyp3h/7yxarwDh3GEKB/O6l30hu65aV3cZKC6HEYZ5Q02s6+jAw9TPR19l1CwRB+xcnfPN1cBJY0oWmBcEo33EAupw5Gz0qTxr26TGo8ILGXENSo4= 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=HWQsdQrd; arc=fail smtp.client-ip=40.107.237.52 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="HWQsdQrd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=tyT6iFMK04W+BRzg0Cp7HSv/AgumU5OCF31f2jqoz0sc0Ako4WXvJ62QtFHomu0lKNWkuTQbclAbj1HHgp4hw/sMr9UDds5oU6XI8stnZRDdTKYwA4z4PihqWqV+NnLmw6mKLSiJiKmlumL4PlzEKs9dAA5XMY3szHQmy0i9TQjBhKOcdYCdLWo8LynoGxphjWB9qisYq3ODoI/5ifr0TsIDth1rHeU+1on5VgdHPP4dyrh0eFhFKPeoCIWe6pvNwW/cPBpdfhlFk952ZySbBe2J2CifUOqK18i8sg1GxOSZ16zYN0k8sGx9/mJPFFuHKgzIl1O32Arg2UBqkHAV+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=w/Ur3uY742ryE/c3u4og6RBfKPYuJ/Vi8+J23Xdfsj4=; b=p68uqnUo5tv06ZkKYqHm1UJrv2aF0NmJsscIS6BdhzuoyyvCx8Fj8Sw9W+q/Fur6hG6Hc09aHX5k/odcI79qXFP1IZNhnQwOZzGdgMJqC+nUkvaBpAdI8F1YguPxlNB2mny5OMTxSPdAe0gXihJiFPF7FLIT0HoTOA80X9iiFS6QvPAFbXIT8uZF+kwhry2jnG6466abPUFIBFx+4Nt96VY2d9ZkmSZdDN46LrAYP7NDkZTNBcQkKmpgW9dmP3exrc2TcGt8XlvfhtzSNeEfUsBqiaCNTKztNyb4NsLo5CL9zqmXuq6Qaul3hANTYnjBoZz7HNNBk+TM3/L5QiLy2g== 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=w/Ur3uY742ryE/c3u4og6RBfKPYuJ/Vi8+J23Xdfsj4=; b=HWQsdQrdDgmCDcBsxh1r14ldcObSAROUF1i0JeARd/JeGCIhmwX9dSWk0tnUGRqDUQM08CuogdoBug7SWRVYn5I1XgZe17u40xzQfwqZEQ55HLekFJTHZovzX0k3/QWWiNB72ZyEdsnWvQ7bLgEbXQZNHuVFinNZQWlV0A9erxU= Received: from CYZPR02CA0023.namprd02.prod.outlook.com (2603:10b6:930:a1::21) by BN7PPF521FFE181.namprd12.prod.outlook.com (2603:10b6:40f:fc02::6d0) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8746.31; Wed, 9 Jul 2025 03:37:19 +0000 Received: from CY4PEPF0000EE3A.namprd03.prod.outlook.com (2603:10b6:930:a1:cafe::e2) by CYZPR02CA0023.outlook.office365.com (2603:10b6:930:a1::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:37:19 +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 CY4PEPF0000EE3A.mail.protection.outlook.com (10.167.242.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:37:19 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:37:13 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 14/35] x86/apic: Rename 'reg_off' to 'reg' Date: Wed, 9 Jul 2025 09:02:21 +0530 Message-ID: <20250709033242.267892-15-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CY4PEPF0000EE3A:EE_|BN7PPF521FFE181:EE_ X-MS-Office365-Filtering-Correlation-Id: 240ce0c0-6a5a-4597-6978-08ddbe99e888 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?itoor8GAQfwzLjrxxJy5wpH1lfv6AkLzTWlGvDUjzmD9K2rH1DRWlBVQCRWa?= =?us-ascii?Q?JjeuFs7tcLm3F9T+XqD7CQc+mAr+2ux4LuIvwHiwHQSeBI8w3iF5P/y+z/5E?= =?us-ascii?Q?Q8HFr6fpYwsudRpRvXN/4od06XH5pwQBXCEeDd8xiORVuPtC9EA36F6dxxPX?= =?us-ascii?Q?0XJxUiO/PSObJeUvgBm9VMJ+uPSxM7v/+h/6AkMAZ2zFXtPYuJx9fv+orIbb?= =?us-ascii?Q?LS0iOq1RZbYs01oNyMOJ/fPXxdNzpaVxIuUxFol/bsUsrXvU3Y7IJ/8UEZyq?= =?us-ascii?Q?tia0o3mb5HFTdggHpAZtwkPpUy8cBcEMzltIfnR3utLQnjoqXHplKd09KgFH?= =?us-ascii?Q?UxHVYFTnOYvjWKM8FtMAjccr7vfjZuGfeL9Y4vFnoqnRL4OjdY0QIP8oQfVh?= =?us-ascii?Q?ywFUW1quKfFk4fQeIb3FJmBLx6dWc1sOtHpKNsWnNyLJIHZKZaGB3qy8GtAX?= =?us-ascii?Q?GiFEJ9aiwKbW6ItV2qO/ilZBG2PdArhCc5jW3Lk7EgnfnfPlzKIpIOyIGchW?= =?us-ascii?Q?cN/ZMvJiY4DiK4OtGUPNS4M4GosaydKZwAiBzV4j17xEmktjquMcJH2czXI2?= =?us-ascii?Q?ncHvLxIL8pdD6jH5OhiKkxfRrpj/XV5Py4rxEwopBPQ3t1cTEmbEYVDFE/gA?= =?us-ascii?Q?U3EhzHCHtWdwQ1c0gFGggbDPingioJvY+VG26BoyUuuk27msOUGBRH/7nOgk?= =?us-ascii?Q?TtI3fOps4SF6MGjErV4y2zWr9wbo6J6i65ixgPtraAeDH0Dp3uoF6otlbv5A?= =?us-ascii?Q?jXc7mdiPmk7j1pPUWmSC7Gni2SxMmVug5yd4W/7xqLfDXV5Q1S40WdvuHvoH?= =?us-ascii?Q?hoxH2gOtsk6YsgwDZouMO2HCfaODVr/HRdBFRNqL6/3Sng5p37R6G236a7yc?= =?us-ascii?Q?T7MNcbJwpog5H8md6j9myVnqYaACz9rifWHIp/JxLC4VpmqeFgh1KDQitAqq?= =?us-ascii?Q?yS+URB1i3dI5aWsfgliJOQOseNiri6nB+dUD1UyzOVmBdy6Kw23/dszHCuOf?= =?us-ascii?Q?hCbI31tD1ghqlXb4r2y8WxaoRxYu4azd7C1cJs5LYTBBpGGJQ8GapugnVnLu?= =?us-ascii?Q?3/IalI2KABNTKLQexfoVz1xTQdNMfNSg1m5lizbUjv/Gx/uuVnNypqRGBzSR?= =?us-ascii?Q?sSoF3rmd/0EVnNEqm3g+eEuKcYgzAoVcuMlgq31VImP4HoWV2rW1t6S6nP5A?= =?us-ascii?Q?h2RXfsFuCjjlBKIMesgNDi8vd5ViS6l2FvOQSWxcdbcYEIssiKmnkMYqi2K2?= =?us-ascii?Q?zomgDbUIVTEwqRV43328bCMB9mmVKDPqd6XjHQCR0vX/5YV/qTtpqGWaVvin?= =?us-ascii?Q?PgzcXisKD8MIrU7Q/Tmht0x3nXJDnQ/4wCKhcwWsyJf3i61dT/78xkFzRCet?= =?us-ascii?Q?VBVuzXaH8drWLGqGpezHT469JdTKf8LFd4d70T6eHbtFMsk+TEMQ6UM2TTb8?= =?us-ascii?Q?RRqWpml6hCP0EvvZzqfVOUF1Q2uTG4nNsZZmgrDsnnRn+3dpi2+W6rwSExop?= =?us-ascii?Q?fVHu8fQdQr+AZb12CHKh1lZ9kOoCAm1QBe0h?= 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)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:37:19.6125 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 240ce0c0-6a5a-4597-6978-08ddbe99e888 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: CY4PEPF0000EE3A.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PPF521FFE181 Content-Type: text/plain; charset="utf-8" Rename the 'reg_off' parameter of apic_{set|get}_reg() to 'reg' to match other usages in apic.h. No functional change intended. Reviewed-by: Tianyu Lan Signed-off-by: Neeraj Upadhyay --- Changes since v7: - No change. arch/x86/include/asm/apic.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 34e9b43d8940..07ba4935e873 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -525,14 +525,14 @@ static inline int apic_find_highest_vector(void *bitm= ap) return -1; } =20 -static inline u32 apic_get_reg(void *regs, int reg_off) +static inline u32 apic_get_reg(void *regs, int reg) { - return *((u32 *) (regs + reg_off)); + return *((u32 *) (regs + reg)); } =20 -static inline void apic_set_reg(void *regs, int reg_off, u32 val) +static inline void apic_set_reg(void *regs, int reg, u32 val) { - *((u32 *) (regs + reg_off)) =3D val; + *((u32 *) (regs + reg)) =3D val; } =20 static __always_inline u64 apic_get_reg64(void *regs, int reg) --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2057.outbound.protection.outlook.com [40.107.92.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 A61DA217F29; Wed, 9 Jul 2025 03:37:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032273; cv=fail; b=U9JEUEQni97kXobWMB9/+EWrqqXS45XOBEB2UJ3lDwFjaqa6rfXvjty8PXrkdozwtZA3JcIfPRF4EX91v9xYhfKetSheGGk+xzINK6VHIGYDSO7AciAekRbYxwDH3uvvMpmfz5CrzE8ZtiNtnf885oIzR0YN7AxBBml21/Vwo48= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032273; c=relaxed/simple; bh=p6VD5iKyrfUElHNOLtNFLBb/PAZDRWqoPm0phCX0+2U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=KzaraM6SpzMfzDMxnGnNwzAgBTHbRJKnxamu/OlNrePhMd0Xg03LI2M8bBRHk9nHlZHqkatSKxsa+Rl4GrXCgawX/kxDCyaL+at4YT/nat/Y+OPij4IFjJoG8nq5G2jHsmX4zSGvlPk4bPvcVvyHjJdh0Mqaic0YT9DmZ2pvDTY= 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=4lpDxDzT; arc=fail smtp.client-ip=40.107.92.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="4lpDxDzT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=q9Pe9JW0xsS1qq50nDuctsRl2mz9DvH6OSHkLaIREhjX4GB/DhsCCPmKJq0I9PETUCkmmySCxPeQxgW4CQrq+PIspM3DXwMMWBw7F5rB/DcNVBoqp6zk3vCyi4ENQ9fAdkdPoUBgXkZtchK5Nm/F5WveVPGBIfZE8PgsfJpWQ1w/4crusJcGodPWhHz9L/YIrNRM4TsLlYebynHB4d/Eor2qNAX/LV0epEcSzqU5v90pUYrotMj3OyozpHHKaxUyT2pAOi7eDbnltS3zNdfArigziQr7LWkF3De/SitkwUCw2Mj5aFbWY1JrnnlWU6BQnOHuTiYkRNM2q/kLjT0+pw== 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=B/w+dNCLisjxqHD84rIbJKWTJslzNCoKzaqyds9O4p8=; b=JTKguT0zJCuCmZ5HGfhTWr/t6v/RUNDXd49a4Y0k/r6JLNyYTwkuP1+Of0Z3aGJV8Y5Kht3d2jcCgdsJ1eM7CGzpc/YrVkyMRLPbSeO0E2v15EtyDf2yzsGuYY5cJ4PK74cX5hOfVfm/iwfClpwSR+xlmdH3z8f4Xs33lhAEPXY9FMHTH3f8Uamdgr+97J6hrBt11zlVvzRFCGIxA4MdcHo0QYd2a7dUkYs5FhWhRUKaKaJxJZKx+B/ul1Chp3+sQcZZBKL/qOmPDEu5dm0CIsOGD+HKPTjPvV3FYjwcImXMboQcXvZFSCgh5FWhCNNIZT5E2GU/3ZSGUtzflKTiNA== 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=B/w+dNCLisjxqHD84rIbJKWTJslzNCoKzaqyds9O4p8=; b=4lpDxDzT8EOoaSZR0Mn8AUf1jKz/tvfHWuUopzxPhNExsi7TOa79tmyuiqyujmgpIPa2/YznKA4h5fjipjoZMIEANHwEpeKgoopLvsy0wEAqA/7Bt1ekZ4tlAOkZeWAsTDI8PBBEMz7RIf2g7SgowK5tVJRfGekWYevUvRkVkrg= Received: from BL1PR13CA0209.namprd13.prod.outlook.com (2603:10b6:208:2be::34) by SA3PR12MB9198.namprd12.prod.outlook.com (2603:10b6:806:39f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.23; Wed, 9 Jul 2025 03:37:45 +0000 Received: from BL6PEPF0001AB4D.namprd04.prod.outlook.com (2603:10b6:208:2be:cafe::e2) by BL1PR13CA0209.outlook.office365.com (2603:10b6:208:2be::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:37:45 +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 BL6PEPF0001AB4D.mail.protection.outlook.com (10.167.242.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:37:45 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:37:31 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 15/35] x86/apic: Unionize apic regs for 32bit/64bit access w/o type casting Date: Wed, 9 Jul 2025 09:02:22 +0530 Message-ID: <20250709033242.267892-16-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4D:EE_|SA3PR12MB9198:EE_ X-MS-Office365-Filtering-Correlation-Id: 5e60b438-eb19-4b29-5f09-08ddbe99f7c5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|82310400026|7416014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?5nQMY0hiWRnROQ6zmq1tpyPSIS7UcR7tzz9eR3reMKnAIWVaqmokjV3ELBQy?= =?us-ascii?Q?IqxuEscuXIX8kEdGNKxxsdh4YewL2OBs7FN9x21AnwEBtHCDdOTPrCuhdPKR?= =?us-ascii?Q?bZVI+FOQbM6S7s3TiEYq+H2Dzaqn3MCXaGhwhhvswk1Ko5xeHuZdouKK9pg3?= =?us-ascii?Q?BUR0YL4cBXgW6grNB8owvGy4wP8PHi+rqxYckSemmp+qxLvfiZ8BS5MHmRR0?= =?us-ascii?Q?akaQyEMxB/gIxRFkWXJC0whHEp3vL0wIoEHb7NsDI+tWBVgpl6/hoTM69kY8?= =?us-ascii?Q?DtoiUdUaJAVuYmTPnYdexlyccA3TM7/MV120NbAYX0W+12tAx3KRPdgWb5yd?= =?us-ascii?Q?e6Yzkc2dPZuo2nzOGNiiB3gaZi+Cie26kmALzWK33XYrFb2VYEm2isEALayD?= =?us-ascii?Q?ofh+j6f+An3gmMZIqjDrrHrh8sCJe2RdYVSNLzgbW8aeGCw47VItx+f6cJ2r?= =?us-ascii?Q?3PKUc1ObRtYdW2tJAekhebRTEruQuxF4JJcR8KWaxVnHeZt2FdMSDuoOTKrE?= =?us-ascii?Q?Mqa0WdYlvpPuOesljfW7E/M+lM8YDdrhu+cdYl+vGu6vJXkdqNih/beM9OZj?= =?us-ascii?Q?Ch0a/7yFnu3OkvdKOM0ykeIhOrHVhwxGt55/fjnCibEbtE3FK2KANt+98JNi?= =?us-ascii?Q?vpD9GvfAogknoYyPekC/v/8cv2P1D8NaWavpYtRDAXSpUF7TPPONcempwk7B?= =?us-ascii?Q?C1iqJbEIPvka4ELtx0rkR5CaCvo3q5uoZb/i9y7Qswh2NoeURkh3KxQiFN31?= =?us-ascii?Q?HX0oqr/Fel+Rp4RaTw8ln7B0iiWejW7yxaR18PWoY1oSb7y7yre8dZvRrV7R?= =?us-ascii?Q?7XYRVx2/EsCkLsan2JgmAV06lZSG7q3pfatFnMwDcP4GKzoj+yVstzBZWCcg?= =?us-ascii?Q?LxXfybinguNbhWG2xjZwqQaC4G8t83MD1tsq6dDdxLGJf/k8CZZWRcc/Z7Ar?= =?us-ascii?Q?LfC4eVFIfg4HZ66szJnDZbldYHOmO7I2XilUWi9PNmx0xZFh79Sz1IdPXTea?= =?us-ascii?Q?d+hkir6BQovtmmoLgHLII9hbP0hKAYYld1bCtbBYOVq9XN9hi2II5G/yJ61v?= =?us-ascii?Q?PcyxlfgwXx2W0ACx1A6s9Lyhi/j7fbPoz2k5WgLmggxHldUc0OCJIpEf5F6G?= =?us-ascii?Q?U7UXcS2oGwO9UOwQmJgKrGoQOKagRiwGxNKUONXhG/6tmdUWAbOQE8O53bbZ?= =?us-ascii?Q?c3/r18UABtbbaVHBtEfzb7VvSr3mmF8wHm6SaplDYhhV8g8HNRbGViOYx3EE?= =?us-ascii?Q?PoSOclbqeYWjdgCttvBuCi+SU6ivjysS9RbXuyiBzI1MimF44Zc6hX0ybT8m?= =?us-ascii?Q?2suINPlDU/qWRp6ebNc2BhcVeSgqX6SceGcsqexIE5qOmoLBZIcJd/ejOU7e?= =?us-ascii?Q?ztP29pTVbxthmHa7wDs7i5D5dJaS8Of+hXkOWfRgaJ72/ZuIJpLFikFhjGCi?= =?us-ascii?Q?+0ZPY5U4m9q7fpFHe30u3FX3Q63rA/z6PeLwGIuXl1ek3goDTSiCC1XU5Hrv?= =?us-ascii?Q?NEj4WMI3OIUNWbRC/0dWHg6bS9AEcm+tvsQ3?= 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)(1800799024)(82310400026)(7416014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:37:45.2219 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5e60b438-eb19-4b29-5f09-08ddbe99f7c5 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: BL6PEPF0001AB4D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR12MB9198 Content-Type: text/plain; charset="utf-8" Define apic_page construct to unionize APIC register 32bit/64bit accesses and use it in apic_{get|set}*() to avoid using type casting. As Secure AVIC APIC driver requires accessing APIC page at byte offsets (to get an APIC register's bitmap start address), support byte access granularity in apic_page (in addition to 32-bit and 64-bit accesses). One caveat of this change is that the generated code is slighly larger. Below is the code generation for apic_get_reg() using gcc-14.2: - Without change: apic_get_reg: 89 f6 mov %esi,%esi 8b 04 37 mov (%rdi,%rsi,1),%eax c3 ret - With change: apic_get_reg: c1 ee 02 shr $0x2,%esi 8b 04 b7 mov (%rdi,%rsi,4),%eax c3 ret lapic.o text size change is shown below: Obj Old-size New-size lapic.o 28800 28832 Signed-off-by: Neeraj Upadhyay --- Changes since v7: - Commit log update. arch/x86/include/asm/apic.h | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 07ba4935e873..b7cbe9ba363e 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -525,26 +525,43 @@ static inline int apic_find_highest_vector(void *bitm= ap) return -1; } =20 +struct apic_page { + union { + u64 regs64[PAGE_SIZE / 8]; + u32 regs[PAGE_SIZE / 4]; + u8 bytes[PAGE_SIZE]; + }; +} __aligned(PAGE_SIZE); + static inline u32 apic_get_reg(void *regs, int reg) { - return *((u32 *) (regs + reg)); + struct apic_page *ap =3D regs; + + return ap->regs[reg / 4]; } =20 static inline void apic_set_reg(void *regs, int reg, u32 val) { - *((u32 *) (regs + reg)) =3D val; + struct apic_page *ap =3D regs; + + ap->regs[reg / 4] =3D val; } =20 static __always_inline u64 apic_get_reg64(void *regs, int reg) { + struct apic_page *ap =3D regs; + BUILD_BUG_ON(reg !=3D APIC_ICR); - return *((u64 *) (regs + reg)); + + return ap->regs64[reg / 8]; } =20 static __always_inline void apic_set_reg64(void *regs, int reg, u64 val) { + struct apic_page *ap =3D regs; + BUILD_BUG_ON(reg !=3D APIC_ICR); - *((u64 *) (regs + reg)) =3D val; + ap->regs64[reg / 8] =3D val; } =20 static inline void apic_clear_vector(int vec, void *bitmap) --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2070.outbound.protection.outlook.com [40.107.92.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 1D7B82080C8; Wed, 9 Jul 2025 03:38:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.92.70 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032286; cv=fail; b=Ko6p+6g87jE7hRRaXPnQ+N6VOuuS5Ber8jk6HJWVnoemG4+X90gQ3Y9+Av2gbT/Z3BSZChPqASboCWMyxCYULkU+qrD/1joEgyManbGbAQQIpcdASXkLe3GWWxCbhoHehu1mLZxy3oEKBmpAPjBqG+9CrBHDAyqK2v6uAcrARMQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032286; c=relaxed/simple; bh=Wn6H91KxFL4ccrLUIRWrAM/VBMK9EwltD8KmUIJtxLE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=YEhTd+3lMkDBmm/877TcUBmp5Xtf9zvzzTIXIdkRTVdCrOoiaQoWOh3VCdhRIS+2NN4cwwA+9yZijGgnBI2F+Bk+xBo9sU8SVbZ4ITmp68080QqvZCmIPRqmIt8vjIuh5xQwR+YT7wQ6ta1Br+CSH4+o3bsjWvbEvzebw/8038Y= 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=dzX0oLxk; arc=fail smtp.client-ip=40.107.92.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="dzX0oLxk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=OP+uJoNh9zokdJtfb3TblADm3ELyoMK+MGMpuiWUg0rp1GMWeMLpGdisy5AzCbMnvPHRazLhYp+niJmCgWsEBo7WwIDiAznay1GCH0qW1EFyMwwTGNxWTgxhXmkbX6PE2mV+0l2vp0RYRug4k4g1s9UxYDtmRlelyotBF0DjtIbi8y8KlLJOJlldbRxWCz+7LwC1GMdYNlkkZwwtYFE+3mrDJBH9y0JY9iwwbCzTQmCY4JlgR5T1Yq2i6/8XQFLFgMTxdGN8Xgb42RG6IXQHaDlJq6x0FALjGQnZYXWL2Of9LKuID5ta3mx2iwZLjW97nsqKZ5rBz3P0NcSPefQ9Ow== 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=lVHCI35Ho7wrHIWfuPBoxFMi3yV438LtT9GK4XNsXt8=; b=TYCNceHJO4VGCQ8xEAoUtpmU+z5J3IxL+kUJR9lH8+wP79q8dRbIfU/CLbVdOzrtlBSIGxPDk54TwjWW3e3JFFNHgptfdzQHpM9iYrzCDPyrccPn8H1S5cVKsVN4NTszuNjNTL2nK8BfEyfflK49pgmkra03Lbvms+bTih/Wg6Et992YFnZqE21IH/Y1i6M9tsbQcpNZPXHIHp4VGzlh654zvq45Sm2QuUW1DfA3e0xMBaqC9IK1n/dOFVBkOTAxGpT5FlW6Y9qKP69462d3dKO3huMwB1vgeHyz8bn4ipqIXmvmKY6+QBAwdVYHssKyYJkNwfbzUhqzhP+F9tQm2Q== 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=lVHCI35Ho7wrHIWfuPBoxFMi3yV438LtT9GK4XNsXt8=; b=dzX0oLxkIOpekmlQP9VfA2Wb7+FM1L+HEpVObGnfeJtjIYOH3eTNWYfER3kNb60Sg6HRqHRwHCu+Z6flaJqI13WAgs+z7WyQ+CE7/zC04gqOcTfDxa6JSu1rR/wUwlkiujahCQttwhKR5y82oGJSGAkOmWjrgLE+WkC/SU5OVkM= Received: from BN9PR03CA0397.namprd03.prod.outlook.com (2603:10b6:408:111::12) by PH8PR12MB7350.namprd12.prod.outlook.com (2603:10b6:510:216::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:37:59 +0000 Received: from BL6PEPF0001AB50.namprd04.prod.outlook.com (2603:10b6:408:111:cafe::a3) by BN9PR03CA0397.outlook.office365.com (2603:10b6:408:111::12) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:37:58 +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 BL6PEPF0001AB50.mail.protection.outlook.com (10.167.242.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:37:58 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:37:50 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 16/35] x86/apic: Simplify bitwise operations on APIC bitmap Date: Wed, 9 Jul 2025 09:02:23 +0530 Message-ID: <20250709033242.267892-17-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB50:EE_|PH8PR12MB7350:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f0592f7-cce9-4e59-8d57-08ddbe99ff93 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?bcHX8YkapDsiOValpsJ5Xcq01L1bGvNhju4fn6BibRPxRWr4pnJIO+Z+PlsS?= =?us-ascii?Q?mpc6nfBY+3TElAZd6aI9Pdrapq6JNNSvbrIGCZdNR6XaF+NOv7Vw6ispw2Va?= =?us-ascii?Q?mTldofJf9GisrLSjPQlj7UuV0z+ISLhFP9HbAUDeYT31szfnJ0/hcIgmd4Jy?= =?us-ascii?Q?KpEz3zxndSh3sYnAlJevHxYhD9u8B5TGZz6NapvkyEVk6SIXCns7s5PASoVj?= =?us-ascii?Q?Hr9gJaF/HBPR66V6cmvJuE5CM6TWFnwQ/nzsQp6/8IT8FHuvtrPU4/11jne/?= =?us-ascii?Q?j9yov1jcW8si5w1gBaTyQ3auQuR70lG4CTgWACW30IJYiIj3tY6iIfX1Rf9j?= =?us-ascii?Q?SChhD23mHEPxSUr3f6M+XeG5+wNKxSueZsiXLVE2nLifyoMYsU96o9iHVkAR?= =?us-ascii?Q?Q3kLcTKU5+xoUJck64U7LGSVK5DS0NmLce4UmA4QyREPNLgOY93YbXmg5b7H?= =?us-ascii?Q?1mqaDBxXkQRP3a62XPwi0RZiqvQYIxEO2HDxOJ9MxlfD8X8/CyBKOdMAIP3t?= =?us-ascii?Q?fYAuZPCiv0RcOQau8AU+gd7JTv/6q9oOnT8xJLlRxbxnOwhsI9fp3Aixq7hT?= =?us-ascii?Q?0m6ODLm9cf3ABAtU88+sdu++mW9joxZp3tgUUw0zZt3CSr0K+VXYydDftTc+?= =?us-ascii?Q?vkcumqmDLOdn392LxfMXT8oz6QHwzT0gGDZvELBvGEMT0z9NyVi+bPwSPmc6?= =?us-ascii?Q?RaTfiV18GoTeMZP67x8RxjUUUkU4Au2O7CPqdeDkg6DfIzKxmeMf/5Ql7APd?= =?us-ascii?Q?nMk1xkBa4DxLsCOASzzCXJXqWyFd8vDrFe/PdwXm1olSpXb4kdrP3GuleH6O?= =?us-ascii?Q?+7QVm+4z3hyncuSQx+Buav1nRToMXWQZYjTY3DrlYOMtZXUEpY7ptCibxPri?= =?us-ascii?Q?LlGLTUh0mtuJfxijj0/ytpyvN47b0/9nDjm8xlPchJ4BcKfinrlHqOK5CxQ1?= =?us-ascii?Q?xl8yyA3rjK/YzIHrXUSpwqQ08h9B0Go5Y7CnNUrlL0hBOo0R976FHx7yjRmR?= =?us-ascii?Q?uZOMSTNEjnm0lJ4gg0G7GrnCRVEaog6eQV/OQvq5ATy1jALsHLEGEnMhHB7D?= =?us-ascii?Q?d5ALvUwZoRzFDtZw2zbAGA07xrsf94MncA/9o0phhvEwB4SXslWzv6uAyfjG?= =?us-ascii?Q?Q0jsnyDE52r6WxpprGqrW3JFW2xxDWU8EkPb3ByFVhDSdbvYONf9Ju7fcRGg?= =?us-ascii?Q?NCsa/KGc8BR4Oua3qrRW5W3YrzRBimXdXjq+20rDTRq/rbbbv5MuoVZX5l1J?= =?us-ascii?Q?aga5EZzKBp/XqLLCPW9a/DCjVcYqcPHs68PPOJae0LeAmeGiD/hYR8rSiWH2?= =?us-ascii?Q?TNJ95dRsq5BLPKXGlEZGmnq64wEjepqv0IM8wEXHSLaEQDiZSCl9Li/+whvK?= =?us-ascii?Q?rUbHYCAxpR/m0J6Csz8ROUyI/Wfst+L/5RanExwIcoQuftUa9FXNgiamDPkh?= =?us-ascii?Q?XLmytbMHjvsGVMK710K5WyTVCEVIEfgQsfy0LNKva0Yh6zrTiY90Igd9OKTF?= =?us-ascii?Q?xPR/G6a2Yf2fWQhhSkxwA80qLErQ7w78VEbo?= 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)(1800799024)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:37:58.3180 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f0592f7-cce9-4e59-8d57-08ddbe99ff93 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: BL6PEPF0001AB50.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR12MB7350 Content-Type: text/plain; charset="utf-8" Use 'regs' as a contiguous linear bitmap for bitwise operations in apic_{set|clear|test}_vector(). This makes the code simpler by eliminating the need to determine the offset of the 32-bit register and the vector bit location within that register prior to performing bitwise operations. This change results in slight increase in generated code size for gcc-14.2. - Without change apic_set_vector: 89 f8 mov %edi,%eax 83 e7 1f and $0x1f,%edi c1 e8 05 shr $0x5,%eax c1 e0 04 shl $0x4,%eax 48 01 c6 add %rax,%rsi f0 48 0f ab 3e lock bts %rdi,(%rsi) c3 ret - With change apic_set_vector: 89 f8 mov %edi,%eax c1 e8 05 shr $0x5,%eax 8d 04 40 lea (%rax,%rax,2),%eax c1 e0 05 shl $0x5,%eax 01 f8 add %edi,%eax 89 c0 mov %eax,%eax f0 48 0f ab 3e lock bts %rax,(%rsi) c3 ret But, lapic.o text size (bytes) decreases with this change: Obj Old-size New-size lapic.o 28832 28768 Signed-off-by: Neeraj Upadhyay --- Changes since v7: - Commit log update. arch/x86/include/asm/apic.h | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index b7cbe9ba363e..f91d23757375 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -564,19 +564,28 @@ static __always_inline void apic_set_reg64(void *regs= , int reg, u64 val) ap->regs64[reg / 8] =3D val; } =20 +static inline unsigned int get_vec_bit(unsigned int vec) +{ + /* + * The registers are 32-bit wide and 16-byte aligned. + * Compensate for the resulting bit number spacing. + */ + return vec + 96 * (vec / 32); +} + static inline void apic_clear_vector(int vec, void *bitmap) { - clear_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFF= SET(vec)); + clear_bit(get_vec_bit(vec), bitmap); } =20 static inline void apic_set_vector(int vec, void *bitmap) { - set_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_REG_OFFSE= T(vec)); + set_bit(get_vec_bit(vec), bitmap); } =20 static inline int apic_test_vector(int vec, void *bitmap) { - return test_bit(APIC_VECTOR_TO_BIT_NUMBER(vec), bitmap + APIC_VECTOR_TO_R= EG_OFFSET(vec)); + return test_bit(get_vec_bit(vec), bitmap); } =20 /* --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2078.outbound.protection.outlook.com [40.107.93.78]) (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 1C51B2036FF; Wed, 9 Jul 2025 03:38:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.78 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032299; cv=fail; b=pqeDdCdKU39kHYrJh4aUYNxtwXrWDMI6cyhdPFLv3qVNdzY3mJ8tdArn1zUyQDxIM3IV9eSPu8hsBVTA8m7+6VJn2MYP/TSbzTtyrtkRUERwTyc/F/+T/OpB6RVBSd2O4mxbK4I3h9nLhah5vGJZSwEWLsmk2amLfuXHXGF7HO4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032299; c=relaxed/simple; bh=xH8LBxYrLD1du1T7GKn+lbaJu2Xae937pGDg/evSY+A=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=p9rbhKxDYIeNUW695H53LkDXtJMbN8OBO3GeqAbLPz2P89vYSwh8v8HfoOLgPhZgCZH1vS73UvFE7glJXK5yVwW63ihlLoCA33gn1niUNibL94jWa5m54JEz+js/A+O89w6Ns4duA3uJzPAkKrNk35Y9ah7VOHbRct10n0uihsc= 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=f5BDsVxZ; arc=fail smtp.client-ip=40.107.93.78 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="f5BDsVxZ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=T998PghcDJrAKChKJJGewaAcER20NXDaz0NiyGXAyC4Fd2SVBM0tsEixVH0ptJ5bZPLFU1utF2zMoYyjRHFQLSguPVLlutXKA2I5h9E1FvKI0dGO6eEOyr/ue7XkUhm2qLI3oPdFhMLNObmxiKkGg9LtITtbJ/YInPoy+Oyc23KPRmCIApa8rijQh/UJv/3gHkYDVkz9Ns1cNwgK1m+E7rxegPnmdDX3MmRRBv9w5ACLrkRNkahNQ9vyomLLilvMKiZYz1U+RybuqgLrNgw2PEt4aQ1oDmvtgkBxqkB5yxN+0hpktjZBrDbRcdG8mpfQPWahH8KD1Jp3BRA7z2Dmpw== 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=qcDsvfurVfN5C60v1p131zDmIKhwXp1wo9TtJDtu3x8=; b=HXGswwHVKolHyJOaKvX9sDGuFWzfsTCGTxkOONleGlxkidL+jd2BOvZuNhv+wk2Ho7fJkt55OEAyPyAKfrVSdIdXDJ6syQbPeAqDR9rxBjqhSbO2Lj5CNiLHW0AE8AE1hjFI/pXL6YtYhLmzxVL6hPmkPv3ZsnprkNz9/kyvN0OQRQ5wx6Ver1kjB8wdLleAmlWXnAF8K4sKW/AhmJC+YytUzJaueqMNKDxsxitNA1fDjnyg7mIoeOgKL567uFNcf+MkUDoqrRyfzJ7cI4bLR3IWXwHwwVUxzD+TvG4zPtfYIy4WdsNd9mjaNyg9wBBWuFI6GwPgOjfRM6nQnKpMdQ== 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=qcDsvfurVfN5C60v1p131zDmIKhwXp1wo9TtJDtu3x8=; b=f5BDsVxZ51ABid4gabYkoL4ErKRIFdLJbGSF+j83GmmDALcqK6Udntx4NAa2WhnIC11C7ATIwxMHKFUPAFNS2q/kfCiQE7+xb0cFlk1J6Z3EGZf0/0u6av/01KDjptt0Q+VKtU0FnAlJ9nQ1pN0IQscLeuVSqYHtBQi2sB/i6xw= Received: from BL1PR13CA0190.namprd13.prod.outlook.com (2603:10b6:208:2be::15) by MN0PR12MB6126.namprd12.prod.outlook.com (2603:10b6:208:3c6::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.34; Wed, 9 Jul 2025 03:38:14 +0000 Received: from BL6PEPF0001AB4D.namprd04.prod.outlook.com (2603:10b6:208:2be:cafe::f9) by BL1PR13CA0190.outlook.office365.com (2603:10b6:208:2be::15) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.20 via Frontend Transport; Wed, 9 Jul 2025 03:38: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 BL6PEPF0001AB4D.mail.protection.outlook.com (10.167.242.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:38:14 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:38:08 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 17/35] x86/apic: Move apic_update_irq_cfg() calls to apic_update_vector() Date: Wed, 9 Jul 2025 09:02:24 +0530 Message-ID: <20250709033242.267892-18-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4D:EE_|MN0PR12MB6126:EE_ X-MS-Office365-Filtering-Correlation-Id: 9ada6467-72e3-4bf0-6018-08ddbe9a0915 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|82310400026|1800799024|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VhNh6q/LCT0wUFRMlVhdRhOxoX4gBInRQ6mOjUzEi7Mwt71Nw4IeSHlZtxAE?= =?us-ascii?Q?VmwB1konBNomWol1gKltBSfbINsf9r14XKXfWj14uAN2o3kbcfrGK+R9ymp/?= =?us-ascii?Q?kft8aovrsaUAo4H2hL8WBxhvmy08D6OMncKhdpxUfS40f9xVqXhh8YXAWRsa?= =?us-ascii?Q?0tndQoAdyZ6xERXPxpxOfeSgynkIwzgfnwvTMfruDqjNoXUt6+b26cu9w+Ho?= =?us-ascii?Q?VxWR9BWoVuVTbqQGK29OypAifz1+oemjcOrsHenM5oYzfhIdJjTSOT2tKuW7?= =?us-ascii?Q?htxwbKkvB+pM9L+B3M4qOw1GVteePngUCn1EUzyKSwL1KDiYYDbS+k97J8zV?= =?us-ascii?Q?KSJwa7qalkDxENXvpFBVKZZ6fL+0Q8i6x0pTp+IsnhYc1Ci31ZkiX4d6jsMk?= =?us-ascii?Q?tF03srKIHRJhW5Eqz7TTZ2SyhpwfBxQ0HKcPYz0O+WOZJjw+1DKhclxS/Icq?= =?us-ascii?Q?2pxircZ0S03RXtDdHTCbsdu7zFTWqi3/eInVOj0u+MCFoHEGJrvGlMGBUYX/?= =?us-ascii?Q?1PHVLJ1Fry9CS9AULSD8MqMQDjsMiXbmQ31m92NwUZNvfcBUSa4ywk3iUUAE?= =?us-ascii?Q?7B1SG+ON7TlQP2geavwZqJCgcHv5XO/g8C6nwwdtQtpcoJ+b134e24nOQm/C?= =?us-ascii?Q?X3iJAu2u8zhWHhhgMqTv/sTlragnUk3CIG95Ud453FZq/VGcXwNFRwTr0QjP?= =?us-ascii?Q?c6jiS4FPhBC1bkPW+tEQRS6Wwfj4iBRJTD6hyPn3svUuRlaLL5B/ePNCLQq7?= =?us-ascii?Q?vA3B2PDYOj4upD/nnpvMrneVXlummMT0jXG4HITEwSYYVTDICRKY8RA0esnH?= =?us-ascii?Q?0bxJIlfVbkcXTaB6sGhGnZCbvTSCJWwuAo8qehIA3Xzn+JjjNBQSl21YOgcP?= =?us-ascii?Q?cpPALrSWvsOcekKmZnV5dZVgqn+UdqHNkInKsRmySAYKC9MUaZCJ6unQ5Pbg?= =?us-ascii?Q?dJXIEkxVflyb1jkKHEqaz9i4nUwZag18I+N+GfyntScJlOn6SGJ59S3hir4L?= =?us-ascii?Q?+zdLhwOWJn6QkcJ/GygPv4bVVo6RDhFopU7b5c9KFIiBvgf7yDq69eWWEffc?= =?us-ascii?Q?dtGrGfz1RPfsK3pS7FbdYVfThO+SstFdJGQL5NvrbcjBAQU1jsq5zwIF7Qnf?= =?us-ascii?Q?I3xAYbLo62tfjyDhnSskPSuk0DFThQJ6ay5GTjimmExSjmit/wMxGxkDxo1X?= =?us-ascii?Q?p/3AYtn7BTuz9AQpiahHlycMhKCsTKriDpILIYagDL1by6O+moIihSlh2Cqt?= =?us-ascii?Q?26hQptip3AbIgweI/eyt7WKTuKztJjBMngDSH8xtmIMyMM2URuBCkQPPIH7X?= =?us-ascii?Q?gG3sm6zcQgPpBNwBdsxBwTyCO/CP3MhKHWJStUOGncodUEOEXhoeuZC2hD+0?= =?us-ascii?Q?Wj248xRTlBMcZnc85Nq3zJHW5sJEBS8H9v9P2kaVXuSIDwFlsnibZdsg+B9S?= =?us-ascii?Q?qx8BJ0mHIV6WXyU5B9yJGPJWs9idu8TtYVtIAMTahi2D2wUYGZ/pbB8OBmaj?= =?us-ascii?Q?F1pV34Ayov3pb4QWjLsrJjfKhrt9bHVnxj3B?= 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)(1800799024)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:38:14.2673 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ada6467-72e3-4bf0-6018-08ddbe9a0915 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: BL6PEPF0001AB4D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB6126 Content-Type: text/plain; charset="utf-8" All callers of apic_update_vector() also call apic_update_irq_cfg() after it. So, simplify the 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 v7: - No change. 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 93069b13d3af..a947b46a8b64 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 Tue Oct 7 14:45:08 2025 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2052.outbound.protection.outlook.com [40.107.237.52]) (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 C5E0C1F4E57; Wed, 9 Jul 2025 03:38:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032320; cv=fail; b=VJ3bGusy0l4m94tBELqtRCmKLwQ/B+K/EC0Q3XrmHghrfvzn0FQ1JNVMrVwcJEjWgpMs1t93PLkcDZ06KyKMwFCyNqurjbCedwKg/LsPIvKloSXe81e+c+QnVlpVHe3fEhxhkQqPNSO95WiQZyAphOXHVtLAw31QP5QdWlA/gWI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032320; c=relaxed/simple; bh=JU1U6sJc1dpJguFGCd3hDPq8sXxNWtwWJ7wmu/XG2bw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=IEww1BCCHwYdkXbOg0jgBvmtxfVzk57E7U9s6RA5O+FtOlNDb0bil101mAU/tWjQLkUTMCU+ji2sE3p7qoW3hyYSuzvVfYgLHOSqsPlf7ei2CO+ci+KVv8txXiXrGrRoiZDJg8FrxwhatZQ6W77RM3FmpC0Paqad7RSTt0Hk+wM= 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=TU7v5Msz; arc=fail smtp.client-ip=40.107.237.52 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="TU7v5Msz" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MviUr3j6+/w3RxrLiIVWmTuP0exDNnWJ2u39W4MqSL/Pt7g3u25Xa3Yv0EqtFkRD6Q0KM9qs4AFoRnjquKSkdS9kZNgbqfiAJHkEhyoAC8iUjGIISW/5lkO0YTlZcpquK3fFgf/++pLiufAH3FG0tby1Kdq3FrX93AGPh2yG1fkco+zdxPd0ZpCgbFmd5ocI6hoWa1do9M8wg2lOYYCkMr9xbfh8eEvleDYLFkYQFgo0UA0+dBHv0KQC3Pl+0p5LOoAJ+KYNyB0sSbbGLlL6oK5RcNg8O9vKp7gXgE2B/73/tvLeXtfXjCYmX7K38I6zpXViD5hszO73v2gnfI/huw== 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=bvkkrZrABFfbSfv/UR//KJCbvJCl7dUztxGJ6hQ5o4c=; b=kVqnfQu9nvpkdOEBBz+l11XZNMXxJH13iBER93JslVP9hTJuhzNhCP6ctP39q9Ujbep/JABjxjHmTvsMlvSZVRjYSjfqhu/70PwOYxp7a1y1wdl6FdYJDp+Tdv3dF3f0r/3LlwHuJwWwoiumoC/q52qHDHMY67zPt3kcBGHD8Ty1sJVti9FvveN4GVibr26TdunLmu+hyQlHCHwxqMcSnjZT4QCFCC2ciIlSpcrhgS5KBgI7u/KQOaqi1oRiCeQO1jebNWxeFRexBYWBfEcnDV7Oj+4Fs4AoaPsHTa970o+ob5CwwUSQUN6SvGGIQazHm7JNJsTBxp0PZh3V0GTDjw== 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=bvkkrZrABFfbSfv/UR//KJCbvJCl7dUztxGJ6hQ5o4c=; b=TU7v5Mszl0+0M26xdbC2wDdJAMfJvSlGpTvsfByZc8oMroH2zjzbkvOcElUwyym9YZ17AJrGkxJSPweQDG3S8h/3r5AIq6dWZon9db87aiQ/A8oS1QXKGNCOfCfKcSiML4wDCoIJKz0p4WPqKrcce4Kf0ukv80TbGpi+VaEhE6s= Received: from BN0PR02CA0030.namprd02.prod.outlook.com (2603:10b6:408:e4::35) by DS7PR12MB8289.namprd12.prod.outlook.com (2603:10b6:8:d8::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Wed, 9 Jul 2025 03:38:33 +0000 Received: from BL6PEPF0001AB4A.namprd04.prod.outlook.com (2603:10b6:408:e4:cafe::63) by BN0PR02CA0030.outlook.office365.com (2603:10b6:408:e4::35) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:38:32 +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 BL6PEPF0001AB4A.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:38:32 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:38:26 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 18/35] x86/apic: Add new driver for Secure AVIC Date: Wed, 9 Jul 2025 09:02:25 +0530 Message-ID: <20250709033242.267892-19-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4A:EE_|DS7PR12MB8289:EE_ X-MS-Office365-Filtering-Correlation-Id: 3f0b1238-43a6-4be5-3575-08ddbe9a1417 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|376014|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?fGg2LNBsDituUWdPVYCLRGu7c2AuGilDwjvd97tem+s/NJ6qVBHcZhjG50nZ?= =?us-ascii?Q?nYQ9Lvl+acOpPjkNVyBBQXF+A8Zb3sxY0J1BzMhkiB3KyEtJlMPWZVfBBxhQ?= =?us-ascii?Q?IcgcoK7KJW9X46kd0zmN8uy+yCl90p6dHznOGnQz6wUOuNZp2fF/mjTTH7pr?= =?us-ascii?Q?/tIuyRHPe+EyZpCzmgtQ2G0Q7jFWjDg76/EINIG5L7tncjBjYCIbCPrHHJNh?= =?us-ascii?Q?1kg0Zp+i7Msr0YNN/qbA81zRKZBUGR5rUfmes8nec9ycbcXSr+Nyy8ulaP/i?= =?us-ascii?Q?PUjJd2lCBuZlLw9tlnqtO/8eyEtc0prCbGheBuHS0BcwQRDUNany5e1Tsw6U?= =?us-ascii?Q?SRhvRAMkKrDpoDEehDaOxvXF4TiSqk4llnqN8kmHf+pFNf+8cG5qtHOnAZpc?= =?us-ascii?Q?GBhjZ6bdFHbOkFgH5xB2NGwZT4nYiJQws1m1Q5Ilh2LXJwQ41KyTba/Kvfsf?= =?us-ascii?Q?ZFiQn337RGL9u8rif7nOU6OMOWcFa0EyNmhK1y1Z7TNAaqOCgzX6jMd6v2H8?= =?us-ascii?Q?rD5+4HKsZ8lm/YkG+PtnCsvD5oGL4zGLm/bqqphEq7a911Mt3SYqL8kQ4eVK?= =?us-ascii?Q?ikONcqv8I+ZlhkBa5ksCElEgfZwwPE4BLEbwZJl1+IzCNJI8DrmKC4i45sZA?= =?us-ascii?Q?SiibOMt8rrZwvPgc6Y7CiWRD4jZ9b/shl6teilL5PclDCmgxEI+XkSPv9XuJ?= =?us-ascii?Q?d7J1OZ7mkxX3UzDnOIVv03n+pVTXNYkftzArZJYR9TiqpppLsee/13itn9YL?= =?us-ascii?Q?yOh4aO8fZAHMDnWlCvlXSxkizVirpvDGpWUPRjzGXMTQtdLv07yP4f0SBs5L?= =?us-ascii?Q?Gz8Cu59S2zjDNxnS8xwvQAaG/svLxFJRZwpAWqWIFBCRq08C5zR3AuT/Rrau?= =?us-ascii?Q?u3Y/NCrPrqJcKSsexsKGzcWe9mIAto1axKYt2usRV++pWAuJU0Hfi4//yjBi?= =?us-ascii?Q?iOZJBaZ14lDNNB1ie1QTgtp+wmr96l64o2uN206TOn2r1UujYUUOWcKGJSM9?= =?us-ascii?Q?eDp52tApPnDcMexQNPpMndI4znDjVHcMDyFmIvToaHxPTlEEvb5RzxfOBZNe?= =?us-ascii?Q?oWyFpTCcyFe7vbhgWJYC7Pi24lmu264CsgmRCNfUthdTATndPnO8DVMnySCs?= =?us-ascii?Q?hpAnaaZrCMEe30oGF6F2Dm09auohVoNhAu92g/wYexUX6Y/ZuYUDZuUSfRRl?= =?us-ascii?Q?gYQnJTvdLfn3fPeOmqQPdgDh9/E9D5H49EfIlVkwQPEL6Dlh7vpZb+CIm9AG?= =?us-ascii?Q?3qAPdJghsLEPlUMahDLvIb0Ja7B3o4T2mfuVEOgKHpU2bDSnU/XHpfr6q+Xe?= =?us-ascii?Q?5wGIt05lPpDmqjhi9KNiaC+Obf2haYopNm5XJ4GVf2mkyn/3WVyMJEjB4Igt?= =?us-ascii?Q?+BUR5aTAExUHa1P40ibI3zAM1lATvcqBm981vz1NKC6pxJcZu85JCjqFq4Aj?= =?us-ascii?Q?pAXQ0uz4aJonlhRV4MmYKDxz8QteA3Fiuqln46EN54IKTejErZZmVwMC4M2W?= =?us-ascii?Q?uPaP6UOmlV3b5tvFL0znPQnJZrrEVE3VZTtI?= 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)(7416014)(376014)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:38:32.7357 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3f0b1238-43a6-4be5-3575-08ddbe9a1417 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: BL6PEPF0001AB4A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8289 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 Reviewed-by: Tianyu Lan Signed-off-by: Neeraj Upadhyay --- Changes since v7: - No change. arch/x86/Kconfig | 13 ++++++ arch/x86/boot/compressed/sev.c | 1 + arch/x86/coco/core.c | 3 ++ arch/x86/coco/sev/core.c | 1 + 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 ++++ 8 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 arch/x86/kernel/apic/x2apic_savic.c diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5b3362af7d65..368292309568 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 fd1b67dfea22..74e083feb2d9 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -235,6 +235,7 @@ bool sev_es_check_ghcb_fault(unsigned long address) 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 d4610af68114..989ca9f72ba3 100644 --- a/arch/x86/coco/core.c +++ b/arch/x86/coco/core.c @@ -104,6 +104,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/coco/sev/core.c b/arch/x86/coco/sev/core.c index fc59ce78c477..a19691436ea6 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -79,6 +79,7 @@ static const char * const sev_status_feat_names[] =3D { [MSR_AMD64_SNP_IBS_VIRT_BIT] =3D "IBSVirt", [MSR_AMD64_SNP_VMSA_REG_PROT_BIT] =3D "VMSARegProt", [MSR_AMD64_SNP_SMT_PROT_BIT] =3D "SMTProt", + [MSR_AMD64_SNP_SECURE_AVIC_BIT] =3D "SecureAVIC", }; =20 /* diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-in= dex.h index 7490bb5c0776..045c0d7e160b 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -698,7 +698,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 Tue Oct 7 14:45:08 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2087.outbound.protection.outlook.com [40.107.223.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 70C391F4E57; Wed, 9 Jul 2025 03:38:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032338; cv=fail; b=C3fEw5u0R8OMwKBXd5gaJm4E20SZcEDIJZQcjw/wmLUr5tU4VGJKxqcVpxNCNPTQvg0ZQiMnDd/omqoLuMFR6eut9k2+E/AnGnSyM0PlGnXqKlE1hauY0XaiEEjj0iq136bYZMBki6l+VERUmRPUWt/NUBcqXAojOorbm2JXtYM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032338; c=relaxed/simple; bh=ll7ueoHpSHeQghqlYlhjQ3EUhy/ID3J/dkl5VmVKRg8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=NKVMR95b99SIWFiMe9aNAB94HeuP85ugoqtl1DYRDfence6ygW3F+Au9A4h86usCnM40mUhx97+bTFinE+aKIRVYZy3N2AeOkNtAlJhWiLj09V3rwHAOWlaTbAVD54sP59Sck3rzDj8B4VJhEAhW1wRA7+d5d7JTjFf3Y7pwQ7k= 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=t0TIXqUO; arc=fail smtp.client-ip=40.107.223.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="t0TIXqUO" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AsH7lkFUA65AHotttLfelJa+ZuDVW4NOrtBFfaGJhXnEvH7eOvP1FrIGKSCi77ZCSqdkTzYTLvxljMVGLzxcmNDdSGxyVmlUee+VexHIcJIt/gjrMDvymtB0acfSjn7p2JA45M6ODtvUzhYwi2Rfo9fqbz4v/ZNABUmCb2aIvDyQbnt7G8k4b1PvpxxPHG94VHDf0yqfZltMFbd/A11AAIfupmUcxop0Nz9I2mRmrzhb3xyI0pcVVtDLCdYaE3nkc54iLY0cNlBzTypMLgW42N1NY9xnk+HE4zD7Bw+epMmUh+Jse7sZN/rEBXeGhlGHAd7eAFqp58JI34Gwuozqvg== 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=qsRRaw59V9ukJxvt2PbBoVNLK1kBAbjxg5yZ5yt0evs=; b=p0d6deRTjlF3u4/eaEELukjz4HeOMGen5dYLg/4GPbIPe+Po6dajcXoIxkMZkVVh9rz4oEcRUrlkigY1016ZTzdDUst6IVo5Owfv6DxQEMRC9TjHRvU3mAmFFqlCSUJK0DEsQucMABWX6B8pq/XGBpgPUbjEf//ZbbjHxwJHDgQN5vLBxrNF/JUi3ywqLo4+nK6TLI2Seup5W50hmihhxFD+Px2T74jpVikGdysxVPZWYXuS0plJmuKLAzhqlyH4lGqFPgyxdL0rYBXPUJsW9IMxPL5cQ4dR56vL248d0Hrgd+CeGdpnEHd+ZuStkW25Q8Xpb3SlxZyNAgiiXzz5ww== 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=qsRRaw59V9ukJxvt2PbBoVNLK1kBAbjxg5yZ5yt0evs=; b=t0TIXqUOtpzIMOHGzaXxPDtTSAnhjZrNCNKIrhjd4lYr6qiHmpeZ883INl79nBtfFAaYD2/ME/P49+DDKQdorWW8S9vmBob7PNZBf5ESeJB6AupNfW86k1N66ofJZOJTnnF3d3qPtjcS9YNE87fI7ZJFfN2OHa7vuWxjPJHg20Y= Received: from BN1PR10CA0024.namprd10.prod.outlook.com (2603:10b6:408:e0::29) by DS7PR12MB8347.namprd12.prod.outlook.com (2603:10b6:8:e5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Wed, 9 Jul 2025 03:38:52 +0000 Received: from BL6PEPF0001AB51.namprd04.prod.outlook.com (2603:10b6:408:e0:cafe::3a) by BN1PR10CA0024.outlook.office365.com (2603:10b6:408:e0::29) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:38:52 +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 BL6PEPF0001AB51.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:38:51 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:38:45 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 19/35] x86/apic: Initialize Secure AVIC APIC backing page Date: Wed, 9 Jul 2025 09:02:26 +0530 Message-ID: <20250709033242.267892-20-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB51:EE_|DS7PR12MB8347:EE_ X-MS-Office365-Filtering-Correlation-Id: d118bdff-a878-40d8-1a97-08ddbe9a1f82 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|36860700013|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?LyfQQxEbZN1B/sAAa9wxWQyUxs9fPTpjD/SJcFnoBJ2T60wsmFm9EvKp3iYA?= =?us-ascii?Q?iHnj09vKAPAljQ8D5l8D2BjJGyQuIE7E6MY81XcHnRfQmSnc5vSCVoJrITZX?= =?us-ascii?Q?ORh1lCoYwyuHNw/PhcfanL2+iU6iHrcgToDyuKcwZwKG/yKN3WZslFW3t3HW?= =?us-ascii?Q?KTCs9RvFHkRdq7FnJ5cLJECkcT9av7ivyEf7sPH7ldvIj+67iWm1elnWyJy3?= =?us-ascii?Q?7vDKcUT9N2MiH5vwTHbd1nq3xG38LEwUuSsWIv8pvpSGohWzsZRtUqS9y1SO?= =?us-ascii?Q?svF3b2uUNp3srFzd+x7mcADO8UPtoqrPFD32msiPPvoPe237NAfqx9Sbe9gk?= =?us-ascii?Q?Ypn5tij0Sd8I675yQ4+MGs7sc2ZBpkNRRF3qnRFoQEUCmGocsFrJorgVQ16v?= =?us-ascii?Q?Ss4iiRUq2sVn/T24iUufX2bsh6lQbjFTNwKxIA+hyKf6qlEhkFvOnt09fsYY?= =?us-ascii?Q?LxXd4D/QFQwHpXs0mSzNwammg394LFQH06JmwxoLVRTpjyh0e7CpdUykJHhJ?= =?us-ascii?Q?KF7fu2wTfk9MN4rTcUXggnjXh9R7IB+HM1t00Y/eBzME77GuTyO4zZNS3vhv?= =?us-ascii?Q?+MLsOXqpJMQvAehHU8JgoM02InLdNSAYMXWl+5+BOf7YvrtPczz6VGsybsaR?= =?us-ascii?Q?PIKEDakkZRTaLfx6mbPu1Cok6F+tjwon0huukFk+T+Shi6pugmLWiUCNpTpl?= =?us-ascii?Q?cC0MlHljEFbyyA1Yc5EDT7klTeDfy6G+lqyKdjiGwG4z5ThyYg8qx2107xZq?= =?us-ascii?Q?DQkWofewu+yFkvAzjdrVT2izUJVCjYwsfzh1jB5K3LAKsJybZsShm2wr4s/j?= =?us-ascii?Q?hVRIsltd4pZ56s37qV6DbgbW9TleyB1XwVhor21hfHQhU4+MUH8xBe+dgqPn?= =?us-ascii?Q?bxompDbPqgXizgD5TLYhKb3+mNRifuXKXvgcjJiOl0+W237Ig0j27QptPJEN?= =?us-ascii?Q?IcHC8po4/1iSOsNUr9KfJPM7TSQV4JNkU+mJ28dlVE8GUxcd8Q2s4zBd+0On?= =?us-ascii?Q?RPVQXWC+Ulquot/SYBPH+HBNms4vwt2tATTmjTlLEAloxVtMoDqGSWxjTXyF?= =?us-ascii?Q?UHnlAVwFhTArSW7QuLyC4M3NGvyNxnRGUjnw4Ym8jwF2qXqDIBhhSPEujSPX?= =?us-ascii?Q?o7XbgnhBjv1yTmjMLTIlOCFiGg1mfXN/c6Xe3DmbZsumOCmNAg6RB7yvso+h?= =?us-ascii?Q?/3jBYq/Xl8E2bZDHaK3SkF6VSS8MU62NXx+MesSpTekUjtxvuZaENfe1h5JH?= =?us-ascii?Q?N9+6gVbETu1vKD9LK3BCvtBa6l3REpCVuiOAkBJCyTknKc99xnjrYhQY+/Y3?= =?us-ascii?Q?lnNztXPl0CF3ZdSu4nK3jknpQLB0zeAm3HY7ooKLzbiG4sTEoZfi5T3ewlOR?= =?us-ascii?Q?BkDo7xARmnBDF/cq6N4ijM5sjghmMygY6rX/J9tRSZnIUD4z4rZdR3fTT5VW?= =?us-ascii?Q?iimo0IFynpDw+A9qj12ty6MMigvzlME07vzj2WX0KbFYrRUZcB4ziVFoef8A?= =?us-ascii?Q?9H+1lgj1Ybe7MYqNx8VzHGgQs5vg1GSGrlnn?= 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)(36860700013)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:38:51.8908 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d118bdff-a878-40d8-1a97-08ddbe9a1f82 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: BL6PEPF0001AB51.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB8347 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 | 32 +++++++++++++++++++++++++++++ 6 files changed, 64 insertions(+) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index a19691436ea6..0c59ea82fa99 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1085,6 +1085,28 @@ int __init sev_es_efi_map_ghcbs_cas(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 f91d23757375..184cae6e786b 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 89075ff19afa..8e5083b46607 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -533,6 +533,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) { @@ -605,6 +606,7 @@ static inline int snp_send_guest_request(struct snp_msg= _desc *mdesc, 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 9c640a521a67..650e3256ea7d 100644 --- a/arch/x86/include/uapi/asm/svm.h +++ b/arch/x86/include/uapi/asm/svm.h @@ -118,6 +118,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 d73ba5a7b623..36f1326fea2e 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1503,6 +1503,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..a2747ab9200a 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -8,17 +8,44 @@ */ =20 #include +#include =20 #include #include =20 #include "local.h" =20 +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 +57,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 +69,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 Tue Oct 7 14:45:08 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) (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 F2F1420551C; Wed, 9 Jul 2025 03:39:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.54 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032361; cv=fail; b=g4LwTvShfQRFqfhJE5GOcVSA8zbfyS8dX/s3aoJ0y4lCyLaXagibkLnlgmoFFbP/E7igkZgHktMU67Q0GAa+ZPYml8FQS/Dlkb59OtU84dEmIfMQhrjLE7/kqSyLdyHWm4CLfMuhjzmNY1H/TS0kcJzsxNBZtuvhha1mbpLa/Vc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032361; c=relaxed/simple; bh=ooco1W6Vst4SYGjeiOaX4HT7Qr++cz7JGg43V7cjZE8=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=r+t7xapN1/BvukvKf0r30z09nIncxuoVJWBj32wDtRxPrnLQjb/i/bds2CgCb2VGSC/uYQejsKB5636vZPvzK6MVtM0z4EGUaCeToMUldHlzsuhWGZ6IG/WIYzjFxGo+46MFwkB1kwV1ARwnl7OFt7dl4EP3Y6Q4NsEq/6M5ejE= 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=AxdKnl4e; arc=fail smtp.client-ip=40.107.244.54 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="AxdKnl4e" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x0BlWOzB+xTKSWUqlVFyzYjtsQ3rEbkik/zriBHXA0m0a7RG3UXkrUo7zgGKjF4VMG9kyV0ocDnoDhKaF62EcEAsVxfQj/tTZfKOl8sGB4DmaIRh6EblFZDCyfdHnEh9I/3PeFPkvUP73QCz6cxseeCpxljcGxJAUHrlmC1Z4UyvAIfvkrGFQvZwfIFUd+RoxFna7Bg6p4ZU9E6M7kId1deBxxPbeseyZFdmIEvRbKuhflwiVFCKIU3FOfoK4b7pTMLQ3A17GQlYNCtivIM2uq6p/4BVp7Z+3Ydg/q5OgnBC+bEQ3Vh4X97dlyhHQSHpos+r1juUmZU//j9mSFo9Ig== 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=wmojS2UxExdQrzLXoHEH7Kl2AL4p0Ia1SsqJq7ex1Ag=; b=B4x5x6eXj2Os+7NvWkv/PTDxgV2xhsnPUIeLu8uyeI3xXoxgAsq77wOT3wDZ+dU3+rlpKde/2Zycc8fVdxogJLu6+CI0WlzVq/HXEVafUhkOZVnr/0i6Tzs6LHXmcyt8td+ip139B88U79CrfJsjXL/1kYxdtUvo68wRtx4T97F6qDy4NsASkZW26ldr3+z0X1/IEGTud8abWGFajYL6RifgJu76x9j7zFdp3HQGMn/R1pKjGrpAEQI249GlEXyH91wPrb8sLcXyYXuhlIA32I9+HRYt4P2ITlNM4jqpUUtBTfLm6s5Ua/mC3DUQbgkoyqXsx+aNVZR3Zuw95uqFIg== 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=wmojS2UxExdQrzLXoHEH7Kl2AL4p0Ia1SsqJq7ex1Ag=; b=AxdKnl4eFLUl6zP+LK6KRssMuHMCikTzTS5czjKtZrVlte0kdY7rgaqF8GSO8kRr9cgWZIAUnpuLiWUHnVoFhm46C1wyybX0bOQyGOdIZHR2kZ2ATzrhdycMbUGkm/T1YTRVVTRUNYpbn4Vggnix6eyON3m3Coa/wBI26mE5W64= Received: from BL1PR13CA0196.namprd13.prod.outlook.com (2603:10b6:208:2be::21) by CY1PR12MB9649.namprd12.prod.outlook.com (2603:10b6:930:106::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Wed, 9 Jul 2025 03:39:09 +0000 Received: from BL6PEPF0001AB4D.namprd04.prod.outlook.com (2603:10b6:208:2be:cafe::d8) by BL1PR13CA0196.outlook.office365.com (2603:10b6:208:2be::21) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.5 via Frontend Transport; Wed, 9 Jul 2025 03:39:09 +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 BL6PEPF0001AB4D.mail.protection.outlook.com (10.167.242.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:39:09 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:39:03 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 20/35] x86/apic: Populate .read()/.write() callbacks of Secure AVIC driver Date: Wed, 9 Jul 2025 09:02:27 +0530 Message-ID: <20250709033242.267892-21-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4D:EE_|CY1PR12MB9649:EE_ X-MS-Office365-Filtering-Correlation-Id: a388b985-fa50-4141-cedc-08ddbe9a29f3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jUhwbbVVR6aQSM9cqumewjuIojiBMTILjOl42L8XWgKNi1zx0r1LVieaSPmj?= =?us-ascii?Q?WhJfaHxB5S0fQ7vR8xtF1BludllSwxoFRXiVMiWgrpzTMFyU1HpgIOLr6RRn?= =?us-ascii?Q?lkxzblTJzTunw3BGbjBXCAb8CUOGXS4ZTi4ixp0EIpeheD7ig2pnJ/McMJdk?= =?us-ascii?Q?yA6yqxJ481SXtVE9jIbp30D/SogHV72bgZ0AX4Fx516DftzRHiBh9iy1PkvS?= =?us-ascii?Q?V0CIOGm2KMt383NYKICaatkOcky55wSijNbh0KtDE2oSk+X8WZ8N7ZoAB0wT?= =?us-ascii?Q?rfBHzSXYdelmldSjx2huTYmgJ615AWlaeKNqsq3uXCbluYTTQAc7e2XQYWlk?= =?us-ascii?Q?6UB4kh1NY/lytNW+QQ2ZbYcsNp/2gcWHptphEFMR89ais+/oGQKhPzp3pE7q?= =?us-ascii?Q?3C5JNc7FZCRSZn8pdPeJZUFzY9LjUHLVfWtFrnZ7OxlGgh207BMT6mwe6ZG6?= =?us-ascii?Q?nYIpLNHxdHRGDElMqaXB918p+LQLvguUzry3+8jXv8+zIFzmfrkwIsyEJ8X3?= =?us-ascii?Q?zRmyLP+3zDKpbgDX+GnFKlbfTMmRK/cL5KtmE7Ucf+hjrIkDopjB9RudPvsw?= =?us-ascii?Q?VrUuAklUFCYdhxMPDckUg2nM8wuG0+22uZyAuu4sGri4bzsXtdLcDCmKwZ3a?= =?us-ascii?Q?YDl/H9Hq7NX1xlUEbtP2uxFWq51o/lewQqf/wLHaIO2BqeC1faLl76QOALwn?= =?us-ascii?Q?iKAfCMhWNc9eMwWFLF7nk3iyadb9g+mOjB66Uex9a+oXX0+zhlqf8F6zShXq?= =?us-ascii?Q?R2+9WzqwroymfTOzkRv45/N2SnHeinCeCxFa6dT851tLbi32J0G77RYxs74I?= =?us-ascii?Q?14PM+WroQtL4gx5gMEx+o+D3ILKp+VLAzE2xnladdu1YkvnnJfvxIqt8X9Ko?= =?us-ascii?Q?tc1IYl3RIcg0GeXCCzP54nU/GMCs9GBB/odDZgt08HaaqG8n+pLr7heWe95H?= =?us-ascii?Q?GZ3F6JKYHA/o6catnnyWYTzPU0TDQrVAsRWXf+XgzcBAWNhLSGbjdzWSQQri?= =?us-ascii?Q?he8Mxq1Av3Djaw7SxvgheOBnLAYqHh/gthg7a+959fF7uDXOYIt3LBDooAia?= =?us-ascii?Q?c4645zpuNeN1f/n/KrAIyoYCMGvplvW9bAjorsssmfVl7ZWhxL13nrP1KHBu?= =?us-ascii?Q?dxrQzjSoFLswR6+UuPWNzhWYO0yYOL8NR8DJV1byhO2/ijLgq1XNlUfgPxHn?= =?us-ascii?Q?fxC43/eNJlRxymmxzq9S47rcQLdusMr5WnjU7xRjd5uagpa5jYs4muFJMn9d?= =?us-ascii?Q?GqtfkZNyQE5Y740JFHvDqLkzSYSjbMkzrhwgpbk4iwxFS5oYfRc0nUw04l8K?= =?us-ascii?Q?YtBgdcJhHaehF1qlzuN+7Yt18AMWkdpNNRxrDWtkHeV4zec220SeeDIQ+gbE?= =?us-ascii?Q?mhSFF+YaOEe9WE8qlQmyWnD4j81ITYOAyeKXYRbpsHkF0lbUSAFJh2zZZQcq?= =?us-ascii?Q?1JR3MxlO1Un3Jo/EKcSeS/t5VA3bXsbfKo2a3EFbZTjOfCLbepRFpUg4sRR1?= =?us-ascii?Q?6367CY1HoBaKmalm/6ayQ4RdY3CH3y352fwH?= 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)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:39:09.4135 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a388b985-fa50-4141-cedc-08ddbe9a29f3 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: BL6PEPF0001AB4D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR12MB9649 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 Reviewed-by: Tianyu Lan --- Changes since v7: - No change. arch/x86/include/asm/apicdef.h | 2 + arch/x86/kernel/apic/x2apic_savic.c | 113 +++++++++++++++++++++++++++- 2 files changed, 113 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 a2747ab9200a..186e69a5e169 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 @@ -22,6 +23,114 @@ 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 +#define SAVIC_ALLOWED_IRR 0x204 + +static u32 savic_read(u32 reg) +{ + struct apic_page *ap =3D this_cpu_ptr(apic_page); + + /* + * 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_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 apic_get_reg(ap, reg); + case APIC_ICR: + return (u32) apic_get_reg64(ap, 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 apic_get_reg(ap, 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 apic_get_reg(ap, 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) +{ + struct apic_page *ap =3D this_cpu_ptr(apic_page); + + 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_LVTTHMR: + case APIC_LVTPC: + case APIC_LVTERR: + case APIC_ECTRL: + case APIC_SEOI: + case APIC_IER: + case APIC_EILVTn(0) ... APIC_EILVTn(3): + apic_set_reg(ap, reg, data); + break; + case APIC_ICR: + apic_set_reg64(ap, reg, (u64) data); + break; + /* ALLOWED_IRR offsets are writable */ + case SAVIC_ALLOWED_IRR ... SAVIC_ALLOWED_IRR + 0x70: + if (IS_ALIGNED(reg - SAVIC_ALLOWED_IRR, 16)) { + apic_set_reg(ap, 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; @@ -85,8 +194,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 Tue Oct 7 14:45:08 2025 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 546D421C186; Wed, 9 Jul 2025 03:39:31 +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=1752032373; cv=fail; b=nGIDTNZf9Fdl787Au8t2rJUlBsdLJvoVtz3velKGD9fNLZOo+onHPg/vegL398/zz4iCujIhwnsSHT6ZnOYb1OhjucSqL9Kl5oQefeiMcze5dCRq4kFKuHKZER4BKHzC6bmtCPMXbJiyWu7hBgtOETRxLduvmA1wP50Dnnw4K6c= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032373; c=relaxed/simple; bh=cRPkDHC6qToufiukbxF++Wfl7rdvk5SuKpJMYSOGrwY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VlvZSDkP3JD6oSdVCrKQM+8eEqyiC+Vml17K5EsZvE0eByp11n/Cdque18Eqow7gmfW1DI+fmLZTKzkCSA3UmmYqI2MBzvqmnTL1RPjfUlZMAwkm88g6Sbqno9iuwVHKbTC0yP4p+5J2lRrnI4YC9m5ukQi5RO793wTzvIHpNdo= 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=mAnPeEm8; 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="mAnPeEm8" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=roJWp0GKqpUzdHvdIAwU/FmIjTMa/HltyN7SeTjexHBNxDnOlzoheUfK7E/Iv9dt5GLI9JkYnB4Jwpl2HZW++X7nyLX2VBC6RSxUQJCEFnvsg/ct3+y/04C7HZqCN/VvciiCAgKdEy4FD9LOL1UWpmuUcjptjJDm8ZxW3cfh1K3lTqNteiH9gShpC6kkda4zSh5vCx310h4vTg8SGBc4SjeifY3nQ+rUJNKHD/daXyaL899VgS02PLf3ojetBkQ2z2+dbLPZeOaW3ux/jIjPexmjXqh/TAcR9twQQSmWXDAJbLrZStLZh5QFzfKyiBTSgCGNk4JbUYsZJoRemNiBJw== 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=aUX4Kp+/qWbwbHQcox9gvAs+bPQEnWiR77K78w27PvQ=; b=aLifYhTKBc7rCILSriAAGzrUtZNUm0ATwRaCPmLAnvJr0IjzB3asjNucmxpOmlhv3SvpGstP/tjaQON/f/zOZT2UUsOQoX+4hToz3g5eAnwb7FcH5HeBb43zR1LtnmWrZAsnDUcUmKg3Ud1erZn0OjyyOTZWdho98E6OSAZv6BDE+InIFPrF5Pgow8WoP5oE118MdXEMSYOC98hzYGX6GAoSb7KbG/kERmS57FFdF/pk6YuMBHbvNuv7UOUiGlOxw3exT9l02S8XcKsz4MPYllLEiHjubjbgGPZvjaTRFwX850ffvJBwZZcDIBt2zoeSjeaOLKGRD7P8sH5nCApIiA== 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=aUX4Kp+/qWbwbHQcox9gvAs+bPQEnWiR77K78w27PvQ=; b=mAnPeEm83H6nuk2MzMmuewtDp/QE23TuLzfRqKs9s/4g0/CEEWRHFmhNS2IVHZtXbaJoPvUUb9t8NUNL21gTFT8tysk3dI96FsViV8/yHc51KBG8Oxz2RMXYQNz1ifxZXbE4QxTTbNMn330/HtCfplICkCjcpi/qV+czBLWrrbA= Received: from BN1PR10CA0027.namprd10.prod.outlook.com (2603:10b6:408:e0::32) by DM4PR12MB5913.namprd12.prod.outlook.com (2603:10b6:8:66::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Wed, 9 Jul 2025 03:39:28 +0000 Received: from BL6PEPF0001AB51.namprd04.prod.outlook.com (2603:10b6:408:e0:cafe::a1) by BN1PR10CA0027.outlook.office365.com (2603:10b6:408:e0::32) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:39:27 +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 BL6PEPF0001AB51.mail.protection.outlook.com (10.167.242.75) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:39:27 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:39:22 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 21/35] x86/apic: Initialize APIC ID for Secure AVIC Date: Wed, 9 Jul 2025 09:02:28 +0530 Message-ID: <20250709033242.267892-22-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB51:EE_|DM4PR12MB5913:EE_ X-MS-Office365-Filtering-Correlation-Id: d972781a-cc11-46dc-7de5-08ddbe9a34f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?6YKm/PKBOEsB0JRDFNvrK4yD6Nz9hUfnB2eI4wWd27EqrCn1btc2PqwYUw99?= =?us-ascii?Q?G5jIlfkAbNstSjoHdmY+Oj0YVLwMTcixVR4hBnYLkL08nbWCunnJHLLp1Ybv?= =?us-ascii?Q?eNlKxj8NBMEF9rnUdALaUzU537k3Oj1+3PZp/fkqy/bm7VXkxmTLcTlcuP9f?= =?us-ascii?Q?2sTqMQxZeHgR825xiiHegl5NKbZYxQngA6rK3f4bfvVKF0JeUeTxe41kn2gi?= =?us-ascii?Q?avba4nuFh7tfF0UGPWrtbMg33OJRAcs5ZS+v+jOtGdE/PVEpVl2dVXINEK3x?= =?us-ascii?Q?fRsTvhefWjwsnWzl/3RFVZ+ay/0oy4bUNV0LqBI+xsLuTYL2qhj5qfvZZWKa?= =?us-ascii?Q?npQMp7iOdFEF11raF1tBCeslRpBzahwBYYr8AZREVDWV3Ddw9Z6Zis2iLdYz?= =?us-ascii?Q?bEaYSUTNpL1zGacBAztUvVGaKmwwRa0PNMDf0JlpotcBVmtr4zRAxHFMeX9C?= =?us-ascii?Q?QGBpoQvWx52sJce8uIrhMNMxYAVsJlp0Rw6cq9REYuP2iXyLPPAevOsxJ5b8?= =?us-ascii?Q?Wh0g+HztLWGByOVQ3BTXgl7p8pko5yIlvqV2Ea0eLlu+yNzzD4ufdlFaCSgx?= =?us-ascii?Q?q3TaxYS6obYxYY2UbcNRgnuafhlo5/cIwmRKrGIcHKIRQVjDRdp7gHQqNQ3T?= =?us-ascii?Q?4jAmPRUqSlh0JzJ52RErxoLG/adlS+hSEK1kjNXwct4vNUBMj4DadEkAsLBG?= =?us-ascii?Q?WH/ZAEdcTAqhcoCcAIuUmdd/sEgpT9UpZbHg4vZwQkCDk0VIswP+4gK7Parf?= =?us-ascii?Q?+i5NCFGFmlodgMJZpLHXUVQWwIKUYuJ/onRPZEjCz2ShDn5Yg+2AmFMrym0E?= =?us-ascii?Q?7NdozsqZ0NaWBPO3lGFERpa169r7DaY9Ss2M/b/fB3rvk1NxgVO0CIH5S4JX?= =?us-ascii?Q?mEVzcxsnlmvcSy9zLIjDJ9/0ESN7qCPtdYqx/SFSo+0+9tbOdlt285rKplYV?= =?us-ascii?Q?FEm/LTmU8Vdzo8YKDbsXwubxTBxZRK3851qcaJlKBvnvUTjm3vL8SqUepW3a?= =?us-ascii?Q?NsgCbEuHjp+DmwKBY1juyEhH6XUqttoUVr7nWieL5PUuhZPb6zUNDXpxfpT7?= =?us-ascii?Q?GZ4HR2/qATFQifKKk53fMcOJzkqshhCmwBRMLfDAWKThYKiSPOzu9VUjnNvU?= =?us-ascii?Q?H6X8yQq7Rc+WoDYK/oXe58+zkuXDsmshR1xtXGCMPTzae7q8LzF5z0bnvYgy?= =?us-ascii?Q?d6e7UVNDuQBCVbEsC2v+3Madz6xDJJW/7zf62AkJV+q8X16EGi7S4VKbIijY?= =?us-ascii?Q?JJFPTaYqhwhHfEKnNaYAC6Sv9DbHt9Ks3gqrMIcEmiAaF/IpxbNO6XXD/oO1?= =?us-ascii?Q?hV5mycF8UxB/zDsGy9r7JDZ2jTivOyBgR5FJABwnaiOcJUCBwigMltmq1IOn?= =?us-ascii?Q?Pma4iqS2ObYgVGHZm+YwVeBG/u2XktujGDwssuIvQmEERTM0hen9pignAhBl?= =?us-ascii?Q?6e5sCCSCaoDYs6srcflhTQVk/38QUKn1dpCjPil+FTLhXT9At5XHqdDKvRhz?= =?us-ascii?Q?VXtPLzafTsvgBcwaiz2kQ+X+tV0Y0vl6bR2r?= 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)(1800799024)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:39:27.8461 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d972781a-cc11-46dc-7de5-08ddbe9a34f0 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: BL6PEPF0001AB51.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5913 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 186e69a5e169..618643e7242f 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -131,6 +131,18 @@ static void savic_write(u32 reg, u32 data) } } =20 +static void init_apic_page(struct apic_page *ap) +{ + 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); + apic_set_reg(ap, APIC_ID, apic_id); +} + static void savic_setup(void) { void *backing_page; @@ -138,6 +150,7 @@ static void savic_setup(void) unsigned long gpa; =20 backing_page =3D this_cpu_ptr(apic_page); + init_apic_page(backing_page); gpa =3D __pa(backing_page); =20 /* --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2062.outbound.protection.outlook.com [40.107.93.62]) (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 53C5F221FC4; Wed, 9 Jul 2025 03:39:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.93.62 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032392; cv=fail; b=UoQjQHcJ+MvayaFRORgDSy09EahQ6An9/HblbC/nlUO2ESmoTJ9K2R1XbEB94K00+Q7tZXHbhIr0qkobUOQx8hSdvrJyc5Gh8PY5FWzdxn/HqvHbUVLMtWBeWBa+O1Y40P7va3couheS12vHqVWHvoDvare1/4aPzp5Px1pPiSw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032392; c=relaxed/simple; bh=xIsVxBu+xDyBq3tID9bSe1uqbcqEHdarvFk1uBnJNZI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=XqzlwTq1RDp2x1UY+Zr4r+QH5bpWFzkSV3FWa2U9U2wi0vSMH/t5RqLInc/l4NJN1NDfqOCMKz12K88nTxLOMvBlc5sKvIvAubocuBMQEaYFsHAwc8JSYuW7aO7MZKSp/HFO2Nxp8t7AW3DqH1o2AEQBNaQh+usKsGrPuBTj5NQ= 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=lKcaenfT; arc=fail smtp.client-ip=40.107.93.62 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="lKcaenfT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=C8LTYgqIBQFSAQPdPG7QlxvpyTTgfK0BEljQ2Pgvx2I2WZtcG5IIt6nzzU6Ok6PuiGoaRKspDVWf2t1wuERP2eetlLFcU8rqjyH7SlTTW3tC5xGtYZtIPtOrR7uZhCUeiF4PbN/xfMVNopM/4QWZKdEvY999bu+VoMAQB7kbOACzE7fBz3q13wDG2fpkvM54S37rDMRi+FtY/c+9gKdqthWskY29MXb9o7QVtsMK2T09mZfqikpMrx/BVzzv1zYIftD4LmwrKCYPjMSAtOuWD6C+p3vrBtTDkoCbGrCyAt1WotidOiLP5osBfDDD91klT0qbPdNw/zGHlrSsdAdYMg== 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=fAoWVQ2PTHI64GTKBwPj+at8l1Noi4Ly28CL6RTVWxE=; b=cEyx2pcPaunIBVi5Re9iQ77JgKUq90rgbF06KWB4yWLu2a2KdA7wWN4rnl02tcoe058DTlU6gQ+05wZivhOO05eBmpHkuU7W7tUbQWsRhqM5rVXUa+BLdxgiTGLKC+t78MEcu++57jgr1Eef7cQxFphDVpaeBVELRNn7bi6Bj+gZQnw+HMyTRRhGFG0HfJJ6xBHJf0snV025GsSuEYYYvSA7RrzSexphuxRC+svBYtJ+7ZSy3cLOC+PjVYlfdJKvv2cWEb5fHWGE3OIxCsq7E8CnIt7Pou2TetvkmABMd+yRIlYVJQ12S6n4zK3ET7/o/XnkanQNFVDhMXfIUiUIcA== 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=fAoWVQ2PTHI64GTKBwPj+at8l1Noi4Ly28CL6RTVWxE=; b=lKcaenfTsWtTZuLzdOdR6g6iQbaGKxMJnjaSfYIOW2XDQUth5AuFr5JocHejre+J/iPpAibRmTi3ecXwwwDDTgrhB5C49VMIfjEd/X8dUeK5eB1b4wRv3HxZRjcyuiYDy6aQUBkFrPIMwIDKzTt+Mvai/X8k4jow2mJ3SL2Hrfw= Received: from MN2PR02CA0023.namprd02.prod.outlook.com (2603:10b6:208:fc::36) by DS7PR12MB5718.namprd12.prod.outlook.com (2603:10b6:8:71::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:39:46 +0000 Received: from BL6PEPF0001AB50.namprd04.prod.outlook.com (2603:10b6:208:fc:cafe::41) by MN2PR02CA0023.outlook.office365.com (2603:10b6:208:fc::36) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:39: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 BL6PEPF0001AB50.mail.protection.outlook.com (10.167.242.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:39:46 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:39:40 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 22/35] x86/apic: Add update_vector() callback for apic drivers Date: Wed, 9 Jul 2025 09:02:29 +0530 Message-ID: <20250709033242.267892-23-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB50:EE_|DS7PR12MB5718:EE_ X-MS-Office365-Filtering-Correlation-Id: 815f3bfe-4ac5-434c-d4aa-08ddbe9a4004 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?x4stLj+82X0vQX8mD9T0XfSk7NrpIQhHHQRbZ9X17ruo3rrhR8vzv+D2667Q?= =?us-ascii?Q?CJgE245h9WgAaRRmI6qkNhSKiwNFnDA02yVLL+O3V2yEyXFcNqDmvCNo+LJU?= =?us-ascii?Q?RQij5Pqy2dutStCWQqm0QlZOzJYJg3Sl5ubeMOgn+KCTfIGWYIn0ebJ+0DwR?= =?us-ascii?Q?KgRu1LU/4RVgOE+H6i4NzGiZoydRdeWrRXWsk4BM60v0ZYujRj+CnZJp3XCI?= =?us-ascii?Q?tEmyXsVD5VhTo0Eas3GLupFXLi6+hRmAhLSqrTBM3yr1jcZ/r2OtPjT+o1/J?= =?us-ascii?Q?rFxrHcBBXKszJ3hJcTVpWNmx/y69Dle21WoQEu4/hUvf+tlOjiui2HWtMPkd?= =?us-ascii?Q?/3RfHCWof9/xlpVj+o5pfip3KYR8wMXx9wIkWwPzp2lockjJjyCIB7xGyti0?= =?us-ascii?Q?nY0MA7ITrKx2XKPXKndpN3uAkJpWNv4L3jDtzT+MMUzuzkHrIvQTRg4Vvp7I?= =?us-ascii?Q?WmDLHzaMYbtCXgg9kRb9Co4IQCvMJ/bDo7UrERp0hF5od6LvMPNlIABTCFlw?= =?us-ascii?Q?s1iS/f/LEOT2JgPShd5ezCl47RXfBY5cX5xHGy+FNpJEhu3mo+aLZrkwY9gI?= =?us-ascii?Q?NFo8cjp6V5PkhcGhWIyRMv3EqfmRnevLPYwvFIWZCknOxeGgT1zMYsxp0SP1?= =?us-ascii?Q?4LsEZLf5KOoMV01jY+ePn/pP/pWLaeUWB+WtiFBiqtil169bZUkxgZ8BCWVD?= =?us-ascii?Q?YO+xXYqrsflcpTmzbJJ5koo4lV8nt7gaSvV5WD1rkbPJm03Dt7v/XYOLkshF?= =?us-ascii?Q?vn4XzG6zumPJ1Wp8MaWFp/IUvkFXyz0vVRMC/4fAcAEEX6gRK7FSs/tRLpbN?= =?us-ascii?Q?K5uGQCflJd9Dm+ZhJJ250vSYqyzR6wnyUbIy3ELwrIX7PZrood7F3IM2O8He?= =?us-ascii?Q?/CZz02LZmupeNEBJQZ+E3vuUh1vsMTr4zM+qqwoulkx9G4RGD/wC4CgzSqo9?= =?us-ascii?Q?abaHcyUV4d+R/soaNd495g4xLAVYJpu/qrXQ6cZJeEZPhW+uBCRFxyPxqj6Z?= =?us-ascii?Q?YAj6sW26VDb5e2ZSVj4IHn+QLM43z2QpBXv/r5mMGx1zuFQ2RNBseZv+lGX7?= =?us-ascii?Q?HWWgESjBtFoGa9Oy4P36JQ3WAkXEHCfSj02KXEa8Hoy3+JTmk+wMtPpK8L4s?= =?us-ascii?Q?2OIehffRCz+sjHBA2EPnmg5OCqnbT5iCScOGxJ07btbAMqQZ8SzjOvPzOjJV?= =?us-ascii?Q?vIjPBVFPq+Qu82SThPODOkHWAmutQj3XVDw0c1uRG6qz1Poe44ir3OgWnRVe?= =?us-ascii?Q?Qe4iTSypx4sBgntcpO2uyIoynug7/o0KyIPhZM7PjHy54GGHJSr/zEDIDzzp?= =?us-ascii?Q?4mjG+ds7tfK8p4hWRDXUHphwPPzYklFfrQ/Ydz1TSivZDy7n299hgt3qJaNe?= =?us-ascii?Q?AB/8AO45+NFLI02HRLx8ZqkMeF2XYgpMuvj1m9Z3blpWNFeCaYjwt2yWqmcZ?= =?us-ascii?Q?iLOMiKEK8BnwG96yyG5v7qAclhp3uiACSOPK98wCsYk7Kg0A/0frVlwJjxPD?= =?us-ascii?Q?TqEH6FKUUYgO6pzLCu22AUThD88wkLbN/BvJ?= 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)(1800799024)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:39:46.4344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 815f3bfe-4ac5-434c-d4aa-08ddbe9a4004 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: BL6PEPF0001AB50.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5718 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 v7: - No change. 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 184cae6e786b..9c74d1faf3e0 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, unsig= ned int cpu); =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 a947b46a8b64..655eeb808ebc 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 Tue Oct 7 14:45:08 2025 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam04on2058.outbound.protection.outlook.com [40.107.102.58]) (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 42A3C21B918; Wed, 9 Jul 2025 03:40:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.102.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032416; cv=fail; b=Xc78Ikkn4EFT+hb7uGditwsoNSYoGuFlJTh2OQPkpv9YN6JtkbDgaPsaytVTPMxsVV7UTkiszWvGFI7gTR2BRJsXDtcXQSTacnK5WzAICy+zce6DjwbRSxe7jhnL79wOKgF7MEoUma74CVs/GRAlTKlxICMfPyN6N+kd0XN4r50= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032416; c=relaxed/simple; bh=m/vhV0EOiWohwzjxuIdtOx2PW6dBI/fC6Q6+hCK6Dd4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Gpi4EU23AagVwHUpA9TeMZ3lbjZCau3vQ+LnQbsm5IS9C0h4UeWsbtsE9LaRxrN3IRgISdmIJhQDLo2CrWEjZKEioidBpqnOmo1xd3s1JyfInqSUWG3GBoLRZwc+bbwxjPQtby+LgbCJgJdu51fFdWRc49Eh821EjSYA6bp6dPI= 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=ICYY3H0t; arc=fail smtp.client-ip=40.107.102.58 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="ICYY3H0t" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Z9FPvMeJwftZrFdyzsar9GL4uOr1ujLU/1mpmRQfoYtELvhyILrJnp8E49HCZTUeQpRb1t8I+bbeh401hJhuYOn82keKDkyggZv1fMtYq+C8PrQVJA8W0aH3m5nCSyy+LBrbcWfJx8ZnsAINOurqkjfxtH89RQ+Jes7YUIL5o9yu60NjfYpecUYf/SkcL8PgGv2LflqLVhh/L+zbpAv1LCOgQ/vVlsCRhlHaC2S8wDgGSDlysTUvESk2wMKFamwnLmVwZLAjLcS7YazRCQupRJbpTBEC7A/QRn21W9O+j7N34RLPj4PFMbbH6m0Dfb/q4vxE589xTWIBVg59q2HEqw== 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=crKeAeysfVOnBd+iX00DHFpDv0CZi43XYUfWfxJk/DU=; b=A3LC1KeXbNRpY5Lu9lXcTUmC5UCjNePqunPOzeGGc3l1LMSercqDaTLv4tLRVQHBSPZW7fjF8+q5KQMeeBM9AAdX2LTpwP9epYg8BHbjLZkFSOKannBhAoCECHQ+sEaur2oCXMi9hsQOuXkiG6v2MwbIOEvlwch/DYDmxWm6gnSKgf8Qqs/MfI0hS9dI6olsx+SUDScLDVsZXAfoZB79QTH+1DX9viw9iNvPLtgpBEDGYQb0vmq9Op1xfcrO0AZ7Wd77BUKtG63U2TBH0zNOeLPdNDFYLo1Pp/bd+tlwqJtbje/YzUKoIX6DXKDhHHUM1vS5kcX55QQJGQxBydz6OA== 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=crKeAeysfVOnBd+iX00DHFpDv0CZi43XYUfWfxJk/DU=; b=ICYY3H0t3Hav9WTB7gGhOvW+AQGIUlhzrZ9Vf5ow+dkCqgCFKlo0Zes5lxKKGI4U+LF4GJVCP+dlqSpEMLyXkZY2p1zhRMcwjV2beQL3ePUp8+69woRNDZozQ0ooGZLCtJbfKzRKhM1AdaYOc6cs416f49sJaUEzR4L2/dTii/4= Received: from BL0PR05CA0016.namprd05.prod.outlook.com (2603:10b6:208:91::26) by PH7PR12MB9125.namprd12.prod.outlook.com (2603:10b6:510:2f4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.17; Wed, 9 Jul 2025 03:40:12 +0000 Received: from BL6PEPF0001AB4F.namprd04.prod.outlook.com (2603:10b6:208:91:cafe::7d) by BL0PR05CA0016.outlook.office365.com (2603:10b6:208:91::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:40: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 BL6PEPF0001AB4F.mail.protection.outlook.com (10.167.242.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:40:11 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:39:58 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 23/35] x86/apic: Add update_vector() callback for Secure AVIC Date: Wed, 9 Jul 2025 09:02:30 +0530 Message-ID: <20250709033242.267892-24-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4F:EE_|PH7PR12MB9125:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e993252-2ee7-4e4e-7dbd-08ddbe9a4f39 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?aBSaUdamn87AMBOh2PzVdN6Q3L+eHfr5djG1bVrm4zMFS6l09pv6F7fGgb/E?= =?us-ascii?Q?c0M3hbjaWKvF8IIyaHRryLTYKykdB4UmEanQ0xqy0kpxnK+fyCQfccINHM74?= =?us-ascii?Q?Hps17BRpEjRx0lQXDH//yUreQB1N3L3+gLlhDp+pU2L6FRUR/wIlp39P2aaY?= =?us-ascii?Q?k7xLgNkhXW2IZqgR2BtIghKqGfuglJykjLDAuHbHsBALtZnx886/grp38hb2?= =?us-ascii?Q?NR8I+s3f3JKzSpUu+TXTplRZpZmSuePY8G5xVz4eYpOB/Ke6WtXNX0otGG+T?= =?us-ascii?Q?QERlatWWXqF88oTnuV8bMm6QfgI6FKX0UAqnpL4dvp1zd0jZQBz+ei0Yd1Jq?= =?us-ascii?Q?foRL3P/pqhRk5AumYFjg253a5pGnUL6zdWN8umaM6fwWNLmNZKLIK2c/bW93?= =?us-ascii?Q?xzeU4wjn8ShnwmOWLz7UrhQPIiIlseA4oJc5bgcfM5sAjB4nTYtRDb5beQbC?= =?us-ascii?Q?W6aVw5x9qiFiEHwSU17dspGuRFn38I065R5z/jVPD4r8GFBBp+nfQje4lxRB?= =?us-ascii?Q?kimk7rtY+0Hzt3/1aGUGKF1EuMZA6m45kq0mkRMKLKy7DAs//cMghDy2laha?= =?us-ascii?Q?t9oMcFw4LqotiCuL3EnGg/p1yYe42aHzn8sEqGXBvx6EGSIZyHMZeizkMxY5?= =?us-ascii?Q?/r5aipheEHXmNFOV9mDWvHQzCvJt5YaeQ+/yHV1HRTCG0hDIimZ0ydkqPHyK?= =?us-ascii?Q?kQlKbMneNjxM8ASct9MQMInrycSZKiDpp9nWxljixrAFIkFK9KF9Wq86MsDR?= =?us-ascii?Q?PeVrx77gdEc/jqMWwpldHWGt8RGiX/d9ThWj/B7BcjoejwuRxrvnL3s3v0Hv?= =?us-ascii?Q?4XmtAb1OlxojzPuJ62n3RYA++49A2P7SFwxQoqdzIB3/4T0xLhdceMML6tJD?= =?us-ascii?Q?XSVvk79n6muJLi7AgPhU84x8vvj9kYbfSo04Oranzz/MOdWT9r/phOQvojB7?= =?us-ascii?Q?qJVlw0bkvJVAubU0roJXCNwNqDdslg3bp2YTO8q/390wTelxHJdZHCmc4gWc?= =?us-ascii?Q?3NBLX26o+sr/AcpWxnl2b3Gqb3j3HpY2AAKMfR8bW+Q3J8vRVPSk2DknJ2wE?= =?us-ascii?Q?/M0Knu5o22DpaWc5BEUFu/Rq0p/DHfvTL0sW5KejLvqBB6ingW+EMaczVgSf?= =?us-ascii?Q?QHVA0cUHbGHHZp+M4qQghod0t5Qh7dXqHZXb4S0KD4Nara/sl5ywIkwOmYm+?= =?us-ascii?Q?aH69ZwOwgAyLvx3RLPzjeEe0KCtsSeXraNW0NRBcnHg99ZZ3hNZQq7z1keZJ?= =?us-ascii?Q?oOSlYM4XLBk/DEuryHQKGX8LoiUfscWZKnWBlgGxRowtX47dZCzt3ZimRZjP?= =?us-ascii?Q?FWNC3BJ0406dk0AXTGRbDpkd6udmzIbrUvAdxuLC3YBvMOyhPBFmnm87AtGD?= =?us-ascii?Q?b5YqCOKlU0ViGJstuwN5482eiQLpJSnlLRViJu0jkPKCXEaW1vm5q8G9LdcG?= =?us-ascii?Q?BLQg1+hgINFLWi9rbr0Fj8niTVUfLsM8TcNPMTloDaeFN3+1/fBggMVjfT3O?= =?us-ascii?Q?xIn7j1okvhW0fKidZme/Ul7puB2+jyDHo3ej?= 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: 09 Jul 2025 03:40:11.9460 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e993252-2ee7-4e4e-7dbd-08ddbe9a4f39 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: BL6PEPF0001AB4F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9125 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 Reviewed-by: Tianyu Lan --- Changes since v7: - No change. arch/x86/kernel/apic/x2apic_savic.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 618643e7242f..2e6b62041968 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -23,6 +23,24 @@ 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 inline void *get_reg_bitmap(unsigned int cpu, unsigned int offset) +{ + struct apic_page *ap =3D per_cpu_ptr(apic_page, cpu); + + return &ap->bytes[offset]; +} + +static inline void update_vector(unsigned int cpu, unsigned int offset, + unsigned int vector, bool set) +{ + void *bitmap =3D get_reg_bitmap(cpu, offset); + + if (set) + apic_set_vector(vector, bitmap); + else + apic_clear_vector(vector, bitmap); +} + #define SAVIC_ALLOWED_IRR 0x204 =20 static u32 savic_read(u32 reg) @@ -131,6 +149,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(struct apic_page *ap) { u32 apic_id; @@ -212,6 +235,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 Tue Oct 7 14:45:08 2025 Received: from outbound.mail.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) (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 651F920DD48; Wed, 9 Jul 2025 03:40:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032428; cv=fail; b=F3CAa0H3/rHPxt1cb0ep6a2Btmn0qrnd3wn+v3KKA7mKw/lF/aQqLmOnru8J9cBEDFgMufd/uoTLoufMLMIbW53nZ7GJ7FuSXxmRVzB7HWcP9YKJ+JyVo1FDunkR1HvJsoLg0LMVb6pkrQzxp7D3aVYTTNMemqBNXznYZKj/D/s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032428; c=relaxed/simple; bh=orlWQKBew3qJczCGuaZXFGYi56C4fvKh6HkMwe11gcg=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qCMjdHJqNtH7eAztR+IUyKk/FLbKSTTtWH8mbQPFg/98GFPOHXE49SSjfwb7oUQa+6CVtucJYAvqQAkmkwvV6vfh4X+1HiZgEv1peYH/YYtACIlWDbbHk7Mtd0/MtXsxzPAaLgtB622iHCMVQ1sw6wU+4Hr9pkHSSmNpc3zGPeg= 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=daWZjeOt; arc=fail smtp.client-ip=40.107.244.52 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="daWZjeOt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=X8Tah+rFjtl2n6B3PDZn+/hN/ArRomxOpAPGQ2kECYIU+efUSLxfOpfpVBSr2ArbeY0nr+//ByJRKPgM3uECRPC+SH0egoJzf/6XBZ3OJjiBq/GUZing+p8XknuvkJjqeYAlQbvmT3xMk4Uenr8G1/F/QAEeoV4DXs10hp02u9XnKVLWdeJFqTjsYZEJq7XoJH1z7QVj0tprJBcg5AAt+eF67L7nLfIp4avawo59QTKGrMLNm1BHnIEpCSGEl9MblijQlovX78qZx6m3A/xHtvbdUVU6m2qFfFs0kmU21XrzTGN9GNhcy18//jzEvdOeb063o1QbkqZyGPpMXxbRew== 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=UyaL4AV5Fi+ZtCLwEgE0S8T2nt20IyMb4DQFuHeRy/I=; b=arCF14G74mLz4JWc6mFrIq9fL27XHJ5NmSBxs6qKYh9P57ccID/be9UM2CfDyHdSxCUMWe8noMDwj4Yrb49ny0WFg2X3RmDYUR8vcrR6jyxt2jrOcfp64jGKTKgQ5dWZQxWu5Fc9/lLKauhq2HHAcr22XcTceKhE3uuVvizVH98t2x4oMtYGgZl9R1Adjm7IDWa6riLakmwmEXOS7je2erEqcB/aKPJsBHNMxJD97eZDvwcaDElTAQkqVRrxOtxylbZf5JLVWCTlku2XzT8VSuX3jY8s8SnWJ2tLNAuqczSyoHhtUHqR7Bij2Hg+nm4QEZ1sgA7APhMj6v9HQolk3w== 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=UyaL4AV5Fi+ZtCLwEgE0S8T2nt20IyMb4DQFuHeRy/I=; b=daWZjeOtJFvwbKgz09AhjcmANIJyJQZ92k9DDio8c5D2Hhyn3uuVkuHrnXD7e98sNw4DCh/qAUmhdO3UddHx/I8KE/fZKYHywz3b3XLaJAHEMbBdWpcBVUJkam/uXbH6aR0wGn43LZh/rYaxraU567X6T7LuqtI2akvu9ibDSL0= Received: from MN2PR02CA0010.namprd02.prod.outlook.com (2603:10b6:208:fc::23) by CH3PR12MB8187.namprd12.prod.outlook.com (2603:10b6:610:125::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:40:22 +0000 Received: from BL6PEPF0001AB50.namprd04.prod.outlook.com (2603:10b6:208:fc:cafe::2f) by MN2PR02CA0010.outlook.office365.com (2603:10b6:208:fc::23) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8835.23 via Frontend Transport; Wed, 9 Jul 2025 03:40:22 +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 BL6PEPF0001AB50.mail.protection.outlook.com (10.167.242.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:40:22 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:40:17 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 24/35] x86/apic: Add support to send IPI for Secure AVIC Date: Wed, 9 Jul 2025 09:02:31 +0530 Message-ID: <20250709033242.267892-25-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB50:EE_|CH3PR12MB8187:EE_ X-MS-Office365-Filtering-Correlation-Id: ac7f8c9f-7e50-45b3-6527-08ddbe9a55ab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|1800799024|36860700013|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?TL8u30+vpUTuHhlUrGpROkcXsaNNAOSysU8ZWmVxcvJCv/xou2F5V5QP366o?= =?us-ascii?Q?UFUh4qmsFhzsRlrtdAwILgBQPNHfysyUU62cu34AU8PxxlsVZxyqVGaCHxWw?= =?us-ascii?Q?4nGYQh+1jNeIfjigdAxz32OgNjNqINoS19bR3axn9juuv2WCZRGUImlGEo7D?= =?us-ascii?Q?Cm6WFgDfqMpfnlXvHPutVfDDuGi1ZR9zgssI7X+CpGPBT5BvdJbewpItGCF7?= =?us-ascii?Q?KOh/4CzRNDQm/2NtVdrhdC5ZizR+4+M6ia0Al6J5K33BJHBLGsd3OFqInIIg?= =?us-ascii?Q?ap+kc1Ui5kJgfRlM7eHSlNp1dy5bbFhmvEi4Bf4oYw99ggqItrjdTutrz+ME?= =?us-ascii?Q?BJu6PypVRDi6xqo/BnSNI9P5zql21h5SVavIPXW6W+mov+8BhJ9HMcGrRAjF?= =?us-ascii?Q?DXs3wed/njT/QFQJIgVUVgWjrDKGRhQQjTwrppmozYl3TmKzXST9BeySCIv8?= =?us-ascii?Q?U1scS3Y6+TXtdwSoSCDXozse7SAwQtR7aE4Y9x3QBFPQFrLEbmZW0TiGxf6h?= =?us-ascii?Q?im3lkYx2O9MDIAWivvhFQcMyTmjMWhpkrUSgayWNb3TIYrdaVE9MkZuA/vfV?= =?us-ascii?Q?k8sFWdET55ACsDzFHU8TcUQQDMVpUTSV2d5HP9apZF32BsbRkToRC0Fh3ak3?= =?us-ascii?Q?PfWZ0ib4sxXmU80TLSoqfzkrVgYy/i+SX7WrrdUfUkJU87uwMQH+ikOUjUfK?= =?us-ascii?Q?YDGFFApHrPBC55/sb9/vr8pE63rgBgU49Ae+IQTaofN4Qeh9ninYOPH+E8rO?= =?us-ascii?Q?j8PTxOx5G174G4WfdrzVwCnl7AQ/0PndB6DaZUEDYQlvshku6+IhRiHRtQZW?= =?us-ascii?Q?R9FRrSWNH1kVxbBJLUA7wNJnCpp0uZ5G+xMmHk+zR8g/9I0+aQyhNFE8hSgK?= =?us-ascii?Q?N7Jj2JLBRg7yg+zChC5vrlxGjavxDbF7y2Y4aewlueDIdQVWOx0U1sD+IACD?= =?us-ascii?Q?uv1b8YCDgqJB4cY9qCJgicRVLZHib67oqxpL5nZkiev7ggCVaseqof282Tnr?= =?us-ascii?Q?HBZ93bg9i7J1092VXazQlzsAQgDpNmzo6Z45+pELFjT68i8t0ErAGSOGXId7?= =?us-ascii?Q?RgPnk4U8AyffbxThguyyg+p51fk1bf3FwthSjJk2a5f7dO7m7nsmscFW8nnc?= =?us-ascii?Q?Yo4ePBnRYKVWFmVBjRLc3YMugEGfAy4NaA7nd/BCssDTwa7g9K7mqFuy1YC1?= =?us-ascii?Q?om6rr/W9KykCnYWTmxlTgkJBBf+uJ4+doVv19DvrXeYevEUyvxqf3zxpB4Aw?= =?us-ascii?Q?yF/K/mqEZfavcU2eT44/z7eIv5LG8unz4T7YXjZWqFvZxCh4Kgnd3sp+4hYy?= =?us-ascii?Q?w9+aZvRh3OY3IIIHjyGiRDYEsrdwGNaakjidoMkF2cuTKdQIxQ8KzVchBNLJ?= =?us-ascii?Q?AS8H2CMlINDJ7oPLa6+HFmpWPBDbw+YLQnT6vi+ncOAH+SrEYX1SskEEhTpe?= =?us-ascii?Q?yJGBnsYOj/Nib1KWLmnBiDJkhJN9kl5UXmOFG3+6bTLqpA5pvJOkjdKZpeNK?= =?us-ascii?Q?RhVsAK9RrA1AVSHZvLEykoaXA2MVpczK8pyS?= 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)(1800799024)(36860700013)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:40:22.7572 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ac7f8c9f-7e50-45b3-6527-08ddbe9a55ab 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: BL6PEPF0001AB50.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8187 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 Reviewed-by: Tianyu Lan --- Changes since v7: - No change. arch/x86/coco/sev/core.c | 28 ++++++ arch/x86/coco/sev/vc-handle.c | 11 ++- arch/x86/include/asm/sev-internal.h | 2 + arch/x86/include/asm/sev.h | 2 + arch/x86/kernel/apic/x2apic_savic.c | 139 +++++++++++++++++++++++++++- 5 files changed, 174 insertions(+), 8 deletions(-) diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c index 0c59ea82fa99..221a0fc0c387 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1085,6 +1085,34 @@ int __init sev_es_efi_map_ghcbs_cas(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/coco/sev/vc-handle.c b/arch/x86/coco/sev/vc-handle.c index faf1fce89ed4..fc770cc9117d 100644 --- a/arch/x86/coco/sev/vc-handle.c +++ b/arch/x86/coco/sev/vc-handle.c @@ -401,14 +401,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: @@ -438,6 +434,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/include/asm/sev-internal.h b/arch/x86/include/asm/sev= -internal.h index 3dfd306d1c9e..6876655183a6 100644 --- a/arch/x86/include/asm/sev-internal.h +++ b/arch/x86/include/asm/sev-internal.h @@ -97,6 +97,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); + void snp_register_ghcb_early(unsigned long paddr); bool sev_es_negotiate_protocol(void); bool sev_es_check_cpu_features(void); diff --git a/arch/x86/include/asm/sev.h b/arch/x86/include/asm/sev.h index 8e5083b46607..e849e616dd24 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -534,6 +534,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) { @@ -607,6 +608,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 2e6b62041968..2a95e549ff68 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 @@ -109,6 +110,74 @@ 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 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) +{ + struct apic_page *ap =3D this_cpu_ptr(apic_page); + 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); + apic_set_reg64(ap, APIC_ICR, icr_data); +} + static void savic_write(u32 reg, u32 data) { struct apic_page *ap =3D this_cpu_ptr(apic_page); @@ -119,7 +188,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: @@ -135,7 +203,10 @@ static void savic_write(u32 reg, u32 data) apic_set_reg(ap, reg, data); break; case APIC_ICR: - apic_set_reg64(ap, reg, (u64) data); + savic_icr_write(data, 0); + break; + case APIC_SELF_IPI: + self_ipi_reg_write(data); break; /* ALLOWED_IRR offsets are writable */ case SAVIC_ALLOWED_IRR ... SAVIC_ALLOWED_IRR + 0x70: @@ -149,6 +220,61 @@ static void savic_write(u32 reg, u32 data) } } =20 +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); @@ -228,13 +354,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 Tue Oct 7 14:45:08 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2040.outbound.protection.outlook.com [40.107.243.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 3812A1FDE22; Wed, 9 Jul 2025 03:40:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.40 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032452; cv=fail; b=N2opSbX05h6wr8AQdQI/y+f6EDnVpicmUum+e8oOF5FL+8HE3h0XyOb9JGdlMJhuRuziV8rBANZdqHlDkx89LuxkKk4wT25Uhu6nsGMi5XOx0bnecNFh7Yop3PtlCz5TRmr+LYzBbC88pZ9i8xh7bH3zg6Ematfa6zwG0CF4eC4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032452; c=relaxed/simple; bh=bGJWKoFLQAA9EP/ljNzdaEFWa2oCgHCFnj+9dSJU6Bc=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=j+pS99R/9btqDmhh1kmZs8A9JOkb6+rNlHSxJK2eT8h+vS5n1rSL+TdPim5ocGzY1yGcfA24f1P3pxFSiCB8pJVtGEH/V4Cne0Hdw2aagqkrcIQ7UysCotABXX1AZ9HSW2XZ1ZnAWg8Hg85icxRFMciQ6MqF0dHLJOssGeLPDIk= 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=rXCenldV; arc=fail smtp.client-ip=40.107.243.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="rXCenldV" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sMVTOcQnvg0NCDbXb7G2JDw1G5dKvp/7D1q9VwUP7kt+w3NxMbxsBYZaLafZUuvhuYpDGkTCDRSJKCRjzdjH6ERJI8zzmdu2R3fWmQbcpBML27BRaSrgJo3RuR6ESjVwCiclpb4WFTZLaMb973SVrAgY8wm+EM8BDTdxKcV2Ok6cWYALz+0rH45L6X5F8a/4EGBshfWNZtExv9b6EGhkxmECYwGHJzCHLST110hi3ULgf8yIXLwN9pWnJb2pbVrj69wfhW9J7IC0qmkTDssLXjaaA7vLJbY29nrVnH8JBcyAcOXUUFUTBPoSobDJxNttGX1/XpEvCKI/ZcCHt/XJSw== 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=vxE824oSxYO1nyhh7A9vtJhaIX//xWDOSWOQhyIc4pY=; b=DO6fDoEdyI6jrkLWbSHZvBO8XZ/PGZCFxNZ63CCjALPGvjy6GBE/6SLVpt3eOpvgZqnsRWM082ZvENLLyq/n0URRZBm09z0cHyXxvAUhQ1gfS3QcEYcpiVOiZv2Fm2jmSIdmEC0ajDw9TUatrohFCKl9ZmakU7WlztiMjtQfDOE7myPxnnPThWxhfG1INgf9MR38odDMXYhdcXB5YNwZZIKhFWelLdVWqxMqOz7JzjYTRp+nypuFxuSBfleNj3zRsk/Hs9vw9hYYLE3yQ2wwoT3USK5A/AB5v8YPHIi/STKk/bdANWo7sy4MGPtxiikWVkFeDVwBQ0S64IWtljFnhA== 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=vxE824oSxYO1nyhh7A9vtJhaIX//xWDOSWOQhyIc4pY=; b=rXCenldVYQhT/XnBqAGdzCNwLd1eksgV0NR+oc8FB41MZLxDLkaIa0xYxU68v2/gi+KB63JakUSLkxi/z7pxOvm3KoRB1XioTgyXbCWkaOVHb8FJc9jGG+iHBHA9x2sZmGR5XBpi+vMCbx9enpmowBIWzOxRM6vXS3uL9ZaYDG4= Received: from BL0PR05CA0018.namprd05.prod.outlook.com (2603:10b6:208:91::28) by CY8PR12MB7314.namprd12.prod.outlook.com (2603:10b6:930:52::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.21; Wed, 9 Jul 2025 03:40:47 +0000 Received: from BL6PEPF0001AB4F.namprd04.prod.outlook.com (2603:10b6:208:91:cafe::5b) by BL0PR05CA0018.outlook.office365.com (2603:10b6:208:91::28) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:40: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 BL6PEPF0001AB4F.mail.protection.outlook.com (10.167.242.73) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:40:46 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:40:40 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 25/35] x86/apic: Support LAPIC timer for Secure AVIC Date: Wed, 9 Jul 2025 09:02:32 +0530 Message-ID: <20250709033242.267892-26-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4F:EE_|CY8PR12MB7314:EE_ X-MS-Office365-Filtering-Correlation-Id: 7f1fd66c-c03a-40fa-da13-08ddbe9a6413 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|82310400026|1800799024|7416014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?7fRlFStB1BwzIWZoUb5fJeGqCqeT3DhDL1Z4cSVMSci9nhs6mh7il27RBhH4?= =?us-ascii?Q?utqgOHvLIjJwMNK4m8SKiR+V5p+t9ZJblRFe4kN4YcAdyKgZeFrfVIDGT69u?= =?us-ascii?Q?asvrJvJtDL0nbRT065s3XwB/stToDnjoPiM/jG/3i2Eu1UmbruDZXoucYkVj?= =?us-ascii?Q?h8MOO3EcrwtYO4A0bdN55400ve1WYOO8y9k3dfPPJTQTG4QtJnEwmisV9Oow?= =?us-ascii?Q?skmuKJtGCrJNOP6Hg1I3ppVfTm6Hm6zTTlEpA5ch+wPVCLQag3+pVoTrqKE7?= =?us-ascii?Q?1TY4aV2TBqu03CiOw+gyu6RC8cB6U74yQdaA22nzufsuG8/7NJCqhRBTwdjx?= =?us-ascii?Q?02PKCZsMGhJ+sO6lL/fQD8CbjqR54X3tVK8RJWQQ5L+HdmDFv7te+FiUVqqB?= =?us-ascii?Q?GUWInvchZTp1tpci+f6CbRp0k/eNdQicT+WftSOIVj6T80eVAk5/YefOiBPf?= =?us-ascii?Q?mK1x/pz8wuuzX6M0IEj5Wjpu6/rO+v5ODIYfJsrdX9KkC0LE6e+4yLqlXDyv?= =?us-ascii?Q?gJObvO3nckBJj+eAjLRB8RKGJRgcBEmdXLW61RhcGAKNxiSHxASKDOc9BSph?= =?us-ascii?Q?3EAHa4CC/IlBOIB1GyXpdPqgQR/cJ5wZeprR6VrUfpZLoxkbZmkNMJmBEkrv?= =?us-ascii?Q?ux8ZIvxaEW1a2Whps/G6CjXklBXYGqg1aHBiCFQ0WS3EC5RxH7cnESZB8vOs?= =?us-ascii?Q?88/OO/1PXr4zDmOnTtIfHq5ZWryBlwYTgmRDTuI8p+WlLmaZb1sbTg9miukL?= =?us-ascii?Q?se6oX/Z3vmR3y5wUgBg0J+xCDQwaXz1xTycboSW3WsBaF5DJIPo2YkoFyKtM?= =?us-ascii?Q?a1jVVBV8FRJou2eAOyUlVR7c+hl4Jeq0LUx9If9omb+p90m3jCicmnmk/Y4H?= =?us-ascii?Q?I8FbzY/8Tqxs8JoqsC/CpmOrUKUVuPCtf2Y39S/kc7FJhSHAQ+pyEz6No61e?= =?us-ascii?Q?wjvKb6m9bFHtk9BiP5faHe/7raFvd8Q/tMZhyVXXilc3oU7XmE1RXSEmzRho?= =?us-ascii?Q?yKvdea9kQCXwmGzJNOy7HF30Ep1xWizrAVvqAz1Q/fVCno9IySEea28UNnTw?= =?us-ascii?Q?xxYmP9+c8ptre5t1D7PXPw5TjKIbdTyCYxlQTMT6DJ0TYnN7MJ8lCfvbak2b?= =?us-ascii?Q?sMBBKMlsATRmuV2I2Rk4OgOJQYeqhG7ugwo8mLD10oZcY0s9sJXuFt16tPVJ?= =?us-ascii?Q?3p6Dp+QbMzrDg1ZgkGjO/E0WlLxLu16KEbvz4eUloPsbNsXPnRuefWojKbSV?= =?us-ascii?Q?EppNKziTLHf7Xgvn3oAROzTODfsQ6yIRhIHPLY2Cr9TO2bnttDkvyMvGcPcQ?= =?us-ascii?Q?TsIbZxmsBd8Q/qmu57IWiGWl/rGqnIyUa1+zGk6/VEMlk8L9sROrG2KUqyHV?= =?us-ascii?Q?97tpH21aHFHUcFsdzoxRIpzyoIGrPVegCRLqptrVCVq6C4AP9RwuItan+MUK?= =?us-ascii?Q?ZkaIJg2wiBNG+3gZuVc01LXg39xTnyeCMyaSfSlxJOjjbXwej/mvL1/mqK+S?= =?us-ascii?Q?8z/WnR/QBTQjWYASzOvL95DJ6Fnle4KCjjVa?= 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)(82310400026)(1800799024)(7416014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:40:46.9315 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7f1fd66c-c03a-40fa-da13-08ddbe9a6413 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: BL6PEPF0001AB4F.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR12MB7314 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 Reviewed-by: Tianyu Lan --- Changes since v7: - No change. 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 221a0fc0c387..3f64ed6bd1e6 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1085,6 +1085,32 @@ int __init sev_es_efi_map_ghcbs_cas(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 e849e616dd24..d10ca66aa684 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -534,6 +534,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) @@ -609,6 +610,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 36f1326fea2e..69b1084da8f4 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -592,6 +592,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 2a95e549ff68..e5bf717db1bc 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -64,6 +64,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: @@ -184,10 +185,12 @@ static void savic_write(u32 reg, u32 data) =20 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 Tue Oct 7 14:45:08 2025 Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam02on2057.outbound.protection.outlook.com [40.107.212.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 9DEB81FBEA2; Wed, 9 Jul 2025 03:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.212.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032470; cv=fail; b=UklEEQLvU+9IhmCPoWeAGtO2Y0uTmtepb1ArXqjzLC+eU4V6i/xi3ebnWbfObK1/gsAoOEZTZ6lVfSCJfxxLyRDz0QT3gb8N2Nv/+ay7541HLPVGZKSkxSzaqoHofMlAkrCM5UBw2tpKzj/wfypurWzS07JWJKTK95Dqms1p48Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032470; c=relaxed/simple; bh=YKqCNJtUPUCRQPghf++q4TztWjTSpk5Ux4Wtp2lrjWY=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=etTLz14Gg+0PGcdDMYbpHKPK6BDNgnEZyyiamY70HlO658cY9vC41izgHZ97ZS/wdDmxPBV5Tygn0E9yxThigB34xGuMNbknxFTuk01VwwzWNv7uOXHhH9BuaK3/fOszkNKnCqzKaqzxoo7sLtjRHAIqlQOVqvPXMPyqx9XNUfM= 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=Q39/Ty54; arc=fail smtp.client-ip=40.107.212.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="Q39/Ty54" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gFXfGK8ImSpZwbRmbJcEhR66FaAq9HDk4GraPGZ/3uYzJKwG+fI8VgGl06cM2ywuC8Jcgw12KGRbK4Nu2OA1pfNvuUVkAvZqFF7BtS846Ft2bFpUWrNJNjwSx8KSvNTWCN2pn60J7T0S+hjPJsIn+G1MPvU0xC5lUDTrKoWb4yT58sxzrnoBOWFgVtLAHy43LF543qZxRM5YIolw29LHK2DURa8jXNozE6syAtXLfipB2XLgfV0AdYOuxe0cejyHzlwqXtnyqcywoH1mTPe2oD8AMq5euNZ7heKRdYGiAkb8BGO+IXftRgiLP+4ikXekwj9DlpUpMDmhK4sae8dfmA== 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=aLFDhesuVmXZOzP5aiZ8KF0Jxhvg8fL+4aCGZhwgzmI=; b=J/SBzGKiXOtY1Mo1JPyTbjpOGwBEul9qsZsAlPJ/ir7w2LzYffYBkgh2x5co94yZeWMa91rhnOX1aBxO00hK15swT/e8KyL0MRaFaz6pvs+O57/w9B0OK7ZmU/27OD7igu0+FPH2j5kGz4BHF6eu8sVwUSjnzFv4izFTNokLWLMX0J5Tz46r014bi4WhERu/bC/cBiuUPlu197V8Llp/ILkC9+7EOBvd07Pa10g+yyfzqjUCeQY9mDbzmkWhYxQ5SlmG11oe1aUttX0gldKlIO1jIZXEH3fLM6OenS0mN94x5/wDcYA/9A+L1qc+j/+kc1h41hX2TJY0TyBfWLWByQ== 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=aLFDhesuVmXZOzP5aiZ8KF0Jxhvg8fL+4aCGZhwgzmI=; b=Q39/Ty54ErKkgWorzHn0x+CXV/YUHaQo3Q4djVWFAoPFSVUbWJFiLhaZ6iDis9iFgLg8VGRueH1Mz6MZq2j6zgl7iFme9URHN7jzxvVu1J2UIBmYpYSE2vKY4guxbPfOCJDyZQhbv4s7M6AbExaRJ+6YMJTfQezVbdSs+x4PdVI= Received: from BN0PR08CA0010.namprd08.prod.outlook.com (2603:10b6:408:142::11) by DS4PR12MB9793.namprd12.prod.outlook.com (2603:10b6:8:2a3::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:41:05 +0000 Received: from BL6PEPF0001AB4D.namprd04.prod.outlook.com (2603:10b6:408:142:cafe::62) by BN0PR08CA0010.outlook.office365.com (2603:10b6:408:142::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:41: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 BL6PEPF0001AB4D.mail.protection.outlook.com (10.167.242.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.20 via Frontend Transport; Wed, 9 Jul 2025 03:41:05 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:40:58 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 26/35] x86/sev: Initialize VGIF for secondary VCPUs for Secure AVIC Date: Wed, 9 Jul 2025 09:02:33 +0530 Message-ID: <20250709033242.267892-27-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4D:EE_|DS4PR12MB9793:EE_ X-MS-Office365-Filtering-Correlation-Id: ad52df39-8a96-4e65-b55e-08ddbe9a6eea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?POqEQNId+Hc7m34u4iFNWRl6N/DjLVEtKZcQUE+pRD6EZdfomlFT9DW1adiv?= =?us-ascii?Q?41Z/siyak6XoAhAXMMAa3at6U6DDYyULfxbet8mf3N8S0L5q4HCePdNUAUta?= =?us-ascii?Q?Z7kQQdiGp2Fu+vX/fGADWQzfxnzisS5wgO36lOEP38IhHAYcMLSgaySsKCxu?= =?us-ascii?Q?sblADj2wYs52mmdCCD96JfUDb3hKdYcC4bJpy105W5whmsLathCODM7ZXTMa?= =?us-ascii?Q?Sb2NvDJ8v6W7jrv8i+XpoMsNZDwTje6hNlg+LEB8Sp7zzTJaSPQWlIiLxYN+?= =?us-ascii?Q?ZwKlTLr3U/Im6QtYn9LkZfBqqKHd1kOAkz/R6oYhpKJgEpu1LhKPhDf8pFMh?= =?us-ascii?Q?f+l1Oyc/WP12eAZjXpwEoWLL7Y0TatH5nV7oVwsd+HpSwBLZddtFwzQtEyQi?= =?us-ascii?Q?YWmNGbUEh+3GcFx8dYZEJcqxY7EpSbt/+uCu0x/kUnSfcoA0dI/RnN4xKPqv?= =?us-ascii?Q?U2Z1wStqp9sxjJ5btj2E1VH6KC5cUe+xQ3YpflDpWKf0YMHnc/plX0DAtmC/?= =?us-ascii?Q?00cNZ61+IyaX+Rm8Fzy2dS24QAekWe0EbboYj6dLxb3tZtwUt0T1nHDCNwh8?= =?us-ascii?Q?kaPXw5cDLWL2WLc5K1ZM3mjLqsxmiYv9VWUgJyknt9bYRZgJ4OotzaJF5OXu?= =?us-ascii?Q?jYvHXHplZYT/yLUJwWzfMWkR4qJDT+WROwu2I6/7Bo/LSUuIo74apqUxEt2g?= =?us-ascii?Q?LwELnbTlhLkn28/P1XWmNVOh7L8SnBH7QOEo4CvuSlrnXIgVHtzKgCi8rj6z?= =?us-ascii?Q?rYYFq5nMs6vEiYz3R6vDjT93frhI1xFRJPfSTaqqOMsIPzaX3B1akXI8e3Lx?= =?us-ascii?Q?Mt2t+7hhyRjQy/X6IsQyB1KkuDduW9Y4R0V9i8SsqgB67IHb/UuI5VRKYVru?= =?us-ascii?Q?N3yjVEBfLom3gtBD8RCYHiBgOK+mGMEdj6QHRlSohpZz49Rbcg/Pih4M6w4m?= =?us-ascii?Q?IVKOJf0eTyTgZcrExZluzeqfqgeIVzwMMmtBo6gqs19Zj1Mys+xUn8tiHpBS?= =?us-ascii?Q?iecN5xkwbN5kP+B31FSV6wbtbs6TI+WVJFhgfS5FZMAWMxG23N1C6dN2CqSG?= =?us-ascii?Q?JIg9r1fg6JCsfqCPOh7wTgLxsozumhKQNrCsf35cRl0jlIPiXTnbhQ9ArMJS?= =?us-ascii?Q?H2QlJ1tdRIA7S1I+RkV7JpN2QWHfA6htWrcPyggqN4SiqSwqDADBIK187uV+?= =?us-ascii?Q?KJLl9CBa2xfFeuP5VZheZ+uyl936/JtOkaOHkHT2LO5rVX2Vg+eSuNRumtlE?= =?us-ascii?Q?tGiK0QvOmxW6NGgASoea7GRTHQEqpLbsm1XrwNS5qBWpO7aNQE587y/fOtr0?= =?us-ascii?Q?kOTG2iTTsGQ5ciz1NtL2Tq9cSYhCDvsj4nB3MqvdiFFoOvyTYHWySzk58Aft?= =?us-ascii?Q?slN9USPjgVIPvQRk/lPW5K2gndAkV56x9NlZHbgKxplHznfEVjgcWKho1UHM?= =?us-ascii?Q?+YuI+I0Ka60sVhcT5HVwRw/JBUPZvqEou0KXDmZ2xkR4XdSwPlRoV8ERrOp3?= =?us-ascii?Q?LGBSqWPC3xlMsXtCuFUXedMvEHFCEL2W9fYh?= 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)(376014)(36860700013)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:41:05.1159 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ad52df39-8a96-4e65-b55e-08ddbe9a6eea 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: BL6PEPF0001AB4D.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9793 Content-Type: text/plain; charset="utf-8" From: Kishon Vijay Abraham I Secure AVIC requires VGIF to be configured in VMSA. Configure for secondary CPUs (the configuration for boot CPU is done by the hypervisor). Signed-off-by: Kishon Vijay Abraham I Signed-off-by: Neeraj Upadhyay Reviewed-by: Tianyu Lan --- Changes since v7: - 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 3f64ed6bd1e6..e341d6239326 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -951,6 +951,9 @@ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned= long start_ip, unsigned 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 Tue Oct 7 14:45:08 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2087.outbound.protection.outlook.com [40.107.220.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 BB03D203710; Wed, 9 Jul 2025 03:41:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.87 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032489; cv=fail; b=qgLnDdVUUi9O3qFBQnSmQX04qXyg9OHV93BwEwqPUxel008KrhZSepg0mtx5B78UbTfykCFZ5D8+/7pdTqX7hfBEJqz25gPGicFo662UKuIIwvbNTS4co0832UKwVwG+JaiN98+Utz56C/DQUfyoKC2z9EdTXQzfKWoKuBmXeqg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032489; c=relaxed/simple; bh=M/UKeHL8np2vmCjWBmbaEdrINO7YA8tz854m6d0rDhw=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WPAXdv3ZAmWv+ETFw4+nflE4qBE/rN+tTQN6bzOFiAlFIkr4Zh7NSS2zai0rOFpj9/ilacuUbH0O/Phkd//CR1oZxR3A1pAQXhiH8pl62Ky08FVHVunKyyM7J6V4mqJcsIbzvD5kJ9kjHa1Isyol7PmEdsDXS6p9H8fKx1AsXiM= 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=FEMwrz4g; arc=fail smtp.client-ip=40.107.220.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="FEMwrz4g" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=jr2IlXL+3huqnaZu1ELHp/4N+ZxMUVpPQ8OSFHiWwr80cEYVeOm49fWNcbpbSZH++QenwEh4XIJowHUHr+kaL9QLWlWoWA3DD0Bs551rkcZutld70a7tpi7ryu9azh1Jkz8o4rNvRo+BLbE8Gvb3w+R8P+SXwED8wDIm8yn2SHJsFWP4zmO/w/cEn6cb1WL2Zckunia/LAbAnP0IHdmpwA4QcUgrKHz3X2ZTzr2YanVCNI7w+I74iOtvsHkk+rK1Yi4jA6Bq0uTl62ehQayLyJ/IcyZAFUH/7MkYgH5XHDmwi87AeXx6rWu4etAVFfc19K9XlLWs+k08JRswKUp1Mw== 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=jrs5GSN4cvtGWu49fDenDeET8NqvxI6IGxdEXqnqKSY=; b=yvacEcZze+CDXYtztrPbv6Q5LOcUjnzFdbWPs+qkaDeW9A6U09OI7wkf0mU4eQbtEOdTdIRBkFdGPi3PyWnExO65spY+i7gcn80orwlaT14DV08ZKfa0EN017jnuU8B0P1c1k3GbeF7Cvl4uJ5z0PfPapsFVRArM8BoWNiWmjISindK4BcCcQTGRUXeHyGg6hv3XU2aj/NIzh47hcWXiaZeqP/0QJCMxFQfvVtDUs6RvFElciQhBFXT5gjwN6o4mQwDTBNQZOQiKrlLKDBsi3l2LUUTVJYhNvTaPj/jvxFyV8S7O82DGtNY2qyYkYK2hYMebLhuFabvoNI8Szg6IHQ== 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=jrs5GSN4cvtGWu49fDenDeET8NqvxI6IGxdEXqnqKSY=; b=FEMwrz4gzBIsXOCmZ9V7qEtNQMiaaP3RnDzkRpaB+RWgnW79mCCjYVz2GbD5Q6EeFvei9Qj6FYW6JGqZDt+8YHSkMsR02DzQoYNdqSIS/4YDv5Wga/X9MFKyAekhZbnGw9mao1xIYb/Y/Lmtda0X2eZ/F/hvZonxow4hwVI0swM= Received: from MN2PR02CA0025.namprd02.prod.outlook.com (2603:10b6:208:fc::38) by MW6PR12MB9020.namprd12.prod.outlook.com (2603:10b6:303:240::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.27; Wed, 9 Jul 2025 03:41:23 +0000 Received: from BL6PEPF0001AB50.namprd04.prod.outlook.com (2603:10b6:208:fc:cafe::bd) by MN2PR02CA0025.outlook.office365.com (2603:10b6:208:fc::38) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:41:23 +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 BL6PEPF0001AB50.mail.protection.outlook.com (10.167.242.74) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:41:23 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:41:17 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 27/35] x86/apic: Add support to send NMI IPI for Secure AVIC Date: Wed, 9 Jul 2025 09:02:34 +0530 Message-ID: <20250709033242.267892-28-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB50:EE_|MW6PR12MB9020:EE_ X-MS-Office365-Filtering-Correlation-Id: b616861a-6c8b-49aa-4100-08ddbe9a799e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|1800799024|36860700013|82310400026|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?cv8hP7+orzmCXoMbhr2E0/L3KBtqYYs719+gUG4y++SD/xH15WzxGh6XNyFM?= =?us-ascii?Q?dp2VhvmpSJ3oB2pkj2FjcKBeeR7OdwBjAOVJOVSOW7d/phD3J9faIoG44rzb?= =?us-ascii?Q?a7Qr+nzm6eZLQcw7BeBBkKTgxHs4tF2inVWKytKq4ME5su/5nC3WyOVzGopm?= =?us-ascii?Q?/zL9bTE0eEjeVH3S6on3OHUGOYu1uxCcfO9nKbWN7dac3cx0C0ast+JtwM7V?= =?us-ascii?Q?fkl6OKeoAQO2HwG8lM7sEqAbzMVu0TpQBaHj+d2JHg7FefTWE+33EJPEvUmq?= =?us-ascii?Q?o/b0tRUfxJdoUOyI77fRiloMS6rb4SRiUqDnAjii60Kt1SMQ+69vVyUV/OVx?= =?us-ascii?Q?3UYT9l1BGsCNG/nwlLr+V9VdOI/M22+KG39D0iDq7yGCkb/mB3TokaH4dSXc?= =?us-ascii?Q?KC/x2kwM+qJOf9yKwjXuLkfrTWvaxLoO1j105g7IVxtlENoIZ7seh2kJe/vW?= =?us-ascii?Q?gy9jq+xBtBnR2dSiZTK3Zp3rwJ2+udtpA1xA3Bu2waG8ZIZ4H9YlV+v3GSj9?= =?us-ascii?Q?45jAVSE3EOEbBF2Z6reBb0Eeg7la+remuo44V07zoxxee9BStWtClBrleKFC?= =?us-ascii?Q?5/tfYDp3ghG7WNi0sS815KjoE99tG2GLASyv/oUOVqpybgsAq2lPFTF/KNC7?= =?us-ascii?Q?Gp7I9Ic1KcB5cPKWB3p9Z4famYxLwoMVow8g9lGfmTkYLdxeinLPvnGQQYpU?= =?us-ascii?Q?2anz6KJPjtjY6Y6pA1DwsTeBzIkN3YUptzeAgnKfKNCMToAgGvTp9cm8yR3i?= =?us-ascii?Q?neb8K2NsIO3DBoiImTf7pLPW7lxczTYhSrirTcVrOybIpMA1pJvGRBnglz6Y?= =?us-ascii?Q?t+stH0B1J0qdS0QGpaUiZ5FPv0hgnCAVVaPA1gCltw7FUTlSVtb6ALcw0uAc?= =?us-ascii?Q?WGgG9A+f5+Ly6Zud4YPjMqgsrl2lN45WLscEHPvGUNGWVHiOyOALjZHIQ2QN?= =?us-ascii?Q?kCn2I4ELpxzwOPBD55x6XXLie4LQAq9+btwzj0vSJfQ3vQqzwpskVKSb4XBZ?= =?us-ascii?Q?08MxzgRjik0tFE81yDouezqLIjTD89zgU0XiqeEy+Dcfcv2bP2oRomVHUeln?= =?us-ascii?Q?tG3tQGckDVer8ugXk9RMrQ2Y0zg9EftD8LK/auVJFX6BY37Cck7TCwkOCRK/?= =?us-ascii?Q?Jdm49urwclmtGhJuQ17SEzGIRJs+7T2rZhNlgdVaI6pCfETSY4aBM+Bf0HuZ?= =?us-ascii?Q?orQzruuHgvJndKc9rfH6vNKrY1Lnm5uN65DGznjOVxJ3svShnQrwvOv4aRLq?= =?us-ascii?Q?rpmSLyODKR9ByxPqriqjtiCAUJrTSl2SFkshFgI/KgO3kjLIZA4pymNwgSjt?= =?us-ascii?Q?YAYSp/IV4Uqos1WRM1yvU8nW4GwssOgUhuRVQLAd7m8GbnOJKN3qJxCKlhks?= =?us-ascii?Q?AJAprrVlJZjdZEYqo4R3iO0FH6Ds5I3HsYstFdL1P7fqJd3BDMrJXhom+FPx?= =?us-ascii?Q?dkefH1fX7AZrrD/wiUF0XaTyDJfrxhsuL4KxPJFLrpTE5zi+YwF3AkU2hJSg?= =?us-ascii?Q?8txcWAE+V+251lxzMb8Eh6IVcLPIHAkWmLLZ?= 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)(1800799024)(36860700013)(82310400026)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:41:23.0690 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b616861a-6c8b-49aa-4100-08ddbe9a799e 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: BL6PEPF0001AB50.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW6PR12MB9020 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 Reviewed-by: Tianyu Lan --- Changes since v7: - No change. 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 e5bf717db1bc..66fa4b8d76ef 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -122,12 +122,19 @@ static inline void self_ipi_reg_write(unsigned int ve= ctor) native_apic_msr_write(APIC_SELF_IPI, vector); } =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); + + apic_set_reg(ap, SAVIC_NMI_REQ, 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 @@ -138,14 +145,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 @@ -154,22 +164,24 @@ static void savic_icr_write(u32 icr_low, u32 icr_high) struct apic_page *ap =3D this_cpu_ptr(apic_page); 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 Tue Oct 7 14:45:08 2025 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2072.outbound.protection.outlook.com [40.107.244.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 8D6FF194A44; Wed, 9 Jul 2025 03:41:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.72 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032507; cv=fail; b=siC3OxY8lK7gCoCotD7SmL2QgE/g1fuuyd1eNLT2Fc83yabgc8XSChvkmPnNuKvWICTmnh/WxMuMFXixDiADzOfs/XVCWlsk60t9nB278jEDmaVRq2gZPrm31zO66945ULtclkyNFYFUpELRzwAAzSoSRutXKmXM5yGpCt5o4uo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032507; c=relaxed/simple; bh=zM/RepVVgowohCMmx1cFKA0C7IqSYdHX/fZ4H3/RDOA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qfTPZUo8g9Ie83rJh3sERXzToUBO6gu8J/bjh0Q6wfU/iW3Iw7gIpka/MYO5KBFf8aaJsete3s8x1E1lcX7FlZBqp9CXtUsDijcZ9T10WCDMdIAs5GjBobJyAlxJiKjJK5CmuJhBV8WsauTmoKIaiG8b/8Ya+lAuWkhGUbu6R1M= 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=KCQDlqbK; arc=fail smtp.client-ip=40.107.244.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="KCQDlqbK" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=mnfgDY+hA/8r1/JZndXw8fktMYQX8gx69W8ZnlPR+Of+a3CYUFYwWaiDE0TzOx9HyrLnO0a9ebr/E/tO2b2Lp1SETxIckGTVAJ1qWJrP+nMX7Rk50cdNZi4BfstxfX2SxjNAz16DQJdn/GyO/uB7AQoGcyU6ihy2ORQ2y+6wF9JaltyhvtfrRXh/Vd7cwbdgq5z1bDBihmovrBeb2O3JlaxLMRJ+Wbj2wA9SPfEooudLSohY8A69UZYw4j3LrIZjB40A5rZZjqBowdsh8qXHCPninzNF3Eb0zcCUrMUW1nzPNuWX0eQXiBIlz2V3OrJMrTzXJN//qTxUYoM7ituwgA== 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=8Vq78tREABFPzJbhWgftSbTqeLa5GNF8KoZlv7TQvgU=; b=iXSxOq5F1S0iXNlRMiCdcXJrNp3jFmxBcccqtojENb4ul7R5U3n4p+A8JOOwLDX+YDkY+1aQORTBuXMO1gvw8drqHZ754OPRJzKCzc8htQLHf28gMtRqg59rEaCe4igGD3MS1nEz+ID0GFIlz28+U5E0SPRjAwhf9Qw/2S/y9jzssmd39wdFVu0FUKPMQ/XFDA7iMY9PZWapxeXM17hF+rg93pUnYdzz+FHIRpKVCtIdKt13V3aqpWTBsUflA+JuCeKiho14wRzsqUuHAHMoIfPDH2ypW6W731HbOaVDxfMJ5QTR7t4ioEBtDG36+1uSTua4NDkL/NtXpJD046ff/g== 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=8Vq78tREABFPzJbhWgftSbTqeLa5GNF8KoZlv7TQvgU=; b=KCQDlqbKByVcSL6/vbbiasvTSukA13GVbyVKr7WxE388SA4blPC9yTUsQkelqHynGX97JNPqXSgKmjTgbyKE4kc4ZZmMgtcWSnbQgI+5+hTVe7UEUvxYDgC3uuBJjnEQk5TjMjwrcfGl8Vh56LK7LmRbj5BQ7S0h1qgWWhdTn6g= Received: from BL1PR13CA0071.namprd13.prod.outlook.com (2603:10b6:208:2b8::16) by DS7PR12MB5743.namprd12.prod.outlook.com (2603:10b6:8:72::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:41:41 +0000 Received: from BL6PEPF0001AB4A.namprd04.prod.outlook.com (2603:10b6:208:2b8:cafe::a6) by BL1PR13CA0071.outlook.office365.com (2603:10b6:208:2b8::16) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:41:41 +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 BL6PEPF0001AB4A.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:41:41 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:41:35 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 28/35] x86/apic: Allow NMI to be injected from hypervisor for Secure AVIC Date: Wed, 9 Jul 2025 09:02:35 +0530 Message-ID: <20250709033242.267892-29-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4A:EE_|DS7PR12MB5743:EE_ X-MS-Office365-Filtering-Correlation-Id: 8dbd54bb-a617-42bf-a80d-08ddbe9a849a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|7416014|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?VIH5fIIeXdzDxdiTGFBA78mU5D2uL4iap+VPqpRcySWVH2dz9bvbg1Mbs9ST?= =?us-ascii?Q?0x1RDiy/Jzb9i12yP3F/ME9iHFB1JKuNNGawJ4L8lqz5Iu202UJSHVBdvrY2?= =?us-ascii?Q?+lH6wkyDA7BU/JU3YL+/pHu6JzYfgqdtHjaFhgdSU0k9Ctz6o5uIJyFniLDe?= =?us-ascii?Q?bW2KS91h0zQVvoQnWtghlmP+BDNQxYsO4gLPMCTwdtBe++FTj8aC5XDAspNg?= =?us-ascii?Q?0qMC01IVhEIyU6B4gFVMf53W3kOqZLkwkp11diE1evnMLTmw/6CLrR2afhBe?= =?us-ascii?Q?HfpbZnD7DWq1Pl2km8fE9uAjiWEIr0rt9JxSlni4VquNwh3uX1XFbOIOC0I3?= =?us-ascii?Q?VZV/bKhUChhPpZ+RsRPB9y2xwSNzaPloRkL9R5DEBozA+P8kakxc71rGQOwU?= =?us-ascii?Q?G2Z5ZO7YAK8zucrWV9bQkZ2GzcfqhOyEyH3GQkumWQtp+QEeRBah6yHqSfXx?= =?us-ascii?Q?HrrFIdcaf4DLYsXI3UmQOYCtjEXX/9io2VOSwOfn6xfCWXNqlIoUCnz1o2NX?= =?us-ascii?Q?iDfMOMiQJ5xYfqmzF9EY1y66lUmq5fx6kFEbYbg0F5nGi96PRClMPV/tBDuc?= =?us-ascii?Q?vcuvmcV0jTJmrY5EZFTVm+zJeYf1Die931Ti/ntkf1YuO43F78ovt7PHEwOh?= =?us-ascii?Q?D0CPbgV7bxIfNG3n3f7LZhZNDZ1ZPICCXrnPsweNLA+vj1XUUmb6DuU5HKaV?= =?us-ascii?Q?4puXe4XftxZ/c7xpkowB0b/njFaoymfMUy13YcUiiZ10yH4Tz92kb5VCLuxA?= =?us-ascii?Q?I9l/NyrckS5xEqzcPLnPq7XpI29OqJvemATc+qbQ1CEfRlpGxw+McSQoDL4U?= =?us-ascii?Q?O6VZyDMBEr5dTVdNwnMmnJo4Jz9gYPP1NsW3GwAvW3/4925+HIqWBm2Y94Lp?= =?us-ascii?Q?9+k+jOwOymuS0Lsx/QsiO4yWmUDvFjfQ51lx7QyC5jO/cyl/2s6+YUK4AjCj?= =?us-ascii?Q?ybff6zaw0SuEB+QBHk/ONTGSbdwfP+d73E9RY3tnlPPjdsX16H8t6Zq4/S2p?= =?us-ascii?Q?oz6xLPw7b01QGoXe0NvfJN15915kyoVj4r64cX1cIsX2ECGjtwFLndSYmSFG?= =?us-ascii?Q?J8XVBDwiJ1351YaywHmf8/2PlV8fSfLVuREkV4igLBZXG/JoBnMgFsGs8Sq5?= =?us-ascii?Q?SJ7ePTpZNKWBhkPNo9G12QwEZ57ILVs0I6HJhy6SI9Rd4AQrRU0ERDg4Ok2J?= =?us-ascii?Q?9ARCF/3XWtskHeIVgdsgzo39YYFpKC8M6JKBZmQNAtcxR1nXWAB6nBNe8+Cz?= =?us-ascii?Q?QnqU50MunQTrddL1tj5ZVv8bT3/ppcr2T3NdRQfDpbYZPq0SBCXfeWqNUKW4?= =?us-ascii?Q?tRUvwwnqlybUgZ67fNXlIZR4K8MXLzRTn82hrHqfCe0LkNFNavVEgN1bMAyG?= =?us-ascii?Q?zLa5f3L1Tzs6SZFddJZWKjgugr7nhQm+QVXQeUh6wCgdgprpUdO187PQCJw8?= =?us-ascii?Q?RLVPmU0xDyuDiLKuaWWFu+IFFaW1gT7Tw0G9D+zNajkCKr2esxL7IsfK7R2N?= =?us-ascii?Q?NJBNiYS3vPk6R3ncabMZEjRHrXJDvBcJRh3P?= 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)(1800799024)(7416014)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:41:41.5014 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8dbd54bb-a617-42bf-a80d-08ddbe9a849a 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: BL6PEPF0001AB4A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5743 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 045c0d7e160b..a3a2b99d5745 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -702,6 +702,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 66fa4b8d76ef..583b57636f21 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -19,6 +19,11 @@ =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); @@ -330,6 +335,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 Tue Oct 7 14:45:08 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2049.outbound.protection.outlook.com [40.107.223.49]) (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 BC378194A44; Wed, 9 Jul 2025 03:42:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.49 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032534; cv=fail; b=aUkubQCii3F5sVBkvKdx8Ld6zPFM01DFwh73dvPOMP1kLMU0YaG5gyi9qgeE3QTwj9jKhFkJNcNaw01AXG/6e45CTw64LP44cthUoglew/xtCxQaX3PHSrAEZDUf4ktJ4r/pT5wzdh5vvjoIMk8/gnZHpgj1+tQMTr4n9lmCWX4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032534; c=relaxed/simple; bh=MkBNEa9m33ocVOqrBKzbWgF+IXk4GKuqXffmWitD2Go=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=WrWN0N1q25/yUxmWqlKaPB2itMQPSYAKi5SH3w1W+PhV9ufsy8QNc5IsUY7fZaxXzkOhsjvb5Yzv0P3XifvKKv8LAqpj5cL07IupLLHpm4WfCgou3632hto+SDrd+H2RIM8gk+CowNZROcXWI7xGeX6jA9+qQiG3U5+cPxOuxuY= 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=MF7rHC62; arc=fail smtp.client-ip=40.107.223.49 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="MF7rHC62" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=KUVw6LfCr6ecswVeO2u3d+HxD4T3HsBpjwuqyan/iKa5zCz5zUymxJN+hD2D+5lZvBur4/i60IWRtqnTSW3meKXadrBwvjt3nNFfEX7ZhdpIouXZOk4bawWm5vkDFj2gsqIv9vR/znUxxrNL8+5wPAvMYEksZhcHcROheItB1W3d6Yfxr/ZmZzMsK97eAZJfLVWrgTsDcyeqAbG2l9Eyn4Hx+JmAiGiMmL2xh+6tcQ2CjF0hYJNmPUbxEu9gy4/rWz2SEN7BGZObP9D0rVgeLx09M4ME+x7AZKkLjirJYCrMlJtVVszSd6yzjK9HogZf8kc9B2+V6jGxQ5aVYlm7wg== 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=X8/f6FtC6XhnC2wW3q5ybttmY59k20Hr19O6r4q+I6g=; b=Yrhs+IqqgG/T+n8B/IP2cYAHCiD7NMScH1jCFGWq7DWDYbgAAhI2edyUyyuqIwZtMuz43C86ff94TfvheWvU1eUqWFBQnMzbRkDV7WNBQRewURo9cy8XPbQm5Iye9axmLPYrQqub8Us1ZHAfwH0gFNrADtz2SvIYLxIOKgEgtypjKYOm2xiNaRQwMK/5XNj5QeyLPQG+SAXG+vRDg+R6Z4Hl2SmR/2IDDlXH7qmHOHy3t7GMunTgBPjs86CoRT6RG0/0ExUfOnaa4v6aXG33dQTw90VP9iLk/szHwJBQfVtEJ1QCkW7v8u/VR2T4MVmi8KWQAhAWvDFon5KS9Dt1Xg== 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=X8/f6FtC6XhnC2wW3q5ybttmY59k20Hr19O6r4q+I6g=; b=MF7rHC62A5+cFkRJw7py7QpP1z+7HiwUrGlhNN53JT0HpOmNv4IjW+cT9QKL/ltLPREQnkkHgWC0VDTq3fjrnk6nL56GHrmTnvbQoxq3Ec10yiFzj2yvTSaG77bU1uFBHbDvgkst0aBO65g0OSiMA4SQ47OjnA8VhfcQFYUUjOE= Received: from BL1PR13CA0066.namprd13.prod.outlook.com (2603:10b6:208:2b8::11) by DM4PR12MB7550.namprd12.prod.outlook.com (2603:10b6:8:10e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8857.30; Wed, 9 Jul 2025 03:42:09 +0000 Received: from BL6PEPF0001AB4A.namprd04.prod.outlook.com (2603:10b6:208:2b8:cafe::90) by BL1PR13CA0066.outlook.office365.com (2603:10b6:208:2b8::11) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8943.5 via Frontend Transport; Wed, 9 Jul 2025 03:42: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 BL6PEPF0001AB4A.mail.protection.outlook.com (10.167.242.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:42:08 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:41:59 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 29/35] x86/sev: Enable NMI support for Secure AVIC Date: Wed, 9 Jul 2025 09:02:36 +0530 Message-ID: <20250709033242.267892-30-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4A:EE_|DM4PR12MB7550:EE_ X-MS-Office365-Filtering-Correlation-Id: f5aba912-7190-4157-c7ef-08ddbe9a94ec X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|376014|7416014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?jsB7lBYt/Aq8k6HFOSJbuuYDTwuNz/AXTBshkJCC7IEtE3uZqEPqiZscXkCD?= =?us-ascii?Q?g1jB6CfF9AXIIvC8Eoq/oyDV/kntzuDTxePjVgN2G7E63vcYDMj2xadVhdwY?= =?us-ascii?Q?fUcrAWWXhyRzgxqOedmEGBSrR63GWlOux2hgBhyacj3epE28cFJHavAxXfV6?= =?us-ascii?Q?JEoPKrJag8H0shDyTEYoUS2ZsTCV9TV7zGCdD/BXlBBIBST+N71jDCoTWmsg?= =?us-ascii?Q?GgDFYsIZoJLnvSZnTx7uw6NJYgcTdjnSd6KF+WWWsvErUmmNdXfrFsZFuf8B?= =?us-ascii?Q?lgeV54kPDWvn1ts5GPy82PvjSEsCr+SVWXJ6G+TKVU6F4yErdtbTSEUNy4+s?= =?us-ascii?Q?5Zwb7UxSY0ETtq+1fvRC+72QABwMXz7pvzK6jc1z83TAQniiY84hm20pKMLP?= =?us-ascii?Q?+gfCecQKzPgCJoI6pj01nnGAa5F0pt/Fzu2eWbpZIR0SV47sTacGn2n5KYox?= =?us-ascii?Q?/eVz2Szu3a+8WtDKL4C7KGfgRyCiUBnm+IGjURSf1y6k+SMfo1KjzmUMCE1U?= =?us-ascii?Q?qjlU5Mq48KVjHXnwDHeNSZ9Ga5OXbQCO9rY1WmqODpjx7I6yZzKSAiAyCHVY?= =?us-ascii?Q?NFZgt/q+ht5ogyODvhGtvLa+XQgp5H4w6W4y+j71xfh/fKc7qlIV28cwzyUY?= =?us-ascii?Q?KqPKVqh/dRaYWsifroMIbjj+NTpIHRuulCWqrgAQ4yi0C5TK9HkUeRxfW2Nn?= =?us-ascii?Q?nULmzBpeKSSt5aMplzvINh7WBUWKcng0QMeD6E7UwWAZ1Igl+2r4YjJhM382?= =?us-ascii?Q?73R9pH9JwrwW7WEug+opkoreHH/B40xh8lDxwc4jik6YryDj4o63FwbVDkeZ?= =?us-ascii?Q?VgOtDfezmK6m6wQvuoXOR3/sP+6Yqto5jpYbU2+dUv0lmS8kUko92uexh+B8?= =?us-ascii?Q?TrTg4Snr8NJBlDBi3v0QGoV/sXL/HAX8PA82aeagh2Qd3Fq3xFC8Mef9P+Ak?= =?us-ascii?Q?BRwYW/I7NFyks1TJ20j0L/N/aOmCJavCBRJQtQON8rz0nRj+hUd3JZEGKd45?= =?us-ascii?Q?G1V8BVy9/5YvrUU7TUMHyvXpXHgY+gEgsyFqXqwYtLri6DnCUwdNR3+Fqx3t?= =?us-ascii?Q?Sv69nO2wQhXZGi32HACyPqIW6QgTQU9dE/p9FC2dWKc+UdbkYO3DRo0VufUO?= =?us-ascii?Q?pw8zvFXeIDaSXTKprrZPmVLwkTXoCJXxQMqcONKbxgOwTQQI4+lEpkK5l9iS?= =?us-ascii?Q?XruFTcDmQfZEI/2zgUTm5jgf+ty2hJGsf0LlaLTMnXRMA+ls/MzvlMnhTEaE?= =?us-ascii?Q?8Bidb7D+vL06YbZQ5B9I2pislvvWo3UtK7Gls8uRBzCbpa7vThCpcmxwu8Q5?= =?us-ascii?Q?4RF9qsxBHZd1tMi+EtoxR12kJSdagLeV+QR/wVqR2wyFWdHI2lBKMsszGJI9?= =?us-ascii?Q?qtYdx2aPXDS+H2/wqOcDF+kej4FAI9/hMvCI7XL77eueSEcUtvE2vvt1/89s?= =?us-ascii?Q?ckIFNyaAqOpKJAPpKaJnScdyYt8mYtKrOsP/s3LidcqfGt92bo7sI5B9tOiU?= =?us-ascii?Q?t+nYPqnlotXCcPNPRNueLFk2Sz9QsXBOvIKm?= 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)(1800799024)(376014)(7416014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:42:08.8825 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f5aba912-7190-4157-c7ef-08ddbe9a94ec 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: BL6PEPF0001AB4A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB7550 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 e341d6239326..d7c53b3eeaa9 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -952,7 +952,7 @@ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned= long start_ip, unsigned 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 Tue Oct 7 14:45:08 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2075.outbound.protection.outlook.com [40.107.220.75]) (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 F0B8A1F8EFF; Wed, 9 Jul 2025 03:42:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.75 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032549; cv=fail; b=PzGs9irkYmoLQ1P73G2lggw0Xz2Xk5gZS+3KjpEF7viBxvicy18kJUeMov7AaaWFpRM4D9gMMJSQIls8+TsiUjDvbvya2gvAa04cghqgYJkqQ3PGKIszQFVhjyvFLiPmS8a4G8WLhUy6AWLleYymLvruDseP6iEOBPABJo8ziOs= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032549; c=relaxed/simple; bh=lPt7O1AwJatIgr8ZGbIkNkDk+ocIJs/sxg8wHHbEu+U=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=pCzh//Hav0g3pFNZUX/LNFJA/hvyvXF76t/CV/sTWRpEwYyiGjEXRREVlMyHdLgoqilptOVHqLZj8fUNXWPpKYlCUALyWzVH+Z/d4+qKVshp+u0GHvNhPZ44liZPkWU8Xn7EU26XeRRHKs+yVqz2C7kGgspkdjP0Y5WDdTpcnrM= 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=sWB9ogHd; arc=fail smtp.client-ip=40.107.220.75 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="sWB9ogHd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QrvMfJgIlDHWzeu2vvW58i5FUan/ynPcUuRUMqDQNUQjcVNzWInvZkqpnxQ0w5SJpUSxp31fR7pWjdtA3J13Bm4+dPl2McXDM6GlQwPTEtRFL+ml/v34xSsVqy0ROKSzeG1ybo+fe9/RiR7XGJFY4J7W/nIw9X+4IgXbNAbP3+V+9I7nIQwspV5hdaT6pc5t97WvjUzCpqY6p5WSv+rSO9xOdlDwI/6DXHsMdM1psw+G75tfBg1D8JkYLCaV04LEzP1TjX7slyvGBGDT+NrhJ+8EfOMxfDccBHxUT8bhea97UZS7ccQyyFr3wSzbpuonlDupuUgpyku2g6pCE0lHyg== 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=HL6Q3aCkl3q989LjelpdlTCSdSvoNpBFNmip3BshRis=; b=qwsODzVK7ZEJWKVExed5VCBfkjE1H2Z68+bBXL4EVbaEPfow/JqRGjD5dHjQ/lI1PXhOcVl8WEI42DwQRPhWZ8SZGkjsoyl1Cd98sf9y5tEl5LnoHv7UZ3P+1jv2wtvYIt/AUw4V5lbCnGB5Ds7xoLzy499RJhSp1hXpRKZNEl+KC3d6fRz9vxUMouG7ovXuoe2ts1plWUK6dztEXClSorF80U2ueqCOFqzLvWuj701rZiqb16HlFljJMVRudacN6Zy8Q/nsaWmp3cMNTPdSMvm4VKmlX36etJrU7PbhByks+iaCQIp5YYXEZgiKf1BDmD3eeKpNM69jKDmo+EEyOg== 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=HL6Q3aCkl3q989LjelpdlTCSdSvoNpBFNmip3BshRis=; b=sWB9ogHd7nmdlQjdR46IAgvRD/WvqNE83GnDrBtuSu2thNY1x4GHLIhfImvuDjlZnc7LQnmXLXdMw1qiBMAspyrDKbi3bEPShb+QpAp/l3XTLGtHqz9kjAGOH/9j7snpuJ9Vfa9fA2TKkRiLxpbSIUDgkXsfWklHPTm2B5QEVdo= Received: from BL1PR13CA0222.namprd13.prod.outlook.com (2603:10b6:208:2bf::17) by LV3PR12MB9355.namprd12.prod.outlook.com (2603:10b6:408:216::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:42:23 +0000 Received: from BL6PEPF0001AB4E.namprd04.prod.outlook.com (2603:10b6:208:2bf:cafe::fe) by BL1PR13CA0222.outlook.office365.com (2603:10b6:208:2bf::17) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.20 via Frontend Transport; Wed, 9 Jul 2025 03:42:23 +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 BL6PEPF0001AB4E.mail.protection.outlook.com (10.167.242.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:42:23 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:42:17 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 30/35] x86/apic: Read and write LVT* APIC registers from HV for SAVIC guests Date: Wed, 9 Jul 2025 09:02:37 +0530 Message-ID: <20250709033242.267892-31-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4E:EE_|LV3PR12MB9355:EE_ X-MS-Office365-Filtering-Correlation-Id: 67021ec0-e05d-4eb2-3fb8-08ddbe9a9d9f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|82310400026|36860700013|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?K+/a/ANKJkxz7ujuUw2gcaJLPAQPJPZ+BlwKkby1jptJdgBHl2cbX2RpbFXB?= =?us-ascii?Q?ZB0Id+FNvUWxGUMfJrUpncXEtl87DK+T9vaoNwogHkw9e6BYTzxOmnFYmXRk?= =?us-ascii?Q?droHZNU5styFxXOcuVT1cL4vDy6o9PYiuppN3wmQvYiHbf5ikId3czkdfpFi?= =?us-ascii?Q?F7FyP+Gcz0RDwYedN5XVqDj7w2hhVsCy4+lvA1oMXnu5qTKiGI3/xG2wxujF?= =?us-ascii?Q?cDL7kkXherj8S40vEramEZnjeAVGfQJIBR/TJIzi0CMbPEZICSlvH4iCB319?= =?us-ascii?Q?SH6PckiNKCdG+/Qm1L66nL6Tx2faZ/H+Suh7uX3dmxG9Ap8V60UJs9rIyEdT?= =?us-ascii?Q?8Oc1W8/tvbl48QnKB2c2UHh9gJuA81c//Wgg7Df7YcRnl42+BaP8x8wTgKIB?= =?us-ascii?Q?77D8Gg+qbXp/B3bB+m2itI3OpoACrtUEhEvNFnIlQhy71dP57H/lshxraZ1n?= =?us-ascii?Q?ZFb86huqT1RT2i/DoyUrrrQuhwJ2njSuNJY9xwRtvagKgZXlwGs2LzpPyhv8?= =?us-ascii?Q?T3Xdie1BxqKvRUBEZdvnqwV1+h8cRjl4izy9uFarUIEEiWx1E/CmZ0KWa9Ed?= =?us-ascii?Q?c9tKK/v2ULm8GxHNlgAvzHHZIyF4/+I3ZJxQbJpz2PReIhly0ZKRszxl+beL?= =?us-ascii?Q?CfSR6JFEy/chlwAbe429byJj5GKaMdItoYD75EBfGEUXofnEEDUsF1RnnA+5?= =?us-ascii?Q?P7I5BPfzZRVqKJ7nNWUdRJcknMt3VnHLu5eqnSneiYojFxbfP1GEMsNqsgIL?= =?us-ascii?Q?Nqd5K6/Y39LoOrKNXgjwRZgQYVf9R0g7jMViIevYhCovY8yjdWT9K+sdPwXW?= =?us-ascii?Q?G0VxfjR23ZKrYu7yuDbYUO1dRh0kGkt5BGd8A3r52OzUamWNS1Wl/r1fnNhL?= =?us-ascii?Q?eTZkRDpuPFikszNhCFAzUcYq23lvHxerJlZ8KYQo8ZmA+JNFU8T+E4QtpqKk?= =?us-ascii?Q?oR2AKsePmtsmSSzrxKwu5eTPYLhYJ5I5vTltLZxxU834006CFd92PRWGBHcP?= =?us-ascii?Q?025l0Pkyw2ZG1FS1hg3PA5c/2zZKqvfzGbWltF01kkyU6mN7kJwQnlFCzfLZ?= =?us-ascii?Q?/+jVPbaVCQ0qbdyrDxX36viK6sDqTl764rHCcIH3UlsSVm47BGb/2wgtV3Ah?= =?us-ascii?Q?jM2RgTGne3v73BEoqm42ORZgoLs4pLQ7cTsTvyCmXni1xy2RTE+RmWzlpidn?= =?us-ascii?Q?EvDHQgEua5n5gF3Mu/eaRggy8orpTZAi2Nzxr4ZfQuhQ7Do0wpKY2SjawDFx?= =?us-ascii?Q?JAZKM4BQzAo6mLEg4Gk6uREotc5V8Mxr3aGyEyk339kLG7J72K+6JFabpocP?= =?us-ascii?Q?JvwZqFIOLddoCY96qIIVmkHRpeW6tdnuWV2BLxgDbU1xU//Vlzw47mXhi3WO?= =?us-ascii?Q?xO066vP+TQTLUC/LhZoBaTJZEyjjFw4n+XkZoeZNsW7VsWwjZCHgz5UqYZWX?= =?us-ascii?Q?VBNfbt/YUL+yYlYPyRyrQxh3agI3+VPMfC+4khWdP+XyXhQOwxJrxNedtO80?= =?us-ascii?Q?YB4VNnArh6fQT3wdGfZITdMAalOsxh3ezubw?= 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)(36860700013)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:42:23.4739 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 67021ec0-e05d-4eb2-3fb8-08ddbe9a9d9f 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: BL6PEPF0001AB4E.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV3PR12MB9355 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 583b57636f21..0fecc295874e 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -69,6 +69,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: @@ -78,11 +83,6 @@ static u32 savic_read(u32 reg) case APIC_LDR: case APIC_SPIV: case APIC_ESR: - case APIC_LVTTHMR: - case APIC_LVTPC: - case APIC_LVT0: - case APIC_LVT1: - case APIC_LVTERR: case APIC_EFEAT: case APIC_ECTRL: case APIC_SEOI: @@ -204,18 +204,18 @@ 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_LVTTHMR: - case APIC_LVTPC: - case APIC_LVTERR: case APIC_ECTRL: case APIC_SEOI: case APIC_IER: --=20 2.34.1 From nobody Tue Oct 7 14:45:08 2025 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2058.outbound.protection.outlook.com [40.107.223.58]) (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 F35111FDA8C; Wed, 9 Jul 2025 03:42:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032569; cv=fail; b=l5OA5akJ3ODSdqu+ne14pbPdTm7O+J148xGzbaz2w6h/ZxlNXNLLERIZE2eoGE/BNK5RyuZpu8QFAalMqHuTzmtO1xnbB9uKMA6DftzbE7JardlGdimMg2dIomRAsiZzXhchuR8LsCzGjHRBhOn24BqwVUZ8+GkV9Gc1n6t4Tu0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032569; c=relaxed/simple; bh=ZCvY98KN6J+89bbIcQ6nxuphiv057a4MfEzKd1qKonQ=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Zwkw2C52Wg/98WTR4nNCnfRcVImZ8LUwGLfCagCS1kxnXuJTTzOcJj07MaCrzIJUx45gJODGHWjuhmnSzDIFhYc8rOcb4GuzGsw6pEBC/OgnxIgLTDd8fQFxIF1KquoryW8ZNNZj6NPsy8xAX86WlHprd3GPqGsGx51HoEfe1rA= 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=GKc8XsYp; arc=fail smtp.client-ip=40.107.223.58 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="GKc8XsYp" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MbosEOhk+FqjiSLsk2pbOXQlJMKv8ihz6Vd6XRnj3XrlNSb/H1n2IR7xqB7rJqsAINaoNLsikaEwX9I/t64QEru9uviv+IyDd24X+ylbPzt8nHM74djIVQMQHvGUBXBU+NAMcXeo1K49PGwl7aocy06DefqV4Xg2G5LQ3LdXPdTSraXhHmMPOKTa04dsmH4HjOFKT4jwmcD7TQGfn6Mdb2mLLTQgDQwBk71iRbeEYuRCBIWfv6tgr3bivwEjhh7RVSDlm/KIVv4SxawtZrGdSns34+8BbRk5+VzC90HZZxITMLTvDKWvBr1rTvl5vC2bQESIloC6XkoNeDHExEAmBg== 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=qNvtuNS7zsax2c0byfUGl/QnHQoNx1FpK9TReb4DC/M=; b=Sv4OWQb4EiL9pvJDeEvHNsbsiDYlX3F8q1zQ1r6Ql6EZurYrbmTytNp52OqR+Ei4QY2D5rla7igasrN67l3j1v1xQqRp40HDWBICyqe/zar6sDbuJLV5zVob9oITWydBUmouqJWJ/+5zGdUKoAxSPRbB70bMXWZbk4227IuzXqzSpJV53lmqc+iECNSjqVeMNvdppNyyPYFm0ZHM5qq+ZbD5msz6jzOFBalndhss5vayr0rve6gXFXKA9ShH4yR+jmhc3xsrAANkkOmdj9eRtVhWGxL+gnEZykJgz0NZDhTliZy6rYmNvDdCSMc4d/vNBqZH0SMmCSDrqHTDmOSKBQ== 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=qNvtuNS7zsax2c0byfUGl/QnHQoNx1FpK9TReb4DC/M=; b=GKc8XsYpnyD9zMvOt5vCyWGKfk53UcURuPx1LhKXb1+EFxn+Mo8SLcTekjB7zzslQZc8rmT6qDKgamAEx99+S+DU7lczeyhJPjRVxAOoJsY8DCeytKuHNQ00XRCJBMRUMiK3HPbNll1U+b3DBucnpYIUqtnyOi/dFiRKZm6wNIQ= Received: from BN9PR03CA0391.namprd03.prod.outlook.com (2603:10b6:408:111::6) by DS5PPF78FC67EBA.namprd12.prod.outlook.com (2603:10b6:f:fc00::655) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.26; Wed, 9 Jul 2025 03:42:42 +0000 Received: from BL6PEPF0001AB4C.namprd04.prod.outlook.com (2603:10b6:408:111:cafe::35) by BN9PR03CA0391.outlook.office365.com (2603:10b6:408:111::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:42:42 +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 BL6PEPF0001AB4C.mail.protection.outlook.com (10.167.242.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8901.15 via Frontend Transport; Wed, 9 Jul 2025 03:42:42 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:42:36 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 31/35] x86/apic: Handle EOI writes for Secure AVIC guests Date: Wed, 9 Jul 2025 09:02:38 +0530 Message-ID: <20250709033242.267892-32-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: BL6PEPF0001AB4C:EE_|DS5PPF78FC67EBA:EE_ X-MS-Office365-Filtering-Correlation-Id: fa048399-5285-4a87-6dcb-08ddbe9aa8c8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|376014|36860700013|7416014|1800799024; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?S0rV95lVsl91e92JET64YpBieoNVE1Z8TEYeQwJAfbO2dksySm7ztYwZmTSF?= =?us-ascii?Q?QqTI7Je+YDpzpMD4/GRu1H91bCXMplq9TDTTYq3pgAj7Yxk+6a+gqBZk1iMF?= =?us-ascii?Q?p3hBh+xOMegnd3tHx13NNzXMdbVOMtHZ6UebIskV1QvyQKicr9fM8Bpeqzb4?= =?us-ascii?Q?qnl/5Lx+fGqr+96xknvLYE98AIryrXevx5aRNH9JhH7sGdhWv5CKhVHeyabr?= =?us-ascii?Q?h+nBMpHOkXZMija2Igz7XGtyFWLLKBgPDN9j/Lkc6YZBYNGTsLzCdDEpfjB4?= =?us-ascii?Q?GBG1khbu49ceeS2dMC5LxoU+TSCXCvgSQzIJ+AFX+REk8VQpe1MqYLLfQ6hO?= =?us-ascii?Q?0IF2wP5S66q63LDzbvZt8Wgf+8ybm+vEo+lv0t/DGKxAvH2thbK2mF9kpEVX?= =?us-ascii?Q?CjkltVYFWzlxP1MQWLSGlffGW+lXaT+dRXPxyYELUVPz/scljSita5OlCK2g?= =?us-ascii?Q?yBKIFtoB7BezXQwS0gMXoSQHdQEfhwZ0wWyoTMHx0xTCEsCdkeZZe24siKkG?= =?us-ascii?Q?A+/eCwjTeeScNNpltuvGj1uZy+9sUrepEKNlifd1pl48q6M0U2GYDKw6Uje5?= =?us-ascii?Q?8HpOXXSQf0FP0AYzmID0qVfuSoSBM3zccj9UIe2Zco5/oHCt0FDwNYuJ6E33?= =?us-ascii?Q?JZD92Ju9V7a8RnTa3ckAkHW4LVAvFovmCz+9/EKHCIcOVlVSxtNFLGqsHt/z?= =?us-ascii?Q?yYWK9hSxRcIYPsJ8g7h4FWUXREdmH8va/CsUeDTM+AX7w6fm+ihew1S2Ut96?= =?us-ascii?Q?bI+5dvkWNf6xG91jmnSZPbNlXR37s2Sjf2/jbqppPRAozml8eOyt0qjHKYF1?= =?us-ascii?Q?YXo9y7qGRWcKiHWiIT8NFdvZMPEGSv6zAg1FyYRGb3t8HTGCfM8QsKIXt9CC?= =?us-ascii?Q?iTzAh2GJGwwvBDfr5foiQPgUx2Y3TB6GeoGH/3Jm2eaZzw18Zqr3dvNPKabw?= =?us-ascii?Q?FKywyGvBfkWggBJSvXsp4KUefSJgUqZOXM0Ein69ZWQAqqKxBkAHLhf3om3s?= =?us-ascii?Q?jJ8xYj6cKNEjDodasycHwS4/GbenmoIx27lKYa1QrJTkbT2C+lU7cKln+Ix0?= =?us-ascii?Q?BRnGg6YSfJOTqA31D4UzM0XHUL+pkAYRbRzeTrqbOF1tu8mhQGbG2tCpaA4M?= =?us-ascii?Q?YzqLmF4zIiGhXfKxWrAwagAuEezPjC9qdpMh4VNnuox3Lau2ju4ZN8J+VbnR?= =?us-ascii?Q?JbE8Lo0lI00p1s1naaoLuOpY31USwi7oTPWT7OwzX34ud8FHr1tUwB/wuN0l?= =?us-ascii?Q?lD6qFjmutlGLHkQH8RemIl0ZMPGypF7ZYSyDDK1sBw8j5l21DQM+rdALQgiO?= =?us-ascii?Q?fbZ6qhpEHoA0qpyCk4h4drkuu+sl5y5zSe6FWBzdER6rVn+byB2KpCSVoXLU?= =?us-ascii?Q?k8uyV1goWj9gEO8v+wlwpNoxuqbNzhjbchHEx7hKC0DmHA+naEP9sJ7ynyqU?= =?us-ascii?Q?rw+lS9ylX1ycBEpuqWDZhLjLiSNo9TErnqiLCbCLBrsjCVfBlL+UE8641mpa?= =?us-ascii?Q?ih7uWQBB0fbsP/JYyBTebDouSfWTdh/wfJqh?= 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)(376014)(36860700013)(7416014)(1800799024);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:42:42.1991 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fa048399-5285-4a87-6dcb-08ddbe9aa8c8 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: BL6PEPF0001AB4C.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS5PPF78FC67EBA 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 Reviewed-by: Tianyu Lan --- Changes since v7: - No change. arch/x86/kernel/apic/x2apic_savic.c | 35 ++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/apic/x2apic_savic.c b/arch/x86/kernel/apic/x2a= pic_savic.c index 0fecc295874e..a527d7e4477c 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -300,6 +300,39 @@ static void savic_update_vector(unsigned int cpu, unsi= gned int vector, bool set) update_vector(cpu, SAVIC_ALLOWED_IRR, vector, set); } =20 +static void savic_eoi(void) +{ + unsigned int cpu; + void *bitmap; + int vec; + + cpu =3D raw_smp_processor_id(); + bitmap =3D get_reg_bitmap(cpu, APIC_ISR); + vec =3D apic_find_highest_vector(bitmap); + if (WARN_ONCE(vec =3D=3D -1, "EOI write while no active interrupt in APIC= _ISR")) + return; + + bitmap =3D get_reg_bitmap(cpu, APIC_TMR); + + /* Is level-triggered interrupt? */ + if (apic_test_vector(vec, bitmap)) { + 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 void init_apic_page(struct apic_page *ap) { u32 apic_id; @@ -386,7 +419,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 Tue Oct 7 14:45:08 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2058.outbound.protection.outlook.com [40.107.236.58]) (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 BB5AF1FDE02; Wed, 9 Jul 2025 03:43:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.58 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032588; cv=fail; b=o154qK1bWIaEfotq4eX4fu1F8ix6ZacKZtIqXx9xohC80xS4f5BJ+LweHzigBSN5kYDAlBKIFdtiVm7yd1PCaeRC6iQVASBEr6iQv2ftrLF65O6iTHUt6Ja5KGqbdec2KfypfGrY1akffLMj8oPGLHqgcfdbLwvuhJxORcPsOlc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032588; c=relaxed/simple; bh=koGhlNmKPQdNiwRvOOdFbgm50xsvhUofSh35LDhgtlo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=eUtu3JxIefIVc984vi7vhBuDkRG1bYullBpS6dRkUKWlELRwefOdq442+NHQ+TY2oia6sK6KGUqECR2SqyfsPLS09r8VH5nwU/vS5y6zz+bBp/yNU91j1GPjhZWDVQp/YORXodAO+tGKr6ZLMiccQMK4QeGuF7IUu7HaLkqUisM= 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=TUWB+do2; arc=fail smtp.client-ip=40.107.236.58 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="TUWB+do2" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=zQfDWqEDX21034tCbxheXUDx6xXvu+IJed1C97iF4ZKadkOMCbS/mN/qgYpcbLZo3l9tGNO0Rmy1V9hvNg2vl35XDArx0e8b8mL9RV9pBSJ24gE7UPeX2R5PbxL2tiBbvweoJFMexjB+XtcdOh+ff2DrzWGVDJY5dXGfFezV8ETrhSEr6z7cducqkUCJC2/piEiNlCOM/AZpv7mXCbHZdRM/J+mvxKJkRw9X4U18p3XwQK7JvRjzNAkrf65nUklrbmPs/bfuKJ9PJW5GVZRxGbHE/WpUg+efvEUcywwEveL3uFy+LxxV6YHyf+N/G+mQ3K575gthGX2OIPMhqsvYVA== 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=CmHFKfuK0gFFYIlTtddi6WahMbJVA0fHjSacG9nf1EI=; b=uLNrscpG2rN36MDf12qL7q2COUB0dy3ZZhU26ewmlAsk/uYqJp5vcPnk3oasIz/m1KSVNjz3SiDhUHWrLekXg+98N04ZNRMwHYrG7/NntAKLLxOTwRDaPosB9O4kjl92l+7zsy4KsaR1S+9LIowCzcIcOTUU1nTALyyxJkhIj/SlbAhQuxlMmM4Hb4K4Bl1igcdtJEDS2apboIVS0FnUqBr2O/Bbvpy33mqsK1hp4C2Pka5Qi/Brf3TCJ7DBwTwH9mzfPoUGBlDAb6eLT8saKvnI5+CLRZgNzyfdLYATCGPdqA2Gpeg3xe1VP6f18eYP7WhcdM+cEqUb3LA7nC7LvQ== 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=CmHFKfuK0gFFYIlTtddi6WahMbJVA0fHjSacG9nf1EI=; b=TUWB+do2YXgu6Wc55hnK7jXSz2x++e5IKlWO/6MtHwQCjoJtGM2HkFvVobtIrvuFfizZ7kzG1/W3Guq6XNVTNWP/jqot/y/qhDmuQO935SjYAGgS1LRLFAIs4/8SRHImeNYScjj5HNp+74XBuEZjYEPY2F9ftphYkI6e0t3KjEQ= Received: from PH7P220CA0094.NAMP220.PROD.OUTLOOK.COM (2603:10b6:510:32d::30) by SA1PR12MB6946.namprd12.prod.outlook.com (2603:10b6:806:24d::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.17; Wed, 9 Jul 2025 03:43:01 +0000 Received: from CO1PEPF000044F9.namprd21.prod.outlook.com (2603:10b6:510:32d:cafe::67) by PH7P220CA0094.outlook.office365.com (2603:10b6:510:32d::30) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:43:00 +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 CO1PEPF000044F9.mail.protection.outlook.com (10.167.241.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8943.1 via Frontend Transport; Wed, 9 Jul 2025 03:43:00 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:42:54 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 32/35] x86/apic: Add kexec support for Secure AVIC Date: Wed, 9 Jul 2025 09:02:39 +0530 Message-ID: <20250709033242.267892-33-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CO1PEPF000044F9:EE_|SA1PR12MB6946:EE_ X-MS-Office365-Filtering-Correlation-Id: 4c17b5d4-150d-4218-bde8-08ddbe9ab3d9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|1800799024|36860700013|376014|82310400026; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?DaI+RIyVMg+hU60wY9RpgPaQSyliYVMVD8RntfJbVvR96MaNJMjw6vRgWsAU?= =?us-ascii?Q?byaz6qMNBsXkwn9DK8C5XbIQ03/I8DJLt8+3vLZQ6YPloNFrPahkAr6kzJIq?= =?us-ascii?Q?MtkkIMzV3qEwdZnvES1AC5A4jcOsM2EswtYMWlsLiJzFd4Oz5xandHh8Ka1o?= =?us-ascii?Q?2TG1mIhGUvS1OZ89SM47zgSaMabKsJqJ4xYfFs6sPYmMKU1OjKK3jcqATl20?= =?us-ascii?Q?2yHutE9geMT9BYKtozYnzJt5o+vNvROzzAdJLwjnnwwhtxQdS1K3fH93q2GD?= =?us-ascii?Q?wnYb38B3XVULzp6DF9WIwAmCRJbfeU3WJejRcQdP8dcTYpEkv2VEbhxFeNLv?= =?us-ascii?Q?suLtDHRTaI32YudkUbhlFcoHLcX5tBgNzvbo91xdXMrT6AlzYZHkS9aEG2km?= =?us-ascii?Q?wWJ5ZxOWfd6K9NWqSgepRQd2h4C9q5omLcgIIvC6rW8vCj8dk3Z/5y6rXJDr?= =?us-ascii?Q?5PgubSn65T4/LSSPjhscSCx3TTDSVmIFJxoS8N4ibZDhJOehflDkaC1/JozO?= =?us-ascii?Q?5Izkk7vw21rXnDzVYU5JeGMa0NTchj12XaIct/O6PAWnyqXW2GLRVu27LttN?= =?us-ascii?Q?SIhMN7KT9dX/PNuWJQNGPzPbPLuofhqqMU04PSZZwj2wFz7K6WL3DHj3Z5MN?= =?us-ascii?Q?cstXlcFHSb8IAwzJtgKdxuTZKw7eR3Rh67XdIa3y4DiLEKjz2K3fY1W6ZQxY?= =?us-ascii?Q?CjnBdXkSQEQXk3ZewCvaZgUoSIg2BP2u5HfR8oCa2k4jJQ0k/SEEcrTajcMw?= =?us-ascii?Q?dLYe/fFWGPq6/tKRyG2KlZEa34p+qpJ/jhmV10vwj7e8dGnmmzt13v4++a0m?= =?us-ascii?Q?Pire6DIC9JsIiMuRFZkwP7Q+3qhdlFcclmE4CJktcIg1JZ39RlC9vNxSHqnX?= =?us-ascii?Q?GMXzYmofI6f3i3Pl5DH15ZmRx8ue6ProJQJUOZ4RMGIm2gFyCsH7seT4mDfr?= =?us-ascii?Q?ZRg8KkcYX8YJb25AlF91sQob739CmbBmqAwRsWiXJfWxmMYbt5R8DQ3e7kVF?= =?us-ascii?Q?Y5T2jTYZk3cN0W9CJDeYXSe7iL6sjjA8wwLCKKiKLo9vrMIfmYEVShP2xSY+?= =?us-ascii?Q?lkoH7t8nzOD0ep6esofuvVITsTrCUiOvqA2F6dKITGNvsFYDExLNlOFsAAJs?= =?us-ascii?Q?1FycaN6CYvYt4MdS8go+ek/6+tdZzdY5IlKT6uL6l4f5cUkz871ZOd/hnfud?= =?us-ascii?Q?/8KmH2zXPQ90aWm5z5b6M9w96Rnj7v68oWOW/AoY/GvVbZ1p0tZVO1XnU5pW?= =?us-ascii?Q?xMyxLBJyf7J5urJLueyypWSYyKMdw2IRYDux7YKRqmBiQRnrICxp/zyEf9aq?= =?us-ascii?Q?0P7fBOPuoA1TC3nmlDVDA4i2kCn1yuMYbC6OOJu/gGevJAT7Q/tWxoLrcmwb?= =?us-ascii?Q?GA7pyOTOuzp7Pqmeu8YIKj6FjTV9HACtPwgf4v7qsUWgOp+SSAikFa9aEAXT?= =?us-ascii?Q?lnIwovq4ck8BsaYTFCfLJTSzWyiLgN3gpZjOmaGHGKu++faEibV3gI6I/wll?= =?us-ascii?Q?LumJl9QbVMC7uEpotr9COUTAoufzysUHNtd3?= 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)(1800799024)(36860700013)(376014)(82310400026);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:43:00.6758 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4c17b5d4-150d-4218-bde8-08ddbe9ab3d9 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: CO1PEPF000044F9.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB6946 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 v7: - 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 d7c53b3eeaa9..da7fc7913a00 100644 --- a/arch/x86/coco/sev/core.c +++ b/arch/x86/coco/sev/core.c @@ -1164,6 +1164,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 9c74d1faf3e0..e8a32a3eea86 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 d10ca66aa684..35877c32b528 100644 --- a/arch/x86/include/asm/sev.h +++ b/arch/x86/include/asm/sev.h @@ -534,6 +534,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 @@ -609,6 +610,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 69b1084da8f4..badd6a42bced 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -1170,6 +1170,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 a527d7e4477c..417ea676c37e 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -345,6 +345,13 @@ static void init_apic_page(struct apic_page *ap) apic_set_reg(ap, 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; @@ -395,6 +402,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 Tue Oct 7 14:45:08 2025 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2068.outbound.protection.outlook.com [40.107.243.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 003AE1FAC48; Wed, 9 Jul 2025 03:43:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.243.68 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032605; cv=fail; b=jjSZnYLteUiuK1Jdei2qURzcN5DKlbLNP75V6daJW6MSxDUwyO6xVC9lO2qNTmPJmBHlVUgXsGPhfN/KHos7PXW1Vmu427a33VpjnUrz57it1/JXb1r2F5vHomja028JONNsNSMzeldWEg+GVOgcsE8lTP/i8JQbUEQn+mIMNXc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032605; c=relaxed/simple; bh=08LTUfimBEw5QoC1ubuVgnXNsmLVJmaV4RRGuUGoTxk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lnJu3Qq8DjEjrn+hdWFyjO35wiqOipKM7OGsE2zllUGP+0hUzL6/u+BHMQRzrEMvLvuzklqYGem+qdatDOm8JM/c0zZyxFW7rOguzh/iUW6ryaExJ3gYhpCY2vh1JI5N+Ozeb9ivqPhbaLKEe4VSSCDWtq6scFVqRSnXuGpwf/Y= 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=nvZGH6VC; arc=fail smtp.client-ip=40.107.243.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="nvZGH6VC" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nWy7xrM2yFHzC/UHJG3evti6AOQTuBt4h3UTDjF0ta6b2DMZbMJCeAHAod3ghi5xcqzzuJyPoodeJ6g7/YkPHiwMOKtXARKJXyBUCxktDM7OII02NiSMGkxtgmDOc52fGe4Kwc5Gqv7XIPyrBMbt637GSOl8ZiqhAXqli5c9xsB+v/suqNdfoipKzw9kXGtIk6lPNCSsUpgOMkrZuv3m/OmKoencgCttWnqCm/Ox+KLRf2A378kjd4SOGfBjZqIuxDLBSf+oXDXkKYgjmKvbknLiynfyzY1lION0iqlAmiOJwaVeMHQU3HE23raQJtwSDB02PH3zA6PIxW2NpGnEWQ== 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=ZIwXS8kRBTCFZSPSTlxpWqe8eSQZdHfgUM3zuEzzFEU=; b=lzCDK7S5z2+PHna1nA4ER7n2n7OHHdA6GWvVboLa6f2//0dFQB5xNMlL/TiNk7ltZuVSMliM6u3bJ/i/3bXgBZSjJ/NfWFCFFDuryxZeApK67IGTHUdWQKix30M+GeWmbDcGXJ9IUSesmZs5dJsVuOr6QV3sAq/L7g7/NuGjJB16xb9VCmuskVVs63KMrunbNmxCpotyNHm+xqFB5OisEKWA42W0FnTnCijR0fJge6YQeBY8/3LiGv9b64cZSkvNivPkUjjYhqbSRw+w2WlmTpjU38lUSRc8nwTInRqB1++DepbhTmSLUjFakNfWgQHo5DzenSbKzLr8RD+Qyk8nUw== 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=ZIwXS8kRBTCFZSPSTlxpWqe8eSQZdHfgUM3zuEzzFEU=; b=nvZGH6VCMTmMRZOkh8+An18hRs42SKsKSOFJS+/OItfrwhhP09EVoqynLp17MDThqOoKaFbd1dEj42uHyl0TkX0ZgKqtjcspCqEQmzHPTBI75+gqgkfc1Cqyhp+DJ1+vzjplaML+8AgHFup9v5VzkiQ4WVnUsOHv6fhqcYFaS2A= Received: from MW4PR04CA0381.namprd04.prod.outlook.com (2603:10b6:303:81::26) by DM4PR12MB6208.namprd12.prod.outlook.com (2603:10b6:8:a5::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.25; Wed, 9 Jul 2025 03:43:19 +0000 Received: from CO1PEPF000044FD.namprd21.prod.outlook.com (2603:10b6:303:81:cafe::63) by MW4PR04CA0381.outlook.office365.com (2603:10b6:303:81::26) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.22 via Frontend Transport; Wed, 9 Jul 2025 03:43:19 +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 CO1PEPF000044FD.mail.protection.outlook.com (10.167.241.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8943.1 via Frontend Transport; Wed, 9 Jul 2025 03:43:19 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:43:12 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 33/35] x86/apic: Enable Secure AVIC in Control MSR Date: Wed, 9 Jul 2025 09:02:40 +0530 Message-ID: <20250709033242.267892-34-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CO1PEPF000044FD:EE_|DM4PR12MB6208:EE_ X-MS-Office365-Filtering-Correlation-Id: bee324a2-8ba4-4ae7-f354-08ddbe9abf0f X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|376014|7416014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?Ml8WUVR6vIU7iW4up88X5ff5Wq1npxDRUvoHVLBehE3Zm/atYYs5rVz528Zn?= =?us-ascii?Q?Doz1wbKOc6snixcBoDZKCfwMC7FXGz0HmC3Sy86dTC077TLPARHbmsLAX5nQ?= =?us-ascii?Q?DOTWPSODH4aWnszW4v9fKpVuPoRqoRWXmWCGd/JBJDXdjVjFzf3MwnYFZe9g?= =?us-ascii?Q?nRSBolcWJDuhjZWBRxS/7ra7Mo9QkFPOlEiJhYvrC6N0GeXIUxFYquDEM9lT?= =?us-ascii?Q?AeAzBtiwi06vs4Wv6iKuncr1Ar8Z5pznb62NLevzJN/KZwg52dZswbB9jZtU?= =?us-ascii?Q?TB55/VMa3sULeHCAt8bgz3mdO9mLuax80blNs/R6KbAJfIJ9pXZqYLbNb3AA?= =?us-ascii?Q?BDXUGD8sso7vxhyj9qZTclyRm0PWIvA3cqoG7ke8mKzyx4UvI2QN8I9vXi7Q?= =?us-ascii?Q?6kWfPw5qUPyF1xdHwWEcBZJkNhYgA43hW/MQZX4hHWv0d0bewvV8H3d7fz1S?= =?us-ascii?Q?yYnl/80lnUzuGEE2MZt+adHU35KkjjDiI5sWm08Hev0x9TGg+ZueRJogAEoe?= =?us-ascii?Q?n4F2KoB+CSvZDdTn8Nvo/mH2QZeSV1Pu4w+BBV3ogLoAbLBkaDq9lsFJXJOG?= =?us-ascii?Q?JQKQ+XJCFyW4omNhpSjqFddPyoP70sLXsDnD6ndXbMGsCm4tS1VlVEYYaKli?= =?us-ascii?Q?ENrphOUgmtziH6w24S14ICoczTFvR4EZEpY0KKtvjixwW4ZdZGU4tVN+0G1k?= =?us-ascii?Q?GvaIXPTz43QhQawuhKtqUeZ3uLp5Xi8yasHDzU/wI3qwKRtlnxJgWlBnm1Rp?= =?us-ascii?Q?1eDHXcg5cTO06iGisYx+EnTLvSdbUc3P5immOJZJh4ncww3BaDH9c9owoCZO?= =?us-ascii?Q?W+6VZ4oSw+Uxk0kjr0C/WDm/C7oLO08iCKI7mgOXDQNoM399JY7F+FJNdnOy?= =?us-ascii?Q?ubvMx8OQcHz17CM/8Y72vXBousdHp7fofZnLJw6nfajprvz7pp4mCORwnxev?= =?us-ascii?Q?ESEAKH9QIGMq3Y4i4S9RweCuKlHAp8yh2sG0ZZ8eaTTIyOQeqElcLoyZ2m4U?= =?us-ascii?Q?VBI8i/rw1hI9GAHYjuNro8m4/JuV70H6fC5JznrHLkWAv52c2OQ4GJfhDvFg?= =?us-ascii?Q?JCppMclDGtalPuuZiqnxBcyQhZwZq2B/1FHnMAxpN8n5ckAOR8XXT9BEZ94P?= =?us-ascii?Q?Wnl1AxX26xMokyGRjuDCIqtbCCQxjLeX6XHXw6V5AGVo+U2U9V9I7gSDvh4A?= =?us-ascii?Q?Qy9hwPJQhw4ioGfI2OvpoLhcf+qTeuv1sN5kzltMQZsnasyltTC81BDxzyCO?= =?us-ascii?Q?ZPRyFXQBC5NuEdgNPKKW4lEXCSfr/+fQ3rogL3icZcgismm4r/SpSVaXTA3H?= =?us-ascii?Q?lwyfYxbFKko55hMw+Yw7Gq4J5kOGNyi37yIrAF08qqGtv7DmA26NmJyKpOkI?= =?us-ascii?Q?EldzfViomsyZcIrN5oyb4u9VMzK19hlYU15R+JD+yhZHnCd/P2j1zH4wdCfK?= =?us-ascii?Q?6Jovg/EZobER4xajrcLLr2eBbMiOfy4QDNS4wXPfEfJzsW7KXd4jo8Gfm/J6?= =?us-ascii?Q?FgqqAsHpTV2kJPROm/H2Lmstc/YoTDWviclJ?= 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)(1800799024)(82310400026)(376014)(7416014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:43:19.4680 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bee324a2-8ba4-4ae7-f354-08ddbe9abf0f 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: CO1PEPF000044FD.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6208 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 a3a2b99d5745..9561184ff989 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h @@ -703,6 +703,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 417ea676c37e..2849f2354bf9 100644 --- a/arch/x86/kernel/apic/x2apic_savic.c +++ b/arch/x86/kernel/apic/x2apic_savic.c @@ -375,7 +375,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 Tue Oct 7 14:45:08 2025 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2048.outbound.protection.outlook.com [40.107.236.48]) (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 03D151FAC37; Wed, 9 Jul 2025 03:43:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032623; cv=fail; b=ZCL38F6SHBACGRUYTYF3xj6Yrk8dEBfztlWqarzejYSXxOrlAXGv3cjxerfh/WzHyoJGYsU1OhbF07eXeLwhYwOK4w6jhPrK12z+uobnuvwf3HA8Ptl5zzQSColt/DsQJS39n7nXODCIi7KBYhyHEqKmfRkXqmhi+9dyH7Lq4+g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032623; c=relaxed/simple; bh=s6OMQZ87PueDe1coDI8NLNHM/CPl8NraH6a9eHXlVXk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=od7B7THK99EubAZpXLc/swP1WAAseQNul7qcSVMmd7ofydM+M9HhnyYxCzShdJkAn/HyaKq+C+0EDTQgbnKcngrQUWa+lQa4hLF1fBxO9zFVPOsA4ezO4tzHuZzMPh98A0AkMcCPl3h/eOSWji0lluKGfV2H9qeHoMKwVJ2ETFY= 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=5JXeQjRj; arc=fail smtp.client-ip=40.107.236.48 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="5JXeQjRj" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=HrSTIUJkZFGLIxN/was1Ql+Dbq+1vXA/N+3MUiiy+inunHNecHYj92t786XfXqpV1hQMx/UnerU1ImAhnMLWptIuliUMTLgbut1k84R1gEd53VU1aKlRjRL7fDOtZrhw0jTxbB3AReqYNV5/YWq17vxJ1MONt3wfIJzVwwmWxKECuk0GXMvaNgR5FADR9GMBiyXcC//7i6JcX40uZpDmtnyBhXMbySZMjS2RpEvDjVUP11aK694xyLANnFvxk8FykNFAze1Bb92AYAtBIVIjV2Yy1ttdKHvlyk+LdWFJFJmbQsSs1IcD7ZUb+jFYMBLjrmWFrsd2YLQ+PIx6KkxqVA== 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=bMsj+dHhVuj0gOzk5NPK+zuwzdD9k9HxlS0SBwMuNxk=; b=DO5ZA4d9ZW1tLu20ov6IKgAdYJP5PXpQZMxgAcbQlphl1ARj/u6Pj3x9JyYAn59JjfWaT7suUOnAMdur0yKyvZxhDRaNWsWmtHtPh+jcs+R8X5t6BXH7O/ld8ABZyXxKavnBqx8QY6Zqz0i+ccW/Ix7lOv2eywU/N1cpEr5gE6YH1FYDfhfEojkr7csA54W9lFtar8ZUBqGNarPGujyW6W0Xu8fJ1a/L1pPdX7x64FoeoprXPW303yKm2SSANcxEJVi4VjvDMO0AEE8QQ8KMVPWWgB1wlKM3i99RuKdaTwq2E2FlGwTaPxaLG5yAIyfi2YjSEQyT1+qrbessmdas2A== 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=bMsj+dHhVuj0gOzk5NPK+zuwzdD9k9HxlS0SBwMuNxk=; b=5JXeQjRjdaFu/Xq52ZeuNyAmoqblHHBOSKZ/tvkXIPJ03zADQZ0YM+8R4jlcQP2yFIWOs3X8wozAzYmM9Zw+3XdzHtC1Wzz7wGOTGKwNYWd8QVAPYh0b6u43yVfPsaYX0FWHtIkQGgtzqR0sDvVlZ+BSftPH0fPE0SOPTv67m7E= Received: from PH7PR17CA0057.namprd17.prod.outlook.com (2603:10b6:510:325::6) by DM4PR12MB6010.namprd12.prod.outlook.com (2603:10b6:8:6a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8880.24; Wed, 9 Jul 2025 03:43:38 +0000 Received: from CO1PEPF000044F8.namprd21.prod.outlook.com (2603:10b6:510:325:cafe::46) by PH7PR17CA0057.outlook.office365.com (2603:10b6:510:325::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:43:37 +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 CO1PEPF000044F8.mail.protection.outlook.com (10.167.241.198) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8943.1 via Frontend Transport; Wed, 9 Jul 2025 03:43:37 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:43:31 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 34/35] x86/sev: Prevent SECURE_AVIC_CONTROL MSR interception for Secure AVIC guests Date: Wed, 9 Jul 2025 09:02:41 +0530 Message-ID: <20250709033242.267892-35-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CO1PEPF000044F8:EE_|DM4PR12MB6010:EE_ X-MS-Office365-Filtering-Correlation-Id: 237da78b-5c8d-4bdc-ee57-08ddbe9ac9b8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700013|1800799024|82310400026|7416014|376014; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?AKFBFWIfaU/8x/Aud+BgSZrii1EopfOl/+YuqKLat1lWc6HBzYOnoxFo8sU+?= =?us-ascii?Q?V4WnU3O6dkRBKyiyAP783iN/uQP2mUk/vIl3qHx4925jpPN2KZEvnnvpQXJl?= =?us-ascii?Q?HcmCxSFXMoOPUVxToVHOLUpXxib5S3LPdZObC10ljpVM+JWE+YiqNtYWhSWv?= =?us-ascii?Q?fHhYEvsP2hoOsfi6U4v04bZpYLp6ynYKuqJpWMuB60d35vOLlTncEsyfeXU6?= =?us-ascii?Q?spy7tjTpQ+IcMg/ujGoXS9eU9lMAVTRjLqPK+lqVTCxVBSZvUkFnBLOc6QtK?= =?us-ascii?Q?34lmC99gR1nDivWrHzI2Mvg1mTw0pjqHIMnboVaGjoUOuN7MHfWyvAQ4Bybc?= =?us-ascii?Q?JrzyI9yn2ok9/omApt0CHwJCbtGhvNM13usE6dUIJh2cSpnp8ES9jQPUijUe?= =?us-ascii?Q?pqE9DoCS7IWE9hAdv1pty9ekmkoMZlhvCqE9hJkkSJw8LW9yk/f7XpjnKAVn?= =?us-ascii?Q?hZpWtZSJojCZG9c8Gk8aruHZn+irCThnpReyCfERgz6Du0wPMa16Hpml2hAm?= =?us-ascii?Q?kuv9SksPGvzGzbvwB1KaK6wtoAN/42v+pJ4MuYdrf3qB68/r57Qt29cZVYcP?= =?us-ascii?Q?Ox5LZ4QbXynC2hrqz+hoT6PuxaxaXFIBQZ5vOlDxDV+RAi6jtpZx27Kf6xIK?= =?us-ascii?Q?wVRJ4qMayK3RjU7E1MBhwwJ0meLStsMy2PeSKBFaLkQ6XEnFmkVKD/UYnPd+?= =?us-ascii?Q?IzPBPI08fINEOZ+TVqsrpqWLuFln+kF8SMwJ+G5Hfs68ZY0FmAHB6cWMQKmZ?= =?us-ascii?Q?ZtEdzOkMxpR7KrntuG1D+FrYO8O4WSd2RxHSZ4/k/00UEREugUiFyqV3kZd+?= =?us-ascii?Q?QnAnLGHYeNvBlq06FFIzbujkCzWEf9zeW4cKYaA6NSrV26WLzRr6RXg0p5yo?= =?us-ascii?Q?yhHnbzaPMWBgVzYFsJ6e9JNX671j3HQT0tCrrvq/yhbuJfvypUyAKRzg/eb4?= =?us-ascii?Q?0PZOOyNB47LKybYlkpfJWaaKZXj2QZBXmfgW24rtigAvmyZv2Lm/TY3o6T5Y?= =?us-ascii?Q?HKLz8/AqijgPJKChRmrnFeItap7Qj84v8jFov7/XY6luM8B4P6QpjismxOtE?= =?us-ascii?Q?LuaMU3zJSxbY4AhyAsg560WrUH5j7KZxgwpJBc+R/eITbf8YsfS0u31OvxVB?= =?us-ascii?Q?eu1hvivFQ41+CUTJ+wKxuQikwXoD3OuYLSyXrithzfRQyMyBzteSxZkhZpOd?= =?us-ascii?Q?qFOQxT5c1XAPjgnLNyqW65jlv/iqzJDLY1Tez4r4r8gAMZKkTMIzKKvi05oZ?= =?us-ascii?Q?bsWf5lQUbb1GQp7H6kuoWzYBUsjhDq5cJJYNdJnr+qvWbzoZvVZZKXOerC+J?= =?us-ascii?Q?looLLvqWF7oKphV2LtkRPJYS5+6B/aQAkVKElpgl0+2uTb0ZXvP9nvv8lhSn?= =?us-ascii?Q?woATQAGRYm7dtiSHDnD3Vv9V5VNEwmgAFcYTjdiHfmNyqHKrM3dQ709EJv7Q?= =?us-ascii?Q?H5MGPjboCB4SQCyiPnqbgfRAUnooNRvFvZcCCiQWB4heY2o39QZ1NwwrRCcu?= =?us-ascii?Q?gtFShapynRklhbTnpZn1h51ZNUKaPDW1hDUv?= 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)(1800799024)(82310400026)(7416014)(376014);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:43:37.3722 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 237da78b-5c8d-4bdc-ee57-08ddbe9ac9b8 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: CO1PEPF000044F8.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB6010 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. Reviewed-by: Tianyu Lan Signed-off-by: Neeraj Upadhyay --- Changes since v7: - No change. arch/x86/coco/sev/vc-handle.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/x86/coco/sev/vc-handle.c b/arch/x86/coco/sev/vc-handle.c index fc770cc9117d..e856a5e18670 100644 --- a/arch/x86/coco/sev/vc-handle.c +++ b/arch/x86/coco/sev/vc-handle.c @@ -414,6 +414,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 Tue Oct 7 14:45:08 2025 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2063.outbound.protection.outlook.com [40.107.220.63]) (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 8E2101FBCB1; Wed, 9 Jul 2025 03:43:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032640; cv=fail; b=EanWtJktshe7ZXQumqeX2FRk6hFY/4IurnP59d6AGMfx7vBdyhA5u4N1g7cYf1gqfcx7QOR4mNjdcCnZ6gzxjFIVRFAwpxr5cfwevHRc+DueyKR1s82bqn+KqyuPu/o4/k/5LunttNFoE1hlu6xX91V/AwQTVKqgUhrzPD9/UkU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752032640; c=relaxed/simple; bh=dcUOdwXyQpIrbncpp0Ry+CPSdeqDiUPWcIhGMqdjeVo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=tf+LzoTC2rf70Di5Pnkdnab8NmqaDYvZbxDD1XL6LZ0wN1O0Dw/qUZRksVfS+L9cHKPYKPpSuxdwp+Jh5lpifiXo5TqpM4EqZCbXO/x/LO22Xlk/G4yMLqnHrRCUHEzH7Mj5F+N2S6wpeXntoQFWEVWcSFK0zDYFPUqcMAj1RXI= 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=fz/ekhpR; arc=fail smtp.client-ip=40.107.220.63 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="fz/ekhpR" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MxDAq8O3+Ls8lPzNaMqLcE0/ids5EVD/xcJsud5S0j08ONyCOXemtRvxgz56eMZdVfdvvhDQKzDBQVZImjEIdJMyY4QqaaGoSyDDRSTpIK88dhLi8YsPDLPSkWmuN4jOz0ecC+bP9FzBZX807tRA/4H9YnVIuFTvk18zCQkQLAgmPKWqJJjYw791EUFXFNszp8Mh4TrcSZBhaoHMMsQ0XJsIHiHTNXeotG3xBO64v8KPux9WzjTT2FYoEWxIFF48VefhzMyIU7mOuccmAmkh2F0YQoEiQb2oPvNRfIjgdOJYRGhQBiVKYYrlVVbPC5uXf7INOD1qy5C5jmD+9K1tkg== 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=K3huU9gwsgBtqDBT/BU8sRv34jahVFiLZYLt+ewquco=; b=JIC72h++HCnott5KR+OPh3mOGIczP/mwoSn1wWcq2NkROUfbCYyNjfEYZCc+8WEgNFaC0QE+ohkuLVZevC8hnX/dsWlfLhohO7hwcrZec00rZLbCyXpL6a7v//GcxNby+TLR+suLcPF+JR4JSM5sTClGGMPLtPLe/zxkgPiumu24Xdbrw5mPJbmuQZRylMZb6+bIQ4gk3nmWwz2CGVUvhMZU3Jyoqj/4LbJzRPSlZN+WUIM0D/JvbT1bZVVNcxVQ/t1f1HN1Dd6OoIxWiySzMF7W3+RBagr8YgxTNPnVsl0rTvj7y5j+Pn7UJk/oSvv97mR0PvXfi7ntffhvw/nBMQ== 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=K3huU9gwsgBtqDBT/BU8sRv34jahVFiLZYLt+ewquco=; b=fz/ekhpReth7abmjB1/MSiyLtRjJYl2WlBd1euO8wAgytQ+KXvemQNQ06CWJgk6iKEj2eRh3MsUcz+VZObzS1ps1X4U0P7ULlrAYjR5v6xYFnE3R6K/ydbtN7cYt3rLSUvHjKljf9Gkv5DPYX4iI65lopVskbuVS+Oc4e140pmk= Received: from MW4PR04CA0089.namprd04.prod.outlook.com (2603:10b6:303:6b::34) by DM3PR12MB9288.namprd12.prod.outlook.com (2603:10b6:0:4a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8901.24; Wed, 9 Jul 2025 03:43:55 +0000 Received: from CO1PEPF000044FC.namprd21.prod.outlook.com (2603:10b6:303:6b:cafe::29) by MW4PR04CA0089.outlook.office365.com (2603:10b6:303:6b::34) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8922.21 via Frontend Transport; Wed, 9 Jul 2025 03:43:55 +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 CO1PEPF000044FC.mail.protection.outlook.com (10.167.241.202) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.8943.1 via Frontend Transport; Wed, 9 Jul 2025 03:43:55 +0000 Received: from BLR-L-NUPADHYA.amd.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, 8 Jul 2025 22:43:49 -0500 From: Neeraj Upadhyay To: CC: , , , , , , , , , , , , , , , , , , , Subject: [RFC PATCH v8 35/35] x86/sev: Indicate SEV-SNP guest supports Secure AVIC Date: Wed, 9 Jul 2025 09:02:42 +0530 Message-ID: <20250709033242.267892-36-Neeraj.Upadhyay@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250709033242.267892-1-Neeraj.Upadhyay@amd.com> References: <20250709033242.267892-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: CO1PEPF000044FC:EE_|DM3PR12MB9288:EE_ X-MS-Office365-Filtering-Correlation-Id: a88b3be2-a9b0-4bd3-c2a4-08ddbe9ad469 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|82310400026|7416014|1800799024|376014|36860700013; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?WOaOyLPBUjDJ5HrfQg3jXo9OW5YR/Zs5SXT8cI0q/hnOO6z1r/bkjuCgJvLU?= =?us-ascii?Q?5Kr9fM2iTwxpBEeANX2czKpJcvao3HbLEC9znBWNrvpxr+pq3q/tbu2e/zsJ?= =?us-ascii?Q?4MWc6Skc8wZNbx6yKUsxZZbbGbkE/IHgTl8AstBMY9W/dKGTdImhFGXYXPfI?= =?us-ascii?Q?M1vM5rNjnFq5vFsK9N7LLbc7FVZDTWy1l2dkYsBhDIlX/eeJS9Ri5xlf4F0P?= =?us-ascii?Q?Ei38bj7eF3jber6a0+/1RoEsb3GsncsTtjgpP1CVC6azzt2YUMkXuK3+Vq65?= =?us-ascii?Q?WHIN0Gh/6XuHMWJagYawXb7UWcWMUIAOOHedPU0v6kkXqUteKBrkEiNv6MNc?= =?us-ascii?Q?1U9c9cbKGAGtlywJpg4JJ2vpB44fBO9kbFuz5zBraaLxHah7mD1Iugfgu/sF?= =?us-ascii?Q?swy2HMa9B43zHNlPNh6LZnssblzTTyI2nxw61UtdN+Lt46HZLmeR236hNhXe?= =?us-ascii?Q?scdRJPAc+YWVGYd5w0yPOPMpRlvD3zlk3EcMhHFLkUAvsXYmZ0eZyvbHUeJJ?= =?us-ascii?Q?pc/GnHS6s43qgVavQcAOGPbzP3Utd1t2RcuM72AVcJNinSvV6thnrzUHAYh3?= =?us-ascii?Q?n5pwZiaeQxxCc0cbatWaaWdgmsQRQgzH0nC/eKhEUZA8QR3kDK5xLZls1y4K?= =?us-ascii?Q?0UDo9bBsMLL3b/rBMkXrKZ9VdWKPTj0lxyKXKgM6GUGIht+sCnZdLde3C2OR?= =?us-ascii?Q?+cTyXttvbRfFzBR346jt06nayKjRw6oTLCx8D+e6eU/phfOiT5PoVjENBqke?= =?us-ascii?Q?aMbUylw9HjXeHvmN1GGKtJwxlEpMSYffxTbZE+6VXuo2cBGPkKi2Eg2i0A0u?= =?us-ascii?Q?ymhQ8iZaTYcN2+RMbko72mZQydUdfyN1lSc36Ju90YCBtWHcCViR8scqwWUK?= =?us-ascii?Q?aADs16dEHkpb3UEVbXTSD90E41asqY+x9MD0ZfWdRfMV5gy1YHG8V84Ufmm0?= =?us-ascii?Q?f1DbxpJBbGBlBmHWy+XNLam6wTEOruCvXC9Xewkue0sEIKT0oGd4Gz/Qxfta?= =?us-ascii?Q?dBEYHR/5NmGI1OGUEH7zc8AnNCjiPdwVWTOvyk66Ir3YqJFj81X0laIPwckV?= =?us-ascii?Q?N6j4HKclqUfVvgTjJtEcEGAq3nWcMgAeN3Wfux16WiuUA/p8V4/l7RVuesL9?= =?us-ascii?Q?Zq9QgQTvaoLip6n99GLmkU6mFLSZ7pwJx9QKXtQp3GSsbhoEYSqRYdZDchdI?= =?us-ascii?Q?DodDUhqvDtFwewprRexYO/eATJ41XzvMPhoJ8QE5v3hs5pjrkADihZe0nzbu?= =?us-ascii?Q?ZzqHJyJTbNVaS5cyJU0Xy0K/yELwmkS9JJm8XGl87kMA8FnTy1iDMm2oBnTu?= =?us-ascii?Q?LqRN1mCJ/nnPBbRwYgLX5LXd7EyMVKNx57FYfY7fAZkaog9EvcPgaj3y8ksq?= =?us-ascii?Q?g7EA/prX2VsA5ebfu+XpKFSuqkPo8+lkyFWQrIytjNmr9ga9LMxDYsXXHhKW?= =?us-ascii?Q?QQ8dwasGAC7xc1fYnK/+xVECbQuAFhv6LCL5UMa2nQh/HZIDdMfShSx6b53d?= =?us-ascii?Q?Co5Lsy2u+WbuBt5uL+uSmAzHPdn7nXIetUc6?= 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)(7416014)(1800799024)(376014)(36860700013);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Jul 2025 03:43:55.3074 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a88b3be2-a9b0-4bd3-c2a4-08ddbe9ad469 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: CO1PEPF000044FC.namprd21.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9288 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 Reviewed-by: Tianyu Lan --- Changes since v7: - 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 74e083feb2d9..048d3e8839c3 100644 --- a/arch/x86/boot/compressed/sev.c +++ b/arch/x86/boot/compressed/sev.c @@ -238,13 +238,20 @@ bool sev_es_check_ghcb_fault(unsigned long address) 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