Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1453943 > unrolled thread

[PATCH v2] powerpc/32: fix csum_partial_copy_generic()

Started byChristophe Leroy <christophe.leroy@c-s.fr>
First post2016-08-02 14:00 +0200
Last post2016-08-10 21:50 +0200
Articles 9 — 6 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Christophe Leroy <christophe.leroy@c-s.fr> - 2016-08-02 14:00 +0200
    Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Segher Boessenkool <segher@kernel.crashing.org> - 2016-08-02 15:40 +0200
    Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Segher Boessenkool <segher@kernel.crashing.org> - 2016-08-02 16:40 +0200
    Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Scott Wood <oss@buserror.net> - 2016-08-04 06:00 +0200
      Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Alessio Igor Bogani <alessio.bogani@elettra.eu> - 2016-08-04 08:40 +0200
        Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Michael Ellerman <mpe@ellerman.id.au> - 2016-08-05 09:00 +0200
          Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Christophe Leroy <christophe.leroy@c-s.fr> - 2016-08-05 09:30 +0200
            Re: [PATCH v2] powerpc/32: fix csum_partial_copy_generic() Michael Ellerman <mpe@ellerman.id.au> - 2016-08-05 11:40 +0200
    Re: [v2] powerpc/32: fix csum_partial_copy_generic() Michael Ellerman <patch-notifications@ellerman.id.au> - 2016-08-10 21:50 +0200

#1453943 — [PATCH v2] powerpc/32: fix csum_partial_copy_generic()

FromChristophe Leroy <christophe.leroy@c-s.fr>
Date2016-08-02 14:00 +0200
Subject[PATCH v2] powerpc/32: fix csum_partial_copy_generic()
Message-ID<s1Gwy-3Wp-49@gated-at.bofh.it>
commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
based on copy_tofrom_user()") introduced a bug when destination
address is odd and initial csum is not null

In that (rare) case the initial csum value has to be rotated one byte
as well as the resulting value is

This patch also fixes related comments

Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
based on copy_tofrom_user()")
Cc: stable@vger.kernel.org

Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
---
 v2: updated comments as suggested by Segher

 arch/powerpc/lib/checksum_32.S | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/arch/powerpc/lib/checksum_32.S b/arch/powerpc/lib/checksum_32.S
index d90870a..0a57fe6 100644
--- a/arch/powerpc/lib/checksum_32.S
+++ b/arch/powerpc/lib/checksum_32.S
@@ -127,8 +127,9 @@ _GLOBAL(csum_partial_copy_generic)
 	stw	r7,12(r1)
 	stw	r8,8(r1)
 
-	andi.	r0,r4,1			/* is destination address even ? */
-	cmplwi	cr7,r0,0
+	rlwinm	r0,r4,3,0x8
+	rlwnm	r6,r6,r0,0,31	/* odd destination address: rotate one byte */
+	cmplwi	cr7,r0,0	/* is destination address even ? */
 	addic	r12,r6,0
 	addi	r6,r4,-4
 	neg	r0,r4
@@ -237,7 +238,7 @@ _GLOBAL(csum_partial_copy_generic)
 66:	addze	r3,r12
 	addi	r1,r1,16
 	beqlr+	cr7
-	rlwinm	r3,r3,8,0,31	/* swap bytes for odd destination */
+	rlwinm	r3,r3,8,0,31	/* odd destination address: rotate one byte */
 	blr
 
 /* read fault */
-- 
2.1.0

[toc] | [next] | [standalone]


#1454401

FromSegher Boessenkool <segher@kernel.crashing.org>
Date2016-08-02 15:40 +0200
Message-ID<s1I5l-54A-87@gated-at.bofh.it>
In reply to#1453943
On Tue, Aug 02, 2016 at 10:07:05AM +0200, Christophe Leroy wrote:
> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()") introduced a bug when destination
> address is odd and initial csum is not null
> 
> In that (rare) case the initial csum value has to be rotated one byte
> as well as the resulting value is
> 
> This patch also fixes related comments
> 
> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()")
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
>  v2: updated comments as suggested by Segher

Thanks.  It looks good to me now.


Segher

[toc] | [prev] | [next] | [standalone]


#1454608

FromSegher Boessenkool <segher@kernel.crashing.org>
Date2016-08-02 16:40 +0200
Message-ID<s1J1q-5FG-79@gated-at.bofh.it>
In reply to#1453943
On Tue, Aug 02, 2016 at 10:07:05AM +0200, Christophe Leroy wrote:
> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()") introduced a bug when destination
> address is odd and initial csum is not null
> 
> In that (rare) case the initial csum value has to be rotated one byte
> as well as the resulting value is
> 
> This patch also fixes related comments
> 
> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()")
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
>  v2: updated comments as suggested by Segher

