[MINIOS PATCH 0/5] x86 assmebly code clean up

[MINIOS PATCH 0/5] x86 assmebly code clean up

[Wei Liu]

Wei Liu (5):
  x86_32: remove inclusion of x86-32.h
  x86_64: remove unused labels
  x86_64: merge RESTORE_REST into RESTORE_ALL
  x86_64: introduce and use SAVE_ALL
  x86_64: don't unnecessarily export some entries

 arch/x86/x86_32.S |  2 --
 arch/x86/x86_64.S | 74 ++++++++++++++++++++++---------------------------------
 2 files changed, 29 insertions(+), 47 deletions(-)

-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[MINIOS PATCH 1/5] x86_32: remove inclusion of x86-32.h

[Wei Liu]

There is no need to do that explicitly.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 arch/x86/x86_32.S | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/x86/x86_32.S b/arch/x86/x86_32.S
index 9241418..f70fc65 100644
--- a/arch/x86/x86_32.S
+++ b/arch/x86/x86_32.S
@@ -3,9 +3,7 @@
 #include <mini-os/asm_macros.h>
 #include <mini-os/arch_mm.h>
 #include <mini-os/desc.h>
-#include <xen/arch-x86_32.h>
 #include <xen/elfnote.h>
-#include <xen/arch-x86_32.h>
 
 #ifdef CONFIG_PARAVIRT
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[MINIOS PATCH 2/5] x86_64: remove unused labels

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 arch/x86/x86_64.S | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S
index 5932bfb..c57ee10 100644
--- a/arch/x86/x86_64.S
+++ b/arch/x86/x86_64.S
@@ -177,7 +177,6 @@ ENTRY(error_entry)
 	movq %r14,1*8(%rsp) 
 	movq %r15,(%rsp) 
 
-error_call_handler:
 	movq %rdi, RDI(%rsp)
 	movq %rsp,%rdi
 	movq ORIG_RAX(%rsp),%rsi	# get error code 
@@ -212,7 +211,6 @@ ENTRY(hypervisor_callback2)
 	decl %gs:0
 
 error_exit:
-retint_kernel:
 	movl RFLAGS(%rsp), %eax
 	shr $9, %eax			# EAX[0] == IRET_RFLAGS.IF
 	XEN_GET_VCPU_INFO(%rsi)
@@ -221,7 +219,6 @@ retint_kernel:
 	jnz restore_all_enable_events	#        != 0 => enable event delivery
 	XEN_PUT_VCPU_INFO(%rsi)
 
-retint_restore_args:
 	RESTORE_REST
 	RESTORE_ALL
 	HYPERVISOR_IRET 0
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[MINIOS PATCH 3/5] x86_64: merge RESTORE_REST into RESTORE_ALL

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu1@citrix.com>
---
 arch/x86/x86_64.S | 29 +++++++++++------------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S
index c57ee10..8432d69 100644
--- a/arch/x86/x86_64.S
+++ b/arch/x86/x86_64.S
@@ -101,27 +101,23 @@ KERNEL_CS_MASK = 0xfc
 .endm
 
 .macro RESTORE_ALL
-	movq (%rsp),%r11
-	movq 1*8(%rsp),%r10
-	movq 2*8(%rsp),%r9
-	movq 3*8(%rsp),%r8
-	movq 4*8(%rsp),%rax
-	movq 5*8(%rsp),%rcx
-	movq 6*8(%rsp),%rdx
-	movq 7*8(%rsp),%rsi
-	movq 8*8(%rsp),%rdi
-	addq $9*8+8,%rsp
-.endm	
-
-.macro RESTORE_REST
 	movq (%rsp),%r15
 	movq 1*8(%rsp),%r14
 	movq 2*8(%rsp),%r13
 	movq 3*8(%rsp),%r12
 	movq 4*8(%rsp),%rbp
 	movq 5*8(%rsp),%rbx
-	addq $6*8,%rsp
-.endm
+	movq 6*8(%rsp),%r11
+	movq 7*8(%rsp),%r10
+	movq 8*8(%rsp),%r9
+	movq 9*8(%rsp),%r8
+	movq 10*8(%rsp),%rax
+	movq 11*8(%rsp),%rcx
+	movq 12*8(%rsp),%rdx
+	movq 13*8(%rsp),%rsi
+	movq 14*8(%rsp),%rdi
+	addq $15*8+8,%rsp
+.endm	
 
 .macro SAVE_REST
 	subq $6*8,%rsp
@@ -219,12 +215,10 @@ error_exit:
 	jnz restore_all_enable_events	#        != 0 => enable event delivery
 	XEN_PUT_VCPU_INFO(%rsi)
 
-	RESTORE_REST
 	RESTORE_ALL
 	HYPERVISOR_IRET 0
 
 restore_all_enable_events:
