mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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: sathyanarayanan.kuppuswamy@linux.intel.com, aarcange@redhat.com,
	ak@linux.intel.com, dan.j.williams@intel.com, david@redhat.com,
	hpa@zytor.com, jgross@suse.com, jmattson@google.com,
	joro@8bytes.org, jpoimboe@redhat.com, knsathya@kernel.org,
	pbonzini@redhat.com, sdeep@vmware.com, seanjc@google.com,
	tony.luck@intel.com, vkuznets@redhat.com, wanpengli@tencent.com,
	thomas.lendacky@amd.com, brijesh.singh@amd.com, x86@kernel.org,
	linux-kernel@vger.kernel.org,
	"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Subject: [PATCHv6 15/30] x86/boot: Port I/O: allow to hook up alternative helpers
Date: Wed, 16 Mar 2022 05:08:41 +0300	[thread overview]
Message-ID: <20220316020856.24435-16-kirill.shutemov@linux.intel.com> (raw)
In-Reply-To: <20220316020856.24435-1-kirill.shutemov@linux.intel.com>

Port I/O instructions trigger #VE in the TDX environment. In response to
the exception, kernel emulates these instructions using hypercalls.

But during early boot, on the decompression stage, it is cumbersome to
deal with #VE. It is cleaner to go to hypercalls directly, bypassing #VE
handling.

Add a way to hook up alternative port I/O helpers in the boot stub with
a new pio_ops structure.  For now, set the ops structure to just call
the normal I/O operation functions.

out*()/in*() macros redefined to use pio_ops callbacks. It eliminates
need in changing call sites. io_delay() changed to use port I/O helper
instead of inline assembly.

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 arch/x86/boot/boot.h            |  4 +--
 arch/x86/boot/compressed/misc.c |  4 +++
 arch/x86/boot/compressed/misc.h |  2 +-
 arch/x86/boot/io.h              | 50 +++++++++++++++++++++++++++++++++
 arch/x86/boot/main.c            |  4 +++
 arch/x86/realmode/rm/wakemain.c |  4 +++
 6 files changed, 65 insertions(+), 3 deletions(-)
 create mode 100644 arch/x86/boot/io.h

diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 22a474c5b3e8..b42b91606ca8 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -23,10 +23,10 @@
 #include <linux/edd.h>
 #include <asm/setup.h>
 #include <asm/asm.h>
-#include <asm/shared/io.h>
 #include "bitops.h"
 #include "ctype.h"
 #include "cpuflags.h"
+#include "io.h"
 
 /* Useful macros */
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
@@ -39,7 +39,7 @@ extern struct boot_params boot_params;
 static inline void io_delay(void)
 {
 	const u16 DELAY_PORT = 0x80;
-	asm volatile("outb %%al,%0" : : "dN" (DELAY_PORT));
+	outb(0, DELAY_PORT);
 }
 
 /* These functions are used to reference data in other segments. */
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 2b1169869b96..9fdef6af20a1 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -47,6 +47,8 @@ void *memmove(void *dest, const void *src, size_t n);
  */
 struct boot_params *boot_params;
 
+struct port_io_ops pio_ops;
+
 memptr free_mem_ptr;
 memptr free_mem_end_ptr;
 
