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 3/3] x86/tdx: Handle load_unaligned_zeropad() page-cross to a shared page
Date: Tue, 14 Jun 2022 15:01:35 +0300 [thread overview]
Message-ID: <20220614120135.14812-4-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20220614120135.14812-1-kirill.shutemov@linux.intel.com>
load_unaligned_zeropad() can lead to unwanted loads across page boundaries.
The unwanted loads are typically harmless. But, they might be made to
totally unrelated or even unmapped memory. load_unaligned_zeropad()
relies on exception fixup (#PF, #GP and now #VE) to recover from these
unwanted loads.
In TDX guests, the second page can be shared page and VMM may configure
it to trigger #VE.
Kernel assumes that #VE on a shared page is MMIO access and tries to
decode instruction to handle it. In case of load_unaligned_zeropad() it
may result in confusion as it is not MMIO access.
Fix it by detecting split page MMIO accesses and fail them.
load_unaligned_zeropad() will recover using exception fixups.
The issue was discovered by analysis. It was not triggered during the
testing.
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
arch/x86/coco/tdx/tdx.c | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/arch/x86/coco/tdx/tdx.c b/arch/x86/coco/tdx/tdx.c
index 7d6d484a6d28..3bcaf2170ede 100644
--- a/arch/x86/coco/tdx/tdx.c
+++ b/arch/x86/coco/tdx/tdx.c
@@ -333,8 +333,8 @@ static bool mmio_write(int size, unsigned long addr, unsigned long val)
static int handle_mmio(struct pt_regs *regs, struct ve_info *ve)
{
+ unsigned long *reg, val, vaddr;
char buffer[MAX_INSN_SIZE];
- unsigned long *reg, val;
struct insn insn = {};
enum mmio_type mmio;
int size, extend_size;
@@ -360,6 +360,19 @@ static int handle_mmio(struct pt_regs *regs, struct ve_info *ve)
return -EINVAL;
}
+ /*
+ * Reject EPT violation #VEs that split pages.
+ *
+ * MMIO accesses suppose to be naturally aligned and therefore never
+ * cross a page boundary. Seeing split page accesses indicates a bug
+ * or load_unaligned_zeropad() that steps into unmapped shared page.
+ *
+ * load_unaligned_zeropad() will recover using exception fixups.
+ */
+ vaddr = (unsigned long)insn_get_addr_ref(&insn, regs);
+ if (vaddr / PAGE_SIZE != (vaddr + size) / PAGE_SIZE)
+ return -EFAULT;
+
/* Handle writes first */
switch (mmio) {
case MMIO_WRITE:
--
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 ` [PATCHv4 1/3] x86/tdx: Fix early #VE handling Kirill A. Shutemov
2022-06-17 21:53 ` [tip: x86/urgent] " 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 ` Kirill A. Shutemov [this message]
2022-06-15 15:27 ` [PATCHv4 3/3] x86/tdx: Handle load_unaligned_zeropad() page-cross to a shared page 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-4-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