This looks good to me now, thanks,


Segher

[toc] | [prev] | [next] | [standalone]


#1456143

FromScott Wood <oss@buserror.net>
Date2016-08-04 06:00 +0200
Message-ID<s2hZ8-3uE-5@gated-at.bofh.it>
In reply to#1453943
On Tue, 2016-08-02 at 10:07 +0200, Christophe Leroy wrote:
> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()") introduced a bug when destination
> address is odd and initial csum is not null
> 
> In that (rare) case the initial csum value has to be rotated one byte
> as well as the resulting value is
> 
> This patch also fixes related comments
> 
> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()")
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
> ---
>  v2: updated comments as suggested by Segher
> 
>  arch/powerpc/lib/checksum_32.S | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

Alessio, can you confirm whether this fixes the problem you reported?

-Scott

> 
> diff --git a/arch/powerpc/lib/checksum_32.S b/arch/powerpc/lib/checksum_32.S
> index d90870a..0a57fe6 100644
> --- a/arch/powerpc/lib/checksum_32.S
> +++ b/arch/powerpc/lib/checksum_32.S
> @@ -127,8 +127,9 @@ _GLOBAL(csum_partial_copy_generic)
>  	stw	r7,12(r1)
>  	stw	r8,8(r1)
>  
> -	andi.	r0,r4,1			/* is destination
> address even ? */
> -	cmplwi	cr7,r0,0
> +	rlwinm	r0,r4,3,0x8
> +	rlwnm	r6,r6,r0,0,31	/* odd destination address:
> rotate one byte */
> +	cmplwi	cr7,r0,0	/* is destination address even ? */
>  	addic	r12,r6,0
>  	addi	r6,r4,-4
>  	neg	r0,r4
> @@ -237,7 +238,7 @@ _GLOBAL(csum_partial_copy_generic)
>  66:	addze	r3,r12
>  	addi	r1,r1,16
>  	beqlr+	cr7
> -	rlwinm	r3,r3,8,0,31	/* swap bytes for odd destination
> */
> +	rlwinm	r3,r3,8,0,31	/* odd destination address:
> rotate one byte */
>  	blr
>  
>  /* read fault */

[toc] | [prev] | [next] | [standalone]


#1456188

FromAlessio Igor Bogani <alessio.bogani@elettra.eu>
Date2016-08-04 08:40 +0200
Message-ID<s2ktX-5fC-7@gated-at.bofh.it>
In reply to#1456143
Scott,

On 4 August 2016 at 05:53, Scott Wood <oss@buserror.net> wrote:
> On Tue, 2016-08-02 at 10:07 +0200, Christophe Leroy wrote:
>> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>> based on copy_tofrom_user()") introduced a bug when destination
>> address is odd and initial csum is not null
>>
>> In that (rare) case the initial csum value has to be rotated one byte
>> as well as the resulting value is
>>
>> This patch also fixes related comments
>>
>> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>> based on copy_tofrom_user()")
>> Cc: stable@vger.kernel.org
>>
>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>> ---
>>  v2: updated comments as suggested by Segher
>>
>>  arch/powerpc/lib/checksum_32.S | 7 ++++---
>>  1 file changed, 4 insertions(+), 3 deletions(-)
>
> Alessio, can you confirm whether this fixes the problem you reported?

No unfortunately.

Ciao,
Alessio

[toc] | [prev] | [next] | [standalone]


#1456902

FromMichael Ellerman <mpe@ellerman.id.au>
Date2016-08-05 09:00 +0200
Message-ID<s2HgR-40X-9@gated-at.bofh.it>
In reply to#1456188
Alessio Igor Bogani <alessio.bogani@elettra.eu> writes:
> On 4 August 2016 at 05:53, Scott Wood <oss@buserror.net> wrote:
>> On Tue, 2016-08-02 at 10:07 +0200, Christophe Leroy wrote:
>>> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>>> based on copy_tofrom_user()") introduced a bug when destination
>>> address is odd and initial csum is not null
>>>
>>> In that (rare) case the initial csum value has to be rotated one byte
>>> as well as the resulting value is
>>>
>>> This patch also fixes related comments
>>>
>>> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>>> based on copy_tofrom_user()")
>>> Cc: stable@vger.kernel.org
>>>
>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>>> ---
>>>  v2: updated comments as suggested by Segher
>>>
>>>  arch/powerpc/lib/checksum_32.S | 7 ++++---
>>>  1 file changed, 4 insertions(+), 3 deletions(-)
>>
>> Alessio, can you confirm whether this fixes the problem you reported?
>
> No unfortunately.

