(+ linux-rt folks)
On Wed, 22 Apr 2020 at 06:04, Eric Biggers <ebiggers@xxxxxxxxxx> wrote:
>
> On Mon, Apr 20, 2020 at 01:57:11AM -0600, Jason A. Donenfeld wrote:
> > The initial Zinc patchset, after some mailing list discussion, contained
> > code to ensure that kernel_fpu_enable would not be kept on for more than
> > a PAGE_SIZE chunk, since it disables preemption. The choice of PAGE_SIZE
> > isn't totally scientific, but it's not a bad guess either, and it's
> > what's used in both the x86 poly1305 and blake2s library code already.
> > Unfortunately it appears to have been left out of the final patchset
> > that actually added the glue code. So, this commit adds back the
> > PAGE_SIZE chunking.
> >
> > Fixes: 84e03fa39fbe ("crypto: x86/chacha - expose SIMD ChaCha routine as library function")
> > Fixes: b3aad5bad26a ("crypto: arm64/chacha - expose arm64 ChaCha routine as library function")
> > Fixes: a44a3430d71b ("crypto: arm/chacha - expose ARM ChaCha routine as library function")
> > Fixes: f569ca164751 ("crypto: arm64/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation")
> > Fixes: a6b803b3ddc7 ("crypto: arm/poly1305 - incorporate OpenSSL/CRYPTOGAMS NEON implementation")
> > Cc: Eric Biggers <ebiggers@xxxxxxxxxx>
> > Cc: Ard Biesheuvel <ardb@xxxxxxxxxx>
> > Cc: stable@xxxxxxxxxxxxxxx
> > Signed-off-by: Jason A. Donenfeld <Jason@xxxxxxxxx>
> > ---
> > Eric, Ard - I'm wondering if this was in fact just an oversight in Ard's
> > patches, or if there was actually some later discussion in which we
> > concluded that the PAGE_SIZE chunking wasn't required, perhaps because
> > of FPU changes. If that's the case, please do let me know, in which case
> > I'll submit a _different_ patch that removes the chunking from x86 poly
> > and blake. I can't find any emails that would indicate that, but I might
> > be mistaken.
> >
> > arch/arm/crypto/chacha-glue.c | 16 +++++++++++++---
> > arch/arm/crypto/poly1305-glue.c | 17 +++++++++++++----
> > arch/arm64/crypto/chacha-neon-glue.c | 16 +++++++++++++---
> > arch/arm64/crypto/poly1305-glue.c | 17 +++++++++++++----
> > arch/x86/crypto/chacha_glue.c | 16 +++++++++++++---
> > 5 files changed, 65 insertions(+), 17 deletions(-)
>
> I don't think you're missing anything. On x86, kernel_fpu_begin() and
> kernel_fpu_end() did get optimized in v5.2. But they still disable preemption,
> which is the concern here.
>
My memory is a bit fuzzy here. I remember talking to the linux-rt guys
about what delay is actually acceptable, which was a lot higher than I
had thought based on their initial reports about scheduling blackouts
on arm64 due to preemption remaining disabled for too long. I intended
to revisit this with more accurate bounds but then I apparently
forgot.
So SIMD chacha20 and SIMD poly1305 both run in <5 cycles per bytes,
both on x86 and ARM. If we take 20 microseconds as a ballpark upper
bound for how long preemption may be disabled, that gives us ~4000
bytes of ChaCha20 or Poly1305 on a hypothetical 1 GHz core.
So I think 4 KB is indeed a reasonable quantum of work here. Only
PAGE_SIZE is not necessarily equal to 4 KB on arm64, so we should use
SZ_4K instead.
*However*, at the time, the report was triggered by the fact that we
were keeping SIMD enabled across calls into the scatterwalk API, which
may call kmalloc()/kfree() etc. There is no need for that anymore, now
that the FPU begin/end routines all have been optimized to restore the
userland SIMD state lazily.
So do we have any callers that are likely to pass more than 4 KB of
input at a time? AF_ALG perhaps? Is this code path covered by the
tcrypt tests? Even if we all agree that this chunking is probably
needed, I'd still like us to have an idea of when/how it is likely to
get exercised.
> >
> > diff --git a/arch/arm/crypto/chacha-glue.c b/arch/arm/crypto/chacha-glue.c
> > index 6fdb0ac62b3d..0e29ebac95fd 100644
> > --- a/arch/arm/crypto/chacha-glue.c
> > +++ b/arch/arm/crypto/chacha-glue.c
> > @@ -91,9 +91,19 @@ void chacha_crypt_arch(u32 *state, u8 *dst, const u8 *src, unsigned int bytes,
> > return;
> > }
> >
> > - kernel_neon_begin();
> > - chacha_doneon(state, dst, src, bytes, nrounds);
> > - kernel_neon_end();
> > + for (;;) {
> > + unsigned int todo = min_t(unsigned int, PAGE_SIZE, bytes);
> > +
> > + kernel_neon_begin();
> > + chacha_doneon(state, dst, src, todo, nrounds);
> > + kernel_neon_end();
> > +
> > + bytes -= todo;
> > + if (!bytes)
> > + break;
> > + src += todo;
> > + dst += todo;
> > + }
> > }
> > EXPORT_SYMBOL(chacha_crypt_arch);
>
> Seems this should just be a 'while' loop?
>
> while (bytes) {
> unsigned int todo = min_t(unsigned int, PAGE_SIZE, bytes);
>
> kernel_neon_begin();
> chacha_doneon(state, dst, src, todo, nrounds);
> kernel_neon_end();
>
> bytes -= todo;
> src += todo;
> dst += todo;
> }
>
> Likewise elsewhere in this patch. (For Poly1305, len >= POLY1305_BLOCK_SIZE at
> the beginning, so that could use a 'do' loop.)
>
> - Eric
