From: Borislav Petkov <bp@alien8.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Dionna Glaze <dionnaglaze@google.com>,
Joerg Roedel <jroedel@suse.de>,
Michael Roth <michael.roth@amd.com>,
Nikunj A Dadhania <nikunj@amd.com>,
Peter Gonda <pgonda@google.com>,
Tom Lendacky <Thomas.Lendacky@amd.com>,
linux-coco@lists.linux.dev, x86@kernel.org
Subject: [PATCH -v3 04/11] virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request()
Date: Tue, 7 Mar 2023 20:24:42 +0100 [thread overview]
Message-ID: <20230307192449.24732-5-bp@alien8.de> (raw)
In-Reply-To: <20230307192449.24732-1-bp@alien8.de>
From: "Borislav Petkov (AMD)" <bp@alien8.de>
Call the function directly instead.
No functional changes.
Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
---
drivers/virt/coco/sev-guest/sev-guest.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/drivers/virt/coco/sev-guest/sev-guest.c b/drivers/virt/coco/sev-guest/sev-guest.c
index e61db0b15b7a..a51bd4afd5ab 100644
--- a/drivers/virt/coco/sev-guest/sev-guest.c
+++ b/drivers/virt/coco/sev-guest/sev-guest.c
@@ -405,7 +405,8 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in
dev_alert(snp_dev->dev,
"Detected error from ASP request. rc: %d, fw_err: %llu\n",
rc, *fw_err);
- goto disable_vmpck;
+ snp_disable_vmpck(snp_dev);
+ return rc;
}
rc = verify_and_dec_payload(snp_dev, resp_buf, resp_sz);
@@ -413,14 +414,11 @@ static int handle_guest_request(struct snp_guest_dev *snp_dev, u64 exit_code, in
dev_alert(snp_dev->dev,
"Detected unexpected decode failure from ASP. rc: %d\n",
rc);
- goto disable_vmpck;
+ snp_disable_vmpck(snp_dev);
+ return rc;
}
return 0;
-
-disable_vmpck:
- snp_disable_vmpck(snp_dev);
- return rc;
}
static int get_report(struct snp_guest_dev *snp_dev, struct snp_guest_request_ioctl *arg)
--
2.35.1
next prev parent reply other threads:[~2023-03-07 19:24 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 19:24 [PATCH -v3 00/11] SEV: Cleanup sev-guest a bit and add throttling Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 01/11] crypto: ccp - Name -1 return value as SEV_RET_NO_FW_CALL Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 02/11] virt/coco/sev-guest: Check SEV_SNP attribute at probe time Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 03/11] virt/coco/sev-guest: Simplify extended guest request handling Borislav Petkov
2023-03-07 19:24 ` Borislav Petkov [this message]
2023-03-07 19:24 ` [PATCH -v3 05/11] virt/coco/sev-guest: Carve out the request issuing logic into a helper Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 06/11] virt/coco/sev-guest: Do some code style cleanups Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 07/11] virt/coco/sev-guest: Convert the sw_exit_info_2 checking to a switch-case Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 08/11] crypto: ccp: Get rid of __sev_platform_init_locked()'s local function pointer Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 09/11] virt/coco/sev-guest: Add throttling awareness Borislav Petkov
2023-03-07 20:27 ` Dionna Amalie Glaze
2023-03-07 19:24 ` [PATCH -v3 10/11] virt/coco/sev-guest: Double-buffer messages Borislav Petkov
2023-03-07 19:24 ` [PATCH -v3 11/11] x86/sev: Change snp_guest_issue_request()'s fw_err argument Borislav Petkov
2023-03-08 20:33 ` [PATCH -v3 00/11] SEV: Cleanup sev-guest a bit and add throttling Tom Lendacky
2023-03-09 12:12 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230307192449.24732-5-bp@alien8.de \
--to=bp@alien8.de \
--cc=Thomas.Lendacky@amd.com \
--cc=dionnaglaze@google.com \
--cc=jroedel@suse.de \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=michael.roth@amd.com \
--cc=nikunj@amd.com \
--cc=pgonda@google.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).