From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8625BC38A2D for ; Thu, 27 Oct 2022 08:39:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234998AbiJ0Ijq (ORCPT ); Thu, 27 Oct 2022 04:39:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58252 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234516AbiJ0Ijn (ORCPT ); Thu, 27 Oct 2022 04:39:43 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2089.outbound.protection.outlook.com [40.107.94.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 27CF417051; Thu, 27 Oct 2022 01:39:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eZGZHpOcy/nELP3Rj/Io1TX7g0+sSCZLgKS4Y5Bc4iNtAiBjg9cCgXP8UJt8H4/f4dfH8XVMVcAglkcjZ+cnYT9YhJzsR7kn1AuSRNqlpcEoThvAwCEOTLlbivXRqPqicH2Ze+T7HZaaF1HRiE4jb2xNf9O0oXJ4x8kJkZ0dxuoeQvBXuYa/h5ZGP7PG/H9CPkqIV+xOsYneeCyIIqKKYOWQNtNMVBOmkgUdKx1UwYjRenYKnYykssIZSD4Qe/U+gUaWUmCINdbHNmDHq+BmV53PhCF8gES9+8o+pCTgqgKkxT2W5yL2SAGNaKn+mk0E+sIKjYpKxx6st5wJWIai6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Zc1VLzQ8oGYMy0WgKioKJ1QWarF5XnyHYDysuvrnN1U=; b=afkbn5YOHFHnDSSYpls3yg6oXrEWaqjMK8GlL4bpgl/Fm4qF1XxD47Obwq3No/YpsugDED14bQ199JBPyTexAGPBVPCWKKYh8Pku/mQ6ZHyKIKJ/pKu1Zl9MlvgDnugl1cOVmORedEIt9/8XCGKagV+ojs1SvzrxalsTaGzdozCCU+ojfzdhcZzQB/j/cmjWTl9i4hmo3uavEKAAnX917y+eCBEmUR76PHugm/4CbBD2KnIVntXaYsyH0CtlYFxo0JBMy0DzvsXfaTlXyYtIjdLbH0t4RimWIDRKuIMVAMGTKGxduVHYEMoVn4XB0dUAIN+RrDY9b42G5LZOeDnsIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=Zc1VLzQ8oGYMy0WgKioKJ1QWarF5XnyHYDysuvrnN1U=; b=lgMaxBndbuos7XT+ttJEe+0RgxkXsOCKzbYPEDSJllRb0xqS9QBzn4i7a99u0WDQ6USLc/+iUnGIz4hvPcXE+0yNVzHlFcQpb+PCyxh4nYjyfl1TQZnuJ8Bv5NMkrCdLSHAO1bW+bzdr9cIUtZUs2AUhwbxIz54VSwwdkLwco4A= Received: from BN8PR12CA0003.namprd12.prod.outlook.com (2603:10b6:408:60::16) by MN0PR12MB5906.namprd12.prod.outlook.com (2603:10b6:208:37a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 08:39:36 +0000 Received: from BN8NAM11FT111.eop-nam11.prod.protection.outlook.com (2603:10b6:408:60:cafe::69) by BN8PR12CA0003.outlook.office365.com (2603:10b6:408:60::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.29 via Frontend Transport; Thu, 27 Oct 2022 08:39:36 +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 BN8NAM11FT111.mail.protection.outlook.com (10.13.177.54) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5746.16 via Frontend Transport; Thu, 27 Oct 2022 08:39:36 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:39:31 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 1/8] x86/cpu: Add CPUID feature bit for VNMI Date: Thu, 27 Oct 2022 14:08:24 +0530 Message-ID: <20221027083831.2985-2-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: BN8NAM11FT111:EE_|MN0PR12MB5906:EE_ X-MS-Office365-Filtering-Correlation-Id: 12ac81ff-9715-4269-805f-08dab7f6c75c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eFYT+IQhOhwfAJCemTOzPl8a/Y4jpVoqelH4o2eEXQvscAurkMfJIE3rW4bwTH+oYy0dJfs+XUht2w30yyZt734jjdS+wLR6VhhoJEiTQ4eTPH63WRUIHc2rOeUmpJQNACXS2RU5qmYqrRaFj+eflZvv9wCuHdHWFO281eA2Vit5jfnKN9aauMjJAHF7Xe2LeDBF2OXTAX5kFmjMoRfF+lpKMrqB0qAvGRokEfbNIp1xqUGEVH5qfDtkBTTPo1ByxpkqJdg8i8WYhdHbyvvilVewIDvwnD0vCtyoUKUo76xc5Cfsr1bzt3bbgZRwz37IY6Npkmot3y0YwcnlH88Uszt/1HUsKZmTH/mLnQj0emcoSR0FtzCv6vpp4iTxWh/Z81/gz9rK1/cxRuFAsAjhQORu9K28u3Pj6iU9/zzzRuCHWh1iVyZtcygZ9BfnPgb0H1wzwCYHGXcJxc5GmuhzXk6+8I7KN+bORiqSw/v56TjVW+Ao8KVfYcsfdLPsNFs2YdIZPOA4maQh5z6tcwhMhKE/PqZF4Lfz1/8x13F4kF16uQvVHE6cZkZXruc8/VNTOqd8aaPzWomrANqjbFGJe6d0IouEzfxJaUb9cYlaYecWgteYe7atBpWYQvrWTgqSoDaCg2wlON+8T2n5xR/rdYDVQDhkwWtnicaz+cCya08LzXl3hrEIOGA9B/IHe70NCRJy0FV8PAol4kbIsV6wh0byrq4aRhLqlGF5Edp++OASUsCl+fdzb9T08C//Oqpwmsrn7I689P2OYSti6i36FhSRDrFVlFl1d0zlBNhyHv7L02cLzFBVEtXfZfeMpIj4 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:(13230022)(4636009)(346002)(376002)(136003)(39860400002)(396003)(451199015)(36840700001)(46966006)(40470700004)(8936002)(5660300002)(41300700001)(81166007)(26005)(40460700003)(82310400005)(36860700001)(356005)(336012)(82740400003)(86362001)(16526019)(44832011)(2906002)(1076003)(186003)(2616005)(36756003)(47076005)(426003)(40480700001)(478600001)(8676002)(4326008)(316002)(70586007)(70206006)(110136005)(6666004)(54906003)(7696005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:39:36.0443 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 12ac81ff-9715-4269-805f-08dab7f6c75c 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: BN8NAM11FT111.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5906 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" VNMI feature allows the hypervisor to inject NMI into the guest w/o using Event injection mechanism, The benefit of using VNMI over the event Injection that does not require tracking the Guest's NMI state and intercepting the IRET for the NMI completion. VNMI achieves that by exposing 3 capability bits in VMCB intr_cntrl which helps with virtualizing NMI injection and NMI_Masking. The presence of this feature is indicated via the CPUID function 0x8000000A_EDX[25]. Reviewed-by: Maxim Levitsky Signed-off-by: Santosh Shukla --- v5: - Rename s/X86_FEATURE_V_NMI/X86_FEATURE_AMD_VNMI arch/x86/include/asm/cpufeatures.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpuf= eatures.h index b71f4f2ecdd5..23bd69848d27 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -356,6 +356,7 @@ #define X86_FEATURE_VGIF (15*32+16) /* Virtual GIF */ #define X86_FEATURE_X2AVIC (15*32+18) /* Virtual x2apic */ #define X86_FEATURE_V_SPEC_CTRL (15*32+20) /* Virtual SPEC_CTRL */ +#define X86_FEATURE_AMD_VNMI (15*32+25) /* Virtual NMI */ #define X86_FEATURE_SVME_ADDR_CHK (15*32+28) /* "" SVME addr check */ =20 /* Intel-defined CPU features, CPUID level 0x00000007:0 (ECX), word 16 */ --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2A8E5C67871 for ; Thu, 27 Oct 2022 08:40:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234526AbiJ0IkI (ORCPT ); Thu, 27 Oct 2022 04:40:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235083AbiJ0IkC (ORCPT ); Thu, 27 Oct 2022 04:40:02 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2083.outbound.protection.outlook.com [40.107.220.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B159B84E5F; Thu, 27 Oct 2022 01:39:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HucugRErDmGbFrhp6mi4t5FIiWEddmjMsaZdBONF5Rr+tBqXsZx7g2d5oA+a7BX+0OP1OsBW4eSECAOFjazjDbZtN0RvHffl4pp7ia3ck/6QWfj4+ehuUIMhLeW+VDu/x2XetV3cZiTepJDKwtNjqMHaCzygT/oJQdhnk+QE9JJjQGkqCU1yjMJHREtbKf9Pbh9MMgj5o5PN0JBxQHQyqBPsCThVZ0OOvWvvKQl3qHvBOoBM/72Fh0NbwHLkBJ4Hh84/sR+ATqa8gqqA82v5ntwiPn/PsasXFP1BfacUpU95/jcvysp/m6LEjvMErYMniEjsQ3Llpn4OEKMu4vfNiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=MnC38vomXNvO6akJJnf1NmMBHxuNASuvEk9xAE0ePJY=; b=NTqjgbeKq4fBILoOYnVigtH0HYZpbfzQFvvsjLS/QuEODm7ahmLZ1xKn/9MIX7bgVAma/q0yQOYddt1bx59e+OFLd3fmGDeeT2M1RxojGFwJ2hfAxC935ffK4AH9hjqwjzLJEai7d4fDaVMPV9+6+P5nEYI3B5yTxksqdDrwpKL2Fn+wtWKRgQLrH5qDe+cB0FF6a36x6ll5Vf8HixDvc/cfuxP/bODYiVJZlkn6175Cpzf+wc5A57et0onvlfmY70XovW8Ev1BEV3ADyY9IXEl/uhnOp1Syj7w/Dl9LBUNl9oE+yNboh3HacIaWDJqDOy/W1hRll3ygHS3h1/U+/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=MnC38vomXNvO6akJJnf1NmMBHxuNASuvEk9xAE0ePJY=; b=VED+YRlj1kh31kiI3gjJlcBEVepmftPZnznDfnCLm5nOX8WmzshCXRexHjBfBqQqTwArqsPbEB8aVdhbqzc498kXJQi123f+M1nCtAGXUGqoH8AK44c4y3mYBBCZDVERNbUOvkwVdmAzqO5sKq10ibdeHlVkbhTYtN57cFvLa9Q= Received: from BN9PR03CA0329.namprd03.prod.outlook.com (2603:10b6:408:112::34) by DS0PR12MB6390.namprd12.prod.outlook.com (2603:10b6:8:ce::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 08:39:56 +0000 Received: from BN8NAM11FT037.eop-nam11.prod.protection.outlook.com (2603:10b6:408:112:cafe::28) by BN9PR03CA0329.outlook.office365.com (2603:10b6:408:112::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.29 via Frontend Transport; Thu, 27 Oct 2022 08:39:56 +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 BN8NAM11FT037.mail.protection.outlook.com (10.13.177.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5746.16 via Frontend Transport; Thu, 27 Oct 2022 08:39:56 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:39:50 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 2/8] KVM: SVM: Add VNMI bit definition Date: Thu, 27 Oct 2022 14:08:25 +0530 Message-ID: <20221027083831.2985-3-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: BN8NAM11FT037:EE_|DS0PR12MB6390:EE_ X-MS-Office365-Filtering-Correlation-Id: 51d43434-708a-4b8e-70ce-08dab7f6d37a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9Kybb9WKflyFffHy/crcMdHak5mSAtW6qjmizWjp7l48cZ6k0Jd3Kk4sXPgrSuibRwAxnQdbuTC+5708RxtaEJsScC7mEgsEuGifjOW2euYyH3oYbvuFx4NHCfH3cQuC8ENM94C2bC9fOP+d4MImPGf4bsSl7xJAwcaP1SG50YtjqX86ZJWW4RNz5EZp8yUSUBdxvuP0ZYtbrGxxad+fjPLeOM0S64nfypmroNQ/3Kr5JP2lWRvcofIkPquKa1Gh4PBfkGjB1vk5Oyq+txJDz952zo2/c9QyYdzoSQeXJKq5MCn8aHA5xnfsTX5DO4wKDCC5d6mb8AMYyzOX9uJfkDzh3VZOMo25xsG2F+wMCQfP3qzHWyQPyeyDeaaKc2Z6TxUAI4MoKD+dcd9HGvLFgbSQmgWq8p7zYQEzBy8UXe7YWwMl7RqIqdF5/xilRSDHApojRGpZ3dMOAekEJ32TO4zp2wCvPQeQRhSXQ93Xl2LYlq9hPO+wiwJ3tbGlCatFWnOh4GFY1DlpuvD5Dbn3gBd7C5VjFJsK+x8Fdr2DpsV15KDMan3XlFjlyUh0ehaCp5uhNnHSPm4MMKX5dFM0Ldewt0+musylXj6fUIPT3KoPBVsO678I3Bs3cASSssQ74jLminTh1DmmA99rYWDFtjzG0GqSkA0MbOksE1myDGVjqu/JzvG01FIh456LLW86uXwXW0tduR15QXlMCrG6L0GvnsgKJIKDzyxwnuteDcaC+yynDyISfCqg7S/dFvG/mNFSPn2SyL4uIxq4H+TCakpaJhwkPJRIaa8hIpOnPrvh2uWwFgHfHJdPXoclqq37 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:(13230022)(4636009)(136003)(39860400002)(346002)(396003)(376002)(451199015)(40470700004)(46966006)(36840700001)(6666004)(82740400003)(2616005)(26005)(186003)(1076003)(16526019)(36860700001)(316002)(4326008)(40480700001)(110136005)(5660300002)(36756003)(44832011)(86362001)(70586007)(54906003)(41300700001)(8676002)(8936002)(70206006)(82310400005)(356005)(81166007)(40460700003)(47076005)(426003)(7696005)(478600001)(336012)(2906002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:39:56.3732 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 51d43434-708a-4b8e-70ce-08dab7f6d37a 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: BN8NAM11FT037.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB6390 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" VNMI exposes 3 capability bits (V_NMI, V_NMI_MASK, and V_NMI_ENABLE) to virtualize NMI and NMI_MASK, Those capability bits are part of VMCB::intr_ctrl - V_NMI(11) - Indicates whether a virtual NMI is pending in the guest. V_NMI_MASK(12) - Indicates whether virtual NMI is masked in the guest. V_NMI_ENABLE(26) - Enables the NMI virtualization feature for the guest. When Hypervisor wants to inject NMI, it will set V_NMI bit, Processor will clear the V_NMI bit and Set the V_NMI_MASK which means the Guest is handling NMI, After the guest handled the NMI, The processor will clear the V_NMI_MASK on the successful completion of IRET instruction Or if VMEXIT occurs while delivering the virtual NMI. To enable the VNMI capability, Hypervisor need to program V_NMI_ENABLE bit 1. Reviewed-by: Maxim Levitsky Signed-off-by: Santosh Shukla --- v5: - Renamed s/X86_FEATURE_V_NMI/X86_FEATURE_AMD_VNMI arch/x86/include/asm/svm.h | 7 +++++++ arch/x86/kvm/svm/svm.c | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 0361626841bc..73bf97e04fe3 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -198,6 +198,13 @@ struct __attribute__ ((__packed__)) vmcb_control_area { #define X2APIC_MODE_SHIFT 30 #define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT) =20 +#define V_NMI_PENDING_SHIFT 11 +#define V_NMI_PENDING (1 << V_NMI_PENDING_SHIFT) +#define V_NMI_MASK_SHIFT 12 +#define V_NMI_MASK (1 << V_NMI_MASK_SHIFT) +#define V_NMI_ENABLE_SHIFT 26 +#define V_NMI_ENABLE (1 << V_NMI_ENABLE_SHIFT) + #define LBR_CTL_ENABLE_MASK BIT_ULL(0) #define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1) =20 diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 58f0077d9357..b759f650fe2d 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -229,6 +229,8 @@ module_param(dump_invalid_vmcb, bool, 0644); bool intercept_smi =3D true; module_param(intercept_smi, bool, 0444); =20 +bool vnmi =3D true; +module_param(vnmi, bool, 0444); =20 static bool svm_gp_erratum_intercept =3D true; =20 @@ -5054,6 +5056,10 @@ static __init int svm_hardware_setup(void) svm_x86_ops.vcpu_get_apicv_inhibit_reasons =3D NULL; } =20 + vnmi =3D vnmi && boot_cpu_has(X86_FEATURE_AMD_VNMI); + if (vnmi) + pr_info("Virtual NMI enabled\n"); + if (vls) { if (!npt_enabled || !boot_cpu_has(X86_FEATURE_V_VMSAVE_VMLOAD) || --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 27F2CC67871 for ; Thu, 27 Oct 2022 08:41:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233956AbiJ0Ik6 (ORCPT ); Thu, 27 Oct 2022 04:40:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34224 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233099AbiJ0Ikz (ORCPT ); Thu, 27 Oct 2022 04:40:55 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2088.outbound.protection.outlook.com [40.107.220.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D01D81118; Thu, 27 Oct 2022 01:40:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Lp1+oyWDg3VojRH3E0g4SroUjJRp/eCZvrMLf1jdL7DGh74FcxPktPdTeQMG6TewmInApeWmfwLzMf7QU3QlqHN/L4RxVGo8Geqy1hwQCoy2RjtJqR/WB0LbxQJIgfZZEmtZXp0yccZadtoTNGEcLfqqxGvVHrAYlsqiydMLj76sqGGvwYJHonl24NTgAZKTl359DrMkSaZdlXqmuJIKWIAawy9keBysc1gbKdPx2/EK2EzFowKzzLIjXnOm+zJTlHCOHdQOqpLxMBt9fauBQXHqHSlHI4aGTENlTl5wGJ+qB7oBqM7e3B9SGKX9vQdmw25/8fdzEfMFF9ru1CZSqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=8fNxPMdbSh7jOwrDytEMM5OjzTzz0SSsEa7nmd0WLQk=; b=c8pWgVzQjGIaB/A+hUHjR4tnBGs3ZMZm2863UR2sdxmBexMe9ugj8/LV+oZ2vPGRsvMxKHKVfA3zVegubnYNmEc7Zw1rArB7zT/PUwraiKNOtN+6l98sb9hBRpcDmOLR5uPQMXLupkD+rJVG5IVGasf8GZNQZvr52tpKPQPjgmvSzkpFtCS/egjNAzDJrSre7PL6hYEAv2LpDbRkzH3K6PdePFNwJRneWj9WqnrDh+V7kjV8zzLfRaG93qLNFSv1Bf6NoVCSPszqHxGqcB8I4Tcr6PLR9jYU2mPUSkNRQ7PGwe2K1LUQqtn2LV50OIPk59JhoVy3ILVRW9YMDHG6yQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=8fNxPMdbSh7jOwrDytEMM5OjzTzz0SSsEa7nmd0WLQk=; b=hqEAbKglHpA6k9hpm7psVUNqBFQupH1cBAhEBatsidMkqbK2rCE9e0166Y2P7pjbrWnhboXT8eVlOLn125HRUtmcjrL59mlokI9cV0Pmp5MZHBBeOB4YWjoBO/eaGIFR92VM5KZIL6tWIDDszArp5cOUlD4D+KfmxZHnEJSN7I4= Received: from BN9PR03CA0928.namprd03.prod.outlook.com (2603:10b6:408:107::33) by CH2PR12MB4199.namprd12.prod.outlook.com (2603:10b6:610:a7::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 08:40:51 +0000 Received: from BN8NAM11FT039.eop-nam11.prod.protection.outlook.com (2603:10b6:408:107:cafe::81) by BN9PR03CA0928.outlook.office365.com (2603:10b6:408:107::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28 via Frontend Transport; Thu, 27 Oct 2022 08:40: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 BN8NAM11FT039.mail.protection.outlook.com (10.13.177.169) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5746.16 via Frontend Transport; Thu, 27 Oct 2022 08:40:50 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:40:45 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 3/8] KVM: SVM: Add VNMI support in get/set_nmi_mask Date: Thu, 27 Oct 2022 14:08:26 +0530 Message-ID: <20221027083831.2985-4-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: BN8NAM11FT039:EE_|CH2PR12MB4199:EE_ X-MS-Office365-Filtering-Correlation-Id: 1acb6b31-7710-4827-0682-08dab7f6f406 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UjCykIE5OoSdR6vE2OogsUbVbY76sH6UOpTeqJukn5fou0Lb9x7Jbs2gA2dJz3p3cg+OkZQKg4+VyGkDAdPCQFLYxB/FcgSg+SXhPv/JnkIoa6tuWtJBaenJ5CPko70j+CNvQ+Kgt/NfnBBmeSzQm+08UMcXleFiCl1UbDAuvF4SKYE+EhZiVxj9Mit2RzkuiSHPrOG3+TiZLwfmz2TgB3xskEUctX0hjp8DLLulhEoLcX5edBg4ppo9kVv9TOVcdaX3W5sP6Z+GRX8BLI3O3JCscvPRGwIYU4sFbAQCnsQxmihyQrnhBc6Yg3ODrKJ9DidJPZnfd0uHKb0af9NI3MwMpugUGnAkddpp57Wdr5nNlxoqEK3O4Xn/B7qi/Nk7+29Odm2MgLzVDkXiCk36zRaArrlokgXxME5nG0LOkg8yLjGwFc9wlitWdU7P/rerFhLGQYoFGRUKWg0DbL5pw5r2uracEoN0o1ViHPA4FSs+HuF6fC41vseVldFt0s+Q+5K1Lb06rPOFk3ecQ3LFTAuEGKJ6V6bnzORSh804WOCRbLJoAeL8JbcBC6TaDA1HSgXsauHQONd/6sR0BCsSoMb0IGxl3PTiYuz+GnT9Luayhl3lPNL4nkU/pfPrGgZpUnZnr6xI70FqfykOJak977Skzu+NMJf7HJ+KbYvZKp/XiFpOf33RosJdRxlcaVE1wIQNDuavFvab9GUHG4B35wtQElJqJEOqWDWewbK1fFEhZrHXnQ9k1Sm9peVtZaXbIoR+SZlHg6dZJcUgPpDKrQokNSHIGpmHYnccUdYAMiVABI4Es0pOL0Qr/8TZn9/b 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:(13230022)(4636009)(396003)(346002)(376002)(39860400002)(136003)(451199015)(46966006)(36840700001)(40470700004)(86362001)(36756003)(82740400003)(81166007)(356005)(40460700003)(336012)(186003)(426003)(40480700001)(7696005)(26005)(2616005)(47076005)(36860700001)(6666004)(16526019)(44832011)(2906002)(1076003)(478600001)(83380400001)(8676002)(316002)(110136005)(41300700001)(82310400005)(5660300002)(70586007)(4326008)(54906003)(70206006)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:40:50.9751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1acb6b31-7710-4827-0682-08dab7f6f406 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: BN8NAM11FT039.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4199 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" VMCB intr_ctrl bit12 (V_NMI_MASK) is set by the processor when handling NMI in guest and is cleared after the NMI is handled. Treat V_NMI_MASK as read-only in the hypervisor except for the SMM case where hypervisor before entring and after leaving SMM mode requires to set and unset V_NMI_MASK. Adding API(get_vnmi_vmcb) in order to return the correct vmcb for L1 or L2, and also API(clear/set_vnmi_mask) to clear and set mask. Signed-off-by: Santosh Shukla --- v3: * Handle SMM case * Added set/clear_vnmi_mask() API. v2: - Added get_vnmi_vmcb API to return vmcb for l1 and l2. - Use get_vnmi_vmcb to get correct vmcb in func - is_vnmi_enabled/_mask_set() - removed vnmi check from is_vnmi_enabled() func. arch/x86/kvm/svm/svm.c | 17 +++++++++++++- arch/x86/kvm/svm/svm.h | 52 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index b759f650fe2d..cb2eb5581d71 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3620,13 +3620,28 @@ static int svm_nmi_allowed(struct kvm_vcpu *vcpu, b= ool for_injection) =20 static bool svm_get_nmi_mask(struct kvm_vcpu *vcpu) { - return !!(vcpu->arch.hflags & HF_NMI_MASK); + struct vcpu_svm *svm =3D to_svm(vcpu); + + if (is_vnmi_enabled(svm)) + return is_vnmi_mask_set(svm); + else + return !!(vcpu->arch.hflags & HF_NMI_MASK); } =20 static void svm_set_nmi_mask(struct kvm_vcpu *vcpu, bool masked) { struct vcpu_svm *svm =3D to_svm(vcpu); =20 + if (is_vnmi_enabled(svm)) { + if (is_smm(vcpu)) { + if (masked) + set_vnmi_mask(svm); + else + clear_vnmi_mask(svm); + } + return; + } + if (masked) { vcpu->arch.hflags |=3D HF_NMI_MASK; if (!sev_es_guest(vcpu->kvm)) diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 6a7686bf6900..cc98ec7bd119 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -35,6 +35,7 @@ extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly; extern bool npt_enabled; extern int vgif; extern bool intercept_smi; +extern bool vnmi; =20 enum avic_modes { AVIC_MODE_NONE =3D 0, @@ -532,6 +533,57 @@ static inline bool is_x2apic_msrpm_offset(u32 offset) (msr < (APIC_BASE_MSR + 0x100)); } =20 +static inline struct vmcb *get_vnmi_vmcb(struct vcpu_svm *svm) +{ + if (!vnmi) + return NULL; + + if (is_guest_mode(&svm->vcpu)) + return svm->nested.vmcb02.ptr; + else + return svm->vmcb01.ptr; +} + +static inline bool is_vnmi_enabled(struct vcpu_svm *svm) +{ + struct vmcb *vmcb =3D get_vnmi_vmcb(svm); + + if (vmcb) + return !!(vmcb->control.int_ctl & V_NMI_ENABLE); + else + return false; +} + +static inline bool is_vnmi_mask_set(struct vcpu_svm *svm) +{ + struct vmcb *vmcb =3D get_vnmi_vmcb(svm); + + if (vmcb) + return !!(vmcb->control.int_ctl & V_NMI_MASK); + else + return false; +} + +static inline void set_vnmi_mask(struct vcpu_svm *svm) +{ + struct vmcb *vmcb =3D get_vnmi_vmcb(svm); + + if (vmcb) + vmcb->control.int_ctl |=3D V_NMI_MASK; + else + svm->vcpu.arch.hflags |=3D HF_GIF_MASK; +} + +static inline void clear_vnmi_mask(struct vcpu_svm *svm) +{ + struct vmcb *vmcb =3D get_vnmi_vmcb(svm); + + if (vmcb) + vmcb->control.int_ctl &=3D ~V_NMI_MASK; + else + svm->vcpu.arch.hflags &=3D ~HF_GIF_MASK; +} + /* svm.c */ #define MSR_INVALID 0xffffffffU =20 --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8D7C4FA373D for ; Thu, 27 Oct 2022 08:41:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233775AbiJ0Iln (ORCPT ); Thu, 27 Oct 2022 04:41:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234967AbiJ0Ilf (ORCPT ); Thu, 27 Oct 2022 04:41:35 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2070.outbound.protection.outlook.com [40.107.220.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6D828D01A6; Thu, 27 Oct 2022 01:41:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mZO3ttGNYKy6lduUyhvm9HssyoBPp/YxET6tevSU0hsDJvPassk1GeUvCAUQDejzfBZ6K6TfK7TwueZpxAb9IWlJ43zrvV7sPNLD8ry3Qb683Wvf/Jcc79EdLvg/OTi9VOdv2PZesLfEGhdJxSoe/Tsr5F9Nw2N1Yk3U2Y2P0rus/88Fg03ay/HDoCTrZa6uuUfQVXsDEwPP/VCyUKO/U+pTBcJRVIQlvAY5jNS/wtfvNkEBEhFOr+DQ2IYydprrVjuD/4/azVDQAO/CwsWORT+zk/ErBce2cBKlkhWpO2ESLmhUB5UF39PDcg1B1mC5Mpb//tQ3AvMTFkrIrDcyeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=nFYHKtCd08W6bwSa2x1KlSLxbgAkmkohddJBjn5kOVo=; b=guk31Wsif0H1EcEh9a766vNYfuq5t2VSzLMvu+524PMXS/7rDwCFd91bJgmr/88P3fKCVw8PX9HHauiSDhnLJCoyD545ytqamW0wuxE8W2E87VrvKIOnYUnZSSMjPQrws6HeAmwOWchD20O5zdbNC9y4t7y1wI1fYGv+jLCj54EGcCGTNPjlvu87cUhPGCk9Vc/ojbHVdzrrOO+YoUxV/yYu9WjWAGmq7zc0h/9DiWr4sAEwluDjXyz1gopTj/oYn6dGZ1pHSV203fPm5LbAZ6+8HkCJyWp+lkrc1mN2BEZlBIttNmT+YEIslPcl6kkVCW0b9AWFjSfV30t9ci+Cgw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=nFYHKtCd08W6bwSa2x1KlSLxbgAkmkohddJBjn5kOVo=; b=Lwxnzyieh/hJdd1ycY71xT7uAYpXBuYDbZdyYgIVGHZWSFIl73GrDmYv05v+JBO+8YR7GTZtGYQnzf6nQuMxEF7a9DdUU7KG0LL1sOpJSI71OzPLkj/jaBCmrNldwu10M2qrfbb5PJdqAu3kuNynFRU7SMfnd6VUejWsbOjBJNc= Received: from BN7PR02CA0033.namprd02.prod.outlook.com (2603:10b6:408:20::46) by CY5PR12MB6346.namprd12.prod.outlook.com (2603:10b6:930:21::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Thu, 27 Oct 2022 08:41:32 +0000 Received: from BN8NAM11FT067.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::7e) by BN7PR02CA0033.outlook.office365.com (2603:10b6:408:20::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28 via Frontend Transport; Thu, 27 Oct 2022 08:41:31 +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 BN8NAM11FT067.mail.protection.outlook.com (10.13.177.159) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5746.16 via Frontend Transport; Thu, 27 Oct 2022 08:41:31 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:41:05 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 4/8] KVM: SVM: Report NMI not allowed when Guest busy handling VNMI Date: Thu, 27 Oct 2022 14:08:27 +0530 Message-ID: <20221027083831.2985-5-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: BN8NAM11FT067:EE_|CY5PR12MB6346:EE_ X-MS-Office365-Filtering-Correlation-Id: 4362422d-6e7b-4434-460f-08dab7f70c29 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mAoqoDJeRawAacO7aCPm4W86zxxvJxhQsMBr2KSIunnsyZX+dORCpu1gnhagsuvk0iczMcSrbXxmD1Bx0BiBHJJJ3ILkemekRM4LcYmJN+mfrqb9jSiWQXkqA2ib+cAV+STnzMbxkM8A5RjsqrmvJQK0wfDST7m5m8r8uwmFfC3WI5LB8Vh+CN6n34n269uDaUIa6xRepWv4JzRHBBfOXxr7+5jO8bDudwU+ydy/oBlAbFeFdrQBOCOxIOc6Jb+cAkPUfFqScHmuCH2D4Qb2eJ58b1KtqFch2qiY/YVgnBe60ru+mqil0NC5U0SDtV2GKzxzYYlDoDV1Xx+L/wfQqRzqtIIJhL5/NQzEBd9Kv5ttljaZOhvgYsDC+DOC/XySJQu5wOSCyubKDhhmKBP7oo8GlACgGlKsvtFsXg8LWwHPAJ/BATdwjUQjrx8j/Am+n0wWPg5mJNhgwE7K+D9D2sakxPCekN93g5GDf4Q1kITbjpN6Vz3itzD5hX5ziINFEEY8aDqnWolYqOsuKQFxkvW3yVRE0LNvYWtCwa/c2tJm3KA7Yq5wRLlXWczcaSfwAKYTxs6lMfAqgyo6f5jo3l7/894ZmqSVeiJf0lH1EHsOxbFdWAfp7xw+cYfPgtPnbInuCm+rNBZvbYMHW7r/+DW//Fbejc0uiFy8Clnl4IOFhSmknpZVhZzpHUTtxmS3eB7LQhY7dOGt2w8bRLDExOHkExA/uwyvQy+R/uX/ddnyYFlDqTy/b8PCNQPevV2wB836kixrpeCWPGnMf8AsVB5QfWo8zoIAzCVOvvTF0Wk= 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:(13230022)(4636009)(136003)(39860400002)(396003)(346002)(376002)(451199015)(40470700004)(36840700001)(46966006)(36756003)(82740400003)(47076005)(36860700001)(336012)(44832011)(40460700003)(7696005)(2906002)(86362001)(356005)(2616005)(16526019)(186003)(81166007)(83380400001)(426003)(70586007)(8676002)(6666004)(40480700001)(5660300002)(54906003)(26005)(70206006)(316002)(1076003)(4326008)(8936002)(41300700001)(110136005)(478600001)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:41:31.4714 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4362422d-6e7b-4434-460f-08dab7f70c29 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: BN8NAM11FT067.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6346 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the VNMI case, Report NMI is not allowed when V_NMI_PENDING is set which mean virtual NMI already pended for Guest to process while the Guest is busy handling the current virtual NMI. The Guest will first finish handling the current virtual NMI and then it will take the pended event w/o vmexit. Signed-off-by: Santosh Shukla --- v3: - Added is_vnmi_pending_set API so to check the vnmi pending state. - Replaced is_vnmi_mask_set check with is_vnmi_pending_set. v2: - Moved vnmi check after is_guest_mode() in func _nmi_blocked(). - Removed is_vnmi_mask_set check from _enable_nmi_window(). as it was a redundent check. arch/x86/kvm/svm/svm.c | 6 ++++++ arch/x86/kvm/svm/svm.h | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index cb2eb5581d71..38fa51e0b70f 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3597,6 +3597,9 @@ bool svm_nmi_blocked(struct kvm_vcpu *vcpu) if (is_guest_mode(vcpu) && nested_exit_on_nmi(svm)) return false; =20 + if (is_vnmi_enabled(svm) && is_vnmi_pending_set(svm)) + return true; + ret =3D (vmcb->control.int_state & SVM_INTERRUPT_SHADOW_MASK) || (vcpu->arch.hflags & HF_NMI_MASK); =20 @@ -3733,6 +3736,9 @@ static void svm_enable_nmi_window(struct kvm_vcpu *vc= pu) { struct vcpu_svm *svm =3D to_svm(vcpu); =20 + if (is_vnmi_enabled(svm) && is_vnmi_pending_set(svm)) + return; + if ((vcpu->arch.hflags & (HF_NMI_MASK | HF_IRET_MASK)) =3D=3D HF_NMI_MASK) return; /* IRET will cause a vm exit */ =20 diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index cc98ec7bd119..7857a89d0ec8 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -584,6 +584,16 @@ static inline void clear_vnmi_mask(struct vcpu_svm *sv= m) svm->vcpu.arch.hflags &=3D ~HF_GIF_MASK; } =20 +static inline bool is_vnmi_pending_set(struct vcpu_svm *svm) +{ + struct vmcb *vmcb =3D get_vnmi_vmcb(svm); + + if (vmcb) + return !!(vmcb->control.int_ctl & V_NMI_PENDING); + else + return false; +} + /* svm.c */ #define MSR_INVALID 0xffffffffU =20 --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A800BC38A2D for ; Thu, 27 Oct 2022 08:42:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234765AbiJ0ImB (ORCPT ); Thu, 27 Oct 2022 04:42:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37032 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234545AbiJ0Il7 (ORCPT ); Thu, 27 Oct 2022 04:41:59 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2061.outbound.protection.outlook.com [40.107.94.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 434D6A7AB0; Thu, 27 Oct 2022 01:41:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FiPEu/HIyKHz+GIV5f7OqwXRSHlwH7FIJCB3G8ultTQkPiq1J4Wy2IHhL5RdU035EkvnEL2M+rCRUrvHpBsAaorGDZ0r/nniAQv0P2L88cnjZY2XjwTdS2cFGgIDFvW/yl3Q0f7MNKralKqK2d2/nNAwJErwIEwskQkDN5SbaBJr+RkMv+BCnObRZBHLqQxOqFoFnlLEXcFNRwdj9mHQPf7Unc2NWTYPNsD7KTJtvKVAA/Mez50c6A8KAIAdZX0zQzMa2+urysJRK+9oDT6SP9P8lTFciY+9FFHJVcGu+sR2QmW4DuEr/b4pazu5n2Ki7qX8W7ziHsSC+26vgGJ3Dg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=4JIVj0zjYPR2ipBGy7fYbw8rqoj3UdBt8qcEMZGLI3U=; b=N6VdQqJ7v7FZPfCv1xbqiSOInnTnu6FFXh6U+GeSqx0kUsb3uKB7cZipP+x40Z6zRXGxLkHeBDC24zLLtmuOaKtX0aew/ibsb+hBGII/+MuxfajpcyT2acdyNd/ocTbP2O0fhKAoKNVxsgfJA7MsNj79df0iwKi1Yn/KcmsClWGYH6fG7rtv/uRibYP0osuVyIp2I17USRt39BKQD7+ECxLqhp5/ViqPS3PCeEDCIy0vpt3aD/j2rbkF5ncZprI39uEzQw4iOTXJ1ecmkE4Odi9LPrc2j9Wb+ppN1KXGT2FIpcR207xkLbHiU03lEI3o7eGoupMuXQt8mez4MTE3sA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=4JIVj0zjYPR2ipBGy7fYbw8rqoj3UdBt8qcEMZGLI3U=; b=4bjOUYwtFPaZQTva3ytrMhhBRXf03ih4x1wMbNybgLZXqxbENXwWZFhIbWbiJ2agnv7Ch9VmRPlb+WXlOfVqSWf+RKc0ur7q2uE0mjsSGHDxSLTQ47iL+RPtTXOMUIgyOR45bsx4XbVjG5sfF9TbUUTN6dIzRPx/oyJEVgqmqbw= Received: from DM6PR08CA0053.namprd08.prod.outlook.com (2603:10b6:5:1e0::27) by CH0PR12MB5249.namprd12.prod.outlook.com (2603:10b6:610:d0::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 08:41:55 +0000 Received: from DM6NAM11FT083.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1e0:cafe::d5) by DM6PR08CA0053.outlook.office365.com (2603:10b6:5:1e0::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28 via Frontend Transport; Thu, 27 Oct 2022 08:41: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 DM6NAM11FT083.mail.protection.outlook.com (10.13.173.97) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Thu, 27 Oct 2022 08:41:55 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:41:51 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 5/8] KVM: SVM: Add VNMI support in inject_nmi Date: Thu, 27 Oct 2022 14:08:28 +0530 Message-ID: <20221027083831.2985-6-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: DM6NAM11FT083:EE_|CH0PR12MB5249:EE_ X-MS-Office365-Filtering-Correlation-Id: 2d101d70-a7d1-4ed2-8b8f-08dab7f71a9e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: tRfYZfI+mrsNSld51Fq/gyK/6a0F42R1dc27PLGF0MnY/tbNo9MOkyOChg9FB95CJ4ugCsjgf/9q4qEztgZVHsHCpVvd/tP3ZXjbo7ucQoSVOA+d0S3XbH3T/Gs3im12xzonjv/shHAtbaEsAnK9D+dx9H4R6EUGW9iIMZHPlg6/r7wz5igdvjSnFxQRCw467IxuZf6RNt0Y/hoM9qyEX4+73OFl0g+g0emPeDd+EEoNFOGBqjIIJwOKNiLey+8lTyrtXE/dfchl2l5HEp6S6O/0SFZwA8kb/1rUzHUgrCOt4QqtDkZ284gtLTWymae2ZnkPnmvOGSXlUF4Ghq5Brl1He3gyAOKbquZJ6BXRhzlowMciBMeZqSTVxAgCk0FNYfOz5g27MUlGet128rEBQtY2/+PS08BUv3ZSu455k17ooEsFOUUGsccSvtkjwTvxyiBoc/sMjswl2wGwv8y58Jfh8IZ78OoHSKoZ3cgtBeazktmXpvla6A7DBpqo4hS1i5twltOJ/DMawt1avNUWPetQV99d32jsvmMWWhS7fDRqQouMIoIilHCfwcx8zufcMRQ+E3P12kFW0shXgKoHFgSOsiM9SWelNrjaJjOv5seIgzQXh6j/0GSJK9UFjNz0I3Bk5DZZlmA3VmL1E/miReFXtWRfCdzIBIQTajTYiVcFdaxFVHSfC5FjZLi3kvvNjHEKGpMOrl1BvayUUmrmj3kShXsQdRWieR9wNef4h6YvrOhXK1x8MmU7YgHC9qM85DtnVuZuELCBuUI5Hd8CpA1zAVD6voWv1OevptjIN7i5MezirBUTigN1jde8DQ9WixQ4dXJzYXbtSk3MVzZS/g== 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:(13230022)(4636009)(376002)(346002)(39860400002)(396003)(136003)(451199015)(40470700004)(46966006)(36840700001)(47076005)(110136005)(40480700001)(26005)(426003)(5660300002)(40460700003)(41300700001)(70206006)(54906003)(36756003)(44832011)(316002)(8676002)(8936002)(6666004)(36860700001)(336012)(186003)(2906002)(16526019)(1076003)(4326008)(7696005)(82310400005)(81166007)(2616005)(478600001)(356005)(966005)(86362001)(70586007)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:41:55.6968 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2d101d70-a7d1-4ed2-8b8f-08dab7f71a9e 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: DM6NAM11FT083.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5249 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Inject the NMI by setting V_NMI in the VMCB interrupt control. processor will clear V_NMI to acknowledge processing has started and will keep the V_NMI_MASK set until the processor is done with processing the NMI event. Also, handle the nmi_l1_to_l2 case such that when it is true then NMI to be injected originally comes from L1's VMCB12 EVENTINJ field. So adding a check for that case. Signed-off-by: Santosh Shukla --- v4: - Added `nmi_l1_to_l2` check, discussion thread https://lore.kernel.org/all/bf9e8a9c-5172-b61a-be6e-87a919442fbd@maciej.szm= igiero.name/ v3: - Removed WARN_ON check. v2: - Added WARN_ON check for vnmi pending. - use `get_vnmi_vmcb` to get correct vmcb so to inject vnmi. arch/x86/kvm/svm/svm.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 38fa51e0b70f..cf05a41779f3 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -3478,7 +3478,14 @@ static void pre_svm_run(struct kvm_vcpu *vcpu) static void svm_inject_nmi(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm =3D to_svm(vcpu); + struct vmcb *vmcb =3D NULL; =20 + if (is_vnmi_enabled(svm) && !svm->nmi_l1_to_l2) { + vmcb =3D get_vnmi_vmcb(svm); + vmcb->control.int_ctl |=3D V_NMI_PENDING; + ++vcpu->stat.nmi_injections; + return; + } svm->vmcb->control.event_inj =3D SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_NMI; =20 if (svm->nmi_l1_to_l2) --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 84FD2C67871 for ; Thu, 27 Oct 2022 08:43:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235095AbiJ0InW (ORCPT ); Thu, 27 Oct 2022 04:43:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38938 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233565AbiJ0InP (ORCPT ); Thu, 27 Oct 2022 04:43:15 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on20604.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe5a::604]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 48C9E1578BA; Thu, 27 Oct 2022 01:43:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FT1qNd0G/3sKnrVSoz+OIfPPWL26XdnVolH7MsRSs1SMFbYgbFso+bX/Qp/8XxOH2UUONgfSbaDZWWBfgKb+muX676Ig2DbI9amv+kSP3O3yExBYCIf2JX3qbTGWemOZz8Hvx/VWV+XKbASokg+SL9O+GyCJrmsvlJBTVswcKsDfalIHuhDHHj3T6UChQjoKLAFovL4QkHsj1qStFrOBl76Oetb4+0QACTRvKsUKB6/M/hoD5sQcX2KNavZZD8I1HjcKIVP7llSzL8ExTAzQQhBdD/n/kNnqrCUbX3LyO/fJO30EQ3kk9pTcOEgaI1FGwBThRJezx0y4oGMTk3IHzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=A+HM0jLpd86Hg+XGAub60xPoH1ueBYIr5PPN07cEdHA=; b=O1iYLQK+oDWH4HZ+1+UEngZJDi1Eo7GtSnPqB/Zw8zxzHL8/l4oPmoGLZ3Rub9LThMaC7ElQyBY9/J9f9hH4iURwl0IDWeMVWQMHQLlJvixFhchMhfPoDNX/vIEf7Tn72a6VicMX/fE1ZtuoJosqU6sWtNoOxU+ZW7xcPmxyZfu4R6iwz5k5AMhuhJZjKVf1cN1X26nf9w2LsmoVyogpLeiHiuLKtVmOhzq/gXQWn41/w0m6936S1HZ+BMAWez6OO99nEqYI7o11N9AP+QbevG379UDUERKmVq4OeXSR8qzhgN6hvQ0fmlrnlo0W5TZOHbo9dfIY+kAjnzF36fXzEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=A+HM0jLpd86Hg+XGAub60xPoH1ueBYIr5PPN07cEdHA=; b=fLEkR+30O0C8lt1u+cqOTMWNaez7X6BXdQQeMM72DEmQiPj4mCNUdmRa1NVODyIshp4yBih4VcG8mmx4+/Cw8zyw2lrrZqrvmP0ZNCSlBbJsqTeW/FybTXacgM2xChDh3/7utnLWkhSzBt41uk+4sUyq9BVcDVGJRc7LYTjAcVQ= Received: from DM6PR07CA0125.namprd07.prod.outlook.com (2603:10b6:5:330::7) by SN7PR12MB7953.namprd12.prod.outlook.com (2603:10b6:806:345::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.23; Thu, 27 Oct 2022 08:43:10 +0000 Received: from DM6NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:5:330:cafe::8c) by DM6PR07CA0125.outlook.office365.com (2603:10b6:5:330::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28 via Frontend Transport; Thu, 27 Oct 2022 08:43: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 DM6NAM11FT031.mail.protection.outlook.com (10.13.172.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5746.16 via Frontend Transport; Thu, 27 Oct 2022 08:43:10 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:42:38 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 6/8] KVM: nSVM: implement nested VNMI Date: Thu, 27 Oct 2022 14:08:29 +0530 Message-ID: <20221027083831.2985-7-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: DM6NAM11FT031:EE_|SN7PR12MB7953:EE_ X-MS-Office365-Filtering-Correlation-Id: 5694fa07-882e-494c-c70d-08dab7f7470e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Om1uUHPt5RH62PfaIs8LKdHvimtIM6C0TtrFRR6tjZx+9taJ9MsYiJ3zEeKOxSer2iYJGOKI0xAvQ/Lru0lXsOt9j8NMhC3ziYJp5ixRqjiPSBLO0V4UmoHBD/INEoWV+l1hdVi/eP5PkC7yWs02b+iutWiw9D/OWj6goQ7NE2BgJSsiG49F+jyMVNMHYFP99qxNG3aVZrSLU+UL3HPZ+xA5qzmZnXWkziOt9vZIlzBrASUS3TH45B6LO4jjMkKiOe6CAYE3WbRa1Rfxgfh8UjbWAu88duXBmUkrFIo6yCoOXbQqsZEem/cBw4uLy3MnXMTii84NRwTbaiA8+PBVbJNGVccWLkJx7h4YJIEDozuROMc36A/QTgpDoyPOBEfEGG1XSeBf5Vn4kLyeDlBWbs11dxXgHxBiP0FGobOeVroQntlwcvDUxf8BTg995My/K/lf5qgwudsbOXPAlp6uF2IG8YSb+YAaOa4nCb29I6kHsyjKfprS4NM5Vmw4eCj/+CPeBeEilM14rFLI3NgSBZIUD8usF1AqAZRJfC3ATV5rSpCD10rhucG6tsz02cWCaNjb0lsvsf7ZbReE95FVX5+VMFHIUD+OWQuf/7KVJF9Uodmf89+SFVuSopLEMvZ38VLcmfeswmE743UFWdYrtDK40SbbHasoXBN9qbLRxnOXcIZZ7xRrsah6h+4bb8pvdFHOzTTxvCC7cYh8hpkG2A4OzV8RjDY7DemZAz84JcsILxrXOUPcUW5dXr4aOAWyiWeiKAZ8j+AtPDASSnXB1xQkebdDdGbMg/J+p2Bc0jU= 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:(13230022)(4636009)(346002)(39860400002)(396003)(136003)(376002)(451199015)(40470700004)(36840700001)(46966006)(1076003)(6666004)(4326008)(36756003)(8676002)(36860700001)(356005)(336012)(70586007)(186003)(81166007)(54906003)(70206006)(110136005)(82310400005)(16526019)(40460700003)(2906002)(316002)(2616005)(5660300002)(44832011)(86362001)(26005)(8936002)(7696005)(40480700001)(41300700001)(478600001)(83380400001)(426003)(47076005)(82740400003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:43:10.2521 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5694fa07-882e-494c-c70d-08dab7f7470e 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: DM6NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN7PR12MB7953 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In order to support nested VNMI requires saving and restoring the VNMI bits during nested entry and exit. In case of L1 and L2 both using VNMI- Copy VNMI bits from vmcb12 to vmcb02 during entry and vice-versa during exit. And in case of L1 uses VNMI and L2 doesn't- Copy VNMI bits from vmcb01 to vmcb02 during entry and vice-versa during exit. Tested with the KVM-unit-test and Nested Guest scenario. Signed-off-by: Santosh Shukla --- v5: - Renamed s/X86_FEATURE_V_NMI/X86_FEATURE_AMD_VNMI v3: - Added code to save and restore VNMI bit for L1 using vnmi and L2 doesn't for the entry and exit case. v2: - Save the V_NMI_PENDING/MASK state in vmcb12 on vmexit. - Tested nested environment - L1 injecting vnmi to L2. - Tested vnmi in kvm-unit-test. arch/x86/kvm/svm/nested.c | 27 +++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 5 +++++ arch/x86/kvm/svm/svm.h | 6 ++++++ 3 files changed, 38 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index 4c620999d230..d1c22c89427e 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -640,6 +640,11 @@ static void nested_vmcb02_prepare_control(struct vcpu_= svm *svm, else int_ctl_vmcb01_bits |=3D (V_GIF_MASK | V_GIF_ENABLE_MASK); =20 + if (nested_vnmi_enabled(svm)) + int_ctl_vmcb12_bits |=3D (V_NMI_PENDING | V_NMI_ENABLE | V_NMI_MASK); + else + int_ctl_vmcb01_bits |=3D (V_NMI_PENDING | V_NMI_ENABLE | V_NMI_MASK); + /* Copied from vmcb01. msrpm_base can be overwritten later. */ vmcb02->control.nested_ctl =3D vmcb01->control.nested_ctl; vmcb02->control.iopm_base_pa =3D vmcb01->control.iopm_base_pa; @@ -992,6 +997,28 @@ int nested_svm_vmexit(struct vcpu_svm *svm) vmcb12->control.event_inj =3D svm->nested.ctl.event_inj; vmcb12->control.event_inj_err =3D svm->nested.ctl.event_inj_err; =20 + if (nested_vnmi_enabled(svm)) { + if (vmcb02->control.int_ctl & V_NMI_MASK) + vmcb12->control.int_ctl |=3D V_NMI_MASK; + else + vmcb12->control.int_ctl &=3D ~V_NMI_MASK; + + if (vmcb02->control.int_ctl & V_NMI_PENDING) + vmcb12->control.int_ctl |=3D V_NMI_PENDING; + else + vmcb12->control.int_ctl &=3D ~V_NMI_PENDING; + } else { + if (vmcb02->control.int_ctl & V_NMI_MASK) + vmcb01->control.int_ctl |=3D V_NMI_MASK; + else + vmcb01->control.int_ctl &=3D ~V_NMI_MASK; + + if (vmcb02->control.int_ctl & V_NMI_PENDING) + vmcb01->control.int_ctl |=3D V_NMI_PENDING; + else + vmcb01->control.int_ctl &=3D ~V_NMI_PENDING; + } + if (!kvm_pause_in_guest(vcpu->kvm)) { vmcb01->control.pause_filter_count =3D vmcb02->control.pause_filter_coun= t; vmcb_mark_dirty(vmcb01, VMCB_INTERCEPTS); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index cf05a41779f3..d8edd40e48e1 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4216,6 +4216,8 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu = *vcpu) =20 svm->vgif_enabled =3D vgif && guest_cpuid_has(vcpu, X86_FEATURE_VGIF); =20 + svm->vnmi_enabled =3D vnmi && guest_cpuid_has(vcpu, X86_FEATURE_AMD_VNMI); + svm_recalc_instruction_intercepts(vcpu, svm); =20 /* For sev guests, the memory encryption bit is not reserved in CR3. */ @@ -4958,6 +4960,9 @@ static __init void svm_set_cpu_caps(void) if (vgif) kvm_cpu_cap_set(X86_FEATURE_VGIF); =20 + if (vnmi) + kvm_cpu_cap_set(X86_FEATURE_AMD_VNMI); + /* Nested VM can receive #VMEXIT instead of triggering #GP */ kvm_cpu_cap_set(X86_FEATURE_SVME_ADDR_CHK); } diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 7857a89d0ec8..4d6245ef5b6c 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -253,6 +253,7 @@ struct vcpu_svm { bool pause_filter_enabled : 1; bool pause_threshold_enabled : 1; bool vgif_enabled : 1; + bool vnmi_enabled : 1; =20 u32 ldr_reg; u32 dfr_reg; @@ -533,6 +534,11 @@ static inline bool is_x2apic_msrpm_offset(u32 offset) (msr < (APIC_BASE_MSR + 0x100)); } =20 +static inline bool nested_vnmi_enabled(struct vcpu_svm *svm) +{ + return svm->vnmi_enabled && (svm->nested.ctl.int_ctl & V_NMI_ENABLE); +} + static inline struct vmcb *get_vnmi_vmcb(struct vcpu_svm *svm) { if (!vnmi) --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAD32FA373D for ; Thu, 27 Oct 2022 08:43:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235039AbiJ0InS (ORCPT ); Thu, 27 Oct 2022 04:43:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233500AbiJ0InP (ORCPT ); Thu, 27 Oct 2022 04:43:15 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2045.outbound.protection.outlook.com [40.107.243.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 55CD915818D; Thu, 27 Oct 2022 01:43:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XyTOurlTwsokNnhQHDo2Un9vGhfv3mmhT0eJYOsd9SKvie9GEVWVXSJGiVULlH6LEBH717K1Mb+1o8T+0LNu7XXIsw+Z/46QUPN876280Y4tDzUsfC6g0bGsp+BVGRUPRsV+cttoATwX9a/3XbQdOur+IX7Y31v4bEhcI6LJiIjh5aEds0pSjqTVa+3qAhNmEIfeyAkz4aGO2Q2fJAuW/VVw+3/ZuZUVEQm5VWVCzOrgC5KeB2mOGtWFEJ/Z73ivCEEva/Xvzu76wXKnjfNBJNf7VrAo7VHAOErToY9bNU7sb9TWGQcgbWJQTjb+VrwFWgR6bXO0f8YCjdPPB9WHEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Mr5n5WfkkqTMhXEC5M5qqGOn9wh7E6FMVuYJGGh8L4Y=; b=S+Q6jb6J5cBdkfRTKUA3X7YMRKifnO1oaKFIzyl0EcFxFgUnJOwIjv7k5MZ3zRM0/2RJHxNQDgfZU3zKgiAdxbaO3h35cJXAMHscDbq8jWxV23l2Tos9Ti++vcQN04nTmMgzH8Md8sV3qiVP38AwoCo72JAJqhCLencEghHRZxHqjx6heoLiveSBMJAzmzumTsxtOU+1Zii+Q3y8UbhLWEXVpEmF9stfQACUtKOm7ZBpjUYm3nVWyNbxlrWqQz+8nfaJUG5oreJVNveh4W2tjtmyfop/jzFX8ira0lE0D9xcaAszIuzLSkS7LSoaa5RFnv6y1T+3cnuy9vNrHKkK8A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=Mr5n5WfkkqTMhXEC5M5qqGOn9wh7E6FMVuYJGGh8L4Y=; b=WiVT5d2T9ublpmIZzzE6+ei4tbUCDIEoUu7HKSFjYQeEwcDxyd6biFtW8748tBb0GlcQd3MlqH7XTloO8+8XCzpW0vVSny7lcZTmyoDm6ifLSohaUZNi7i+NqvaJ6joh1jeh8pmQl3JFDHPrkDqKzOpihUP4b0cBMq1xIeQFLk4= Received: from DM5PR07CA0100.namprd07.prod.outlook.com (2603:10b6:4:ae::29) by SA1PR12MB7149.namprd12.prod.outlook.com (2603:10b6:806:29c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 08:43:12 +0000 Received: from DM6NAM11FT080.eop-nam11.prod.protection.outlook.com (2603:10b6:4:ae:cafe::1d) by DM5PR07CA0100.outlook.office365.com (2603:10b6:4:ae::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5654.26 via Frontend Transport; Thu, 27 Oct 2022 08:43: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 DM6NAM11FT080.mail.protection.outlook.com (10.13.173.105) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Thu, 27 Oct 2022 08:43:12 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:43:07 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 7/8] KVM: nSVM: emulate VMEXIT_INVALID case for nested VNMI Date: Thu, 27 Oct 2022 14:08:30 +0530 Message-ID: <20221027083831.2985-8-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: DM6NAM11FT080:EE_|SA1PR12MB7149:EE_ X-MS-Office365-Filtering-Correlation-Id: 91e018ba-c8c6-4694-779b-08dab7f7481b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cmdFD39GY8NtlTIvvCvqo8gQSjkE04gwkd/zdZDRMdh2AdOueTEQmCRM+EyzDH9QLvPVVBmoxekeNT7CkdPbBeqjcttb7w3TK3DRgPGnGVaK33n7Bmpk6Ik1VhsceEnENpjdcZfkgYXDdtZeAWE2I/dyvsR3LocPvsDdPXPRMo+QUX+V2ODHewl8E9Bsh2ZwQLJFOv55Fu9W9F7+3wx9WhJk7ntzuoeAU1IN4rrbmyZ/0GV37H4l/q9zAnt9iCQ29q3RYAbVf2ygLazEfQLib4FfOUVFawhgzcuCOdUtM0fzm+tkTRP4L3mZMxZ/av7ar7KHwducocrlZ/SqugL/sADtxQYsY+bMW/SDcITOpji8brzFzLYykL6s25Cf9Vl8y5ozRLciL+ES01U1qc36DK1hfl/YRZMapO0QS8ZpLvw73eatuk73sGgJPoHZh+/rGfKk/Kz86xahXACW2HQRA/6hhw+8yX+iU0/T08qT/sX8cec3OmQxNFXqoBkC7Z0pWITz8n/YNoQlQHCGUAwS3XgCdTtdFf9c6N6FlOJoPgiEZcQZAMF+eTQRt1jUrOJnCxTkNqzqaSB7W9kjZELQz+5CZdzTUyHrSt0QI+dgKhYyoqwVrV780v1YYEN10C+WHhrZCDxkFZd7pC00Fhq1+1yHP+/muWVxTzv4V+7MLVeHN/XqtdqbuYi0NIOZd0iQ/BcuxLCTnkIfhuO6mgk/Ptr6yaeMG0kBPCTI6lWOhX/fnOmdvxZFx47OIFQ2bxsmSxydR6jQIpQ+ky6qelG9zxrNU8cTM93Le0AjwFCnQ3ZfaSYp+TXO57QQc5XvN79K 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:(13230022)(4636009)(376002)(346002)(396003)(39860400002)(136003)(451199015)(46966006)(40470700004)(36840700001)(7696005)(2616005)(186003)(36756003)(1076003)(336012)(36860700001)(478600001)(426003)(356005)(82740400003)(6666004)(83380400001)(81166007)(16526019)(70206006)(40460700003)(47076005)(40480700001)(316002)(8936002)(110136005)(4326008)(54906003)(26005)(82310400005)(5660300002)(41300700001)(4744005)(70586007)(2906002)(8676002)(44832011)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:43:12.0130 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91e018ba-c8c6-4694-779b-08dab7f7481b 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: DM6NAM11FT080.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7149 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" If NMI virtualization enabled and NMI_INTERCEPT is unset then next vm entry will exit with #INVALID exit reason. In order to emulate above (VMEXIT(#INVALID)) scenario for nested environment, extending check for V_NMI_ENABLE, NMI_INTERCEPT bit in func __nested_vmcb_check_controls. Signed-off-by: Santosh Shukla --- arch/x86/kvm/svm/nested.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index d1c22c89427e..e94ec6dee661 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -274,6 +274,11 @@ static bool __nested_vmcb_check_controls(struct kvm_vc= pu *vcpu, if (CC(!nested_svm_check_tlb_ctl(vcpu, control->tlb_ctl))) return false; =20 + if (CC((control->int_ctl & V_NMI_ENABLE) && + !vmcb12_is_intercept(control, INTERCEPT_NMI))) { + return false; + } + return true; } =20 --=20 2.25.1 From nobody Sat Apr 11 12:09:21 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CE433FA373D for ; Thu, 27 Oct 2022 08:43:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234475AbiJ0Int (ORCPT ); Thu, 27 Oct 2022 04:43:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234093AbiJ0Inp (ORCPT ); Thu, 27 Oct 2022 04:43:45 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam02on2049.outbound.protection.outlook.com [40.107.95.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8681B1213D2; Thu, 27 Oct 2022 01:43:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SRh0V0PVhG/mVCokgxMsNAqMkXRWPrtF3tSltqs6fI8/b1rhKDXf8fnia9/H5J8ydSBYqENyNwFa7kW9TJxa7gfq8bqR2GIkgxWDAXb1TEEffWofHoMoJVARN1mfo9LC2OlgqdsQ5UR79fTxpZ2RmnRHJln3AA/FUGwy3HKYZEPrUGZs6Rpg3ik837d4cBNCKnX9ipmjS1C+hQcJfCfUlgf5Lm8LJAD7vo41VeNSHEPDDQrIFVDjkyQsLtIiIRMTJ5RcDvvk85SnbEYHIF8Symdxz1Bb5MSM7oO0hYvmYi4B7o++OEarjAZEtHt7wMZKTh7H/eP9qDBLegOOAYgtzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=xqegCxIaOnhSvJQ2jvqCAvktB5q3YZG4hAIM4XcHCbE=; b=KUEqedW0vDvsuHl3AyF9JdqLjttcm7MpQllThWWTLJ0vEr68495+piviQSBWr229scccHf0htPgWTZWklLRCXJ/ohK2RHd10ynYjg+mS6DfEZ8cYQmC/G0eMekV8D8FboMgczl1dQlD1tcbqvvBEaxdvLThXfL6IOIkd9ciZkIRIqf4MmrSfswETjwKIsEoXrEWiSs1YNJ9XPMzR+1nnzXEue8FoFTXCKTRCl/SKyNd50QcTUoTDjoye6lHUpsAnbAkdP1IA8MeLeCDZYgAjQ+bH9oEDNg0ZcJBYVDBHvxbJolegRyqQdCZO+BnAQj8Z0utOlto52/iTv7ulbLhBZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=redhat.com 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 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=xqegCxIaOnhSvJQ2jvqCAvktB5q3YZG4hAIM4XcHCbE=; b=KWJVs8VEISd/UGzvJLqeWrYrf7GgF2WlLvoJqaZbqoGX6a7+suirqmqOhG5cZDIkGjjXg0JgcWpNaDXWLn/34tFUEIZ+0P022O+mieZhvEKBpgZSLPFBVKA5oXohXWpL+p9ToVyKlSikQz0/7c2Z1kO4J3mF/E52C18PM666iPU= Received: from DS7PR05CA0090.namprd05.prod.outlook.com (2603:10b6:8:56::13) by DM6PR12MB4329.namprd12.prod.outlook.com (2603:10b6:5:211::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5746.28; Thu, 27 Oct 2022 08:43:42 +0000 Received: from DM6NAM11FT052.eop-nam11.prod.protection.outlook.com (2603:10b6:8:56:cafe::17) by DS7PR05CA0090.outlook.office365.com (2603:10b6:8:56::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.8 via Frontend Transport; Thu, 27 Oct 2022 08:43: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 DM6NAM11FT052.mail.protection.outlook.com (10.13.172.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5769.14 via Frontend Transport; Thu, 27 Oct 2022 08:43:42 +0000 Received: from BLR-L-SASHUKLA.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.2375.31; Thu, 27 Oct 2022 03:43:37 -0500 From: Santosh Shukla To: , CC: , , , , , , , Subject: [PATCHv5 8/8] KVM: SVM: Enable VNMI feature Date: Thu, 27 Oct 2022 14:08:31 +0530 Message-ID: <20221027083831.2985-9-santosh.shukla@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221027083831.2985-1-santosh.shukla@amd.com> References: <20221027083831.2985-1-santosh.shukla@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] 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: DM6NAM11FT052:EE_|DM6PR12MB4329:EE_ X-MS-Office365-Filtering-Correlation-Id: 99ad5507-cd52-4db1-2f83-08dab7f75a5c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: DWYchpGhHUMuiDeLAj7Rl43Zy9hCI8q6MrLTspySar44qeYk6qsy/hmNMOebVDPRge0HoKxqIOcAqkNShGGF0Kqz42zoI9mPAkl4RtWlLo7eJP4DJBa3dyqu8fcOqxY7ejiK0LZOslzohTRUe19XSFIxW5c71/yH+gHEpRNYui+9LLzBQ5MY7kgsTb/3liI1AiKwAKH3eGrqea4qffBEkqTnb+iRvO1lyf2SS35+tFohSq2dn8oCtBz/0Mvz8wIyxrEeNwcDxpwQkQOkATU5e1XgTtuNdMEHXChmf0cY74b8aB9cEeluS6y9dytYeiL0Xp7itpxd8XDDXwt21pzaLLjuBfbPBYzGLoA9b2oeSfuYAxwDR5Gc6fXfaO5Rk+eO4en/0V4Vi8UlZNtZhrtaqT9R2IW56XQJ52YKGGWYd4ZmrPLmFwdkiK+gxpxn+EyXDoL+SybtuQbuA2tJfX9FDqiztokfxNN65l5Y3sdlUkf5hEK29pZcmls6dGq+kU97iFwc4pV26biAreMhgB6mV1d7ZiZzv6uRhpOsOeSYVwmMtqwZRgV4TcPzmba321W1/bb4MRFNLPV3pfK689YWjChgmeY+QnZhm4EoEnEBfvCGChLdNYX/TnfewRnrysG+HcoKgczCKRL0O7R6EFSMWACww3cp4LNqo7wL9HDH8+LtD9AfFIM1xZLfm0WE2uM6Dtx+uklupaP6UbpvO/sFsnPO10czXAGbxdPzL0BLFjX2zMw95WaskQSL0xvE2FnhIP+6EB5VX4Aw6D2z46mJx+LEik2BOr04yfglJvr+FjPKk5jRnm0nKjOTpy5PtSOV 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:(13230022)(4636009)(136003)(39860400002)(346002)(396003)(376002)(451199015)(40470700004)(46966006)(36840700001)(70206006)(36756003)(82310400005)(40480700001)(356005)(81166007)(478600001)(44832011)(4744005)(5660300002)(36860700001)(86362001)(82740400003)(4326008)(26005)(6666004)(7696005)(54906003)(70586007)(426003)(47076005)(16526019)(336012)(2616005)(1076003)(186003)(40460700003)(8676002)(110136005)(8936002)(41300700001)(2906002)(316002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Oct 2022 08:43:42.6361 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 99ad5507-cd52-4db1-2f83-08dab7f75a5c 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: DM6NAM11FT052.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4329 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Enable the NMI virtualization (V_NMI_ENABLE) in the VMCB interrupt control when the vnmi module parameter is set. Signed-off-by: Santosh Shukla --- arch/x86/kvm/svm/svm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index d8edd40e48e1..9bfee8c4e95d 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -1307,6 +1307,9 @@ static void init_vmcb(struct kvm_vcpu *vcpu) if (kvm_vcpu_apicv_active(vcpu)) avic_init_vmcb(svm, vmcb); =20 + if (vnmi) + svm->vmcb->control.int_ctl |=3D V_NMI_ENABLE; + if (vgif) { svm_clr_intercept(svm, INTERCEPT_STGI); svm_clr_intercept(svm, INTERCEPT_CLGI); --=20 2.25.1