From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: linux-crypto@vger.kernel.org, herbert@gondor.apana.org.au,
giovanni.cabiddu@intel.com
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH v2 1/3] crypto: scompress - don't sleep with preemption disabled
Date: Fri, 21 Jul 2017 16:42:36 +0100 [thread overview]
Message-ID: <20170721154238.21697-2-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20170721154238.21697-1-ard.biesheuvel@linaro.org>
Due to the use of per-CPU buffers, scomp_acomp_comp_decomp() executes
with preemption disabled, and so whether the CRYPTO_TFM_REQ_MAY_SLEEP
flag is set is irrelevant, since we cannot sleep anyway. So disregard
the flag, and use GFP_ATOMIC unconditionally.
Cc: <stable@vger.kernel.org> # v4.10+
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
crypto/scompress.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/crypto/scompress.c b/crypto/scompress.c
index ae1d3cf209e4..0b40d991d65f 100644
--- a/crypto/scompress.c
+++ b/crypto/scompress.c
@@ -211,9 +211,7 @@ static int scomp_acomp_comp_decomp(struct acomp_req *req, int dir)
scratch_dst, &req->dlen, *ctx);
if (!ret) {
if (!req->dst) {
- req->dst = crypto_scomp_sg_alloc(req->dlen,
- req->base.flags & CRYPTO_TFM_REQ_MAY_SLEEP ?
- GFP_KERNEL : GFP_ATOMIC);
+ req->dst = crypto_scomp_sg_alloc(req->dlen, GFP_ATOMIC);
if (!req->dst)
goto out;
}
--
2.11.0
next prev parent reply other threads:[~2017-07-21 15:42 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-21 15:42 [PATCH v2 0/3] crypto: scompress - defer allocation of percpu scratch buffers Ard Biesheuvel
2017-07-21 15:42 ` Ard Biesheuvel [this message]
2017-07-21 15:42 ` [PATCH v2 2/3] crypto: scompress - free partially allocated scratch buffers on failure Ard Biesheuvel
2017-07-21 15:42 ` [PATCH v2 3/3] crypto: scompress - defer allocation of scratch buffer to first use Ard Biesheuvel
2017-07-25 23:36 ` Giovanni Cabiddu
2017-07-26 0:07 ` Ard Biesheuvel
2017-07-28 9:13 ` Giovanni Cabiddu
2017-08-03 6:24 ` [PATCH v2 0/3] crypto: scompress - defer allocation of percpu scratch buffers Herbert Xu
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=20170721154238.21697-2-ard.biesheuvel@linaro.org \
--to=ard.biesheuvel@linaro.org \
--cc=giovanni.cabiddu@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-crypto@vger.kernel.org \
/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).