From nobody Sun Jun 28 05:34:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 78DCFC433EF for ; Fri, 11 Feb 2022 21:06:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353680AbiBKVGN (ORCPT ); Fri, 11 Feb 2022 16:06:13 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:58598 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229596AbiBKVGM (ORCPT ); Fri, 11 Feb 2022 16:06:12 -0500 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2069.outbound.protection.outlook.com [40.107.223.69]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82A232D2 for ; Fri, 11 Feb 2022 13:06:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Nkx/a1/f3U5L98njJF1FEd6BF7G8kDrOwe+CQOE18/O3f6WY2yq7P9t/l7vWnSx9AzCumIB/6LBeFkevpPZbPoG5VuIfInQfYvuPX+UhzdBebu290ltw3LiqGILHTyMCZOBrKg9NuBcJouQ3XDyKp4QlpfxYV8V4HC1CpC9v9RULe9rSmXuM29UU+7ufU8aIV78Vl2ehTCSTzl+aKqLcjSkm3d8YcOw1FxOo8brz/2pTqXBflMt7PB+HEHx2bSqjNaB0oGxlW7KwYWiIQ6wvOj7QUlhyY083AUp6ZfEpYYkWRBFdSA/l50FGoLL7Cy9rKQTklrM0ctbtC3A2X/1k8A== 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=ovyTE8YL6rUObqjY9WVHSAc4XDBj1+SL7sr/2ie6hGU=; b=jpkPsZGYZWDu9GhsjUGgECyP/6V5CNlakf0czY9uhj3df0NJHUv+aKsqplOL8hvoXNxPMaquGrUH6ucMa3P0wNDdbcuRJzdyYw7qElStMfmaEiVcjeeuTOfX5whn003Ri34ommIsnwdWW3cKNdastphLZawIEpXPQ9HO0CQPaqTw23ug9SRxthaq/EbIH6Ev5eFdueKq97bHXJoKOg7q3v2lHZasqpYn5aT0rKpObDSZeObKKB5Z7s6nLl0ClFYcmIziQg/WrkGFqZE3TR/bgIfRg4vHtbamzQcRgZoiy3lSVVFC2vQyAbeCvvG1OP/DdciRa7nIRCzM1a6yEviRxg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=ovyTE8YL6rUObqjY9WVHSAc4XDBj1+SL7sr/2ie6hGU=; b=yrzSTABe0zB4+l0SSC0LDqn2a4dEF6YwTfRagDy5IXL1sTsC/0y+ydF/I4HdjUCgsFkeECjktNYMtTWENFyvUNEUbtoq8Md1C2Q9bx6AvRDQnJf6h+4k8vWxc0u+5ePRz5j9sjbIY7TQFOn2Dd5cqR7aXudS6W9nNMsXjn8meII= Received: from BN9PR03CA0964.namprd03.prod.outlook.com (2603:10b6:408:109::9) by MN2PR12MB4127.namprd12.prod.outlook.com (2603:10b6:208:1d1::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.12; Fri, 11 Feb 2022 21:06:08 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::11) by BN9PR03CA0964.outlook.office365.com (2603:10b6:408:109::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by 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.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06:08 +0000 Received: from localhost.localdomain (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.18; Fri, 11 Feb 2022 15:06:06 -0600 From: Mario Limonciello To: Borislav Petkov , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" CC: Kees Cook , Thomas Lendacky , , Martin Fernandez , , "Brijesh Singh" , Mario Limonciello Subject: [PATCH v2 1/4] crypto: ccp: Use cc_platform_has to determine SEV presence Date: Fri, 11 Feb 2022 15:02:52 -0600 Message-ID: <20220211210255.9820-2-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211210255.9820-1-mario.limonciello@amd.com> References: <20220211210255.9820-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 634e93b0-aeaa-4ed9-8bc9-08d9eda25308 X-MS-TrafficTypeDiagnostic: MN2PR12MB4127:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /Z5hVkj6OSFpgZm6aI5K5Gowf9Fzb4inh9w5SM/8XxJ8vWZCWxd3yzWmk1oxTFnsX7D4RMXWiEeOER1YQnrEeRX/DpYchzc7ldd6I1mkmv/lGzsWKY+czSDr5St9+iSbdR1IpkbnzqB1xjcUdXpvWUhNgPVsUBwqjLUZxy/htdBLGVbXzJ+cyDtEgv1Ydh9w6P/3/LcacsEb9ElTRxqmdTIB5Fd8toIHgiz0iMpkuWwlTO3EHk+E6CYDlFOPcGH6KaBYOIqyZDjMpYP4bjRGatu1eXgNCcbVIiZqqTRTrKqWxqBX8gTLeju5VPNTQQtdZhpkPPkE+KWmpOvvFJRq2yM+C5ssfQ0QBJxo9vrNw0Ahx3bhqUSsmDss1+6J3QZVmPHcWmbrld+BpeGV3bmkYTYoTHpBde/UcMaZM95wd3Q4dss0PF2N8gvKqQZ0uzISFzp1xN+kmZbRVSWnwrKkdi64tibib8HW9YiTloT8y0pcT1f0FqziR72eNHQ+nLd4IK8RJ+WwJY4EKZ8GSlB9mVaGQGVcsnFHxbd+QbR79Tzpl2864PTaxD0yXQ4Tnsbi5TkWFZNg+bXP+EAlDquVBEQOq1TqpvFS9h43ch9qiXigTSQmjkvIIpcb+7qbDWe79O2bGaLLaXUpozufNl/077ppoGkF9XYiCDCs9Ta3Dk6m76ZHzta16rYGgNG8nHkmDfWdGqugcTQR7PD8j+ob1w== 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)(54906003)(356005)(86362001)(36860700001)(426003)(5660300002)(4744005)(4326008)(40460700003)(110136005)(336012)(44832011)(81166007)(8936002)(83380400001)(508600001)(82310400004)(8676002)(186003)(316002)(70586007)(6666004)(1076003)(2616005)(2906002)(26005)(36756003)(70206006)(47076005)(16526019)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 21:06:08.2564 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 634e93b0-aeaa-4ed9-8bc9-08d9eda25308 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: MN2PR12MB4127 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The CPU feature flag shouldn't be used to determine if SEV is active, that's what `cc_platform_has` is for. Signed-off-by: Mario Limonciello --- drivers/crypto/ccp/sev-dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/ccp/sev-dev.c b/drivers/crypto/ccp/sev-dev.c index 8fd774a10edc..e061eb6a039c 100644 --- a/drivers/crypto/ccp/sev-dev.c +++ b/drivers/crypto/ccp/sev-dev.c @@ -1148,7 +1148,7 @@ int sev_dev_init(struct psp_device *psp) struct sev_device *sev; int ret =3D -ENOMEM; =20 - if (!boot_cpu_has(X86_FEATURE_SEV)) { + if (!cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT)) { dev_info_once(dev, "SEV: memory encryption not enabled by BIOS\n"); return 0; } --=20 2.34.1 From nobody Sun Jun 28 05:34:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DB699C433F5 for ; Fri, 11 Feb 2022 21:06:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353707AbiBKVGW (ORCPT ); Fri, 11 Feb 2022 16:06:22 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:58624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353681AbiBKVGN (ORCPT ); Fri, 11 Feb 2022 16:06:13 -0500 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2083.outbound.protection.outlook.com [40.107.236.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42A5F2D3 for ; Fri, 11 Feb 2022 13:06:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=TiGX9U46772h82HsHOv7KQLr5J859veCEADCQXbAEEVH9Z5z1y17TvXMHCOFZ5SW0AquwumKBF0FUQGQihoEIsbclhgm6uEmypQNExAfycwjyKD2U4uqzypX46qQ+9G1uGvWcve7LfCgSrkdHjhM6Zk+qA9g2NkFcsvdQc8qxFcDh0oH02em5GCWMVciOCNZOOcmFr9i4LdH2B/mgzFCWMibYiYNnFq/Cn/R8SsojrVEhAz+VowZ8jFp0uXJc7Iy5iA16Oi2V4f1RsmsD7to9+f2dIp3HaSJmj3EOW5cVYHSIqqpFXk2f0NKim77BWpY/dXJ3baVBDN3yFahng2/8A== 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=8ffWasgJ6Jh4cc1Xc3Eab+SwyAEnO9S0VmIWUJJUOP4=; b=TFuNPBhhmumJ7sgDXQV7dOAL+gdWQ7h5g/LXtavIsu9TKAGGVjvInImqcu0uUZ74a6CCClVNNuDcZgf6GWWM+c0UnyqNKa9ywvRdM9fxBawtrg97ICmZdVSHHhE/I4vwJaLgH+5Ld2ObgpklMNxx8KlvFYJrrB0BdH/iadcJv4CWUrHAvVJ/Fd6jTA8D+Y80sdS4snSmIVTJDsMtxDY8ADQid2LlYX6y0FmKnzUcjrY8NxIRGzwzlXl5uVxJkrDaxaeOdGJsdgSJEC6VzkISr55IZ/N4oGDsCYqfCDsiDTpW7Q2RSsEXBr9z8+46OzQUvg39dSMw6f3a6Qqd21+INQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=8ffWasgJ6Jh4cc1Xc3Eab+SwyAEnO9S0VmIWUJJUOP4=; b=mrnhUnupQKUx51h3bZ09Qv95RLDD5p+NhdbRXlvwXUPGIXXZnQOINzrQTJJBF8LvRjMWiPfn6k3VLF/MBAPn3WmGWIQM7l/JTsF3aLP8Woz4jnZmW99oPFJ7E/3NReuhZSLNpvJFgjlvFae2LwNuNzF1C8+jMHm2ZtYH/xhg9IY= Received: from BN9PR03CA0978.namprd03.prod.outlook.com (2603:10b6:408:109::23) by MWHPR1201MB0126.namprd12.prod.outlook.com (2603:10b6:301:57::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.14; Fri, 11 Feb 2022 21:06:09 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::1f) by BN9PR03CA0978.outlook.office365.com (2603:10b6:408:109::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; Received: from SATLEXMB04.amd.com (165.204.84.17) by 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.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06:08 +0000 Received: from localhost.localdomain (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.18; Fri, 11 Feb 2022 15:06:07 -0600 From: Mario Limonciello To: Borislav Petkov , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" CC: Kees Cook , Thomas Lendacky , , Martin Fernandez , , "Brijesh Singh" , Mario Limonciello Subject: [PATCH v2 2/4] KVM: SVM: Use cc_platform_has instead of CPU feature flags Date: Fri, 11 Feb 2022 15:02:53 -0600 Message-ID: <20220211210255.9820-3-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211210255.9820-1-mario.limonciello@amd.com> References: <20220211210255.9820-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 5b900485-28cb-4fad-fea7-08d9eda2533c X-MS-TrafficTypeDiagnostic: MWHPR1201MB0126:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6790; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5a8OmJJPvKkEbyPKde+zesjiZ3R+1Jwd8DlJzbBCtjep8PJUsWv1TjpjKFhFaBfYc36IFQr8EANc9ZuqIgl+qs9Xq19/I4lbeUaRjEzjrbLHWJUhelSNuY0lVg7i5V4zy2Z2IH4mfMOnstX3+Tmh1YsecJZPmhc0UFcu/ZGTiLrt9aA5Uz/GzntH66KGVLxsy6vcS6SPr+jrmHmNC9mCMNWGVSsAbaMWhvahKVF0xMjtTA4rnBmJQ6dxwZ2HROAfHrJte4c2s4glx5aDk5Fx90rhJN3Jt/Ul/m9GRQgk9TT+dX9W8Y6DV2bA4A6jv61zDoRDNGcJaFUCFxvRcr+9/7FPYtgomyUEDvoSCnL9tQ+TDUqRlVFGKQYxv246w8fXW0FH6ZAA1BIHl/rbVNXxTUroemVIeR2t+Po3mS99nW/4RX4bZ6TCkdAZgUuq1nw11EcPeiQ9OcWH5tn5bP8TKoSfv/wHcGV2JIyw8TJiX2a/JoIKkGY0365b7JmBa/ZfSWUUzsSOuLJiKnISBn/udVQU3iuBYq60HF2G2gVe014h17slsDuKyUwIuRXTvQ94rjA36iy/5Cfe3Y4XOU0InbUxr8XpPUf/ppEbRjOluKcxfWvTvuOOF79ZEMtfZML1FjKTcVvIl97M6mHvnW8nNUThyZEmBjkoqgnodzyQ0inI07Pq48+uFqYwM2LZalGr+LePuCKdXw7hOJOgpd2B5Q== 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)(36860700001)(83380400001)(47076005)(336012)(2906002)(36756003)(426003)(2616005)(26005)(16526019)(186003)(40460700003)(1076003)(81166007)(356005)(82310400004)(6666004)(508600001)(316002)(86362001)(110136005)(8936002)(54906003)(4326008)(8676002)(44832011)(70586007)(5660300002)(70206006)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 21:06:08.5845 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 5b900485-28cb-4fad-fea7-08d9eda2533c 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: MWHPR1201MB0126 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The CPU feature flags may have been cleared earlier by the kernel if the BIOS didn't activate features. Instead use `cc_platform_has` to determine that SEV was enabled. Signed-off-by: Mario Limonciello --- arch/x86/kvm/svm/sev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/svm/sev.c b/arch/x86/kvm/svm/sev.c index 17b53457d866..d3d1ec78d927 100644 --- a/arch/x86/kvm/svm/sev.c +++ b/arch/x86/kvm/svm/sev.c @@ -2105,7 +2105,7 @@ void __init sev_hardware_setup(void) * CPU supports decode assists, which is mandatory for SEV guests to * support instruction emulation. */ - if (!boot_cpu_has(X86_FEATURE_SEV) || + if (!cc_platform_has(CC_ATTR_GUEST_MEM_ENCRYPT) || WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_DECODEASSISTS))) goto out; =20 @@ -2153,7 +2153,7 @@ void __init sev_hardware_setup(void) goto out; =20 /* Does the CPU support SEV-ES? */ - if (!boot_cpu_has(X86_FEATURE_SEV_ES)) + if (!cc_platform_has(CC_ATTR_GUEST_STATE_ENCRYPT)) goto out; =20 /* Has the system been allocated ASIDs for SEV-ES? */ --=20 2.34.1 From nobody Sun Jun 28 05:34:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4007AC433F5 for ; Fri, 11 Feb 2022 21:06:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353701AbiBKVGS (ORCPT ); Fri, 11 Feb 2022 16:06:18 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:58612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353679AbiBKVGN (ORCPT ); Fri, 11 Feb 2022 16:06:13 -0500 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2072.outbound.protection.outlook.com [40.107.102.72]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E96822D2 for ; Fri, 11 Feb 2022 13:06:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DeTIId8+omAD8KE58xT2JBZPFGp4ikmQ2AgVHoLxTLmoIxhxClt+ToDROyuJWnW1kf7DtFi0DIxuumDbk9oR7+7Qi7JiLXu+db6R+05XeiK0/jffHBPah3MYgEC502OXGu+6YL7ZQeUDBRGdvGrGzMx2olhpYdiX8t1dinSaCK3nGjlY+TkRU0oHZ6nvedWDAUh5fS1GT4tXwiLRgCRheeJNR7LppkFbFjAogC8tYfNHQk9H1xJs8sSrRaAYMQhvXktQ3JVtNGUhCL1FTRS7nLmMSkTccn05LGirRHFNRX+aRZAxY9SpooLii6GqaRXhpkAitSqjPv/JBRioHfL0Ww== 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=lLKnA5Fqtpw3bgpdoaA+Pq9MhdpOnrbaGO2HHYYFpxg=; b=J8nrJj22dE+7c9/GdVmkJEyfmD2VJuoJB5qXUGQCM6a84a7UuY8Th949zlym/e6hCYFHjjaOKYbGnfSVNGIrHjEs67xy+whVmXVgwdBScYPUpLXivjYpaL4tNcNOyavrkDt8knzIQBbf38v0ae/gJigmuWZRzNvaYHmWojjmkNZlmayBCFj4qlBx5GpYCQTyvNe2fYeMNmV93rDtADXwZHOlrFHrzZ0fV1C1WOX6i8VGRv3WP9KxClLXlgvtvHxeuLiOBUoZ2jHN4UtFufhq3hiiam6o24s0sJfZoxu7ssmJoYoLrYpC00MRunDN4SDA3kg7CwF9i+3+S/HL0BVO4Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=lLKnA5Fqtpw3bgpdoaA+Pq9MhdpOnrbaGO2HHYYFpxg=; b=1xcbKjWvMC6c1NGQfg4o5qTN+c4TO0rLtXpY75lCKoaOzPThqM7kmxxrogoIvowcjU0XfajGPsPLuyDlFg/2kqcKztDzMJH8HX1JUQouWLt2Lvhs/2ZcPJW8Ph3bkN8ba3/ywsugd9ua/WFWWs62qO4HY/eXnUb0uOM9KhecNbE= Received: from BN9PR03CA0973.namprd03.prod.outlook.com (2603:10b6:408:109::18) by BL1PR12MB5271.namprd12.prod.outlook.com (2603:10b6:208:315::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Fri, 11 Feb 2022 21:06:10 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::a6) by BN9PR03CA0973.outlook.office365.com (2603:10b6:408:109::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06: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; 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.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06:09 +0000 Received: from localhost.localdomain (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.18; Fri, 11 Feb 2022 15:06:07 -0600 From: Mario Limonciello To: Borislav Petkov , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" CC: Kees Cook , Thomas Lendacky , , Martin Fernandez , , "Brijesh Singh" , Mario Limonciello Subject: [PATCH v2 3/4] x86/cpu: clear SME features when not in use Date: Fri, 11 Feb 2022 15:02:54 -0600 Message-ID: <20220211210255.9820-4-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211210255.9820-1-mario.limonciello@amd.com> References: <20220211210255.9820-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d7d0b3fb-731d-426a-909a-08d9eda253f4 X-MS-TrafficTypeDiagnostic: BL1PR12MB5271:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: De4ipHRIo750wm90RUlMfaZF/upaFr4jEbUNC8DkrX3dfFYUMoQtKGzu/oPIYuO3DpkkdIQdcpGLTX/Cwixd0An4e4FCfgkvIzF0Sw3OODTmGtz0AgDnoC9j2XpeO5+QxWEM4fPI2K43J1MU8JLKtsGEbcgnAK1RafwR0u6bseS0Qdh+0xrN5/Va5vWN3hjVbu5Oo2EM0xf9zqqZgkzS4EVpB/9L9Om+k3LOBCS/iHa4mOKGIxrZbSDEcOk5EtUvlxGDtlLadmRwh+gW3ht2cEx/RZ0pReCy0p6zUBYJL4Pa/23+nKPxOOx482dxPMlo/o5JQx5PCDis9vmADqfPe68eHooo5NwOdtcdFveJOEIti5LynkhyC0Hyrh7vbSnJXLwKA5ca/2c9mtgclHNClgA2Jp5LPGfMdZAB/LW15tTVgmz4wah6yXAOIW63lXOJpn/87GoiiXXUE+DlPkQcazsjcdDy/Wz7ix8WX3Quw6y8Or1DSUAuBx9LtpE7dMzjVSbLZ37AKGxznR+J6kGUrE8QpspFFN4ZEtLWaC9Yw24KQkj2R/gw6vmkps/qqjnhY/4HhISSjrh60dk1ZPYAj5a4NBtPaimoS8cBZw+rrqg2qDQiQqy7XnmEFaUAOkKMGtzT/bckXyGKlMxARWF5xmGDPrUca3pIXTrzRxOGSXT7Jh8DRRBUvuVTM5mDT8Hs1OGiiBVU4FaC1A8OWOlETg== X-Forefront-Antispam-Report: CIP:165.204.84.17;CTRY:US;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:SATLEXMB04.amd.com;PTR:InfoDomainNonexistent;CAT:NONE;SFS:(13230001)(4636009)(40470700004)(46966006)(36840700001)(426003)(70586007)(70206006)(110136005)(81166007)(4326008)(336012)(8676002)(8936002)(2616005)(82310400004)(40460700003)(54906003)(356005)(16526019)(316002)(1076003)(186003)(26005)(2906002)(47076005)(36756003)(508600001)(36860700001)(44832011)(5660300002)(83380400001)(86362001)(6666004)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 21:06:09.7876 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d7d0b3fb-731d-426a-909a-08d9eda253f4 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: BL1PR12MB5271 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Currently the SME CPU feature flag is reflective of whether the CPU supports the features but not whether they have been activated by the kernel. Change this around to clear the features if the kernel is not using them so userspace can determine if they are available and in use from `/proc/cpuinfo`. As the feature flag is now cleared on systems that SME isn't active use CPUID 0x8000001f to confirm SME availability before calling `native_wbinvd`. Signed-off-by: Mario Limonciello --- A concern was raised whether the assembly generated from stop_this_cpu is still safe. Here is the assembly from compiling with this patch: 00000000000011d0 : 11d0: e8 00 00 00 00 call 11d5 11d5: 55 push %rbp 11d6: 48 89 e5 mov %rsp,%rbp 11d9: 41 54 push %r12 11db: 53 push %rbx 11dc: 48 83 ec 18 sub $0x18,%rsp 11e0: 65 48 8b 04 25 28 00 mov %gs:0x28,%rax 11e7: 00 00 11e9: 48 89 45 e8 mov %rax,-0x18(%rbp) 11ed: 31 c0 xor %eax,%eax 11ef: ff 14 25 00 00 00 00 call *0x0 11f6: e8 00 00 00 00 call 11fb 11fb: 31 f6 xor %esi,%esi 11fd: 48 c7 c3 00 00 00 00 mov $0x0,%rbx 1204: 89 c7 mov %eax,%edi 1206: e8 00 00 00 00 call 120b 120b: e8 00 00 00 00 call 1210 1210: e8 00 00 00 00 call 1215 1215: 41 89 c4 mov %eax,%r12d 1218: 3d ff 1f 00 00 cmp $0x1fff,%eax 121d: 77 49 ja 1268 121f: 4a 03 1c e5 00 00 00 add 0x0(,%r12,8),%rbx 1226: 00 1227: 48 89 df mov %rbx,%rdi 122a: e8 00 00 00 00 call 122f 122f: c7 45 d8 1f 00 00 80 movl $0x8000001f,-0x28(%rbp) 1236: 48 8d 7d d8 lea -0x28(%rbp),%rdi 123a: 48 8d 75 dc lea -0x24(%rbp),%rsi 123e: c7 45 e0 00 00 00 00 movl $0x0,-0x20(%rbp) 1245: 48 8d 55 e0 lea -0x20(%rbp),%rdx 1249: 48 8d 4d e4 lea -0x1c(%rbp),%rcx 124d: ff 14 25 00 00 00 00 call *0x0 1254: f6 45 d8 01 testb $0x1,-0x28(%rbp) 1258: 74 02 je 125c 125a: 0f 09 wbinvd 125c: eb 07 jmp 1265 125e: 0f 00 2d 00 00 00 00 verw 0x0(%rip) # 1265 1265: f4 hlt 1266: eb f4 jmp 125c 1268: 4c 89 e6 mov %r12,%rsi 126b: 48 c7 c7 00 00 00 00 mov $0x0,%rdi 1272: e8 00 00 00 00 call 1277 1277: eb a6 jmp 121f 1279: 0f 1f 80 00 00 00 00 nopl 0x0(%rax)=20 arch/x86/kernel/cpu/amd.c | 3 +++ arch/x86/kernel/process.c | 5 ++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 4edb6f0f628c..9cea774344cb 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -607,6 +607,9 @@ static void early_detect_mem_encrypt(struct cpuinfo_x86= *c) if (IS_ENABLED(CONFIG_X86_32)) goto clear_all; =20 + if (!sme_me_mask) + goto clear_all; + rdmsrl(MSR_K7_HWCR, msr); if (!(msr & MSR_K7_HWCR_SMMLOCK)) goto clear_sev; diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 81d8ef036637..e131d71b3cae 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -765,8 +765,11 @@ void stop_this_cpu(void *dummy) * without the encryption bit, they don't race each other when flushed * and potentially end up with the wrong entry being committed to * memory. + * + * Test the CPUID bit directly because the machine might've cleared + * X86_FEATURE_SME due to cmdline options. */ - if (boot_cpu_has(X86_FEATURE_SME)) + if (cpuid_eax(0x8000001f) & BIT(0)) native_wbinvd(); for (;;) { /* --=20 2.34.1 From nobody Sun Jun 28 05:34:12 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06234C433EF for ; Fri, 11 Feb 2022 21:06:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353715AbiBKVGZ (ORCPT ); Fri, 11 Feb 2022 16:06:25 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:58626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353682AbiBKVGO (ORCPT ); Fri, 11 Feb 2022 16:06:14 -0500 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2047.outbound.protection.outlook.com [40.107.243.47]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99F3E2D4 for ; Fri, 11 Feb 2022 13:06:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EtvCR3JM/ltNAW1dW1WiS7iop23iExxXZSMIdugU6oo+yOJ9WYWenXVV+JG/nE55Ji3JszAA1j81EDsCUndmEaQsNgtdx2HxDdwtfsmhVqKxtEw370nIgkkyNE9YGownj1rC6j1UEIHPZN99ut3NEJgP5gCbiGAVk/BWVtzeozZTVmIY0jel2Tdf5lUIXew8RGy9JntUg9vhJdsZGOmp0rFFsKXWon2pWIj7wNZRfnrzokcTrhbq4VvqLnZuYT+ODeulZUrCHz19cMwdh5zMydNPjtHLevaTWdwTnqHZTWbsvo6u8ocyHC/9VNijuKqo3SMaBU40H+n14OkgkIjURg== 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=A64yGphSPUuITJhT/JcqmxOnimSVcR/eBE+ddOYFoII=; b=Gg9evq2WI3w7hmZRqinGG3JnOvmviAGmA9tFlFL8Q6gr7TCYS6mdqZYMO2Ifq8hasGs/LsY0vGqlE/3CXRdTj6ZBa9Aq3WfXQYJ1jfYPsHi3umen+s9R6wYxOCEnMResvcaw1l59Y6Y4bNfaTY0Wv0rOT2k9Rlkqn0t+xwuuSp0I0Xe4zV/A2GLcZqc08IoqZLxrj1L10uw1GA5bntrV4UolCL1Df3bx52TR0nDWTWZrgpMsROvvkHj+C5Sot16+ZY0p5pN2f/u2g2snM/5tf6aY8FRpfxFepxaUl8ITtqqc39fg6aBRFLqMySN6KvE2QyTdMnv8mXlATrvnYAZI8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=alien8.de 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=A64yGphSPUuITJhT/JcqmxOnimSVcR/eBE+ddOYFoII=; b=azXvTPpV7TJmhtYXp1lS6wvOF1KaEG3NzbzcFPG0TBRi4mErqNtz7D0u/CUuBjHeFXWBcfc40g/0JR8b7QLpbTj6TBwHXhCRx20w9cnmuW/4DdCoXQPrFu0PedSONq/AzNjpNix79KDsTkzeJkyxMba9vOfiyfCj7qYPG96oCQk= Received: from BN9PR03CA0974.namprd03.prod.outlook.com (2603:10b6:408:109::19) by MN0PR12MB6001.namprd12.prod.outlook.com (2603:10b6:208:37d::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4975.11; Fri, 11 Feb 2022 21:06:10 +0000 Received: from BN8NAM11FT019.eop-nam11.prod.protection.outlook.com (2603:10b6:408:109:cafe::61) by BN9PR03CA0974.outlook.office365.com (2603:10b6:408:109::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4951.14 via Frontend Transport; Fri, 11 Feb 2022 21:06:10 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 165.204.84.17) smtp.mailfrom=amd.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=amd.com; Received-SPF: Pass (protection.outlook.com: domain of amd.com designates 165.204.84.17 as permitted sender) receiver=protection.outlook.com; client-ip=165.204.84.17; helo=SATLEXMB04.amd.com; 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.4975.11 via Frontend Transport; Fri, 11 Feb 2022 21:06:10 +0000 Received: from localhost.localdomain (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.18; Fri, 11 Feb 2022 15:06:08 -0600 From: Mario Limonciello To: Borislav Petkov , "maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)" CC: Kees Cook , Thomas Lendacky , , Martin Fernandez , , "Brijesh Singh" , Mario Limonciello Subject: [PATCH v2 4/4] x86/cpu: clear SEV/SEV_ES features when not in use Date: Fri, 11 Feb 2022 15:02:55 -0600 Message-ID: <20220211210255.9820-5-mario.limonciello@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220211210255.9820-1-mario.limonciello@amd.com> References: <20220211210255.9820-1-mario.limonciello@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.180.168.240] X-ClientProxiedBy: SATLEXMB03.amd.com (10.181.40.144) To SATLEXMB04.amd.com (10.181.40.145) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d3d74a9c-a6ae-421d-2ab1-08d9eda25430 X-MS-TrafficTypeDiagnostic: MN0PR12MB6001:EE_ X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mhxN4LFX/jYTTIxuE0Bk9XqhYW1Qta4D4dLRtO2op4PqaizLzpnVlxaIfWah3dtb9mi+kPEH4RACI4Up96ksK1bhU6VqaDcWoC7sJ3/qv6mWS8LaDnc/9QBuLrD8COmr2Phy/Kd2VsT+fSB3mRFM61+vtJyM6pQbZmKIakQOPvKIBuNWnGWqami9UP1mX7W7yUKpgmn4qg18bChmvkuzQogFs2QyN79L2jJvKdvSgPIJtAmhDXgGl7AUUAFIsrCz8FoVjwVb31MQzJfolDNkNtWSbQc/Gk+OXO+foafBwfAtFvjOCLJdmicGVAW9xIBQ17DWmq7nJlGjraBhaJC8D+RP7vyedhOcezZGdSIqc5hV94y+gj7KzC0ojSYaXKhWxfHP4n5OgGc0jGHY/cyfZwn61rfx9OsKjBAsfD7t7ehSm3nga1Itn6luOmyo6GA0UwrWUzUes/jLbLXdxnOreqH8PgzmoiLou03veKqOvrmIFMLh9AjTH4f4Yje9TXW44l0i3zN9BE4U+wSoSOemQ77JfiHNaSzL9nBIReogiFT97OO884zmp90POCnQv8fdyW3UWH5ioDjkGu5hSBhnbkPIUvyAnD8IQx1Gdr2MqduPLQRuGIAfwkXyWe3Jt9RzyU/94yNAkXdiy/CTnQrii3qfGzsiW+1/O4FgQUUy69h2PH2ouAeNZx5kbBqKYvuW6NlvszNwm/z074bqTL9mgw== 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)(16526019)(426003)(44832011)(26005)(186003)(36860700001)(336012)(86362001)(40460700003)(2906002)(4744005)(47076005)(316002)(2616005)(356005)(54906003)(82310400004)(110136005)(81166007)(6666004)(8936002)(5660300002)(70206006)(4326008)(8676002)(83380400001)(70586007)(1076003)(36756003)(508600001)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Feb 2022 21:06:10.1625 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d3d74a9c-a6ae-421d-2ab1-08d9eda25430 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: MN0PR12MB6001 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" As there are no consumers for these feature flags in the kernel, don't export these flags to userspace unless the feature has been enabled by the guest. Signed-off-by: Mario Limonciello --- arch/x86/kernel/cpu/amd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 9cea774344cb..6623a4995df1 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -614,12 +614,19 @@ static void early_detect_mem_encrypt(struct cpuinfo_x= 86 *c) if (!(msr & MSR_K7_HWCR_SMMLOCK)) goto clear_sev; =20 + if (!(sev_status & MSR_AMD64_SEV_ENABLED)) + goto clear_sev; + + if (!(sev_status & MSR_AMD64_SEV_ES_ENABLED)) + goto clear_sev_es; + return; =20 clear_all: setup_clear_cpu_cap(X86_FEATURE_SME); clear_sev: setup_clear_cpu_cap(X86_FEATURE_SEV); +clear_sev_es: setup_clear_cpu_cap(X86_FEATURE_SEV_ES); } } --=20 2.34.1