Patch "sparc64: fix fault handling in NGbzero.S and GENbzero.S" has been added to the 4.10-stable tree

This is a note to let you know that I've just added the patch titled

sparc64: fix fault handling in NGbzero.S and GENbzero.S

to the 4.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
sparc64-fix-fault-handling-in-ngbzero.s-and-genbzero.s.patch
and it can be found in the queue-4.10 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Dave Aldridge <[email protected]>
Date: Tue, 9 May 2017 02:57:35 -0600
Subject: sparc64: fix fault handling in NGbzero.S and GENbzero.S

From: Dave Aldridge <[email protected]>

commit 3c7f62212018b904ae17f5636ead18a4dca3a88f upstream.

When any of the functions contained in NGbzero.S and GENbzero.S vector through *bzero_from_clear_user, we may end up taking a fault when executing one of the store alternate address space instructions. If this happens, the exception handler does not restore the %asi register.

This commit fixes the issue by introducing a new exception handler that ensures the %asi register is restored when a fault is handled.

Orabug: 25577560

---
 arch/sparc/kernel/head_64.S |    6 ++++++
 arch/sparc/lib/GENbzero.S   |    2 +-
 arch/sparc/lib/NGbzero.S    |    2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

@@ -935,3 +935,9 @@ ENTRY(__retl_o1)
 	retl
 	 mov	%o1, %o0
 ENDPROC(__retl_o1)
+
+ENTRY(__retl_o1_asi)
+	wr      %o5, 0x0, %asi
+	retl
+	 mov    %o1, %o0
+ENDPROC(__retl_o1_asi)

@@ -8,7 +8,7 @@
 98:	x,y;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_o1;	\
+	.word 98b, __retl_o1_asi;\
 	.text;			\
 	.align 4;
 

@@ -8,7 +8,7 @@
 98:	x,y;			\
 	.section __ex_table,"a";\
 	.align 4;		\
-	.word 98b, __retl_o1;	\
+	.word 98b, __retl_o1_asi;\
 	.text;			\
 	.align 4;
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.10/sparc64-fix-fault-handling-in-ngbzero.s-and-genbzero.s.patch