From patchwork Wed May 18 16:26:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853836 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 CEA13C433FE for ; Wed, 18 May 2022 16:27:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240194AbiERQ1Q (ORCPT ); Wed, 18 May 2022 12:27:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240095AbiERQ1N (ORCPT ); Wed, 18 May 2022 12:27:13 -0400 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2054.outbound.protection.outlook.com [40.107.94.54]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87F9E68F8F; Wed, 18 May 2022 09:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=D2RP/cnlO1PAzVFSzVCWFKo9+WKA/BLI2LqDi4obfj2ni5o71HdQsCi3PfZRJrsotLu/X5R0bn8+f97u3TJJhAoJaTSbkk7lrjp4poGmSR9XC7tVvd8co6XKTq9wGIYDwZU2Osk9Gmyf5tzePoq3kgAuoolKycPHxwQvPST/zQnrPyuyylH6EpMjnKm08oFbB5aNwLBiAST27w2HO3evFTfKkeSWy8zbGbhRVEUuYSt7wTWiPCfvb758tKNfg+fSTWp11bMB5BVW2l9ZUo1rbcc3lpe9JpRwJfiTOH1mk3x8FxEl56ku2erqSqrbnbvaRp2uOSKxIo65Rl+mV7MEFQ== 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=VrkVkiXJ/36ogQ/HCFUMWmNaPKzJEWU/pZi1WB6jPn09KhNzAb+6YZ7IaNmanFI972CaJIumCABBBIs3cBVdzN3BuJygHKwcMbAaARCpcZ6KJ6eN96VUWgmVGSQlsqkxCleRw/Vh9ziQYbJPI2dP3lqgQ27z9ZYqLBEDPVYSetXFLOcGd67n1Tys9MpKCfQbWzBa/nizQcqD51Ryngu9LCuGmGXf9ixfHtDDsqW/WDEu9zY5kw+WWq0sh8n3PAWNzzIwEE1C5MzRD/m7rw9TOrspGMYaYvquxO62kFnh6Gp7aEB/2GVR84cSpT4r4hvf/IiHOkXhtLiGUetsZW9hzQ== 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=MzFXOKQPfw/PS8SoS203uwypxQHRDuekC7AUTC6SVqD7NW20ASDHEGUFfCENCiJYjB+yfd5OvmsWXcea4S6IK8uQOIGxERs4eTivlYfgnkfu0EhfT+jn7a+oiEt7FreRDEvAtfyhLYd027xyW4UGkpOao5S6w1RWMmNUep8MGB4= Received: from BN0PR04CA0178.namprd04.prod.outlook.com (2603:10b6:408:eb::33) by BN7PR12MB2724.namprd12.prod.outlook.com (2603:10b6:408:31::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 16:27:08 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::e) by BN0PR04CA0178.outlook.office365.com (2603:10b6:408:eb::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:08 +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, 18 May 2022 11:27:06 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 01/17] x86/cpufeatures: Introduce x2AVIC CPUID bit Date: Wed, 18 May 2022 11:26:36 -0500 Message-ID: <20220518162652.100493-2-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 48581b35-0396-4fcc-fc05-08da38eb40e3 X-MS-TrafficTypeDiagnostic: BN7PR12MB2724: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: wHgx+jVm/4jsqHBh5wazmvxYD6td4ev7lht9lTBaJBQKR6/i/bU9wnN0hAf2ZBvMVgoKmdPDchpbhHfYhOzhAxbiNh+wWyp+vvn89sRiX8wyw1UV8qfd9gB6lWPpL9Hwldy4xn887r3MOYH/29W/Quk/TpR8vkzOHg6jQWEkYKIoER65bsYv6AVitsndxJIKg7+GegT18Mn+jNZGaWAYP1+6jw5FBZJh5/6Zc7PZhycqSZP4WMEDB1M5CLny0DeIsaLmqgThbSsrukrw4EYkE0cqpGyuxLclz+3YlJm6ie58Vf6jMk6cvVCM0Wo+wumvF7Wkc8IOJTNlmI00upyyuHdzuJYcX9bvR+/zNZHiafiWCSPLp45HdDE2E2otofrpOBCwD1tqtosYwBT1K1XjYEXobt3MY87lw4saiw1sPkdbhbYq4VsckV/n1JrM6CRy3dwmE1JIjjkbFny2dp44yvikcv18T2b7SpIQse0ujUAbQur1waeTAHtoPmeVohGdvtMXIPQW06vO3frtLR25qcC40pwqdcptk30w6Aeo1LbMjY/J+UBy1YHC9aV6XO+omeBQKWK3iVjtbacXEkUs9XrVpq+iZfiqz+oMpwtU49OUgAcyFfi8MJH18W5Q/5DaIlJHQxnQum85BpLgfvMHZYxncwy9aobA38AX4xW17JwqDNDCQNXwLWlk0YPijm0sroBdP5sHCjx2RMRX9vSdyw== 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)(36860700001)(316002)(70586007)(426003)(70206006)(336012)(2616005)(1076003)(16526019)(356005)(47076005)(186003)(36756003)(2906002)(110136005)(6666004)(508600001)(81166007)(82310400005)(54906003)(5660300002)(8676002)(8936002)(4744005)(7696005)(40460700003)(44832011)(86362001)(4326008)(26005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:08.2718 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 48581b35-0396-4fcc-fc05-08da38eb40e3 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2724 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 18 16:26:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853834 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 C0A33C433F5 for ; Wed, 18 May 2022 16:27:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240105AbiERQ1O (ORCPT ); Wed, 18 May 2022 12:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42018 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240091AbiERQ1M (ORCPT ); Wed, 18 May 2022 12:27:12 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2085.outbound.protection.outlook.com [40.107.236.85]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FFDE64715; Wed, 18 May 2022 09:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=luMPoPXV2cPkqHHWfbKT1uUd9MMTvVP0uEfgfarLumMFVwYC5VggEtPP3dpbft2Za96dcil85BB5sNA6Q0q24WeuEtqWIWW4p8++pykVkXV6wvlI+R8YC0fZI2cHobTN2xGreKSK+7XJFi1DjX/54yLCCKdaEXgqu2lqyFIIGYO+f4Z57pfQxGtIV76mmOlWqWOUPttdoosd74K2ZiIkHDM+BrYVxtoUGKR9vHl/UCAHoHKB6fA8VXh158CVYWw/v7kT0ScJLtnFH6Voa/4KXEi9uwqxlANyk580x3iBKvTULOks+yd0kX8hzY4K87nkUsk+mOLVcUKKjgB73BiXOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=PnglCy/xPXrLNOnm93nCreZT2JM/mgwXu4AHQzkO224=; b=QJKhAohbbke3G+AW4c5boGqr0VCzTAox/7AnQWeEodjrxY46nAtZFzVhqGgQF0bt0eLMMU72kC9L8tUbsj7KHbcG8B45BLZnHISbOicjrHbTc7951FqhEcDAdYhNBFCWYJChU3IxBbXS26okrRH9FofJdfyggGH7E+lCMQFBX9Vl6aPbGQhSbmvRobX0cNUsI0EdAw8cUp/lHybsHcRVbmmBHSu4QS64LGWcIT8f3tNxmQBJnK5uVon71aGfvrZFbeJ2GCmqoiVwybuE0uhXiu3PaHsgzVPd+Bifi39JmcLBcTJC3KfvadnLYKGjQRBFarDB9UelxrF5d+Z2vEI7NA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=PnglCy/xPXrLNOnm93nCreZT2JM/mgwXu4AHQzkO224=; b=wianEMnF0f1Ied7l0GlNtpa/qYZIz7hGuHFTRH+xNUI2NCoep6S0zHTj+P8GxQ4LcHeAJSR6LJZc09ROZrfpWWgdlNN8FXvZSAiaWswMAy6upDLJWfZ4nktvFwLJu/jciYDG7/9rTzUco6NH1uaKZFpnsGd4Wz74IbjQvliNu8E= Received: from BN0PR04CA0162.namprd04.prod.outlook.com (2603:10b6:408:eb::17) by BY5PR12MB3876.namprd12.prod.outlook.com (2603:10b6:a03:1a7::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.13; Wed, 18 May 2022 16:27:08 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::dc) by BN0PR04CA0162.outlook.office365.com (2603:10b6:408:eb::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:08 +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, 18 May 2022 11:27:07 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v5 02/17] KVM: x86: lapic: Rename [GET/SET]_APIC_DEST_FIELD to [GET/SET]_XAPIC_DEST_FIELD Date: Wed, 18 May 2022 11:26:37 -0500 Message-ID: <20220518162652.100493-3-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 01067bd2-3d54-4dca-0c7d-08da38eb4116 X-MS-TrafficTypeDiagnostic: BY5PR12MB3876: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: hefHawLgVKjHLNmWejYNzTgNePiP3mMBuBkOCzvARiN1JNhQW9bkrW3GSQ2oQbj/Tg7m8XZC7YuEj/d+//Rpt7bIGpLEPeWr98qc8DW222gkB/1AiN/o4BKhC2C+QKSHIFs4Fh1h03Ifx5fGvnmCU0m6uZpGhCKHF7lpq0/HEGSqPRF7Y4EFAnTj6Ih/PdaiYfQBqthThK4yEVXR11CpS/cSY/3LHArZ42f/uc/dRoIQHcra1PMqva3QwhLA4W3tyvAgCLKBJIQ+Z4D5NarWluU0CL5Hw1NYiM27efrD32RFURlXRrByIvp44Pu4t8SizkanFmC6/eM1boDA0TCycLtHHxrLVTlIqp6L1gJQpBPGCSa1VEWps36MCzd/jv6gsxFX77XOgWeQqzwbfIt4lknaA1ZGIYhYRditTpdt6I2lFgnV9pC+MfB8AffGIEIvV/oB52OB/6GAAg7HJd1ipcoa/F8jDCwIcO358Xq0qvjq5P7CVMxbPa6FO4iNwQOZ4HI0kIzYZTZcv576VNzscqnVy7TXR24UIY+gJVtd5KJLPgriszR9S+1XIWSBhw/RmkVaLUbGAukvFwq4cxbHNnbDOnNGCOMgH7q/+Go9wazrWt7LPihW2ufVl/+t1/GkZjWONDKS1f2e450S5NpiuyJtONyXioxOS7g6GrG9WV6ZjpL9BHpmfXQ71ybr2aTr3oV/jTujki9jT5tvVfJdcQ== 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)(8936002)(70586007)(70206006)(2906002)(82310400005)(4326008)(8676002)(36860700001)(316002)(356005)(508600001)(1076003)(7696005)(2616005)(26005)(86362001)(426003)(54906003)(47076005)(186003)(336012)(40460700003)(44832011)(5660300002)(110136005)(83380400001)(36756003)(16526019)(6666004)(81166007)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:08.6155 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 01067bd2-3d54-4dca-0c7d-08da38eb4116 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3876 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org To signify that the macros only support 8-bit xAPIC destination ID. Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- 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 18 16:26:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853835 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 F09EFC433EF for ; Wed, 18 May 2022 16:27:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240185AbiERQ1O (ORCPT ); Wed, 18 May 2022 12:27:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41982 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240089AbiERQ1M (ORCPT ); Wed, 18 May 2022 12:27:12 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2061.outbound.protection.outlook.com [40.107.92.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B8BB64703; Wed, 18 May 2022 09:27:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NctJ6T1axaQ5cYl97IJlDHMiR64uqHFPvCnayZTlXIm1DK93RJ4hdc1qHd1aYGM1LjPaIUjA7TkGVWPuTxhnUzQwaa954HGKc5QLPat8L+tvRRZQwhU1tAmiEsnWy15OmPvKyv1JfuhF2BLZlbLX0qpmXzdHkJHIIgmKlU41HQMs8ZeWNt5hbpJ+vEjt+TUnPtHIkUDRpgS0ZYYz9zFwVgSX/EppNbkMKco+O2svJUjX8FnmUco770lcSLhRS+qfcxyFYN4yHRjJlYmw4ttcc8h/0bpAhU6CpchQx68NkVg4oJ5DOCx0bBhe0FbyFxPjr5O5bdW+rM+BWCsVy6ZLHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=XXbUDqjRmzsRStQJiczH5Ed8Uo0mFMfsNCIw/RPMjfQ=; b=bk1BqQtALK2uFoN7eUIQZ6rKiI2ZSBzsBxPZEmEwMPlTibKARGNKBUgtK+36CcikJ6YaW0adDrotLfTvWJXGLPjPCXfr3MeR+obF4He+ze2BJeKs7yna0XdCZ1U2IUE7KyBCSHPfM3zElQLmbQXADZ+DjsHpHKnbqob3qljd51LyEbgxHWjAvs95g0BRroEQOIMXQ7TdWaiXYc9mCkH4SuLgq4W7NP/vT5gs2zfAg24B/i+oL4CWJq7va8LUoUJ45g8bw2zUSqj09j1i2eLXOd6pAlMIcSklbZUPYDEoaH1vFOoH1+mhr8efaRZDlDcW16onP7wp8fKtepX0JRiqqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XXbUDqjRmzsRStQJiczH5Ed8Uo0mFMfsNCIw/RPMjfQ=; b=WWdwJwYX8HBCzvtfSMlKfVL7t8+NSYj9bc2IkvOsaNVz0a4vdPlUiVSaqGHhKvQ5RMgnmdqeyc/Ci7odExL0ShB3ShQpNS81XsFVASyOIcWC4qLgGZ+FQFfznUkuMPe9MsVWRBeYQ/KwxJyPmEPSU0Yab6wZj8hXdd/QVz+jyvw= Received: from BN0PR04CA0152.namprd04.prod.outlook.com (2603:10b6:408:eb::7) by DS7PR12MB6143.namprd12.prod.outlook.com (2603:10b6:8:99::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:09 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::b) by BN0PR04CA0152.outlook.office365.com (2603:10b6:408:eb::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:09 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:09 +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, 18 May 2022 11:27:08 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v5 03/17] KVM: SVM: Detect X2APIC virtualization (x2AVIC) support Date: Wed, 18 May 2022 11:26:38 -0500 Message-ID: <20220518162652.100493-4-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 82813609-980c-4599-a432-08da38eb4170 X-MS-TrafficTypeDiagnostic: DS7PR12MB6143: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: ij8VhjMMur3RUiaKu8FX6hhh1UEaOsUSkKc/dNX9dzC5vY6drCLhjzcq9L9np2yLCQ2ksayrzpRZ4KbE9/fdYyUXW5+hCjMnOtDq6OrVJVBoJeW4xj5IG17VVnlABAlzdOFY7WlXX+8XEClGqEtkrU3bHkVWVnUXGmKqU44ZDoUQd/0Uf7IDFc75CCt6gYTyhs57DcuOgEqWsFVEEneUU6Z5MXypvm5OCuRPCeFUaZ5B4edtwwawH5VJsEfHUAEm2iSCCTJ2Dc+N3J9SX0V6dUuVdOwmgL0hm+YwyIu1ZnfWA3BTxJqLxq/YYPSkAn5iIM814wuT8ZvrjHTe1dj2mQLjW0Vg3Qogu2nmBo26MaKPS/cJPlTaiij0fSLHeHhK1mDwZE1xkP6adNmqWjfBP/Xr44YJH2+WkKW6r4djIWM2uPVl13J8lIUQ18g8yBRjKhF6JUEH2/Tpv+8hxSewBWMxBGNbxhQZTEb5J5cOhC+tVRCqi78b9AUPn2xt4onzAVSL/KaqTl44GpYgiAQKgVkQtTOeJo/tMz+ADYyhpaaqjeA0wqFWjKJ+MJR8K/MdDVtP5Fiu3aVijhnNklUM+g4rJ06sfSgkDhIlllAWSZmhN6Js1gIUEYwj/JQf5HHUI2mrrFHhznUnCDAyf9QAl5RSKkBe9HBonGyJVezvhLhFQQAEyt9TDeUvjgQOEsz18263mqYPYaBzq7hL85ireadnlD0aPTnFNlPj4HHh2N1JqDo6dbsIDbqrR0MZ/Qj+TMEi8NtLr4kRlFk2wWEWng== 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)(70586007)(70206006)(83380400001)(316002)(54906003)(7696005)(508600001)(110136005)(8936002)(81166007)(82310400005)(356005)(86362001)(6666004)(36860700001)(40460700003)(2906002)(186003)(47076005)(16526019)(1076003)(36756003)(2616005)(336012)(8676002)(426003)(4326008)(26005)(44832011)(5660300002)(71600200004)(36900700001)(309714004);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:09.1936 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 82813609-980c-4599-a432-08da38eb4170 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR12MB6143 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add CPUID check for the x2APIC virtualization (x2AVIC) feature. If available, the SVM driver can support both AVIC and x2AVIC modes when load the kvm_amd driver with avic=1. The operating mode will be determined at runtime depending on the guest APIC mode. Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/svm.h | 3 +++ arch/x86/kvm/svm/avic.c | 45 ++++++++++++++++++++++++++++++++++++++ arch/x86/kvm/svm/svm.c | 15 ++----------- arch/x86/kvm/svm/svm.h | 9 ++++++++ 4 files changed, 59 insertions(+), 13 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index f70a5108d464..2c2a104b777e 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -195,6 +195,9 @@ struct __attribute__ ((__packed__)) vmcb_control_area { #define AVIC_ENABLE_SHIFT 31 #define AVIC_ENABLE_MASK (1 << AVIC_ENABLE_SHIFT) +#define X2APIC_MODE_SHIFT 30 +#define X2APIC_MODE_MASK (1 << X2APIC_MODE_SHIFT) + #define LBR_CTL_ENABLE_MASK BIT_ULL(0) #define VIRTUAL_VMLOAD_VMSAVE_ENABLE_MASK BIT_ULL(1) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index a8f514212b87..7d4e73e95acd 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -40,6 +40,9 @@ #define AVIC_GATAG_TO_VMID(x) ((x >> AVIC_VCPU_ID_BITS) & AVIC_VM_ID_MASK) #define AVIC_GATAG_TO_VCPUID(x) (x & AVIC_VCPU_ID_MASK) +static bool force_avic; +module_param_unsafe(force_avic, bool, 0444); + /* Note: * This hash table is used to map VM_ID to a struct kvm_svm, * when handling AMD IOMMU GALOG notification to schedule in @@ -50,6 +53,7 @@ static DEFINE_HASHTABLE(svm_vm_data_hash, SVM_VM_DATA_HASH_BITS); static u32 next_vm_id = 0; static bool next_vm_id_wrapped = 0; static DEFINE_SPINLOCK(svm_vm_data_hash_lock); +enum avic_modes avic_mode; /* * This is a wrapper of struct amd_iommu_ir_data. @@ -1077,3 +1081,44 @@ void avic_vcpu_unblocking(struct kvm_vcpu *vcpu) avic_vcpu_load(vcpu); } + +/* + * Note: + * - The module param avic enable both xAPIC and x2APIC mode. + * - Hypervisor can support both xAVIC and x2AVIC in the same guest. + * - The mode can be switched at run-time. + */ +bool avic_hardware_setup(struct kvm_x86_ops *x86_ops) +{ + if (!npt_enabled) + return false; + + if (boot_cpu_has(X86_FEATURE_AVIC)) { + avic_mode = AVIC_MODE_X1; + pr_info("AVIC enabled\n"); + } else if (force_avic) { + /* + * Some older systems does not advertise AVIC support. + * See Revision Guide for specific AMD processor for more detail. + */ + avic_mode = AVIC_MODE_X1; + pr_warn("AVIC is not supported in CPUID but force enabled"); + pr_warn("Your system might crash and burn"); + } + + /* AVIC is a prerequisite for x2AVIC. */ + if (boot_cpu_has(X86_FEATURE_X2AVIC)) { + if (avic_mode == AVIC_MODE_X1) { + avic_mode = AVIC_MODE_X2; + pr_info("x2AVIC enabled\n"); + } else { + pr_warn(FW_BUG "Cannot support x2AVIC due to AVIC is disabled"); + pr_warn(FW_BUG "Try enable AVIC using force_avic option"); + } + } + + if (avic_mode != AVIC_MODE_NONE) + amd_iommu_register_ga_log_notifier(&avic_ga_log_notifier); + + return !!avic_mode; +} diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index aa7b387e0b7c..196bca5751a1 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -188,9 +188,6 @@ module_param(tsc_scaling, int, 0444); static bool avic; module_param(avic, bool, 0444); -static bool force_avic; -module_param_unsafe(force_avic, bool, 0444); - bool __read_mostly dump_invalid_vmcb; module_param(dump_invalid_vmcb, bool, 0644); @@ -4913,17 +4910,9 @@ static __init int svm_hardware_setup(void) nrips = false; } - enable_apicv = avic = avic && npt_enabled && (boot_cpu_has(X86_FEATURE_AVIC) || force_avic); + enable_apicv = avic = avic && avic_hardware_setup(&svm_x86_ops); - if (enable_apicv) { - if (!boot_cpu_has(X86_FEATURE_AVIC)) { - pr_warn("AVIC is not supported in CPUID but force enabled"); - pr_warn("Your system might crash and burn"); - } else - pr_info("AVIC enabled\n"); - - amd_iommu_register_ga_log_notifier(&avic_ga_log_notifier); - } else { + if (!enable_apicv) { svm_x86_ops.vcpu_blocking = NULL; svm_x86_ops.vcpu_unblocking = NULL; svm_x86_ops.vcpu_get_apicv_inhibit_reasons = NULL; diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 32220a1b0ea2..1731c1f3884b 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -36,6 +36,14 @@ extern bool npt_enabled; extern int vgif; extern bool intercept_smi; +enum avic_modes { + AVIC_MODE_NONE = 0, + AVIC_MODE_X1, + AVIC_MODE_X2, +}; + +extern enum avic_modes avic_mode; + /* * Clean bits in VMCB. * VMCB_ALL_CLEAN_MASK might also need to @@ -603,6 +611,7 @@ extern struct kvm_x86_nested_ops svm_nested_ops; /* avic.c */ +bool avic_hardware_setup(struct kvm_x86_ops *ops); int avic_ga_log_notifier(u32 ga_tag); void avic_vm_destroy(struct kvm *kvm); int avic_vm_init(struct kvm *kvm); From patchwork Wed May 18 16:26:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853839 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 548FBC433EF for ; Wed, 18 May 2022 16:27:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240151AbiERQ1f (ORCPT ); Wed, 18 May 2022 12:27:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240197AbiERQ1R (ORCPT ); Wed, 18 May 2022 12:27:17 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2057.outbound.protection.outlook.com [40.107.220.57]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B32436AA62; Wed, 18 May 2022 09:27:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UkRYQNYBdNoZXNcsswzhSw7nyOMXiCmXwU2MAXXIHFDlfErZCKVSd7FGhpSQwohSvE5Mza/NuDhUPSA6HyCZyCE98Iz/unr309xIAFNelghBQ4OM+LXTFlsi+UFbbAPzd6/LJE0ED0+7AOfg/cjs9ezLc8oFE61+eZPV219Ydarq+EGKNmN55C0Nm1vAzZFp1nm4dC8vvOAHsQGsGV+EwQ6OFWnAGvX3Psm2P9HCQdR5hm8hoKwYPw16iCePf184E0bAm/w02nPlMhgSrOyRWU9SuiKdoLoO0lpKKfgtQSFLAy6lFZt3NzqyQsD+djw8Not+bk9yINEFtYgbbwgCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ZsGI/LukaIQoq01Bz/uzHMwv/M362sY2YQ14Oxc9OVM=; b=f7/SHYoCZjMER24t7vza2D5wbjHCpQMj/cAA+Me3h4p1w5PZLVa3y/eUrUWtypCYEhXZDZxInmpMKCFtvi9lZiXhcGWof0vzuqVGEf9eLIawY/YeisScsgp2Xc5EEqyCdD7wMV3rZwBGGDWHaq/L0xTDQwh1p7atqHuACdU0h5+CIOH5r7YZ8Iqtid7nOjyig12rzXOEwlTo7L+gD+EPlD1oMUES6QtAuSsXPfqEsbOYeg3s7zOCN4qtFurTnIzYHcw1+eYVPVYze4gr+kSAyZfoteeVFNoscwYi2A76TQfG0b1NP0jiZ43y/4Xazqqe/gHHJbcnCi6tAIPhzF9/gg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZsGI/LukaIQoq01Bz/uzHMwv/M362sY2YQ14Oxc9OVM=; b=DydUGUlTQ+5xrtIuUtKhoiiHpJJZkPCNztzrH9vPvm8Pc/RH8CbGAFEi/12EmZcI/7lA9T2WPdRovT9YVpOAnJ6RU+0nYU0UWvS3VF/4jlS/boMqBM5xyCdl0krLzcoy0bguadc5iKyq/OAG8B1yui04xn5QAmJeoxUmL0L5Ag4= Received: from BN0PR04CA0172.namprd04.prod.outlook.com (2603:10b6:408:eb::27) by MN2PR12MB4319.namprd12.prod.outlook.com (2603:10b6:208:1dc::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 16:27:13 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::c2) by BN0PR04CA0172.outlook.office365.com (2603:10b6:408:eb::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:13 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:13 +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, 18 May 2022 11:27:08 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v5 04/17] KVM: SVM: Update max number of vCPUs supported for x2AVIC mode Date: Wed, 18 May 2022 11:26:39 -0500 Message-ID: <20220518162652.100493-5-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 7c63e222-228d-4470-9f27-08da38eb4421 X-MS-TrafficTypeDiagnostic: MN2PR12MB4319: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: QbaGUiHcBpoxSY/H7cRlKOv6Z/Pv0nQ7kTnjSSs5rbvbAvRbpArYAJqKDUQeBoLaMrT8h2S3gXmHkJGeZPy1KswIglbWSBT+BKoL+YYEkBs842GvABTvzI2+CBfuH20kCun9Ol+LW5zzkLnCSnqOJTQ/5J2/bq5UyaYH3qDn4yV4KJutWLRXibOq58uQoSp/jvt9T2If0RbzXW//Z9JLUSTH2Sa60wJ6aEFgGUvbFyEXHUE7erLzFJtDVamTplklNbObRYBnKWJMKgA0ftPkqsz7abVRxR92t/c/+mjLAcOOP/fIW+nKrnNSZp2aJ8HRufJXGQ0XH60QYvT3n+RL0rEno64kSMcnMWjsfnzHF1ySvYKEEG7l+DkNFv3EhaWAdh1QJXlFfeGScpz9vgIvDMUKDnTcxVTqsf6NpItaN7U/Jmvo3/KcKStJFOi4ogHc1PocSzqevOHwmQr4PO0IRjD5WWQqDFtlICEKDImgPixK8Ocz+xCcoUEw3uWbeohBnLK+JaybQlsFk4hbAdQqx8dh6crMyyt9GWDJTfZLm6IFDg+hCt2mP+JaiBDsXjY8vdU8xo6f+AeZqGqJ8C+rFTj5Bb4ifAmmAURd3RyuxLM67+7jUGHV9CEQ4pzATPQbK7+qlbq5cLpPijq4noz8clSHBLMgxq/jgMewjZ8q/4pQFgPXhcPViMUSBTMKr6fa6fSqtpH0mLyM/+5TQdv3ig== 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)(81166007)(54906003)(4326008)(110136005)(356005)(336012)(2906002)(1076003)(508600001)(186003)(47076005)(15650500001)(26005)(36860700001)(16526019)(6666004)(7696005)(8936002)(40460700003)(83380400001)(70586007)(316002)(5660300002)(2616005)(44832011)(36756003)(82310400005)(86362001)(8676002)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:13.7089 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c63e222-228d-4470-9f27-08da38eb4421 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4319 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org xAVIC and x2AVIC modes can support diffferent number of vcpus. Update existing logics to support each mode accordingly. Also, modify the maximum physical APIC ID for AVIC to 255 to reflect the actual value supported by the architecture. Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/svm.h | 12 +++++++++--- arch/x86/kvm/svm/avic.c | 8 +++++--- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 2c2a104b777e..4c26b0d47d76 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -258,10 +258,16 @@ enum avic_ipi_failure_cause { /* - * 0xff is broadcast, so the max index allowed for physical APIC ID - * table is 0xfe. APIC IDs above 0xff are reserved. + * For AVIC, the max index allowed for physical APIC ID + * table is 0xff (255). */ -#define AVIC_MAX_PHYSICAL_ID_COUNT 0xff +#define AVIC_MAX_PHYSICAL_ID 0XFEULL + +/* + * For x2AVIC, the max index allowed for physical APIC ID + * table is 0x1ff (511). + */ +#define X2AVIC_MAX_PHYSICAL_ID 0x1FFUL #define AVIC_HPA_MASK ~((0xFFFULL << 52) | 0xFFF) #define VMCB_AVIC_APIC_BAR_MASK 0xFFFFFFFFFF000ULL diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 7d4e73e95acd..6b89303034e3 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -179,7 +179,7 @@ void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb) vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK; vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK; vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK; - vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID_COUNT; + vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE & VMCB_AVIC_APIC_BAR_MASK; if (kvm_apicv_activated(svm->vcpu.kvm)) @@ -194,7 +194,8 @@ static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu, u64 *avic_physical_id_table; struct kvm_svm *kvm_svm = to_kvm_svm(vcpu->kvm); - if (index >= AVIC_MAX_PHYSICAL_ID_COUNT) + if ((avic_mode == AVIC_MODE_X1 && index > AVIC_MAX_PHYSICAL_ID) || + (avic_mode == AVIC_MODE_X2 && index > X2AVIC_MAX_PHYSICAL_ID)) return NULL; avic_physical_id_table = page_address(kvm_svm->avic_physical_id_table_page); @@ -241,7 +242,8 @@ static int avic_init_backing_page(struct kvm_vcpu *vcpu) int id = vcpu->vcpu_id; struct vcpu_svm *svm = to_svm(vcpu); - if (id >= AVIC_MAX_PHYSICAL_ID_COUNT) + if ((avic_mode == AVIC_MODE_X1 && id > AVIC_MAX_PHYSICAL_ID) || + (avic_mode == AVIC_MODE_X2 && id > X2AVIC_MAX_PHYSICAL_ID)) return -EINVAL; if (!vcpu->arch.apic->regs) From patchwork Wed May 18 16:26:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853840 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 B48FDC433EF for ; Wed, 18 May 2022 16:27:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240148AbiERQ1i (ORCPT ); Wed, 18 May 2022 12:27:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240200AbiERQ1S (ORCPT ); Wed, 18 May 2022 12:27:18 -0400 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2061.outbound.protection.outlook.com [40.107.96.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 593FF72E2C; Wed, 18 May 2022 09:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YiBmRard/KOkOWpDKGYjbNaNDuHs4QrwahItM4rLJK5bOWTtoKH0hn39rdSW5vUvO4OTyR0FXlbsFzHdlQyVnlSd4BWWIm7WwFoMmpVP3x/SByGXRn9sMZ2l/btmCBDXMO5KYBc8E3BCDa6Nm9DERwVGqBK8qHK9BGs7cxKaiJNscDhvdoL/FLlHafTnWcZWVSM37BOL8k4bM3hW/CiQQ29ppd7IXvCYhkvMyrb3py+be1GvAoVvupFy7DoxAa8KTLXV5pCD35lYT43nfak3lvps4ytaTQaEBScMLCdypQa0vyEMnCjnB8UVoBvRzf/Xs20yOpPLWkcZXrKDJIAgzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l7nGMak3tiYN2w9nHKtz8Tq5+cMkjgVNWyFDRaDtLDw=; b=AvR2PyNZEM5b7kjwfJVwbx/eEY+KltNKg4bksHAwWpJmoPn3iW2dsBZtvlCCWkX7jHatz3NzH4hRvb26Y/4t+DWv8AaPs7USh5liKYt0cgVGnIb1fe1Oj7lccQfJxU2gyzi64NeHEiVqOHdHj1v7clfeJHDoykuF6/f42yrmB3rLVT5e/e4JBnbU7XahP367wK6S2p7+WSEEGhxb8L2hrdOq1Pvtls77EkRfYlBMyGyH0w0y2CmG+vP0wYg8vIvIvy6EfKYMmHBG3ru4aJjfbzjaVdUaWxfgFiTETA3EeH+KgguGoqmN9M4dpYphJcWIYO46HAx9cLf4/b/6Zqehng== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l7nGMak3tiYN2w9nHKtz8Tq5+cMkjgVNWyFDRaDtLDw=; b=gmb1Hdi+An5fFRYW1wEABF6XuJ/3UZ8zXc+eLu1Z3aur1ubTeYmYd1qXf25c5REAgNpExySsKUVKb/v4iujDs607xyxGn5SM2P7PdXw6vqCkRg8Baea8GX22Ttoj/LpyLqMfW6gcv64F/mIfyOt0sT2akiuwNpmPUNScwuarmhw= Received: from BN0PR04CA0155.namprd04.prod.outlook.com (2603:10b6:408:eb::10) by DM6PR12MB4028.namprd12.prod.outlook.com (2603:10b6:5:1ce::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.17; Wed, 18 May 2022 16:27:14 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::fe) by BN0PR04CA0155.outlook.office365.com (2603:10b6:408:eb::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Wed, 18 May 2022 16:27:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:14 +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, 18 May 2022 11:27:09 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 05/17] KVM: SVM: Update avic_kick_target_vcpus to support 32-bit APIC ID Date: Wed, 18 May 2022 11:26:40 -0500 Message-ID: <20220518162652.100493-6-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: d80aadeb-6593-41a3-11ee-08da38eb4456 X-MS-TrafficTypeDiagnostic: DM6PR12MB4028: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: xD+LN86cdXykuiTOE+UY5hekJ7wnPliH7EJW+tVfK9xrjcOCEYog9UpjA87mzXD+0bXsaV1f1YgqUCyByRHsKEx3LFSBbrPRWOzWxMW95vksYtg0xpOQ4MrYeR4eWHSkCwKDH/YaVX6Mvfn9rDYn5oqPtyMQlkwMub152KdXS/ZstUuLaZmbZVaPXAmLbk1HxWbU7X2TiGOA0zs/9U4qnllqkBxC6MpzeQaFsAW0smbPYUa24qs4D8WATAQFKgpKo4W5eoAeFvaPPakeq2uEsKB837CRtID/bzN7D44J4SsNYTrh6WYyy2RnsO/1PmD1ejB49RkMD9ZH7DExNDgONNIjCN1k6EZ2lVTrRqa+v03K3W/75oTcEx/xloiuaP5MW+Fwm1hUjL12TyrdMtI7Y4kEc4ocNoXaaAwLPbpeuSVKAITy4N7Xs0q8RaUvXnz1TkY1eMAgKFUNKZhGsmq7E26bARDDqWQxnGQAaPSN4PO7hVU14CNdZGcPkrJOR6jYsLfxjlOICqi+WB5pMCBd9n2676ijiEqmkTn/pOH6wLgO8xKlIoRKH563rVxWuPg4eupP9GEv2zUnAOKk1nwQGJsWy0KZAa/vxjNOC67401nUn9EU9GA8DpPoK8y5NHbOHy9yktIOnMd4WfKxiEqdEyeH9LxFt/jfPfeXF3pcQy9Ekgh/1NLO9lm5+WwHbWahtw1Ndq2IYP7fLrnnM1iuew== 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)(316002)(81166007)(36756003)(36860700001)(47076005)(2906002)(44832011)(6666004)(7696005)(4326008)(8676002)(336012)(356005)(70206006)(2616005)(5660300002)(86362001)(186003)(16526019)(54906003)(110136005)(40460700003)(15650500001)(8936002)(508600001)(1076003)(82310400005)(70586007)(83380400001)(26005)(426003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:14.0526 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d80aadeb-6593-41a3-11ee-08da38eb4456 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4028 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In x2APIC mode, ICRH contains 32-bit destination APIC ID. So, update the avic_kick_target_vcpus() accordingly. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 6b89303034e3..560c8a886199 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -369,9 +369,15 @@ static void avic_kick_target_vcpus(struct kvm *kvm, struct kvm_lapic *source, * since entered the guest will have processed pending IRQs at VMRUN. */ kvm_for_each_vcpu(i, vcpu, kvm) { + u32 dest; + + if (apic_x2apic_mode(vcpu->arch.apic)) + dest = icrh; + else + dest = GET_XAPIC_DEST_FIELD(icrh); + if (kvm_apic_match_dest(vcpu, source, icrl & APIC_SHORT_MASK, - GET_XAPIC_DEST_FIELD(icrh), - icrl & APIC_DEST_MASK)) { + dest, icrl & APIC_DEST_MASK)) { vcpu->arch.apic->irr_pending = true; svm_complete_interrupt_delivery(vcpu, icrl & APIC_MODE_MASK, From patchwork Wed May 18 16:26:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853838 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 4F8FBC433FE for ; Wed, 18 May 2022 16:27:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240138AbiERQ1c (ORCPT ); Wed, 18 May 2022 12:27:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240201AbiERQ1S (ORCPT ); Wed, 18 May 2022 12:27:18 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2080.outbound.protection.outlook.com [40.107.244.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF52A6AA60; Wed, 18 May 2022 09:27:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OOsJs+5UJ9Wu07zzJYOGy2VpgGp3+BzLtnSLn81MaLMHhnRdw7aM1jZg6tV84PnavvlQQjde7yuXCYBYaWzpKlzxAhwQtFl5v1lBTBNbs1SqDdHm+N+pJkKnrpg5z5amtBZJAOToa4/XIYTspMHRprW5a3+mGT3LdlXXhtOREVVKODGMmZ10Dr4QtkqtB+EgaElbM4OqWVnDxUB/jPA8sFxGgHMCbVhduUUB2qMM/zzQHUCtFS6OjhzCwLsV9boSeueMUwctdBE9gOUjckCJGhzRTtOzBK4yJ4HyrKzDuqK+/68TGXL2dFC91LB1Oyeu3etYdd+i2RKCNC8o6/uIJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=cWn/vash+REJVBPvFVe6fL5edyLf62h5NzBGmBUCpiU=; b=OT+bjsuwGynEUY+ldNVodXtTqyUnSq9FAmnHCCLM4DqA79DFi1JcvKm+iPWJVHTB9wzhcTKWix28FK51IT5mRvHKwxvKENBOiBjKHq2klQKUcw5SLrTRGZVgiBJ0pbevT+XtGPuBLUyB9TuKSKK0m0DrNybS7DVT3THvla61YUS5rMZ44l12+XmRd4Vff/nLGHvcAdr8fODzfXfRgCcdQBC8IWn80JDLOsHvU4SxiLbuY6q2pThtI2PhU+i+MGMjjen9tjB5XHMasHw5lFseoLl6Tcu+PedTWvnQFc1rBhqtbGRdL6ROwoDsDtNBST2Tb2U8jKKj3qYHDCwRrwVX6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=cWn/vash+REJVBPvFVe6fL5edyLf62h5NzBGmBUCpiU=; b=jxFzq6I/nuIZh0EHs9EoL64ZcR/6kmWfNy8NCrvoyFjWTPa1OKPrOLEdrj4J9mMHVGSCWx1M6Ep5D/JY40WSEplvlCwuGcOEgaTgX8tBIijrBp0RfQNIDNuZfZ7jB1fJqjEEK3ZsqP8ZmvM6XiVKhSS/FEzrus8MiUBg8cVtY8Y= Received: from BN0PR04CA0178.namprd04.prod.outlook.com (2603:10b6:408:eb::33) by CY5PR12MB6372.namprd12.prod.outlook.com (2603:10b6:930:e::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 16:27:15 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::e) by BN0PR04CA0178.outlook.office365.com (2603:10b6:408:eb::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:14 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:14 +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, 18 May 2022 11:27:10 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 06/17] KVM: SVM: Do not support updating APIC ID when in x2APIC mode Date: Wed, 18 May 2022 11:26:41 -0500 Message-ID: <20220518162652.100493-7-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: d85d4698-ef53-4088-d08e-08da38eb44b7 X-MS-TrafficTypeDiagnostic: CY5PR12MB6372: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: 7mqGp14jPm0d0GzzqrHtmHvf5sEnmpQsgCQbM4cKrbNpKA9DQzqALKY6QRSUNpp8isycaOauiAkWIThseb+0hQad0OSt5gFtUC7eAzoDZimL3wORhDJKaIEJfE8f8efGSzs3uJQ/827bA8De5HJTl/7BgaESsPQATFp26dJhw9amamz2FqaTHytvvSn9o2DzDfPNgIiSin5Sv6PFGaSzL3NW5yn9DzWA6xtDUpjKW5hdCfgT5VLjP0OQDQSYElzu906qoEhrpfTTdFYTBdQ56RJswK85/XwFCRUXvzUCCPgpwAmiKy7RyzPk0+QAwtOjli8LcNp/5qp4+XNPQPagRZmgKQy4QBQZKoyAJruL/ck9sFDiSH0V3x/tYf98QMmujnj5jjB3yd4NsGKdzNWkodcJpZfNf7HB77BOipoadUbMN3Dan3raUhYjCnvC5VcTgYiIW51PKIkhvsweKMYqMcaOqvx3lqW5LJyZ9zuangIHvHzMh3Sc94BonTu46pR71bUgCTDdiPtgw7idJfLzGnspAaMiSBI1O80Mvcgxg0vnMv9umi/BUWFpSDNbE/v9n03Rl2rXOtU66rEQhxoKrP2gC/FbUCujFkqRBVARowKH3WfXHY2TQtzzgNP3uTV/zm8WikAAjKBKYFaDP0OFuEngpsO7L9QLI3AY91WF63wV7ahkvj9ydTy4c2z+zpmfXjWeWxOpeYKE9rBg22qlgw== 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)(47076005)(426003)(2616005)(186003)(336012)(40460700003)(316002)(70586007)(16526019)(4326008)(8676002)(7696005)(54906003)(508600001)(1076003)(36756003)(5660300002)(81166007)(44832011)(6666004)(8936002)(2906002)(86362001)(110136005)(356005)(83380400001)(70206006)(82310400005)(26005)(36860700001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:14.6932 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d85d4698-ef53-4088-d08e-08da38eb44b7 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR12MB6372 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org In X2APIC mode, the Logical Destination Register is read-only, which provides a fixed mapping between the logical and physical APIC IDs. Therefore, there is no Logical APIC ID table in X2AVIC and the processor uses the X2APIC ID in the backing page to create a vCPU’s logical ID. In addition, KVM does not support updating APIC ID in x2APIC mode, which means AVIC does not need to handle this case. Therefore, check x2APIC mode when handling physical and logical APIC ID update, and when invalidating logical APIC ID table. Reviewed-by: Maxim Levitsky Suggested-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 560c8a886199..7aa75931bec1 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -493,8 +493,13 @@ static void avic_invalidate_logical_id_entry(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); bool flat = svm->dfr_reg == APIC_DFR_FLAT; - u32 *entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat); + u32 *entry; + /* Note: x2AVIC does not use logical APIC ID table */ + if (apic_x2apic_mode(vcpu->arch.apic)) + return; + + entry = avic_get_logical_id_entry(vcpu, svm->ldr_reg, flat); if (entry) clear_bit(AVIC_LOGICAL_ID_ENTRY_VALID_BIT, (unsigned long *)entry); } @@ -506,6 +511,10 @@ static int avic_handle_ldr_update(struct kvm_vcpu *vcpu) u32 ldr = kvm_lapic_get_reg(vcpu->arch.apic, APIC_LDR); u32 id = kvm_xapic_id(vcpu->arch.apic); + /* AVIC does not support LDR update for x2APIC */ + if (apic_x2apic_mode(vcpu->arch.apic)) + return 0; + if (ldr == svm->ldr_reg) return 0; @@ -526,6 +535,14 @@ static int avic_handle_apic_id_update(struct kvm_vcpu *vcpu) struct vcpu_svm *svm = to_svm(vcpu); u32 id = kvm_xapic_id(vcpu->arch.apic); + /* + * KVM does not support apic ID update for x2APIC. + * Also, need to check if the APIC ID exceed 254. + */ + if (apic_x2apic_mode(vcpu->arch.apic) || + (vcpu->vcpu_id >= APIC_BROADCAST)) + return 0; + if (vcpu->vcpu_id == id) return 0; From patchwork Wed May 18 16:26:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853841 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 6F111C433F5 for ; Wed, 18 May 2022 16:27:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240115AbiERQ1l (ORCPT ); Wed, 18 May 2022 12:27:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240177AbiERQ1X (ORCPT ); Wed, 18 May 2022 12:27:23 -0400 Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2059.outbound.protection.outlook.com [40.107.93.59]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EED646B086; Wed, 18 May 2022 09:27:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NVYsthIr0u1n2SMMZonUFogTkg3NnWbKJ/tDxRXV3k24m3cu/JCyzI6eS1TBG9rX0R8XCDWD8FFbqYu3W0aqoYAOjHFYb3/5AW8q7lfNl8SBJpoN6k9wskKZwffYML2DCR4xoUeWsA6RvOZ0CG1pIuqeXfvft9HgUWZa0T0xUTWnGwsDsKVTW1CeO0GzB2qECRh5ZRSJXfy7vxJ1amkf9ZJkTkc1YoGJLi/taXa4rfjwF0djufp9V61dZdzFah7IldFh6U+7RFtIoI15Jh814YK2Qb8Jh7y6ZmPF4/bhpGbi7KPNjc27e7rnD+L5Jgs///ZiuoIgmvX4LqPfLSKyTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B06hmCDbcPMOIz5jArgE4svMc8q/kgfB0AJoJeN67Uc=; b=Bib/qKRMVSqXj+XnTIpSTfGBiKXupPSyT2oj5hgxA2Bk5Km2SsqypPP+RXWuu4PxWyyt0G4XJSL4WbVEaR+df8CD8YdRZTgAnoJUTACauRi7SkmRVPSITwTizHuylMf30AbOan12J7J5tl/ScH5P8jGz2Ib80ArPYbOaH3uvdAKAugYlrbZa7FH4sT1jS2BepiqY9qEOkhavOJOZ7CbjRZh8BDAG/6aXrCT/TUdwm3C+40+SIE0Ggg0X7lv4CE/Y5NwHOrKUzw169L4Z/cAKb8AMzJJynJV7RuboGy8nomnEjC0HncuG/2g0Yf1J6yV5P+kFVeRnXDl156o6TJtlTw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B06hmCDbcPMOIz5jArgE4svMc8q/kgfB0AJoJeN67Uc=; b=zIqRY2A0upwbkg34JQ+IfN7Ml1lOCF5F4KMicgV1jbGON+2psC4Hdmppi5LWb4j9cHCz7WTS0KFX+aGeeUxjISmIM83yA5I7/UmT6pHvoj31MMZ4NPgMaD8Sf9dw9RUgBevH5hcbkacCqgvjlZua/DD8/Xvr+qWYAhkQnMlxa1M= Received: from BN0PR04CA0179.namprd04.prod.outlook.com (2603:10b6:408:eb::34) by DM5PR12MB2549.namprd12.prod.outlook.com (2603:10b6:4:bb::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:15 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::41) by BN0PR04CA0179.outlook.office365.com (2603:10b6:408:eb::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:15 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:15 +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, 18 May 2022 11:27:11 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 07/17] KVM: SVM: Adding support for configuring x2APIC MSRs interception Date: Wed, 18 May 2022 11:26:42 -0500 Message-ID: <20220518162652.100493-8-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: d8a2bd26-1082-4298-7ab8-08da38eb4525 X-MS-TrafficTypeDiagnostic: DM5PR12MB2549: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: SMTEYWukh1ho/u7IC7WS0IY0Hrz0dlIZNYtsV7U2R3QfkaaVd9gPRACcWkJKTX9VJvbTnHCHxgzgisk6kKQAF2OZ4MYMaFSOj+8FVrPsGuMdIOYSBOHbbHoszIIOfYRFa1KpFiKgGNq/dXVzz8I0jJlGScyxXFm461D3ewMBmzuRHAcU8+nJDrOgnWm33OUWwuDu5wkuhvVU2ir1CueAn1FjDR986mWmMrozItUVQJ0KEQohHcWt/1uYdfsag794k20b0bLSZuTqOxibR0g2SmOpkxM8uiR4qI7wgNySj+gTGuMUHTyGmuDpsH2xBrgDvpiyJ7Xy0gHnOpq67yQzvEFILRA3qyMk8c+7Rc55NJOdhjQn4VTxK0vmxZf5HOXtQaB6Bjbc/zz2HJrPqPsN5W/uX1fH71KetvAngxPjXyHObaRDrq1fIHLmV/kGVIqLR8eMle7zQ7qPVa+IeFrQRgq/7Wltv1EBDoobunuDzQRBPUmfkCkzPL5N6VTTlgrrdyuZy30mNsK03xP7tjwzXNMU4dqFWZo0t52UgMMVEE5PD7qTolgMWyl1JfAlsKs0H7Ywra2RxSAJUy87qoaFK8oPeE5++Myo0rl4BZMCnioaL9NmRwokczr6+iBBqWyNY1x+CnEVPAYcj6NnLli2LN6Ywp1uE5cQFi5SLn8mHI+oUFpO9mipBYrYbTClBEBcM1yYo1AFvzzX+rL1IkCqeQ== 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)(83380400001)(2906002)(186003)(26005)(16526019)(1076003)(44832011)(40460700003)(6666004)(2616005)(36860700001)(7696005)(47076005)(426003)(336012)(54906003)(316002)(110136005)(356005)(70586007)(36756003)(4326008)(70206006)(8676002)(86362001)(508600001)(5660300002)(82310400005)(81166007)(8936002)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:15.4119 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d8a2bd26-1082-4298-7ab8-08da38eb4525 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2549 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When enabling x2APIC virtualization (x2AVIC), the interception of x2APIC MSRs must be disabled to let the hardware virtualize guest MSR accesses. Current implementation keeps track of list of MSR interception state in the svm_direct_access_msrs array. Therefore, extends the array to include x2APIC MSRs. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/svm.c | 25 +++++++++++++++++++++++++ arch/x86/kvm/svm/svm.h | 4 ++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 196bca5751a1..2cf6710333f8 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -100,6 +100,31 @@ static const struct svm_direct_access_msrs { { .index = MSR_IA32_CR_PAT, .always = false }, { .index = MSR_AMD64_SEV_ES_GHCB, .always = true }, { .index = MSR_TSC_AUX, .always = false }, + { .index = (APIC_BASE_MSR + APIC_ID), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TASKPRI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ARBPRI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_PROCPRI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_EOI), .always = false }, + { .index = (APIC_BASE_MSR + APIC_RRR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LDR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_DFR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_SPIV), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ISR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TMR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_IRR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ESR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ICR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_ICR2), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTT), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTTHMR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTPC), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVT0), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVT1), .always = false }, + { .index = (APIC_BASE_MSR + APIC_LVTERR), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TMICT), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TMCCT), .always = false }, + { .index = (APIC_BASE_MSR + APIC_TDCR), .always = false }, { .index = MSR_INVALID, .always = false }, }; diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 1731c1f3884b..16f1d117c98b 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -29,8 +29,8 @@ #define IOPM_SIZE PAGE_SIZE * 3 #define MSRPM_SIZE PAGE_SIZE * 2 -#define MAX_DIRECT_ACCESS_MSRS 21 -#define MSRPM_OFFSETS 16 +#define MAX_DIRECT_ACCESS_MSRS 46 +#define MSRPM_OFFSETS 32 extern u32 msrpm_offsets[MSRPM_OFFSETS] __read_mostly; extern bool npt_enabled; extern int vgif; From patchwork Wed May 18 16:26:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853844 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 858DDC433EF for ; Wed, 18 May 2022 16:27:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240166AbiERQ1w (ORCPT ); Wed, 18 May 2022 12:27:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43276 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240209AbiERQ1X (ORCPT ); Wed, 18 May 2022 12:27:23 -0400 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2074.outbound.protection.outlook.com [40.107.237.74]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF41D8E1A3; Wed, 18 May 2022 09:27:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cgkx5RyqjxD9DcH0L2k5xWeTXfb6l6vpP9NPYVTp2frMhi0jOgHsxQHpZDKrKFyUJrtkkgI5abvJUnE7dWfbyOkfmBN54nzXNHBez6VHJG5cXgv3k5h9+oj6FXbl2WnvaQ5GfkXkf9RjdQUJqQAp93+A5HrJ+S3uExvXZpMXpOvELlPmVe7BlHSFU7JD11rWTERM5G9Tl0xFPuKseRvwGdRrjwsFahf/CONRq1qsAmEfg/tfktlN/y8HzulHU7rwQd1Ym4gMU0a7L3yOprge2fCrFKf2FbP4qfwrCMD7Xqx76Fr5Tl/9Tn57G/M30UYGl6jfeV2M6wTeX07ViP0OgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mDW86IJiGH34cAr0v8eFBvuoANA/E9jIPQE627h34BM=; b=H0fY5ib1etcSbQGwlsmRviABf7JzeIcf54krT60azL/fIN7M9OVZyLR/SeAmrtzFG4LWZObtzLCWqpSW7hv9ltnW8yrfpjTYWPUavAEw3nC7whr++qrVLhB52upx/xhK52xFItSuhA6gFNHkFkOhHypZEEXuEG4mg8UIvqplLOl9TlvU1CpnneVvBPfFezD61ihNnSOf0RKJAOliSoMObCf9GsWgWCtfZeRcq6Zb7bo6JkW2ZcaZnT3b7kTFAXJpWyFQ1UnUimIZCD+Z+53Bb4bJCk7LM0upBe0YkLaJxSNilVKzsLgavEDDW9r5f5dUhxWQ+z1WKVuhtP0DYy7Rew== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mDW86IJiGH34cAr0v8eFBvuoANA/E9jIPQE627h34BM=; b=cwQMZ4CwjSvGK1Dh1glTEFVMGXlUR6AGPYOnOxHny1Bwt3MqBBcR2+fWXf+d5UlJ/UYiT2/gE+ByyKEnr9BGR89k1WQxuObhcDKWSjR9rcwaNRDoWLVHuhL7SzdU8n/nZmhvMYkhfCF2B+OqhwG9luk+Qy+KNgTd0sJBVUWRYSQ= Received: from BN0PR04CA0168.namprd04.prod.outlook.com (2603:10b6:408:eb::23) by IA1PR12MB6163.namprd12.prod.outlook.com (2603:10b6:208:3e9::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:16 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::bb) by BN0PR04CA0168.outlook.office365.com (2603:10b6:408:eb::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Wed, 18 May 2022 16:27:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:16 +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, 18 May 2022 11:27:11 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 08/17] KVM: x86: Deactivate APICv on vCPU with APIC disabled Date: Wed, 18 May 2022 11:26:43 -0500 Message-ID: <20220518162652.100493-9-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: a30c9ac2-26dc-4461-c28b-08da38eb4590 X-MS-TrafficTypeDiagnostic: IA1PR12MB6163: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: MXc900e6szwthgUSLjg/nOKNAzow4MKNavHAxU7cr9bfcDnKFImq0ni1YpeNXisl6PLKbnCavzYFZM3uIJ4e6MVASDNRBUlFjfBERQG+Yv2Vl4JhwHRSS13rQQMpRROYmbPWuPd4UZvvJucQUNLaHTXGgEDYe0zDCtdQBkQ+N1lcr9D8w9Nq9RlMKMeGrz0yd6Tyzdxplp9vb8Clh2fyBOUG0rN2T2HboW+JGFIkTJT65dATsM65jaTbxyNm3LNoi336Abq2URUBasWimXoN2qPMJAtQ3YUNDAjsWxzRgPzl70BeyAU7C8QKEn2/FyTL4ScyAWeMQcXZwx/yzYaz41VPyKLoir4//ZTvDNbSdQzuNPs2bNU9fPeNkmIPul/1S7BOzh1Vj/6lj8XYkhgZqZY2HXIiITvuisdZDF7tg8J30l4z6xjTQsktdZYYbww9G4KP5uPU17UdpAFRGY+MFmjOJTFaOII2xM8Q0Xw8R5HbW0tT3gDCrZFerX/hI4XcFxeOaqvR4JzSzRGHFtK1am1XnbkM2VW4Wc8lKCwlkQStWw4AzfmofKrp5EXDClAniSfQDQZu4TM4WuA8oFmlLptPpSLlU7PxYOar6mVqcwlu/YQP9/oKeWs2OOmfO2LB8Cxp+WtwVTj7oHP/XkPeK9yOQBrRWdATAt381ho4kpCthlB+r+VwznpQDITR1ZSmH+Ij/vRBwm9iNScY+mtUuw== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36860700001)(47076005)(316002)(83380400001)(336012)(54906003)(426003)(82310400005)(1076003)(2906002)(2616005)(356005)(36756003)(26005)(40460700003)(110136005)(7696005)(81166007)(70206006)(70586007)(86362001)(5660300002)(16526019)(8676002)(4326008)(6666004)(508600001)(186003)(8936002)(44832011)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:16.1150 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a30c9ac2-26dc-4461-c28b-08da38eb4590 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6163 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org APICv should be deactivated on vCPU that has APIC disabled. Therefore, call kvm_vcpu_update_apicv() when changing APIC mode, and add additional check for APIC disable mode when determine APICV activation, Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/lapic.c | 4 +++- arch/x86/kvm/x86.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 8b8c4a905976..680824d7aa0d 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c @@ -2346,8 +2346,10 @@ void kvm_lapic_set_base(struct kvm_vcpu *vcpu, u64 value) if (((old_value ^ value) & X2APIC_ENABLE) && (value & X2APIC_ENABLE)) kvm_apic_set_x2apic_id(apic, vcpu->vcpu_id); - if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE)) + if ((old_value ^ value) & (MSR_IA32_APICBASE_ENABLE | X2APIC_ENABLE)) { + kvm_vcpu_update_apicv(vcpu); static_call_cond(kvm_x86_set_virtual_apic_mode)(vcpu); + } apic->base_address = apic->vcpu->arch.apic_base & MSR_IA32_APICBASE_BASE; diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 8ee8c91fa762..77e49892dea1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -9836,7 +9836,9 @@ void kvm_vcpu_update_apicv(struct kvm_vcpu *vcpu) down_read(&vcpu->kvm->arch.apicv_update_lock); - activate = kvm_vcpu_apicv_activated(vcpu); + /* Do not activate APICV when APIC is disabled */ + activate = kvm_vcpu_apicv_activated(vcpu) && + (kvm_get_apic_mode(vcpu) != LAPIC_MODE_DISABLED); if (vcpu->arch.apicv_active == activate) goto out; From patchwork Wed May 18 16:26:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853851 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 61C38C433EF for ; Wed, 18 May 2022 16:28:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240152AbiERQ2M (ORCPT ); Wed, 18 May 2022 12:28:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43280 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240204AbiERQ1X (ORCPT ); Wed, 18 May 2022 12:27:23 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2086.outbound.protection.outlook.com [40.107.236.86]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2835F90CE6; Wed, 18 May 2022 09:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nJtPFVJJyFiRyhKMILwnlkmQDd7LwwyrKqh5Vedw7T5z/OZSj1jnWxDTQ8LeoW1xCLnhN9RTtKq2uyHSi4GxevhhWJUqQ47iUKg8yqbUiJLvG0K8aJLmJilRHa0po+7GDpoy9OFi//xP8gfuQVrsiy4KrKgnyrgeN7XYEikQdwE0D3N60WQVLFbSk6Xjk0kHu7cSkBhiEDv+TxG+edll3b3lcJGFGJom3su0uiLwgBXkA1rk9UPetPtD3Uqs+Hz/PjJF5j6arsszdB0SrX6J0I/E25vrGpuzjH0cpDmIUSRnJDAyfXtx2kGMoJ3Me2VQDkU6mQfVllgqomI13hHYPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=83695Y+9o+s62B8x0blwU4bqtpuC0t1iZ5LaeEhEG7k=; b=LUmNleJp2lnL120RU3yaUVX2RaRBfp31/sW1pxEo0qm/dHXxjZk3lAFj7RmkLF4hPo9+QhjqJSt8nc58wO40VzVf+jPAbJB8IzsJJkdcfFpPP2V9RwcKeRI7qJOVl3wxJh65/0AjZnB1ALKCGKpG8C+c6xc1E7MPkSwJsB/2lA829XFsbTSoJ3mOyujCXLeRADgjXLEFIfapkVdgTcykdaHWuASM+pWybNfLt8eHIn0LIkCtibGPAG4+t+L9bjNM2/yoDpQ2N/TC6vcY3HyzN6IISDGDkb3ONSAebwgP1kDu4wk+Y5E4TreCdigi72pBmKrexAfo2czq9SJa9c5H4A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=83695Y+9o+s62B8x0blwU4bqtpuC0t1iZ5LaeEhEG7k=; b=h4kP81k7UiauoqGgC2OZz6Xrdz27RR1g6J74m2F4FUJ6lbnuU1YSXs3vpMhxMqIR5PfI400sjUlldxZcESVLSl3/9UtNzS8eC0xLON7MOA3gMRjJHHTVQqfevNyukQO/pA3a9WJ5oQ40dFilgvlqxoIhbC8/Ozt7OhbGT4T+nqI= Received: from BN0PR04CA0179.namprd04.prod.outlook.com (2603:10b6:408:eb::34) by DM5PR12MB1851.namprd12.prod.outlook.com (2603:10b6:3:109::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:16 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::8b) by BN0PR04CA0179.outlook.office365.com (2603:10b6:408:eb::34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:16 +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, 18 May 2022 11:27:12 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 09/17] KVM: SVM: Refresh AVIC configuration when changing APIC mode Date: Wed, 18 May 2022 11:26:44 -0500 Message-ID: <20220518162652.100493-10-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 9b8aae6d-6fa7-4b6c-3553-08da38eb45c5 X-MS-TrafficTypeDiagnostic: DM5PR12MB1851: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: 6sBkJ2ZnFNeLV7cBB6lgludcrvNDP2hlzKVGNK2VnsgatiOCiNJxVq9gKFOH7pmXP9L0pQtAGODvoachXL3K9fBMS8Xk+5hlr910DCXwzTMGK+qSC39OG4j84plTt+0TSoQoiWXcRoLQOskqYzqSDdIULpUMX405fy/3jfTvhuXZrRuO092TR7RaT5BTadoNWDzgJgiYie8G6r5HdBwPFr8VJ/s+hNcU002RG8bGqDu1GCVQStMWeG6JOTvHg+NowM2OuMVbqp/Wwl3S/OlaMFbLutZz3kHyhsyEItjEMcKKBlg/qVmXqGGmphQDjZMKK3oWsQ5uIiYIKgRQQedA6tHT5Kh4eTdhlbcEYMz06Yz/if3gLYr0oTuNIwfrUXd+MkN9zcDniuaoQukuqpHREU7VDgz/9LncRbBYeRN0WQ4pabItmkvKSXWQ2PQ4m52/xMjqlljxBf9YmPdusjjHQsCEmNjm6+VQaJLpkvFvu0/q8bqUz1LF9aGjQbhh+79ApuiYHR7jsIoSFlW6Kw8evEv8GYK+IooZe5XgH1pY2tstCzNO0AbVt28xwY3YKJ/3FzAb+AqnSp+nbUQol3FWpmU/NPbzrSLL0j9Zgybfmlpdu621fJoF1LyuC/Sy0P2zAWOgrkrNs/Vum33RhtHLKPLA1948MqUvIcx7Q5SjBqB8e7mFfPb/3DZZbULxoYNsGT292ExsVETsgSowAUxCIA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(36840700001)(40470700004)(46966006)(8936002)(4326008)(6666004)(110136005)(8676002)(40460700003)(316002)(336012)(426003)(81166007)(70206006)(36756003)(36860700001)(508600001)(7696005)(54906003)(70586007)(186003)(16526019)(44832011)(26005)(82310400005)(86362001)(2906002)(1076003)(2616005)(356005)(83380400001)(5660300002)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:16.4743 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9b8aae6d-6fa7-4b6c-3553-08da38eb45c5 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1851 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org AMD AVIC can support xAPIC and x2APIC virtualization, which requires changing x2APIC bit VMCB and MSR intercepton for x2APIC MSRs. Therefore, call avic_refresh_apicv_exec_ctrl() to refresh configuration accordingly. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 12 ++++++++++++ arch/x86/kvm/svm/svm.c | 1 + 2 files changed, 13 insertions(+) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 7aa75931bec1..aa88cef3d41f 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -685,6 +685,18 @@ void avic_apicv_post_state_restore(struct kvm_vcpu *vcpu) avic_handle_ldr_update(vcpu); } +void avic_set_virtual_apic_mode(struct kvm_vcpu *vcpu) +{ + if (!lapic_in_kernel(vcpu) || (avic_mode == AVIC_MODE_NONE)) + return; + + if (kvm_get_apic_mode(vcpu) == LAPIC_MODE_INVALID) { + WARN_ONCE(true, "Invalid local APIC state (vcpu_id=%d)", vcpu->vcpu_id); + return; + } + avic_refresh_apicv_exec_ctrl(vcpu); +} + static int avic_set_pi_irte_mode(struct kvm_vcpu *vcpu, bool activate) { int ret = 0; diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 2cf6710333f8..31b669f3f3de 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4692,6 +4692,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { .enable_nmi_window = svm_enable_nmi_window, .enable_irq_window = svm_enable_irq_window, .update_cr8_intercept = svm_update_cr8_intercept, + .set_virtual_apic_mode = avic_set_virtual_apic_mode, .refresh_apicv_exec_ctrl = avic_refresh_apicv_exec_ctrl, .check_apicv_inhibit_reasons = avic_check_apicv_inhibit_reasons, .apicv_post_state_restore = avic_apicv_post_state_restore, From patchwork Wed May 18 16:26:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853842 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 7818DC433EF for ; Wed, 18 May 2022 16:27:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240155AbiERQ1q (ORCPT ); Wed, 18 May 2022 12:27:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43286 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240207AbiERQ1X (ORCPT ); Wed, 18 May 2022 12:27:23 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2082.outbound.protection.outlook.com [40.107.92.82]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3961CA30B5; Wed, 18 May 2022 09:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I3k2h7Jc4YwH+kEmaROSeDR6huxB/kbRvY4m6zG+uNySwtxbVJZ5TmZHBdB55ufvi0XfO6MYKSSuijjL6YqdDm9JBR3ftLyjaIl6Zqo7jvex5tqOQNIgM7xwceakyZA5jfkJ7nC3JbEE4IdsQAkdVIadS+cNFhPPmOteKnG9yy3h69BtnIWGnvfOCfb+dKEN1OVHYz2pJsXU4Tw+GRE9sOHWVhMTEHO4efgV2l5o9HbhJFzX9cl0lOgKCbmDlz3OE8JMTI+VwqokZs0qdmubViA8ydFMn7cTwiY3E8YHAotddBAfbt8+PZSFTUZtzRXTrxkl43icN0cUoobg/o1u5A== 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=UZN1UbDmTA4y0AHhJlVrJtsx9BgY/0V7F+KEDD0hWG0=; b=fMF3m64TnJYHdAgBcs33XhWIWIArC6OxCadPN7nhQWxUAO/7B7fkMtaOu7zZ8eLdSNYA7jCTfyHk3hPqfjqbP311ZdvTieYR21smk/O5ndlidrVulZDe15RDSNcYOxwUP1et4+7JAj5xShal8TwuA2K96UcL4keH0S2rSE6eQAzhdzW309WyhadFqrsZu/eYF3aJWfGqdg+fLtx6BvKhql6gRA0Pqr3AP7VIAEajgRz209gk6+dtdO7PB8RdO4FaOilcXxu79ltwrXQ+5Fqu8fqDW6WhxXF4NKORtJAm4K8FHIhydS2sBZZJQy2F79KGU+3DvwcJWUhvqg5BY8rDMQ== 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=UZN1UbDmTA4y0AHhJlVrJtsx9BgY/0V7F+KEDD0hWG0=; b=mDJXXvhXTUknprk11Mt1GeeDQNNl9gCQOKYSEIttM+noonHthIDtumhFoWUsNyTBhS34uGaBdGRxS/mz/elTQmY5mDyT3bLThlq+YQ7Z6/wwUxBMO0VlnheOcVqdiGMZl582kK+e1dInFgExF06yCsy4PRBrK6V5d9WsmwRPRZA= Received: from BN7PR02CA0029.namprd02.prod.outlook.com (2603:10b6:408:20::42) by LV2PR12MB5872.namprd12.prod.outlook.com (2603:10b6:408:173::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:17 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::cd) by BN7PR02CA0029.outlook.office365.com (2603:10b6:408:20::42) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:16 +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, 18 May 2022 11:27:13 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , kernel test robot Subject: [PATCH v5 10/17] KVM: SVM: Introduce helper functions to (de)activate AVIC and x2AVIC Date: Wed, 18 May 2022 11:26:45 -0500 Message-ID: <20220518162652.100493-11-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 40d09535-c243-48f5-59bc-08da38eb4604 X-MS-TrafficTypeDiagnostic: LV2PR12MB5872: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: wZ3gphGdXbocHY3CrnYtXoZuMvcxVznbplTLFWv1ZLL9PNXC3Ik4QEQIObfDMt0JtaKh2fw3hKACqHALPdO+NDpBOQTomCbTl1ZHfpy/8kxGis4gQgsXfBJ45EUQTc3IPgOFZx/H5B6X8RVXxr3Pk/MtVgZIc2fGMtkTuhqjnxGYwqOQRp+/F6QEbNakEtolFMmGyUMK2JftzxYw6NF8Z/lIbHNHCGwckRtDTze2gzjUSey0I33m9usBZxyxf5Hry57rNIKKckGdvYEYFY06mt2UUJPn+vnQRKkfzVku+2WSceSgdgnqjxe6tAp/zzo81V2WSYzJ8YuqPPwWLGOnmhWtp2frXxA2d8fsudNBzZvf0dhtnQYYHpHztpoGkq/BLSM8HZlEj1yynT1ERrvKfoIByq666yRM921in9E85U950oIA+meGXvc5JhVyFAdYQwRSFMnQWz1y1oAoXDtR3e2m9Mq0DG45tZPD8B3u02QzZe3HdLLrLNAD6DPR78jP3EPUNlakt9iTQwMKIzv0UrrSQQpKcMAeOA++Rs6DAN7PXJRMYFidd5UokUsK1eVsOuNadG9pimqs7EOi7MfbPf+DTji9zlw29TRyHiGBXvpRAT/iccPu6xsRIFfVkuVA6SSZmIEUN3MaIsNRcF5uwTDZ0wq8XPRy6QkBYlhhSaBrgSdJWFRRRHctlVtXawCVXJ0ebdj9NyyhOsGF3xaS6g== 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)(82310400005)(110136005)(47076005)(36756003)(26005)(54906003)(36860700001)(4326008)(186003)(336012)(1076003)(2616005)(16526019)(8676002)(81166007)(70586007)(40460700003)(426003)(86362001)(356005)(8936002)(7696005)(6666004)(5660300002)(44832011)(2906002)(316002)(70206006)(83380400001)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:16.8725 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 40d09535-c243-48f5-59bc-08da38eb4604 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: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: LV2PR12MB5872 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 | 1 + arch/x86/kvm/svm/avic.c | 39 +++++++++++++++++++++++++++++++++----- arch/x86/kvm/svm/svm.c | 18 ++++++++++++++++++ arch/x86/kvm/svm/svm.h | 1 + 4 files changed, 54 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/svm.h b/arch/x86/include/asm/svm.h index 4c26b0d47d76..13d315b4eaba 100644 --- a/arch/x86/include/asm/svm.h +++ b/arch/x86/include/asm/svm.h @@ -256,6 +256,7 @@ enum avic_ipi_failure_cause { AVIC_IPI_FAILURE_INVALID_BACKING_PAGE, }; +#define AVIC_PHYSICAL_MAX_INDEX_MASK GENMASK_ULL(9, 0) /* * For AVIC, the max index allowed for physical APIC ID diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index aa88cef3d41f..d40170082716 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -63,6 +63,36 @@ struct amd_svm_iommu_ir { void *data; /* Storing pointer to struct amd_ir_data */ }; +static void avic_activate_vmcb(struct vcpu_svm *svm) +{ + struct vmcb *vmcb = svm->vmcb01.ptr; + + vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK | X2APIC_MODE_MASK); + vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; + + vmcb->control.int_ctl |= AVIC_ENABLE_MASK; + if (apic_x2apic_mode(svm->vcpu.arch.apic)) { + vmcb->control.int_ctl |= X2APIC_MODE_MASK; + vmcb->control.avic_physical_id |= X2AVIC_MAX_PHYSICAL_ID; + /* Disabling MSR intercept for x2APIC registers */ + svm_set_x2apic_msr_interception(svm, false); + } else { + vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; + /* Enabling MSR intercept for x2APIC registers */ + svm_set_x2apic_msr_interception(svm, true); + } +} + +static void avic_deactivate_vmcb(struct vcpu_svm *svm) +{ + struct vmcb *vmcb = svm->vmcb01.ptr; + + vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK | X2APIC_MODE_MASK); + vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; + + /* Enabling MSR intercept for x2APIC registers */ + svm_set_x2apic_msr_interception(svm, true); +} /* Note: * This function is called from IOMMU driver to notify @@ -179,13 +209,12 @@ void avic_init_vmcb(struct vcpu_svm *svm, struct vmcb *vmcb) vmcb->control.avic_backing_page = bpa & AVIC_HPA_MASK; vmcb->control.avic_logical_id = lpa & AVIC_HPA_MASK; vmcb->control.avic_physical_id = ppa & AVIC_HPA_MASK; - vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; vmcb->control.avic_vapic_bar = APIC_DEFAULT_PHYS_BASE & VMCB_AVIC_APIC_BAR_MASK; if (kvm_apicv_activated(svm->vcpu.kvm)) - vmcb->control.int_ctl |= AVIC_ENABLE_MASK; + avic_activate_vmcb(svm); else - vmcb->control.int_ctl &= ~AVIC_ENABLE_MASK; + avic_deactivate_vmcb(svm); } static u64 *avic_get_physical_id_entry(struct kvm_vcpu *vcpu, @@ -1076,9 +1105,9 @@ void avic_refresh_apicv_exec_ctrl(struct kvm_vcpu *vcpu) * accordingly before re-activating. */ avic_apicv_post_state_restore(vcpu); - vmcb->control.int_ctl |= AVIC_ENABLE_MASK; + avic_activate_vmcb(svm); } else { - vmcb->control.int_ctl &= ~AVIC_ENABLE_MASK; + avic_deactivate_vmcb(svm); } vmcb_mark_dirty(vmcb, VMCB_AVIC); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 31b669f3f3de..0ec2444c342d 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -746,6 +746,24 @@ void svm_vcpu_init_msrpm(struct kvm_vcpu *vcpu, u32 *msrpm) } } +void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) +{ + int i; + + if (avic_mode != AVIC_MODE_X2 || + !apic_x2apic_mode(svm->vcpu.arch.apic)) + return; + + for (i = 0; i < MAX_DIRECT_ACCESS_MSRS; i++) { + int index = direct_access_msrs[i].index; + + if ((index < APIC_BASE_MSR) || + (index > APIC_BASE_MSR + 0xff)) + continue; + set_msr_interception(&svm->vcpu, svm->msrpm, index, + !intercept, !intercept); + } +} void svm_vcpu_free_msrpm(u32 *msrpm) { diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 16f1d117c98b..818817b11f53 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -542,6 +542,7 @@ void svm_set_gif(struct vcpu_svm *svm, bool value); int svm_invoke_exit_handler(struct kvm_vcpu *vcpu, u64 exit_code); void set_msr_interception(struct kvm_vcpu *vcpu, u32 *msrpm, u32 msr, int read, int write); +void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool disable); void svm_complete_interrupt_delivery(struct kvm_vcpu *vcpu, int delivery_mode, int trig_mode, int vec); From patchwork Wed May 18 16:26:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853843 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 45E52C433F5 for ; Wed, 18 May 2022 16:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240163AbiERQ1t (ORCPT ); Wed, 18 May 2022 12:27:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240208AbiERQ1X (ORCPT ); Wed, 18 May 2022 12:27:23 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2049.outbound.protection.outlook.com [40.107.236.49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61ABAA30BE; Wed, 18 May 2022 09:27:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eVWGv3ZsrdG6YnDxSOj/ltfCga0WYCBbmflaSGypeBeW1awKPbxMAFKTLPSHywO8BehBUHt+1CsYM17k4xB3R9gofUqDz6Nf1fdkErSpqEv4DnbKkUpmfZrrsP1zyJt/E0CBFEStlzE5ae7IQ8yWNSVGERR8/orYdagx8CJtMfIutdOqJRcRjDhgr0J+414IP/ncDa+5wopYUVYmo/BubQNtN76aEfWABMVOy5JKYQ+F+m9uQB3wKOm2/dVwQTd1z57E/771Z2ogs8jbAE9EdndIVpntj+p43oSleEjSQ+SSxwYSUHfaneD6lrTLrlcIa4oPyyd/7zdOaqrWALkgIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=g/Bie8oDP8RAYNrsWPeGRtId0tjZaZQocZJiTWghtFg=; b=ZE1EEr1SVcVusk6rASq3UegmumAs4kvBXLQxLuwpUKohuLnwYuo6lfTOs5bWR+GWUjtj6SgFafkhfviVMCNgoCLd71A1RZV9PC4t9o/MPHUIF6JqHz8CAAxGpTsMIJn6X3Jy0xnwQ7x6WwvwdO1KDngjBSkqVnwNtR+2u1bBHaWqQd8SMe/yrUcvhBSEbyGCB1b0TSBqUbPocVofMdvhIcpdwISXR4at8peSvEQKFVnNjmQHQfAeDl2BxjHvENtvLF42dgWqf0B+PA+3LA3sTtODF6p7muu4ERM/Hu68NhJxs8UTXcwtQhd8gtFTX90wt4ppTNkKN5f0ENSBUC0oZQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=g/Bie8oDP8RAYNrsWPeGRtId0tjZaZQocZJiTWghtFg=; b=piTUddLQ62AOUW/UYMxqpT8IYVidDSPoujvBArG+3FGcabDfiEXsj7DUTqXb5YRgNAqgMbqS+LUmEBEbEd+jOsKjUbgH229UHt78FuIT2xrddT6Ae6z/c7w3XAPqWURCOphMiM7BFWPxBnRxQEXvLnv5o6a1RcwfBhgnebICtzU= Received: from BN0PR04CA0177.namprd04.prod.outlook.com (2603:10b6:408:eb::32) by CH2PR12MB4246.namprd12.prod.outlook.com (2603:10b6:610:a9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.14; Wed, 18 May 2022 16:27:17 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::a4) by BN0PR04CA0177.outlook.office365.com (2603:10b6:408:eb::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:17 +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, 18 May 2022 11:27:13 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit , Pankaj Gupta Subject: [PATCH v5 11/17] KVM: SVM: Do not throw warning when calling avic_vcpu_load on a running vcpu Date: Wed, 18 May 2022 11:26:46 -0500 Message-ID: <20220518162652.100493-12-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 85a3f32d-6d7a-4164-6ab5-08da38eb461d X-MS-TrafficTypeDiagnostic: CH2PR12MB4246: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: rnxUqS36+As9I26bQSGHgd2RQXEBDid9kNWD0us3PmaYCuysamAiKSQGC+krfviHJS06V9cwvp81oLTeeYVH4kXHPyoE3gK9aeIZgD8vPnPpnGeFezXDE91xx9GqmgjZUyMTuwRCaD1g5Eqi3x4WMBRKChx1TPf6UdoniR3RAxZtM+mqvb5x4ra/dSixReCu4lSlwKA+zhvNnrLge7xRYqoCHaszUwmkrpjXFhxX/a+UOOIg5VIbRC6VbT+tE7QV6lQWXt7+UDUVUgDTKXpfYcyue8zZgd4SEH7tCIwaJSqVog5odmcjkXyFEKVVNGpQE4Lettk7ENsid+d1/vcpmHAtCc8fgrDtucsdUlJfk5dODtUWqAGyAUSgigrMTlK1gYo3AGK1XQdng+WD8/ouqlm0JGWt9u6eFTjXEzS7MhTrj/LNjT75XmMiVwJ5t//AanTPJDprcd+IWiHkIACV/8UJdNKZPeYB8h/9iL3m/xjINjSETLBPwO7Ei0Ft0CicqgkrQdmxt1ligpb7xd/zXTQOiak7xASqnImnpyXcwLyXQ8vyQG5ArW1+/cYpJD5RcR6GGznJGzdz8FqX1XA2YMEjNSleJ7v5P6tHEbJWp0syp3Xl3EBhOUlOlDqnhiRn/3Xz5hIg1CjjZ0aNf2ExWpe2wKYsrTj0mlrXzE6dh3waXSk185Km4mTTpHEDs26t/6Tr1fe8pS5aB/eVPTzx4g== 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)(1076003)(83380400001)(2616005)(44832011)(508600001)(70586007)(8936002)(82310400005)(40460700003)(5660300002)(2906002)(356005)(4326008)(36860700001)(26005)(8676002)(336012)(70206006)(426003)(186003)(54906003)(47076005)(6666004)(316002)(81166007)(36756003)(16526019)(86362001)(110136005)(7696005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:17.0524 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85a3f32d-6d7a-4164-6ab5-08da38eb461d 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4246 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Originalliy, this WARN_ON is designed to detect when calling avic_vcpu_load() on an already running vcpu in AVIC mode (i.e. the AVIC is_running bit is set). However, for x2AVIC, the vCPU can switch from xAPIC to x2APIC mode while in running state, in which the avic_vcpu_load() will be called from svm_refresh_apicv_exec_ctrl(). Therefore, remove this warning since it is no longer appropriate. Reviewed-by: Maxim Levitsky Reviewed-by: Pankaj Gupta Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index d40170082716..2d9455338b1f 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -1038,7 +1038,6 @@ void __avic_vcpu_load(struct kvm_vcpu *vcpu, int cpu) return; entry = READ_ONCE(*(svm->avic_physical_id_cache)); - WARN_ON(entry & AVIC_PHYSICAL_ID_ENTRY_IS_RUNNING_MASK); entry &= ~AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK; entry |= (h_physical_id & AVIC_PHYSICAL_ID_ENTRY_HOST_PHYSICAL_ID_MASK); From patchwork Wed May 18 16:26:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853848 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 DD039C433EF for ; Wed, 18 May 2022 16:28:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240221AbiERQ2G (ORCPT ); Wed, 18 May 2022 12:28:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240107AbiERQ10 (ORCPT ); Wed, 18 May 2022 12:27:26 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2083.outbound.protection.outlook.com [40.107.244.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EAD2B36F0; Wed, 18 May 2022 09:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SmURWlJWNOTBXzc3+h8nuzzv1VQj2uVila+/aPe+Niofnvu3qLHewul9d8GGrO6uBVrS/TTzcBGa8rEPl9gMGi+mlPEMQDioE9YCz2Jluo8C+k6nBfqe/7+Qyib8896dtvUcsakrBUHE5zjhL7P5ePw46RmCajfqGgEWj5XTUTaIof8OnjW3BbTYpkWw0nmxYttigd3x8p+2C5GuAqbE8LlH4LERn853hgw7zBRCbHKCTbhmHRRA5Gc/2R03QTjtyrQs7Cwpvpr1YP4Vxuga7sYGDMyo2UuwtkeTqipLotrRprVFS51/P09hzaLJ2Xaqz95QHt12scHXXJXSSdjP1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=2cNgGsdFWKRWIjCLSQ4nHmgOHOsK+GyL6ZVYxn6pkHA=; b=VdxHCmAh3qXlQwWwKTowHn0qY011iExsLjwbXLNeHxvhJJ7p1vV7FmGe1o8p6Ctp9PKkh1SUOnxeE+CNHVae3NSPugX4yKwZmRectJhMnBHDLI/JSLbJoCmyBUwpaKkFOOeG8KNVgrQL9j9GdtEQDWj3ENNmVe2mArqosv0bbetjkJwl1NmoSxRhv7sQk4zcw//g45hqKwtR+t9ts6AC0QD68qdGG5zHh3+QRUSfHpRlo3ihG6RvOGa7cPsn/VMDfq/9uTDKFaDE+XbKBHl0ByXARBpzBVYWaYpiEcMdZYzKeDpI3rfwggnmPK/odm5R4YIS1Jbx/WsnJ7enr+wWtw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2cNgGsdFWKRWIjCLSQ4nHmgOHOsK+GyL6ZVYxn6pkHA=; b=HZ+CFI3FiTaeO0WFJALtk/7xB2qboMIaxLKircfRC91dLelhOSAJOvgQsld66pRqksydc5sacyCc1kZD7zxkv6HMeBNEqfbTzB9T9ZEPDKsnU+J4Za0EIWir3VuHaYcVsXl9mNeejH1Zky+77MjTc9vbUmhlGfjX2K9s325MvJE= Received: from BN7PR02CA0010.namprd02.prod.outlook.com (2603:10b6:408:20::23) by MWHPR12MB1551.namprd12.prod.outlook.com (2603:10b6:301:9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:17 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::cc) by BN7PR02CA0010.outlook.office365.com (2603:10b6:408:20::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:17 +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, 18 May 2022 11:27:14 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 12/17] KVM: SVM: Introduce hybrid-AVIC mode Date: Wed, 18 May 2022 11:26:47 -0500 Message-ID: <20220518162652.100493-13-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: d0c8ca90-a30e-4ad4-de9c-08da38eb464b X-MS-TrafficTypeDiagnostic: MWHPR12MB1551: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: 8JJR9aP0FnX5sE8rQ0K340jp8ZYnR6LsRs4aVGPI8zpcWbDUEKUD3nucrGJkxfAj95pOKiaUgKiMBh+gfpmNB6Za2HiKJ/va1bdvTk3ZYOWH0sgtz2jvjWk983GavRKOG9/muMXA2MYbjuxBxelyVo6pejLTRxzK4/rjfgRiRr9bYDExYDc23OnXhN8R7wF5uAkVg6gQrqvu5C9EVxDmU9654TsC8eE86gHtWcqU89UkS4LUJNrkSKF4qQj87PrkLoxPr0A6C7945nFVd7KHEx1ycjJ0Pqsenrv0YQbvnYIMjFay6RlSXgCOplHVjlfMUHOLo+mWIUIdYJRfRoMIRPaW8N9c0lHrAETSMglqgGQemj6u+BBy9CklmvXcc45ig5C5P7YiJEVt9OYgXZ/TE/Tua9MGRMEOZjOELo92WO9z1lIWXzG+Y3e/vXJSKfVWYXBhoaLku4cX4lgx6BmVaKPgKdBqy73SnuCs3RoT3H4Xji+D84sKRXlNPogt8Iw/6QULxCW6XvjMxQ8XkTRcgZwsZDTM3u3Uj0XOgYEuBbjDa6+HtDVRUh/F/EM6k9XigUv9XuE1VpKMJeKKeOkHMzLWImguQAloqLQYn93UKdVxVPmuetrpmQlznMdbITldyBzTK56XoxaYiIO3Kw9elhRGf70qteimm4v6MgTuFz7kmj24XPX/3pK+gwV5IzZNt/rQiXOolvGy2elvyZJ/zA== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(46966006)(40470700004)(36840700001)(36860700001)(40460700003)(110136005)(54906003)(26005)(356005)(70586007)(36756003)(70206006)(1076003)(86362001)(81166007)(4326008)(316002)(16526019)(8936002)(508600001)(44832011)(8676002)(186003)(426003)(336012)(2906002)(7696005)(2616005)(82310400005)(47076005)(5660300002)(6666004)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:17.3412 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0c8ca90-a30e-4ad4-de9c-08da38eb464b 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: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1551 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Currently, AVIC is inhibited when booting a VM w/ x2APIC support. because AVIC cannot virtualize x2APIC MSR register accesses. However, the AVIC doorbell can be used to accelerate interrupt injection into a running vCPU, while all guest accesses to x2APIC MSRs will be intercepted and emulated by KVM. With hybrid-AVIC support, the APICV_INHIBIT_REASON_X2APIC is no longer enforced. Suggested-by: Maxim Levitsky Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/include/asm/kvm_host.h | 1 - arch/x86/kvm/svm/avic.c | 13 +++++++++++-- arch/x86/kvm/svm/svm.c | 9 --------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h index c59fea4bdb6e..da03111b05f6 100644 --- a/arch/x86/include/asm/kvm_host.h +++ b/arch/x86/include/asm/kvm_host.h @@ -1051,7 +1051,6 @@ enum kvm_apicv_inhibit { APICV_INHIBIT_REASON_NESTED, APICV_INHIBIT_REASON_IRQWIN, APICV_INHIBIT_REASON_PIT_REINJ, - APICV_INHIBIT_REASON_X2APIC, APICV_INHIBIT_REASON_BLOCKIRQ, APICV_INHIBIT_REASON_ABSENT, APICV_INHIBIT_REASON_SEV, diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 2d9455338b1f..bac876bb1cf1 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -71,12 +71,22 @@ static void avic_activate_vmcb(struct vcpu_svm *svm) vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; vmcb->control.int_ctl |= AVIC_ENABLE_MASK; - if (apic_x2apic_mode(svm->vcpu.arch.apic)) { + + /* Note: + * KVM can support hybrid-AVIC mode, where KVM emulates x2APIC + * MSR accesses, while interrupt injection to a running vCPU + * can be achieved using AVIC doorbell. The AVIC hardware still + * accelerate MMIO accesses, but this does not cause any harm + * as the guest is not supposed to access xAPIC mmio when uses x2APIC. + */ + if (apic_x2apic_mode(svm->vcpu.arch.apic) && + (avic_mode == AVIC_MODE_X2)) { vmcb->control.int_ctl |= X2APIC_MODE_MASK; vmcb->control.avic_physical_id |= X2AVIC_MAX_PHYSICAL_ID; /* Disabling MSR intercept for x2APIC registers */ svm_set_x2apic_msr_interception(svm, false); } else { + /* For xAVIC and hybrid-xAVIC modes */ vmcb->control.avic_physical_id |= AVIC_MAX_PHYSICAL_ID; /* Enabling MSR intercept for x2APIC registers */ svm_set_x2apic_msr_interception(svm, true); @@ -978,7 +988,6 @@ bool avic_check_apicv_inhibit_reasons(enum kvm_apicv_inhibit reason) BIT(APICV_INHIBIT_REASON_NESTED) | BIT(APICV_INHIBIT_REASON_IRQWIN) | BIT(APICV_INHIBIT_REASON_PIT_REINJ) | - BIT(APICV_INHIBIT_REASON_X2APIC) | BIT(APICV_INHIBIT_REASON_BLOCKIRQ) | BIT(APICV_INHIBIT_REASON_SEV); diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index 0ec2444c342d..e04a133b98d0 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -4061,7 +4061,6 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); struct kvm_cpuid_entry2 *best; - struct kvm *kvm = vcpu->kvm; vcpu->arch.xsaves_enabled = guest_cpuid_has(vcpu, X86_FEATURE_XSAVE) && boot_cpu_has(X86_FEATURE_XSAVE) && @@ -4093,14 +4092,6 @@ static void svm_vcpu_after_set_cpuid(struct kvm_vcpu *vcpu) vcpu->arch.reserved_gpa_bits &= ~(1UL << (best->ebx & 0x3f)); } - if (kvm_vcpu_apicv_active(vcpu)) { - /* - * AVIC does not work with an x2APIC mode guest. If the X2APIC feature - * is exposed to the guest, disable AVIC. - */ - if (guest_cpuid_has(vcpu, X86_FEATURE_X2APIC)) - kvm_set_apicv_inhibit(kvm, APICV_INHIBIT_REASON_X2APIC); - } init_vmcb_after_set_cpuid(vcpu); } From patchwork Wed May 18 16:26:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853845 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 C12CDC433F5 for ; Wed, 18 May 2022 16:27:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240179AbiERQ14 (ORCPT ); Wed, 18 May 2022 12:27:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240205AbiERQ1X (ORCPT ); Wed, 18 May 2022 12:27:23 -0400 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2087.outbound.protection.outlook.com [40.107.220.87]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EEE09B36DA; Wed, 18 May 2022 09:27:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Dfy9562bWFNuej34ofpqBbEnJLvln1pJTuAV6CgYi1A5745b45+ONuj17HYvvXeXAxUyAbwKgmnEmP2Le2XZa/XysB0XNn1ZQ3XiKT4/Od6/2s46nDjnfSYbWpeZ879B6Bfhp3Uqqguec+n4+k8mNQe00mHsr8U5r4U/CL0MTXFAUf9ERttWlCKvcKgErDnLeeFjLDcvmUciGoHF0uvad76jcruCiFLdnKuzO52Jxn0+WzaOlqOzuKvZK0v8rUeSsiw48iYAuAYlup4lArScpTCkppzT3/1PoT8I/jhUh9zQWz1m2sKLLo70oPe8spVGUbVYqs20b37CTa3Da/zDng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=An59Audd9Wb4f9DlFPkPLOYObyXGIgmHhDYd1Z0I8EI=; b=QWWaWUT8A92FheNfn18WVPQED6zKVlr/DuDbyrOWYqkRNLjyr5LsvEMlMa5+PcGq+O08Jrrbie/8GCzqGsUzHmYmAZtKcGY19mgyfNmqTZA5+WEmPfBO3twSQhvR9TPDRmSFZxs8SWhVGVgFhsAjd8jLFqY4Xs5/7kx5qAKtyT3+VcnZLwMd4HzwLBZp2V/u4l1/+wY58ku3USvwdIZFc74wTovOTL6Zld0eEU21YhjIcbO/k16/cgOwWaSKYddbhvGXbJbeZkkUiyZO7NBFDqNqCCfVUPlHrhDDP8khpLusBw0MPUeaW5EQsIebEN16EKGF8Z5WoVooKC1MZN0qxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=An59Audd9Wb4f9DlFPkPLOYObyXGIgmHhDYd1Z0I8EI=; b=Cm03bWFe0ILAbOZ0tlFCB6qLL9soTApgCtV8lsu7nmm5tUZf+3k1nT6qZagbUoIFuUMDDZENRratQ+X5Jvsp4FMKgK1ZI+j516iMeQ7sT2eYLjo4DknHYC7m6V8enr8PatxUMrNDg+ZgSwOkkvTuyKilWclIbturYw5Y2a3ces8= Received: from BN0PR04CA0161.namprd04.prod.outlook.com (2603:10b6:408:eb::16) by MN0PR12MB5716.namprd12.prod.outlook.com (2603:10b6:208:373::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Wed, 18 May 2022 16:27:17 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::76) by BN0PR04CA0161.outlook.office365.com (2603:10b6:408:eb::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:17 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:17 +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, 18 May 2022 11:27:15 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 13/17] KVM: x86: Warning APICv inconsistency only when vcpu APIC mode is valid Date: Wed, 18 May 2022 11:26:48 -0500 Message-ID: <20220518162652.100493-14-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: c596a9e2-da21-4362-a017-08da38eb4675 X-MS-TrafficTypeDiagnostic: MN0PR12MB5716: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: HaNo7N7woNoZ2hBvKHo8YKQ7PpvJnlLZV0BfKH7nJ2NaX6ip8Auyc1DL1fo8TFfP+nCBdvMUI4QnZ9DW9MOkEkGWvUjk/Tk/drR0hJmlvoTvq7yJaMp/rA/atTtrUn26TFEEAXf5QCViOIIFG/gCY8ezeg0EPoCBYn4wOZWcWvZ+GHJGwRKrZIXIDHQIAIQwr4vrLduajX9vkb2lUbFZqojO1n+6kmAkELZTegMRVfIQmATQkdFq1xGhdkgfC4Jeq3DvRtKAdYntxZpDWpGXsmZwllhcHkxKJP4qj/X+ydGQvuRaERY7qrO8f6+MXh1EliY1lbxPnI1aZVDPGlviccAxjyQj8pV5DOi3N9aQCxWo0yBQ72wTzzUqpZhM4bB+8Do3Wyc4lHMNthKDApECphwcDds9IzoE3D73cpG3WPjhkWplx/XZvXK3IH6vs8HJrVc/hT6fXzF65QUS9YULizeRyzRqN7p7iCy8vTLTorMJV0BzUUkqqeV3p5HEst4LiK29nvM6PXdm6Rz7MuOJiNbFpuu/7qZc39cjfGElpHhDCVnnndqTtJTI9HZoX/pa+QWw45G27xkSgPZZS7N/8yJA7M6J1kZy0aS+VhgIzKhmfcJ4A9/dTvmw+IOjFHU7pAy9Xo79Wyt2ldVhLUkAQZ4e/wiiNvdHM3IT/aqNqUF+ctRNlcJknlq462tIdRQn/r6Lty7IbwXQWmXtV0beWQ== 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)(36756003)(8936002)(70206006)(82310400005)(70586007)(6666004)(26005)(4326008)(8676002)(44832011)(7696005)(508600001)(110136005)(2906002)(54906003)(316002)(86362001)(186003)(1076003)(336012)(426003)(16526019)(2616005)(40460700003)(36860700001)(47076005)(83380400001)(81166007)(5660300002)(356005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:17.6149 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c596a9e2-da21-4362-a017-08da38eb4675 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN0PR12MB5716 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org When launching a VM with x2APIC and specify more than 255 vCPUs, the guest kernel can disable x2APIC (e.g. specify nox2apic kernel option). The VM fallbacks to xAPIC mode, and disable the vCPU ID 255 and greater. In this case, APICV is deactivated for the disabled vCPUs. However, the current APICv consistency warning does not account for this case, which results in a warning. Therefore, modify warning logic to report only when vCPU APIC mode is valid. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 77e49892dea1..0febaca80feb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10242,7 +10242,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) * per-VM state, and responsing vCPUs must wait for the update * to complete before servicing KVM_REQ_APICV_UPDATE. */ - WARN_ON_ONCE(kvm_vcpu_apicv_activated(vcpu) != kvm_vcpu_apicv_active(vcpu)); + WARN_ON_ONCE((kvm_vcpu_apicv_activated(vcpu) != kvm_vcpu_apicv_active(vcpu)) && + (kvm_get_apic_mode(vcpu) != LAPIC_MODE_DISABLED)); exit_fastpath = static_call(kvm_x86_vcpu_run)(vcpu); if (likely(exit_fastpath != EXIT_FASTPATH_REENTER_GUEST)) From patchwork Wed May 18 16:26:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853850 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 CD770C433F5 for ; Wed, 18 May 2022 16:28:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240170AbiERQ2K (ORCPT ); Wed, 18 May 2022 12:28:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240211AbiERQ1Y (ORCPT ); Wed, 18 May 2022 12:27:24 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2052.outbound.protection.outlook.com [40.107.244.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2EEA1986DD; Wed, 18 May 2022 09:27:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TWpcWt6D9TG/fZw35N9G4dw4nzwlyVQ39VmU9hAwITMvKKRnW6kyda+UKoaoaxYHLAkPa/E+DT9AFT8MoruOfogkhFXBC6oVnuLJV+7T/DvASxW0g4806GSqyi9zHjn3Lsq4n5bU+KAgUsBWeQYj4U59mQIfDZh+G4yfjx23DfLlwxSUBB5jol4dduv+Zh2lEgI0yOLdHoEDaBiN9i+HLt7iJc1fHyHOVS4DevOk10Ms8wbWC6bMYPE1by+5mogQEQxz9eQ2pahpbxBhLhkid6xjyhRxpkQhP7rXGFpsi+kKl2cg0rZzTtKrlG5C3gzk2Hry6cV06zG6A470Vm7GhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=mXunKw91AziOXjcu05kGRHnt4FdkawppGowMHSMaU3Y=; b=h9QawsoAfRUumOTF05TkAmGt00qzofGaGMzOsxn837Lnqy7ENNeVqe7pAG5Elq8ZTDvJBYmyqpjnBga2Uh6hQT7zo2MzsSnlmb4Z++AHO98xZpwbvznCTrMY9xi3REmKcPlEFT+KORXwvdw77q3iacfyxEj27xk/D4vqZdX2ni/oXyMD10Ht2OGyWljMmXeVrbPOiFuJ5DRa9cbafFCerdT1Nf0YPfiW/9nt4JWkSRcMvPA460MnDuPdvNTVlEk2FGF92pAh6JBdlWnMM+Zw2W+EkYNHvnTqeRvy5bFZkDlE+oYg9ZkbAXyertuLCS7XQ0ETzcM2nFO09nKTw6IXig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mXunKw91AziOXjcu05kGRHnt4FdkawppGowMHSMaU3Y=; b=5K3el0lSJx1aFKdrTMlN1rQMYymoZUAgKZLl3vW7HeqjyjQJOIFJXTVJrALguqKNMppSs4GI2orq7VUZQydo7jk9dTPBX3DktKQrqbws2w68TKhXrEn2z+pLZfSBSE/fgkT+bRE0yErKcWnAosyDhQLCuEb/rPEkgrzRydyK4xA= Received: from BN7PR02CA0011.namprd02.prod.outlook.com (2603:10b6:408:20::24) by BL1PR12MB5176.namprd12.prod.outlook.com (2603:10b6:208:311::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14; Wed, 18 May 2022 16:27:18 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::e6) by BN7PR02CA0011.outlook.office365.com (2603:10b6:408:20::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.14 via Frontend Transport; Wed, 18 May 2022 16:27:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:17 +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, 18 May 2022 11:27:16 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 14/17] KVM: SVM: Use target APIC ID to complete x2AVIC IRQs when possible Date: Wed, 18 May 2022 11:26:49 -0500 Message-ID: <20220518162652.100493-15-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 7fd94a5d-fd5c-485c-3a72-08da38eb46ab X-MS-TrafficTypeDiagnostic: BL1PR12MB5176: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: xCqVeXDBEPyzbuyT6/2rYVGNDGkWZM9v7J5JFuRqwNhlqPNiy6sEh89RAGII+VoKq+4MzsywT4ttSP8FxmazYUFL23XPkUSK57/3mVchLwz85SwjCcG9i6A1367Bne46QjM7R9a9+U1j0qLY6lmhScy7hnHeVwbVscaYoP4xTgBJGgxTHP/e04rktLlGc0+jrtx7ItH7K0VLlbJ0Ue+6fytvKTLCWZ35HyQjcdPoOyBSpwf3KhQxoNU+/97CzWDjS/QuNmv8qKySLJQjminy5HRlnE9iOJCNB4yNfLP90uMWakToBWzkv6AQyhVBnrtRJQwuOI4L21cQ1w5F14VuwkwoEj5M/z2G+6buRowIMEikY2c+1k6OHZ43uFmfyM3g41oCaNSF1qeNsrgIPgt7AUC+C3woVfL/QQab9ILGt2fwEJcmreNkxw4u/65wMGKrfrgFPXP0qUny9B1/Pm/UHY6a/6T7Nq52oqI6dW7r+b/vNBLd3S4VPLFStgLV8Y4Rai9ty8ZM8G0zy3DYXUtD5rJ+OVLs2n5XhLN6SjesxpicN0UJr57mfNvWhMfzX4PeDl1KwWqw1rMin3j2JywzsJ8dz8yBUq3XfcRcKRLyuiDxTvoQbBvPLZVf9qwA3ORaeYm8NkF4AS7ZgpI6WvZgLf5ntCDmCWi6PTZlDcVYUYfWbco/Va7BAD14RLTq3VYYvePpFZsfgUrIOTlxIOOK1A== 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)(5660300002)(16526019)(7696005)(36860700001)(356005)(2616005)(86362001)(508600001)(186003)(44832011)(81166007)(8936002)(36756003)(40460700003)(426003)(47076005)(70586007)(1076003)(316002)(54906003)(82310400005)(110136005)(4326008)(8676002)(70206006)(6666004)(2906002)(26005)(336012)(83380400001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:17.9662 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7fd94a5d-fd5c-485c-3a72-08da38eb46ab 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: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5176 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org For x2AVIC, the index from incomplete IPI #vmexit info is invalid for logical cluster mode. Only ICRH/ICRL values can be used to determine the IPI destination APIC ID. Since QEMU defines guest physical APIC ID to be the same as vCPU ID, it can be used to quickly identify the target vCPU to deliver IPI, and avoid the overhead from searching through all vCPUs to match the target vCPU. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index bac876bb1cf1..9c439a32c343 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -358,7 +358,26 @@ static int avic_kick_target_vcpus_fast(struct kvm *kvm, struct kvm_lapic *source /* For xAPIC logical mode, the index is for logical APIC table. */ apic_id = avic_logical_id_table[index] & 0x1ff; } else { - return -EINVAL; + /* For x2APIC logical mode, cannot leverage the index. + * Instead, calculate physical ID from logical ID in ICRH. + */ + int apic; + int first = ffs(icrh & 0xffff); + int last = fls(icrh & 0xffff); + int cluster = (icrh & 0xffff0000) >> 16; + + /* + * If the x2APIC logical ID sub-field (i.e. icrh[15:0]) contains zero + * or more than 1 bits, we cannot match just one vcpu to kick for + * fast path. + */ + if (!first || (first != last)) + return -EINVAL; + + apic = first - 1; + if ((apic < 0) || (apic > 15) || (cluster >= 0xfffff)) + return -EINVAL; + apic_id = (cluster << 4) + apic; } } From patchwork Wed May 18 16:26:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853846 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 8F0C4C433FE for ; Wed, 18 May 2022 16:27:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240196AbiERQ16 (ORCPT ); Wed, 18 May 2022 12:27:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240203AbiERQ1Y (ORCPT ); Wed, 18 May 2022 12:27:24 -0400 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2046.outbound.protection.outlook.com [40.107.92.46]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C331B36E7; Wed, 18 May 2022 09:27:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=K2nhJDVjZqVMRQ0Oschn+6xEo7gUWEzwQEdz9d34AeK5RyxsMWYuU55MPqHdaXgnzXPM4vm0GBzFv/LxdREWwnwWtL+KlbSObGYBjUk0P/lb2WlV8IgWuWzjostGZXSUXvoPr/d7IxujVX1TbQbk5wZlycHkU5T1mvMz+SK9Net0wR5DJv4vKviLLslUoMVJMjFF/LYCFRS73UjbvQ6RKWRLn/wglSzNfXI2Vkn4ftkl1bc8gOHjtS6rjZjw+4/1HP44GD9f66aT9j2G1jRmJjOq1ab164iGDPzrwhqb+88/6zV/5RKjenD1V69tRP1CYXs8Z90qc3kDYgWSYpx7zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=G/bvutB7S+dp6/W0J0zqVf2Gzw00JZ9rk2oPU8jUQCs=; b=jwelLzVlr1n1UPICqCyYtDHA5abGNq56M6Y5e8IQXx+8hxyNbTA6s5pBdxItGLnHocCj03VD7bPkGFDrSx1lADR58vhTuIhf6qUeVrtRAAJuImCd5z2tr9vobyYB3KhruzAIXHJc3WXcS63GicU8wUMXau0QFYI4o2s0J5ymxEespKP+OGgXeyxc4ncg7GaOrrrs+vQ+f2qiDNP5kCKlKVImAnO5ktp+7RgkXrCAwvoXfGDLmHTlKOphCd4eOWrghxkzdypJ1uCYagzFC9ZCiUMHLtJvq1IX3aCzbGOKMq7kv2zdpO8JT12RbGwOwnrZ9bZVSaVEpDWRlaMqWEnFKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=G/bvutB7S+dp6/W0J0zqVf2Gzw00JZ9rk2oPU8jUQCs=; b=YPlwkZeRWcbzeOCvyw8em72OVSgeMHf9OfHFMo8SOkoTlSVtsJOb5o1H8X98X6O1wy/p1goA1kJ9gz3DKZUzAwY0eDoPmfwkPn2oXo7UKCEdxEG+/KIeGPU13n+sdP1tHQUCcsUUwIZyjf47LK4hjlTxSKvWYvGITGIyk+mrqTM= Received: from BN0PR04CA0168.namprd04.prod.outlook.com (2603:10b6:408:eb::23) by MWHPR12MB1599.namprd12.prod.outlook.com (2603:10b6:301:10::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.18; Wed, 18 May 2022 16:27:18 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::f4) by BN0PR04CA0168.outlook.office365.com (2603:10b6:408:eb::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13 via Frontend Transport; Wed, 18 May 2022 16:27:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:18 +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, 18 May 2022 11:27:16 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 15/17] KVM: SVM: Add AVIC doorbell tracepoint Date: Wed, 18 May 2022 11:26:50 -0500 Message-ID: <20220518162652.100493-16-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: 86d044b8-ebb0-455d-c305-08da38eb46ba X-MS-TrafficTypeDiagnostic: MWHPR12MB1599: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: tpoOKDfQumVsDtLyr+RK3PjH2IuwCDr9DuwdC190JvOPL04g0p6oL648gEF6Ya2Qw2jyQ2YfGQT1UO9eh6ePt0EZgLWDMKPidqvPCCQOIY3CZfNEN/gO1kue7vj4aqXE11bhRejZKDrW6u8hlDCORLghirWr2MOJt3hfxA/Nd6gE3UrCGRu0AKvaQadVLbZbCAPhayGGas0mHf8MuH1HniivbQzgLJ1tYcpUiHHhMiiNCyH482V+T2ABnlKBFhT3Iy8TcuYHS7ca235aTS1hr1W75YbSPKGVwDs5UxuoVMKx0tKl096iabTjvWXLuTDEN8KKMvE9sG4WFf3/mxBFwVHQrhgQMQi0BAJuCjBsBIlk8PQ5zXOpnIBQT6AR3I6NNByRH9JwGbbGEBuJxqk5Q4kM7XwXvvgG8zN2rkgflf4NgjNXp0L6rqOolvb9lQwWbxYbpewUkkRRUgI6bLP2ABzMBaqxrWJp2LHFOQ7+VSzbwlirqbXq54YIhOswjX4vyvy0d55YfrtHl7r2OxbNf0oMHx3dB5i9XEFpgbESBmkGHbK7jEccQRq+DTY067RMOSHQURuTyHbiYR2acprYWLvvkZW0DxczvMRK1uFtPAwu+m8I+K0raNL8sqg4iQNVffcOXOdjYA6ZOAavJMOX/Qg/x4Lt4BQWr/tK+g7FAlQHEli2KXOJoC/xKic2XA6zdS8pBEBQbO13dU04uSmfTg== 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)(1076003)(110136005)(336012)(36756003)(6666004)(16526019)(186003)(44832011)(86362001)(2616005)(8676002)(4326008)(508600001)(2906002)(8936002)(70206006)(70586007)(40460700003)(7696005)(26005)(356005)(81166007)(5660300002)(316002)(426003)(47076005)(83380400001)(36860700001)(54906003)(82310400005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:18.0836 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 86d044b8-ebb0-455d-c305-08da38eb46ba 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1599 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Add a tracepoint to track number of doorbells being sent to signal a running vCPU to process IRQ after being injected. Reviewed-by: Maxim Levitsky Signed-off-by: Suravee Suthikulpanit --- arch/x86/kvm/svm/avic.c | 4 +++- arch/x86/kvm/trace.h | 18 ++++++++++++++++++ arch/x86/kvm/x86.c | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 9c439a32c343..2a9eb419bdb9 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -324,8 +324,10 @@ void avic_ring_doorbell(struct kvm_vcpu *vcpu) */ int cpu = READ_ONCE(vcpu->cpu); - if (cpu != get_cpu()) + if (cpu != get_cpu()) { wrmsrl(MSR_AMD64_SVM_AVIC_DOORBELL, kvm_cpu_get_apicid(cpu)); + trace_kvm_avic_doorbell(vcpu->vcpu_id, kvm_cpu_get_apicid(cpu)); + } put_cpu(); } diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index de4762517569..a47bb0fdea70 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -1479,6 +1479,24 @@ TRACE_EVENT(kvm_avic_kick_vcpu_slowpath, __entry->icrh, __entry->icrl, __entry->index) ); +TRACE_EVENT(kvm_avic_doorbell, + TP_PROTO(u32 vcpuid, u32 apicid), + TP_ARGS(vcpuid, apicid), + + TP_STRUCT__entry( + __field(u32, vcpuid) + __field(u32, apicid) + ), + + TP_fast_assign( + __entry->vcpuid = vcpuid; + __entry->apicid = apicid; + ), + + TP_printk("vcpuid=%u, apicid=%u", + __entry->vcpuid, __entry->apicid) +); + TRACE_EVENT(kvm_hv_timer_state, TP_PROTO(unsigned int vcpu_id, unsigned int hv_timer_in_use), TP_ARGS(vcpu_id, hv_timer_in_use), diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 0febaca80feb..d013f6fc2e33 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -13095,6 +13095,7 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_unaccelerated_access); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_incomplete_ipi); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_ga_log); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_kick_vcpu_slowpath); +EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_avic_doorbell); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_apicv_accept_irq); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_enter); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_vmgexit_exit); From patchwork Wed May 18 16:26:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853849 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 C6573C433EF for ; Wed, 18 May 2022 16:28:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240227AbiERQ2I (ORCPT ); Wed, 18 May 2022 12:28:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43634 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240116AbiERQ10 (ORCPT ); Wed, 18 May 2022 12:27:26 -0400 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2041.outbound.protection.outlook.com [40.107.236.41]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EDBD7CDE7; Wed, 18 May 2022 09:27:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YyfxNsM1dyheTwegfJidFcKA30hPFKIBR9Bx+diJmqWdF4GjPcooze+QBRXTGvQj5HiGhqGgoK8s6JSPz/qBTOPtDa1ihOZD223I+eXgWDqUODiaRdAM6N7tY84cYDXKgZBo1JFthOxpfG19GKXO8bXPTVqHX84X95QOShQz2o7Gu6YVyKaXwlreuMFb5UiLgZ3a18WbLbvvJdkjAVvhuxiFjPGt7niwabWTrP/XBXIOcGFH/ZhHsFmXHAr/G5wC/Y71OtS62bHzIiIPkPfEP6uhu2jqBPnKElOQZ+3ltSmcFdwbz0lHxvn1BeKbwwOezdTOy/kpa4BG8noqNuTEKQ== 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=+/Qm/ohhI1YVz9MCRGs3yk2RGJy4IIf5wX9E5nxQerE=; b=VDG1MPQQ6PbUUacLyDEUF7qLub0RAFsXN/+I9oIACQ1pWhSm/Fl0RiyNpuUUDlk6YuoFNqrVjWZf6A0R8G8m72NYqTa5dQUON7dGhn3CkyNXFUDBpmlvIN4bK7A+z4C5oV7xsHTIaq2iPuaCCt7UAfJikLyfMqIYH8sXbldT/cxoD7aU0XpK5JgF25zIelX7KLKLaQgJwgwKUhKRV8edsoIA3H91NxmJYzdwgzMjRxRdbpoWWJcOk8VzUCd8mZVqgL5OOsk3z1UJePVS6Coz+ObWkz0bBHGI20v18UcftoggoSs36rbtLsBa46judfaO+k1GKvxBrzz/nifWxKgKog== 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=+/Qm/ohhI1YVz9MCRGs3yk2RGJy4IIf5wX9E5nxQerE=; b=dPiqZ6UBWGFP2HKnuANTd0jETj0yhadsCCJsskBHebfU8SXqCv1CwW/sQ7pyFjpKYDAOY/Bj3LkGEPr/NFsgcw4FN6PKXV0kVZ60UHP8ZImi1o4SOMwRI74TP4dO04rHbMEY6tB7GCozcJRHj4++VjxknwYJ/adCm45FJNQ0bGU= Received: from BN7PR02CA0022.namprd02.prod.outlook.com (2603:10b6:408:20::35) by BY5PR12MB4051.namprd12.prod.outlook.com (2603:10b6:a03:20c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.13; Wed, 18 May 2022 16:27:20 +0000 Received: from BN8NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:408:20:cafe::6) by BN7PR02CA0022.outlook.office365.com (2603:10b6:408:20::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15 via Frontend Transport; Wed, 18 May 2022 16:27:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT008.mail.protection.outlook.com (10.13.177.95) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:20 +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, 18 May 2022 11:27:17 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 16/17] KVM: x86: nSVM: always intercept x2apic msrs Date: Wed, 18 May 2022 11:26:51 -0500 Message-ID: <20220518162652.100493-17-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: fcf54a5c-5ec0-4806-abf4-08da38eb4809 X-MS-TrafficTypeDiagnostic: BY5PR12MB4051: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: ZEpS3mqC/LIrg21X9wROhLaL3ieG7+EqPqu0va+K5xWx0aqafBB3KVtKe0ZBwzRBaXKXbnrSc/j/yhVsDKs5Gtr0h7lUIoGGwLAF1ZK1k/vgSFejk+mgFOTYFB2W/G0+DilEVp1hNUO2g1+tmYAzqGA+9ueMiwUMfTLQP25x3CX3hs7bQJv6+XRrqBzDWjkxL7uyAdH5swHbtgL8WtmDvA1d3AFgJV1nwppBAULf0RCnrycDvXSZ+WWiqSG6OdLvH1Td8CFrcjjg7K34Pv/KnFbDJlLfT+EdjBDFCCcuzpWIncSEMtcee+L//fuwFIi3u0ffqx71CJcCFU1R8E0bEp6p7SXHbBxtaRYz2EH/Z57XAgvz/yvkRVS9y3XccTVhgqQHVgfYSbpKcNMezdeH0ducbJlOHospiwVFo8DidY8AsiOG2aPvgbNkU3yYT7q4xg0oJNYU0uAHP7qurI8C+ezZ57elwGNCnrDqYGOpdhLJvhAft8oCZlte82/9IpQ2iz6t/y4j13vavrT9Ph9hBKoNld+KXCi/SRyL2HywWlG8nFmdM1vc5I35myQczOE8Alx+2doxwZM3QVzYZCK+K0+DCIv8p0ncHVE4e+Yvr5KF20xnxC4ncY/cSWIN1LyACLOU0oOGKr+qmc88CGMXUTqOROlN8v9q+vDWS8IjCsDuU+9kW28xz87Ilu3ZjurK/l866NRwuRWvOJwjkuLzwg== 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)(316002)(8676002)(36756003)(82310400005)(54906003)(110136005)(70206006)(356005)(4326008)(36860700001)(70586007)(508600001)(6666004)(40460700003)(81166007)(26005)(5660300002)(44832011)(8936002)(2906002)(16526019)(186003)(7696005)(1076003)(426003)(86362001)(336012)(2616005)(47076005)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:20.2628 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: fcf54a5c-5ec0-4806-abf4-08da38eb4809 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: BN8NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4051 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Maxim Levitsky As a preparation for x2avic, this patch ensures that x2apic msrs are always intercepted for the nested guest. Reviewed-by: Suravee Suthikulpanit Tested-by: Suravee Suthikulpanit Signed-off-by: Maxim Levitsky --- arch/x86/kvm/svm/nested.c | 5 +++++ arch/x86/kvm/svm/svm.h | 9 +++++++++ 2 files changed, 14 insertions(+) diff --git a/arch/x86/kvm/svm/nested.c b/arch/x86/kvm/svm/nested.c index f209c1ca540c..b61f8939c210 100644 --- a/arch/x86/kvm/svm/nested.c +++ b/arch/x86/kvm/svm/nested.c @@ -230,6 +230,11 @@ static bool nested_svm_vmrun_msrpm(struct vcpu_svm *svm) break; p = msrpm_offsets[i]; + + /* x2apic msrs are intercepted always for the nested guest */ + if (is_x2apic_msrpm_offset(p)) + continue; + offset = svm->nested.ctl.msrpm_base_pa + (p * 4); if (kvm_vcpu_read_guest(&svm->vcpu, offset, &value, 4)) diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 818817b11f53..309445619756 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -517,6 +517,15 @@ static inline bool nested_npt_enabled(struct vcpu_svm *svm) return svm->nested.ctl.nested_ctl & SVM_NESTED_CTL_NP_ENABLE; } +static inline bool is_x2apic_msrpm_offset(u32 offset) +{ + /* 4 msrs per u8, and 4 u8 in u32 */ + u32 msr = offset * 16; + + return (msr >= APIC_BASE_MSR) && + (msr < (APIC_BASE_MSR + 0x100)); +} + /* svm.c */ #define MSR_INVALID 0xffffffffU From patchwork Wed May 18 16:26:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 12853847 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 DEA77C433EF for ; Wed, 18 May 2022 16:28:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240216AbiERQ2A (ORCPT ); Wed, 18 May 2022 12:28:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240108AbiERQ10 (ORCPT ); Wed, 18 May 2022 12:27:26 -0400 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2076.outbound.protection.outlook.com [40.107.243.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5DD49A777B; Wed, 18 May 2022 09:27:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bQLt83nRAE2RZ5yUMTFG9+RopQlzUXtGSXNzio4KuebIMbtIZazL3IZDCFQmOFeji1q5NBSdRBTLtihNETr60vfAwpDwVdEmOxRmafg7ntunowoV/iPFzrAfvEdpIEIxwvWohepBBC/3JCsdvNoE3vtTb5fcZ9wYwl6jDwdXP0ctoPiONsHXm1ZBNDOLbx6ygMlIIYqh7X1ATu+6rrEW1tfOtZ+VOyboLqPpvMKUhELD1RPJ/lj+NXANQkiBbFAOA9ARKfJCqRQEG5HvwmijxDeOdvH74Lqc3sRIG4NdgeIn2RyIeLuSwXhsg0JuU0+F4bjTlZYxGoxl6rS0JtQO3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DPj83bZ8mihTAUF0tvoNhgkl3Cn0mGFmF6SK7lQl6vQ=; b=a0rhuiNOLxO+rDtQ7USSKTNtGqAUJvKSI9ESBgLYZEtZXQhL6+0ekZzzDkWUwfI9DVgJkZI/yCAkslIEdGngYnvSrmZI9DFaMj3ExwYcAdMZHZIiLFn6n+5o3996b37wWG2kJ/47Oa6QmvoBqOj/aX9OQLNu+FyCqCQcNj9VhIaJoApThI17CCwCidtDgI5gf0hw00in5CInk+blAe4t8POQ8bZAXPeoy2++BlFz91qrER0poDwOouFqy2dCTyuRbSMOcwUvIW3MPC18JMN31QJocqxmKlpg0eZy0vaUZaW93vchEykv61rPqFSJyqSkRPbrJZqKUOYHUsswAiNtIg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amd.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DPj83bZ8mihTAUF0tvoNhgkl3Cn0mGFmF6SK7lQl6vQ=; b=lffppYN4WxhUzwURtqDR6mck76lKlMC4lKdtANUvBKNbNuSQc3Cmg1Fl8v8CvY0N/pXn9/fWv0mTghhyQ9o8jb9VkNtq68ZRx8WjGVSKbmdwn8oUOJlPfFmdq5Zolfpoob6d4EOHtxCTXdEq/JZVrpFbTjWfRAUp6fbq/TA8v1E= Received: from BN0PR04CA0166.namprd04.prod.outlook.com (2603:10b6:408:eb::21) by BYAPR12MB3304.namprd12.prod.outlook.com (2603:10b6:a03:139::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5273.15; Wed, 18 May 2022 16:27:20 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:eb:cafe::56) by BN0PR04CA0166.outlook.office365.com (2603:10b6:408:eb::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5250.15 via Frontend Transport; Wed, 18 May 2022 16:27:20 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; pr=C Received: from SATLEXMB04.amd.com (165.204.84.17) by BN8NAM11FT019.mail.protection.outlook.com (10.13.176.158) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5273.14 via Frontend Transport; Wed, 18 May 2022 16:27:20 +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, 18 May 2022 11:27:18 -0500 From: Suravee Suthikulpanit To: , CC: , , , , , , , Suravee Suthikulpanit Subject: [PATCH v5 17/17] KVM: x86: nSVM: optimize svm_set_x2apic_msr_interception Date: Wed, 18 May 2022 11:26:52 -0500 Message-ID: <20220518162652.100493-18-suravee.suthikulpanit@amd.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220518162652.100493-1-suravee.suthikulpanit@amd.com> References: <20220518162652.100493-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: c813c516-5356-490b-9891-08da38eb481b X-MS-TrafficTypeDiagnostic: BYAPR12MB3304: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: nOpTzVF32twR82/tCSrtRgckD61OqhdC6LWqre+QBMBKyGiAbKGduEMJS+UlcFUmQ8X86IQVEt7US+U+focIGsG85ybIA0mmYPT+ANsQAkc7Y0POa4+xvJE4JuJ7FDeSzVT0Tesbc2U3ttLYQcYYmXSNdwRVd/dIuKZdvMyb+IRqjCdLezOIunXE5amE+v8lZekg4+A330WC7Zmud33aOqzt49BUykDX8JUNC2n8BT33LWHBnX4HM3BsZI8BGktdzDSfvsRwIfjqwzL3Q4QSHtuP+Nqb9v7ZkOtUlN0GSX2q5Js0pE4wKHx7B3zXNfaB++LRcVIHCPwpfqyMSdRlKrsQR0qu8yqRO0QMB8bn52qfiT0HDU8wmaweG0hoOw+FPiDwLMhn+V/Iz4VmxpXYJzRjRAQbtctFcvYf57qFLlPBXn3Pm8yMrEHyA592fDiCqjJuvHMT9E7zvtWCgPx9DUD+FZiY7VMPv7yvI1Rvi864YhryiY6xuvriK9M2plBme5qeGO1lXfPiQ+8AcxktVOkdrXslHc8FL6HW7pwmFbVD+Ftw8TNSoAKwYDcRbtDHsIQCL1jYjK0PO9tF9vvrVAxKdS8LqEsuLcWXhXH0pBd54tXIzkh6+jzkoCaHIl5SNPEKdfE9VRruB4Qlp8gKOxN1pa8PStpvp9LEdv153FtNjoUTTFR91EH7CfRiqxMZo8NK3dlhy9qgSj4cnEbh+A== 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)(426003)(336012)(40460700003)(82310400005)(47076005)(316002)(54906003)(8936002)(86362001)(36860700001)(2616005)(1076003)(508600001)(36756003)(44832011)(110136005)(356005)(81166007)(5660300002)(26005)(83380400001)(6666004)(4326008)(8676002)(2906002)(7696005)(186003)(70206006)(70586007)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 May 2022 16:27:20.3959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c813c516-5356-490b-9891-08da38eb481b 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: BN8NAM11FT019.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3304 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org From: Maxim Levitsky - Avoid toggling the x2apic msr interception if it is already up to date. - Avoid touching L0 msr bitmap when AVIC is inhibited on entry to the guest mode, because in this case the guest usually uses its own msr bitmap. Later on VM exit, the 1st optimization will allow KVM to skip touching the L0 msr bitmap as well. Reviewed-by: Suravee Suthikulpanit Tested-by: Suravee Suthikulpanit Signed-off-by: Maxim Levitsky --- arch/x86/kvm/svm/avic.c | 8 ++++++++ arch/x86/kvm/svm/svm.c | 7 +++++++ arch/x86/kvm/svm/svm.h | 2 ++ 3 files changed, 17 insertions(+) diff --git a/arch/x86/kvm/svm/avic.c b/arch/x86/kvm/svm/avic.c index 2a9eb419bdb9..0d7499678cb9 100644 --- a/arch/x86/kvm/svm/avic.c +++ b/arch/x86/kvm/svm/avic.c @@ -100,6 +100,14 @@ static void avic_deactivate_vmcb(struct vcpu_svm *svm) vmcb->control.int_ctl &= ~(AVIC_ENABLE_MASK | X2APIC_MODE_MASK); vmcb->control.avic_physical_id &= ~AVIC_PHYSICAL_MAX_INDEX_MASK; + /* + * If running nested and the guest uses its own MSR bitmap, there + * is no need to update L0's msr bitmap + */ + if (is_guest_mode(&svm->vcpu) && + vmcb12_is_intercept(&svm->nested.ctl, INTERCEPT_MSR_PROT)) + return; + /* Enabling MSR intercept for x2APIC registers */ svm_set_x2apic_msr_interception(svm, true); } diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c index e04a133b98d0..4165317c0b00 100644 --- a/arch/x86/kvm/svm/svm.c +++ b/arch/x86/kvm/svm/svm.c @@ -750,6 +750,9 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) { int i; + if (intercept == svm->x2avic_msrs_intercepted) + return; + if (avic_mode != AVIC_MODE_X2 || !apic_x2apic_mode(svm->vcpu.arch.apic)) return; @@ -763,6 +766,8 @@ void svm_set_x2apic_msr_interception(struct vcpu_svm *svm, bool intercept) set_msr_interception(&svm->vcpu, svm->msrpm, index, !intercept, !intercept); } + + svm->x2avic_msrs_intercepted = intercept; } void svm_vcpu_free_msrpm(u32 *msrpm) @@ -1333,6 +1338,8 @@ static int svm_vcpu_create(struct kvm_vcpu *vcpu) goto error_free_vmsa_page; } + svm->x2avic_msrs_intercepted = true; + svm->vmcb01.ptr = page_address(vmcb01_page); svm->vmcb01.pa = __sme_set(page_to_pfn(vmcb01_page) << PAGE_SHIFT); svm_switch_vmcb(svm, &svm->vmcb01); diff --git a/arch/x86/kvm/svm/svm.h b/arch/x86/kvm/svm/svm.h index 309445619756..6395b7791f26 100644 --- a/arch/x86/kvm/svm/svm.h +++ b/arch/x86/kvm/svm/svm.h @@ -272,6 +272,8 @@ struct vcpu_svm { struct vcpu_sev_es_state sev_es; bool guest_state_loaded; + + bool x2avic_msrs_intercepted; }; struct svm_cpu_data {