Thanks for testing.

I've dropped the patch for now, send me a new one that works.

cheers

[toc] | [prev] | [next] | [standalone]


#1456913

FromChristophe Leroy <christophe.leroy@c-s.fr>
Date2016-08-05 09:30 +0200
Message-ID<s2HJU-4rz-25@gated-at.bofh.it>
In reply to#1456902

Le 05/08/2016 à 08:57, Michael Ellerman a écrit :
> Alessio Igor Bogani <alessio.bogani@elettra.eu> writes:
>> On 4 August 2016 at 05:53, Scott Wood <oss@buserror.net> wrote:
>>> On Tue, 2016-08-02 at 10:07 +0200, Christophe Leroy wrote:
>>>> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>>>> based on copy_tofrom_user()") introduced a bug when destination
>>>> address is odd and initial csum is not null
>>>>
>>>> In that (rare) case the initial csum value has to be rotated one byte
>>>> as well as the resulting value is
>>>>
>>>> This patch also fixes related comments
>>>>
>>>> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>>>> based on copy_tofrom_user()")
>>>> Cc: stable@vger.kernel.org
>>>>
>>>> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>
>>>> ---
>>>>   v2: updated comments as suggested by Segher
>>>>
>>>>   arch/powerpc/lib/checksum_32.S | 7 ++++---
>>>>   1 file changed, 4 insertions(+), 3 deletions(-)
>>> Alessio, can you confirm whether this fixes the problem you reported?
>> No unfortunately.
> Thanks for testing.
>
> I've dropped the patch for now, send me a new one that works.
>
>

The purpose of this patch was not to address Alessio's issue, but to fix 
a huge issue on checksum calculation which induces breakdown of TCP 
connections.

I think it is worth commiting it upstream and on impacted stable 
releases, allthought we don't have yet identified the issue Alessio's has.

Christophe

[toc] | [prev] | [next] | [standalone]


#1456989

FromMichael Ellerman <mpe@ellerman.id.au>
Date2016-08-05 11:40 +0200
Message-ID<s2JLH-5EJ-23@gated-at.bofh.it>
In reply to#1456913
Christophe Leroy <christophe.leroy@c-s.fr> writes:

> Le 05/08/2016 à 08:57, Michael Ellerman a écrit :
>> Alessio Igor Bogani <alessio.bogani@elettra.eu> writes:
>>> On 4 August 2016 at 05:53, Scott Wood <oss@buserror.net> wrote:
>>>> On Tue, 2016-08-02 at 10:07 +0200, Christophe Leroy wrote:
>>>>> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
>>>>> based on copy_tofrom_user()") introduced a bug when destination
>>>>> address is odd and initial csum is not null
>>>>>
>
> The purpose of this patch was not to address Alessio's issue, but to fix 
> a huge issue on checksum calculation which induces breakdown of TCP 
> connections.
>
> I think it is worth commiting it upstream and on impacted stable 
> releases, allthought we don't have yet identified the issue Alessio's has.

OK. I'll put it back into fixes on Monday if I haven't heard anything
further.

cheers

[toc] | [prev] | [next] | [standalone]


#1459703 — Re: [v2] powerpc/32: fix csum_partial_copy_generic()

FromMichael Ellerman <patch-notifications@ellerman.id.au>
Date2016-08-10 21:50 +0200
SubjectRe: [v2] powerpc/32: fix csum_partial_copy_generic()
Message-ID<s4HFM-12V-17@gated-at.bofh.it>
In reply to#1453943
On Tue, 2016-02-08 at 08:07:05 UTC, Christophe Leroy wrote:
> commit 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic()
> based on copy_tofrom_user()") introduced a bug when destination
> address is odd and initial csum is not null
> 
> In that (rare) case the initial csum value has to be rotated one byte
> as well as the resulting value is
> 
> This patch also fixes related comments
> 
> Fixes: 7aef4136566b0 ("powerpc32: rewrite csum_partial_copy_generic() based on copy_tofrom_user()")
> Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/1bc8b816cb8058c31f61fe7844

cheers

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web