-	RESTORE_REST
 	RESTORE_ALL
 	pushq %rax                      # save rax for it will be clobbered later
 	RSP_OFFSET=8                    # record the stack frame layout changes
@@ -289,7 +283,6 @@ critical_region_fixup:
 
 #else
 error_exit:
-	RESTORE_REST
 	RESTORE_ALL
 	HYPERVISOR_IRET 0
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[MINIOS PATCH 4/5] x86_64: introduce and use SAVE_ALL

[Wei Liu]

Introduce this macro to match RESTORE_ALL. Also delete the unused
SAVE_REST.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 arch/x86/x86_64.S | 38 ++++++++++++++++----------------------
 1 file changed, 16 insertions(+), 22 deletions(-)

diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S
index 8432d69..21fa61b 100644
--- a/arch/x86/x86_64.S
+++ b/arch/x86/x86_64.S
@@ -119,14 +119,26 @@ KERNEL_CS_MASK = 0xfc
 	addq $15*8+8,%rsp
 .endm	
 
-.macro SAVE_REST
-	subq $6*8,%rsp
+.macro SAVE_ALL
+	/* rdi slot contains rax, oldrax contains error code */
+	cld
+	subq $14*8,%rsp
+	movq %rsi,13*8(%rsp)
+	movq 14*8(%rsp),%rsi	/* load rax from rdi slot */
+	movq %rdx,12*8(%rsp)
+	movq %rcx,11*8(%rsp)
+	movq %rsi,10*8(%rsp)	/* store rax */
+	movq %r8, 9*8(%rsp)
+	movq %r9, 8*8(%rsp)
+	movq %r10,7*8(%rsp)
+	movq %r11,6*8(%rsp)
 	movq %rbx,5*8(%rsp)
 	movq %rbp,4*8(%rsp)
 	movq %r12,3*8(%rsp)
 	movq %r13,2*8(%rsp)
 	movq %r14,1*8(%rsp)
 	movq %r15,(%rsp)
+	movq %rdi, RDI(%rsp)	/* put rdi into the slot */
 .endm
 
 .macro HYPERVISOR_IRET flag
@@ -154,26 +166,8 @@ KERNEL_CS_MASK = 0xfc
  * and the exception handler in %rax.	
  */ 		  				
 ENTRY(error_entry)
-	/* rdi slot contains rax, oldrax contains error code */
-	cld	
-	subq  $14*8,%rsp
-	movq %rsi,13*8(%rsp)
-	movq 14*8(%rsp),%rsi	/* load rax from rdi slot */
-	movq %rdx,12*8(%rsp)
-	movq %rcx,11*8(%rsp)
-	movq %rsi,10*8(%rsp)	/* store rax */ 
-	movq %r8, 9*8(%rsp)
-	movq %r9, 8*8(%rsp)
-	movq %r10,7*8(%rsp)
-	movq %r11,6*8(%rsp)
-	movq %rbx,5*8(%rsp) 
-	movq %rbp,4*8(%rsp) 
-	movq %r12,3*8(%rsp) 
-	movq %r13,2*8(%rsp) 
-	movq %r14,1*8(%rsp) 
-	movq %r15,(%rsp) 
-
-	movq %rdi, RDI(%rsp)
+	SAVE_ALL
+
 	movq %rsp,%rdi
 	movq ORIG_RAX(%rsp),%rsi	# get error code 
 	movq $-1,ORIG_RAX(%rsp)
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

[MINIOS PATCH 5/5] x86_64: don't unnecessarily export some entries

[Wei Liu]

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
 arch/x86/x86_64.S | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/x86/x86_64.S b/arch/x86/x86_64.S
index 21fa61b..2046187 100644
--- a/arch/x86/x86_64.S
+++ b/arch/x86/x86_64.S
@@ -165,7 +165,7 @@ KERNEL_CS_MASK = 0xfc
  * Exception entry point. This expects an error code/orig_rax on the stack
  * and the exception handler in %rax.	
  */ 		  				
-ENTRY(error_entry)
+error_entry:
 	SAVE_ALL
 
 	movq %rsp,%rdi
@@ -182,7 +182,7 @@ ENTRY(error_entry)
 ENTRY(hypervisor_callback)
 	zeroentry hypervisor_callback2
 
-ENTRY(hypervisor_callback2)
+hypervisor_callback2:
 	movq %rdi, %rsp
 
 	/* check against event re-entrant */
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 3/5] x86_64: merge RESTORE_REST into RESTORE_ALL

[Wei Liu]

On Thu, Aug 25, 2016 at 05:38:26PM +0100, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu1@citrix.com>

Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Pressed Ctrl-X in Vim by mistake.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 1/5] x86_32: remove inclusion of x86-32.h

[Juergen Gross]