@@ -370,6 +372,8 @@ asmlinkage __visible void *extract_kernel(void *rmode, memptr heap,
 	lines = boot_params->screen_info.orig_video_lines;
 	cols = boot_params->screen_info.orig_video_cols;
 
+	init_default_io_ops();
+
 	/*
 	 * Detect TDX guest environment.
 	 *
diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h
index 8a253e85f990..ea71cf3d64e1 100644
--- a/arch/x86/boot/compressed/misc.h
+++ b/arch/x86/boot/compressed/misc.h
@@ -26,7 +26,6 @@
 #include <asm/boot.h>
 #include <asm/bootparam.h>
 #include <asm/desc_defs.h>
-#include <asm/shared/io.h>
 
 #include "tdx.h"
 
@@ -35,6 +34,7 @@
 
 #define BOOT_BOOT_H
 #include "../ctype.h"
+#include "../io.h"
 
 #ifdef CONFIG_X86_64
 #define memptr long
diff --git a/arch/x86/boot/io.h b/arch/x86/boot/io.h
new file mode 100644
index 000000000000..5f0d99310f91
--- /dev/null
+++ b/arch/x86/boot/io.h
@@ -0,0 +1,50 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef BOOT_IO_H
+#define BOOT_IO_H
+
+#include <asm/shared/io.h>
+
+#undef inb
+#undef inw
+#undef inl
+#undef outb
+#undef outw
+#undef outl
+
+struct port_io_ops {
+	u8 (*inb)(u16 port);
+	u16 (*inw)(u16 port);
+	u32 (*inl)(u16 port);
+	void (*outb)(u8 v, u16 port);
+	void (*outw)(u16 v, u16 port);
+	void (*outl)(u32 v, u16 port);
+};
+
+extern struct port_io_ops pio_ops;
+
+/*
+ * Use the normal I/O instructions by default.
+ * TDX guests override these to use hypercalls.
+ */
+static inline void init_default_io_ops(void)
+{
+	pio_ops.inb = __inb;
+	pio_ops.inw = __inw;
+	pio_ops.inl = __inl;
+	pio_ops.outb = __outb;
+	pio_ops.outw = __outw;
+	pio_ops.outl = __outl;
+}
+
+/*
+ * Redirect port I/O operations via pio_ops callbacks.
+ * TDX guests override these callbacks with TDX-specific helpers.
+ */
+#define inb pio_ops.inb
+#define inw pio_ops.inw
+#define inl pio_ops.inl
+#define outb pio_ops.outb
+#define outw pio_ops.outw
+#define outl pio_ops.outl
+
+#endif
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index e3add857c2c9..1202d4f8a390 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -17,6 +17,8 @@
 
 struct boot_params boot_params __attribute__((aligned(16)));
 
+struct port_io_ops pio_ops;
+
 char *HEAP = _end;
 char *heap_end = _end;		/* Default end of heap = no heap */
 
@@ -133,6 +135,8 @@ static void init_heap(void)
 
 void main(void)
 {
+	init_default_io_ops();
+
 	/* First, copy the boot header into the "zeropage" */
 	copy_boot_params();
 
diff --git a/arch/x86/realmode/rm/wakemain.c b/arch/x86/realmode/rm/wakemain.c
index 1d6437e6d2ba..a6f4d8388ad8 100644
--- a/arch/x86/realmode/rm/wakemain.c
+++ b/arch/x86/realmode/rm/wakemain.c
@@ -62,8 +62,12 @@ static void send_morse(const char *pattern)
 	}
 }
 
