diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2020-09-15 13:30:24 +1000 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2020-09-25 17:48:13 +1000 |
| commit | 255f6c2e74b136662a191652d688bd7566c94bf6 (patch) | |
| tree | c13b3ae2dd3f77e3556a1732d3758f40bd67b944 /lib/crypto | |
| parent | 63cdd870ab058e750b7358a979f8baccbbdcfdcc (diff) | |
| download | linux-stable-255f6c2e74b136662a191652d688bd7566c94bf6.tar.gz linux-stable-255f6c2e74b136662a191652d688bd7566c94bf6.tar.bz2 linux-stable-255f6c2e74b136662a191652d688bd7566c94bf6.zip | |
crypto: lib/chacha20poly1305 - Set SG_MITER_ATOMIC unconditionally
There is no reason for the chacha20poly1305 SG miter code to use
kmap instead of kmap_atomic as the critical section doesn't sleep
anyway. So we can simply get rid of the preemptible check and
set SG_MITER_ATOMIC unconditionally.
Even if we need to reenable preemption to lower latency we should
be doing that by interrupting the SG miter walk rather than using
kmap.
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'lib/crypto')
| -rw-r--r-- | lib/crypto/chacha20poly1305.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/crypto/chacha20poly1305.c b/lib/crypto/chacha20poly1305.c index 431e04280332..5850f3b87359 100644 --- a/lib/crypto/chacha20poly1305.c +++ b/lib/crypto/chacha20poly1305.c @@ -251,9 +251,7 @@ bool chacha20poly1305_crypt_sg_inplace(struct scatterlist *src, poly1305_update(&poly1305_state, pad0, 0x10 - (ad_len & 0xf)); } - flags = SG_MITER_TO_SG; - if (!preemptible()) - flags |= SG_MITER_ATOMIC; + flags = SG_MITER_TO_SG | SG_MITER_ATOMIC; sg_miter_start(&miter, src, sg_nents(src), flags); |