From patchwork Tue Feb 21 11:34:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 59877 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1812258wrn; Tue, 21 Feb 2023 03:36:11 -0800 (PST) X-Google-Smtp-Source: AK7set+phg+n2gq0Apg/vnl1p+XFbXa8Zz11094A8S8B2GzfAoJeEZZr/4a7jrZqO81tS6k1wlEB X-Received: by 2002:a17:907:c788:b0:88b:f26d:7b25 with SMTP id tz8-20020a170907c78800b0088bf26d7b25mr15925434ejc.28.1676979370849; Tue, 21 Feb 2023 03:36:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676979370; cv=none; d=google.com; s=arc-20160816; b=XciqkWi9TF8kclWsDnbmzCUr5r/S6hxrZqAhGY79HU+IALYSc8rk25pAGG+7ygSa4F NQfyZp1tuaeNOpCLyf7z2I1xnRQ/CYtVtT2v44U/sOOklFSOL8RsrFGwoEDUM4nXJ9pq Zy55xAu8KEpTCddQoak4+a7Oi8XPrvIXL/VYtQSzHwq6go8104DRdAdaqi2Sbb31AD45 kXQ4msJLpWRlHo67CPCXtbypaoMwENm8VH1e6i379PxZ73951yzXSctZ7LLKBuRDdPVx bE9VWpKK6KfhjoNF2VI51srewJbNqKNP7t0qpmDO4NVWL6H0o4BQR8adkgBdXRhUpwG0 OcfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=cwRPhPVa7VbVWxOqB+Oos/acf4MTp3gp6dUcgjiwjrA=; b=D+CC2D2Xne57fTnh6ysrs0lXLCRcN3F1Pum7pH7HGNez32TljSfD65WOeMkP4cpt2o M1gn5j2lXA8RpGFJ6maSUrcGaZwARy2PR1ANfgvsHylW7zqkOTaRPUoAiIq+bNPcW9Bt xDj4xoUdl6LLXUJ8Id3PMdfjDiAWIGyaM4Sok/MOvAw8fQMHlxCW4xt8gDyYziQ4DAMo khNPZ1t0IJ+6ZHjzlcUM0dhQRryY1ODX0szwP7O3d1uFAlMRnaM4aFlikGlE+ITBPC65 OBs+iL7WZ3jZQQ4P//QYQcioMD2NqkZmr10jC0DV8VFBbxBM35bja43Nr+2XmxeBIknr TEuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b="beu/SnEp"; 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=NONE sp=NONE dis=NONE) header.from=alien8.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q4-20020aa7da84000000b004accfd0cdb2si629006eds.189.2023.02.21.03.35.46; Tue, 21 Feb 2023 03:36:10 -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=@alien8.de header.s=dkim header.b="beu/SnEp"; 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=NONE sp=NONE dis=NONE) header.from=alien8.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234215AbjBULe4 (ORCPT + 99 others); Tue, 21 Feb 2023 06:34:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233751AbjBULel (ORCPT ); Tue, 21 Feb 2023 06:34:41 -0500 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0010123858 for ; Tue, 21 Feb 2023 03:34:39 -0800 (PST) Received: from zn.tnic (p5de8e9fe.dip0.t-ipconnect.de [93.232.233.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.skyhub.de (SuperMail on ZX Spectrum 128k) with ESMTPSA id 64B5F1EC0666; Tue, 21 Feb 2023 12:34:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1676979278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cwRPhPVa7VbVWxOqB+Oos/acf4MTp3gp6dUcgjiwjrA=; b=beu/SnEpU6k01R9hmAUwPqllKFAUqkW0jJEU87dx7kdHVXy5avM1YPz+3XpcsqPnxeANif Dl6+r9bAuxzk5CT4P1jlE4fqMMb8ewBai1pI4bvAcdGfwFJ8yk6p8Ekc8sPpalw33WLysY lUGkjCzK9EKp7bu6FQ0Z9kkypY2bggQ= From: Borislav Petkov To: LKML Cc: Dionna Glaze , Joerg Roedel , Michael Roth , Nikunj A Dadhania , Peter Gonda , Tom Lendacky , linux-coco@lists.linux.dev, x86@kernel.org Subject: [PATCH -v2 05/11] virt/coco/sev-guest: Carve out the request issuing logic into a helper Date: Tue, 21 Feb 2023 12:34:22 +0100 Message-Id: <20230221113428.19324-6-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230221113428.19324-1-bp@alien8.de> References: <20230221113428.19324-1-bp@alien8.de> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,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?1758440320403270497?= X-GMAIL-MSGID: =?utf-8?q?1758440320403270497?= From: "Borislav Petkov (AMD)" This makes the code flow a lot easier to follow. No functional changes. Signed-off-by: Borislav Petkov (AMD) --- drivers/virt/coco/sev-guest/sev-guest.c | 41 +++++++++++++++---------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c index c0ecc5885573..e72289de2b28 100644 --- a/drivers/virt/coco/sev-guest/sev-guest.c +++ b/drivers/virt/coco/sev-guest/sev-guest.c @@ -318,27 +318,12 @@ static int enc_payload(struct snp_guest_dev *snp_dev, u64 seqno, int version, u8 return __enc_payload(snp_dev, req, payload, sz); } -static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, int msg_ver, - u8 type, void *req_buf, size_t req_sz, void *resp_buf, - u32 resp_sz, __u64 *fw_err) +static int __handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, __u64 *fw_err) { unsigned long err, override_err = 0; unsigned int override_npages = 0; - u64 seqno; int rc; - /* Get message sequence and verify that its a non-zero */ - seqno = snp_get_msg_seqno(snp_dev); - if (!seqno) - return -EIO; - - memset(snp_dev->response, 0, sizeof(struct snp_guest_msg)); - - /* Encrypt the userspace provided payload */ - rc = enc_payload(snp_dev, seqno, msg_ver, type, req_buf, req_sz); - if (rc) - return rc; - retry_request: /* * Call firmware to process the request. In this function the encrypted @@ -347,7 +332,6 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in * prevent reuse of the IV. */ rc = snp_issue_guest_request(exit_code, &snp_dev->input, &err); - switch (rc) { case -ENOSPC: /* @@ -384,6 +368,29 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in if (override_npages) snp_dev->input.data_npages = override_npages; + return rc; +} + +static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, int msg_ver, + u8 type, void *req_buf, size_t req_sz, void *resp_buf, + u32 resp_sz, __u64 *fw_err) +{ + u64 seqno; + int rc; + + /* Get message sequence and verify that its a non-zero */ + seqno = snp_get_msg_seqno(snp_dev); + if (!seqno) + return -EIO; + + memset(snp_dev->response, 0, sizeof(struct snp_guest_msg)); + + /* Encrypt the userspace provided payload */ + rc = enc_payload(snp_dev, seqno, msg_ver, type, req_buf, req_sz); + if (rc) + return rc; + + rc = __handle_guest_request(snp_dev, exit_code, fw_err); if (rc) { dev_alert(snp_dev->dev, "Detected error from ASP request. rc: %d, fw_err: %llu\n",