This is a note to let you know that I've just added the patch titled
virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request()
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
virt-coco-sev-guest-remove-the-disable_vmpck-label-in-handle_guest_request.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From c5a338274bdb894f088767bea856be344d0ccaef Mon Sep 17 00:00:00 2001
From: "Borislav Petkov (AMD)" <bp@xxxxxxxxx>
Date: Wed, 15 Feb 2023 11:43:43 +0100
Subject: virt/coco/sev-guest: Remove the disable_vmpck label in handle_guest_request()
From: Borislav Petkov (AMD) <bp@xxxxxxxxx>
commit c5a338274bdb894f088767bea856be344d0ccaef upstream.
Call the function directly instead.
No functional changes.
Signed-off-by: Borislav Petkov (AMD) <bp@xxxxxxxxx>
Reviewed-by: Tom Lendacky <thomas.lendacky@xxxxxxx>
Link: https://lore.kernel.org/r/20230307192449.24732-5-bp@xxxxxxxxx
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/virt/coco/sev-guest/sev-guest.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
--- a/drivers/virt/coco/sev-guest/sev-guest.c
+++ b/drivers/virt/coco/sev-guest/sev-guest.c
@@ -407,7 +407,8 @@ retry_request:
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);
@@ -415,14 +416,11 @@ retry_request:
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)
Patches currently in stable-queue which might be from bp@xxxxxxxxx are
queue-6.1/virt-coco-sev-guest-do-some-code-style-cleanups.patch
queue-6.1/virt-coco-sev-guest-add-throttling-awareness.patch
queue-6.1/virt-coco-sev-guest-simplify-extended-guest-request-handling.patch
queue-6.1/x86-mm-fix-use-of-uninitialized-buffer-in-sme_enable.patch
queue-6.1/ftrace-kcfi-define-ftrace_stub_graph-conditionally.patch
queue-6.1/x86-mce-make-sure-logged-mces-are-processed-after-sysfs-update.patch
queue-6.1/virt-coco-sev-guest-convert-the-sw_exit_info_2-checking-to-a-switch-case.patch
queue-6.1/virt-coco-sev-guest-remove-the-disable_vmpck-label-in-handle_guest_request.patch
queue-6.1/virt-coco-sev-guest-carve-out-the-request-issuing-logic-into-a-helper.patch
queue-6.1/virt-coco-sev-guest-check-sev_snp-attribute-at-probe-time.patch
