diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-01-28 17:35:05 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2009-01-30 17:51:45 -0500 |
commit | ecb93d1ccd0aac63f03be2db3cac3fa974716f4c (patch) | |
tree | be6fe6fce203ed17b9f5b52d73b51b1832b00336 /arch/x86/xen/irq.c | |
parent | 9104a18dcdd8dfefdddca8ce44988563f13ed3c4 (diff) |
x86/paravirt: add register-saving thunks to reduce caller register pressure
Impact: Optimization
One of the problems with inserting a pile of C calls where previously
there were none is that the register pressure is greatly increased.
The C calling convention says that the caller must expect a certain
set of registers may be trashed by the callee, and that the callee can
use those registers without restriction. This includes the function
argument registers, and several others.
This patch seeks to alleviate this pressure by introducing wrapper
thunks that will do the register saving/restoring, so that the
callsite doesn't need to worry about it, but the callee function can
be conventional compiler-generated code. In many cases (particularly
performance-sensitive cases) the callee will be in assembler anyway,
and need not use the compiler's calling convention.
Standard calling convention is:
arguments return scratch
x86-32 eax edx ecx eax ?
x86-64 rdi rsi rdx rcx rax r8 r9 r10 r11
The thunk preserves all argument and scratch registers. The return
register is not preserved, and is available as a scratch register for
unwrapped callee code (and of course the return value).
Wrapped function pointers are themselves wrapped in a struct
paravirt_callee_save structure, in order to get some warning from the
compiler when functions with mismatched calling conventions are used.
The most common paravirt ops, both statically and dynamically, are
interrupt enable/disable/save/restore, so handle them first. This is
particularly easy since their calls are handled specially anyway.
XXX Deal with VMI. What's their calling convention?
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/xen/irq.c')
-rw-r--r-- | arch/x86/xen/irq.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 2e8271431e1..5a070900ad3 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c | |||
@@ -50,6 +50,7 @@ static unsigned long xen_save_fl(void) | |||
50 | */ | 50 | */ |
51 | return (-flags) & X86_EFLAGS_IF; | 51 | return (-flags) & X86_EFLAGS_IF; |
52 | } | 52 | } |
53 | PV_CALLEE_SAVE_REGS_THUNK(xen_save_fl); | ||
53 | 54 | ||
54 | static void xen_restore_fl(unsigned long flags) | 55 | static void xen_restore_fl(unsigned long flags) |
55 | { | 56 | { |
@@ -76,6 +77,7 @@ static void xen_restore_fl(unsigned long flags) | |||
76 | xen_force_evtchn_callback(); | 77 | xen_force_evtchn_callback(); |
77 | } | 78 | } |
78 | } | 79 | } |
80 | PV_CALLEE_SAVE_REGS_THUNK(xen_restore_fl); | ||
79 | 81 | ||
80 | static void xen_irq_disable(void) | 82 | static void xen_irq_disable(void) |
81 | { | 83 | { |
@@ -86,6 +88,7 @@ static void xen_irq_disable(void) | |||
86 | percpu_read(xen_vcpu)->evtchn_upcall_mask = 1; | 88 | percpu_read(xen_vcpu)->evtchn_upcall_mask = 1; |
87 | preempt_enable_no_resched(); | 89 | preempt_enable_no_resched(); |
88 | } | 90 | } |
91 | PV_CALLEE_SAVE_REGS_THUNK(xen_irq_disable); | ||
89 | 92 | ||
90 | static void xen_irq_enable(void) | 93 | static void xen_irq_enable(void) |
91 | { | 94 | { |
@@ -106,6 +109,7 @@ static void xen_irq_enable(void) | |||
106 | if (unlikely(vcpu->evtchn_upcall_pending)) | 109 | if (unlikely(vcpu->evtchn_upcall_pending)) |
107 | xen_force_evtchn_callback(); | 110 | xen_force_evtchn_callback(); |
108 | } | 111 | } |
112 | PV_CALLEE_SAVE_REGS_THUNK(xen_irq_enable); | ||
109 | 113 | ||
110 | static void xen_safe_halt(void) | 114 | static void xen_safe_halt(void) |
111 | { | 115 | { |
@@ -124,10 +128,12 @@ static void xen_halt(void) | |||
124 | 128 | ||
125 | static const struct pv_irq_ops xen_irq_ops __initdata = { | 129 | static const struct pv_irq_ops xen_irq_ops __initdata = { |
126 | .init_IRQ = __xen_init_IRQ, | 130 | .init_IRQ = __xen_init_IRQ, |
127 | .save_fl = xen_save_fl, | 131 | |
128 | .restore_fl = xen_restore_fl, | 132 | .save_fl = PV_CALLEE_SAVE(xen_save_fl), |
129 | .irq_disable = xen_irq_disable, | 133 | .restore_fl = PV_CALLEE_SAVE(xen_restore_fl), |
130 | .irq_enable = xen_irq_enable, | 134 | .irq_disable = PV_CALLEE_SAVE(xen_irq_disable), |
135 | .irq_enable = PV_CALLEE_SAVE(xen_irq_enable), | ||
136 | |||
131 | .safe_halt = xen_safe_halt, | 137 | .safe_halt = xen_safe_halt, |
132 | .halt = xen_halt, | 138 | .halt = xen_halt, |
133 | #ifdef CONFIG_X86_64 | 139 | #ifdef CONFIG_X86_64 |