From: "Jan Beulich" <JBeulich@suse.com>
To: xen-devel <xen-devel@lists.xenproject.org>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
Keir Fraser <keir@xen.org>, Feng Wu <feng.wu@intel.com>
Subject: [PATCH v3 4/4] x86: use 32-bit loads for 32-bit PV guest state reload
Date: Thu, 17 Mar 2016 02:04:25 -0600 [thread overview]
Message-ID: <56EA731902000078000DD937@prv-mh.provo.novell.com> (raw)
In-Reply-To: <56EA6FDF02000078000DD8FB@prv-mh.provo.novell.com>
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
This is slightly more efficient than loading 64-bit quantities.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -313,6 +313,13 @@ static always_inline void stac(void)
987:
.endm
+#define LOAD_ONE_REG(reg, compat) \
+.if !(compat); \
+ movq UREGS_r##reg(%rsp),%r##reg; \
+.else; \
+ movl UREGS_r##reg(%rsp),%e##reg; \
+.endif
+
/*
* Reload registers not preserved by C code from frame.
*
@@ -326,16 +333,14 @@ static always_inline void stac(void)
movq UREGS_r10(%rsp),%r10
movq UREGS_r9(%rsp),%r9
movq UREGS_r8(%rsp),%r8
-.if \ax
- movq UREGS_rax(%rsp),%rax
.endif
-.elseif \ax
- movl UREGS_rax(%rsp),%eax
+.if \ax
+ LOAD_ONE_REG(ax, \compat)
.endif
- movq UREGS_rcx(%rsp),%rcx
- movq UREGS_rdx(%rsp),%rdx
- movq UREGS_rsi(%rsp),%rsi
- movq UREGS_rdi(%rsp),%rdi
+ LOAD_ONE_REG(cx, \compat)
+ LOAD_ONE_REG(dx, \compat)
+ LOAD_ONE_REG(si, \compat)
+ LOAD_ONE_REG(di, \compat)
.endm
/*
@@ -372,8 +377,9 @@ static always_inline void stac(void)
.subsection 0
#endif
.endif
-987: movq UREGS_rbp(%rsp),%rbp
- movq UREGS_rbx(%rsp),%rbx
+987:
+ LOAD_ONE_REG(bp, \compat)
+ LOAD_ONE_REG(bx, \compat)
subq $-(UREGS_error_code-UREGS_r15+\adj), %rsp
.endm
[-- Attachment #2: x86-32on64-load-low.patch --]
[-- Type: text/plain, Size: 1585 bytes --]
x86: use 32-bit loads for 32-bit PV guest state reload
This is slightly more efficient than loading 64-bit quantities.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -313,6 +313,13 @@ static always_inline void stac(void)
987:
.endm
+#define LOAD_ONE_REG(reg, compat) \
+.if !(compat); \
+ movq UREGS_r##reg(%rsp),%r##reg; \
+.else; \
+ movl UREGS_r##reg(%rsp),%e##reg; \
+.endif
+
/*
* Reload registers not preserved by C code from frame.
*
@@ -326,16 +333,14 @@ static always_inline void stac(void)
movq UREGS_r10(%rsp),%r10
movq UREGS_r9(%rsp),%r9
movq UREGS_r8(%rsp),%r8
-.if \ax
- movq UREGS_rax(%rsp),%rax
.endif
-.elseif \ax
- movl UREGS_rax(%rsp),%eax
+.if \ax
+ LOAD_ONE_REG(ax, \compat)
.endif
- movq UREGS_rcx(%rsp),%rcx
- movq UREGS_rdx(%rsp),%rdx
- movq UREGS_rsi(%rsp),%rsi
- movq UREGS_rdi(%rsp),%rdi
+ LOAD_ONE_REG(cx, \compat)
+ LOAD_ONE_REG(dx, \compat)
+ LOAD_ONE_REG(si, \compat)
+ LOAD_ONE_REG(di, \compat)
.endm
/*
@@ -372,8 +377,9 @@ static always_inline void stac(void)
.subsection 0
#endif
.endif
-987: movq UREGS_rbp(%rsp),%rbp
- movq UREGS_rbx(%rsp),%rbx
+987:
+ LOAD_ONE_REG(bp, \compat)
+ LOAD_ONE_REG(bx, \compat)
subq $-(UREGS_error_code-UREGS_r15+\adj), %rsp
.endm
[-- Attachment #3: Type: text/plain, Size: 126 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-17 8:04 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-04 11:08 [PATCH 0/4] x86: accommodate 32-bit PV guests with SMAP/SMEP handling Jan Beulich
2016-03-04 11:27 ` [PATCH 1/4] x86/alternatives: correct near branch check Jan Beulich
2016-03-07 15:43 ` Andrew Cooper
2016-03-07 15:56 ` Jan Beulich
2016-03-07 16:11 ` Andrew Cooper
2016-03-07 16:21 ` Jan Beulich
2016-03-08 17:33 ` Andrew Cooper
2016-03-04 11:27 ` [PATCH 2/4] x86: suppress SMAP and SMEP while running 32-bit PV guest code Jan Beulich
2016-03-07 16:59 ` Andrew Cooper
2016-03-08 7:57 ` Jan Beulich
2016-03-09 8:09 ` Wu, Feng
2016-03-09 14:09 ` Jan Beulich
2016-03-09 11:19 ` Andrew Cooper
2016-03-09 14:28 ` Jan Beulich
2016-03-09 8:09 ` Wu, Feng
2016-03-09 10:45 ` Andrew Cooper
2016-03-09 12:27 ` Wu, Feng
2016-03-09 12:33 ` Andrew Cooper
2016-03-09 12:36 ` Jan Beulich
2016-03-09 12:54 ` Wu, Feng
2016-03-09 13:35 ` Wu, Feng
2016-03-09 13:42 ` Andrew Cooper
2016-03-09 14:03 ` Jan Beulich
2016-03-09 14:07 ` Jan Beulich
2016-03-04 11:28 ` [PATCH 3/4] x86: use optimal NOPs to fill the SMAP/SMEP placeholders Jan Beulich
2016-03-07 17:43 ` Andrew Cooper
2016-03-08 8:02 ` Jan Beulich
2016-03-04 11:29 ` [PATCH 4/4] x86: use 32-bit loads for 32-bit PV guest state reload Jan Beulich
2016-03-07 17:45 ` Andrew Cooper
2016-03-10 9:44 ` [PATCH v2 0/3] x86: accommodate 32-bit PV guests with SMEP/SMAP handling Jan Beulich
2016-03-10 9:53 ` [PATCH v2 1/3] x86: suppress SMEP and SMAP while running 32-bit PV guest code Jan Beulich
2016-05-13 15:48 ` Andrew Cooper
2016-03-10 9:54 ` [PATCH v2 2/3] x86: use optimal NOPs to fill the SMEP/SMAP placeholders Jan Beulich
2016-05-13 15:49 ` Andrew Cooper
2016-03-10 9:55 ` [PATCH v2 3/3] x86: use 32-bit loads for 32-bit PV guest state reload Jan Beulich
[not found] ` <56E9A0DB02000078000DD54C@prv-mh.provo.novell.com>
2016-03-17 7:50 ` [PATCH v3 0/4] x86: accommodate 32-bit PV guests with SMEP/SMAP handling Jan Beulich
2016-03-17 8:02 ` [PATCH v3 1/4] x86: move cached CR4 value to struct cpu_info Jan Beulich
2016-03-17 16:20 ` Andrew Cooper
2016-03-17 8:03 ` [PATCH v3 2/4] x86: suppress SMEP and SMAP while running 32-bit PV guest code Jan Beulich
2016-03-25 18:01 ` Konrad Rzeszutek Wilk
2016-03-29 6:55 ` Jan Beulich
2016-05-13 15:58 ` Andrew Cooper
2016-03-17 8:03 ` [PATCH v3 3/4] x86: use optimal NOPs to fill the SMEP/SMAP placeholders Jan Beulich
2016-05-13 15:57 ` Andrew Cooper
2016-05-13 16:06 ` Jan Beulich
2016-05-13 16:09 ` Andrew Cooper
2016-03-17 8:04 ` Jan Beulich [this message]
2016-03-25 18:02 ` [PATCH v3 4/4] x86: use 32-bit loads for 32-bit PV guest state reload Konrad Rzeszutek Wilk
2016-03-17 16:14 ` [PATCH v3 5/4] x86: reduce code size of struct cpu_info member accesses Jan Beulich
2016-03-25 18:47 ` Konrad Rzeszutek Wilk
2016-03-29 6:59 ` Jan Beulich
2016-03-30 14:28 ` Konrad Rzeszutek Wilk
2016-03-30 14:42 ` Jan Beulich
2016-05-13 16:11 ` Andrew Cooper
2016-05-03 13:58 ` Ping: [PATCH v3 2/4] x86: suppress SMEP and SMAP while running 32-bit PV guest code Jan Beulich
2016-05-03 14:10 ` Andrew Cooper
2016-05-03 14:25 ` Jan Beulich
2016-05-04 10:03 ` Andrew Cooper
2016-05-04 13:35 ` Jan Beulich
2016-05-04 3:07 ` Wu, Feng
2016-05-13 15:21 ` Wei Liu
2016-05-13 15:30 ` Jan Beulich
2016-05-13 15:33 ` Wei Liu
2016-05-13 17:02 ` [PATCH v3 0/4] x86: accommodate 32-bit PV guests with SMEP/SMAP handling Wei Liu
2016-05-13 17:21 ` Andrew Cooper
2016-06-21 6:19 ` Wu, Feng
2016-06-21 7:17 ` 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=56EA731902000078000DD937@prv-mh.provo.novell.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=feng.wu@intel.com \
--cc=keir@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).