* FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree
@ 2018-09-03 13:14 gregkh
2018-09-03 15:59 ` Martin Schwidefsky
0 siblings, 1 reply; 5+ messages in thread
From: gregkh @ 2018-09-03 13:14 UTC (permalink / raw)
To: schwidefsky, heiko.carstens, stable; +Cc: stable
The patch below does not apply to the 4.14-stable tree.
If someone wants it applied there, or to any other stable or longterm
tree, then please email the backport, including the original git commit
id to <stable@vger.kernel.org>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
>From 5eda25b10297684c1f46a14199ec00210f3c346e Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 6 Aug 2018 13:49:47 +0200
Subject: [PATCH] s390/lib: use expoline for all bcr instructions
The memove, memset, memcpy, __memset16, __memset32 and __memset64
function have an additional indirect return branch in form of a
"bzr" instruction. These need to use expolines as well.
Cc: <stable@vger.kernel.org> # v4.17+
Fixes: 97489e0663 ("s390/lib: use expoline for indirect branches")
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
diff --git a/arch/s390/lib/mem.S b/arch/s390/lib/mem.S
index 2311f15be9cf..40c4d59c926e 100644
--- a/arch/s390/lib/mem.S
+++ b/arch/s390/lib/mem.S
@@ -17,7 +17,7 @@
ENTRY(memmove)
ltgr %r4,%r4
lgr %r1,%r2
- bzr %r14
+ jz .Lmemmove_exit
aghi %r4,-1
clgr %r2,%r3
jnh .Lmemmove_forward
@@ -36,6 +36,7 @@ ENTRY(memmove)
.Lmemmove_forward_remainder:
larl %r5,.Lmemmove_mvc
ex %r4,0(%r5)
+.Lmemmove_exit:
BR_EX %r14
.Lmemmove_reverse:
ic %r0,0(%r4,%r3)
@@ -65,7 +66,7 @@ EXPORT_SYMBOL(memmove)
*/
ENTRY(memset)
ltgr %r4,%r4
- bzr %r14
+ jz .Lmemset_exit
ltgr %r3,%r3
jnz .Lmemset_fill
aghi %r4,-1
@@ -80,6 +81,7 @@ ENTRY(memset)
.Lmemset_clear_remainder:
larl %r3,.Lmemset_xc
ex %r4,0(%r3)
+.Lmemset_exit:
BR_EX %r14
.Lmemset_fill:
cghi %r4,1
@@ -115,7 +117,7 @@ EXPORT_SYMBOL(memset)
*/
ENTRY(memcpy)
ltgr %r4,%r4
- bzr %r14
+ jz .Lmemcpy_exit
aghi %r4,-1
srlg %r5,%r4,8
ltgr %r5,%r5
@@ -124,6 +126,7 @@ ENTRY(memcpy)
.Lmemcpy_remainder:
larl %r5,.Lmemcpy_mvc
ex %r4,0(%r5)
+.Lmemcpy_exit:
BR_EX %r14
.Lmemcpy_loop:
mvc 0(256,%r1),0(%r3)
@@ -145,9 +148,9 @@ EXPORT_SYMBOL(memcpy)
.macro __MEMSET bits,bytes,insn
ENTRY(__memset\bits)
ltgr %r4,%r4
- bzr %r14
+ jz .L__memset_exit\bits
cghi %r4,\bytes
- je .L__memset_exit\bits
+ je .L__memset_store\bits
aghi %r4,-(\bytes+1)
srlg %r5,%r4,8
ltgr %r5,%r5
@@ -163,8 +166,9 @@ ENTRY(__memset\bits)
larl %r5,.L__memset_mvc\bits
ex %r4,0(%r5)
BR_EX %r14
-.L__memset_exit\bits:
+.L__memset_store\bits:
\insn %r3,0(%r2)
+.L__memset_exit\bits:
BR_EX %r14
.L__memset_mvc\bits:
mvc \bytes(1,%r1),0(%r1)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree
2018-09-03 13:14 FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree gregkh
@ 2018-09-03 15:59 ` Martin Schwidefsky
2018-09-12 19:33 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Martin Schwidefsky @ 2018-09-03 15:59 UTC (permalink / raw)
To: gregkh; +Cc: heiko.carstens, stable
>From 4164ae404d145052e20d5a810ca776dd85f25b8b Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 6 Aug 2018 13:49:47 +0200
Subject: [PATCH] s390/lib: use expoline for all bcr instructions
[ Upstream commit de481fa3f40d7e46f804f1b19d536b390bda5e59 ]
The memove, memset, memcpy, __memset16, __memset32 and __memset64
function have an additional indirect return branch in form of a
"bzr" instruction. These need to use expolines as well.
Cc: <stable@vger.kernel.org> # v4.17+
Fixes: 97489e0663 ("s390/lib: use expoline for indirect branches")
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/lib/mem.S | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/s390/lib/mem.S b/arch/s390/lib/mem.S
index e1fa974ac500..37e52118d7e9 100644
--- a/arch/s390/lib/mem.S
+++ b/arch/s390/lib/mem.S
@@ -17,7 +17,7 @@
ENTRY(memmove)
ltgr %r4,%r4
lgr %r1,%r2
- bzr %r14
+ jz .Lmemmove_exit
aghi %r4,-1
clgr %r2,%r3
jnh .Lmemmove_forward
@@ -36,6 +36,7 @@ ENTRY(memmove)
.Lmemmove_forward_remainder:
larl %r5,.Lmemmove_mvc
ex %r4,0(%r5)
+.Lmemmove_exit:
BR_EX %r14
.Lmemmove_reverse:
ic %r0,0(%r4,%r3)
@@ -65,7 +66,7 @@ EXPORT_SYMBOL(memmove)
*/
ENTRY(memset)
ltgr %r4,%r4
- bzr %r14
+ jz .Lmemset_exit
ltgr %r3,%r3
jnz .Lmemset_fill
aghi %r4,-1
@@ -80,12 +81,13 @@ ENTRY(memset)
.Lmemset_clear_remainder:
larl %r3,.Lmemset_xc
ex %r4,0(%r3)
+.Lmemset_exit:
BR_EX %r14
.Lmemset_fill:
stc %r3,0(%r2)
cghi %r4,1
lgr %r1,%r2
- ber %r14
+ je .Lmemset_fill_exit
aghi %r4,-2
srlg %r3,%r4,8
ltgr %r3,%r3
@@ -97,6 +99,7 @@ ENTRY(memset)
.Lmemset_fill_remainder:
larl %r3,.Lmemset_mvc
ex %r4,0(%r3)
+.Lmemset_fill_exit:
BR_EX %r14
.Lmemset_xc:
xc 0(1,%r1),0(%r1)
@@ -111,7 +114,7 @@ EXPORT_SYMBOL(memset)
*/
ENTRY(memcpy)
ltgr %r4,%r4
- bzr %r14
+ jz .Lmemcpy_exit
aghi %r4,-1
srlg %r5,%r4,8
ltgr %r5,%r5
@@ -120,6 +123,7 @@ ENTRY(memcpy)
.Lmemcpy_remainder:
larl %r5,.Lmemcpy_mvc
ex %r4,0(%r5)
+.Lmemcpy_exit:
BR_EX %r14
.Lmemcpy_loop:
mvc 0(256,%r1),0(%r3)
--
2.16.4
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree
2018-09-03 15:59 ` Martin Schwidefsky
@ 2018-09-12 19:33 ` Greg KH
2018-09-13 6:22 ` Martin Schwidefsky
0 siblings, 1 reply; 5+ messages in thread
From: Greg KH @ 2018-09-12 19:33 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: heiko.carstens, stable
On Mon, Sep 03, 2018 at 05:59:22PM +0200, Martin Schwidefsky wrote:
> From 4164ae404d145052e20d5a810ca776dd85f25b8b Mon Sep 17 00:00:00 2001
> From: Martin Schwidefsky <schwidefsky@de.ibm.com>
> Date: Mon, 6 Aug 2018 13:49:47 +0200
> Subject: [PATCH] s390/lib: use expoline for all bcr instructions
>
> [ Upstream commit de481fa3f40d7e46f804f1b19d536b390bda5e59 ]
That git commit id does not match anything in Linus's tree :(
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree
2018-09-12 19:33 ` Greg KH
@ 2018-09-13 6:22 ` Martin Schwidefsky
2018-09-13 6:59 ` Greg KH
0 siblings, 1 reply; 5+ messages in thread
From: Martin Schwidefsky @ 2018-09-13 6:22 UTC (permalink / raw)
To: Greg KH; +Cc: heiko.carstens, stable
On Wed, 12 Sep 2018 21:33:22 +0200
Greg KH <gregkh@linuxfoundation.org> wrote:
> On Mon, Sep 03, 2018 at 05:59:22PM +0200, Martin Schwidefsky wrote:
> > From 4164ae404d145052e20d5a810ca776dd85f25b8b Mon Sep 17 00:00:00 2001
> > From: Martin Schwidefsky <schwidefsky@de.ibm.com>
> > Date: Mon, 6 Aug 2018 13:49:47 +0200
> > Subject: [PATCH] s390/lib: use expoline for all bcr instructions
> >
> > [ Upstream commit de481fa3f40d7e46f804f1b19d536b390bda5e59 ]
>
> That git commit id does not match anything in Linus's tree :(
Yes, sure enough that commit id is from our internal devel tree.
Forgot to specify "master" when searching for the commit..
Upstream commit id is 5eda25b10297684c1f46a14199ec00210f3c346e
--
>From e5c91db72e51d0423375f8f73025819b884c0369 Mon Sep 17 00:00:00 2001
From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 6 Aug 2018 13:49:47 +0200
Subject: [PATCH] s390/lib: use expoline for all bcr instructions
[ Upstream commit 5eda25b10297684c1f46a14199ec00210f3c346e ]
The memove, memset, memcpy, __memset16, __memset32 and __memset64
function have an additional indirect return branch in form of a
"bzr" instruction. These need to use expolines as well.
Cc: <stable@vger.kernel.org> # v4.17+
Fixes: 97489e0663 ("s390/lib: use expoline for indirect branches")
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---
arch/s390/lib/mem.S | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/s390/lib/mem.S b/arch/s390/lib/mem.S
index e1fa974ac500..37e52118d7e9 100644
--- a/arch/s390/lib/mem.S
+++ b/arch/s390/lib/mem.S
@@ -17,7 +17,7 @@
ENTRY(memmove)
ltgr %r4,%r4
lgr %r1,%r2
- bzr %r14
+ jz .Lmemmove_exit
aghi %r4,-1
clgr %r2,%r3
jnh .Lmemmove_forward
@@ -36,6 +36,7 @@ ENTRY(memmove)
.Lmemmove_forward_remainder:
larl %r5,.Lmemmove_mvc
ex %r4,0(%r5)
+.Lmemmove_exit:
BR_EX %r14
.Lmemmove_reverse:
ic %r0,0(%r4,%r3)
@@ -65,7 +66,7 @@ EXPORT_SYMBOL(memmove)
*/
ENTRY(memset)
ltgr %r4,%r4
- bzr %r14
+ jz .Lmemset_exit
ltgr %r3,%r3
jnz .Lmemset_fill
aghi %r4,-1
@@ -80,12 +81,13 @@ ENTRY(memset)
.Lmemset_clear_remainder:
larl %r3,.Lmemset_xc
ex %r4,0(%r3)
+.Lmemset_exit:
BR_EX %r14
.Lmemset_fill:
stc %r3,0(%r2)
cghi %r4,1
lgr %r1,%r2
- ber %r14
+ je .Lmemset_fill_exit
aghi %r4,-2
srlg %r3,%r4,8
ltgr %r3,%r3
@@ -97,6 +99,7 @@ ENTRY(memset)
.Lmemset_fill_remainder:
larl %r3,.Lmemset_mvc
ex %r4,0(%r3)
+.Lmemset_fill_exit:
BR_EX %r14
.Lmemset_xc:
xc 0(1,%r1),0(%r1)
@@ -111,7 +114,7 @@ EXPORT_SYMBOL(memset)
*/
ENTRY(memcpy)
ltgr %r4,%r4
- bzr %r14
+ jz .Lmemcpy_exit
aghi %r4,-1
srlg %r5,%r4,8
ltgr %r5,%r5
@@ -120,6 +123,7 @@ ENTRY(memcpy)
.Lmemcpy_remainder:
larl %r5,.Lmemcpy_mvc
ex %r4,0(%r5)
+.Lmemcpy_exit:
BR_EX %r14
.Lmemcpy_loop:
mvc 0(256,%r1),0(%r3)
--
2.16.4
--
blue skies,
Martin.
"Reality continues to ruin my life." - Calvin.
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree
2018-09-13 6:22 ` Martin Schwidefsky
@ 2018-09-13 6:59 ` Greg KH
0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2018-09-13 6:59 UTC (permalink / raw)
To: Martin Schwidefsky; +Cc: heiko.carstens, stable
On Thu, Sep 13, 2018 at 08:22:33AM +0200, Martin Schwidefsky wrote:
> On Wed, 12 Sep 2018 21:33:22 +0200
> Greg KH <gregkh@linuxfoundation.org> wrote:
>
> > On Mon, Sep 03, 2018 at 05:59:22PM +0200, Martin Schwidefsky wrote:
> > > From 4164ae404d145052e20d5a810ca776dd85f25b8b Mon Sep 17 00:00:00 2001
> > > From: Martin Schwidefsky <schwidefsky@de.ibm.com>
> > > Date: Mon, 6 Aug 2018 13:49:47 +0200
> > > Subject: [PATCH] s390/lib: use expoline for all bcr instructions
> > >
> > > [ Upstream commit de481fa3f40d7e46f804f1b19d536b390bda5e59 ]
> >
> > That git commit id does not match anything in Linus's tree :(
>
> Yes, sure enough that commit id is from our internal devel tree.
> Forgot to specify "master" when searching for the commit..
>
> Upstream commit id is 5eda25b10297684c1f46a14199ec00210f3c346e
Thanks, that worked. Now queued up.
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-09-13 12:08 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-09-03 13:14 FAILED: patch "[PATCH] s390/lib: use expoline for all bcr instructions" failed to apply to 4.14-stable tree gregkh
2018-09-03 15:59 ` Martin Schwidefsky
2018-09-12 19:33 ` Greg KH
2018-09-13 6:22 ` Martin Schwidefsky
2018-09-13 6:59 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.