From patchwork Wed May 4 07:31:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837200 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 BC5AAC433EF for ; Wed, 4 May 2022 07:31:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239490AbiEDHfa (ORCPT ); Wed, 4 May 2022 03:35:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56084 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231405AbiEDHf1 (ORCPT ); Wed, 4 May 2022 03:35:27 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2051.outbound.protection.outlook.com [40.107.237.51]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 17848140A6; Wed, 4 May 2022 00:31:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=njm7F09Sqq0fDFF0WVJUqZwc44Md7lW7npBNyKG7bWgOvObalgt4xZ2A+C9HKzxb4jTAiMVIb2BYFxI32iDovKW3dHpSib69r7poJjWskbvSekULjMcZo1+m9FnWWJdlYYIOut1M5P+OlaG72k9twEPHtRjultGDcGRU90FIRSvxQhgXfaGgiiGkuJKzzxJKIFK9nTMr6QpmOzK19kwBktdJVM9g53bBiScp/p9zOfzffpUkuBTUlMahhO6ZI+aGsrpXyw5uhdvupCg10Sx0iSgGev3M5ADfGbHWz6+fEWtfgKfqYXgFsNS4CT2S0vY9ZkMD6C7JO60mqJKbytaJhA== 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=foYQM17885vsn1ARjtaYSZ891uRbkrojbRJxDEBDeLQiV4C7aH2iZNUTefjgbCrDEmbBioK06k3Y+hNxk6B/+E1ifG4YzdilRxBrS5G6u2jATLJK+AgtGSuAn6yBdIvHq0vcWj6yXfAo+HPot+NMYJVQetrxNqU+AZ2sq8QSdhKrpRdTWOsPuRy0Nyw8XS0/bAHZh7TgWSAMnppvhP37MrrxcnnFL5u8aFXDqg9bvqVlEfSYv6VQ7SfZ5R0+xEbBzby+MZ5GzODg2mc6S8nxWv9M/8E8QauVH5bnMwhoFpw8on4WcC9WjxGZz2xSZc2kMrFDlSJDlOGLKie005ABkg== 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=036EV9WXw1XC3KdVyJ5D60U78mdHdDvg3AIFpVE/1FcjGR3Infi9sRW0E6gF+7FbNxoTJondYbV/GyV5jPQffZWrE+yJIoxfFKUPlyZL4B4RlrUHUUSc1WqEvhm+qJZE9m7WPKeIWwyL2/aNAbAT97V2IAAGiz/y5KhS1Ofz9zQ= Received: from BN9PR03CA0728.namprd03.prod.outlook.com (2603:10b6:408:110::13) by SJ1PR12MB6170.namprd12.prod.outlook.com (2603:10b6:a03:45b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.25; Wed, 4 May 2022 07:31:50 +0000 Received: from BN8NAM11FT037.eop-nam11.prod.protection.outlook.com (2603:10b6:408:110:cafe::3d) by BN9PR03CA0728.outlook.office365.com (2603:10b6:408:110::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Wed, 4 May 2022 07:31:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT037.mail.protection.outlook.com (10.13.177.182) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:31:49 +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; Wed, 4 May 2022 02:31:48 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 01/14] x86/cpufeatures: Introduce x2AVIC CPUID bit Date: Wed, 4 May 2022 02:31:15 -0500 Message-ID: <20220504073128.12031-2-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 47768752-6fa7-49fe-e412-08da2da02718 X-MS-TrafficTypeDiagnostic: SJ1PR12MB6170: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: ZyTJugCztD9v/vYMap/6J1S2y+nEJkYG+a+PhRLFgu7CthYE23vxG1Kz8P3PepczsWINHuGcslDCC9fg0DEJmrF77AgPONlcj5HuCEjDKHxNJBsexbR0O+ytFBPJh34bsx1w41WKKPiNqOmYYqkknelEgAPLNpKZxGkMvVhqlOBma4J5gXGCFM2R7w4V0Zyk+BExC/gjekhX7ZXP7Ei8+v27md1aE3O+DgCgANK6aqtqmqh1F3HlIEumb/YJNe3YaMt+5fYwU4oOK/uMl6S6oY8GA41dQXquC9UhHeenM8PZmQHPJM+LVKhsOoZjeF+ddKF3l2I3B33DSM4JzViOd66aYHxOL4/gpx5TR8v38MY7O50UaEXbbhCR3WyyK50cjDk6+LFCKI0AiKM+EAYerq1OICJTS2uDqluidXkooaPpPaO+qB54NYNsSeKdGy7PIgF6QGz5aduX+jKXkBB+0npGoVWlUZn3IZkmgXWaEeNcTujOcs6l98wfy4dQEM4pPsHvwDtlWFh/8iBU+VRK67Uwzx+0yCIfVnaTAEOR06psFQ1H8k8uCm3UK/VCUFP3nCEZYqJyUL6QcqvvazLhqxXa5tNpgzCKHGmt0ucA1u4cakjkwRC3F9vE3ey1fNSZZNnA2reJNmzqJk/O+VtIu3PrQJECIKp1EZkFOL81E5DVUFHu4FykI9UgwDoFH+nBCG7aMqWGyi7mJGEkNXZF5Q== 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)(316002)(110136005)(54906003)(336012)(426003)(47076005)(81166007)(44832011)(82310400005)(5660300002)(36756003)(4744005)(8936002)(2906002)(86362001)(70206006)(1076003)(36860700001)(70586007)(2616005)(508600001)(40460700003)(186003)(26005)(8676002)(4326008)(6666004)(356005)(7696005)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:31:49.9525 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47768752-6fa7-49fe-e412-08da2da02718 X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.17];Helo=[SATLEXMB04.amd.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT037.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6170 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 --- 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 Wed May 4 07:31:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837201 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 A5A82C433F5 for ; Wed, 4 May 2022 07:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345480AbiEDHfc (ORCPT ); Wed, 4 May 2022 03:35:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232878AbiEDHf3 (ORCPT ); Wed, 4 May 2022 03:35:29 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2080.outbound.protection.outlook.com [40.107.236.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E414167DC; Wed, 4 May 2022 00:31:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aORYzBtYeTw43NxF/pyGrOdUCmbUr3aqHhE9VmQOSjzgpN1oYdzkgTtbzsFKTl2i9hojci13jRIujS7VszOCSA3kBtpfQkAcuZ5gOGaRNPrUmFI+sK4TAGH1W+2l9ywNeLmNAzd1RDQSAKbvtEpS1RuGYHcA3UOh0UEY0D/6RMPkrJCYHBhZie9OKfr30Y2C1LgBrvimaWoLnP9LqLoQGtnDkoiOM+4RafjTFpBAKl0EUvJAKY0NlNV1P0flHaqin2zNr5PodLYn+diTbGDm5Z5cO5jlXM1APlcreA02Fm2NTcv1YAFadZkBGFYp2h4i68yt43ARGuK8JtH3yQlGrA== 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=AUwb6mBBN0KdHYBzaBuzqhj1XLsjUZTpdqob3bf9pHg=; b=ERtUpfUJV+EyjKf2CcInOdFRYF4IQSPUxqaPY9IbJQqrnv1g0yLk5aCE7ts80Gm4hamiaQTav/3MYIfFU/faEQQHoM5BNeYtrCM2qc8M5Pncr7WZvy3bVMzyEQyxtcdQtb4z82oYu1GXvkZSyQXr3BCV0X2EbVqqTUiKdqRDdg8rVxXHYqdGBJ28VHjxDx7hVEkaKw2YgFhjeGDQRGCxQIqXz+aJGJ85LP24pIxf46ybtJDNW4gWvcBHlUeOaWHE/2rkD9+CO1gwFVg0nxwHSOHa4N4+l8RreDHpExs6nJMDNLrFwefLraQzJjTNirJgB3+9Iu//nL8d7vBfsqrW5g== 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=AUwb6mBBN0KdHYBzaBuzqhj1XLsjUZTpdqob3bf9pHg=; b=ksrm2fXS4LEv5dpEX0fPMv5S8t/PJEO+C7cNG1nwlS+F706YPSxUfwkGTP0P85KmGPflf1awS7uJHwvdKEPTUazzFTSu0vM+KGJ3ZnkfnJ+kipyOiHn3VbstnEB6YKEvhn6WEcxSsUj0VXDDPDUrTfV5ND/KajZ98VBzY+pDxAI= Received: from BN1PR12CA0020.namprd12.prod.outlook.com (2603:10b6:408:e1::25) by DS7PR12MB5743.namprd12.prod.outlook.com (2603:10b6:8:72::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12; Wed, 4 May 2022 07:31:51 +0000 Received: from BN8NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:408:e1:cafe::aa) by BN1PR12CA0020.outlook.office365.com (2603:10b6:408:e1::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24 via Frontend Transport; Wed, 4 May 2022 07:31:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT064.mail.protection.outlook.com (10.13.176.160) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:31:51 +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; Wed, 4 May 2022 02:31:49 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 02/14] KVM: x86: lapic: Rename [GET/SET]_APIC_DEST_FIELD to [GET/SET]_XAPIC_DEST_FIELD Date: Wed, 4 May 2022 02:31:16 -0500 Message-ID: <20220504073128.12031-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 978bb809-0e5f-4ddd-c655-08da2da027d9 X-MS-TrafficTypeDiagnostic: DS7PR12MB5743: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: m8SkOCX9D4A8+j6+W1Lny73/JyljiN2wZBXtXxbgla+7+J/f09JuEZZbCzn2+tFLP4jJwhVfKVZ1NINCuzILtgsH2SIcUBMs3DGkAeYXAMYv+xwRNymHOaIbouh7huIlox6qimu3cXGtdXmmA2oJ2+TLMhoFCTB9yIIrgRJUaobr1a71buqyxm0Oq5hpUga6ctbAEOn6jBF4MEkkzyoRJX6dGAXw6IQU18sgRGftsqLbPIlPsYH9Y8GI5UBFsbqDsUkG9if39T8/SpMkwxwILDxJAeQnoIuawk9WEr8ZbRZ90AbG3i1Sf5jLZ8rzQITPKKAvW78m290oPvzN597GcPWgkVc3X/iFzC8s0QfZlTD8/a2GAacadQCH9RWBD9KfnkmYj67n+3GrsoqShU0JpZb6gv2n84ZrdEbcpYM6pJV/lh2sVMMJHLSPnl8BJEqSGXc4e1aiwAXQTILb0WtpkVT9DbgGtmUSBp7bK3ZB2tj1IJWzSxwyyYDLbXNcGwXIth9eVQ84XgY4HjndNK6J7XCJbN/PamrZNfqA3b06v28FDC01ub0IJNJvCybvGdZv5BMBAM52glzW8+2HaQisJKuv/1JSqon4CAdboLOD658cPXvQ+BFVV/Vf31Et31EYMoA3oh+HWDtG69Rou9UWlJSelvQh0BLljHiwGsxXaCuqP+SLKH1E93Ry41+b9c2IW8xz9mUje+W0ZoRi8d9c1Q== 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)(40460700003)(426003)(336012)(86362001)(26005)(186003)(82310400005)(47076005)(54906003)(44832011)(70586007)(16526019)(110136005)(83380400001)(1076003)(8676002)(5660300002)(70206006)(4326008)(2616005)(316002)(81166007)(508600001)(36860700001)(7696005)(356005)(6666004)(36756003)(2906002)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:31:51.2166 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 978bb809-0e5f-4ddd-c655-08da2da027d9 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: BN8NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB5743 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 Signed-off-by: Suravee Suthikulpanit --- 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 Wed May 4 07:31:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837203 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 C6F64C433FE for ; Wed, 4 May 2022 07:32:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345501AbiEDHfg (ORCPT ); Wed, 4 May 2022 03:35:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345271AbiEDHfb (ORCPT ); Wed, 4 May 2022 03:35:31 -0400 Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2054.outbound.protection.outlook.com [40.107.100.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2383E167DC; Wed, 4 May 2022 00:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZOB2r2O5CnqCsrtnBd/GYVFKiit0rkCq/atTQYEeng6x0oEZV1o5iZU5NwtSj/ve7zlaQA8uRWOjtN9q6AkK+jQZLaaSAxX7dr+KFc2YzoFPhsyYKPACLHexu1qqhJBJR8RzVqc6fVr+pEtL1MajQBCOdje+JyKMECeyV0pOlmmDrsfI5EPUOK4v9I5ILAkMysIdif/HjiP0bK48rZKMOj3ajiNsRTKZ4qkxrpLmdoSxaO7D4mAk+3RFw+Xz2D1xFbDkgBGMh9H6RQdkokDmztkESHsGTbZ4HViHM6UOasXJHon4q10RLk4sI1A70imB6W+eKZ66qP7Hw+ajYjHgYw== 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=VV3Z5LtFVKWONo8RBpJqojzZpm2/QHjyX/ZscgGf0tc=; b=KFNunjSNWSuwQblvpzQm6fTX3TVW4eAy9naVbKeMurJFSaBWb6iJp6MogC8Zp/cdQzqRnnyTb/15RfnVDjEDkNV6MaImCGEve2t4azl+5A/NrNeXSZ2hSpT/oPrUaISt89FwGDEfFitQok8ENRsGyT4s1A5QG9UW0P0wGloPnmwDtrDMYWya4veGrt2LhWA4IxCJJghqii5mcvRTqDH01Apftwevju4J4wQy9UaDGRZfqR9xM4gC2g+wXBQjlHM0yqf3iWIT1Gj60GrCFevM13FnwV1Qeezv9l1BJutj8x9qEOggbdZk2M7eXKVn5ZJqA4eVXdDP5NruwsFtrmbVqQ== 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=VV3Z5LtFVKWONo8RBpJqojzZpm2/QHjyX/ZscgGf0tc=; b=Ke4TR5TrQ3/xOaz1doc2mOv3SZutgMfCeoSOL9UVNAv54xAMt3XcFPNAWRFf7RAM5xQe0u1itHgRF6Cu7Y0SkgsZLLD7us1OIQ40IVLcjMpDw06UQz8MRe4YqjfuXH8GjwPWjDUnzeseUXQ8cyDxuwayDgFS128HybBOxDoPpAM= Received: from BN0PR07CA0004.namprd07.prod.outlook.com (2603:10b6:408:141::22) by SN6PR12MB4767.namprd12.prod.outlook.com (2603:10b6:805:e5::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:31:53 +0000 Received: from BN8NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::30) by BN0PR07CA0004.outlook.office365.com (2603:10b6:408:141::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Wed, 4 May 2022 07:31:53 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT027.mail.protection.outlook.com (10.13.177.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:31:52 +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; Wed, 4 May 2022 02:31:50 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 03/14] KVM: SVM: Detect X2APIC virtualization (x2AVIC) support Date: Wed, 4 May 2022 02:31:17 -0500 Message-ID: <20220504073128.12031-4-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 54bd0db4-07ab-4a5a-f1b0-08da2da028a9 X-MS-TrafficTypeDiagnostic: SN6PR12MB4767: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: wEYneZGOPRztG8gQ32L08UWSumOZbYSDxPSM3Kbk5DMtJ7AKAUs8GscjV9ujkJtNG/LGpjHATcsP51jGiNe/L9I51ar756NQfo2iyrPP7/mV0CKLCgJG1/cHoxtvbn0q0VtJaeS+ZwVFMRMZhOf+p3mxfj7M/oh/PcGf4euklSQuAgoZsYDT9a9bqBj+xMEGMsRbOGuKDmxRop5Pf6P1pEoaQQqTZAYATqYo7PWik7J9y+Y8418GJYcHsYqcNH4Sy/5Sg9/5sVohKQ3lBRleNaXndTruMpgI2iBbpJ/9HnRdWTZCgBjCAQR8ACyGMMYySPXx5/2VEjGxVNM7POAllWxghGjU8di7ZG8NTuM2APRRSLLi9/o0TJ3JIGAl2all6FuHUyq1OpcgLJBZjutXaw1uB6xfieu9z2rjPN7e/6NV9FkLcaEAJp12jsJc347FmG+5vPDS/BAk4Es9R7mlVYm7L/QQSa5FNWoe42GQKSmNtOqbEJ7gFJSDB0qKHI+/AXpwBBljIR5t/ejxf1kpjQv0n7qCPcCOjSTazGts4/XgyGMW2GBDm1vu20UaXN+JJOIyacDSH9ZrH8KUqts0tccYiR5Z+vxH1a4BRSPIEsucqpJG/o6PCkDn6dKcYHXFKLtMntqt4ife6y6jCyO8R8txWAfUQ9EPEACG65y6bQtRmNtExOTpeoz0lrqrLngHOCagekS0+XHzE2coVB0jOG/R8ihNsTIliFByAQe2bx/HOtV0DxSrlrpEWlHlm8Cw 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)(70206006)(47076005)(336012)(4326008)(426003)(40460700003)(81166007)(70586007)(83380400001)(8676002)(36860700001)(110136005)(54906003)(2616005)(16526019)(1076003)(186003)(316002)(82310400005)(86362001)(2906002)(26005)(36756003)(6666004)(356005)(44832011)(5660300002)(7696005)(8936002)(508600001)(36900700001)(309714004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:31:52.5808 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54bd0db4-07ab-4a5a-f1b0-08da2da028a9 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: BN8NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN6PR12MB4767 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 Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/svm.h | 3 +++ arch/x86/kvm/svm/avic.c | 40 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 15 ++------------ arch/x86/kvm/svm/svm.h | 1 + 4 files changed, 46 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..fc3ba6071482 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -40,6 +40,15 @@ #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) +enum avic_modes { + AVIC_MODE_NONE = 0, + AVIC_MODE_X1, + AVIC_MODE_X2, +}; + +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 +59,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); +static enum avic_modes avic_mode; /* * This is a wrapper of struct amd_iommu_ir_data. @@ -1077,3 +1087,33 @@ 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) { + pr_warn("AVIC is not supported in CPUID but force enabled"); + pr_warn("Your system might crash and burn"); + } + + if (boot_cpu_has(X86_FEATURE_X2AVIC)) { + avic_mode = AVIC_MODE_X2; + pr_info("x2AVIC enabled\n"); + } + + 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 3b49337998ec..74e6f86f5dc3 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..678fc7757fe4 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -603,6 +603,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 Wed May 4 07:31:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837202 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 963ABC433F5 for ; Wed, 4 May 2022 07:32:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345490AbiEDHfe (ORCPT ); Wed, 4 May 2022 03:35:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344782AbiEDHfb (ORCPT ); Wed, 4 May 2022 03:35:31 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2089.outbound.protection.outlook.com [40.107.244.89]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6095B186F1; Wed, 4 May 2022 00:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mI75ZY22+otTOdmIvCmGMWr13T80OMbHltlTtq6HFrBadgUmkugI/6IqIjCWtZ269a6Z1pBr66Ma53Zxnf/m0/26khSpo2mqV3syk+7IAWLpQJP0fFIeNTvSmywxYPZXHIwPIOItxbPggyMRSeVQI96tQ1BvY9NiO4oFl8otRZgWYpPFbFX3yIqIF5UiaX99ID5/f/LVnyPzw6IAbJWu3aZ+wpI4/wxIu46S0DWSVyrFWHqWw1XsWDWqUc9ii3UBFRdt9Ltkj3HYQVzZDvavkecw+ZeesHw3zJXxk3uzd0ajYk9nl9nnFcK9sYrgrB1W2jYiO2dz9gpNx8jprdhT2A== 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=VFyYseioVs6V9UzBI5urMdMu5miaun2LBkfHFZi3ZVk=; b=FMt5lLiVMKacbFCmN2h/ASD82ADVlBAJD23d0/lAWA6UgeQIKkM4KvtedaZSOxqbClNTtQV+m5TSjIer2lM5zXT0H0xvnI5DGeK+98ROEvQiw38zF+T7OeAmXIvArZNEChU2JqxMGohprrNwf41WU6X4Jg4zMq/N/b48xErgAJGY000jSrLsg7YZWVHelItq5P0N60xI2r7jCzEFr/cLtPftI13T4Zxl0fraPSs6P4G5ymMANtTAdo69b/QYAGUxFQFzIGEJ1SrLsFx3Gu5BA63/v6s1+u8zp+svn+MzrADfQs8mj6G6UCD1OHlKZnqQ68fpIydxOrqekZhINd67pA== 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=VFyYseioVs6V9UzBI5urMdMu5miaun2LBkfHFZi3ZVk=; b=iEOZoidR+0TXH3I1C18oULqcD7L4uIf4Pl4uWKcUrG3wCsFLkUZRQ1+cVfkvVs3NOsfIF53HVclybiMthB+opW7G22DNrRjFmS2nmmZpV6mKicoUrA7FBRBjl6KZESp1ptGG2Bl5C0d0XeyXTX+Bi666ptH31WL66ARvPRxGN98= Received: from BN0PR07CA0028.namprd07.prod.outlook.com (2603:10b6:408:141::27) by MWHPR12MB1229.namprd12.prod.outlook.com (2603:10b6:300:11::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Wed, 4 May 2022 07:31:54 +0000 Received: from BN8NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::98) by BN0PR07CA0028.outlook.office365.com (2603:10b6:408:141::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Wed, 4 May 2022 07:31:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT027.mail.protection.outlook.com (10.13.177.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:31:54 +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; Wed, 4 May 2022 02:31:52 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 04/14] KVM: SVM: Update max number of vCPUs supported for x2AVIC mode Date: Wed, 4 May 2022 02:31:18 -0500 Message-ID: <20220504073128.12031-5-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: e1af953e-bacc-4f32-320b-08da2da02991 X-MS-TrafficTypeDiagnostic: MWHPR12MB1229: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: NdYTR+zvEjA2kiBeiOY9/20hO4XDCjnYA/7EkheWda4BHI11uOh74jiU4WqgiwJmBwNko4Qoq4ODIbL37z40DkWWJvB4cCPTci7yXsrO3MXg9sKdmhUuej25T9JwnMiFunZPpe6+9NPbxIARR4wRUAoGGJxLUy7CQFXiccOXrxz3iUOKUr74YjNpZj6HcUM/ibRwNNrQfVuTxKAwXchOiAS8iCFuRk+Yruv/ifZeRwR2T0q7zeLB5rtMkNNibeP+P5856i0Bd1aDdZ/asjuMK2nuRkyEbIp7Rcucwnk+JNGvhj5AUTITfkEgyMClwQlOsfxuqyprkMa547J5ynH2SPw4zJkvBN5Yo7ItJcy5y0+04MZJmGaROUeZelrU7yzULyNJcjhNJjZZ/HqdNKPyemyLKhCrroJGG08QlzUyuEbznYYl8iv1M0kVsmSvrPZbdCBvouW4hYfWV/4yTabBUXWgeS6YI2kXQSbKX6LPkg3jBmp75xji15tZ6IMrxLfvn6kpt2S1lvcOw9R9EbN3juI+OXzq/l3AJVC+oeeETBL0YkQoMZj0bgHj+xYJlqfxJg++QZJuXH4mAfxjjU/zx1+/2ZyHUtbgfzG/g9QxfYANwtvADzbLdv5TiQqqNzTeVZLtz7Fllrqc1LcVFy7s42S29Wd2Qaq/D5ijNzWpXseCltzmYaZu2tnSxMkEyQBX3H2kHu2XoR3EH12gtK3hLw== 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)(82310400005)(16526019)(2616005)(186003)(316002)(356005)(81166007)(1076003)(54906003)(110136005)(336012)(36860700001)(426003)(83380400001)(47076005)(36756003)(508600001)(5660300002)(15650500001)(7696005)(6666004)(44832011)(2906002)(40460700003)(8936002)(8676002)(4326008)(86362001)(70586007)(26005)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:31:54.1120 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e1af953e-bacc-4f32-320b-08da2da02991 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: BN8NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1229 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 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 fc3ba6071482..182f4891c7ef 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -185,7 +185,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)) @@ -200,7 +200,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); @@ -247,7 +248,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 Wed May 4 07:31:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837205 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 2996DC433FE for ; Wed, 4 May 2022 07:32:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345494AbiEDHfn (ORCPT ); Wed, 4 May 2022 03:35:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56156 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345477AbiEDHfc (ORCPT ); Wed, 4 May 2022 03:35:32 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2059.outbound.protection.outlook.com [40.107.92.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 65638186F1; Wed, 4 May 2022 00:31:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZZinvk+Jb/2WBxTttvtfD2e+meLm7QRts2TNhL289gnGXwYhiXqXFBqLjg2k9uAiQenH4lQmk+ycBo2EjhCDED/OOyFIUdOt3qsydjCPzXvpZxRep2QDrVF8K4oj62Nioxfi8TzDzwtShyyDvbA8hguE7n5yIUMS3I7UIGkTdcK+B7xI4NlTh1NdMd6pjhTSsTscQs6argLWpvWUZmWZKmPIBP8I3/AxdUcMUYIv+mawcmiPnHEnT1gWxXNZVGyd5XEkK1SZAojreTx6UYsnWyk0zEX+Xw6y26QaaW0mS5MLm5AimoCoK6GWMCDRS82+Vq3K34cQdYFjRQU6p6/Wgg== 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=2Iph4iB4yyIthTKApkOheSs+Byc7LO1j1IQqr3s/6F4=; b=gRD/yC25EWTPLCR6NpNbuxZfYemsZjySK57ncEbUgw709a7bM23W+7aIwEJ7kNHKRHS8r4A8tbzQrc/IXGyzy6bHh7b3oQoU18Lfypjj+dt8T8+XBq5Ot6Fy9ii//weTJCyxWeh/ckT8SbJLCjM77aoo5kzLxsAPLpSeVLH/Xs1aguYTUb/qUs3n+WZES/AOxQEUuWhOjKt7nUosAeLWfEVKGtgzwUwVUh4DqF6AWDpkDqrtTCq8RFQKwKFOrFg7MhZU9AHsppDjIqTw3MflJmNZsSQXY2+LfgVsLiEDJLjrHp5rzyVZh0m/V0/riaROnnHy4Ccu4VGFngCwLvchHg== 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=2Iph4iB4yyIthTKApkOheSs+Byc7LO1j1IQqr3s/6F4=; b=EzfcZXEVhPNGY9s4uE2eh7l+dX6DiEez6aJ5Pj4i1HXHc5qE4VHTva09t6EJxbyGV9wnUvEIb2qg+xUI0AXpXP56MvYdOG9obOpjl+knmesohF6eujHgCQmAaCs6/639HCH0yIB2UWv/9r0BzMHONdq3Noe4lG6aY/W2G31bwCE= Received: from BN0PR07CA0002.namprd07.prod.outlook.com (2603:10b6:408:141::17) by MW3PR12MB4491.namprd12.prod.outlook.com (2603:10b6:303:5c::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:31:55 +0000 Received: from BN8NAM11FT027.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::c8) by BN0PR07CA0002.outlook.office365.com (2603:10b6:408:141::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24 via Frontend Transport; Wed, 4 May 2022 07:31:54 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT027.mail.protection.outlook.com (10.13.177.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:31:54 +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; Wed, 4 May 2022 02:31:53 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 05/14] KVM: SVM: Update avic_kick_target_vcpus to support 32-bit APIC ID Date: Wed, 4 May 2022 02:31:19 -0500 Message-ID: <20220504073128.12031-6-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: f28d9c5a-814f-4f87-f31e-08da2da029f2 X-MS-TrafficTypeDiagnostic: MW3PR12MB4491: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: AEI0lh+9WtbHZv7BjWHrtxN3EDt/Gzour4Q6PEN25xSsufI03ImFqij06w2mpEFiOKqYfq+Fq5tSw0NUGp+lmadjKe9mOjLVYc/VZmZLdUj5WiewE3jIlfEr+g3wokjU1rBz1Zulf4X1gDdkdYQkahVmhcgucodf6ZtXVtPnK6O98dbcQ6ft1U0W3bLVS22x8NiCnxTSsf/a+cO0pBQBm1bXqPaWU9wlfAeAvxT6a5f9qDBqKCvuqAhNHoznLH0NZMg5guoCj8WwZTlgdFPodvXdM55uUM8+zjFU/Zf0/UTVx3phFAII/m1mrBMQoHr3jGxZKzqp+SrN0A0qbSrIpc3U9V7wJVTCQ11Su16PTUcYEIwIkjg/paL739jBYpaZt3jjQZx/8nYfBJLI0K6kGBVHgTqpjknFBuz1Af6f5tHjHxVkdfxsPv7+C/QfgBbjWuRx0VLwfbP2iLuqHBF3ICWmuuLR6Wjcr9b0c7Y+4mA3fAjsaZeUwaGTgpUjrQwMwE53QEJGthY6ru4IIb4Va8QTEGMdWMjkuTDlpeeKy2KuAkE69Qr60yWXBRwUQAxa319R1OrS8ATwaHZxYsDr/cfQBoQrU2tFB7WD0JfqIOdYmA3krQnrwQiELGmrRqfe6IVRABruTUbQWqA6/6OqhGXAqT/dcb347jSBRk4tmlhswh1Ajl/mZWLJj9u/zCzTuHF2LgLr6wQxYYflS4TwBQ== 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)(70206006)(47076005)(336012)(4326008)(426003)(40460700003)(81166007)(70586007)(83380400001)(8676002)(36860700001)(110136005)(54906003)(2616005)(16526019)(1076003)(186003)(316002)(82310400005)(86362001)(2906002)(15650500001)(26005)(36756003)(6666004)(356005)(44832011)(5660300002)(7696005)(8936002)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:31:54.7526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f28d9c5a-814f-4f87-f31e-08da2da029f2 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: BN8NAM11FT027.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4491 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 182f4891c7ef..9213e9d113dd 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -375,9 +375,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 Wed May 4 07:31:20 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837212 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 59DB8C433EF for ; Wed, 4 May 2022 07:34:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237335AbiEDHhy (ORCPT ); Wed, 4 May 2022 03:37:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57086 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345658AbiEDHgE (ORCPT ); Wed, 4 May 2022 03:36:04 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BBE0A24589; Wed, 4 May 2022 00:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M4Op0ERfa6BbgwEvD8SRLAK5ekHzA89tn8TkWCNINXaLghJnv4ydTfhXTaMTVQEDoWU/sjFDvHEt0KMWluj63v+PeH5s0HWJR+CmXD3/A3HultSFfNSdSK5QCq1W0eEN2vhjzq83a9sHBQhpS1KHDoZnFCWKqVqYaACXniz/0idaOniJnAM2ZsfqSEkhnT4AyHysF7uZH9G/xJDdZs5O23hej2yT4oFs5XFOeDSo8KIBxg8u8IEX4NtsU2iSy3geEzHnicJXex4CYtJrM/wXv36DXoWMCvv6ua8sdrHyDUzPagkTTaoCg7Hbc7U9RBV8MpR88CrO8PuWJMNdU9cCEQ== 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=2zLEyZnzgUJ/seGaW57olObKvwk+ZcDptsE21MdgluM=; b=RpI7A+Cx38whW1zlquFQMJU/14m0qdUVuWDxBZir0U58qTjxSWt4ASUIYwZ/R7fsNTrn4LgGMqvSMv8DX4/cWg6WWy8J/IvXmIoYVwBQHgoQUjAFVay5gKi+EARcMNk4axiPygFq9pSKcVvU5VJ8V6QG1wl9vy4YoMjSzKZwy6dxrO5jwQCv6ni029NPwBjaL9kMZOsY6lfySChXZv6jvnUc18brELIfVaPoUO2z0Q9/4sfNgjU1OBrk9nWRF7M0Xs5Z3h7wJ2TBJdJ6PSCNJ3mH8tnlyXqWoqAXdWaZxKa0buF90Z57P9U566fSJlazXCCswDWcQLBE4lQ6/cl+TA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=temperror (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=temperror 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=2zLEyZnzgUJ/seGaW57olObKvwk+ZcDptsE21MdgluM=; b=SU5k6SGgzxTsgUxLIMuhADjrXmXtk7DZ+rT/0qSzfPzsR24x2uFo0JMm7lDVCNY7kenMNNHkQ03W24x2JFQu1zxi660UMqyMz+Kub4wLOOhoyd0JsE/goT0VDfbJgWeMoW+AzxNdzXGUBDQv/B+llKBKjFQgqK+Y50D/3cwEAQ0= Received: from BN0PR04CA0149.namprd04.prod.outlook.com (2603:10b6:408:ed::34) by MWHPR12MB1135.namprd12.prod.outlook.com (2603:10b6:300:e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.19; Wed, 4 May 2022 07:32:08 +0000 Received: from BN8NAM11FT005.eop-nam11.prod.protection.outlook.com (2603:10b6:408:ed:cafe::c9) by BN0PR04CA0149.outlook.office365.com (2603:10b6:408:ed::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Wed, 4 May 2022 07:32:08 +0000 X-MS-Exchange-Authentication-Results: spf=temperror (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=temperror action=none header.from=amd.com; Received-SPF: TempError (protection.outlook.com: error in processing during lookup of amd.com: DNS Timeout) Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT005.mail.protection.outlook.com (10.13.176.69) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:06 +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; Wed, 4 May 2022 02:31:54 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 06/14] KVM: SVM: Do not support updating APIC ID when in x2APIC mode Date: Wed, 4 May 2022 02:31:20 -0500 Message-ID: <20220504073128.12031-7-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 50733351-256f-47df-0b24-08da2da03128 X-MS-TrafficTypeDiagnostic: MWHPR12MB1135: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: GhuQP7aGOdOW36aX7HHb8Hrb0SQRFPpkwuXabq5ipPXrxntzy1FZ9ZWi1FN17CYwPecw1b6R4magiW5ODFvb7d9djs9/ftAWaVji3n2aYFKCSYZ46RzhpDQ4jyTLxrRlA0mdxcDwJWnq+sjGukwwT/QFczAcSL+G16XyV52Kc9ko9mlAli69r4lh2J0stT2KSo2qM33oQAd7MYO7JrlMw2IOCc7+g5iWSlBta+5PpsUJ+wEq2b1aTbyNRmLdy7oICb0HcnIqapDn2R+FfB/nDDWpfZXnlcd42+Fpj7wlXm7V6h6hseztU/kw4HDowjwz7mK609zZbWxRolGFj5kPJHv0gwZvmXmhLPdaKQETwuPpJRCx4dnSpbqbflnGFKTbOHURqzHU4MF6H1RT9ZyI18HGgwmHf5G/XTJ7BdUAWbbfXSSMaknyYMD6nHada9scbQEGPzdhvlj6d3++iy//ln8LfMO7mSfR4+3JQdVApZNg39NcDXYe9T3wxtX6MB1yuFun0XgXPZ5XcUt2QjPW31WKmFwtnaGxCV65jB143o3MIRbmZnwZ24cAevqH3G6AEnVL4B+IITT2g3X+pVpXocE8yv1EoIL1aBlSEHyhJnpDq7fUN8Ah/dIo7nlwxHVIwTZHlovDZCSZbrtkCpamdYu8mDqfoWKwggdd2Xo6paWKtVtzzuJg7S0uIdyDWrrmKcipP55W+urDp1Fs3a8G5g== 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)(508600001)(54906003)(110136005)(2616005)(36860700001)(7696005)(26005)(86362001)(63350400001)(83380400001)(63370400001)(1076003)(16526019)(186003)(336012)(8676002)(47076005)(4326008)(82310400005)(70586007)(70206006)(36756003)(2906002)(44832011)(40460700003)(8936002)(5660300002)(356005)(81166007)(316002)(6666004)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:06.3447 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 50733351-256f-47df-0b24-08da2da03128 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: BN8NAM11FT005.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1135 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 9213e9d113dd..3ebeea19b487 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -499,8 +499,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); } @@ -512,6 +517,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; @@ -532,6 +541,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 Wed May 4 07:31:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837207 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 24626C433F5 for ; Wed, 4 May 2022 07:33:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345607AbiEDHgk (ORCPT ); Wed, 4 May 2022 03:36:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56916 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345593AbiEDHf5 (ORCPT ); Wed, 4 May 2022 03:35:57 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2053.outbound.protection.outlook.com [40.107.92.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6AF5423BFC; Wed, 4 May 2022 00:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WvmStNU0/w/472tFA6yS2Ab1dUYFCHmSNdvcClINCPvTPHJHmfo0RJ6E2WK3kLlTC7vuKjyVLg9Q+9V+jfTMRDCPz3h8h/nZTdPsPzkZw6ZUD+rKgfPGvLV9NDro+w5IwjVrS7lWV3iQZ/YdXKJrsiNM2Dfior+2+ihnCIJ6D92OkZBt9LulovpWcvXE+wPRRJ+QaHAuQwveGu9nYAFdoWRvSESRFkP3sK2nvEtNpki8rZ3DgEQxN0Vs4DXkOfdLWR8GT7bouW+LjFO1E1nhv2CXEZnqmX39Ho0NuVaKXBFBfaQZ8Xt+fT5pbM581Fu/oNz82s6hLMNe0kgIxA5+YA== 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=zc/of3Lm60E7G+tiFe8ILRpuSFGVZhuCnkP2zfuapQI=; b=hRdMCEDsEYFNyLQZlUc4wniNitUQh7S915q2yKyTaE0xzJd/aFmxleHUuQsk6uTzJckjVq80beGDVig/WhIYfoxq7AfNU1M1fHR5SU6kIUevfFL37+72t1C8ttvFVY2sGfWdPuT+V4N384qHhIEQDz3XebRviEzQXAwgl+JwsYhZpRb8/3jZp/K8cFCEhzLUEuNFxUAcpys/q+cMk5O4KGqmgAwakFcv5CpIQ/cCy6NctlV2bmL0FVG4zbo1cSsbhiRzwR33bvarrgsouamPpvVp29GvqqVROCfkPyCALcCGdfaUH8asxCOzc7bs2zu+soF/21f0r1P7crlnQ5djAg== 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=zc/of3Lm60E7G+tiFe8ILRpuSFGVZhuCnkP2zfuapQI=; b=DXAPJNG77SEypsXQjLttGG4Ykhd9/IVxb9PDjEzZ7EXC2LMO8wXdVJBex9Ijgy6F9RqLLkxehRGgVS43w1YgoYNuJpBSrULBOujxGc3xKCpmcCOHAhRs9ChpNJL2BldA55Aczeyq3AFA/YbS9//Dy1IS9lV2OkhQM87KC8J7/+8= Received: from BN9P220CA0016.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::21) by CH2PR12MB4971.namprd12.prod.outlook.com (2603:10b6:610:6b::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:32:03 +0000 Received: from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::7c) by BN9P220CA0016.outlook.office365.com (2603:10b6:408:13e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24 via Frontend Transport; Wed, 4 May 2022 07:32:02 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:02 +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; Wed, 4 May 2022 02:31:55 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 07/14] KVM: SVM: Adding support for configuring x2APIC MSRs interception Date: Wed, 4 May 2022 02:31:21 -0500 Message-ID: <20220504073128.12031-8-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 8142eacb-bb2a-487e-b3c4-08da2da02ea9 X-MS-TrafficTypeDiagnostic: CH2PR12MB4971: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: 1GDg649dbpbceexquCdI0FNOXmiiTRn8Bpqy5nkLZ8VTRzSvx00+A7kyQFsgywx1xwkXZGLlF/QXl7EAZg791cHrIfi8UAUSHvHuAfTeaeAMrhe6Op36V7m/CseuU/th69jRX0dfpSQECdJIetOw/fmuD3pXngnc4dQMPb2c7CjecJyq5eyv0c3DR7HMwpZDJqo2K72jiSAos0bSJIGzIdVqmNPU3d0/FP1t+Xh962tCdoRranWOrQ1/MPnFIQoqKsNb2t9qZdW8Jzcs0upTRFl8Cvv7w/avyb1qk3sZ3kTZIR4xi+I4dZq4ZGMqTNSoycwAMoHYEJf5EWEBqq0VOeUSDmLtJ2fkjwvtwO41HuJv+TbE9KJo6wdtiOq4Zzl9xMGANBsQTsrQYqo/7SaTYAPKYO0xFPQj5+H7YQRvMHxatUlYr0396ywWMbJLb2eZy3zvxRtR4a1LW1fdAWDUyp2ccbyVI5Tzlmna1NWDdPUzDFfJwb8f3idaCFz8e1/s/Rt6BAVfbzdznyhwsHlC7DdVC9i7l4FAIjPPQzjGwMlV0nJC+9zd9p0YH+Thxs5olK65e+K10hg9rUiD3Tk5GgZaHwXETNsff+AMFWswLBni2Q4NJyLayjox/WMoQQeNM+uUvmCGU2242LmcFHFI0pUwoxYMSAjHwvOyCM+hgtUZqlMQh9AEXnaezZ5wlgHfr3dx9DEXyKR7wuIEQpAQ5Q== 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)(36860700001)(7696005)(6666004)(26005)(86362001)(81166007)(356005)(426003)(16526019)(186003)(336012)(40460700003)(47076005)(1076003)(2616005)(5660300002)(316002)(83380400001)(70206006)(4326008)(8676002)(70586007)(36756003)(82310400005)(44832011)(2906002)(8936002)(54906003)(110136005)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:02.6456 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8142eacb-bb2a-487e-b3c4-08da2da02ea9 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: BN8NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4971 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. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- 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 74e6f86f5dc3..314628b6bff4 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 678fc7757fe4..5ed958863b81 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 Wed May 4 07:31:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837209 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 43764C433FE for ; Wed, 4 May 2022 07:33:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345835AbiEDHgq (ORCPT ); Wed, 4 May 2022 03:36:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345591AbiEDHf5 (ORCPT ); Wed, 4 May 2022 03:35:57 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2044.outbound.protection.outlook.com [40.107.244.44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6EAD19021; Wed, 4 May 2022 00:32:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=F0WQCkc+dQ1EV7i4GtyfaTs34GnWSRLoZGNEKp7fKEZP5YGQxPgpv082qFFcacOvXA4dGJMA6Y5ngUVKWymCs3oGi/rR82CvHlbDrom8Wtkh0+6j7kQOwS7P+JJ4aDyZhySHUWjIp6ZvO5agr315TAGaY+Y2Otggkkic+OG92Jklc/24vOc5iYy4gIx57kPPN4LpzCtkw+8WSO6NTdVyYEAjdSrgKbTGkGCZurQ1wXgPBNrkK2+8aIppVG8V//viH+RQueSIm3n4VAwnulsSv2AbAnJlAdMB7UqS1We8nd9g6bSlPFosptu24kJvy+ZKQpwXqEUgkZEpjzw8LSHp9Q== 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=ewbE+AI70OzkMmoSvEvf+iypkUh9m0mQwqkfJbJ4IRY=; b=BCexDK3EfIJyOwmhib9wxEw+jAqEUUJaT6op7Z4g4y/XOvHqkPghBQvHSnuuxFSGyhai4vwBwlXICAdve4D0/rlp+MuaovYtG7D74Pg848ir9KNXnrp2zsJEcdQyte7fGTK5Y4RlcULo6+39xJCVKNYQjydxnP8eN5b/pMz4RVokX6U4t5HKNvuSErJLVSnN5ypUqLEP00Rsmo8TG/seqSOirbpuXwZtCPCr1TVOCKzBq/fO0XgC4euecq7G9Y5qhNinKBWiS5Vk/tFQvPHTog5aRaqNsbl4x+EAMw3GWzOBOohuoN7mTyGYySazLRNyyBF9nlcJnvhgJGxWugVrhA== 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=ewbE+AI70OzkMmoSvEvf+iypkUh9m0mQwqkfJbJ4IRY=; b=xp+nAOLfRdKWBinDUbJjIkGMQEMx4cu36lG+M9YxMmk7byrieY5dSqMImnLFI/VLrw7VYH3IcDcCkq35qGpj1nXbCsJ3O+A12bAX+OjTNGF/q8SPtXb0zQ/wzz0Em5n5xUh4YE9Yo/6g6GMZN/u12xjFNJCBMs/0Ewi198WCSuw= Received: from BN9P220CA0024.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::29) by DM6PR12MB4403.namprd12.prod.outlook.com (2603:10b6:5:2ab::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:32:03 +0000 Received: from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::b) by BN9P220CA0024.outlook.office365.com (2603:10b6:408:13e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15 via Frontend Transport; Wed, 4 May 2022 07:32:03 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:03 +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; Wed, 4 May 2022 02:31:57 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 08/14] KVM: SVM: Update AVIC settings when changing APIC mode Date: Wed, 4 May 2022 02:31:22 -0500 Message-ID: <20220504073128.12031-9-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: d8b65cbe-6091-4c6d-4b92-08da2da02f04 X-MS-TrafficTypeDiagnostic: DM6PR12MB4403: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: H+mKRXclUjl//wIP9ABc5OmjKYsvOoNnxzbolT0LiP7MFPIUVQZVex/1iZ8cAUS+MjnO4Of5IULl+tsKCSAp5L8gKM2LcO0k8n10HM/HodLI4z80TC1j69eUFjN1/7V8t/DNPzwrJMXND0JPB2d7AdczVAT2phxamCTQxK0XLUcSHHOmLHeI9/yWb21FcO2JTPG/b8ZloexxhWR37z75H7WCptUcGO5DH3XNJczibwPGPG1J71DRCsNhxE2psLdvNMiKPTWGsJ0Qr1JoersMmM48UzCQ5/GMM5RIT4FKJhAblx7mzGQI4GK/sL+Urc/QL828A0HwyNPUi4D/tj1jw1kG/clvwDiv6jFBSO6CXfdn4IvO718G8Zv5J8+g0q4pwFMIYjAVF7ClSqjX9nIunRgfVi5BE5wBEFJZyn/pJL+wyT2CIkA6sxABi3Us+s2cUZT6Fry1FwsIBZOVIB6SVvk+vCXrkpPpraBtZ9kQs0x1wdhypvFNH/frGnBvG1ZmGye548WYgYzq8FI5QeQq+/UGjmvr1C4aXWSVxsu+vcHIBNIy649OiR1mTbVX/PuSr0rZ/7Ee3mWqetp9Q7FD+FkLUs6/c1EJ4AXpHcp/b0ggOpIazNBTibczSUnCAvYKL+3X0EXXkTDbC/rEWEVXw0pgFXu4htZvhQY+8YKCPk8ZZc1Pvcxivm2gT4f23kEzkaR7LIv8ksX6thwL2lP03g== 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)(82310400005)(1076003)(7696005)(356005)(83380400001)(2616005)(70586007)(8676002)(86362001)(36860700001)(6666004)(70206006)(4326008)(40460700003)(81166007)(36756003)(2906002)(336012)(47076005)(16526019)(8936002)(186003)(316002)(5660300002)(426003)(508600001)(44832011)(15650500001)(26005)(54906003)(110136005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:03.2549 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8b65cbe-6091-4c6d-4b92-08da2da02f04 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: BN8NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4403 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Update and refresh AVIC settings when guest APIC mode is updated (e.g. changing between disabled, xAPIC, or x2APIC). Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 16 ++++++++++++++++ arch/x86/kvm/svm/svm.c | 1 + 2 files changed, 17 insertions(+) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 3ebeea19b487..d185dd8ddf17 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -691,6 +691,22 @@ 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) +{ + struct vcpu_svm *svm = to_svm(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; + } + + kvm_vcpu_update_apicv(&svm->vcpu); + avic_refresh_apicv_exec_ctrl(&svm->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 314628b6bff4..9066568fd19d 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 Wed May 4 07:31:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837210 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 C73F6C433F5 for ; Wed, 4 May 2022 07:34:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345572AbiEDHht (ORCPT ); Wed, 4 May 2022 03:37:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345580AbiEDHf5 (ORCPT ); Wed, 4 May 2022 03:35:57 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2086.outbound.protection.outlook.com [40.107.243.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 08D21167CF; Wed, 4 May 2022 00:32:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RA1L3WubjLQcBEjT8K18sfXu/u2S3MfF/HUv9yAqd3V7By8HERzvm11+4ZHAMF1kwpN85f7vLOyXqDTCR7hyUoeVrP1uxJoGFvQAIRFMbQth/Gf5qCi+v6a0s/tmEhh8RO49ooeuKvZOU9IA2LgzUQO3FLyMfo8UNQG8TcpXyqgVavj3Nv04OdDCvtWUMdbSrGUVASGuNfc8Frv11KnwupebFcRGDgBXpCtNzJzLIN1lBSj5QbyBa0G2hxPEFZr9LK98kd3Yu2hOff1CYSmlYwgOk8djsRBZ5p+lSmIC404gooAIis3j+FwJ1kIUxB6we8fDhWQk61JbRP1NuHLaVg== 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=ov6gHw0IlBX4iVrryGtn3CYv0dj3odyCW2qaAsuQyaE=; b=KtidxtW3PJaH75XnsBIFbK+4ItAYgnecc2CgFMvVHI6nnznQ5gvnWDA6UFSsnu2UHxlzOHdOgpTLwLUCnLXYNObvjEzU71GNzgn8VjWoscG0cPd1DIqrcY0hJc3F+WGP2KDdxf0PrOJURFujSf+QDyidz+6s3dABcTOGgCQNtkl4WFyq5BMtAZvVYQMaM9d+mWoZCfwqtB0Og1CDzBkZBm/KPOsQhV7KhPNM4LUzRVoJeVWacSTC+PWw05JYQkLc/V4TkSjJ8/eiFWASUcU8eDUBurdKvR6r5GCFHYTXlC6ZZ3qY2TLTGOVOnYYY16WJ9jHPcdjTuLv+DUf4wij/OA== 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=ov6gHw0IlBX4iVrryGtn3CYv0dj3odyCW2qaAsuQyaE=; b=heRVr0pO1uqeJ+UHJ3vTP211EEjPZSlR0sHswGuyCp7SqEa3Nf3c8n2iMk8FMXjfDRqyK0Kr5IHrzKxlkk5+Oo/pzfc6AV9ogS+9hponAsuVZ0TAsmwvV7faQRKYL0KRwsH1qbfD9Ueh+nKdbRimqnNH2IbE2rtX0hrxc0TNTaE= Received: from BN9P220CA0015.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::20) by MN0PR12MB5858.namprd12.prod.outlook.com (2603:10b6:208:379::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:32:04 +0000 Received: from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::63) by BN9P220CA0015.outlook.office365.com (2603:10b6:408:13e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Wed, 4 May 2022 07:32:03 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:03 +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; Wed, 4 May 2022 02:31:58 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , kernel test robot Subject: [PATCH v3 09/14] KVM: SVM: Introduce helper functions to (de)activate AVIC and x2AVIC Date: Wed, 4 May 2022 02:31:23 -0500 Message-ID: <20220504073128.12031-10-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 7b111c4e-8d60-4e0d-bc71-08da2da02f57 X-MS-TrafficTypeDiagnostic: MN0PR12MB5858: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: Zh7IM3BOoWPissLcTy/0E+bcrbG4OytbosD4dUNfIBPqxokZIUmn9oTMCeTzS617r884NDvxqmamNCU5MpN5s2ug5Gc3QtmESeAPJyvt7CPm+WqvYkaMHHxRBnMMxpWbsxFqo4FegOx+ySAg1IeTz9sEG8AV4Moc8qfT6YGoGXnuva/DG8G7vcug7fpxD3r4dGVN+cMR55I0JfCQ0G5B5Wo5ItmCPzjsN+pepb5tWjBIOjDih76LOYGuuMyXQorQ8yGlLhlZY+s0dUm92M7EjFayzG5bw2mueatH0FXbV+dRSD2eUqAEllIuQp1kezQvEgTxK3LRaybOp5mQ0ljZFzAH2ZgWf7G2Fy+F7kZu9wBgsueRuaX5GMsrFtAGlCBiQwRcRLIK0IkpP7XivupZIJZdl1/jXFgCzL+tumgCoK8eqCrLB8agI4Jj3Q19/i2mlh49m4Iee+Hu8ErTbBo9TSN7PPuZVuI3aBb8l3pNvyeG8tA13TRTbJTeZQB/b/NwOsVqJ5c4keC8o1bg8pLZ80/Se1e2OTdo/M/sNapAaA/bElAbdeQffL6FTpZdiacsnVdD8ohX5lO9bjF5LkV4163YNpIfxndXb/QPX8sFlPQq7nNg8s0y2TORDTZ7TfwKxDhm4l6mAGFAsgssZx0HK4oh+f8f0z5M3cQfh9mskX2+wUKT4b6DhvvHXO46ISwzuM7YKFh/mZa8RarGY1l+NA== 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)(7696005)(426003)(81166007)(336012)(83380400001)(40460700003)(356005)(47076005)(26005)(316002)(86362001)(186003)(16526019)(44832011)(5660300002)(82310400005)(1076003)(36860700001)(8936002)(36756003)(4326008)(70586007)(6666004)(70206006)(8676002)(110136005)(54906003)(2906002)(508600001)(2616005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:03.7861 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7b111c4e-8d60-4e0d-bc71-08da2da02f57 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: BN8NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5858 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Refactor the current logic for (de)activate AVIC into helper functions, and also add logic for (de)activate x2AVIC. The helper function are used when initializing AVIC and switching from AVIC to x2AVIC mode (handled by svm_refresh_spicv_exec_ctrl()). When an AVIC-enabled guest switches from APIC to x2APIC mode during runtime, 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 | 6 +++++ arch/x86/kvm/svm/avic.c | 54 ++++++++++++++++++++++++++++++++++---- arch/x86/kvm/svm/svm.c | 6 ++--- arch/x86/kvm/svm/svm.h | 1 + 4 files changed, 58 insertions(+), 9 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 4c26b0d47d76..f5525c0e03f7 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 @@ -500,4 +501,9 @@ DEFINE_GHCB_ACCESSORS(sw_exit_info_2) DEFINE_GHCB_ACCESSORS(sw_scratch) DEFINE_GHCB_ACCESSORS(xcr0) +struct svm_direct_access_msrs { + u32 index; /* Index of the MSR */ + bool always; /* True if intercept is initially cleared */ +}; + #endif diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index d185dd8ddf17..f255ca221e56 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -69,6 +69,51 @@ struct amd_svm_iommu_ir { void *data; /* Storing pointer to struct amd_ir_data */ }; +static inline void avic_set_x2apic_msr_interception(struct vcpu_svm *svm, bool disable) +{ + int i; + + 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, + !disable, !disable); + } +} + +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 */ + avic_set_x2apic_msr_interception(svm, false); + } else { + vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; + /* Enabling MSR intercept for x2APIC registers */ + avic_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 */ + avic_set_x2apic_msr_interception(svm, true); +} /* Note: * This function is called from IOMMU driver to notify @@ -185,13 +230,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, @@ -1086,9 +1130,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 9066568fd19d..96a1fc1a1d1b 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -74,10 +74,8 @@ static uint64_t osvw_len = 4, osvw_status; static DEFINE_PER_CPU(u64, current_tsc_ratio); -static const struct svm_direct_access_msrs { - u32 index; /* Index of the MSR */ - bool always; /* True if intercept is initially cleared */ -} direct_access_msrs[MAX_DIRECT_ACCESS_MSRS] = { +const struct svm_direct_access_msrs +direct_access_msrs[MAX_DIRECT_ACCESS_MSRS] = { { .index = MSR_STAR, .always = true }, { .index = MSR_IA32_SYSENTER_CS, .always = true }, { .index = MSR_IA32_SYSENTER_EIP, .always = false }, diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 5ed958863b81..bb5bf70de3b2 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -600,6 +600,7 @@ void nested_vmcb02_compute_g_pat(struct vcpu_svm *svm); void svm_switch_vmcb(struct vcpu_svm *svm, struct kvm_vmcb_info *target_vmcb); extern struct kvm_x86_nested_ops svm_nested_ops; +extern const struct svm_direct_access_msrs direct_access_msrs[]; /* avic.c */ From patchwork Wed May 4 07:31:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837211 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 6A1E3C433FE for ; Wed, 4 May 2022 07:34:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345582AbiEDHhv (ORCPT ); Wed, 4 May 2022 03:37:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56908 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345587AbiEDHf5 (ORCPT ); Wed, 4 May 2022 03:35:57 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5373723BEE; Wed, 4 May 2022 00:32:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N+GgcLjEzkFQVBWtXdk3+tvq/So8Nt4LRWnI7eNuBRtdS/vqYGtAfArZRX0ngFiKkDtHT5Jz/M1a36o34/tEHiqBGph7r09XqA85oG5i+si9PFnvA19x/9ckqPqrsQSya+L7VOa9KHEusa7zCFIsjuszo/JB8iizFeJa963ZfrG2U4xz5zksgYT9vPY0Jt0zHD2KF8K3BfuhrZ1CAyJrIShIOYcSvByEN540x6CwPsowtytRtBQTI9zB0CUsBYT4oBPMI8DkcQRdCQUQwDRbi/yfE/1psOSJBYU1+HlqT0eJwewLJF4DWnTo6zr0DstacfBWj034xq9I2pDuiDBn6Q== 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=bwtOgpiXJ3IA45DgWr96HIvAUT2y3tBHa0Y6sbVjlSw=; b=MeKP+Zj55ECrFihRJ+PspeKBd7ywTI8NAS0r4+A2y1tKx91BKwIr2AZAwPZiUpP7DzGWw9X+B+edTrBgpHwJxkubyD+KwvKOHMjJCxj019s0iXCDyT0d4NJyT019U//rjou8aqzTaicyQeWI3JizTHO5K5XhNde3ISgo1qwFu8U4r3i5xSXpnPwLsBD6TQKSSoh2XxfPMlpkqgdxm5HvZSrg1OGOI66bcjx7owEf09jTL89r6aAOYmCNrFZoqHXy11VxDX2LSV0sh+NWv8Dce0IEoLs+vDT2l1jFk11kLWATyM+R5jgc4YEbdA7DUhc1zwW/OBnZTcqojCug8x1kwQ== 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=bwtOgpiXJ3IA45DgWr96HIvAUT2y3tBHa0Y6sbVjlSw=; b=lYN85jIDfvEbVm7/xsX6aGDJRZGYJgT+ISRG8+zFVqDymqDD+fUd+gSMXc4hFhBo/DFQ6Qv7p9QIsmwjWXhh8f22KSHyy1gvdan63ZgXccGMYQZa4DNaV1nQWvAtrO5VDB48ILhRn2i4QjudlwNZlcSO4h1zK7/8EiAlvozw4Tw= Received: from BN9P220CA0018.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::23) by BN6PR1201MB0161.namprd12.prod.outlook.com (2603:10b6:405:55::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13; Wed, 4 May 2022 07:32:05 +0000 Received: from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::e0) by BN9P220CA0018.outlook.office365.com (2603:10b6:408:13e::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25 via Frontend Transport; Wed, 4 May 2022 07:32:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:05 +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; Wed, 4 May 2022 02:31:59 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 10/14] KVM: SVM: Do not throw warning when calling avic_vcpu_load on a running vcpu Date: Wed, 4 May 2022 02:31:24 -0500 Message-ID: <20220504073128.12031-11-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: ed641400-c680-4e5b-fe80-08da2da0301f X-MS-TrafficTypeDiagnostic: BN6PR1201MB0161: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: JmO1WaOCU91USRKmlGtfZ7C0jfVx0OR9wgPKv+cUDgJqDXSU/13o+iykFfgDiwNdD2V3CS5Swt7Q0kevLfSB2KuPG4wdNvFCTLlxAcPPWH1MX/B1iuRTcQKsoysMsO1g/REewUtbB0HdApTpBl5dzzfp5OJj8naQqpjB38MKuEzSQvK7IAibUWqL2/CBvZ54r290b3KZ7nIGdV549L0cBCVcriLn/iJNVxOwwZAbgQ2FzTicIDrt8mFZdTnnqFYXU78aVPAQirTzrkHC1XPM5I+LZ6rCX4sIIo/SpeSB620LHEOwC66cb+vRirRMLvWk3wxcCmVgOWFX8g4v6TT0FGIwGtg3dJ5ThO/4hwYWm4UPn/3VLHdfokvoJJzgv3Dkt3Fyc2Fg7uJyy8cZqpgY22/0fqmtEhUsZbF/FP3hHzI7u9x2Klgm22ZGhG6CgkwZT2Q/XDwjnjtYSx1gbfSZJl30I2O+ZPaOVPVHxZCeJmwHKuX8OxAoLr0uNSohJLqSn+tMQjRD70jSFIYxZaRnwy5e4fXQuM9b5NBWKYhiYpl1iJ6AtNUgoEANvchr5KAxnpniuxELq74VpLG5M5oHIdyrUoX3aV4r2IN/91R47d1mIBpWkj7btv+e1gRGgtlRsTCu31LqdyYloLNZzDcci7cFddXECcUUajihUsYso+wlxfOlOr+WW56XKkkz42mRMC+7lXAgHAod97vctp2pzw== 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)(6666004)(356005)(110136005)(26005)(81166007)(316002)(1076003)(54906003)(86362001)(186003)(426003)(336012)(47076005)(2616005)(83380400001)(16526019)(40460700003)(36756003)(7696005)(82310400005)(36860700001)(5660300002)(44832011)(8676002)(8936002)(70206006)(70586007)(4326008)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:05.1141 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed641400-c680-4e5b-fe80-08da2da0301f 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: BN8NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1201MB0161 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 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 f255ca221e56..d07c58f06bed 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -1063,7 +1063,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 Wed May 4 07:31:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837208 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 A6660C433F5 for ; Wed, 4 May 2022 07:33:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345565AbiEDHgp (ORCPT ); Wed, 4 May 2022 03:36:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56920 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345596AbiEDHf5 (ORCPT ); Wed, 4 May 2022 03:35:57 -0400 Received: from NAM02-DM3-obe.outbound.protection.outlook.com (mail-dm3nam07on2050.outbound.protection.outlook.com [40.107.95.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3A16F2408A; Wed, 4 May 2022 00:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JEDG5wQBKH28JNI786voK1ptIteq+N5CYTjSrV7pmA0zl9LWnBgl6JRpLWfkmaNFJ5EBYAE1I+cmth7MyveOENrunEscyqVHS0AczQpT0QCSXiMLVWXgOV2ZaCp9r3y45fYAloZYSvsfxCWB31j3Q1kZ3S4l9y65EHH5lhwq3l2f9OL2TgQCrBRNJyAEtWfJRUbnLBowtlwFjvxG2kKNwqar26xlUb01v8s8C1o3gCNthqcEqOg66p7z3CbdCC9zk/dy5ZNsuFAy5TBkVl4eOJNUHCht5uUmKy43OeOSwkUjZSar9igTcd3rM5lt7gtdikIO1aKvVXrLUHOO5CjpIQ== 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=9d1mpnhuBPi06DaWjPziRVs22zzek3stCyobtsuEvcQ=; b=n8vmdscnZoxLSvmWpef9MB1rNAXI1HjLCwAeP1zW+NWMrEKfXzdEG7FjaVewrEkMKJPRHsADCSxLBjJSgAVW/8tPv5lYUUkd/wzOSiZ12bf1zAwaDw4axhsrKhl5nbDeEDDwgrSGPpOiT0X8crGlguFYzukTxGMtVKesJ+/Qnmhs4J6P2cmbFAOKl85j/na1aFwZOBw0GCAzQq4YgCrPgIzz/I7pGvCkYw0PIJbCvbhdSRqrL/l/y5ar0tTmKYLRTwVucACJQH/ffDGKnd0mcTjX6Zb5MhgHA6sA/R+FYaqom8vyYKwc67Aj6609zEPgwMptGie+QD4fWiOaVbdsCw== 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=9d1mpnhuBPi06DaWjPziRVs22zzek3stCyobtsuEvcQ=; b=4Sj+mjoqIbmTasxf09Jbqzu9vkfonY+FzAua5e9qMWbKExV9GLYZIOkZFx7NO4zFjNu72fJD+t0ZFnPraFOzsHjZc6CXB2YEqub5KsePIlrSZpNHwKxe4lNHy1DgJdOZQ00kPyw0VY6bBwbAK9tjeXzP2SnsLROl8vQ1Retz2wA= Received: from BN9P220CA0017.NAMP220.PROD.OUTLOOK.COM (2603:10b6:408:13e::22) by DM6PR12MB4619.namprd12.prod.outlook.com (2603:10b6:5:7c::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Wed, 4 May 2022 07:32:06 +0000 Received: from BN8NAM11FT035.eop-nam11.prod.protection.outlook.com (2603:10b6:408:13e:cafe::93) by BN9P220CA0017.outlook.office365.com (2603:10b6:408:13e::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.13 via Frontend Transport; Wed, 4 May 2022 07:32:06 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT035.mail.protection.outlook.com (10.13.177.116) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:06 +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; Wed, 4 May 2022 02:32:00 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 11/14] KVM: SVM: Introduce hybrid-AVIC mode Date: Wed, 4 May 2022 02:31:25 -0500 Message-ID: <20220504073128.12031-12-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 93a0c27e-df9a-4075-4489-08da2da030aa X-MS-TrafficTypeDiagnostic: DM6PR12MB4619: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: N6ErR5aeRwwLX5i95pqhRq3Eelb4eAqrOxbA00ORy3DEQ0DmAev2Xe45grEmx2ImRDeLO67RqbMTWDb6Qlai/Ojv6fcyT7e6e5sx5O3qOG8L6I3/0zd0J29JAIv+x9f2YB7QeWD49blHd6mTC3hdLuC3rr8R4wVgnNDpFrUONQbTcLZuQIKLOkagh7Fc+/+FZ1/Vivbo9ocSSVSIOcbQznsuyJ2eWUD2SaC/g4eGgB9JYptdKsgWAmmAMYczYgVx7iS6TiQPPjLqaYaYg9R5OLPnghiGPY7S/4RA5SspeESKAHidJnxYsFgu4upkf/CRX303vhTo/f2pJ3P/Ss9wkKmDElUNJBx3nvGIu46N79GT9gEGLYd9i58BWkKbOMV3RNsKeg4C8s9IRsOCjeIBb6DN5ljPpQnvZokACDd9D9JHIImE6dKcvyl7ZXLcF/KE2vnOZ1LxI4dcLnM8YB0CxicJ7nfhxm5M+uLXkbVjT0Wa+fpnLxR9gw2vYKx2hTNJjGCAyshgFEjJznnPgCxxRuf0A9SJueD3dCWbLrDs2Ex3T+th6YX+MuEuAvBi3V3JT3z7KAVTR1m2VAfd701ZDmiCSBffi2RQxzgS5o0H/0+DeZrbSPd+8N2/Fj83ieHoXgWXLpHER/+rYS+rsGqz4iBqbH8hToE/ax1lHt0Ts92IVdCJ9/cmpG4PXT4eok9ZU0O/NQhYaKN4Mme2p4Pbvg== 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)(426003)(186003)(336012)(81166007)(6666004)(356005)(36756003)(26005)(1076003)(7696005)(2616005)(508600001)(40460700003)(83380400001)(36860700001)(47076005)(16526019)(70586007)(70206006)(4326008)(8676002)(86362001)(2906002)(8936002)(5660300002)(44832011)(82310400005)(316002)(110136005)(54906003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:06.0203 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 93a0c27e-df9a-4075-4489-08da2da030aa 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: BN8NAM11FT035.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4619 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 Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 10 +++++++++- arch/x86/kvm/svm/svm.c | 9 --------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index d07c58f06bed..3b6a96043633 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -92,12 +92,20 @@ 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-x2AVIC mode, where KVM emulates x2APIC + * MSR accesses, while interrupt injection to a running vCPU + * can be achieve using AVIC doorbell. + */ + 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 */ avic_set_x2apic_msr_interception(svm, false); } else { + /* For xAVIC and hybrid-x2AVIC modes */ vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; /* Enabling MSR intercept for x2APIC registers */ avic_set_x2apic_msr_interception(svm, true); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 96a1fc1a1d1b..c0a3d4a1f3dc 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4041,7 +4041,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) && @@ -4073,14 +4072,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 Wed May 4 07:31:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837214 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 49421C433EF for ; Wed, 4 May 2022 07:34:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345678AbiEDHiB (ORCPT ); Wed, 4 May 2022 03:38:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345635AbiEDHf7 (ORCPT ); Wed, 4 May 2022 03:35:59 -0400 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A9C4240A9; Wed, 4 May 2022 00:32:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eFAOt/oa71lbfkU4WDi/LZya9VeRquRcxfWCLFOWlHTe8pzyQLX4HwArAkoy8m4CbTjr8nI9XL3+vCeqceI5stznCA9UkzKCTgoxoZrtNVEiCUDACLh0AZxZupiYT1TEKVPQiOfCPPdn0rpBkjuJjNF2OjqiVwhK/VuF0eV/Y9WXA4uxo9bmd5Fws+8WcEhrgORHrD6oZ+dMFmRmIOVskvw2Mwm4pUWVimDeKvwYwb4b8sXtKQwS3Flomv0Gr++QeA5ZhJmApmX6Y7WD7cD5+1tZHkGjZAegv7LCYnqtcWjBAhH6V+hGb46zLJ9Nb6c4zfFonmShFZRdIXbxTS2eBg== 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=Am+hebpbUVWjqbjozJ/EwbcyomrWHLe7poj2ia4Fbaw=; b=mkK0doC4Kv25b9tO+rhmatmEKXQ+pzG2DUYTn5MQIyKwnv8CUbHT27bRSieEPycryh6YALLV7CeiqqNSQkWR20LOgmDlgyuMlAyQM+3XZ3GVpUeG2D114QSuQYiLMp4c/81F1RpJ/p+XIZyFCszwy2nMuVVB2iLQqvntfiK1POVOrFwrkRdJ31qzgfeRzaA3JU1YoswjUIBC77SY6G+kahOxVIadxb+wGiYEo1PnRTVw1WTSBvPiSR3H0gBx36HTgCeTsQ9u+V5/RMgM7oN1Ir4W8D/t54ctbhwiM3kdKkuBL/W5Szo2jSo/9H011h5ZZtSRiLz7w1t8CHvRsBvuTw== 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=Am+hebpbUVWjqbjozJ/EwbcyomrWHLe7poj2ia4Fbaw=; b=qe664NhY9UyxI08OsKTVVHHmY66dFOir3Y4YDSf3ZsWnW1FqTTvsNsRHqxOs2cwRhPRX17dOTVhzQ3Z+uD0W69hD2m+7wfvaOWMH2pl8CJuvCnVj3MpFLTlqcRqYnRLZLbJDVWgQ0BLjuEIBO64Ud2pjpKQaF1LeonjvFd67+dg= Received: from BN9PR03CA0447.namprd03.prod.outlook.com (2603:10b6:408:113::32) by CY4PR1201MB0039.namprd12.prod.outlook.com (2603:10b6:910:1e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5186.15; Wed, 4 May 2022 07:32:07 +0000 Received: from BN8NAM11FT038.eop-nam11.prod.protection.outlook.com (2603:10b6:408:113:cafe::37) by BN9PR03CA0447.outlook.office365.com (2603:10b6:408:113::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.12 via Frontend Transport; Wed, 4 May 2022 07:32:07 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT038.mail.protection.outlook.com (10.13.176.246) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:07 +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; Wed, 4 May 2022 02:32:01 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 12/14] kvm/x86: Warning APICv inconsistency only when vcpu APIC mode is valid Date: Wed, 4 May 2022 02:31:26 -0500 Message-ID: <20220504073128.12031-13-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 6ecbe219-5c3f-4573-cbd4-08da2da03147 X-MS-TrafficTypeDiagnostic: CY4PR1201MB0039: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: 6+/TozoPPKS6o6GeMRVOwCAz129TuvDqBj1Pi0UDTPeJy3lTCzRMiZKu5u/TwahdLrKqaT/McxoOrtnvEcVsiig3fLP+vXJzgVI7Ha8+iMK9BQ7cBme0BIxdan8Psxnuuv1TRNs12vxfYeW9eB8JacUBWWG7tZCilxjWrNxpq9t0YZqCtcfd1jsP9Pe8BxMBc/ToOQz1EM7UkhDnbq2LxX6arPf7NQVypOdQMiXobL55uZmS/vmVFpLYyn3sVYGlEHYVfvR3DKwHZTNksuFsZLEodLQ0Y7ggnQBFElS978KRdxgLtFvi2E120dO6xXsCZsdS37RU2FTwy3Lw8fjZ45BNwJc9JyK33Z2FXbdWv8kLGn5E65D6ksURpxWbe/DNK4C7mx2afPaBVyvzfiYoHlwXDaa/CMPF1hoshdiAqRjCmANwsY5mgErl3vJAzZRQ5te7AsSFNmJXKIED+gVYFup/Rg1HfXSzhGmLoJsQRz9oB7HXEqtiYSpwhDkSFGaDrYj8MfbTpJ1j7vQ6fuqfGKJzT4wbmiBPdcUW0Tg4bM0AeNuXp6q++iyQil6W/Og9XT1PvFEo6hNlIZ0H6O+SFwe01NAViq7UcfypwaKHKOBEPLV5xbwYuxE+QnLmqv/nP8KYOLvPeXRsvFmrzwVnsZDsFQIaNuWY81sVwuFK58zCa5d+P6116z9noYFpnsXnfcsbS9fg9ddweW6BUgyNwg== 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)(36756003)(54906003)(36860700001)(8936002)(110136005)(316002)(2906002)(44832011)(83380400001)(86362001)(356005)(81166007)(70206006)(70586007)(26005)(8676002)(6666004)(7696005)(508600001)(4326008)(82310400005)(186003)(426003)(40460700003)(2616005)(16526019)(47076005)(1076003)(336012)(5660300002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:07.0527 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6ecbe219-5c3f-4573-cbd4-08da2da03147 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: BN8NAM11FT038.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB0039 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 should be 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. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- arch/x86/kvm/x86.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8ee8c91fa762..b14e02ea0ff6 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9838,6 +9838,10 @@ void kvm_vcpu_update_apicv(struct kvm_vcpu *vcpu) activate = kvm_vcpu_apicv_activated(vcpu); + /* Do not activate AVIC when APIC is disabled */ + if (kvm_get_apic_mode(vcpu) == LAPIC_MODE_DISABLED) + activate = false; + if (vcpu->arch.apicv_active == activate) goto out; @@ -10240,7 +10244,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)); + if (kvm_vcpu_apicv_activated(vcpu) != kvm_vcpu_apicv_active(vcpu)) + WARN_ON_ONCE(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 Wed May 4 07:31:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837213 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 5B302C433F5 for ; Wed, 4 May 2022 07:34:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345660AbiEDHh6 (ORCPT ); Wed, 4 May 2022 03:37:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345647AbiEDHgB (ORCPT ); Wed, 4 May 2022 03:36:01 -0400 Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2042.outbound.protection.outlook.com [40.107.101.42]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CC6542458F; Wed, 4 May 2022 00:32:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Uw/bTeQThEFLVh1A8LjzYXHJgYSwm/ByEe3UJvPv1KkkANT+vtosntgsjHC6cwMxiRuVvp9diJea49kjI2JSE6pEvmCqawryrSbw9Vs9T9bJip0Ifk85NC8TqS2UBIulPvkzjP332nxX4UvympWewQLsxg910GDC+/0njJ2Lkvyh4xzLm57nxABlnrc3LXvZZ6qtQszyrKOXNPZHz3ilWYbcKIGVtgsMUHzCMUDZiSTJaZGOV65M1glfCob78DH446HD2s8vphYAnZIgAeAhbG16bawekQLwUzItUabrvmivwLSbXSz42R/YkOkTG6jp8ZumCTYR7w4hhw5kULKhVw== 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=DxEMAog8PiX4aUmttmMw2zb33gcOgtkamYN8hfraxhs=; b=b1YiaSSYEOSkIgIF+QDMiLuXAeL0dYtaiK03zWbUjz/XuxHH178iTX3mafB/SDySVhU7FF8zaeWdAg0i5zkAfs5Pg4J3JkRQN0Ag+gBxRZ6JW8FP5USRWBDh7aN9qWqHqRolcMpuEpXrNWgLwH7RtVPAcN9P/IAPxWEFOLdk4F58ChTvGN9aZwXV0QrmeEx5NEeGEe/i2mQHZTrtZUh/ukEBcWBQwbiT9zDLtubtlwy6+8UQDbC+wnkAHv50Y4+mAiXAOUoxLgivAgzDfDMktiUbjXiy4njUEQoJwRA4CAjkT2Y6pQvsD4parnx3yG6OW0wA9JVuW6IDcpQpCvmzcg== 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=DxEMAog8PiX4aUmttmMw2zb33gcOgtkamYN8hfraxhs=; b=4EFRfwhLiKtsSIQU+laktbkIpZj0pqwHMvuoWadZtSV54TmQd0hqK5ZKlYMTH4nme2UdX41VLob+/hTamHDiA13Y/rPaIa5IC2ocqhWaxxogeDBOOs1XcqilToGIWXlFP7n9tDs1n/3+Q8Z2N6RfnnyeEqceDnY9tbd+pt5sM5U= Received: from BN9PR03CA0420.namprd03.prod.outlook.com (2603:10b6:408:111::35) by BN8PR12MB3012.namprd12.prod.outlook.com (2603:10b6:408:64::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:32:07 +0000 Received: from BN8NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:408:111:cafe::a9) by BN9PR03CA0420.outlook.office365.com (2603:10b6:408:111::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25 via Frontend Transport; Wed, 4 May 2022 07:32:07 +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; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT061.mail.protection.outlook.com (10.13.177.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:07 +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; Wed, 4 May 2022 02:32:02 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 13/14] KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible Date: Wed, 4 May 2022 02:31:27 -0500 Message-ID: <20220504073128.12031-14-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: 8a638e13-6231-4d7d-7ac7-08da2da031a3 X-MS-TrafficTypeDiagnostic: BN8PR12MB3012: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: cidlAzT1tvY4NZFYB2HoaNgm0vriXyo4v1MWoJC8U8SgB30dSbztfNOiGWaAA9dy05R2eDXyAPE5+QQYrJawWOepcKQ2UI+WA9V45b31vQbzxLW437YloOOwAhWlYzLuKwGPmV8pEHSmxjXvFYeATS6fZQVNcyf/PU/RTTDS800znV5lWBGARsB1WtjM8t+IpLx5TQWXM9Ed4joltyvtmfe6yN2p3VyspxgEZqwL62pPo2V9zw2sUUAvP5cH+6esUqK29MHGFHMhT0PMFrwIA9FVZYrEjfOAuQF5hQ1QRYQzL687mdhAhJgTudLWyKwiVWE/ZVDae2ZuSf2JKASUGiMNid75tgebEeI9wVCGXFddPCwYqpU7Zj1ruzJQ/OluhoWLIh5CmN5MO/+yiyC6lsDWJ73/GorQqepSOgwyIGHjRY10gqP2aI8ybbR1FL4bRFBrWcCcuOPyx8+v3CY//eg7DyXF7Tc0MBs6WC8dfJDVh5BjS+zIyiU/JUnEfYzbXSAkXF+MMDFgynbMEMILtFTh9Qu/ZnYHO4qkcS0wG66EFMcTkKnyN1f8K651JQrZ2XkaXySFOlmzfmbGSVVgqIl6wyndM+jvUXh1DesK+MbBAIjf3CMGSLJnoCgCrnys7lSBn9vTJiPxnBYGXIcPUImN9D02JFcCTEKJwdLk2ahRxJ72xY0NvOy/BGkJLfdQMR7h5fipXtmIIVkVBPHe4w== 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)(70206006)(47076005)(336012)(4326008)(426003)(40460700003)(81166007)(70586007)(83380400001)(8676002)(36860700001)(110136005)(54906003)(2616005)(16526019)(1076003)(186003)(316002)(82310400005)(86362001)(2906002)(26005)(36756003)(6666004)(356005)(44832011)(5660300002)(7696005)(8936002)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:07.6536 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a638e13-6231-4d7d-7ac7-08da2da031a3 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: BN8NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3012 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. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- 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 3b6a96043633..a526fbc60bbd 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -377,7 +377,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 Wed May 4 07:31:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12837206 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 53540C433F5 for ; Wed, 4 May 2022 07:33:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345558AbiEDHgf (ORCPT ); Wed, 4 May 2022 03:36:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56924 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345610AbiEDHf5 (ORCPT ); Wed, 4 May 2022 03:35:57 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2062.outbound.protection.outlook.com [40.107.93.62]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E5E924098; Wed, 4 May 2022 00:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JQUzBn9Pi3TexV7JfpTxJ1E2JamNEb5PMV1o7DXq8e0IJpS9XxxPEyJDFQnCjTtS61akRkqeUty1pDJO8Hv2c/MzGS652rvhRG4QgCAfLSurcmXxknyJCS1HCoUn9nzuc8ALt7UmdMebQYYQxPQ5m8itD+SeR01YI3+eUJ149G1cwXZLV8LzmTHxkBPvIClM1Yk38HZTHcFOoscJYW1NfNi4qt4p4o0okWxDI4b09PvFv5lzuNJB/K7T0w8vVN4Jwr4BIG2BOHXXcYJUnDv9Ks22hmsPVpnUC5zoIsZC4CtO09cW400AVE0/L5itmsFFoCvRwjwXvtbWiqf5+UpwbQ== 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=L4I+63+Zt42XQgKSkYTJdDXHuGGSUiSP5mh9jvyc2YI=; b=M1MSYhk7f0rgxxXW9Na8SLKQic0gVL3JXko5WQWy5kG3GlhS1Wau6R7dX+tOgXSd1jVxUvJqAmrGUFK5yKfV8l67YghhtUm+16Ecx8wzrUzaccvF6Y8x4BwL7qYvLT/dp86IjBU87jR8ihhXZnxES1IHrhid0fcw3TIUlTNGP9i2tjg/uR33kthseVkyV+wWldNb+htShkew+6bz5Ci8isZzxvs68Io7nPau1qtsvV0qovaLlPi5XDuVwtH8sAq8uE4Afq0kkNP5z6HtBZqyJwsl2PKBOyMMRnjvrDlq3EYauv/Cnnn1vf/E0fPQEKeGfZ/SyEfEdxPk3bvaYJUMUg== 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=L4I+63+Zt42XQgKSkYTJdDXHuGGSUiSP5mh9jvyc2YI=; b=mAOusCr9Dzb6qEsYSdiVyRTK/9/a+B8DD0gftfWcVGuFsCSZIUAyOLqpfAzrf6/C5L3UM6qLh34PiZYKAYniS9TfZaInob5hGfjbhqpJyA2of/AtEByvuNXPTVTMlOVzm3t00VFGBW6Z2A/gyeXHaHooElesP9aYA3zIn9JC44A= Received: from BN9PR03CA0420.namprd03.prod.outlook.com (2603:10b6:408:111::35) by MN2PR12MB3824.namprd12.prod.outlook.com (2603:10b6:208:16a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.24; Wed, 4 May 2022 07:32:08 +0000 Received: from BN8NAM11FT061.eop-nam11.prod.protection.outlook.com (2603:10b6:408:111:cafe::ee) by BN9PR03CA0420.outlook.office365.com (2603:10b6:408:111::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5206.25 via Frontend Transport; Wed, 4 May 2022 07:32:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT061.mail.protection.outlook.com (10.13.177.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5227.15 via Frontend Transport; Wed, 4 May 2022 07:32:07 +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; Wed, 4 May 2022 02:32:02 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v3 14/14] KVM: SVM: Add AVIC doorbell tracepoint Date: Wed, 4 May 2022 02:31:28 -0500 Message-ID: <20220504073128.12031-15-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220504073128.12031-1-suravee.suthikulpanit@amd.com> References: <20220504073128.12031-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: f66c16f0-6930-4fb0-ed90-08da2da031d7 X-MS-TrafficTypeDiagnostic: MN2PR12MB3824: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: rrC7xhDLw08ldvjfXdaQziTjf4L6UJt+chZglY7SOvAbCQppcQL+O4yIZy0vLyMDglns8vcdIxLQE25lC8DyNzMykdifDLekc/AE5l8vXp1a+9vGLWO8xH7/X6/t77o8OwxQie6s2MqJdVurMeFm31qPuST8i0FGCdUir/pzlITOf4IRaMiDJ26ETx3G5B/J6o9O3L9aG9tmNoMyopsX8fW8gMb8x5ibHURIU4XnUzd1vF4OqXNORA3DhVlgqkmFXuK5W56zo3lb5EMzO4KdDbcdl11mAQyQgVexa7UJYqC2LuenG7JbJA1t0plr7sLb0aAKz++5j8FFslaAl8bGvcpaIeXHJ1bTo6sHlrl4SydoUqPrn0XFMBqiV7S7j+8k1fatKVGX3qzKCOjKN821k+0NhEIG6H8hhdL9q8qYaNF6NZX9dIDafytn0NiM3K3CKAhrJ5lCt9K0xXtUILk4Fq2F+Z65KcmW9aIRDddkIubdMnxRuQXZRIpiCD2MBogvqDTSahniS6FIII6wMEFNjXxbS7UPvWhXDNXtnVAFGEc4HMyyJvUwcNm/DBwWYFJdFtvgxmV4FD5xIYJHQN3PFUTXjMKBjymtKW8IwhJJOZdsm1WU55XryBMQhpUAMBFQjsTyLg5UMi/JZ6RAaXAMleTjYJkFv7PvhTi3JX0Rc1Ra6qHnRydSf3wFDuQ5wpR/GtNW2e2veIYcvC7sXA08gw== 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)(4326008)(1076003)(36860700001)(2616005)(47076005)(8936002)(36756003)(8676002)(70586007)(6666004)(70206006)(508600001)(54906003)(2906002)(110136005)(356005)(5660300002)(26005)(82310400005)(40460700003)(7696005)(426003)(83380400001)(336012)(81166007)(186003)(16526019)(44832011)(316002)(86362001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 May 2022 07:32:07.9973 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f66c16f0-6930-4fb0-ed90-08da2da031d7 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: BN8NAM11FT061.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3824 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. Signed-off-by: Suravee Suthikulpanit Reviewed-by: Maxim Levitsky --- 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 a526fbc60bbd..e3343cfc55cd 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -343,8 +343,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 b14e02ea0ff6..69a91f47a509 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13097,6 +13097,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);