From: "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@intel.com, luto@kernel.org, peterz@infradead.org
Cc: ak@linux.intel.com, dan.j.williams@intel.com, david@redhat.com,
hpa@zytor.com, linux-kernel@vger.kernel.org,
sathyanarayanan.kuppuswamy@linux.intel.com, seanjc@google.com,
thomas.lendacky@amd.com, x86@kernel.org,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCHv4 1/3] x86/tdx: Fix early #VE handling
Date: Tue, 14 Jun 2022 15:01:33 +0300 [thread overview]
Message-ID: <20220614120135.14812-2-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20220614120135.14812-1-kirill.shutemov@linux.intel.com>
Move RIP in tdx_early_handle_ve() after handling the exception. Failure
to do that leads to infinite loop of exceptions.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Fixes: 32e72854fa5f ("x86/tdx: Port I/O: Add early boot support")
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
---
arch/x86/coco/tdx/tdx.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
index 03deb4d6920d..faae53f8d559 100644
--- a/arch/x86/coco/tdx/tdx.c
+++ b/arch/x86/coco/tdx/tdx.c
@@ -447,13 +447,17 @@ static bool handle_io(struct pt_regs *regs, u32 exit_qual)
__init bool tdx_early_handle_ve(struct pt_regs *regs)
{
struct ve_info ve;
+ bool ret;
tdx_get_ve_info(&ve);
if (ve.exit_reason != EXIT_REASON_IO_INSTRUCTION)
return false;
- return handle_io(regs, ve.exit_qual);
+ ret = handle_io(regs, ve.exit_qual);
+ if (ret)
+ regs->ip += ve.instr_len;
+ return ret;
}
void tdx_get_ve_info(struct ve_info *ve)
--
2.35.1
next prev parent reply other threads:[~2022-06-14 12:01 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-14 12:01 [PATCHv4 0/3] An updated version of the load_unaligned_zeropad() fix Kirill A. Shutemov
2022-06-14 12:01 ` Kirill A. Shutemov [this message]
2022-06-17 21:53 ` [tip: x86/urgent] x86/tdx: Fix early #VE handling tip-bot2 for Kirill A. Shutemov
2022-06-14 12:01 ` [PATCHv4 2/3] x86/tdx: Clarify RIP adjustments in #VE handler Kirill A. Shutemov
2022-06-17 21:53 ` [tip: x86/urgent] " tip-bot2 for Kirill A. Shutemov
2022-06-14 12:01 ` [PATCHv4 3/3] x86/tdx: Handle load_unaligned_zeropad() page-cross to a shared page Kirill A. Shutemov
2022-06-15 15:27 ` Dave Hansen
2022-06-15 17:10 ` Kirill A. Shutemov
2022-06-15 21:55 ` Dave Hansen
2022-06-15 22:43 ` Kirill A. Shutemov
2022-06-15 22:49 ` Dave Hansen
2022-06-15 23:16 ` Kirill A. Shutemov
2022-06-15 18:12 ` Dave Hansen
2022-06-15 22:32 ` Kirill A. Shutemov
2022-06-15 22:36 ` Dave Hansen
2022-06-15 23:16 ` Kirill A. Shutemov
2022-06-15 22:52 ` Kirill A. Shutemov
2022-06-15 23:34 ` Dave Hansen
2022-06-16 1:19 ` Kirill A. Shutemov
2022-06-16 6:35 ` David Laight
2022-06-17 21:53 ` [tip: x86/urgent] " tip-bot2 for Kirill A. Shutemov
2022-06-17 22:41 ` tip-bot2 for Kirill A. Shutemov
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=20220614120135.14812-2-kirill.shutemov@linux.intel.com \
--to=kirill.shutemov@linux.intel.com \
--cc=ak@linux.intel.com \
--cc=bp@alien8.de \
--cc=dan.j.williams@intel.com \
--cc=dave.hansen@intel.com \
--cc=david@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=seanjc@google.com \
--cc=tglx@linutronix.de \
--cc=thomas.lendacky@amd.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