From: Juergen Gross <jgross@suse.com>
To: linux-kernel@vger.kernel.org, x86@kernel.org,
xen-devel@lists.xensource.com, konrad.wilk@oracle.com,
david.vrabel@citrix.com, boris.ostrovsky@oracle.com,
tglx@linutronix.de, mingo@redhat.com, hpa@zytor.com,
mmarek@suse.cz, linux-kbuild@vger.kernel.org
Cc: Juergen Gross <jgross@suse.com>
Subject: [PATCH 4/4] xen: use generated hypercall symbols in arch/x86/xen/xen-head.S
Date: Thu, 11 Dec 2014 19:04:25 +0100 [thread overview]
Message-ID: <1418321065-10212-5-git-send-email-jgross@suse.com> (raw)
In-Reply-To: <1418321065-10212-1-git-send-email-jgross@suse.com>
Instead of manually list each hypercall in arch/x86/xen/xen-head.S
use the auto generated symbol list.
This also corrects the wrong address of xen_hypercall_mca which was
located 32 bytes higher than it should.
Symbol addresses have been verified to match the correct ones via
objdump output.
Based-on-patch-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
---
arch/x86/xen/xen-head.S | 62 ++++++++-----------------------------------------
1 file changed, 10 insertions(+), 52 deletions(-)
diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 674b2225..b2ba341 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -12,6 +12,8 @@
#include <xen/interface/elfnote.h>
#include <xen/interface/features.h>
+#include <xen/interface/xen.h>
+#include <xen/interface/xen-mca.h>
#include <asm/xen/interface.h>
#ifdef CONFIG_XEN_PVH
@@ -85,58 +87,14 @@ ENTRY(xen_pvh_early_cpu_init)
.pushsection .text
.balign PAGE_SIZE
ENTRY(hypercall_page)
-#define NEXT_HYPERCALL(x) \
- ENTRY(xen_hypercall_##x) \
- .skip 32
-
-NEXT_HYPERCALL(set_trap_table)
-NEXT_HYPERCALL(mmu_update)
-NEXT_HYPERCALL(set_gdt)
-NEXT_HYPERCALL(stack_switch)
-NEXT_HYPERCALL(set_callbacks)
-NEXT_HYPERCALL(fpu_taskswitch)
-NEXT_HYPERCALL(sched_op_compat)
-NEXT_HYPERCALL(platform_op)
-NEXT_HYPERCALL(set_debugreg)
-NEXT_HYPERCALL(get_debugreg)
-NEXT_HYPERCALL(update_descriptor)
-NEXT_HYPERCALL(ni)
-NEXT_HYPERCALL(memory_op)
-NEXT_HYPERCALL(multicall)
-NEXT_HYPERCALL(update_va_mapping)
-NEXT_HYPERCALL(set_timer_op)
-NEXT_HYPERCALL(event_channel_op_compat)
-NEXT_HYPERCALL(xen_version)
-NEXT_HYPERCALL(console_io)
-NEXT_HYPERCALL(physdev_op_compat)
-NEXT_HYPERCALL(grant_table_op)
-NEXT_HYPERCALL(vm_assist)
-NEXT_HYPERCALL(update_va_mapping_otherdomain)
-NEXT_HYPERCALL(iret)
-NEXT_HYPERCALL(vcpu_op)
-NEXT_HYPERCALL(set_segment_base)
-NEXT_HYPERCALL(mmuext_op)
-NEXT_HYPERCALL(xsm_op)
-NEXT_HYPERCALL(nmi_op)
-NEXT_HYPERCALL(sched_op)
-NEXT_HYPERCALL(callback_op)
-NEXT_HYPERCALL(xenoprof_op)
-NEXT_HYPERCALL(event_channel_op)
-NEXT_HYPERCALL(physdev_op)
-NEXT_HYPERCALL(hvm_op)
-NEXT_HYPERCALL(sysctl)
-NEXT_HYPERCALL(domctl)
-NEXT_HYPERCALL(kexec_op)
-NEXT_HYPERCALL(tmem_op) /* 38 */
-ENTRY(xen_hypercall_rsvr)
- .skip 320
-NEXT_HYPERCALL(mca) /* 48 */
-NEXT_HYPERCALL(arch_1)
-NEXT_HYPERCALL(arch_2)
-NEXT_HYPERCALL(arch_3)
-NEXT_HYPERCALL(arch_4)
-NEXT_HYPERCALL(arch_5)
-NEXT_HYPERCALL(arch_6)
+ .skip PAGE_SIZE
+
+#define HYPERCALL(n) \
+ .equ xen_hypercall_##n, hypercall_page + __HYPERVISOR_##n * 32; \
+ .type xen_hypercall_##n, function; .size xen_hypercall_##n, 32
+#include <asm/xen-hypercalls.h>
+#undef HYPERCALL
+
.balign PAGE_SIZE
.popsection
--
2.1.2
next prev parent reply other threads:[~2014-12-11 18:07 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-12-11 18:04 [PATCH 0/4] xen: auto-generate symbols for xen hypercalls Juergen Gross
2014-12-11 18:04 ` [PATCH 1/4] xen: build infrastructure for generating hypercall depending symbols Juergen Gross
2014-12-12 22:48 ` Boris Ostrovsky
2014-12-15 5:20 ` Juergen Gross
2014-12-15 10:00 ` [Xen-devel] " Jan Beulich
2014-12-15 10:00 ` Jan Beulich
2014-12-15 10:00 ` Jan Beulich
2014-12-15 11:38 ` [Xen-devel] " David Vrabel
2014-12-15 11:38 ` David Vrabel
2014-12-15 11:47 ` Jan Beulich
2014-12-15 11:47 ` Jan Beulich
2014-12-16 14:51 ` David Vrabel
2014-12-16 14:51 ` [Xen-devel] " David Vrabel
2014-12-16 14:51 ` David Vrabel
2014-12-15 11:47 ` Jan Beulich
2014-12-16 14:40 ` [Xen-devel] " Juergen Gross
2014-12-11 18:04 ` [PATCH 2/4] xen: synchronize include/xen/interface/xen.h with xen Juergen Gross
2014-12-15 11:45 ` [Xen-devel] " David Vrabel
2014-12-11 18:04 ` [PATCH 3/4] xen: use generated hypervisor symbols in arch/x86/xen/trace.c Juergen Gross
2014-12-15 11:46 ` [Xen-devel] " David Vrabel
2014-12-15 11:46 ` David Vrabel
2014-12-11 18:04 ` Juergen Gross [this message]
2014-12-15 12:05 ` [Xen-devel] [PATCH 4/4] xen: use generated hypercall symbols in arch/x86/xen/xen-head.S David Vrabel
2014-12-15 12:05 ` David Vrabel
2014-12-16 5:55 ` Juergen Gross
2014-12-16 10:24 ` David Vrabel
2014-12-16 10:24 ` David Vrabel
2014-12-16 10:24 ` David Vrabel
2014-12-16 11:20 ` Juergen Gross
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=1418321065-10212-5-git-send-email-jgross@suse.com \
--to=jgross@suse.com \
--cc=boris.ostrovsky@oracle.com \
--cc=david.vrabel@citrix.com \
--cc=hpa@zytor.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mmarek@suse.cz \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
--cc=xen-devel@lists.xensource.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.