On 25/08/16 18:38, Wei Liu wrote:
> There is no need to do that explicitly.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 2/5] x86_64: remove unused labels

[Juergen Gross]

On 25/08/16 18:38, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 3/5] x86_64: merge RESTORE_REST into RESTORE_ALL

[Juergen Gross]

On 25/08/16 18:38, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 4/5] x86_64: introduce and use SAVE_ALL

[Juergen Gross]

On 25/08/16 18:38, Wei Liu wrote:
> Introduce this macro to match RESTORE_ALL. Also delete the unused
> SAVE_REST.
> 
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 5/5] x86_64: don't unnecessarily export some entries

[Juergen Gross]

On 25/08/16 18:38, Wei Liu wrote:
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>

Reviewed-by: Juergen Gross <jgross@suse.com>


Juergen


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 0/5] x86 assmebly code clean up

[Juergen Gross]

On 25/08/16 18:38, Wei Liu wrote:
> Wei Liu (5):
>   x86_32: remove inclusion of x86-32.h
>   x86_64: remove unused labels
>   x86_64: merge RESTORE_REST into RESTORE_ALL
>   x86_64: introduce and use SAVE_ALL
>   x86_64: don't unnecessarily export some entries
> 
>  arch/x86/x86_32.S |  2 --
>  arch/x86/x86_64.S | 74 ++++++++++++++++++++++---------------------------------
>  2 files changed, 29 insertions(+), 47 deletions(-)
> 

BTW: perhaps you should Cc: minios-devel@lists.xenproject.org next time?


Juergen

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 0/5] x86 assmebly code clean up

[Samuel Thibault]

Wei Liu, on Thu 25 Aug 2016 17:38:23 +0100, wrote:
> Wei Liu (5):
>   x86_32: remove inclusion of x86-32.h
>   x86_64: remove unused labels
>   x86_64: merge RESTORE_REST into RESTORE_ALL
>   x86_64: introduce and use SAVE_ALL
>   x86_64: don't unnecessarily export some entries

For the whole series,

Acked-by: Samuel Thibault <samuel.thibault@ens-lyon.org>



_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 0/5] x86 assmebly code clean up

[Wei Liu]

On Thu, Aug 25, 2016 at 07:12:47PM +0200, Juergen Gross wrote:
> On 25/08/16 18:38, Wei Liu wrote:
> > Wei Liu (5):
> >   x86_32: remove inclusion of x86-32.h
> >   x86_64: remove unused labels
> >   x86_64: merge RESTORE_REST into RESTORE_ALL
> >   x86_64: introduce and use SAVE_ALL
> >   x86_64: don't unnecessarily export some entries
> > 
> >  arch/x86/x86_32.S |  2 --
> >  arch/x86/x86_64.S | 74 ++++++++++++++++++++++---------------------------------
> >  2 files changed, 29 insertions(+), 47 deletions(-)
> > 
> 
> BTW: perhaps you should Cc: minios-devel@lists.xenproject.org next time?
> 

Oops, I normally do that but forgot this time.

> 
> Juergen

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 0/5] x86 assmebly code clean up

[Wei Liu]

Send this cover letter to minios-devel -- forgot to do that when I sent
this series out.

On Thu, Aug 25, 2016 at 05:38:23PM +0100, Wei Liu wrote:
> Wei Liu (5):
>   x86_32: remove inclusion of x86-32.h
>   x86_64: remove unused labels
>   x86_64: merge RESTORE_REST into RESTORE_ALL
>   x86_64: introduce and use SAVE_ALL
>   x86_64: don't unnecessarily export some entries
> 
>  arch/x86/x86_32.S |  2 --
>  arch/x86/x86_64.S | 74 ++++++++++++++++++++++---------------------------------
>  2 files changed, 29 insertions(+), 47 deletions(-)
> 
> -- 
> 2.1.4
> 

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel

Re: [MINIOS PATCH 0/5] x86 assmebly code clean up

[Wei Liu]

On Thu, Aug 25, 2016 at 06:48:34PM +0100, Wei Liu wrote:
> Send this cover letter to minios-devel -- forgot to do that when I sent
> this series out.
> 
> On Thu, Aug 25, 2016 at 05:38:23PM +0100, Wei Liu wrote:
> > Wei Liu (5):
> >   x86_32: remove inclusion of x86-32.h
> >   x86_64: remove unused labels
> >   x86_64: merge RESTORE_REST into RESTORE_ALL
> >   x86_64: introduce and use SAVE_ALL
> >   x86_64: don't unnecessarily export some entries
> > 
> >  arch/x86/x86_32.S |  2 --
> >  arch/x86/x86_64.S | 74 ++++++++++++++++++++++---------------------------------
> >  2 files changed, 29 insertions(+), 47 deletions(-)
> > 
> > -- 
> > 2.1.4
> > 

Series pushed.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel