From nobody Wed Dec 17 10:58:54 2025 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 E1EBEC4167B for ; Tue, 28 Nov 2023 13:01:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345062AbjK1NBa (ORCPT ); Tue, 28 Nov 2023 08:01:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344999AbjK1NBR (ORCPT ); Tue, 28 Nov 2023 08:01:17 -0500 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 A038D1BC1; Tue, 28 Nov 2023 05:01:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ABZ22H6aZf6fEmZ6QXkOqQXQVGMVoiljVawVUgKVONG9qbRtjpfrwQ4hYIR/1VN8WJ+4EH40B5zdNWJ9npVb0GgWsOjH1Bx7CoUWDHQgP0hRAk9FUYaQJibm1z+Moq+csZKwI6ziF5prr0WZuCg/AYr2jcPj2rAwNkUO0SP9vKrVLPyR+ZMmFoPVh31+UGzU/7DrEcs9hSGiYD/L8c4Wy0lz27aX+Xce42nfcWrBGTw0m0MtIDYIvntsCXOYf/uSrvaivJF3v0l83cN3ICEoXdlLA3pU4i/G7vMcqUEVTG0Am9jhXKlCecFShx/L2lkgDZj9tAdfaGctiFkhPioSZQ== 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=XrnedH1rkkWFeauA8mfF4Q4jsW8KfvunZSBh3cWrooE=; b=l1p61xm+jMrdhD7s+70ifQ0hv9EFu5d0FZYHk/RWGLtoTCc8VnAwmKc/j4uJ6i2K9Rpw5qnRoBp63LL/zAtoUcY9cPWGri18mF9cPmXval1j3NFvNZ3V5YgmwmP/h0/GAIqHYdBHU0mKE1S5m4ewxkP2pbdTukHZNG4b1V6m+bOw+6k+URbIsL09p6dSeFlbxZSaEYVBiw02p8sHQRexofXyBU6auFgoyU58oN++FQ/tYGJJh/IbgJxG22mIeg+1Kw33/Exa4gR7D9bO2CO76H2UHy6IpDpYQKBpjcmxGLkvqYen5JI8Ch4OWhptT5wumFq21DSeFz1dELeZo8Oqeg== 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 (0) 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=XrnedH1rkkWFeauA8mfF4Q4jsW8KfvunZSBh3cWrooE=; b=GHSprKUWyY/1P2wVSyFsVqUeHb5e3zek2+MTG+FvKozCPiwR5ATKbo+qc9N5V/xWJKE1xCetWZltncBFFB2K45p4rLCsaWDCbfohVwPO/KlEI3nvGeA39eheQYgQj4mDROkmIPHip1aK/2dUx8HohxHo7rg1b1PaJTPLa08wJWc= Received: from DS7PR05CA0027.namprd05.prod.outlook.com (2603:10b6:5:3b9::32) by CH0PR12MB5385.namprd12.prod.outlook.com (2603:10b6:610:d4::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.29; Tue, 28 Nov 2023 13:01:15 +0000 Received: from CY4PEPF0000EE34.namprd05.prod.outlook.com (2603:10b6:5:3b9:cafe::9) by DS7PR05CA0027.outlook.office365.com (2603:10b6:5:3b9::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7025.18 via Frontend Transport; Tue, 28 Nov 2023 13:01: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 CY4PEPF0000EE34.mail.protection.outlook.com (10.167.242.40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.7046.17 via Frontend Transport; Tue, 28 Nov 2023 13:01:14 +0000 Received: from gomati.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.2507.34; Tue, 28 Nov 2023 07:01:10 -0600 From: Nikunj A Dadhania To: , , , CC: , , , , , , , , Subject: [PATCH v6 05/16] virt: sev-guest: Add vmpck_id to snp_guest_dev struct Date: Tue, 28 Nov 2023 18:29:48 +0530 Message-ID: <20231128125959.1810039-6-nikunj@amd.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231128125959.1810039-1-nikunj@amd.com> References: <20231128125959.1810039-1-nikunj@amd.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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: CY4PEPF0000EE34:EE_|CH0PR12MB5385:EE_ X-MS-Office365-Filtering-Correlation-Id: f09ec37d-8033-421c-bf59-08dbf0121aae X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8aOX+1b1E+G2dNztQnLaYgqOuuHQ44RB4eoEYATbiR7/4u6BkwhWe7wGlj5VFTvZ6H4i1QHh0A9Wd0iNpb7tcAP2e+bt8YpuE4kqr4oY3293bRN0EraPXxXvGsNqz47SM0BZt9QCOlJhBtYh7rXwoQNqACxcD0B653J3wkNV2kABdV/PGsK9XtIwJevc2purgsV9GdNHxCCiOQIFiVd0t7UDQVNCHJ0E+DzyuMKGWktBiUKFiYorT2qWTmxWvWaWns1D4wl1sDRpNsvOBqPCAOyrmuySK5Gz7XK2mE8W/78LTpW8ZLbLSknoiNtttwsTmKT/9LCCmYBJQYce0W+3JESyVG8PUU2gNH3T8qQNO27gmK+CE69z1HkTzZ2QChQNRtsVYhJtyo8khVfoA9VSOBhaQZqH+nt7zm6f81MKNDbcdwSwUO9s5CXQwPZsGHhhQiwNIc1Mf7VF4IbyYrzUFe/aR79248TvuuDHgPBflP9vZGk0BufFz2R0hkvk2CGAZ9sTO2EB0n11hgcEB9iQ5U7CR3X3ibYqoAANlnUETm3MzMnAKfVbFU9N5ZRX/CtlSI5WWYpD6SFAzpLgw+INgJax+kylXEbk4+5Qll3c/LswbQWXiXaVBGb80ku4FroHylaLlrOatRr86a2nYrAbFUmqx69CKCu2khJtXVY4qCOFVFarKktkwL7mj9x5EnM0VafnI8XH3j2tWhB+IQoMXnMe0U78y4klCEuWV8/VMpmmGRU0KOBHXX1+QvmcMH4mj2KPd9B+Rxin1YQSFKU3nA== 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:(13230031)(4636009)(39860400002)(136003)(376002)(396003)(346002)(230922051799003)(82310400011)(1800799012)(451199024)(186009)(64100799003)(40470700004)(46966006)(36840700001)(83380400001)(81166007)(356005)(47076005)(336012)(8936002)(82740400003)(426003)(7696005)(8676002)(6666004)(110136005)(316002)(70206006)(70586007)(54906003)(36860700001)(4326008)(7416002)(478600001)(5660300002)(40480700001)(2906002)(41300700001)(36756003)(16526019)(1076003)(26005)(2616005)(40460700003)(36900700001);DIR:OUT;SFP:1101; X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2023 13:01:14.9700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f09ec37d-8033-421c-bf59-08dbf0121aae 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: CY4PEPF0000EE34.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5385 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Drop vmpck and os_area_msg_seqno pointers so that secret page layout does not need to be exposed to the sev-guest driver after the rework. Instead, add helper APIs to access vmpck and os_area_msg_seqno when needed. Also, change function is_vmpck_empty() to snp_is_vmpck_empty() in preparation for moving to sev.c. Signed-off-by: Nikunj A Dadhania Reviewed-by: Tom Lendacky --- drivers/virt/coco/sev-guest/sev-guest.c | 95 ++++++++++++------------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/se= v-guest/sev-guest.c index 1579140d43ec..0f2134deca51 100644 --- a/drivers/virt/coco/sev-guest/sev-guest.c +++ b/drivers/virt/coco/sev-guest/sev-guest.c @@ -59,22 +59,29 @@ struct snp_guest_dev { struct snp_derived_key_req derived_key; struct snp_ext_report_req ext_report; } req; - u32 *os_area_msg_seqno; - u8 *vmpck; + unsigned int vmpck_id; }; =20 static u32 vmpck_id; module_param(vmpck_id, uint, 0444); MODULE_PARM_DESC(vmpck_id, "The VMPCK ID to use when communicating with th= e PSP."); =20 -static bool is_vmpck_empty(struct snp_guest_dev *snp_dev) +static inline u8 *snp_get_vmpck(struct snp_guest_dev *snp_dev) { - char zero_key[VMPCK_KEY_LEN] =3D {0}; + return snp_dev->layout->vmpck0 + snp_dev->vmpck_id * VMPCK_KEY_LEN; +} =20 - if (snp_dev->vmpck) - return !memcmp(snp_dev->vmpck, zero_key, VMPCK_KEY_LEN); +static inline u32 *snp_get_os_area_msg_seqno(struct snp_guest_dev *snp_dev) +{ + return &snp_dev->layout->os_area.msg_seqno_0 + snp_dev->vmpck_id; +} =20 - return true; +static bool snp_is_vmpck_empty(struct snp_guest_dev *snp_dev) +{ + char zero_key[VMPCK_KEY_LEN] =3D {0}; + u8 *key =3D snp_get_vmpck(snp_dev); + + return !memcmp(key, zero_key, VMPCK_KEY_LEN); } =20 /* @@ -96,20 +103,22 @@ static bool is_vmpck_empty(struct snp_guest_dev *snp_d= ev) */ static void snp_disable_vmpck(struct snp_guest_dev *snp_dev) { - dev_alert(snp_dev->dev, "Disabling vmpck_id %d to prevent IV reuse.\n", - vmpck_id); - memzero_explicit(snp_dev->vmpck, VMPCK_KEY_LEN); - snp_dev->vmpck =3D NULL; + u8 *key =3D snp_get_vmpck(snp_dev); + + dev_alert(snp_dev->dev, "Disabling vmpck_id %u to prevent IV reuse.\n", + snp_dev->vmpck_id); + memzero_explicit(key, VMPCK_KEY_LEN); } =20 static inline u64 __snp_get_msg_seqno(struct snp_guest_dev *snp_dev) { + u32 *os_area_msg_seqno =3D snp_get_os_area_msg_seqno(snp_dev); u64 count; =20 lockdep_assert_held(&snp_dev->cmd_mutex); =20 /* Read the current message sequence counter from secrets pages */ - count =3D *snp_dev->os_area_msg_seqno; + count =3D *os_area_msg_seqno; =20 return count + 1; } @@ -137,11 +146,13 @@ static u64 snp_get_msg_seqno(struct snp_guest_dev *sn= p_dev) =20 static void snp_inc_msg_seqno(struct snp_guest_dev *snp_dev) { + u32 *os_area_msg_seqno =3D snp_get_os_area_msg_seqno(snp_dev); + /* * The counter is also incremented by the PSP, so increment it by 2 * and save in secrets page. */ - *snp_dev->os_area_msg_seqno +=3D 2; + *os_area_msg_seqno +=3D 2; } =20 static inline struct snp_guest_dev *to_snp_dev(struct file *file) @@ -151,15 +162,22 @@ static inline struct snp_guest_dev *to_snp_dev(struct= file *file) return container_of(dev, struct snp_guest_dev, misc); } =20 -static struct aesgcm_ctx *snp_init_crypto(u8 *key, size_t keylen) +static struct aesgcm_ctx *snp_init_crypto(struct snp_guest_dev *snp_dev) { struct aesgcm_ctx *ctx; + u8 *key; + + if (snp_is_vmpck_empty(snp_dev)) { + pr_err("VM communication key VMPCK%u is null\n", vmpck_id); + return NULL; + } =20 ctx =3D kzalloc(sizeof(*ctx), GFP_KERNEL_ACCOUNT); if (!ctx) return NULL; =20 - if (aesgcm_expandkey(ctx, key, keylen, AUTHTAG_LEN)) { + key =3D snp_get_vmpck(snp_dev); + if (aesgcm_expandkey(ctx, key, VMPCK_KEY_LEN, AUTHTAG_LEN)) { pr_err("Crypto context initialization failed\n"); kfree(ctx); return NULL; @@ -589,7 +607,7 @@ static long snp_guest_ioctl(struct file *file, unsigned= int ioctl, unsigned long mutex_lock(&snp_dev->cmd_mutex); =20 /* Check if the VMPCK is not empty */ - if (is_vmpck_empty(snp_dev)) { + if (snp_is_vmpck_empty(snp_dev)) { dev_err_ratelimited(snp_dev->dev, "VMPCK is disabled\n"); mutex_unlock(&snp_dev->cmd_mutex); return -ENOTTY; @@ -666,32 +684,14 @@ static const struct file_operations snp_guest_fops = =3D { .unlocked_ioctl =3D snp_guest_ioctl, }; =20 -static u8 *get_vmpck(int id, struct snp_secrets_page_layout *layout, u32 *= *seqno) +bool snp_assign_vmpck(struct snp_guest_dev *dev, unsigned int vmpck_id) { - u8 *key =3D NULL; + if (WARN_ON(vmpck_id > 3)) + return false; =20 - switch (id) { - case 0: - *seqno =3D &layout->os_area.msg_seqno_0; - key =3D layout->vmpck0; - break; - case 1: - *seqno =3D &layout->os_area.msg_seqno_1; - key =3D layout->vmpck1; - break; - case 2: - *seqno =3D &layout->os_area.msg_seqno_2; - key =3D layout->vmpck2; - break; - case 3: - *seqno =3D &layout->os_area.msg_seqno_3; - key =3D layout->vmpck3; - break; - default: - break; - } + dev->vmpck_id =3D vmpck_id; =20 - return key; + return true; } =20 struct snp_msg_report_resp_hdr { @@ -727,7 +727,7 @@ static int sev_report_new(struct tsm_report *report, vo= id *data) guard(mutex)(&snp_dev->cmd_mutex); =20 /* Check if the VMPCK is not empty */ - if (is_vmpck_empty(snp_dev)) { + if (snp_is_vmpck_empty(snp_dev)) { dev_err_ratelimited(snp_dev->dev, "VMPCK is disabled\n"); return -ENOTTY; } @@ -847,22 +847,21 @@ static int __init sev_guest_probe(struct platform_dev= ice *pdev) goto e_unmap; =20 ret =3D -EINVAL; - snp_dev->vmpck =3D get_vmpck(vmpck_id, layout, &snp_dev->os_area_msg_seqn= o); - if (!snp_dev->vmpck) { - dev_err(dev, "invalid vmpck id %d\n", vmpck_id); + snp_dev->layout =3D layout; + if (!snp_assign_vmpck(snp_dev, vmpck_id)) { + dev_err(dev, "invalid vmpck id %u\n", vmpck_id); goto e_unmap; } =20 /* Verify that VMPCK is not zero. */ - if (is_vmpck_empty(snp_dev)) { - dev_err(dev, "vmpck id %d is null\n", vmpck_id); + if (snp_is_vmpck_empty(snp_dev)) { + dev_err(dev, "vmpck id %u is null\n", vmpck_id); goto e_unmap; } =20 mutex_init(&snp_dev->cmd_mutex); platform_set_drvdata(pdev, snp_dev); snp_dev->dev =3D dev; - snp_dev->layout =3D layout; =20 /* Allocate the shared page used for the request and response message. */ snp_dev->request =3D alloc_shared_pages(dev, sizeof(struct snp_guest_msg)= ); @@ -878,7 +877,7 @@ static int __init sev_guest_probe(struct platform_devic= e *pdev) goto e_free_response; =20 ret =3D -EIO; - snp_dev->ctx =3D snp_init_crypto(snp_dev->vmpck, VMPCK_KEY_LEN); + snp_dev->ctx =3D snp_init_crypto(snp_dev); if (!snp_dev->ctx) goto e_free_cert_data; =20 @@ -903,7 +902,7 @@ static int __init sev_guest_probe(struct platform_devic= e *pdev) if (ret) goto e_free_ctx; =20 - dev_info(dev, "Initialized SEV guest driver (using vmpck_id %d)\n", vmpck= _id); + dev_info(dev, "Initialized SEV guest driver (using vmpck_id %u)\n", vmpck= _id); return 0; =20 e_free_ctx: --=20 2.34.1