stable.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Thomas Backlund <tmb@tmb.nu>, "# 3.4.x" <stable@vger.kernel.org>,
	Linux Crypto Mailing List <linux-crypto@vger.kernel.org>,
	Eric Biggers <ebiggers@kernel.org>,
	Herbert Xu <herbert@gondor.apana.org.au>
Subject: Re: stable request
Date: Thu, 18 Mar 2021 12:42:50 -0400	[thread overview]
Message-ID: <YFODCo5hbvO+Vp5x@sashalap> (raw)
In-Reply-To: <CAMj1kXG_D_Aw+kyrz7ShMuPaMhpnMhTRZ8tsqKUf0koq_UPSnw@mail.gmail.com>

On Thu, Mar 18, 2021 at 03:15:35PM +0100, Ard Biesheuvel wrote:
>On Thu, 18 Mar 2021 at 14:03, Sasha Levin <sashal@kernel.org> wrote:
>> What about anything older than 5.10? Looks like it's needed there too?
>>
>
>Yes, 4.19 and 5.4 should probably get this too. They should apply with
>minimal effort, afaict. The only conflicting change is
>34fdce6981b96920ced4e0ee56e9db3fb03a33f0, which changed
>
>--- a/arch/x86/crypto/aesni-intel_asm.S
>+++ b/arch/x86/crypto/aesni-intel_asm.S
>@@ -2758,7 +2758,7 @@ SYM_FUNC_START(aesni_xts_crypt8)
>        pxor INC, STATE4
>        movdqu IV, 0x30(OUTP)
>
>-       CALL_NOSPEC %r11
>+       CALL_NOSPEC r11
>
>        movdqu 0x00(OUTP), INC
>        pxor INC, STATE1
>@@ -2803,7 +2803,7 @@ SYM_FUNC_START(aesni_xts_crypt8)
>        _aesni_gf128mul_x_ble()
>        movups IV, (IVP)
>
>-       CALL_NOSPEC %r11
>+       CALL_NOSPEC r11
>
>        movdqu 0x40(OUTP), INC
>        pxor INC, STATE1
>
>but those CALL_NOSPEC calls are being removed by this patch anyway, so
>that shouldn't matter.

Hm, I'm seeing a lot more conflicts on 5.4 that I'm not too comfortable
with resolving.

I should be taking just these two, right?

	032d049ea0f4 ("crypto: aesni - Use TEST %reg,%reg instead of CMP $0,%reg")
	86ad60a65f29 ("crypto: x86/aes-ni-xts - use direct calls to and 4-way stride")

-- 
Thanks,
Sasha

  reply	other threads:[~2021-03-18 16:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-16  9:21 stable request Thomas Backlund
2021-03-16 10:17 ` Ard Biesheuvel
2021-03-16 12:15   ` Thomas Backlund
2021-03-16 12:28     ` Thomas Backlund
2021-03-16 12:35       ` Ard Biesheuvel
2021-03-18 13:03         ` Sasha Levin
2021-03-18 14:15           ` Ard Biesheuvel
2021-03-18 16:42             ` Sasha Levin [this message]
2021-03-18 17:13               ` Ard Biesheuvel
2021-03-18 17:45                 ` Ard Biesheuvel
2021-03-19  7:35           ` Thomas Backlund
2021-03-19 10:50             ` Greg KH
2021-03-19 12:10               ` Sasha Levin
  -- strict thread matches above, loose matches on Subject: below --
2021-03-16  6:37 Ard Biesheuvel

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=YFODCo5hbvO+Vp5x@sashalap \
    --to=sashal@kernel.org \
    --cc=ardb@kernel.org \
    --cc=ebiggers@kernel.org \
    --cc=herbert@gondor.apana.org.au \
    --cc=linux-crypto@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=tmb@tmb.nu \
    /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).