+struct port_io_ops pio_ops;
+
 void main(void)
 {
+	init_default_io_ops();
+
 	/* Kill machine if structures are wrong */
 	if (wakeup_header.real_magic != 0x12345678)
 		while (1)
-- 
2.34.1


  parent reply	other threads:[~2022-03-16  2:11 UTC|newest]

Thread overview: 89+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-16  2:08 [PATCHv6 00/30] TDX Guest: TDX core support Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 01/30] x86/tdx: Detect running as a TDX guest in early boot Kirill A. Shutemov
2022-03-16 23:10   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 02/30] x86/tdx: Provide common base for SEAMCALL and TDCALL C wrappers Kirill A. Shutemov
2022-03-16 23:33   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 03/30] x86/tdx: Add __tdx_module_call() and __tdx_hypercall() helper functions Kirill A. Shutemov
2022-03-16 23:43   ` Thomas Gleixner
2022-03-17 16:03   ` Borislav Petkov
2022-03-16  2:08 ` [PATCHv6 04/30] x86/tdx: Extend the confidential computing API to support TDX guests Kirill A. Shutemov
2022-03-17  0:01   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 05/30] x86/tdx: Exclude shared bit from __PHYSICAL_MASK Kirill A. Shutemov
2022-03-17  0:16   ` Thomas Gleixner
2022-03-17 13:58     ` Kirill A. Shutemov
2022-03-17 14:39       ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 06/30] x86/traps: Refactor exc_general_protection() Kirill A. Shutemov
2022-03-17  0:21   ` Thomas Gleixner
2022-03-17 14:05     ` Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 07/30] x86/traps: Add #VE support for TDX guest Kirill A. Shutemov
2022-03-17  0:48   ` Thomas Gleixner
2022-03-17 17:33     ` Kirill A. Shutemov
2022-03-17 18:18       ` Thomas Gleixner
2022-03-17 20:21       ` Peter Zijlstra
2022-03-17 20:32         ` Dave Hansen
2022-03-18 10:55           ` Peter Zijlstra
2022-03-18 13:03             ` Kirill A. Shutemov
2022-03-18 14:19         ` Thomas Gleixner
2022-03-18 15:34           ` Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 08/30] x86/tdx: Add HLT support for TDX guests Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 09/30] x86/tdx: Add MSR " Kirill A. Shutemov
2022-03-17 11:30   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 10/30] x86/tdx: Handle CPUID via #VE Kirill A. Shutemov
2022-03-17 11:32   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 11/30] x86/tdx: Handle in-kernel MMIO Kirill A. Shutemov
2022-03-16 21:53   ` Dave Hansen
2022-03-17 11:48     ` Thomas Gleixner
2022-03-17 11:35   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 12/30] x86/tdx: Detect TDX at early kernel decompression time Kirill A. Shutemov
2022-03-17 11:55   ` Thomas Gleixner
2022-03-17 18:04     ` Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 13/30] x86: Adjust types used in port I/O helpers Kirill A. Shutemov
2022-03-17 11:56   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 14/30] x86: Consolidate " Kirill A. Shutemov
2022-03-16  2:08 ` Kirill A. Shutemov [this message]
2022-03-16 22:02   ` [PATCHv6 15/30] x86/boot: Port I/O: allow to hook up alternative helpers Dave Hansen
2022-03-17 12:12   ` Thomas Gleixner
2022-03-17 20:10     ` Kirill A. Shutemov
2022-03-17 20:20       ` Dave Hansen
2022-03-17 20:23         ` Dave Hansen
2022-03-17 22:48           ` Kirill A. Shutemov
2022-03-18 14:20       ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 16/30] x86/boot: Port I/O: add decompression-time support for TDX Kirill A. Shutemov
2022-03-17 12:15   ` Thomas Gleixner
2022-03-17 20:15     ` Kirill A. Shutemov
2022-03-18 14:28       ` Thomas Gleixner
2022-03-18 15:36         ` Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 17/30] x86/tdx: Port I/O: add runtime hypercalls Kirill A. Shutemov
2022-03-17 12:25   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 18/30] x86/tdx: Port I/O: add early boot support Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 19/30] x86/tdx: Wire up KVM hypercalls Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 20/30] x86/boot: Add a trampoline for booting APs via firmware handoff Kirill A. Shutemov
2022-03-17 12:32   ` Thomas Gleixner
2022-03-17 12:44   ` Boris Petkov
2022-03-17 20:21     ` Kirill A. Shutemov
2022-03-18  9:55       ` Borislav Petkov
2022-03-16  2:08 ` [PATCHv6 21/30] x86/acpi, x86/boot: Add multiprocessor wake-up support Kirill A. Shutemov
2022-03-16 23:47   ` Dave Hansen
2022-03-17 12:44   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 22/30] x86/boot: Set CR0.NE early and keep it set during the boot Kirill A. Shutemov
2022-03-17 12:46   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 23/30] x86/boot: Avoid #VE during boot for TDX platforms Kirill A. Shutemov
2022-03-17 12:48   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 24/30] x86/topology: Disable CPU online/offline control for TDX guests Kirill A. Shutemov
2022-03-17 12:50   ` Thomas Gleixner
2022-03-17 20:47     ` Kirill A. Shutemov
2022-03-16  2:08 ` [PATCHv6 25/30] x86/tdx: Make pages shared in ioremap() Kirill A. Shutemov
2022-03-16 22:06   ` Dave Hansen
2022-03-17 14:33   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 26/30] x86/mm/cpa: Add support for TDX shared memory Kirill A. Shutemov
2022-03-17 14:56   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 27/30] x86/kvm: Make SWIOTLB buffer shared for TD guest Kirill A. Shutemov
2022-03-16 22:24   ` Dave Hansen
2022-03-16  2:08 ` [PATCHv6 28/30] x86/tdx: ioapic: Add shared bit for IOAPIC base address Kirill A. Shutemov
2022-03-17 15:00   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 29/30] ACPICA: Avoid cache flush inside virtual machines Kirill A. Shutemov
2022-03-16 22:13   ` Dave Hansen
2022-03-17 15:32     ` Dan Williams
2022-03-17 23:04     ` Kirill A. Shutemov
2022-03-17 15:23   ` Thomas Gleixner
2022-03-16  2:08 ` [PATCHv6 30/30] Documentation/x86: Document TDX kernel architecture 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=20220316020856.24435-16-kirill.shutemov@linux.intel.com \
    --to=kirill.shutemov@linux.intel.com \
    --cc=aarcange@redhat.com \
    --cc=ak@linux.intel.com \
    --cc=bp@alien8.de \
    --cc=brijesh.singh@amd.com \
    --cc=dan.j.williams@intel.com \
    --cc=dave.hansen@intel.com \
    --cc=david@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jgross@suse.com \
    --cc=jmattson@google.com \
    --cc=joro@8bytes.org \
    --cc=jpoimboe@redhat.com \
    --cc=knsathya@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=luto@kernel.org \
    --cc=mingo@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=peterz@infradead.org \
    --cc=sathyanarayanan.kuppuswamy@linux.intel.com \
    --cc=sdeep@vmware.com \
    --cc=seanjc@google.com \
    --cc=tglx@linutronix.de \
    --cc=thomas.lendacky@amd.com \
    --cc=tony.luck@intel.com \
    --cc=vkuznets@redhat.com \
    --cc=wanpengli@tencent.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

all inboxes | Powered by JetHome®