From patchwork Tue Mar 7 19:24:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 65842 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2644655wrd; Tue, 7 Mar 2023 12:27:28 -0800 (PST) X-Google-Smtp-Source: AK7set+8SWtJd7V9JZTuh6m0ibn8AfciS+h7MooQWjhq7ZJc8jsQdgcTjFidYqJ84dZ3FCJVauP9 X-Received: by 2002:a17:902:bf06:b0:19c:ff15:5bd8 with SMTP id bi6-20020a170902bf0600b0019cff155bd8mr13056616plb.46.1678220848535; Tue, 07 Mar 2023 12:27:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678220848; cv=none; d=google.com; s=arc-20160816; b=losjpXUgtQrhkZ5CUkgJ/av9zQ4fRJAn6hFHt61oO7edxeaWBeHw3/g0u7TkmRabGj XpK9sTsCUqciCqdlaTUFC2kcsMyLgXPwE7QQ41Nq7mbeyrHPS8kOhAPGl8aBFGLr8AHM I5n94YBNv3I+Rd9nnFAd7pgcki47eDNRj8TbyZwYvqJFMz2Uk9VWGKtr9NA355jqB6LY jmdhz6Asl8P7if2+cM/y/hJArQXgkkGnGyhrJnsHtD5Lh0GDtdWWaw2IyiQRpc2Hpwi+ afUcRW1z/ay//TrCLfaF8ayiwWDKSb7mbw5nacE1fq5PM7lgbiSiJPyEvo1ZLogWpAMW nsOQ== 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=eQFtBqETFSp+hhhzZz7vM2Ig7VzCSNQThRpT4qgJ7Og=; b=R5uhIiu5VyyPIhWWnkW6HXJYwIJBSwsbm4Ca5DaJMQIlQCDMi4k/3WHSVRxuztfrKs TPSw7M66Le0d6HJhP7qS5V/mTd3yqozljjhY6kj/SQyiqw/7JH1scnH/i6Mt6hSNdDxR +t4wsba5EGKipBpeH9Fe9fzWIBkKyITaqNsljuq41x30CvGgMHrTp462PCJX2aLpoUNx czYmCmLlLNEkNJcrley5rf2RDa8td5APoUgq6gWhcxiaV7W6py+Tvr++tz4yHbuom0E/ RbQKC0wMaDkEajZHyFkvTbkgV82r/C2bE86HuwCAOGltiZTDOjjgo+BA1+WpRdHNrbCQ fobA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=gJEpBAyb; 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 kl5-20020a170903074500b0019b7766afdcsi11865314plb.554.2023.03.07.12.27.15; Tue, 07 Mar 2023 12:27:28 -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=gJEpBAyb; 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 S234279AbjCGTiY (ORCPT + 99 others); Tue, 7 Mar 2023 14:38:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51366 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233901AbjCGThj (ORCPT ); Tue, 7 Mar 2023 14:37:39 -0500 Received: from mail.skyhub.de (mail.skyhub.de [5.9.137.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 705AB9966C for ; Tue, 7 Mar 2023 11:25:00 -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 C4F461EC0691; Tue, 7 Mar 2023 20:24:58 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1678217098; 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=eQFtBqETFSp+hhhzZz7vM2Ig7VzCSNQThRpT4qgJ7Og=; b=gJEpBAybRJNlcPHBjH7/5s351qIY0T0sci7vxVZC7eGpnLFm2b2QFlEa/Dwe00bnnUX5xM OBld47fMfxq+iJiu0ryfKaPRfXvbMyn2lx8su5OurXghLaR8RqVRgZQ181lEqOkgjR+RD4 /rwYGZuzwOKJrOtqk70WXP2V76iSq5U= 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 -v3 05/11] virt/coco/sev-guest: Carve out the request issuing logic into a helper Date: Tue, 7 Mar 2023 20:24:43 +0100 Message-Id: <20230307192449.24732-6-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307192449.24732-1-bp@alien8.de> References: <20230307192449.24732-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, URIBL_BLOCKED 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?1759742104266997229?= X-GMAIL-MSGID: =?utf-8?q?1759742104266997229?= From: "Borislav Petkov (AMD)" This makes the code flow a lot easier to follow. No functional changes. [ Tom: touchups. ] Signed-off-by: Borislav Petkov (AMD) Signed-off-by: Tom Lendacky Signed-off-by: Borislav Petkov (AMD) --- drivers/virt/coco/sev-guest/sev-guest.c | 44 +++++++++++++++---------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c index a51bd4afd5ab..07dafe22b27a 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: /* @@ -401,7 +385,33 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in if (!rc && override_err == SNP_GUEST_REQ_INVALID_LEN) return -EIO; + 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) { + if (rc == -EIO && *fw_err == SNP_GUEST_REQ_INVALID_LEN) + return rc; + dev_alert(snp_dev->dev, "Detected error from ASP request. rc: %d, fw_err: %llu\n", rc, *fw_err);