From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795036039; b=PM4fmZsefw+WGIGI7vTykrCvkyEcx/JEbtt68FLkruRa274CzkovDZx2mlG8dJ8iQD5U Kc786OmfTbGCN5bdeao1V+Gmh3lwEH5Wk/691tFgqgtV2XsA+rpRlx8ccFbVXYDM8krVs hznqe1VkXSEyGy2UhJ1rWuRk2gE8Xo666t5m1M3RxElTX7LD0L5UETiHkVdUUw70pIy+k PTa6ZqAaJLhzmrq2Krg6LMTsqV2AzbLAgs8BBK62Ha/emtJX4gLBzICsmfFEgIUb5ERNS a8p7fH8Y2TkLyntFvsW7TC3NzQXkuRHRPF6N6jVDfvSNhMzZvbJStqAwatgVgpqBxOA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795036039; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=5nW0ZhEwVL3j7Gn9eBPh9ifbLAVmtqjf9I9dSRvjVJI=; b=lkIjpFnjVhOvPCyvYuSMPF0uq7ArB3rcAGi28t1h61ey0N4RXmhI4T7GJvURjdFCQKN6 fzwGJ+NF8MfBa6ng49rGM9n26J0hApXT/JjeCNHeqrxrBA0vFapvffWOjXytY+jqVlhUJ Ay+5OdI6lQE4l3y9HFLpYZFIyPsHL7h/R0SKIIFpgclL0Pre8xObnuAMFM2hwNg7PGyer HzAFYKiPBqALkcJY08Rs3yM8Q3PEapPgg8NC12d6lI5Gp1r9kEGlTrtsDzWuG78FSE7Ks E6gLVGZUvgfA0Ns4xYsmTTF52Rk/B4wkoG2FF2lvkfS/q9jniMnVOnkmpZs/MxLfc4Q== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=CSf72NT6; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8EF8606A31C; Wed, 18 Nov 2026 21:07:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=CSf72NT6 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23C601F000C4; Wed, 18 Nov 2026 21:07:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795036039; bh=5nW0ZhEwVL3j7Gn9eBPh9ifbLAVmtqjf9I9dSRvjVJI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CSf72NT61pRC6AKHeZ0qf9GMLBtI34HqtgSGfLTJkILk0vo6q7L0667DmQBrIrYYl h4vet1yXJJrku3t9nZMJr+uwrA9tNJ4AKYXXqRJWN0RD9pykG6V2n0+UAE7WiSliDb LNp+bA3CQWnmNwbSCOU979vaYudGcdTGcoR/v/qs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Weili Qian , Herbert Xu , Sasha Levin Subject: [PATCH 6.6 0915/3318] crypto: hisilicon/hpre - fix GFP flags for dma_alloc_coherent Date: Wed, 18 Nov 2026 15:25:37 +0100 Message-ID: <20261118150346.969419906@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150313.527275416@linuxfoundation.org> References: <20261118150313.527275416@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Weili Qian [ Upstream commit 40ec9605cb195e065470f8f23ef94b1b541411a3 ] The HPRE driver hard-codes GFP_ATOMIC for RSA/DH and GFP_KERNEL for ECDH. This may cause "scheduling while atomic" in atomic context or unnecessary allocation failures under memory pressure. Select GFP flags dynamically based on CRYPTO_TFM_REQ_MAY_SLEEP and store them in hpre_asym_request::flags. The areq field is a union of rsa/dh/ecdh request pointers; reading base.flags through any union member other than the one that was written would be type-punning, so a dedicated flags field avoids that. Fixes: 98dfa9343f37 ("crypto: hisilicon/hpre - don't use GFP_KERNEL to alloc mem during softirq") Cc: stable@vger.kernel.org Signed-off-by: Weili Qian Signed-off-by: Herbert Xu Signed-off-by: Sasha Levin --- drivers/crypto/hisilicon/hpre/hpre_crypto.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/crypto/hisilicon/hpre/hpre_crypto.c b/drivers/crypto/hisilicon/hpre/hpre_crypto.c index 2d2dc969f40d8..81a3e0c8a358d 100644 --- a/drivers/crypto/hisilicon/hpre/hpre_crypto.c +++ b/drivers/crypto/hisilicon/hpre/hpre_crypto.c @@ -145,6 +145,7 @@ struct hpre_asym_request { int req_id; hpre_cb cb; struct timespec64 req_time; + u32 flags; }; static inline unsigned int hpre_align_sz(void) @@ -259,6 +260,7 @@ static int hpre_prepare_dma_buf(struct hpre_asym_request *hpre_req, struct scatterlist *data, unsigned int len, int is_src, dma_addr_t *tmp) { + gfp_t gfp = hpre_req->flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC; struct hpre_ctx *ctx = hpre_req->ctx; struct device *dev = ctx->dev; void *ptr; @@ -268,7 +270,7 @@ static int hpre_prepare_dma_buf(struct hpre_asym_request *hpre_req, if (unlikely(shift < 0)) return -EINVAL; - ptr = dma_alloc_coherent(dev, ctx->key_sz, tmp, GFP_ATOMIC); + ptr = dma_alloc_coherent(dev, ctx->key_sz, tmp, gfp); if (unlikely(!ptr)) return -ENOMEM; @@ -530,6 +532,7 @@ static int hpre_msg_request_set(struct hpre_ctx *ctx, void *req, bool is_rsa) h_req = PTR_ALIGN(tmp, hpre_align_sz()); h_req->cb = hpre_rsa_cb; h_req->areq.rsa = akreq; + h_req->flags = akreq->base.flags; msg = &h_req->req; memset(msg, 0, sizeof(*msg)); } else { @@ -544,6 +547,7 @@ static int hpre_msg_request_set(struct hpre_ctx *ctx, void *req, bool is_rsa) h_req = PTR_ALIGN(tmp, hpre_align_sz()); h_req->cb = hpre_dh_cb; h_req->areq.dh = kreq; + h_req->flags = kreq->base.flags; msg = &h_req->req; memset(msg, 0, sizeof(*msg)); msg->key = cpu_to_le64(ctx->dh.dma_xa_p); @@ -1511,6 +1515,7 @@ static int hpre_ecdh_msg_request_set(struct hpre_ctx *ctx, h_req = PTR_ALIGN(tmp, hpre_align_sz()); h_req->cb = hpre_ecdh_cb; h_req->areq.ecdh = req; + h_req->flags = req->base.flags; msg = &h_req->req; memset(msg, 0, sizeof(*msg)); msg->in = cpu_to_le64(DMA_MAPPING_ERROR); @@ -1532,6 +1537,7 @@ static int hpre_ecdh_msg_request_set(struct hpre_ctx *ctx, static int hpre_ecdh_src_data_init(struct hpre_asym_request *hpre_req, struct scatterlist *data, unsigned int len) { + gfp_t gfp = hpre_req->flags & CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL : GFP_ATOMIC; struct hpre_sqe *msg = &hpre_req->req; struct hpre_ctx *ctx = hpre_req->ctx; struct device *dev = ctx->dev; @@ -1545,7 +1551,7 @@ static int hpre_ecdh_src_data_init(struct hpre_asym_request *hpre_req, if (unlikely(shift < 0)) return -EINVAL; - ptr = dma_alloc_coherent(dev, ctx->key_sz << 2, &dma, GFP_KERNEL); + ptr = dma_alloc_coherent(dev, ctx->key_sz << 2, &dma, gfp); if (unlikely(!ptr)) return -ENOMEM; -- 2.53.0