* [PATCH] x86-64: fix updating of UREGS_rip when converting sysenter to #GP
@ 2012-04-17 14:57 Jan Beulich
2012-04-17 15:05 ` Keir Fraser
0 siblings, 1 reply; 2+ messages in thread
From: Jan Beulich @ 2012-04-17 14:57 UTC (permalink / raw)
To: xen-devel
[-- Attachment #1: Type: text/plain, Size: 674 bytes --]
(I spotted this copy-and-paste mistake only when backporting c/s
25200:80f4113be500 to 4.1 and 4.0.)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -280,7 +280,7 @@ sysenter_eflags_saved:
UNLIKELY_START(z, sysenter_gpf)
movq VCPU_trap_ctxt(%rbx),%rsi
movl $TRAP_gp_fault,UREGS_entry_vector(%rsp)
- subl $2,UREGS_rip(%rsp)
+ subq $2,UREGS_rip(%rsp)
movl %eax,TRAPBOUNCE_error_code(%rdx)
movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax
testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi)
[-- Attachment #2: x86_64-sysenter-trap-bounce-rip.patch --]
[-- Type: text/plain, Size: 737 bytes --]
x86-64: fix updating of UREGS_rip when converting sysenter to #GP
(I spotted this copy-and-paste mistake only when backporting c/s
25200:80f4113be500 to 4.1 and 4.0.)
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/x86_64/entry.S
+++ b/xen/arch/x86/x86_64/entry.S
@@ -280,7 +280,7 @@ sysenter_eflags_saved:
UNLIKELY_START(z, sysenter_gpf)
movq VCPU_trap_ctxt(%rbx),%rsi
movl $TRAP_gp_fault,UREGS_entry_vector(%rsp)
- subl $2,UREGS_rip(%rsp)
+ subq $2,UREGS_rip(%rsp)
movl %eax,TRAPBOUNCE_error_code(%rdx)
movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax
testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi)
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] x86-64: fix updating of UREGS_rip when converting sysenter to #GP
2012-04-17 14:57 [PATCH] x86-64: fix updating of UREGS_rip when converting sysenter to #GP Jan Beulich
@ 2012-04-17 15:05 ` Keir Fraser
0 siblings, 0 replies; 2+ messages in thread
From: Keir Fraser @ 2012-04-17 15:05 UTC (permalink / raw)
To: Jan Beulich, xen-devel
On 17/04/2012 15:57, "Jan Beulich" <JBeulich@suse.com> wrote:
> (I spotted this copy-and-paste mistake only when backporting c/s
> 25200:80f4113be500 to 4.1 and 4.0.)
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
> --- a/xen/arch/x86/x86_64/entry.S
> +++ b/xen/arch/x86/x86_64/entry.S
> @@ -280,7 +280,7 @@ sysenter_eflags_saved:
> UNLIKELY_START(z, sysenter_gpf)
> movq VCPU_trap_ctxt(%rbx),%rsi
> movl $TRAP_gp_fault,UREGS_entry_vector(%rsp)
> - subl $2,UREGS_rip(%rsp)
> + subq $2,UREGS_rip(%rsp)
> movl %eax,TRAPBOUNCE_error_code(%rdx)
> movq TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_eip(%rsi),%rax
> testb $4,TRAP_gp_fault * TRAPINFO_sizeof + TRAPINFO_flags(%rsi)
>
>
>
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-04-17 15:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-04-17 14:57 [PATCH] x86-64: fix updating of UREGS_rip when converting sysenter to #GP Jan Beulich
2012-04-17 15:05 ` Keir Fraser
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).