From patchwork Thu May 19 10:26:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854759 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 CD961C433EF for ; Thu, 19 May 2022 10:27:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236712AbiESK1i (ORCPT ); Thu, 19 May 2022 06:27:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236658AbiESK1c (ORCPT ); Thu, 19 May 2022 06:27:32 -0400 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2089.outbound.protection.outlook.com [40.107.96.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D4758A7E19; Thu, 19 May 2022 03:27:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Etd7DPaYAk2hJPVcpyTkYM7sfps49ApHANR4i45IAwZ3lf3drXM4FM4kwHiiK8SKV3oH56dXSF1tn9UbH1UsiFVjtUyNFhclju+bxGfT5yjSfs8ww5BhyFuHjGMUT6Hy7qvtCzhBdrUfzDuDctp4n+rLlWrX8b3G2ck5RRMFvjSBCUARWXzboXEiX7uShZ//R7BWFjiPl2afPERlP4whfqduW182I3NPA0yBgbE2f/391Qv2OmntUiHTiAdfaSFN1UCgapNqbRXj9AYAUyIINDa8sX2sPwJmCEeLKAfQa3TpCUDYXR3NxsoAjhVBeowl8ho76jP4Qg317yQcaaL0lg== 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=AIxqo7TXYYl0T+tYZvoLGn2rk3JMESoQytRIcfR+RbQ=; b=GwhZjKSWwtOweitWD+ndrvhxkQD3POo4YkrNq9m9t9PvxDPgQX94xusjnMVcNjP2UDDIa7KWhR2/TtUzyvSldIe2s4WWtyEr4WlFTW0V5Rd3hGsy2AVYjPl+zfQgmapjmlnCfxnl1DEqe5/BITrISoTc7wZYF01wotg8haFcOiwx8cQG718i0kgqFZY4Hjf8TNslMRBRFnr4/vVzMHW1VkOq13qIZDoVGWHI58WCpYBu35LaSnJlGsUMAbk0AA7ZtKaPwONSmq4FnEhEfcj7QqAujKmEfLAauvaDTUc18NL9E9YKBiecRqh4n2p3nXKMOSGORTjxSH0Qrssl3ALNNg== 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 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=AIxqo7TXYYl0T+tYZvoLGn2rk3JMESoQytRIcfR+RbQ=; b=BCpcZOKyIdCoQxU3Vf8+bAzHemUB2UspGTK56SKaj+jLzI9a73Pjlbq9nN3FLmwJ/xdcZvaX/h61DYdgbpgBocQwj+yxQlitXiOlNsMzgJfk5i1xDdT5rxHVJ8P+toXSsd6nr2EuEtk6gMRf+18QKLYyvRQHPdG6hmgLAExzhes= Received: from DM5PR18CA0061.namprd18.prod.outlook.com (2603:10b6:3:22::23) by DM6PR12MB3545.namprd12.prod.outlook.com (2603:10b6:5:18b::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.17; Thu, 19 May 2022 10:27:28 +0000 Received: from DM6NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:3:22:cafe::ed) by DM5PR18CA0061.outlook.office365.com (2603:10b6:3:22::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.26 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT066.mail.protection.outlook.com (10.13.173.179) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:27 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:26 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 01/17] x86/cpufeatures: Introduce x2AVIC CPUID bit Date: Thu, 19 May 2022 05:26:53 -0500 Message-ID: <20220519102709.24125-2-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4390e5d7-25a1-47a4-1ec4-08da39822c6f X-MS-TrafficTypeDiagnostic: DM6PR12MB3545:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wAr+1Ts0pifmrAF+MAZws9B2YhM0BsEnViCr0Oui3atCeIlg7MC1uAMsniNEdBNBg6zR+R4G3vF4ZJ7fFYe3ZcHaIBQXKz9K4P1YdmEScK5GG1I1w5aX6OMFkp/vIBFJTLciYWymbFMIJR3MwD+XC4xkCssWs1hYAWX4yqtBkyzeZ70u/p4OcikTQYc7QdVfp/c57TRUSihbB6qlUK3oEc0ZL/xeur0fgH06AjY6mT8enweXFB0CUK9qTWNC2+WozUCcGfMExNVFkp/isRDhYSppFnUCEiF4dNoTj+LnrnshZ2DYOuJtqnQKARFg2qiDMuIv52eLFYWxgUrEEmLTYBxRDf1cmBpjrTpDB4xCLcdW3Tl5CgtpJnX3xMP69f7CIIIpzIer4v0ajnQSLteY1GyfwQBBo/0wVm1KJjwbu2B0WlKvzRpum1TmDK6SryNdwMc1BbU9r7lwGSyHX/xmSlc2l5rtd/dBs1IFz11m/SJQ96ykR6s+1uuoxyzvoDcpZ+VQ9KF2OQMMcVHsoTB+l0HSQgnBk4k9Uq5L9uFPARJjp6sIfTodF6tkm8UnKj8gsqhxG+vrg+nvVLUmldXETGIeeN0Lq2yDFEeqx3Oqu5IodN7H+h2XyjZSdhLQqFTauqp0zkyxSLTMXBnqszrp1Ha1w2wmIDRseUG0+6jCTw74Eu9puqC7ELRJ8DX+4iXAREFf1bcyhfAQ2cFGEe/Ytw== 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:(13230001)(4636009)(46966006)(36840700001)(40470700004)(4326008)(70586007)(70206006)(8676002)(4744005)(81166007)(54906003)(47076005)(36860700001)(2906002)(26005)(40460700003)(110136005)(316002)(1076003)(336012)(186003)(16526019)(356005)(8936002)(86362001)(6666004)(5660300002)(44832011)(426003)(36756003)(82310400005)(7696005)(2616005)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:27.9420 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4390e5d7-25a1-47a4-1ec4-08da39822c6f 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: DM6NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3545 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Introduce a new feature bit for virtualized x2APIC (x2AVIC) in CPUID_Fn8000000A_EDX [SVM Revision and Feature Identification]. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit Reviewed-by: Paolo Bonzini --- 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/cpufeatures.h index 1d6826eac3e6..2721bd1e8e1e 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -343,6 +343,7 @@ #define X86_FEATURE_AVIC (15*32+13) /* Virtual Interrupt Controller */ #define X86_FEATURE_V_VMSAVE_VMLOAD (15*32+15) /* Virtual VMSAVE VMLOAD */ #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_SVME_ADDR_CHK (15*32+28) /* "" SVME addr check */ From patchwork Thu May 19 10:26:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854762 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 C0851C433FE for ; Thu, 19 May 2022 10:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235468AbiESK1t (ORCPT ); Thu, 19 May 2022 06:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43766 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236678AbiESK1d (ORCPT ); Thu, 19 May 2022 06:27:33 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2078.outbound.protection.outlook.com [40.107.244.78]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FDBDA7E1B; Thu, 19 May 2022 03:27:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LvN2qGBoNmt5E50xPwyTpW/aLkR2L6KqKZivsrWzsoQ7MN2W0E0u2nb/DTqhOBaJaacJ7cq/BtlDqp8aC3+ZrYEuWOOuZ3H3GyCdiEou9HfLy93xsK9Q4rebNxHWIavXzWbPy+IP72ZNNAyoiv82AzLFPcsX3TqZ3m2IiggJ/qctf7G9gYgFQ/tpxLDR8JpvUdBiHRlnw201fAGVlsqT2vtLWai6e1DUv9ngeDA1ddib33bmo5VZ2rNmpJlYB8UBNV70Eabp8Ea7q2iGvd4MhJKCYuiOA+nMcpaukmbGlGQwL1iPSnf0lRmzijjyzsuHqrUmG+IV8BeTpPQggjOXnA== 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=PnglCy/xPXrLNOnm93nCreZT2JM/mgwXu4AHQzkO224=; b=HkV0DUhW57ViXd9Obcn4XaUSjPsJbwQSXA5pol+3zu3/uCesQa/QyqPhb1sbJqPDKJDPWGGLLKV1LsKj5PJce7MYJ9fCCy72+Yr7OxCTGr42+eY+Q9CjRI4Nr7rlfK/YY87XGKWw2ocwgeRWFxI6PoPwUeQV98Et1AfViqkNPYYXPNSsUNYSR0o8jMTT9UPsSoDQ4OwIFvhb0chnKCjcGaqrFVopKVRcbzzXmQaML9jG8zF8IHKZdXYWjCyv8cfO7hT11LsCJq5y5og8La0GSo4U5PY1OMldnb9fHbKMUgmEKSAcJpPmTfbLvqfMd5/kyfHWiKB8BwTnvxh2GUY7DQ== 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 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=PnglCy/xPXrLNOnm93nCreZT2JM/mgwXu4AHQzkO224=; b=nA8rVfE92tm2O6IM3fiFswArss5fjMsaze2yMPAB9r3oN3hOrCNiao/pizqmrTGw4uDE+di7kCIZsh6D7jSiLeqbu6RhVNYab/6rWJNXyKW1V3h13ZYgWHXn0ksFYDa+tjSAeQPHK0TLL6omoRWwsI36TXEaIBgLUd488qcP+y4= Received: from DM5PR11CA0020.namprd11.prod.outlook.com (2603:10b6:3:115::30) by DM6PR12MB2825.namprd12.prod.outlook.com (2603:10b6:5:75::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.15; Thu, 19 May 2022 10:27:28 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:3:115:cafe::f2) by DM5PR11CA0020.outlook.office365.com (2603:10b6:3:115::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.27 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:28 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:27 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v6 02/17] KVM: x86: lapic: Rename [GET/SET]_APIC_DEST_FIELD to [GET/SET]_XAPIC_DEST_FIELD Date: Thu, 19 May 2022 05:26:54 -0500 Message-ID: <20220519102709.24125-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c1178770-6107-43ee-60e3-08da39822ceb X-MS-TrafficTypeDiagnostic: DM6PR12MB2825:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vRMQOf0mzvUtxbo+DCCy/O0Fj+2RoqeZGwjFxwJCYrIBkpPUnitepFytToGn8agncSdMI4S9r7HOo0BgJnIjIiUE039w4US75PFreFdnXHQ34PeYtIvsFKHzaM/x5APIuXERAW8KZrr2QjXgp8hcRN6sXsiJ4P0gglmx1lQEmhBFIBuONxzXI65sMjcTHq1xbvLxp3/j7WPmO6wSyPlphcXyYYLpd4AflgOo2PcvtMufCbVeUQRQ9uI1/1V8RWeMuld5bf5ZE8YCopxjIeaFdGKlPzikAJqGd/p18ti/LzjrSweFuq4FS4/JoGdxEsPVJwm+m6RnjWe2uUBqntSxCEB6WujVUnYdo9INnpzz67ChUgdB/Ty/0rrt3ZzEacPIwZv0hJSW808aXtOMo5ZJjKmyxBoIfaXS9q5UasPgZGs3vOKBVQOCi/+zs+ztsCC5FCSxDmAE6V6+tHcn8aYG/YtrXnMmc7V1zV/o/Tk3BJcEEw+E4OtfB6xkEakACzBw/0cL2jyXdifbR7V4noqElopNkkrY8BOhbEMPDp82jvzb7FKzGO+nMNw8+Cp6lUG72Py3nWuPVWYj44BBr64YepBiUbleXbVoOSkY3fP1GMZnvSQvBKveT5DOs7ng2AOMgVfgqyokQ8GlElSMO5gKVpkvaRE+qkMicx8P4ciAXCVzWkCo4n3//HPptiWU5K5hmiDhFR8B6GubJdvRHKuFaQ== 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:(13230001)(4636009)(40470700004)(46966006)(36840700001)(54906003)(508600001)(86362001)(8936002)(2616005)(8676002)(26005)(4326008)(16526019)(36860700001)(1076003)(81166007)(40460700003)(70586007)(426003)(47076005)(336012)(2906002)(7696005)(83380400001)(6666004)(82310400005)(36756003)(316002)(44832011)(5660300002)(110136005)(70206006)(356005)(186003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:28.7564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c1178770-6107-43ee-60e3-08da39822ceb 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB2825 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org To signify that the macros only support 8-bit xAPIC destination ID. Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit Reviewed-by: Paolo Bonzini --- arch/x86/hyperv/hv_apic.c | 2 +- arch/x86/include/asm/apicdef.h | 4 ++-- arch/x86/kernel/apic/apic.c | 2 +- arch/x86/kernel/apic/ipi.c | 2 +- arch/x86/kvm/lapic.c | 2 +- arch/x86/kvm/svm/avic.c | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/x86/hyperv/hv_apic.c b/arch/x86/hyperv/hv_apic.c index db2d92fb44da..fb8b2c088681 100644 --- a/arch/x86/hyperv/hv_apic.c +++ b/arch/x86/hyperv/hv_apic.c @@ -46,7 +46,7 @@ static void hv_apic_icr_write(u32 low, u32 id) { u64 reg_val; - reg_val = SET_APIC_DEST_FIELD(id); + reg_val = SET_XAPIC_DEST_FIELD(id); reg_val = reg_val << 32; reg_val |= low; diff --git a/arch/x86/include/asm/apicdef.h b/arch/x86/include/asm/apicdef.h index 5716f22f81ac..863c2cad5872 100644 --- a/arch/x86/include/asm/apicdef.h +++ b/arch/x86/include/asm/apicdef.h @@ -89,8 +89,8 @@ #define APIC_DM_EXTINT 0x00700 #define APIC_VECTOR_MASK 0x000FF #define APIC_ICR2 0x310 -#define GET_APIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) -#define SET_APIC_DEST_FIELD(x) ((x) << 24) +#define GET_XAPIC_DEST_FIELD(x) (((x) >> 24) & 0xFF) +#define SET_XAPIC_DEST_FIELD(x) ((x) << 24) #define APIC_LVTT 0x320 #define APIC_LVTTHMR 0x330 #define APIC_LVTPC 0x340 diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index b70344bf6600..e6b754e43ed7 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c @@ -275,7 +275,7 @@ void native_apic_icr_write(u32 low, u32 id) unsigned long flags; local_irq_save(flags); - apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(id)); + apic_write(APIC_ICR2, SET_XAPIC_DEST_FIELD(id)); apic_write(APIC_ICR, low); local_irq_restore(flags); } diff --git a/arch/x86/kernel/apic/ipi.c b/arch/x86/kernel/apic/ipi.c index d1fb874fbe64..2a6509e8c840 100644 --- a/arch/x86/kernel/apic/ipi.c +++ b/arch/x86/kernel/apic/ipi.c @@ -99,7 +99,7 @@ void native_send_call_func_ipi(const struct cpumask *mask) static inline int __prepare_ICR2(unsigned int mask) { - return SET_APIC_DEST_FIELD(mask); + return SET_XAPIC_DEST_FIELD(mask); } static inline void __xapic_wait_icr_idle(void) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 137c3a2f5180..8b8c4a905976 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -1326,7 +1326,7 @@ void kvm_apic_send_ipi(struct kvm_lapic *apic, u32 icr_low, u32 icr_high) if (apic_x2apic_mode(apic)) irq.dest_id = icr_high; else - irq.dest_id = GET_APIC_DEST_FIELD(icr_high); + irq.dest_id = GET_XAPIC_DEST_FIELD(icr_high); trace_kvm_apic_ipi(icr_low, irq.dest_id); diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 54fe03714f8a..a8f514212b87 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -328,7 +328,7 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source if (apic_x2apic_mode(vcpu->arch.apic)) dest = icrh; else - dest = GET_APIC_DEST_FIELD(icrh); + dest = GET_XAPIC_DEST_FIELD(icrh); /* * Try matching the destination APIC ID with the vCPU. @@ -364,7 +364,7 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, */ kvm_for_each_vcpu(i, vcpu, kvm) { if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, - GET_APIC_DEST_FIELD(icrh), + GET_XAPIC_DEST_FIELD(icrh), icrl & APIC_DEST_MASK)) { vcpu->arch.apic->irr_pending = true; svm_complete_interrupt_delivery(vcpu, From patchwork Thu May 19 10:26:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854761 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 6B6C6C433F5 for ; Thu, 19 May 2022 10:27:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229586AbiESK1q (ORCPT ); Thu, 19 May 2022 06:27:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236679AbiESK1d (ORCPT ); Thu, 19 May 2022 06:27:33 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2079.outbound.protection.outlook.com [40.107.223.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03C58A7E17; Thu, 19 May 2022 03:27:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kSV3TPEB9dAP39mHHNXXfrRdPbKnEjHGLSM4CFtDp5rsNYzPJCYoi2TWqJOnOdKSJtKlOhepAyFALS1DLfopqjuMx2G0b13TlbKlhPo8raBHtRGglkfq6LxemAzb1PgekPsGLo1ZgGF/RFYksih1rLLkmmM0kTu89KRWFtQdBKdUR3ZU/tQNr//GVK4oJGSCUU3ke8BCVnIOnSnGGn5rFzEF7Rk6JpQRH1DulL+fYHNZ8W3k4fi9cOt54q5npny4KUTx2XgolfQw8qiEcitnF5j3IwRGaPrHaRiMv+Hcj++D0C3M4vIuTXlCnKL6mwtfvlvN/2xhdIYVDf0qmV+ptA== 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=XXbUDqjRmzsRStQJiczH5Ed8Uo0mFMfsNCIw/RPMjfQ=; b=NVhs9BBwC9w07+kiDeIXiCneq911CifZauYyZa6r8y+PXYiwaFWkuTdLSetyAKj3LcRjXwOYEzykFRfRM0qZkeujcexxQSysyiGUTvq9wQjONQsOVjinGHvpMbwVXdBis5ZmRcfuubQMukH8t+MDwC8e7XG8jMBmZKEY5D8etDQuAkWNGXuR0Rzpq96U5TLCrp8Uo/ljoUpxVdtyc1mSTmddZzljNwG0SDaaDpwP/o4DbCjZOvEFnVptX3L193yUVX60lkf1l0L8f+22Z2AQF6SOWm0+F3QhASa3CJAt+p4B+ofhtpdIcBPt/Vn4XyQjG8e68KJI5iTHvPiJlv6wGQ== 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 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=XXbUDqjRmzsRStQJiczH5Ed8Uo0mFMfsNCIw/RPMjfQ=; b=zTrQz9qV0saF8vOqMT4jLd/iqAiaJY1m1PCuKHjlF2t1U44WzJ9giOisu6JeLFhepCcGosrJGrmU9WgM38IQLbtB6pGhxyQTDFGORa6D2E0uYJzgEOeEXwvzf5s/fNzQ2VDIcPCZA3hp6LJuPlHozHu0zt7jNrtpS57Uc17mtfw= Received: from DM6PR02CA0117.namprd02.prod.outlook.com (2603:10b6:5:1b4::19) by BN8PR12MB4770.namprd12.prod.outlook.com (2603:10b6:408:a1::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.16; Thu, 19 May 2022 10:27:30 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b4:cafe::4f) by DM6PR02CA0117.outlook.office365.com (2603:10b6:5:1b4::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18 via Frontend Transport; Thu, 19 May 2022 10:27:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:29 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:28 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v6 03/17] KVM: SVM: Detect X2APIC virtualization (x2AVIC) support Date: Thu, 19 May 2022 05:26:55 -0500 Message-ID: <20220519102709.24125-4-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cc4628f4-62ee-4374-277d-08da39822d75 X-MS-TrafficTypeDiagnostic: BN8PR12MB4770:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OfNGAAl//tOmX/kRLa/TLEU3f6eOLoL/+716D06AK7TCd0qTk3B7Y3KoNu9/2Qmz3OHnUzOVJTlRo4gixeP4BUjyyjyJ6+Eo9TLeEJH/jUVFeTKObmjfEmUUgghF0YXuygtA4Lv2nbH4Udwfga7yhkpW2g53Z8NFihxGK7M3VNE6CfI9QgrpHcYqreSah5BVcyYNLp9ul5jwnkhdW3tFljX9oIF3sQO3YnyICc+mj0oOoyoRgf2rKVrtI0rkUPBv57WCk6T3Mzc4aPZQRihIQ7P1BsEeRehcpxN7aaVj9sXWAamnuVzZ6ZAgcCAzGcXpfLDh1ZxWWG3HLYFGyHh6UGqVOWm3ewq9C2Dx9GphbD8Ipboe6RZ0hf+rTmkkLgdTFydyqd6PRe83sMCLdxSKYUdBDxBcOVzsL/FkjgS9qVMSzkKg3sUhWcpQpOrXj6GDVLIlVxKeYFzpR2F+Gm8ZhWCw1p25ZdK7E5lkt9tRH339u3Q6jBSXuk9eX4kTVdJAflNWSzojsEQMTVNmtA2JOIRFcNxkpypNysQe4/WlvcG4kfAoY+oKWGf5BybEju8+gsnE34ItwOByUcG9sZvvDchGaz/qTpgJ7k3qvC7jNvr5VxbEbp0TSptz9B1/ZpLpvFqC6uo2Iz6JUVNGnbVIESCq/NvtAYaGHZRGnOfReI7RZi5Uj2c/D2XjwLKc9eMOuAV7j6fYLU+E1kn3YZEhO+rFYbN5CDOOdrtiOW23HClPuDk3l1nj3wrovWl6P7NhRY8o+zaBZ65knB7KRp9v/Q== 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:(13230001)(4636009)(36840700001)(46966006)(40470700004)(83380400001)(47076005)(426003)(336012)(16526019)(26005)(81166007)(7696005)(2616005)(186003)(1076003)(316002)(8676002)(4326008)(356005)(40460700003)(86362001)(70206006)(70586007)(36860700001)(82310400005)(8936002)(36756003)(6666004)(2906002)(110136005)(5660300002)(508600001)(44832011)(54906003)(71600200004)(36900700001)(309714004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:29.6437 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cc4628f4-62ee-4374-277d-08da39822d75 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB4770 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add CPUID check for the x2APIC virtualization (x2AVIC) feature. If available, the SVM driver can support both AVIC and x2AVIC modes when load the kvm_amd driver with avic=1. The operating mode will be determined at runtime depending on the guest APIC mode. Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/svm.h | 3 +++ arch/x86/kvm/svm/avic.c | 45 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 15 ++----------- arch/x86/kvm/svm/svm.h | 9 ++++++++ 4 files changed, 59 insertions(+), 13 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index f70a5108d464..2c2a104b777e 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -195,6 +195,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area { #define AVIC_ENABLE_SHIFT 31 #define AVIC_ENABLE_MASK (1 << AVIC_ENABLE_SHIFT) +#define X2APIC_MODE_SHIFT 30 +#define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT) + #define LBR_CTL_ENABLE_MASK BIT_ULL(0) #define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index a8f514212b87..7d4e73e95acd 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -40,6 +40,9 @@ #define AVIC_GATAG_TO_VMID(x) ((x >> AVIC_VCPU_ID_BITS) & AVIC_VM_ID_MASK) #define AVIC_GATAG_TO_VCPUID(x) (x & AVIC_VCPU_ID_MASK) +static bool force_avic; +module_param_unsafe(force_avic, bool, 0444); + /* Note: * This hash table is used to map VM_ID to a struct kvm_svm, * when handling AMD IOMMU GALOG notification to schedule in @@ -50,6 +53,7 @@ static DEFINE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS); static u32 next_vm_id = 0; static bool next_vm_id_wrapped = 0; static DEFINE_SPINLOCK(svm_vm_data_hash_lock); +enum avic_modes avic_mode; /* * This is a wrapper of struct amd_iommu_ir_data. @@ -1077,3 +1081,44 @@ void avic_vcpu_unblocking(struct kvm_vcpu *vcpu) avic_vcpu_load(vcpu); } + +/* + * Note: + * - The module param avic enable both xAPIC and x2APIC mode. + * - Hypervisor can support both xAVIC and x2AVIC in the same guest. + * - The mode can be switched at run-time. + */ +bool avic_hardware_setup(struct kvm_x86_ops *x86_ops) +{ + if (!npt_enabled) + return false; + + if (boot_cpu_has(X86_FEATURE_AVIC)) { + avic_mode = AVIC_MODE_X1; + pr_info("AVIC enabled\n"); + } else if (force_avic) { + /* + * Some older systems does not advertise AVIC support. + * See Revision Guide for specific AMD processor for more detail. + */ + avic_mode = AVIC_MODE_X1; + pr_warn("AVIC is not supported in CPUID but force enabled"); + pr_warn("Your system might crash and burn"); + } + + /* AVIC is a prerequisite for x2AVIC. */ + if (boot_cpu_has(X86_FEATURE_X2AVIC)) { + if (avic_mode == AVIC_MODE_X1) { + avic_mode = AVIC_MODE_X2; + pr_info("x2AVIC enabled\n"); + } else { + pr_warn(FW_BUG "Cannot support x2AVIC due to AVIC is disabled"); + pr_warn(FW_BUG "Try enable AVIC using force_avic option"); + } + } + + if (avic_mode != AVIC_MODE_NONE) + amd_iommu_register_ga_log_notifier(&avic_ga_log_notifier); + + return !!avic_mode; +} diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index aa7b387e0b7c..196bca5751a1 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -188,9 +188,6 @@ module_param(tsc_scaling, int, 0444); static bool avic; module_param(avic, bool, 0444); -static bool force_avic; -module_param_unsafe(force_avic, bool, 0444); - bool __read_mostly dump_invalid_vmcb; module_param(dump_invalid_vmcb, bool, 0644); @@ -4913,17 +4910,9 @@ static __init int svm_hardware_setup(void) nrips = false; } - enable_apicv = avic = avic && npt_enabled && (boot_cpu_has(X86_FEATURE_AVIC) || force_avic); + enable_apicv = avic = avic && avic_hardware_setup(&svm_x86_ops); - if (enable_apicv) { - if (!boot_cpu_has(X86_FEATURE_AVIC)) { - pr_warn("AVIC is not supported in CPUID but force enabled"); - pr_warn("Your system might crash and burn"); - } else - pr_info("AVIC enabled\n"); - - amd_iommu_register_ga_log_notifier(&avic_ga_log_notifier); - } else { + if (!enable_apicv) { svm_x86_ops.vcpu_blocking = NULL; svm_x86_ops.vcpu_unblocking = NULL; svm_x86_ops.vcpu_get_apicv_inhibit_reasons = NULL; diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 32220a1b0ea2..1731c1f3884b 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -36,6 +36,14 @@ extern bool npt_enabled; extern int vgif; extern bool intercept_smi; +enum avic_modes { + AVIC_MODE_NONE = 0, + AVIC_MODE_X1, + AVIC_MODE_X2, +}; + +extern enum avic_modes avic_mode; + /* * Clean bits in VMCB. * VMCB_ALL_CLEAN_MASK might also need to @@ -603,6 +611,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops; /* avic.c */ +bool avic_hardware_setup(struct kvm_x86_ops *ops); int avic_ga_log_notifier(u32 ga_tag); void avic_vm_destroy(struct kvm *kvm); int avic_vm_init(struct kvm *kvm); From patchwork Thu May 19 10:26:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854760 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 A5582C433FE for ; Thu, 19 May 2022 10:27:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236725AbiESK1n (ORCPT ); Thu, 19 May 2022 06:27:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43796 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236602AbiESK1e (ORCPT ); Thu, 19 May 2022 06:27:34 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2059.outbound.protection.outlook.com [40.107.223.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DABBBA7E1F; Thu, 19 May 2022 03:27:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EPhSwjJ27aaVUmKazl1DyXXMRLLNbGFuxQwqtRgcxer4VbQRiDG1NElFUxk/XHzPb2r8nhDXOuNaEawWLQOAvPcZKGs4IOM8lO8k/28yCLrqt4rd5veJVbGoirnE72dgWZtV5gSp1n3JfMMNZBp4eyBHIrMogCN29dKLGY6POgLaug11hEw7Y0gzXQQfcKPtjP4kiT5yKdxkwwjSEI13avmaEWgZ26E/6Kmu2UdAeCNZ359VqvvtPEwq/+tahmkVxmvoauTtvpbUFNYI4JfcH9/6L7uLZ2sqmjxwxGq0EUT9t76FENqWfJwvlRZsIrFSgF5mStzOEKGLBFdk6ZvFKA== 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=ZsGI/LukaIQoq01Bz/uzHMwv/M362sY2YQ14Oxc9OVM=; b=ZA/FdhJVk+bzMharVhatZWODc1YuHAXfrNeWEBnfiu3EvDxiNY0zWcb3HRHcKJrK7kYqZvinLIqRYLpVi99cdJBoV/NXfUrRUpPXJQ6lIz6H+ZkPc98Egrfwmw9F03NgY/WNuLJsavq8OZGm+sBR5BVk0Oi9ucVUvwFDSqSFjs3OQfQtY7BZQAFL8tKt2phwzVBkEk2D+eOjT6bHPc03egSxpKl/I8LFqEXZWyvicZjKZ/0VeB08NsUYX40jSM9+4t/Sv29kzUWALPyndad/upPyatkh8TzFozkrqCjIyeaCe6iknl6XuD7Ny7EDgrv42qwQOPrkjXfYaTOxtc+K+A== 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 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=ZsGI/LukaIQoq01Bz/uzHMwv/M362sY2YQ14Oxc9OVM=; b=0znO+sk8c+yucGMY/TZMbIHBxLMKcdHkAQpDr+AeZGzPfmlL/Mumu8Ymm45AhHnSpIt0Lcyi03VpCad8Cvtjirsed9nHtTO9eE/2+q3f3qUrqXZdW0uhR5OBhBDWJRUJz5srwprY5ezfRKJsTCCTQksVu+Gjpkwxpwtlk8sMpOs= Received: from DM6PR02CA0130.namprd02.prod.outlook.com (2603:10b6:5:1b4::32) by DM6PR12MB3882.namprd12.prod.outlook.com (2603:10b6:5:149::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Thu, 19 May 2022 10:27:30 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b4:cafe::31) by DM6PR02CA0130.outlook.office365.com (2603:10b6:5:1b4::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18 via Frontend Transport; Thu, 19 May 2022 10:27:30 +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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:30 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:28 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v6 04/17] KVM: SVM: Update max number of vCPUs supported for x2AVIC mode Date: Thu, 19 May 2022 05:26:56 -0500 Message-ID: <20220519102709.24125-5-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ff89e4d5-ea88-4482-2177-08da39822dd2 X-MS-TrafficTypeDiagnostic: DM6PR12MB3882:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0sJ72E/qNA8Gv8/lZDT0gdylZkqA7n7xOJTMXITDFHClzstOmWAlL4iKYj1nOWoddZp/X6RFw/OsgtZeuYG2Nl6wSLbeNaYrk+BikEu/fvkbzsvBwaaAXZqnyrlB+X1vTXwamZOSm+Q94QA0cx418TG9597wA8VaqUf9zWViU5KjFCUPsa0p6aVZtWR1NCY76FsWVmaMHw6zLqNH13N2JJOg13OeshqwLk/5LGqj1HYFhJCCacHPNvGzrDNzer0qK0SmgylbjxcGk5QTGhDdOUveKTCR/T4alkOyYjUXpxn0zZayaJC19reuwnjhisGwuEDlafQSMp3+vg99U0xcO/5bXejGYud9LXV9ePsSqKpMJheItUNmE0EJs1i3GRXRCmHIfhwPKOf9QVKXpZglWsDOaPJICtOjdcsayA9r4CpS4Aiia0gABvu9qkptKmLePS7j3QdRH+BZDfe6T6jpMlhFaQD73j02qBEjtx3TxyuKQWG6Os9TIs6ld5R7mK1JrvHNPv13O4q53VQGnh5pJ+DS4v3PNYTCIrscu+14gwPGIYbt/dB5cOGDczCm5L6+g0Vh+UUNZNEdUbKB44mjOr9x5gItyrx47rVFUEa2B+aGYyfV6p0eZ+wX3kBsHejhKC9WnSa16EfJkKAZavChKVmZR61gICHNRvkEL/y3c9L2jOwVUYWrUgbnaI0nAjuhGWwUcVKY8uEOu8ECSN5lrw== 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36860700001)(7696005)(16526019)(2616005)(40460700003)(54906003)(336012)(47076005)(83380400001)(2906002)(44832011)(426003)(70586007)(70206006)(5660300002)(186003)(4326008)(82310400005)(6666004)(8676002)(15650500001)(8936002)(81166007)(356005)(316002)(36756003)(86362001)(1076003)(508600001)(26005)(110136005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:30.2530 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ff89e4d5-ea88-4482-2177-08da39822dd2 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3882 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org xAVIC and x2AVIC modes can support diffferent number of vcpus. Update existing logics to support each mode accordingly. Also, modify the maximum physical APIC ID for AVIC to 255 to reflect the actual value supported by the architecture. Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/svm.h | 12 +++++++++--- arch/x86/kvm/svm/avic.c | 8 +++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 2c2a104b777e..4c26b0d47d76 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -258,10 +258,16 @@ enum avic_ipi_failure_cause { /* - * 0xff is broadcast, so the max index allowed for physical APIC ID - * table is 0xfe. APIC IDs above 0xff are reserved. + * For AVIC, the max index allowed for physical APIC ID + * table is 0xff (255). */ -#define AVIC_MAX_PHYSICAL_ID_COUNT 0xff +#define AVIC_MAX_PHYSICAL_ID 0XFEULL + +/* + * For x2AVIC, the max index allowed for physical APIC ID + * table is 0x1ff (511). + */ +#define X2AVIC_MAX_PHYSICAL_ID 0x1FFUL #define AVIC_HPA_MASK ~((0xFFFULL << 52) | 0xFFF) #define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 7d4e73e95acd..6b89303034e3 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -179,7 +179,7 @@ void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb) vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK; vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK; vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK; - vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID_COUNT; + vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE & VMCB_AVIC_APIC_BAR_MASK; if (kvm_apicv_activated(svm->vcpu.kvm)) @@ -194,7 +194,8 @@ static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu, u64 *avic_physical_id_table; struct kvm_svm *kvm_svm = to_kvm_svm(vcpu->kvm); - if (index >= AVIC_MAX_PHYSICAL_ID_COUNT) + if ((avic_mode == AVIC_MODE_X1 && index > AVIC_MAX_PHYSICAL_ID) || + (avic_mode == AVIC_MODE_X2 && index > X2AVIC_MAX_PHYSICAL_ID)) return NULL; avic_physical_id_table = page_address(kvm_svm->avic_physical_id_table_page); @@ -241,7 +242,8 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu) int id = vcpu->vcpu_id; struct vcpu_svm *svm = to_svm(vcpu); - if (id >= AVIC_MAX_PHYSICAL_ID_COUNT) + if ((avic_mode == AVIC_MODE_X1 && id > AVIC_MAX_PHYSICAL_ID) || + (avic_mode == AVIC_MODE_X2 && id > X2AVIC_MAX_PHYSICAL_ID)) return -EINVAL; if (!vcpu->arch.apic->regs) From patchwork Thu May 19 10:26:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854758 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 3E32DC433EF for ; Thu, 19 May 2022 10:27:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236607AbiESK1h (ORCPT ); Thu, 19 May 2022 06:27:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236656AbiESK1e (ORCPT ); Thu, 19 May 2022 06:27:34 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2069.outbound.protection.outlook.com [40.107.100.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DACC2A7E22; Thu, 19 May 2022 03:27:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jrbv8tQG+qbsLjEhFW7Ha+he1LBbAdCHhJQzrFkJJB08g1fUmy/kTaPN+EOOsbxZexiTIveWahd27o3ycNjblGW6pbg4S3zklZLayYT7nZomqKpYZN74hRfXhA8cwCaD7z9xJWB5QJXEI0gYoqjhZYHgOdHre7ONCH/JoL+xckAFWBUpZN2q3+giGYydeGzbqd6iV0zmKG4bBW3dg9GJf1nMRWD2KdJtxFghmiqUzhIBrtmWk6cjPm/h+YTxAtOmN4xoezTL12IPjv9nHxJ7pALCkiiijB0WcEG3l1/3r8UWQk6PfcdcInrFyQ5mbKLvuvFtLHl9fthW+kDup89Jrw== 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=l7nGMak3tiYN2w9nHKtz8Tq5+cMkjgVNWyFDRaDtLDw=; b=E/eTCDgdfmxEP4lVoPE+fcXhQQzqUc9Xt0yp1rtgeU+wUimaEG1+rBPWiF5h8A/uQdFlAj1+H1TDPq6NF/KSn29oZycLbkGkbU+M29HKvRfKIG0AElC/EaZOksXdxC6r5u7ZkN46vkmWjYUfmymCrvsOqUPhh5XUYtfbIpvRbXZXSjC8OYGirc9bzDK28vYg1I2eP2RFgDlsITI8W+vtCTJAZ2mvQfCWgHl6h2XT7w5W5NSWmhpE2P3ykBbVkEplG6UueZIsSIWm6ktr52GDhGmflOW1NF/V/i1FHu9l0qBfWm/md9RfT9LUgWOjUWScA5fSBLzakDIczLNUKxfl3Q== 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 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=l7nGMak3tiYN2w9nHKtz8Tq5+cMkjgVNWyFDRaDtLDw=; b=N/sbkpe85Wx3z9TH1gY6Nw5eQjw8IWe1V/ZCEF4u6ZQVzrRg0t9oaW0A3e/hj83LGrKpEnhc0cedxYLXZ8A+GiLR7f4RemKHE/cgAs+6dNHt/LrOnxF6lYJBmWBQTKu9ofxx2Jt2phP2ktQ9cCtSnKMo/jZlvFH9NFoDqUiqA9E= Received: from DM6PR02CA0136.namprd02.prod.outlook.com (2603:10b6:5:1b4::38) by DM6PR12MB5520.namprd12.prod.outlook.com (2603:10b6:5:208::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Thu, 19 May 2022 10:27:30 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b4:cafe::6c) by DM6PR02CA0136.outlook.office365.com (2603:10b6:5:1b4::38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:30 +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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:30 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:29 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 05/17] KVM: SVM: Update avic_kick_target_vcpus to support 32-bit APIC ID Date: Thu, 19 May 2022 05:26:57 -0500 Message-ID: <20220519102709.24125-6-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d7f3945-85c8-4e30-e219-08da39822e14 X-MS-TrafficTypeDiagnostic: DM6PR12MB5520:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oEahODQfOMgKy0T4He9EmySLO0TcW/eqnwMcolL+DOjsUvVihCfeGpHy9YX4OF0sJVXpE8VVwUGTRYL5v/5M2Dyz2Kx9dPEYvN1/9rU/4vzRUaWnrbUbxfjmGFZyF033tpgp7d5C0GM3z1tPXHwCb5yaeJLd8KRDE5yaPBnVLoz6ac7fiEI/A/FPZLTZXZD6Bsy81EFOIRUUDfx2df6LjR/CzKI5aJTWIBr4eo7jvhni+YcTX/bzdxFfvhwvu1IECW+0ocBUgxoLFmbgOL543glU3p7lS8RUS+JDai3OabUgQ0T3U0xvoZgNnEJHCqGdoICNIRiqzBQQAB2GK5Sx0A+DDCGTe3N/i5LhZojtuRxvehE716SaoamINQHDpilpX/386oio46QgmMbofBcWDMZ/JsDJiDLW7NSsWnoNNhir6XK3KOUWMzlfARfz8hYwbAYKnmq4VcrRAfiwqoI4PdQ7fsGD4bi0v7dSstP5IoOhWfUK9TbK8TsqRQQBIjAxKZMJBofd5BLOxQkNb92JP6rCBaTN5XzX38eeBlzsjUnvuEoFhyPrKACsgFbklAhyMJDEqo3M04u/lOEa/uYa92V35BGsseJMLvCQLtGly496uZ3oUOPSM8+YXWtiBEYm4Pua7NvBp4INQnwfuUeQV92fup/EKoUpWZUarxVyMehthkQXkWc/hEeFa5kDaIVrbddwpQGaejlNh08pewbOzQ== 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:(13230001)(4636009)(46966006)(36840700001)(40470700004)(2906002)(15650500001)(6666004)(47076005)(316002)(82310400005)(508600001)(70586007)(70206006)(4326008)(8676002)(7696005)(336012)(426003)(54906003)(110136005)(40460700003)(86362001)(356005)(16526019)(2616005)(81166007)(44832011)(36860700001)(83380400001)(5660300002)(8936002)(36756003)(186003)(26005)(1076003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:30.7061 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d7f3945-85c8-4e30-e219-08da39822e14 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB5520 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In x2APIC mode, ICRH contains 32-bit destination APIC ID. So, update the avic_kick_target_vcpus() accordingly. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 6b89303034e3..560c8a886199 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -369,9 +369,15 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, * since entered the guest will have processed pending IRQs at VMRUN. */ kvm_for_each_vcpu(i, vcpu, kvm) { + u32 dest; + + if (apic_x2apic_mode(vcpu->arch.apic)) + dest = icrh; + else + dest = GET_XAPIC_DEST_FIELD(icrh); + if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, - GET_XAPIC_DEST_FIELD(icrh), - icrl & APIC_DEST_MASK)) { + dest, icrl & APIC_DEST_MASK)) { vcpu->arch.apic->irr_pending = true; svm_complete_interrupt_delivery(vcpu, icrl & APIC_MODE_MASK, From patchwork Thu May 19 10:26:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854763 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 C02D5C433EF for ; Thu, 19 May 2022 10:27:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236708AbiESK1v (ORCPT ); Thu, 19 May 2022 06:27:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43820 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236692AbiESK1f (ORCPT ); Thu, 19 May 2022 06:27:35 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2079.outbound.protection.outlook.com [40.107.237.79]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 52A38A7E1C; Thu, 19 May 2022 03:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XAHkoiZKMBw3A1GJdJ3zMq1peizeEXl4IglqltbEs20bRlxs6DWw76rn0C9g7uQrU7kqP63ol10FQ8RTd0+cYjNy6pOFMJIfo2nXvmW+QRQW6eOISFnblS177U+E72xS1xiJfma90yQsSgD4tlrnS8gMeyOroXxPepadrxgjKxvbncw87MpMIiToBHecKrptu1s8t2KhZdNZXot/QMyo9MUrgWCv3UUOTg0PjUo57nQFSORJFjvA+1Dq+VpdPO/bRw/J1rOzs3xANGT4QW/HyF+5i6cJnSyA7hFX5595/7WyS/eEeRgl1ZW8KjaeQ6rjVGb/OzxKTZlEv9R38O8B5g== 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=cWn/vash+REJVBPvFVe6fL5edyLf62h5NzBGmBUCpiU=; b=EcbkK/TsZEw6I4ufJYNHv32YTtG0+r3rHiSWvebCiQmmEKwhohW3n9NJ1fpjsvKwxBW+VJjuY5ITATLxuBOf2MYiWw0zVv6SBj8uxgv8as6qUJnn5KBGy5haMSfVfDsj+5yWNpIVLqRHYQDcKN2g3UMTG0SGEmZDCXakX1GiaB7kCURWsl4kIe2U+xJi3GO8YsHycmIVt3VioCjKGImtSnRfyln+qUFUEXg1ZD70Br6rGY43Qa8+tZvXY/T8y6DwtV4AK7Mf/fbH5kgfsGUItAu3t6MKy4eA/BOO3EPK+sAwcdgHTu4U7PU9XXZ9EH/gGJqgklw3IXXptofXo7WbiA== 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 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=cWn/vash+REJVBPvFVe6fL5edyLf62h5NzBGmBUCpiU=; b=CFzUH3Z6ew8J5Meij052HN2Wd8y2LsHRSoniX7nMLxOxe5IgFWXLqHVxxAMdVVjqLzn1lP3y0HUki6qZsqo5UdveNc/JxrvsB9KHbjOCmgqBZMnnFu6zwLK2ngCBfcxhjWf1oGBGdA8kAx8M3PsIkFVv4DwHHGsz8DfHxk0j0D0= Received: from DS7PR05CA0038.namprd05.prod.outlook.com (2603:10b6:8:2f::23) by CH2PR12MB3927.namprd12.prod.outlook.com (2603:10b6:610:2d::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Thu, 19 May 2022 10:27:31 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2f:cafe::ee) by DS7PR05CA0038.outlook.office365.com (2603:10b6:8:2f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:31 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:30 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 06/17] KVM: SVM: Do not support updating APIC ID when in x2APIC mode Date: Thu, 19 May 2022 05:26:58 -0500 Message-ID: <20220519102709.24125-7-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94b69030-1311-4c9e-61c3-08da39822eaa X-MS-TrafficTypeDiagnostic: CH2PR12MB3927:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8exGQvoFVBhwSFI9w+WbLmD2sM5x61orTRLj1Bit0oVcMuR93569BjMKGSjNHF1tAz2fQoar0DPJekbRk2qLB3YlylPv7hX+doAkxTnSf2RZrJv3LLgXxIZmuXDvBbvQ72NlR7hni28XPpoWMZDzGA7Gi/eVKp4+utJdQCYts4tu2f7kBed+eENLLdPPFyQ27lb+hcMy5L58PqIpXVKjZ4UmRv+p4WgaRfDhX9lbedkcn4PVCn/Z0GKmbbCmCisnirrdf02jukQbh/BnQBbHNmsw/1MUZSQNNNA+Pa4Nsk5JDgWQ5oqrbWBdGCWcBRog/wGDfCbHjy8fiYcKuw0gxHbgCLs1Si/DH+16HvVC2fB5ajILAvsf+o3GzlAV9xbLpep0LSsKFaMneeX+VJOgZXhhWJ12jEM+JSNfDnQo4URWEG+ZSNFhZredOfmLgEncwjd94Pnd1gYpnJklWRTPEFKFd1Ujzj9J6AL2v6F3SswooE4TTj5G9T4ivNbE4jQ+79iYiKGryaR6lpzBMYqh5IpTSN4+yR0PqQdBF/pnXOYP5mNY5J1t1QH+36rqZ3CyJuWUFjFLe0U60ZlC3fLjxFxkQvju298IolF7vTPnLvMiBHebK8NFzbB4lCdf3ty0kR/KTjexnlNYOGUuyaP3VaxvbA3Wv+Jx20FOcfgeO9tCHI8Q04iQrkJJ3nr5g1FIzPePQD2i2FEsLmVtTDKHiw== 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:(13230001)(4636009)(36840700001)(46966006)(40470700004)(8936002)(36860700001)(186003)(44832011)(356005)(40460700003)(7696005)(1076003)(2906002)(70206006)(6666004)(70586007)(2616005)(26005)(8676002)(82310400005)(426003)(83380400001)(110136005)(54906003)(316002)(336012)(47076005)(16526019)(86362001)(508600001)(5660300002)(81166007)(4326008)(36756003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:31.6702 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94b69030-1311-4c9e-61c3-08da39822eaa 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3927 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In X2APIC mode, the Logical Destination Register is read-only, which provides a fixed mapping between the logical and physical APIC IDs. Therefore, there is no Logical APIC ID table in X2AVIC and the processor uses the X2APIC ID in the backing page to create a vCPU’s logical ID. In addition, KVM does not support updating APIC ID in x2APIC mode, which means AVIC does not need to handle this case. Therefore, check x2APIC mode when handling physical and logical APIC ID update, and when invalidating logical APIC ID table. Reviewed-by: Maxim Levitsky Suggested-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 560c8a886199..7aa75931bec1 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -493,8 +493,13 @@ static void avic_invalidate_logical_id_entry(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); bool flat = svm->dfr_reg == APIC_DFR_FLAT; - u32 *entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat); + u32 *entry; + /* Note: x2AVIC does not use logical APIC ID table */ + if (apic_x2apic_mode(vcpu->arch.apic)) + return; + + entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat); if (entry) clear_bit(AVIC_LOGICAL_ID_ENTRY_VALID_BIT, (unsigned long *)entry); } @@ -506,6 +511,10 @@ static int avic_handle_ldr_update(struct kvm_vcpu *vcpu) u32 ldr = kvm_lapic_get_reg(vcpu->arch.apic, APIC_LDR); u32 id = kvm_xapic_id(vcpu->arch.apic); + /* AVIC does not support LDR update for x2APIC */ + if (apic_x2apic_mode(vcpu->arch.apic)) + return 0; + if (ldr == svm->ldr_reg) return 0; @@ -526,6 +535,14 @@ static int avic_handle_apic_id_update(struct kvm_vcpu *vcpu) struct vcpu_svm *svm = to_svm(vcpu); u32 id = kvm_xapic_id(vcpu->arch.apic); + /* + * KVM does not support apic ID update for x2APIC. + * Also, need to check if the APIC ID exceed 254. + */ + if (apic_x2apic_mode(vcpu->arch.apic) || + (vcpu->vcpu_id >= APIC_BROADCAST)) + return 0; + if (vcpu->vcpu_id == id) return 0; From patchwork Thu May 19 10:26:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854764 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 4478DC433FE for ; Thu, 19 May 2022 10:27:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236747AbiESK1y (ORCPT ); Thu, 19 May 2022 06:27:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43834 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236700AbiESK1g (ORCPT ); Thu, 19 May 2022 06:27:36 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2061.outbound.protection.outlook.com [40.107.92.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F128A7E27; Thu, 19 May 2022 03:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S0r/0vO2gQpkpBG9sKTbbO0xn/dftpF/o/iU6jy1pFXfCnKMz5MGlxPJ5fKClQMpyOrFp/grLCHfTsxKFxN+nEtw1j7gZEhU3rDgSUS3PpG0rxMOY+wJroeaCBvWe31Qe5TwCykTT3Fg3iN2tIgSmZ3cl1q+5g4KmMTtJnoVV5/Dn/B5uZrbnV8cVQRXo6ucpCoiSoMFi/tx+0foQSnxeRIUgS0T82S4JG068HlHlmW8DvIGSdsmUX7MimUwxxeu41ccSGJq/SEwmd1A7/maC7ZEcDDbFnlrt1IAE8DbvmX3JBkJD1elzSNn9xWq9cmBptzM+YDgwg/gfOiMR7JoVw== 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=B06hmCDbcPMOIz5jArgE4svMc8q/kgfB0AJoJeN67Uc=; b=doCrzV/Lqudo3UinDNnaLxYA9bitbVM+OepVejwlfMmXSTw+k6wwTyjLKEUyMa00ER+RfrvZJ39LjcguF5hj6e5V9w97yk8JLLxCblsjq6Ix08tgrwe1XuPsxXbykju1bsdKyoXNAuRbxpZWNuoVONTPB1lVWEEwVoWVs2EzI2OLAMKqj80NvhASUXROigHI+zb+W9wRV8k8LisgfUUSsmoTS5DfSApDV2lHjDfRiyZuOeNIAt27IK/pD4cpWOjN/7oUSbtoGsDGbjMjdKBziSh42cisynxNkjYt+MiK7SGApU67+BxDbNOsDpL+Pl2wzQg4667cutdbIYSBaimSOA== 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 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=B06hmCDbcPMOIz5jArgE4svMc8q/kgfB0AJoJeN67Uc=; b=bPMQwQszvgmC8upWrXbBUlqssiEKfQSYOHZMacX79i+/Nz65LO9UVeGz+wzwQDk/kb2P0Bu3y4quguRowYiNOIcja+sRaEr4p7jtS2kmK1MIb2jZHAF8b82a1scV0oyGOUOYpgkxNj0kREGUQ/zvjAV3B7BO0Gl80vfqUOoCVf4= Received: from DS7PR05CA0035.namprd05.prod.outlook.com (2603:10b6:8:2f::18) by DM4PR12MB5892.namprd12.prod.outlook.com (2603:10b6:8:68::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Thu, 19 May 2022 10:27:32 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2f:cafe::9f) by DS7PR05CA0035.outlook.office365.com (2603:10b6:8:2f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:32 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:31 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 07/17] KVM: SVM: Adding support for configuring x2APIC MSRs interception Date: Thu, 19 May 2022 05:26:59 -0500 Message-ID: <20220519102709.24125-8-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1f6f1525-7045-4675-e3d9-08da39822f2f X-MS-TrafficTypeDiagnostic: DM4PR12MB5892:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kynO2q85RIW4xQXZ04IvCp0qoO8RRWlChFHC0QAxxMcKw9F3OuvaEDhWd+RB8Yb27K07rENDXJwbh3kDhS+Pa/y5XnicwjqAbH4KZQ4DGUnkkoIKfQWILNQbMqXsQsaoTlcS5Lo5W0QrB/S8gWP6lqOXRwcmreGYGqnOx5S0qpq87v3up8KAp2WqSNcf+7QzcjErRra0DhtBKzZM0dzKglhaB4woEWAQfIdpHTmIOHhy0FVTo9kbNHs9qgumdUzcj2T70bsRPHBTLmjGTWlIDI3mP6C5QPEmnuZnc/zl9Yx5W6TlXiZeAfmdA9bLqYKQIw0vu8KDKIUZJXdDNq07MC6pWCxx5x0dwrSppxSuBTvyghzf6kmRZwN2kTR1eTDlXiSeGPrbXv7YXeodB9il/nG9pNAyeprf8OLTKh7sbP9vlngysZ0ftht6rWSNgn6Q9vmap4Lq7o0UDuznoYjtzWFNTiNuFA/HlrR/fR1Ge4B8EYSfqMYqpjSLqXoBXn6YGPjWAXBnfX6TtwerXOd+11ot7g7QMS3uUvdjmNKO/aovdyoDb+oJa37tIc29frR4NANuNp0/2omOOI+cvxeWVoHqvSwWegKvc6EoJ+nZUFlqoAEfxGNEX+owX+4o/7xQUb+xUyHcUJ06YH9DNtuDO2/e1KaDEskzWKeeFWeyZ1XgwoJNADDxhvnSLfub3D8zp3KAVNYt7DeIl7KYU5ZFMg== 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:(13230001)(4636009)(36840700001)(46966006)(40470700004)(316002)(86362001)(36860700001)(82310400005)(426003)(336012)(47076005)(8936002)(81166007)(4326008)(44832011)(54906003)(8676002)(7696005)(2616005)(36756003)(5660300002)(186003)(6666004)(508600001)(1076003)(2906002)(40460700003)(110136005)(83380400001)(356005)(70586007)(70206006)(16526019)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:32.5452 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1f6f1525-7045-4675-e3d9-08da39822f2f 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5892 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When enabling x2APIC virtualization (x2AVIC), the interception of x2APIC MSRs must be disabled to let the hardware virtualize guest MSR accesses. Current implementation keeps track of list of MSR interception state in the svm_direct_access_msrs array. Therefore, extends the array to include x2APIC MSRs. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/svm.c | 25 +++++++++++++++++++++++++ arch/x86/kvm/svm/svm.h | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 196bca5751a1..2cf6710333f8 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -100,6 +100,31 @@ static const struct svm_direct_access_msrs { { .index = MSR_IA32_CR_PAT, .always = false }, { .index = MSR_AMD64_SEV_ES_GHCB, .always = true }, { .index = MSR_TSC_AUX, .always = false }, + { .index = (APIC_BASE_MSR + APIC_ID), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TASKPRI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ARBPRI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_PROCPRI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_EOI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_RRR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LDR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_DFR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_SPIV), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ISR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TMR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_IRR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ESR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ICR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ICR2), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTT), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTTHMR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTPC), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVT0), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVT1), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTERR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TMICT), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TMCCT), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TDCR), .always = false }, { .index = MSR_INVALID, .always = false }, }; diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 1731c1f3884b..16f1d117c98b 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -29,8 +29,8 @@ #define IOPM_SIZE PAGE_SIZE * 3 #define MSRPM_SIZE PAGE_SIZE * 2 -#define MAX_DIRECT_ACCESS_MSRS 21 -#define MSRPM_OFFSETS 16 +#define MAX_DIRECT_ACCESS_MSRS 46 +#define MSRPM_OFFSETS 32 extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly; extern bool npt_enabled; extern int vgif; From patchwork Thu May 19 10:27:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854765 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 B7692C433F5 for ; Thu, 19 May 2022 10:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236818AbiESK1z (ORCPT ); Thu, 19 May 2022 06:27:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236704AbiESK1g (ORCPT ); Thu, 19 May 2022 06:27:36 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2071.outbound.protection.outlook.com [40.107.243.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5705AA7E19; Thu, 19 May 2022 03:27:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=chqYlPlkJ3JIb2FgvtKjldA3Fvo8Au4Vrpcmrg6N6MFocb4UscAzqQn7OjxalUk9mcPTiz5EYyEbhxNgEvpMMBQ1mSjgkQMSvkY/kx8zrkwgNeLyObGIYO4qhaDlzOKMcC/PoPtRJDRHXkfcow0neq4HZT1kIjOZI2mtFtFXkTkFtfm/1J4MuJcKUZDxWC2RBLIT61Y/9QKT6B3rinNhzQVot9arm4NKH+R5/mGgjmKZ8ZxXnnZ6S66ftD91v9r9JTJTWe5GRXoYo1IHFVboFzA5WBVI75wxt83eZpw/4AdGTanNjCjWQ2ldzB6L6O/hn0TvopHEKGOcj2MRDdJlyg== 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=mDW86IJiGH34cAr0v8eFBvuoANA/E9jIPQE627h34BM=; b=L4GZvD5zJlJfMCYkiI98X3V8I7eX1mBhm6dojrt3C69U2ZBP4qz4r7jBr3MIhrj8LP8BTaWbQBZJRh4//jEAvYcMNNY59yv3c03fvPUqSfB79r5VpyX3RXitYvKf+0OVf8KMBE8sBuXJmNE4TZeqldgljPtAlzPAq2Lc2evvEIJAlZJAyXRJXnO/d/GYCtufS2K32kWZCaHldLXLmOPU6tKOrL1OsnCtU3WVIQdVLutziCvtMmIKJ/uNF028GBZ+Oi0CIcFAF7hgIFt0Y3bf4ieP6+/1CQ/Ltmbm3YGgAsA6xAzDDGJso08Z05bJi1cIdMUhrNF2gvTvm+tIThIepQ== 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 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=mDW86IJiGH34cAr0v8eFBvuoANA/E9jIPQE627h34BM=; b=iA8+JK9pQOhEDG3I+7xb+oUiyNn3Zh+htgR0+uOAzmHU0su72pr7h67vpd9zx8b/PiMjTUsDqqDT9G/yqmMB3eq7HqU6SX6W68s2jQ51FKJD24W9ZL2/EcVFfb8rpTtIijLN86z+V8RaB88Qs0uu903m9D1JFqCKj2pa6XeKkNg= Received: from DS7PR05CA0038.namprd05.prod.outlook.com (2603:10b6:8:2f::23) by IA1PR12MB6435.namprd12.prod.outlook.com (2603:10b6:208:3ad::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Thu, 19 May 2022 10:27:33 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2f:cafe::ee) by DS7PR05CA0038.outlook.office365.com (2603:10b6:8:2f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:32 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:31 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 08/17] KVM: x86: Deactivate APICv on vCPU with APIC disabled Date: Thu, 19 May 2022 05:27:00 -0500 Message-ID: <20220519102709.24125-9-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f7b88594-d063-4b0e-a4ca-08da39822f72 X-MS-TrafficTypeDiagnostic: IA1PR12MB6435:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5l4p86j5bJm3kea7zl16WBltj6lNWplwcR6lMxPPnpNseocTONZfpcEu+1+ssLfZVOTTxHmmH4UWkaCvGUaXtm0F3cCoYoZFU+OzJ8eEPL270I73sPZLKVAhcxiZfXAeoENmEl2Rtg17uqTmhGbzruXvPkeq+rJrnCYmWQJsyZoPvxfaZrUxyD0bJUcB5b59tMjJ3I51lgkJpTPKCilcFY6yQqLee+Nj6WbwXudQSP7z5PTO4YaxhiarG9/t2CRmEFgR+xgitdvTgcBjB1mSo37zkJEcnWpFcbClkACA2zG+WGtuhvLWMx7VTYa6Hd8LF2vKRroMw1G5kh7GUVjoSBR0M/iI3rRA04EpANtpn/2dpm6i07SzPtQ60K4K40eYiF/eD2zwrcJfPyHdWjeczO/f0O20Hb+AS3Kn2T10NcQSp2dpv9mqkdlcPQMlQIKrY+5ePCBOvGBFCDHNqPuuBnj1tV75smx8oWgI2A8wWwJt5n1TzqAmRJonUaEXYduos+aClOd2MiFWK43IBbuihpqqQeNa+S6f4dxefGSiArwbvFn9hX+MK4ez3SjuzUzMvQKVVQxEGFaijHADAuCAmu7A61qRIx2bQ3Z28Rxgqp6onf30N9mw95sb8v6DT/Ml6Oxpgm+6Y2MSAfhnrx8dceyhefMYHR+hNJ194xbk9nMbvQXJ2E87kEres+RPZNfHPJ8j+YbgABAI1lTTttCveg== 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:(13230001)(4636009)(40470700004)(46966006)(36840700001)(36860700001)(4326008)(16526019)(8676002)(81166007)(6666004)(54906003)(356005)(2906002)(26005)(7696005)(86362001)(47076005)(36756003)(110136005)(5660300002)(70206006)(426003)(336012)(186003)(316002)(82310400005)(1076003)(8936002)(83380400001)(40460700003)(2616005)(508600001)(70586007)(44832011)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:32.9826 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f7b88594-d063-4b0e-a4ca-08da39822f72 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6435 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org APICv should be deactivated on vCPU that has APIC disabled. Therefore, call kvm_vcpu_update_apicv() when changing APIC mode, and add additional check for APIC disable mode when determine APICV activation, Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/lapic.c | 4 +++- arch/x86/kvm/x86.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 8b8c4a905976..680824d7aa0d 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2346,8 +2346,10 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) if (((old_value ^ value) & X2APIC_ENABLE) && (value & X2APIC_ENABLE)) kvm_apic_set_x2apic_id(apic, vcpu->vcpu_id); - if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE)) + if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE)) { + kvm_vcpu_update_apicv(vcpu); static_call_cond(kvm_x86_set_virtual_apic_mode)(vcpu); + } apic->base_address = apic->vcpu->arch.apic_base & MSR_IA32_APICBASE_BASE; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8ee8c91fa762..77e49892dea1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9836,7 +9836,9 @@ void kvm_vcpu_update_apicv(struct kvm_vcpu *vcpu) down_read(&vcpu->kvm->arch.apicv_update_lock); - activate = kvm_vcpu_apicv_activated(vcpu); + /* Do not activate APICV when APIC is disabled */ + activate = kvm_vcpu_apicv_activated(vcpu) && + (kvm_get_apic_mode(vcpu) != LAPIC_MODE_DISABLED); if (vcpu->arch.apicv_active == activate) goto out; From patchwork Thu May 19 10:27:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854773 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 0F0A7C433EF for ; Thu, 19 May 2022 10:28:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234726AbiESK2p (ORCPT ); Thu, 19 May 2022 06:28:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236762AbiESK1v (ORCPT ); Thu, 19 May 2022 06:27:51 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2069.outbound.protection.outlook.com [40.107.95.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22914A7E36; Thu, 19 May 2022 03:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BWvt8rPLg4++I/vo1CZCiY2aUAh+YxfZlq9IJLBNCvE5vW9IbDs1GPgLCYj6k4Ts9RyrPYGv67n5lgN6d6xSvPBEdwZIcTsh1O6EGvZe3hu5YDHduM5NuOFITyJfwcIk4AzWpc1/HNRgY2qJ/P6In6ZBzYVpcWITBTlb7/92YXnKjIqsnWGRyhWJHH2ztNkz/IWDBTLOt/hqNALaW4aXqegq0vdST1nl1cGAMSQ/xa2iDscQpi1FOl6XsCufePSZrOACq5Y2snr1C1SD8pdJpMZRZb+F6HpcLO8WNM6hdcvbLEPdgkj6G79eThxsjoL1ER+HxIakfcnMbYlcRehRSA== 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=83695Y+9o+s62B8x0blwU4bqtpuC0t1iZ5LaeEhEG7k=; b=gVtbQ661shpvVYWb97o3ozXCQkbXFZF3YolOiXp08RJ0GwJVjj8CsBj20ar1qVdfzIAZUWIrLztWg8SZGwEA3uEJ8rSXNG8Q5sk9uDt4Q/M1uqwzDSvP2XgXsOC+sdXohN8zeDI7Zf3tZStWl+bqeRQzMSY36GM/1MTaDtOaBZAAmARr8ecpCMNr1lIg38EZIJq7AcoUEBGmWy4/gU/N9OrTIdVlcNw1dX+uzYQf8yDlzlRUWhq+mzPjo6BceZtq10Dkt3VO+aPLeqDQGapuFybLcVklN8dLEzyzatXL4LdrIYwWNl1I9nRvAkRvhj/c0yt6J+dkYsWL+oe9OjjMVw== 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 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=83695Y+9o+s62B8x0blwU4bqtpuC0t1iZ5LaeEhEG7k=; b=M+G2vuAIHebrDmoXfTqrA8KstNR6svPgnL5xHHFz74XzjXm1rvop+/mHR0u1ZPf1OJRxAXeLW6XmUIRIIlWQsf8evQJDR28ijV9oQp03CuRFa8OdvfkaD9eBTukzNoAc9HKfc2XHqilrbjVoVKBCH7UbPD1yy+ItgBjKfOyOmoM= Received: from DS7PR05CA0041.namprd05.prod.outlook.com (2603:10b6:8:2f::8) by SN1PR12MB2446.namprd12.prod.outlook.com (2603:10b6:802:26::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Thu, 19 May 2022 10:27:33 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2f:cafe::b2) by DS7PR05CA0041.outlook.office365.com (2603:10b6:8:2f::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:33 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:32 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 09/17] KVM: SVM: Refresh AVIC configuration when changing APIC mode Date: Thu, 19 May 2022 05:27:01 -0500 Message-ID: <20220519102709.24125-10-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: fc542980-2652-4717-9f5f-08da39822fcf X-MS-TrafficTypeDiagnostic: SN1PR12MB2446:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aFgx/0NLPKuQdnEdxVTT5y8hR2WHHpuAKNNE91QsMAv8eHgtpVaaHqcl9VkJu7NCwxYT7J177KQuDGSEQqFOYUfXmTWHYTjb96U9gwa5p/qeaGk06qQGHOhsZiO1i662yc5uJ0vr80AQeJcVoGPDffjfplfWtsIQSZR2ukb79LnFYKth5hA6kEVxOFPdqsxjRmAjPw8V6/rjJbHIi0ljHSRx5G8R9Gat/GEJxEy5TwZ4mdXHYxlDGCYT0OUiACotY+soSKCDtKBwanutuanmz9E5mA6sNkJZTY5OPr5Ytf+Q/RdVXjLfopEbMI5/uRL6T7Qs8qcBi9K7ORt3vqMgN9mQWit5pVhwsod0L8O2drVgPHM9+xm4FkoA5x0kSHNRzuQomVPcl7tnLHzHwS/YdGFneFdBsflVTkdpK3+qserD0+U3weUpZqE1IAN/xSGYICkltfyA3Wxjc3dOJEdn4MUCkgWmVjnyk35pv/Gz3CKralntZpC1eKNz+Fpf423XvcT6O+C5Y3bITWd0hCYApKOqOanme4f4yXfAWvoJPCOpCv9kyOsszSxpcCgmXfzfUXYM7DTjs2tH/EzgyH8EtQ6LuvkR0wzZB/K8gx9OTPFwc/msXYlE+lbWXEg/0Cbyp6LGt5nfjKjDuzeMk1PW07gf3jRT+cGiA/X886CMqOGvXB29y5Qex8FPGO5P1Ea6RY4JnOfr0FAFCdQpEcYQ/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:(13230001)(4636009)(36840700001)(46966006)(40470700004)(26005)(356005)(336012)(47076005)(426003)(86362001)(70206006)(70586007)(83380400001)(8676002)(4326008)(40460700003)(54906003)(2616005)(508600001)(110136005)(316002)(16526019)(36860700001)(186003)(5660300002)(1076003)(2906002)(7696005)(81166007)(36756003)(44832011)(82310400005)(6666004)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:33.5920 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fc542980-2652-4717-9f5f-08da39822fcf 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR12MB2446 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org AMD AVIC can support xAPIC and x2APIC virtualization, which requires changing x2APIC bit VMCB and MSR intercepton for x2APIC MSRs. Therefore, call avic_refresh_apicv_exec_ctrl() to refresh configuration accordingly. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 1 + 2 files changed, 13 insertions(+) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 7aa75931bec1..aa88cef3d41f 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -685,6 +685,18 @@ void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu) avic_handle_ldr_update(vcpu); } +void avic_set_virtual_apic_mode(struct kvm_vcpu *vcpu) +{ + if (!lapic_in_kernel(vcpu) || (avic_mode == AVIC_MODE_NONE)) + return; + + if (kvm_get_apic_mode(vcpu) == LAPIC_MODE_INVALID) { + WARN_ONCE(true, "Invalid local APIC state (vcpu_id=%d)", vcpu->vcpu_id); + return; + } + avic_refresh_apicv_exec_ctrl(vcpu); +} + static int avic_set_pi_irte_mode(struct kvm_vcpu *vcpu, bool activate) { int ret = 0; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 2cf6710333f8..31b669f3f3de 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4692,6 +4692,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .enable_nmi_window = svm_enable_nmi_window, .enable_irq_window = svm_enable_irq_window, .update_cr8_intercept = svm_update_cr8_intercept, + .set_virtual_apic_mode = avic_set_virtual_apic_mode, .refresh_apicv_exec_ctrl = avic_refresh_apicv_exec_ctrl, .check_apicv_inhibit_reasons = avic_check_apicv_inhibit_reasons, .apicv_post_state_restore = avic_apicv_post_state_restore, From patchwork Thu May 19 10:27:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854768 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 18D36C433EF for ; Thu, 19 May 2022 10:28:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236927AbiESK2E (ORCPT ); Thu, 19 May 2022 06:28:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236718AbiESK1j (ORCPT ); Thu, 19 May 2022 06:27:39 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2058.outbound.protection.outlook.com [40.107.92.58]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA354A7E14; Thu, 19 May 2022 03:27:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hyJ+fyAfg6LWpt4qKiEQkV5oSNQdpbmZB448v4E1EEOu3pa2Vv2KyQoU5LN6s6OlP8ie4rT74UYulNtu+ZtZ6eAmSRYlziYgsIU4Zy+9yu0NmR8TNzlTNhAOuY89j2ToGC18QLTow6IFbWkEJg5lnp9BtegXwKVCY/KyeG6L2eiXmJAZ0fs3ANFI54hQU5JG6QOHg+xj7xmFy6tVltZWfhK2U1JogbpOHFMPmneutXExY8QjjOsGYnnPzgwDmFAcobC0NfZhsNkfLmK4gAmLX7KUStB2uezxgcRZbWxY3Q++DDeoQxgKnO1rTMMa6vw4KwSYGw0p3PBDljsM/Btaug== 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=ODKpWb8InaTb4Bxr96ER51q4LIVlRZd6l2Z6ASaxK5g=; b=YHQ6AfCLtLbHuBVeti1zIkr1i3Z2LmYfxr2NdLfpMFkbLqO7HK6dhSXXXtPqyXdPO6tzXIPSZI3L4M+yaeVjxRNa2+JLuHIVqDHjM64QVLDLdd7Td16qVUPvO54RA6T6DJFoZxDyLZxxcd+c29Sv3nRJZ6SvhBG2ZEYus/7Qkusc7Lj3fT62HIbPbEADYxBxroz6BG5a1ED29Mxt9dAQqZii9F/cMMVrO/kkekGDu5kI8ZKK49gwH1BSw6Jdn98wlMIPu3QlkmXFFcb6DIwt8QR2xFmrQ1zQjySYD89eyahC/bf9Weq3Cvry43VzKQsvvGrX7aRb6J82WUS1HeXOmQ== 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 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=ODKpWb8InaTb4Bxr96ER51q4LIVlRZd6l2Z6ASaxK5g=; b=jxNiKcE39IcY0hcqBKYu1s5PYDJvRlvmWh+20v6vEwZe+hV/4DmbJVxRDoTRcsi1+PelkJBmYRmyZwYH4lGaSYjPE+i2wYbibkwtjn38F4Q5Qx/NhLQwZFxaobNRUb2J8F9YHKfFCXOzmfXrmeZZM4+l4ZmGWFJg1COFHCa/z5A= Received: from DS7PR05CA0060.namprd05.prod.outlook.com (2603:10b6:8:2f::13) by BN6PR12MB1763.namprd12.prod.outlook.com (2603:10b6:404:107::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Thu, 19 May 2022 10:27:34 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:8:2f:cafe::4f) by DS7PR05CA0060.outlook.office365.com (2603:10b6:8:2f::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5293.7 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:34 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:33 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 10/17] KVM: x86: nSVM: always intercept x2apic msrs Date: Thu, 19 May 2022 05:27:02 -0500 Message-ID: <20220519102709.24125-11-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 9819669b-2dcb-4db5-e9aa-08da3982301b X-MS-TrafficTypeDiagnostic: BN6PR12MB1763:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BQvOKh5g4mt/tVuA8E7DSJeGN6QnJQwH0UnMSKEqDx2TuYcC2Ee16/iYEM3cMGBfK1mlzOv5rCxogPt8W7incNCfTnZrgLYLiJIb3PbN98exNhimBYJZ3vlimKpXMMmpMsvzTraDthXze3q6BaixrmV+YGItAw26cNdKdtAS8ZiMQNXMMyPgGdbpGjzK//sjXqXD8EqzOQK+b6KDXVreTl/qJf/baPO6apShc1kcnpnBbN0+9xxhGg1D8eMUB+jcjqCTzSRor4whtlzRRzEkNuRKZh/XCL03kqDgVj9uDKeucEl/RJVBOXQ1TrIUYvP+iyXPkwl0mDOCi6wsByRswyWXhLkmFk8pSnnYOiKxWZcYAVD30o0cXDuYFV3taWX7DJdfiNEaX62AhXhy4hFF6gG0mouUL4enI5A0mWHUCo0klF8WiiwwlHRl6Np+7pAF8z/R68B3ZGcigwb+RnX5+BaeR4qDPwaXCu/W3OjBmxXNOV1sFbKOPQbF3H+q3bnwZYn7NamVZZqIwdXMihVOcnoTGb/a2CExXurRJWZ2CXFXwiTcFhteLG2/DFEWx+gei2TBPf6PiUD5mxLbXxFlPrSw8qUvOw4DI10guBaRN1cY8gVZeOmXLFAr5c9vDQ/ow467bMfYWJFMAfxA9iZeqlZHXuP/EKzLUbDUKU73vvBIJZyJB5/xEluqboHN2BZzFjeH9vVgn+niSyojbn4xFQ== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(8676002)(81166007)(8936002)(82310400005)(44832011)(4326008)(5660300002)(86362001)(2906002)(356005)(110136005)(186003)(36756003)(1076003)(54906003)(316002)(7696005)(6666004)(508600001)(26005)(2616005)(36860700001)(70586007)(70206006)(40460700003)(426003)(336012)(47076005)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:34.1076 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9819669b-2dcb-4db5-e9aa-08da3982301b 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1763 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Maxim Levitsky As a preparation for x2avic, this patch ensures that x2apic msrs are always intercepted for the nested guest. Reviewed-by: Suravee Suthikulpanit Tested-by: Suravee Suthikulpanit Signed-off-by: Maxim Levitsky --- arch/x86/kvm/svm/nested.c | 5 +++++ arch/x86/kvm/svm/svm.h | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index f209c1ca540c..b61f8939c210 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -230,6 +230,11 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) break; p = msrpm_offsets[i]; + + /* x2apic msrs are intercepted always for the nested guest */ + if (is_x2apic_msrpm_offset(p)) + continue; + offset = svm->nested.ctl.msrpm_base_pa + (p * 4); if (kvm_vcpu_read_guest(&svm->vcpu, offset, &value, 4)) diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 16f1d117c98b..7e53474c8834 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -517,6 +517,15 @@ static inline bool nested_npt_enabled(struct vcpu_svm *svm) return svm->nested.ctl.nested_ctl & SVM_NESTED_CTL_NP_ENABLE; } +static inline bool is_x2apic_msrpm_offset(u32 offset) +{ + /* 4 msrs per u8, and 4 u8 in u32 */ + u32 msr = offset * 16; + + return (msr >= APIC_BASE_MSR) && + (msr < (APIC_BASE_MSR + 0x100)); +} + /* svm.c */ #define MSR_INVALID 0xffffffffU From patchwork Thu May 19 10:27:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854767 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 8A2D0C433FE for ; Thu, 19 May 2022 10:28:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236920AbiESK2A (ORCPT ); Thu, 19 May 2022 06:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236744AbiESK1u (ORCPT ); Thu, 19 May 2022 06:27:50 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2057.outbound.protection.outlook.com [40.107.237.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9ED4EA7E27; Thu, 19 May 2022 03:27:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HkKSr2xMCP5SzpXQPIh3NWUUO6S8Qj4DHCNH1Of/U9AUKgVgDtqvv+WEa/PejuOUYPJ2LD/gdSjleso+U+PEahaDm8TElpy89C4rqU5YPrqTO7pfMDzNb4NaJM0LwEeP/gls8+rhckAfXt8dWf1LCQ75UHy7Sop8snl2myxOngX5ECi+WqE5uehuPpKB9GjehJOYLFMBzjolkZQLC7DjkmqpcrcWqprqCc3dqVxPAHxCh3neNhTc/JrXxDPNtBSFpz5SRoCh1Keiz6Aud3P7t0BHYwF6SI/NdE5kaZBaw87JYJ9jlVizMWAA7LypMlISS2t2L0qfdERCItCWNWDA5g== 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=kga6IgM/p/p5hs5qDWDbxRUoEkdYgZejzKFw01ko9qs=; b=Rt/ZBbiAvOa3z9GnfSIZXir0vOYYYR9qVqyj9c3LRp9NQvS5Sv7+3bRgE9s4+sVtWwGcAeTD1FNM/h9a2LYbgjykHyUthgJhj+3zDzO76yW3dguKqnI5TttwL962A8dBAjcxrJbQfEVJD/oWA6LGib7bxtjGcCTc7TRbNDaK98GaqCZhHumDdqN1v1j8VFcTR2hJwuU5RElp5k4a0MI+CQCkvYW40ZBxSrAJ4nCH8sKUG5hgkpR7aILCdXK0nhBI7+FkBchSnKgAWqbigEvzP4alz7firHudrqeK7iG0+a0URs+uHQrDPx+tWY2f1pvAeA5Zjaj5GfPDUsD4SZxATQ== 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 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=kga6IgM/p/p5hs5qDWDbxRUoEkdYgZejzKFw01ko9qs=; b=MOHNps39OkH4Htb419omtq+HRRjwF9M1GcH1TP5DDxLorrdDu8DyZFgPeG9L1pK8D4CYZ6M8Ikrj5y/IRDpSetAb/mEicTn88mKBhJ1rpm23+qXQfTsPM+ntartyvFdSVSfcm7w6dRVI3uKe0VOvrfwlRfRP838TwTS+jz3INrU= Received: from DM5PR12CA0069.namprd12.prod.outlook.com (2603:10b6:3:103::31) by BY5PR12MB3763.namprd12.prod.outlook.com (2603:10b6:a03:1a8::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Thu, 19 May 2022 10:27:35 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:103:cafe::7f) by DM5PR12CA0069.outlook.office365.com (2603:10b6:3:103::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.27 via Frontend Transport; Thu, 19 May 2022 10:27:35 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:35 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:33 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , kernel test robot Subject: [PATCH v6 11/17] KVM: SVM: Introduce logic to (de)activate x2AVIC mode Date: Thu, 19 May 2022 05:27:03 -0500 Message-ID: <20220519102709.24125-12-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: da23a182-2661-4aec-5d51-08da398230b3 X-MS-TrafficTypeDiagnostic: BY5PR12MB3763:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: F8IsAKxfVSsSSLxOJ4NzR+KL2fgPkMWZEmfqC1Eu0iNyrMELnR/izUMCY8Ls+yqrb4GwfeTFho27yPgp9CORB407Rb2j4UJuMqXezv/ZjynjQpzMAGKh5Avdq7+w/GvG1y688/iXG92UR9ZCunbPemcwMt3jWy3LDIzlqGjO+UuqLXIU5830A+M3gXTiuIp4MsoBwJ3+vo0Iaewh0J8QB9F5DWW97GdVtA8hzuaz8v6kywh7aNKk7FUM4ogy287nC3DiBijuvZ9VX7t/zx4rV/E91lBEisqLiE03Dzsn7+vhNg4El9BuGWfkSwGj4yzdutDDG+EtirmtcFPP/YVy32iSckA1rtSQHFGsQIMmWHxw7ULVjzFCUAsNwP8+l16KcZZ+8vo6s5sCTm4hiJnZ/ByFluKQuM3lzn6Wz4deEZR6PlJW5vzOTZZFs9WZadWO1LNrEjKt25yfpjiyFRgFFxqiOPt5xBPJ+dJCOzmv2Psc+rCagYQadBAZSpi195KDgkse5rCQbSLD8i5lyUcPVdDjpgm+sWrMTDop2KY3BCzqkaZ1fgxfgfaYE3Qt3d4fJVa5KzFWhd7yT5kDy8LSbqfw23gm0FKLnny32iSoNM39GXjQy9+7FXeN8ePv7N92AbNS7NG6MjYkIyt4h6wQoFAwXbusB91ul8F6TIJ3BsKibNVJw6ZkopBjniqBKFHuNQBK6Hul+1GQAYximmnV+w== 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(40460700003)(36860700001)(186003)(54906003)(26005)(2616005)(16526019)(82310400005)(110136005)(316002)(356005)(426003)(36756003)(508600001)(8936002)(1076003)(47076005)(44832011)(6666004)(70586007)(5660300002)(8676002)(2906002)(4326008)(7696005)(81166007)(336012)(86362001)(83380400001)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:35.0845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: da23a182-2661-4aec-5d51-08da398230b3 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3763 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Introduce logic to (de)activate AVIC, which also allows switching between AVIC to x2AVIC mode at runtime. When an AVIC-enabled guest switches from APIC to x2APIC mode, the SVM driver needs to perform the following steps: 1. Set the x2APIC mode bit for AVIC in VMCB along with the maximum APIC ID support for each mode accodingly. 2. Disable x2APIC MSRs interception in order to allow the hardware to virtualize x2APIC MSRs accesses. Reported-by: kernel test robot Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/svm.h | 1 + arch/x86/kvm/svm/avic.c | 39 +++++++++++++++++++++++++++++++++----- arch/x86/kvm/svm/svm.c | 18 ++++++++++++++++++ arch/x86/kvm/svm/svm.h | 1 + 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 4c26b0d47d76..13d315b4eaba 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -256,6 +256,7 @@ enum avic_ipi_failure_cause { AVIC_IPI_FAILURE_INVALID_BACKING_PAGE, }; +#define AVIC_PHYSICAL_MAX_INDEX_MASK GENMASK_ULL(9, 0) /* * For AVIC, the max index allowed for physical APIC ID diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index aa88cef3d41f..d40170082716 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -63,6 +63,36 @@ struct amd_svm_iommu_ir { void *data; /* Storing pointer to struct amd_ir_data */ }; +static void avic_activate_vmcb(struct vcpu_svm *svm) +{ + struct vmcb *vmcb = svm->vmcb01.ptr; + + vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK | X2APIC_MODE_MASK); + vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; + + vmcb->control.int_ctl |= AVIC_ENABLE_MASK; + if (apic_x2apic_mode(svm->vcpu.arch.apic)) { + vmcb->control.int_ctl |= X2APIC_MODE_MASK; + vmcb->control.avic_physical_id |= X2AVIC_MAX_PHYSICAL_ID; + /* Disabling MSR intercept for x2APIC registers */ + svm_set_x2apic_msr_interception(svm, false); + } else { + vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; + /* Enabling MSR intercept for x2APIC registers */ + svm_set_x2apic_msr_interception(svm, true); + } +} + +static void avic_deactivate_vmcb(struct vcpu_svm *svm) +{ + struct vmcb *vmcb = svm->vmcb01.ptr; + + vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK | X2APIC_MODE_MASK); + vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; + + /* Enabling MSR intercept for x2APIC registers */ + svm_set_x2apic_msr_interception(svm, true); +} /* Note: * This function is called from IOMMU driver to notify @@ -179,13 +209,12 @@ void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb) vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK; vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK; vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK; - vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE & VMCB_AVIC_APIC_BAR_MASK; if (kvm_apicv_activated(svm->vcpu.kvm)) - vmcb->control.int_ctl |= AVIC_ENABLE_MASK; + avic_activate_vmcb(svm); else - vmcb->control.int_ctl &= ~AVIC_ENABLE_MASK; + avic_deactivate_vmcb(svm); } static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu, @@ -1076,9 +1105,9 @@ void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu) * accordingly before re-activating. */ avic_apicv_post_state_restore(vcpu); - vmcb->control.int_ctl |= AVIC_ENABLE_MASK; + avic_activate_vmcb(svm); } else { - vmcb->control.int_ctl &= ~AVIC_ENABLE_MASK; + avic_deactivate_vmcb(svm); } vmcb_mark_dirty(vmcb, VMCB_AVIC); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 31b669f3f3de..0ec2444c342d 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -746,6 +746,24 @@ void svm_vcpu_init_msrpm(struct kvm_vcpu *vcpu, u32 *msrpm) } } +void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) +{ + int i; + + if (avic_mode != AVIC_MODE_X2 || + !apic_x2apic_mode(svm->vcpu.arch.apic)) + return; + + for (i = 0; i < MAX_DIRECT_ACCESS_MSRS; i++) { + int index = direct_access_msrs[i].index; + + if ((index < APIC_BASE_MSR) || + (index > APIC_BASE_MSR + 0xff)) + continue; + set_msr_interception(&svm->vcpu, svm->msrpm, index, + !intercept, !intercept); + } +} void svm_vcpu_free_msrpm(u32 *msrpm) { diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 7e53474c8834..309445619756 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -551,6 +551,7 @@ void svm_set_gif(struct vcpu_svm *svm, bool value); int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code); void set_msr_interception(struct kvm_vcpu *vcpu, u32 *msrpm, u32 msr, int read, int write); +void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool disable); void svm_complete_interrupt_delivery(struct kvm_vcpu *vcpu, int delivery_mode, int trig_mode, int vec); From patchwork Thu May 19 10:27:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854766 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 2952BC433F5 for ; Thu, 19 May 2022 10:28:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236881AbiESK16 (ORCPT ); Thu, 19 May 2022 06:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236709AbiESK1i (ORCPT ); Thu, 19 May 2022 06:27:38 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2089.outbound.protection.outlook.com [40.107.93.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA45EA7E16; Thu, 19 May 2022 03:27:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KQf1EnjSOe8JPmcOzUDUvBmY24+rXtgBPfH+RD8Oi51vwUIKmLVi9J1HFTI9tMyK0eeFJNqEQP6yqqp4+OStza6Vjk6sy0uD7OQvQ0i+uEeviLQlodqfwenGR+h1wBDqGkEwSe2cDIoOY1aCZG2dS4WEd8EkLJ1fDKanZ2/VzKAywH4zD0OlKZse2j8h0VX1/4w0vFrV/JaHLnyWmhMu/ox0q0XAXnUGTs+BjVeqk2ceOLibvMAd4IhuWNpivaUhNNEY9JD+Yl8sRKWY+zqg1ORzrp0siSX9xZ4YN9Uayi+WdSkAu2ahLn0PF3kAB0rdeO1rf4SfUGI7qslELMxYIw== 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=g/Bie8oDP8RAYNrsWPeGRtId0tjZaZQocZJiTWghtFg=; b=C6bzk+IX2RCF83fmHPEAy3T5Pgp13j4QzOBgHkjmXkCRgC7qeBG3ZiPbM606eqvUw37a+177lapekjvUW5dlNPAiO/wmB9rIop1CIRzQOmVXHuXVzHdAxZNtmc1Wkj3MERMa5p0F8lljIeCgEZ1ZbBD+HZWEERnQD46NQMrjUbwbvABIF8bT82ofXEFeZf9cTwNvxSKquXTHLJPqf4SQnjZbDbtmWtH5yURW23+aovX1omm2/+J7d0CclWwvp8FCQCAn0saSyDByaAC+Rh3EyLuyd0VIdHFxyZRo8xiyHxXd6EOPWNXX9L4iOZ+tBvYP9DOLvH4RVWTrPxOk2BZfog== 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 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=g/Bie8oDP8RAYNrsWPeGRtId0tjZaZQocZJiTWghtFg=; b=qzf+NJj3/HJM4kJt6pwVbd90v+LW7Va/rq6MvgrLa5G99C6xA8zbgTBPlbk55cHYuB5poNtReJ1TQzv7iOTPGMXK6v5LCwbPqLbkcxo1H95vbzxbftYcrG+vjCuq8/SJ4Bh3YU0uU+7K4wgUmSQM0/9+cjl6fDBHwbKKX4OWgfo= Received: from DM5PR12CA0056.namprd12.prod.outlook.com (2603:10b6:3:103::18) by IA1PR12MB6281.namprd12.prod.outlook.com (2603:10b6:208:3e7::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.16; Thu, 19 May 2022 10:27:36 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:103:cafe::57) by DM5PR12CA0056.outlook.office365.com (2603:10b6:3:103::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.26 via Frontend Transport; Thu, 19 May 2022 10:27:35 +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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:35 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:34 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v6 12/17] KVM: SVM: Do not throw warning when calling avic_vcpu_load on a running vcpu Date: Thu, 19 May 2022 05:27:04 -0500 Message-ID: <20220519102709.24125-13-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1d4bb421-1ad0-4b3e-55c1-08da3982312f X-MS-TrafficTypeDiagnostic: IA1PR12MB6281:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: cyw1D/5nNgff8mDye5mcu7Gs07nihjNF4/C/Ij7Wn2zVgA/1o3Y3/oq4dgTOY0gw7W0hqZZGKg87hTLNOMZBWxT6taFjc+CdInuGcSCEK8gJd3qVsq7vPKhNJKg6dQTBlGf4vIYe5qmoa37Oh+DJYsmKhbdqnEeD/PP6TOSlirXiX1P+wsSx9vxkP2qXzv+EP7+Gf/1Trt980rqK1HVL+c57mrM0CbGCejz8Z9RSRoh35lR0l+gvZNuq9J/XYIUDggLZs+HhnRWtM5Nh8gZaTfkZCaEyRAIclabaOUsNQY17z3qohsMNmD21hzx6iVelkmrf+vThKJA6sxC0sb3F+KOI8mFr1ntGbpQfm0nFipBdY3vzpbgdoK5BD9Za7IrP0zSxRAiu93y9VjVEtWVZocUhQEhmVc+SOkSJ93EnVX+GEgiIBbaziVZQlSr9NtUX/6Xau2TXl6tZIkm+/JyESevNcQF/UkH+UXqDf1u5yUBybcwLdTy4lUVX/IKFX067YOVYZsLVKUvsGGH2tNScOFXX2of22z4xURzjEnFuI/YVUHGWic/iuLN5tXGKT3Gpvgri65AsdohmhzwJwhZqvoO3eXymvQXE+ZSFHTYUxwzUrhfjPyS2pke3GsK81TOgYQK/Ld4DR+pXOnAzcLPoA+wJAf8zttVauUkIsE+gFGMPVjVxGP7AFaUjILtdxP63vCQwAhi6xySU8zkklW8AAA== 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:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36756003)(83380400001)(2616005)(26005)(70206006)(8676002)(82310400005)(6666004)(70586007)(4326008)(36860700001)(1076003)(40460700003)(47076005)(426003)(7696005)(16526019)(336012)(186003)(508600001)(86362001)(2906002)(8936002)(5660300002)(356005)(81166007)(44832011)(316002)(54906003)(110136005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:35.8970 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1d4bb421-1ad0-4b3e-55c1-08da3982312f 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6281 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Originalliy, this WARN_ON is designed to detect when calling avic_vcpu_load() on an already running vcpu in AVIC mode (i.e. the AVIC is_running bit is set). However, for x2AVIC, the vCPU can switch from xAPIC to x2APIC mode while in running state, in which the avic_vcpu_load() will be called from svm_refresh_apicv_exec_ctrl(). Therefore, remove this warning since it is no longer appropriate. Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index d40170082716..2d9455338b1f 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -1038,7 +1038,6 @@ void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu) return; entry = READ_ONCE(*(svm->avic_physical_id_cache)); - WARN_ON(entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK); entry &= ~AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK; entry |= (h_physical_id & AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK); From patchwork Thu May 19 10:27:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854770 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 C2016C433FE for ; Thu, 19 May 2022 10:28:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236778AbiESK2f (ORCPT ); Thu, 19 May 2022 06:28:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44322 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236779AbiESK1y (ORCPT ); Thu, 19 May 2022 06:27:54 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2057.outbound.protection.outlook.com [40.107.243.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20BEFA7E22; Thu, 19 May 2022 03:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cqaditm+snspOOXiug5va+2ndtOnGXaCD63nx/NGMstrJL4R7dEus1Bo6glFzYBXxUqpzck7FB3+HMOGdfYJCjXfhYvahg1GHYdEq1VBiapLdOnZcP3QRjxkK9P+wyw/XQQw5T6w3rGI+8FXPg0jtHPFFdoaRK/pa8TFZSm2+NpePw7Yip+byD/ZqmVBDrHdT5O/zNVZUs3/pEFdWKMXxN8DfFLv9TcH9++7uFSVugcSCPfj9GSFKH3o6yhUyQGL6ydsmctWxI0Z31EO6vVvCmaVWRTdqwbXI/cXRK29rfRI5rC3Fvqfn93oYVLRUdGPtGx0npMI6Isr/lk4x/oIHg== 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=2cNgGsdFWKRWIjCLSQ4nHmgOHOsK+GyL6ZVYxn6pkHA=; b=nOyPhExaR4qai4CQu0nwMe66kJ6UX5j72DvQl5V7omDPhHpsO/V56U9d+ZHuok3/lFyp1+I4OBylt30IvuAJcsdAyXl95X4T+kzBpMn6mcLgwcPZ9zKcSy8Ht5sFGFHk1CTTRv/GTmKb68JPNXI+jPoW3jUiVWl3ZdILsKoNaBzP67RmuPoxCqAPm01vqOo5V+MqX6mU7WKCuxtNFFscb+6FyaGx/FI/3B85+EExpRNc+1Du+2nDXbh348T66xeERguw9sG21v2EvabExF8BWMgomrYDPNTaqms17BTQo0jVQRzcC9AuRzW+jDQNse32KOSn+BfmPTUQp8YUXY/61A== 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 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=2cNgGsdFWKRWIjCLSQ4nHmgOHOsK+GyL6ZVYxn6pkHA=; b=NNtbvF6NnEcse2H3K4VwLl8YBZ9G+Wu8QVClcohw5+QN2Yi+fckku1GENmXIHJOBImDX0Q/mGrROsxGgNpqAU60AKU+gOTdgIufLoFPZtl57HomIOF6Yzz0C//EuPWSc/6Pbnup4jPcPDRWHX79FqbGXgPzmwEDrpXgxOQV7mzg= Received: from DM5PR12CA0051.namprd12.prod.outlook.com (2603:10b6:3:103::13) by CH2PR12MB3703.namprd12.prod.outlook.com (2603:10b6:610:2d::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Thu, 19 May 2022 10:27:36 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:103:cafe::1) by DM5PR12CA0051.outlook.office365.com (2603:10b6:3:103::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.26 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:36 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:35 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 13/17] KVM: SVM: Introduce hybrid-AVIC mode Date: Thu, 19 May 2022 05:27:05 -0500 Message-ID: <20220519102709.24125-14-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 231678d3-52f8-4fdb-2926-08da39823185 X-MS-TrafficTypeDiagnostic: CH2PR12MB3703:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6f4nMkZkR6fmy2iibHppdYRgPkzKK3FY4C/Uyq7av7r+E5E35f0qEEecITjslV7HyftzDKjTQWOwUWBvygXEnjb9RYK5Ya54fYQN+6iWf/ouDruJgvAOpOIkcxkyFhA3ICuRJYWjH8erY7hd89Kk5GGBEOdIh3GviMD160E8qempqSdp5VwfqYhe6efm2cocPUU9eeyJe4DbTLp+fRc1Xw+RcntozGvHUVnL7JUYNDh3JYw7pYIll9IPmvVT7dhq02RCL5eiYMBcJLJDniaj5AuvFo78SRLY5lbVDDunxyav4KZS1ecBJnfT9sSafKQUr3gZqwjnqCfXw547ETDMI1iHUZKgxl2IQIX1IXo/+G1K6EgB3RUc4+8pRZ99yzyz4xAPBi7d81IGUw6tUxCGnuTmxRNCDbYi2itwisxkJ0OoPJhxmR8uGNly3dxzxNicWpv2S4/xwFhPcrvN6cf5H/vvOUs7iaU7jfGt/zZuIWIcUCwBGVL+Dm08fwmGjbgO1YnJNeUcCV93/YpTujTXjVoD1L85RcUU/KjUQBxAG8r8gRArfqKHdJmISrVxuNbM3ze0bJQWGfeMbpiR/v0vz0CHne5gGvY4cqAPEcI+KVdKQ41GyUvlsHXpeeNBYjZO2HwVusH/4Rz66hZ5F/bhRY/lnwT3NYa5btaqG/rK+i/Gyheh5sOvJjFRIQL6HE69n+Zgi2zHbAbNq0BN03VqJw== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(508600001)(186003)(16526019)(8936002)(44832011)(47076005)(70586007)(5660300002)(336012)(36860700001)(81166007)(70206006)(36756003)(54906003)(110136005)(86362001)(26005)(40460700003)(83380400001)(356005)(1076003)(4326008)(2906002)(426003)(6666004)(8676002)(7696005)(2616005)(316002)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:36.4751 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 231678d3-52f8-4fdb-2926-08da39823185 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3703 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Currently, AVIC is inhibited when booting a VM w/ x2APIC support. because AVIC cannot virtualize x2APIC MSR register accesses. However, the AVIC doorbell can be used to accelerate interrupt injection into a running vCPU, while all guest accesses to x2APIC MSRs will be intercepted and emulated by KVM. With hybrid-AVIC support, the APICV_INHIBIT_REASON_X2APIC is no longer enforced. Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/kvm_host.h | 1 - arch/x86/kvm/svm/avic.c | 13 +++++++++++-- arch/x86/kvm/svm/svm.c | 9 --------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index c59fea4bdb6e..da03111b05f6 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1051,7 +1051,6 @@ enum kvm_apicv_inhibit { APICV_INHIBIT_REASON_NESTED, APICV_INHIBIT_REASON_IRQWIN, APICV_INHIBIT_REASON_PIT_REINJ, - APICV_INHIBIT_REASON_X2APIC, APICV_INHIBIT_REASON_BLOCKIRQ, APICV_INHIBIT_REASON_ABSENT, APICV_INHIBIT_REASON_SEV, diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 2d9455338b1f..bac876bb1cf1 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -71,12 +71,22 @@ static void avic_activate_vmcb(struct vcpu_svm *svm) vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; vmcb->control.int_ctl |= AVIC_ENABLE_MASK; - if (apic_x2apic_mode(svm->vcpu.arch.apic)) { + + /* Note: + * KVM can support hybrid-AVIC mode, where KVM emulates x2APIC + * MSR accesses, while interrupt injection to a running vCPU + * can be achieved using AVIC doorbell. The AVIC hardware still + * accelerate MMIO accesses, but this does not cause any harm + * as the guest is not supposed to access xAPIC mmio when uses x2APIC. + */ + if (apic_x2apic_mode(svm->vcpu.arch.apic) && + (avic_mode == AVIC_MODE_X2)) { vmcb->control.int_ctl |= X2APIC_MODE_MASK; vmcb->control.avic_physical_id |= X2AVIC_MAX_PHYSICAL_ID; /* Disabling MSR intercept for x2APIC registers */ svm_set_x2apic_msr_interception(svm, false); } else { + /* For xAVIC and hybrid-xAVIC modes */ vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; /* Enabling MSR intercept for x2APIC registers */ svm_set_x2apic_msr_interception(svm, true); @@ -978,7 +988,6 @@ bool avic_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason) BIT(APICV_INHIBIT_REASON_NESTED) | BIT(APICV_INHIBIT_REASON_IRQWIN) | BIT(APICV_INHIBIT_REASON_PIT_REINJ) | - BIT(APICV_INHIBIT_REASON_X2APIC) | BIT(APICV_INHIBIT_REASON_BLOCKIRQ) | BIT(APICV_INHIBIT_REASON_SEV); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 0ec2444c342d..e04a133b98d0 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4061,7 +4061,6 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); struct kvm_cpuid_entry2 *best; - struct kvm *kvm = vcpu->kvm; vcpu->arch.xsaves_enabled = guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) && boot_cpu_has(X86_FEATURE_XSAVE) && @@ -4093,14 +4092,6 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vcpu->arch.reserved_gpa_bits &= ~(1UL << (best->ebx & 0x3f)); } - if (kvm_vcpu_apicv_active(vcpu)) { - /* - * AVIC does not work with an x2APIC mode guest. If the X2APIC feature - * is exposed to the guest, disable AVIC. - */ - if (guest_cpuid_has(vcpu, X86_FEATURE_X2APIC)) - kvm_set_apicv_inhibit(kvm, APICV_INHIBIT_REASON_X2APIC); - } init_vmcb_after_set_cpuid(vcpu); } From patchwork Thu May 19 10:27:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854772 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 2D2A2C433FE for ; Thu, 19 May 2022 10:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233540AbiESK2k (ORCPT ); Thu, 19 May 2022 06:28:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236783AbiESK1y (ORCPT ); Thu, 19 May 2022 06:27:54 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2062.outbound.protection.outlook.com [40.107.92.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20E11A7E3D; Thu, 19 May 2022 03:27:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AmAnlQ8O4Jg6Hl3N5ZJsXJeyGnT8j9lm9j79Lke6mCEF+ejv+dwkThFv1/zHNW4acGpp/1yyiHIKyomCw67mNlxIjziLaTXCoh06kPsj6Nuuijo/NNpdSfaHST+1wWs+grBA8a0ld0FbHT3e7q3mo+laH9E9CTJMqX26NeiauSUhn45xvoBisruLmZPbx7xXq6Y188XFA4ajqa3DaTOCMwrBFCAPxTdDi/aZAsb3WBJc/GG9NPmvOhGYyN16Prd1CA2fYDpq2+ZvBzE3bB/7RwYT3TELdUksyCMd4EqSyu+Pkq0pSO8MzsAj5cUf6r4dox/Go4Bg+tj1mksmS28eXA== 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=An59Audd9Wb4f9DlFPkPLOYObyXGIgmHhDYd1Z0I8EI=; b=eAGaR1cxMbx/XqQiI458bSQqrgWObU8hCTRCKjKfbNwN5BIINA0Ml5DMQN0R2hhzJ1nCoQ8ywPM0wTzmcfGhUi/O4JdWoNwQ9Qqwm3jjGBB7jaZEySGaPWOErCR7LxwoQ9JBN7bMQEzQWuFSfqHtxlNvAnnLc/O5A/S5y/xh0IDBgjji0EnMLq2uZhZN6P940kFjlzlH3TFGePMZqyIIH0aWFEgiRC19lLi7a25VPOkaEo1CAsIt5YPnwDM3M7L4ohjEyDmxGJ+TERCHdK6jAufTOdhyjwifUNMbE7ouvK2D3CRyL4dyjM4Ii2wU90JRWowWf+g5SiBIWeDljYCpNg== 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 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=An59Audd9Wb4f9DlFPkPLOYObyXGIgmHhDYd1Z0I8EI=; b=O6mxHJdPPltRg7KSoZ6EQdbVdyRrDPqq3pfuQeW9AUGzIc/LOq3hpbuPoivB7QHbJYMfTo5AG87HblsgjmYiGl3Uma5vjDf4rBhxm1uNUvKCyjVPh+4wdkwzfm7GpSuJ/jTwjR8zZtVirmyQ2vm4Gs0sfhXAUpAgxyVjwuOZNdw= Received: from DM5PR12CA0056.namprd12.prod.outlook.com (2603:10b6:3:103::18) by CY4PR1201MB0103.namprd12.prod.outlook.com (2603:10b6:910:17::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Thu, 19 May 2022 10:27:37 +0000 Received: from DM6NAM11FT057.eop-nam11.prod.protection.outlook.com (2603:10b6:3:103:cafe::d4) by DM5PR12CA0056.outlook.office365.com (2603:10b6:3:103::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.26 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT057.mail.protection.outlook.com (10.13.172.252) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:36 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:35 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 14/17] KVM: x86: Warning APICv inconsistency only when vcpu APIC mode is valid Date: Thu, 19 May 2022 05:27:06 -0500 Message-ID: <20220519102709.24125-15-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 37f08fae-d6a7-4d1b-4c58-08da398231ca X-MS-TrafficTypeDiagnostic: CY4PR1201MB0103:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: UgA2dnukSZyLkkzgF0QQkZlQgNr602UmFh4uR6+5LAqxeP6ZPbgu8dc0rZeMGyXXqecfNTJpTteAXFJ+QvARJ8PpEuQj/0hG8/R3VzAduRJS/jYn3UQvnsnxUYEUNCxUqEuXwF0GBmmK6wgDE925Dp2TRlw2m/q50tIiPOWx0QhqVO3HQADEuIfIOkd2U/e8gHI2AZg7l2pQokOD8YueWKPvVsHOtoF1Qteh3zXiY8v0dMPcfeGLSz31eWYiuP//DdyirsT4eHL8GedVnL22P0Yrru4wvbvGbpUkJqlORui0SoTU6r78kluvqwpyCZ00OwDL/knL0XwguH9PHAo05EiWmxhBcxqW6b2riaXM6hMFUoRDVSihgwCbuCcUQE/Q0+BzbhL1TKoAKi4n9yXqBwVpLsb4zu1U3DqkxlsZ/Zpb9bByaYfSCMe4ci9enPgdvY8PdBciGEbQ0Olxgav+f4ZphU1crLgFtp6ofdN3xXurrTikWLrYyU45mdOVcnH2WerDEmKKHNmJ2arMzk9IY1dtFaFItv2Kw6SCvnqxPTuugy8xUFm5EAyJ4RfIA9mIynmo4YZZBqPOFKXPYw4yMKPKIzIaQU2XmhtgRzlVZCI23JxNxlA5b0gKKf+RmbQbgCPjTqT+N0x5JajQ4b1j4Rx6Y2Zpqy0jSue1hIUYV8jy7yxsgur+mipkogc/S5PwjwodK9lY9DH/g8oNYIxREg== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(8936002)(83380400001)(316002)(7696005)(1076003)(82310400005)(6666004)(2616005)(508600001)(356005)(44832011)(110136005)(2906002)(40460700003)(36860700001)(4326008)(8676002)(70586007)(70206006)(54906003)(186003)(16526019)(336012)(81166007)(426003)(26005)(5660300002)(86362001)(36756003)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:36.9282 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 37f08fae-d6a7-4d1b-4c58-08da398231ca 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: DM6NAM11FT057.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0103 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When launching a VM with x2APIC and specify more than 255 vCPUs, the guest kernel can disable x2APIC (e.g. specify nox2apic kernel option). The VM fallbacks to xAPIC mode, and disable the vCPU ID 255 and greater. In this case, APICV is deactivated for the disabled vCPUs. However, the current APICv consistency warning does not account for this case, which results in a warning. Therefore, modify warning logic to report only when vCPU APIC mode is valid. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 77e49892dea1..0febaca80feb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10242,7 +10242,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) * per-VM state, and responsing vCPUs must wait for the update * to complete before servicing KVM_REQ_APICV_UPDATE. */ - WARN_ON_ONCE(kvm_vcpu_apicv_activated(vcpu) != kvm_vcpu_apicv_active(vcpu)); + WARN_ON_ONCE((kvm_vcpu_apicv_activated(vcpu) != kvm_vcpu_apicv_active(vcpu)) && + (kvm_get_apic_mode(vcpu) != LAPIC_MODE_DISABLED)); exit_fastpath = static_call(kvm_x86_vcpu_run)(vcpu); if (likely(exit_fastpath != EXIT_FASTPATH_REENTER_GUEST)) From patchwork Thu May 19 10:27:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854774 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 AE8E1C433EF for ; Thu, 19 May 2022 10:28:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236902AbiESK2s (ORCPT ); Thu, 19 May 2022 06:28:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44314 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236760AbiESK1v (ORCPT ); Thu, 19 May 2022 06:27:51 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2070.outbound.protection.outlook.com [40.107.93.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8B70BA7E31; Thu, 19 May 2022 03:27:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fmQfA1kKYPsW/OGAgfOqoYzfLelpzBVizwDnlSAbqXRXDAgHQUmm20dd7p4sXFIpfFcPgjJoq7xGRPurUAw0CVTvNUuVYyxt7KRMBjn4rYtjq7wHCiA7tw2M9F/v0bKwOFPYBQT8B5p5qDhr1dP6eJyFCJLaAXFTQiEekonL6LoaiVyLI9mtN5S2YK8Mt2tEGuKP+5ckCbqZxNeYz26aDkY8rFAYPcxRnH85Oup3nAcGecvis67oZGkFjLTl85gDimlqrsC7Zsg4cuBYnzqZxLFsPEISdJhH3Wkb1/j/Zpu8pwMtLcUoIRQBhex+BANgP6RtE1rIsGwlzv+4TLUa3Q== 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=mXunKw91AziOXjcu05kGRHnt4FdkawppGowMHSMaU3Y=; b=HatJJHyVlBoYuyCNo5AnSzgh7ceIoqqZQSf4OxwPxQ+S9WpmynN0a/87ijnli3fRkbswgKxxNTSnaQg9iHtZjhpt0vAQWCCbBUGTiPNFChrfkTezDxJ4ke8mCGvX4GBQdRBpdbOAgr9rBR4q2h2OdW5y9WIpgGC2fROGFTawPTcBnjEHl5IWwgxYgBM9EZ57Xh+ulDHtxs8aJpV9MzEcKQ3vck/5JzH3ET/5fzdLBnDXY0mNHqMGDXyWeoFzd3+cGQMC/N/z1HCwrZmcrNuskxaQwsRmalj0+/bGRAQhqE9G3J9xD2qkNZKqIKFqfYiXbojYnsjPnt/3Z0crOlruyQ== 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 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=mXunKw91AziOXjcu05kGRHnt4FdkawppGowMHSMaU3Y=; b=VWei6o61KGkMsFyEFJjqNwFBbp02W3RPRdHQkHOk0O+cQkA4vb0HtVbO2GN5kH3gC/waXyzzkvMk6IJ0MOMuHz6WUPiBsikDIjqTiKTw+iupslt3pFa08bPyEsP7BonrLzwmY9SmplfV1wUIzAImv4SvmrWnZ0lGaeM3taKkRLY= Received: from DM5PR11CA0014.namprd11.prod.outlook.com (2603:10b6:3:115::24) by CH0PR12MB5300.namprd12.prod.outlook.com (2603:10b6:610:d7::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Thu, 19 May 2022 10:27:38 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:3:115:cafe::86) by DM5PR11CA0014.outlook.office365.com (2603:10b6:3:115::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.27 via Frontend Transport; Thu, 19 May 2022 10:27: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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:37 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:36 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 15/17] KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible Date: Thu, 19 May 2022 05:27:07 -0500 Message-ID: <20220519102709.24125-16-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8fd3de3f-f8ca-4efc-a77d-08da3982325b X-MS-TrafficTypeDiagnostic: CH0PR12MB5300:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Ass6eyHuyLA1kliYUpI4UFnXcT6oIVw1UBHLQ8gXXWocmJ2ZF8fiMCdDsICydDtC7OXIlIQY1GcpGQyAzcHPSn/MwF9q98+mS14GMuCd1Kd0zrrQeJJZn66Qtl71dS2cDx7ZA+QYyndlncOnaXtLGDOf0N5WgZ5siyjBDGXI49cErU5vy4654Qw8mFitng3T3bkfEU0NvrS0Q6C/1n9izpP0Q11h0B+t09EYyDlooj4suk9hUvpkxnf2K09sgCPwcdQ7x8Xn2JkosTxcjT87A6MiGw2qvVnj2OBGg8ZgNCQmd0PkbIdW4oyHMH2aT/Evh3V1/RDYBnb7glBcKR6u0PQiB59ejKaWl8zxKecAlcuHZ9T2zPKfDpDthz3EOARhT+AnMnx+5LDgL00SZeyh/EaE0xw4UlIaWeKmzcpzrX+Bo19D4cUnW2JTQV3z2mrug6h0FQ0dqKlKT1Zl/bS8zZv7OznyrYN2Q1ZDEDzC0ESsb0VjLdvDZILTbyGY77fn0iwPY1T0ZzqinKGjzegixEPDH8bj/0aM1QUbW6cR9aLV6f179Osew5VOl1tAMP3qlE14eN97nxdv4CwzNcte9A0YCcGMWoKzHiSrlW5C77WG91G/gtKEUPD0RDzfQ7rjIHooufqtjLANcf80a9ILuf8nQbtVtba7wCZIglxzUvtyd8NEyQ6mxCo8TxXwu6+YOtWzOptAw7UbMGSdSNSiyw== 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:(13230001)(4636009)(36840700001)(40470700004)(46966006)(7696005)(8936002)(1076003)(5660300002)(508600001)(2906002)(82310400005)(6666004)(47076005)(44832011)(336012)(36860700001)(426003)(83380400001)(86362001)(40460700003)(316002)(26005)(16526019)(2616005)(36756003)(4326008)(81166007)(8676002)(70586007)(70206006)(186003)(356005)(110136005)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:37.8651 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8fd3de3f-f8ca-4efc-a77d-08da3982325b 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5300 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For x2AVIC, the index from incomplete IPI #vmexit info is invalid for logical cluster mode. Only ICRH/ICRL values can be used to determine the IPI destination APIC ID. Since QEMU defines guest physical APIC ID to be the same as vCPU ID, it can be used to quickly identify the target vCPU to deliver IPI, and avoid the overhead from searching through all vCPUs to match the target vCPU. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index bac876bb1cf1..9c439a32c343 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -358,7 +358,26 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source /* For xAPIC logical mode, the index is for logical APIC table. */ apic_id = avic_logical_id_table[index] & 0x1ff; } else { - return -EINVAL; + /* For x2APIC logical mode, cannot leverage the index. + * Instead, calculate physical ID from logical ID in ICRH. + */ + int apic; + int first = ffs(icrh & 0xffff); + int last = fls(icrh & 0xffff); + int cluster = (icrh & 0xffff0000) >> 16; + + /* + * If the x2APIC logical ID sub-field (i.e. icrh[15:0]) contains zero + * or more than 1 bits, we cannot match just one vcpu to kick for + * fast path. + */ + if (!first || (first != last)) + return -EINVAL; + + apic = first - 1; + if ((apic < 0) || (apic > 15) || (cluster >= 0xfffff)) + return -EINVAL; + apic_id = (cluster << 4) + apic; } } From patchwork Thu May 19 10:27:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854769 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 96A57C433F5 for ; Thu, 19 May 2022 10:28:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236758AbiESK2a (ORCPT ); Thu, 19 May 2022 06:28:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236807AbiESK1z (ORCPT ); Thu, 19 May 2022 06:27:55 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2046.outbound.protection.outlook.com [40.107.237.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DD489A88B3; Thu, 19 May 2022 03:27:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=AOX8n5mdEoJ8B/rJKZXyFdFypyzomVqse6yJfC0TeH1dQKKRNoveTo6JrOxzrMh/Xi4UQ0PAkbFimSfHTBUaVTVtGqUVnCQjjslufUgyqVqHccg7SksMuwCzy+cEbIt81a6vNaYbyLLc0gzOyLImKclBUApOxv3BZI0oJCWosTRMnTzYLKsqZOD7adpmkqWGbth8C/FwNjv0uG4nKHtYQA85/diyD8gG4Z5+fKbN8HtsoUz0yaGIs0ZbwvxKN2YvKiBg66eFsGgexFcT3f6MVKZCsgHeMXqfTMjN0XvB53SxfcJ2HRRrP99ZFCZ9WS7yE7MFbtPGIb8+azMY9M0WaA== 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=G/bvutB7S+dp6/W0J0zqVf2Gzw00JZ9rk2oPU8jUQCs=; b=EENsA6MifkuYZvjBYcqDkCJ/1V52kuoQwGrtotoGT2z6zuiIttgWrmBWIczNxlgIHZz0Ma4RKkHfGEIP778xKcxa9rBzXSeYeIxocH6xALEpWcXKqw5j92OoaWtIFN+2uyWP3KbLw4GjscbiOHuj7wFbT+D+MZE4JlDXHKFYAHH28/CgjEx4AkSF314XCwdT8XdWCnaAbeQwHXDVuE7nVDbA3u5sfaQb5JJxNsNXTDpBradKgX0P9nvCHRNKmG+Wi9IPhkTktmecnj0uVNVCCzrhX8XM5oY1Rlj1gsFBwFXLqXjQym//Ba5LuLxX+27qHChHM176ZiZungjsg7AWWw== 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 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=G/bvutB7S+dp6/W0J0zqVf2Gzw00JZ9rk2oPU8jUQCs=; b=XYISegQ9noTbQVFBrIm45kt1vXBfKJowu3CSeC23aHqCKQhm51RaeZWlrssME3KilJTzR20Y3qRZIh+irnYXVm7ZEQmsKBXNzsQ5RXPDBJf95LsbPTNHg1SKvsDbtGTlptEUFfgZJ/WHLsVg0ZpTn0NyUxDweN1oCw23ZKPFMNw= Received: from DM5PR11CA0003.namprd11.prod.outlook.com (2603:10b6:3:115::13) by BL1PR12MB5825.namprd12.prod.outlook.com (2603:10b6:208:394::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Thu, 19 May 2022 10:27:38 +0000 Received: from DM6NAM11FT025.eop-nam11.prod.protection.outlook.com (2603:10b6:3:115:cafe::be) by DM5PR11CA0003.outlook.office365.com (2603:10b6:3:115::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5144.27 via Frontend Transport; Thu, 19 May 2022 10:27:38 +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 DM6NAM11FT025.mail.protection.outlook.com (10.13.172.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:38 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:37 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 16/17] KVM: SVM: Add AVIC doorbell tracepoint Date: Thu, 19 May 2022 05:27:08 -0500 Message-ID: <20220519102709.24125-17-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 647492a6-2e2c-4970-1a5e-08da39823290 X-MS-TrafficTypeDiagnostic: BL1PR12MB5825:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iXxRvbKKdT44F20+t8s8hgjrjYU6j8wpgOuL/lYRL4E/nCREpBpKTef18ghy2v+LcC/5J2zwSMcyA0zmOoR2nfHsmKaXr3Y7Eer9Wwykc5XC7GxO+ShRN9QPie6vGMO7HgEUUypB0JCf/rfW8tSWBUpCNrZuSWIw8qMCBhRCfIobdYmbRt9twGYXTrZYD3eq/gkU/YHdkCmU3nKtLDfj4HSJ/pa/IEeO5H/0lkhx3srvwDvrL/NjKRfMSxgYT1FNQa7Y/MesN94//c9mcCqOtPIKbFD+BQ4LzTWh2yiE5z0LTq3ASut8thLJdPvBfprmtY0GBrzRJEweJeKmT1t8f0yr/GvxSViPe47/icTAg9B37ZXCNxYgRunzk/Qsqx88mCN2ENAiD27O7bUsz9o0axGatUHqozH2sLGRFKMLYK4+jav6PQPa4OBrmg0fkg4z53VJrfPKc8UJUtSlQSmJsEp013Y02T7MpfjWAyOZdzf76NGkXveSQNxVEish9PrVo5lrch38qlwrDpNZzMA9w/Im55+73/H1SJWHD1ox25hVqAcpTbiwWj2C/DR7QFSH5ltruwfLBjYmJSHDlp8DNZIweB9MTZ77TEi/WcNvHHzdPK8O5X2EiQRVGape0Ekyv28JeE0QUYYW4dWfS8UytSbHhxi62jHnBpRJFHEMzD4OTf+atDozn7x9c/tK+dun2RRCLN6HkJ5JX00CsKcBQg== 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:(13230001)(4636009)(40470700004)(36840700001)(46966006)(81166007)(356005)(508600001)(5660300002)(70586007)(40460700003)(110136005)(8936002)(82310400005)(44832011)(1076003)(186003)(16526019)(26005)(54906003)(36756003)(336012)(2616005)(4326008)(8676002)(316002)(83380400001)(2906002)(6666004)(47076005)(426003)(36860700001)(7696005)(70206006)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:38.2089 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 647492a6-2e2c-4970-1a5e-08da39823290 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: DM6NAM11FT025.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5825 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add a tracepoint to track number of doorbells being sent to signal a running vCPU to process IRQ after being injected. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 4 +++- arch/x86/kvm/trace.h | 18 ++++++++++++++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 9c439a32c343..2a9eb419bdb9 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -324,8 +324,10 @@ void avic_ring_doorbell(struct kvm_vcpu *vcpu) */ int cpu = READ_ONCE(vcpu->cpu); - if (cpu != get_cpu()) + if (cpu != get_cpu()) { wrmsrl(MSR_AMD64_SVM_AVIC_DOORBELL, kvm_cpu_get_apicid(cpu)); + trace_kvm_avic_doorbell(vcpu->vcpu_id, kvm_cpu_get_apicid(cpu)); + } put_cpu(); } diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index de4762517569..a47bb0fdea70 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -1479,6 +1479,24 @@ TRACE_EVENT(kvm_avic_kick_vcpu_slowpath, __entry->icrh, __entry->icrl, __entry->index) ); +TRACE_EVENT(kvm_avic_doorbell, + TP_PROTO(u32 vcpuid, u32 apicid), + TP_ARGS(vcpuid, apicid), + + TP_STRUCT__entry( + __field(u32, vcpuid) + __field(u32, apicid) + ), + + TP_fast_assign( + __entry->vcpuid = vcpuid; + __entry->apicid = apicid; + ), + + TP_printk("vcpuid=%u, apicid=%u", + __entry->vcpuid, __entry->apicid) +); + TRACE_EVENT(kvm_hv_timer_state, TP_PROTO(unsigned int vcpu_id, unsigned int hv_timer_in_use), TP_ARGS(vcpu_id, hv_timer_in_use), diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0febaca80feb..d013f6fc2e33 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13095,6 +13095,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_unaccelerated_access); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_incomplete_ipi); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_ga_log); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_kick_vcpu_slowpath); +EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_doorbell); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_apicv_accept_irq); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_exit); From patchwork Thu May 19 10:27:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12854771 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 4EF00C433F5 for ; Thu, 19 May 2022 10:28:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236797AbiESK2i (ORCPT ); Thu, 19 May 2022 06:28:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236780AbiESK1y (ORCPT ); Thu, 19 May 2022 06:27:54 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2064.outbound.protection.outlook.com [40.107.100.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85A36A8890; Thu, 19 May 2022 03:27:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GQo0e4K6+PBOAN2p9NPJrlEKb2YUf5lZdVG6OprJHT29rUUwGqTztsqDxqUcvjv+0vvP0qLpN016J3vpL026fTsQElX7E6vAgLtBGGVR3M6l/EegcPbcU+2kJ+qkiSbmrx2qaCdlAVF4xl2Hvdaat45OqmSw/XoHmldUWsaWS1VVn9CE6VMY924JtBhMY8I/8+NMPvSDWb/5YcpqBFzV7wzDg0ywfXnsWYHaTvToRmqHNx9OG3POQSpz8zzdiQIjOEhzCBdapgFNcp/ZpLRjVjsSTpPvOkDsZPnilkFjdTYQ2Ysf5uIIw8O1kvkpLX1/zmN6ft6gb+4x0YI5p+E1hQ== 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=DPj83bZ8mihTAUF0tvoNhgkl3Cn0mGFmF6SK7lQl6vQ=; b=hsbGJUfc+CJX9VVa+2Gh0QW6cKaNseG3oE2ZOTVyn7z03TeicseRnapTjqpC0QhYdmogXR736RQvWpKdgyNVbdDR76B05OfYGFCJtqOw7MuHmqLI2Jm/g/P9e2c0Ff1tL99eqWeB+7GSomGI1iYyiETnMzaRJbSkQXxpuhOl2Iy1T/7ZPyerVKiKaA119xKccmbHx/S4qQ+e5aWWZ8i0Ju93mZy3P3GFFMIYJJdW/e6A3T4w7JIiW2Ew8fw4b7acg8w/4BMq2o4JVo8WqukjQGhuuUpt+olwGEQRqn7E1EA9Lt3/dA9l7JYE6Z18YBdTAnfwznMou6ithrsdFuh1Qg== 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 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=DPj83bZ8mihTAUF0tvoNhgkl3Cn0mGFmF6SK7lQl6vQ=; b=kNYDk2DOnMLDsZvoPrtrDBbzl9rT3b9MdkP5VOs8gY0awb/GeAk6SOxGW/5GP/HyTNzszlHPIl2PSWLm8qZ8yg/u+lmWnS6uNAWl/zoy0RzNrAh7t0BPkmZDb/zYOyGf5i0aYUv2Ibl/UIxY/s6gXm7Pt4iijTyCg1tvfkM+tAo= Received: from DM6PR02CA0126.namprd02.prod.outlook.com (2603:10b6:5:1b4::28) by MN2PR12MB4991.namprd12.prod.outlook.com (2603:10b6:208:a4::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Thu, 19 May 2022 10:27:39 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:1b4:cafe::88) by DM6PR02CA0126.outlook.office365.com (2603:10b6:5:1b4::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18 via Frontend Transport; Thu, 19 May 2022 10:27:39 +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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Thu, 19 May 2022 10:27:39 +0000 Received: from sp5-759chost.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.24; Thu, 19 May 2022 05:27:37 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v6 17/17] KVM: x86: nSVM: optimize svm_set_x2apic_msr_interception Date: Thu, 19 May 2022 05:27:09 -0500 Message-ID: <20220519102709.24125-18-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> References: <20220519102709.24125-1-suravee.suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB04.amd.com (10.181.40.145) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d89d55d9-bf03-4203-2bb5-08da39823328 X-MS-TrafficTypeDiagnostic: MN2PR12MB4991:EE_ X-Microsoft-Antispam-PRVS: X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EIBI5FLuIE+MtvphDJKA4fYZdX3ZRVQMsPCXu7vAVtEiRFLuY0Uo2NspXLo27h8TZUZAz9cEGD3EUk0h9HXf1a1Oh4OFanKfXV2KTNypMjSkmNRxnHmJIWacl/2ZyKl3lKSREbB49uMaWJ8+n0POTFh/HmAqo/fZCcu+d7ka+oUBKZ09/gk9+uTG8QIM0I7JcLZGGy5r5u1HNX/E6VkITSUm5kEPaXtrpbX/aX4zYYDBPKM7T8aPRNlEsXL4LwGWtBAZfnq+illMzkzsCC9Cd4EiQ/HqUsC0o8R2xv6oYIRPwtAbvgOhoLZCPwibds0NfmX/kJ+MnzuJgq9Cg+ujn08A9D+umKSeqikTacDN4eGYQrLP2idFzvdEcPZwCqGsHTr7Qu27G7XD7q5d8/23ZorwrxdT+JOkV/TPOij/hTEAwGRgAEzOy+vQp27ZlgfyQCN/JNvbW6hPtRpCHCj1ldN7gPrxLq1oSyFUKNcv2XaoXXGhKeFbxPhyuvO26lDZZFEruwVMChxNnDbGiGI5dt50vwx7vA5p2KBy9CsOlhWjs+ytSMnkW56qoQ4pGayhoNGVTldHgZZzUJy0lL5GDDy8MW1x72zqnGc04mAWhIzLgRyMp4tdbATsRhyaEMOvMz50iXaBPl0SNNNAYRfP36K7d+DxfOJpa6wjljgRMNT5kUATp3yv04janlkKr1+7vcUhPZ4Pf4slEMy2vG2Eqg== 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:(13230001)(4636009)(36840700001)(46966006)(40470700004)(2906002)(83380400001)(356005)(7696005)(508600001)(6666004)(26005)(47076005)(426003)(336012)(2616005)(16526019)(186003)(1076003)(54906003)(110136005)(40460700003)(316002)(86362001)(4326008)(8676002)(70586007)(44832011)(70206006)(82310400005)(36860700001)(81166007)(5660300002)(36756003)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 May 2022 10:27:39.2055 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d89d55d9-bf03-4203-2bb5-08da39823328 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4991 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Maxim Levitsky - Avoid toggling the x2apic msr interception if it is already up to date. - Avoid touching L0 msr bitmap when AVIC is inhibited on entry to the guest mode, because in this case the guest usually uses its own msr bitmap. Later on VM exit, the 1st optimization will allow KVM to skip touching the L0 msr bitmap as well. Reviewed-by: Suravee Suthikulpanit Tested-by: Suravee Suthikulpanit Signed-off-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 8 ++++++++ arch/x86/kvm/svm/svm.c | 7 +++++++ arch/x86/kvm/svm/svm.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 2a9eb419bdb9..0d7499678cb9 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -100,6 +100,14 @@ static void avic_deactivate_vmcb(struct vcpu_svm *svm) vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK | X2APIC_MODE_MASK); vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; + /* + * If running nested and the guest uses its own MSR bitmap, there + * is no need to update L0's msr bitmap + */ + if (is_guest_mode(&svm->vcpu) && + vmcb12_is_intercept(&svm->nested.ctl, INTERCEPT_MSR_PROT)) + return; + /* Enabling MSR intercept for x2APIC registers */ svm_set_x2apic_msr_interception(svm, true); } diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index e04a133b98d0..4165317c0b00 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -750,6 +750,9 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) { int i; + if (intercept == svm->x2avic_msrs_intercepted) + return; + if (avic_mode != AVIC_MODE_X2 || !apic_x2apic_mode(svm->vcpu.arch.apic)) return; @@ -763,6 +766,8 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) set_msr_interception(&svm->vcpu, svm->msrpm, index, !intercept, !intercept); } + + svm->x2avic_msrs_intercepted = intercept; } void svm_vcpu_free_msrpm(u32 *msrpm) @@ -1333,6 +1338,8 @@ static int svm_vcpu_create(struct kvm_vcpu *vcpu) goto error_free_vmsa_page; } + svm->x2avic_msrs_intercepted = true; + svm->vmcb01.ptr = page_address(vmcb01_page); svm->vmcb01.pa = __sme_set(page_to_pfn(vmcb01_page) << PAGE_SHIFT); svm_switch_vmcb(svm, &svm->vmcb01); diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 309445619756..6395b7791f26 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -272,6 +272,8 @@ struct vcpu_svm { struct vcpu_sev_es_state sev_es; bool guest_state_loaded; + + bool x2avic_msrs_intercepted; }; struct svm_cpu_data {