From patchwork Thu Nov 24 00:04:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Phillips X-Patchwork-Id: 2149 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp3105788wrr; Wed, 23 Nov 2022 16:18:13 -0800 (PST) X-Google-Smtp-Source: AA0mqf7P1SO32nHhUmg+L3+tfh78MhhWVfv+huZEpFYn3yFQo9sd/os9yqikWGiPUzIQx7cJIvur X-Received: by 2002:a05:6a02:187:b0:46b:26a6:51bc with SMTP id bj7-20020a056a02018700b0046b26a651bcmr28085389pgb.204.1669249092778; Wed, 23 Nov 2022 16:18:12 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1669249092; cv=pass; d=google.com; s=arc-20160816; b=IY9pxSEMiyfcxzAXSpgan1g3DZV3SWapAvwO72fi7kMKPvbTffgplnR0DDFf3y707N Hf0+jcaXXGPFq+aKUJ0tRXJ0vDXanVSM/t5PuEU3cfDt1eEadf84xabIBZ/Z54JnVtaH bC8XeEu/nxgEr1LBu0h02uG2c+XsK0rI/pat0Ui741QQw4sORx7feUUdGYMZq1/Vmq6Z jZesCet68EWKdyHn9bkoF2PxRbJ21kM49dOCbChYdUAW2l3emcEWV4UI6U8xH2or7Dwa +aAYIGX8zrabRRUM9Bk2lmNy5dLEjS04u9pcWYdF1yX4zEHAdz9wNi4C8ojyoWmFeEdN 7T6g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=ls0dPisZ58tZFHFLr1d8pg0l4ciXYIZa0PX1DhS/Bqk=; b=J8W/jVfJ9fNErWf39wwRr0MGD021ywfq+lWwpm1ZGuxZ/VwFobqWYR/FayJEEevTXc INoFvjq7CaqbhhmDY0D6OWgqVfSISGtiDOFOAcYMm9Geneo2ZcTjTt58ButzEbF8Ff14 wTR9jZMNpa88RSvNntYdRjyUWWbKZz8uG9lM3YKSMgI6ZO8j/7AgTQc1e8Aka5KvfEAv NrPYneQI5NsOoRGwq5nnUx/HknhCdMYp/5sGfM4M65G+YNbgEys8DLzZ5POlN60Y5zXH PvdbBmR02FRBdGsrlIWL/cHnEy/37jQZhAQmJZpq/TLxZzqkWf9W5rLgO6x0gS9xIxzc me3A== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=j2opVBiI; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n4-20020a170903110400b00188b297f39bsi861212plh.216.2022.11.23.16.17.59; Wed, 23 Nov 2022 16:18:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@amd.com header.s=selector1 header.b=j2opVBiI; arc=pass (i=1 spf=pass spfdomain=amd.com dmarc=pass fromdomain=amd.com); spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amd.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229669AbiKXAFP (ORCPT + 99 others); Wed, 23 Nov 2022 19:05:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229379AbiKXAFO (ORCPT ); Wed, 23 Nov 2022 19:05:14 -0500 Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2047.outbound.protection.outlook.com [40.107.92.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C7DA91095B0; Wed, 23 Nov 2022 16:05:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JYhZNgHZZQXRH6S15PcrdbaVmYHqzFlpuyoJC4rsqbhGlPoRyUqAJIbfLhm30C9w+43WqUj/cnZsDaBJnVPXwIM0XizC4qSDVKaXJWSKJ9bbfeA8BsRbeNn3JpcVulg6gXzcHf5KWvU9HO0baxqnD+1u4ni9vy1QzgXfeahI9yOsIAJFGxkLVsJzil+VCwaEH4e/inFW88x56XkKCQSDFIy26ICXP5Gvo3HcS1e3+pSzu9C4CV2dI9bLHwkCHj+rigIBDsr4LZIwwsKNFl813PMbTDBVLUW7rHjALrUChk0QxRlx48tHO5IWD03QbWw1LGZvZmvobYuMz92jheppGg== 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=ls0dPisZ58tZFHFLr1d8pg0l4ciXYIZa0PX1DhS/Bqk=; b=eKEwA2jDgolzZlP2VkWQLBgtUNIYBw8/YRILo36DzTeeWIOSBmg5UwmttCrjYViXFdjIJh0E/JPi4MB8JUgc6zNsv8FNxJ7iuyyfRfm+/hqoqW3fYI9frWV5MnzHg6dc+a4nhRtjpaIO7O5tcbN30BkWVCv1GOZSeMkym7GBQfYvluKAjS2BmN6+04fzoO/tJKP21sHiowJ1/4+PZMz7Qvr2olLhXP1pCYIdeNoP5fBZE46JCCcSVeQCBcHv+bPkyTwBBdOWQou2mIHIWKnlf/fdwmwvR4TJBFtLj2X7mu7lb5VU53xo/X8RX+Yl+Bvh2kCE4j5odls8LJ8e5gC95g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=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=ls0dPisZ58tZFHFLr1d8pg0l4ciXYIZa0PX1DhS/Bqk=; b=j2opVBiI8HNihMKOoLlIfGvUlfGNe0Epkc+Z6bhsLBCeb4RYjiESYRS9Z6u76c1SbZ+IxuCuLlY0o41TGo4PaEy2LV+XdKA7gFUcZBIyJeZsYTzH7Y4YxG88tyLU+LqnlrAaXEf/1qIIqEVSNuYMvssTS42gNwN0WT74Udz6hu8= Received: from MW2PR16CA0070.namprd16.prod.outlook.com (2603:10b6:907:1::47) by MN2PR12MB4550.namprd12.prod.outlook.com (2603:10b6:208:24e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5834.15; Thu, 24 Nov 2022 00:05:09 +0000 Received: from CO1NAM11FT083.eop-nam11.prod.protection.outlook.com (2603:10b6:907:1:cafe::c6) by MW2PR16CA0070.outlook.office365.com (2603:10b6:907:1::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.17 via Frontend Transport; Thu, 24 Nov 2022 00:05: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 CO1NAM11FT083.mail.protection.outlook.com (10.13.174.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.5857.18 via Frontend Transport; Thu, 24 Nov 2022 00:05:08 +0000 Received: from fritz.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.34; Wed, 23 Nov 2022 18:05:06 -0600 From: Kim Phillips To: CC: Kim Phillips , Babu Moger , Borislav Petkov , Borislav Petkov , Boris Ostrovsky , Dave Hansen , "H. Peter Anvin" , Ingo Molnar , Joao Martins , Jonathan Corbet , "Konrad Rzeszutek Wilk" , Paolo Bonzini , Sean Christopherson , Thomas Gleixner , David Woodhouse , Greg Kroah-Hartman , Juergen Gross , Peter Zijlstra , Tony Luck , Tom Lendacky , , , Subject: [PATCH v2 0/2] x86/cpu, kvm: Support AMD Automatic IBRS Date: Wed, 23 Nov 2022 18:04:47 -0600 Message-ID: <20221124000449.79014-1-kim.phillips@amd.com> X-Mailer: git-send-email 2.34.1 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-TrafficTypeDiagnostic: CO1NAM11FT083:EE_|MN2PR12MB4550:EE_ X-MS-Office365-Filtering-Correlation-Id: a0bd5f69-2ecd-4816-ccc1-08dacdaf8c7b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aodgq29ArpU/6XpuZ89yeFOlY4Qre7tyMpJl1o86XmkLGzEej1slS+kwZ58NJaGcjcHYgZnXFu9+e9giSL/I2aBRmrRiOO7Mn/pOt4xvcRVJhS34jT+467qWYy6FR4nfbFezCvcPKoIN3rnyoew0t5HHZCWHUCE/5JeLJ3adF0Qq+LmsbumpbSutyqik2Ht2y9oAlqP6BJ0z+w1JUrvuEYFXsUzkEqX60CnlrB3IH/Jz0R9nq5To/OdgHbPVFo+unihtSO4OelUH4l34QBFdPfWVC4chymp0yUVo25YQszq3Wkzdg4ziD4s6xZtt4eOUc9rwGtwZ/wbgUr7e+k8Wict/z9hgSasPSTGj5vEtN6h8ccB30fQH8BPX+BCmceD6thgTpTwHSLNxJrhsihZVD40q8yP8oJOqnNUpOTdExQ2Eetl7aY+QEAMUQuZa75JSkRUXvNzM5lD4Jqie4p5hFthyBPpV+mAbS3+GccXhLZed2PhBiJZUogtfsJkZ7N2jPrC/gb4/9ujCKx/4oBWHTrIBEgUkNOJmUz6SWehvK0MGlAUBjLq2G0uSftFKZkOEqBloit/oslsRurebdNG0ClzXu8BwAgNvx6/EcmyXc/TopmkD9A8I9k/2iV0UOYgQbZlk3G6i8VcZynh+A3ew4ojj0URmSIxDq0eQcSDONMik7/4XiF5U7AJ0qHCrRj4gGxPORi3ksXVAs8IAKFkDJ18+3dOjzQoBENGNPLXwDh8= X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230022)(4636009)(396003)(39860400002)(346002)(376002)(136003)(451199015)(46966006)(36840700001)(40470700004)(41300700001)(7416002)(8936002)(5660300002)(316002)(8676002)(44832011)(70586007)(4326008)(70206006)(54906003)(6916009)(7696005)(36756003)(26005)(478600001)(2906002)(336012)(1076003)(426003)(16526019)(2616005)(186003)(47076005)(82310400005)(86362001)(40480700001)(36860700001)(83380400001)(356005)(81166007)(82740400003)(40460700003)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2022 00:05:08.4366 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a0bd5f69-2ecd-4816-ccc1-08dacdaf8c7b 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: CO1NAM11FT083.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4550 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750334536851180637?= X-GMAIL-MSGID: =?utf-8?q?1750334536851180637?= The AMD Zen4 core supports a new feature called Automatic IBRS (Indirect Branch Restricted Speculation). Enable Automatic IBRS by default if the CPU feature is present. It typically provides greater performance over the incumbent generic retpolines mitigation. Patch 1 adds support for AutoIBRS and other feature bits in the CPUID_8000_0021_EAX leaf. Patch 2 adds support for AMD Automatic IBRS Co-developed-by: Babu Moger Co-developed-by: Borislav Petkov Signed-off-by: Kim Phillips Cc: Borislav Petkov Cc: Boris Ostrovsky Cc: Dave Hansen Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Joao Martins Cc: Jonathan Corbet Cc: Konrad Rzeszutek Wilk Cc: Paolo Bonzini Cc: Sean Christopherson Cc: Thomas Gleixner Cc: David Woodhouse Cc: Greg Kroah-Hartman Cc: Juergen Gross Cc: Peter Zijlstra Cc: Tony Luck Cc: Tom Lendacky Cc: kvm@vger.kernel.org Cc: linux-doc@vger.kernel.org Cc: x86@kernel.org Cc: linux-kernel@vger.kernel.org Kim Phillips (2): x86/cpu, kvm: Use CPU capabilities for CPUID[0x80000021].EAX x86/cpu, kvm: Support AMD Automatic IBRS .../admin-guide/kernel-parameters.txt | 9 +++-- arch/x86/include/asm/cpufeatures.h | 5 +-- arch/x86/include/asm/msr-index.h | 2 ++ arch/x86/kernel/cpu/bugs.c | 23 +++++++----- arch/x86/kernel/cpu/common.c | 8 +++++ arch/x86/kernel/cpu/scattered.c | 4 +++ arch/x86/kvm/cpuid.c | 35 +++++++++++-------- arch/x86/kvm/reverse_cpuid.h | 24 +++++++++---- arch/x86/kvm/svm/svm.c | 3 ++ arch/x86/kvm/x86.c | 3 ++ 10 files changed, 82 insertions(+), 34 deletions(-)