From patchwork Thu Feb 16 12:41:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Borislav Petkov X-Patchwork-Id: 58034 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp278581wrn; Thu, 16 Feb 2023 04:46:02 -0800 (PST) X-Google-Smtp-Source: AK7set/DgBK7S1vSAXyb3br8wUjirV9MXVs/j59fqz2Wji2+eeDA5UDS5crGQpbehD5k9ddD8G5e X-Received: by 2002:a05:6a21:9996:b0:bf:a5d1:1c6c with SMTP id ve22-20020a056a21999600b000bfa5d11c6cmr6953291pzb.56.1676551561979; Thu, 16 Feb 2023 04:46:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676551561; cv=none; d=google.com; s=arc-20160816; b=j30p0ey7RUK7yOu/Q18ibuuPt17A5qgaeQrzeOxEAHB0YPOsX9G5wjB2ITjYmd0Gdh DH21I8Y+h5xrq0xPDaQTUtoX2qSU7aWyfFQ/l1wmw4yUVF1xPPbAf82UAbIFAo9w7JU6 NnBFr1gjcBLlDgAhgKwfOy4LXuYUtKpfFok+u3UP6mJRpS9z3ZIm9tlH/h52BJUbhvPu zyyxKlWHbyeeeHTM1PmDPSY3iYZcywPLVNtta93Vnw52YCOivMoeAP/t1995m2PVWX/L YfU4kQV40DO8o+M9o6iNcUpXsgU1f75kxA3keSWVFvrLKoSiILNQVQKcsfUE4jHhvVH4 qoGw== 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=eIkWBKh6Z05aqDGlQ8Y8GwgfONwWX5gnceKmSrlvC+msJvN51ufxturubB/vShJvRX fb+ZnW3GoHn8M/Z8Wqu7TMnvdv9xJQBgnLS+mQzzPhVC8rFcSkJE3oFgSrS0CdNBtsbm Hya/g7aSEA2xA3Kqc6QmHT04isOI08mSrRoM738nrXMeEz7GKVu6B+C1LUD49X4Rsj87 5D+w86IiIVydNWuauZii8Z8jnbS30aKg5KblGSSPQXr6Ymv6rwrlYt6QHDkFqNNQNGUY LLdUVZHiWjQ3L/Hkv9imNTAz/Bp9rbzIjANzflrfB2DI9WJY92vHAHgC0khQ75djgEMK GyVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@alien8.de header.s=dkim header.b=SFrilYmy; 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 z11-20020a6552cb000000b004e63b6b399esi1380897pgp.570.2023.02.16.04.45.47; Thu, 16 Feb 2023 04:46:01 -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=SFrilYmy; 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 S229928AbjBPMlp (ORCPT + 99 others); Thu, 16 Feb 2023 07:41:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51116 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229918AbjBPMlg (ORCPT ); Thu, 16 Feb 2023 07:41:36 -0500 Received: from mail.skyhub.de (mail.skyhub.de [IPv6:2a01:4f8:190:11c2::b:1457]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2D43986AF for ; Thu, 16 Feb 2023 04:41:35 -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 C1F4A1EC0947; Thu, 16 Feb 2023 13:41:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alien8.de; s=dkim; t=1676551293; 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=SFrilYmyeGG0wWrmWf25Jgw2SDvEd8gzeP1UPSHZyFlv3FF99ToHgozNFDcU9l3SrDz00k vdwPjOAszIOg9tM8kOMicIjxXT9IkBgbf0S6UG6LG3vwytXUqpleG9v44J0vfIJP+leiX4 7yhq3Ju+RMzzuIGSYSMji02XLzEnazE= 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 05/11] virt/coco/sev-guest: Carve out the request issuing logic into a helper Date: Thu, 16 Feb 2023 13:41:14 +0100 Message-Id: <20230216124120.26578-6-bp@alien8.de> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230216124120.26578-1-bp@alien8.de> References: <20230216124120.26578-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?1757991730448510829?= X-GMAIL-MSGID: =?utf-8?q?1757991730448510829?= 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",