From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>
Subject: [PATCH 4/5] x86: hypercall vector is unused when !PV32
Date: Wed, 25 Nov 2020 09:50:51 +0100 [thread overview]
Message-ID: <6505bcc4-0cb3-42de-9fd5-50da133d6d99@suse.com> (raw)
In-Reply-To: <46d83c92-0b06-fc09-4832-7a7d7935d5c2@suse.com>
This vector can be used as an ordinary interrupt handling one in this
case. To be sure no references are left, make the #define itself
conditional.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -436,8 +436,12 @@ int __init init_irq_data(void)
irq_to_desc(irq)->irq = irq;
#ifdef CONFIG_PV
- /* Never allocate the hypercall vector or Linux/BSD fast-trap vector. */
+ /* Never allocate the Linux/BSD fast-trap vector. */
set_bit(LEGACY_SYSCALL_VECTOR, used_vectors);
+#endif
+
+#ifdef CONFIG_PV32
+ /* Never allocate the hypercall vector. */
set_bit(HYPERCALL_VECTOR, used_vectors);
#endif
--- a/xen/arch/x86/pv/traps.c
+++ b/xen/arch/x86/pv/traps.c
@@ -30,6 +30,7 @@
#include <asm/traps.h>
#include <irq_vectors.h>
+#ifdef CONFIG_PV32
void do_entry_int82(struct cpu_user_regs *regs)
{
if ( unlikely(untrusted_msi) )
@@ -37,6 +38,7 @@ void do_entry_int82(struct cpu_user_regs
pv_hypercall(regs);
}
+#endif
void pv_inject_event(const struct x86_event *event)
{
@@ -155,9 +157,11 @@ static void nmi_softirq(void)
void __init pv_trap_init(void)
{
+#ifdef CONFIG_PV32
/* The 32-on-64 hypercall vector is only accessible from ring 1. */
_set_gate(idt_table + HYPERCALL_VECTOR,
SYS_DESC_trap_gate, 1, entry_int82);
+#endif
/* Fast trap for int80 (faster than taking the #GP-fixup path). */
_set_gate(idt_table + LEGACY_SYSCALL_VECTOR, SYS_DESC_trap_gate, 3,
--- a/xen/arch/x86/x86_64/compat/entry.S
+++ b/xen/arch/x86/x86_64/compat/entry.S
@@ -11,6 +11,8 @@
#include <public/xen.h>
#include <irq_vectors.h>
+#ifdef CONFIG_PV32
+
ENTRY(entry_int82)
ASM_CLAC
pushq $0
@@ -27,6 +29,8 @@ ENTRY(entry_int82)
mov %rsp, %rdi
call do_entry_int82
+#endif /* CONFIG_PV32 */
+
/* %rbx: struct vcpu */
ENTRY(compat_test_all_events)
ASSERT_NOT_IN_ATOMIC
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -982,8 +982,10 @@ autogen_stubs: /* Automatically generate
.rept X86_NR_VECTORS
/* Common interrupts, heading towards do_IRQ(). */
-#ifdef CONFIG_PV
+#if defined(CONFIG_PV32)
.if vec >= FIRST_IRQ_VECTOR && vec != HYPERCALL_VECTOR && vec != LEGACY_SYSCALL_VECTOR
+#elif defined(CONFIG_PV)
+ .if vec >= FIRST_IRQ_VECTOR && vec != LEGACY_SYSCALL_VECTOR
#else
.if vec >= FIRST_IRQ_VECTOR
#endif
--- a/xen/include/asm-x86/mach-default/irq_vectors.h
+++ b/xen/include/asm-x86/mach-default/irq_vectors.h
@@ -22,7 +22,10 @@
#define FIRST_LEGACY_VECTOR FIRST_DYNAMIC_VECTOR
#define LAST_LEGACY_VECTOR (FIRST_LEGACY_VECTOR + 0xf)
-#define HYPERCALL_VECTOR 0x82
+#ifdef CONFIG_PV32
+#define HYPERCALL_VECTOR 0x82
+#endif
+
#define LEGACY_SYSCALL_VECTOR 0x80
/*
next prev parent reply other threads:[~2020-11-25 8:51 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 8:42 [PATCH 0/5] x86: asm-offsets.h and !PV32 adjustments Jan Beulich
2020-11-25 8:45 ` [PATCH 1/5] x86/build: limit rebuilding of asm-offsets.h Jan Beulich
2020-12-28 12:00 ` Roger Pau Monné
2021-01-04 13:46 ` Jan Beulich
2020-11-25 8:49 ` [PATCH 2/5] x86/build: limit #include-ing by asm-offsets.c Jan Beulich
2020-12-28 12:54 ` Roger Pau Monné
2021-01-04 13:48 ` Jan Beulich
2020-11-25 8:49 ` [PATCH 3/5] x86/build: restrict contents of asm-offsets.h when !HVM / !PV Jan Beulich
2020-12-28 13:07 ` Roger Pau Monné
2020-11-25 8:50 ` Jan Beulich [this message]
2020-12-28 13:37 ` [PATCH 4/5] x86: hypercall vector is unused when !PV32 Roger Pau Monné
2020-11-25 8:51 ` [PATCH 5/5] x86: don't build unused entry code " Jan Beulich
2020-12-28 15:30 ` Roger Pau Monné
2021-01-04 13:56 ` Jan Beulich
2021-01-04 15:53 ` Roger Pau Monné
2021-01-04 16:11 ` Jan Beulich
2021-04-01 7:51 ` Ping: " Jan Beulich
2021-04-01 14:01 ` Roger Pau Monné
2021-04-01 14:20 ` Jan Beulich
2021-04-06 9:52 ` Jan Beulich
2021-04-01 14:31 ` Andrew Cooper
2021-04-01 14:37 ` Jan Beulich
2021-04-06 17:34 ` Andrew Cooper
2021-04-07 7:54 ` Jan Beulich
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=6505bcc4-0cb3-42de-9fd5-50da133d6d99@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=roger.pau@citrix.com \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.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).