From nobody Fri Sep 25 14:31:46 2026 Received: from canpmsgout06.his.huawei.com (canpmsgout06.his.huawei.com [113.46.200.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 106AD340A7F; Fri, 11 Sep 2026 10:29:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.221 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122591; cv=none; b=GsbTESLi5AmaSLEW0f4hDY6FyMasyCT5liVjNiQss69j9Xzm21zqm8BdApGqsjBENXFpXwdSfsK/TIntvfIu3HTp0yySH8nou1NomguN2fpk21F10/Ung7ULu9kMkL7hi41eODmYjWJyYRVC9h4zIBO8EQgGCmvx0XfXLCtEK/E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122591; c=relaxed/simple; bh=IrKWIJ7QMNC5hE6Fm3l0kETZfyC10H9hmqoDCwbKpQo=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Y1gKPCIvhQO2GY03fMC5VAiQuyooBsJIix+tDV1JGbhO7PngQVgYi0i4o65PT1/3Gh5HqYY7ibRW19pDR2GlADUc9v+LpXb20PzHCC5/9QMIm3uBWdVbAhBGVE6nj2E5XwpfsUZviuzx4FS+vykxrLOXUKNX4NlnHMg47Ff2CGA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=M7XkN2OI; arc=none smtp.client-ip=113.46.200.221 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="M7XkN2OI" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=mB3uXMOP0bJMj505X9gNfPZ7qfnx0MMTWbOtcjOZDJA=; b=M7XkN2OIYLEeMAaNj394Z1UhR7g86SFkIEjYmOKXsIpaIBqzhDRn24jv2gjW6sgYbkW/GwXiP zDopKVaDYzRUNFNT4P4EQH1GenmOh2y1a+mMOBzWO4nnSTe/sSXN5jdY4H/3OPOONOuNz77RwSg iH2hzwTNC/u679LSdmyDQbg= Received: from mail.maildlp.com (unknown [172.19.163.0]) by canpmsgout06.his.huawei.com (SkyGuard) with ESMTPS id 4hh9W01qRJzRhQs; Fri, 11 Sep 2026 18:18:52 +0800 (CST) Received: from whupemk200001.china.huawei.com (unknown [7.152.184.93]) by mail.maildlp.com (Postfix) with ESMTPS id 821A840537; Fri, 11 Sep 2026 18:29:45 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by whupemk200001.china.huawei.com (7.152.184.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 11 Sep 2026 18:29:44 +0800 From: Chenghai Huang To: , CC: , , , , , Subject: [PATCH 1/4] crypto: hisilicon/qm - fix devm_kcalloc argument order Date: Fri, 11 Sep 2026 18:29:39 +0800 Message-ID: <20260911102942.387778-2-huangchenghai2@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260911102942.387778-1-huangchenghai2@huawei.com> References: <20260911102942.387778-1-huangchenghai2@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To whupemk200001.china.huawei.com (7.152.184.93) Content-Type: text/plain; charset="utf-8" From: Wenkai Lin The n and size arguments of devm_kcalloc in qm_pre_store_caps() are swapped. Fix the order to match the kcalloc(n, size, flags) convention. Fixes: 7c234e138c67 ("crypto: hisilicon/qm - replace devm_kzalloc with devm= _kcalloc") Signed-off-by: Wenkai Lin Signed-off-by: Chenghai Huang --- drivers/crypto/hisilicon/qm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index c01966a4a33f..e915cacef5c0 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -5732,7 +5732,7 @@ static int qm_pre_store_caps(struct hisi_qm *qm) size_t i, size; =20 size =3D ARRAY_SIZE(qm_cap_query_info); - qm_cap =3D devm_kcalloc(&pdev->dev, sizeof(*qm_cap), size, GFP_KERNEL); + qm_cap =3D devm_kcalloc(&pdev->dev, size, sizeof(*qm_cap), GFP_KERNEL); if (!qm_cap) return -ENOMEM; =20 --=20 2.43.0 From nobody Fri Sep 25 14:31:46 2026 Received: from canpmsgout03.his.huawei.com (canpmsgout03.his.huawei.com [113.46.200.218]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B5DBE429838; Fri, 11 Sep 2026 10:29:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.218 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122592; cv=none; b=b09Gkg4btwEeMS4JhAsJn5pjFJwKWz23gz/WQMbCmVnJAcRe7V8Pw3uFx7Fx+ekjBCcTqGZhyqTQXNQFdjHnNWmP453+UrCHBZASVXfwHyJ7HcvZGctlFm0ZyUOEs6ccnV2TE/3clihrti97OanarE2owRpdP8P7Qo07IDpVzAM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122592; c=relaxed/simple; bh=oy8V1oY5BuE2EcujppGbwVp6bL3xO2L1dntOy8uHZlE=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=iy7y8YcHC5ZHwo4HsBp2fioCPwsDbdSmMHZNWGYFKShWC+d8X7mv0r0ZehIjJObJhfDzQNgRe88FZn9+LD7VNn0hhxLeb35mXxCEZm24rczT0apsJ+BoFMNij8CN4SFc+0zo6S2i28pgENI4u3w9RbYPzXkCDzAijfQfxcaV4Ds= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=v04WmE8M; arc=none smtp.client-ip=113.46.200.218 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="v04WmE8M" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=qlh1uoHDxvxCILcdR5iou+SpPCfOhn5G3AHfbnPvEZI=; b=v04WmE8M+yvVccINenn2qHHnx/86OnVvRUV+Ai19gAvIQjusI3wkrq0R8JMXKfOJTQjM+4Tme kfbmgj7iRz1UvjiGNIXSiH2XLbLXyzrWeI+sZqRE7LZZASi8rHfIrEZOze4/bYdaJsDr/BJa+Wd tjnNpYPNMEovmzax0llRDjc= Received: from mail.maildlp.com (unknown [172.19.163.104]) by canpmsgout03.his.huawei.com (SkyGuard) with ESMTPS id 4hh9V93s8dzpSvD; Fri, 11 Sep 2026 18:18:09 +0800 (CST) Received: from whupemk200001.china.huawei.com (unknown [7.152.184.93]) by mail.maildlp.com (Postfix) with ESMTPS id 533304057F; Fri, 11 Sep 2026 18:29:46 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by whupemk200001.china.huawei.com (7.152.184.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 11 Sep 2026 18:29:45 +0800 From: Chenghai Huang To: , CC: , , , , , Subject: [PATCH 2/4] crypto: hisilicon/sec2 - fix scheduling while atomic in aead soft fallback Date: Fri, 11 Sep 2026 18:29:40 +0800 Message-ID: <20260911102942.387778-3-huangchenghai2@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260911102942.387778-1-huangchenghai2@huawei.com> References: <20260911102942.387778-1-huangchenghai2@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To whupemk200001.china.huawei.com (7.152.184.93) Content-Type: text/plain; charset="utf-8" From: Wenkai Lin sec_aead_soft_crypto() allocates the sub-request with GFP_KERNEL, which may sleep. This is safe when called directly from sec_aead_crypto() (process context), but the function is also reachable through the backlog drain path. When an AEAD request sits in the backlog queue and qp_send_message() returns a non-EBUSY error, the backlog is drained in software while the backlog spinlock is still held. The GFP_KERNEL allocation inside aead_request_alloc() can then schedule out, triggering scheduling while atomic. Fix it by switching the allocation to GFP_ATOMIC so it is safe in both the process-context path and the spinlock-held backlog drain path. Fixes: 0a2a464f8631 ("crypto: hisilicon/sec - fix the aead software fallbac= k for engine") Signed-off-by: Wenkai Lin Signed-off-by: Chenghai Huang --- drivers/crypto/hisilicon/sec2/sec_crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/sec2/sec_crypto.c b/drivers/crypto/hi= silicon/sec2/sec_crypto.c index 0a2f7c8b44fc..bbb6826ab256 100644 --- a/drivers/crypto/hisilicon/sec2/sec_crypto.c +++ b/drivers/crypto/hisilicon/sec2/sec_crypto.c @@ -2533,7 +2533,7 @@ static int sec_aead_soft_crypto(struct sec_ctx *ctx, struct aead_request *subreq; int ret; =20 - subreq =3D aead_request_alloc(a_ctx->fallback_aead_tfm, GFP_KERNEL); + subreq =3D aead_request_alloc(a_ctx->fallback_aead_tfm, GFP_ATOMIC); if (!subreq) return -ENOMEM; =20 --=20 2.43.0 From nobody Fri Sep 25 14:31:46 2026 Received: from canpmsgout01.his.huawei.com (canpmsgout01.his.huawei.com [113.46.200.216]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D6A3542BE93; Fri, 11 Sep 2026 10:29:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.216 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122593; cv=none; b=mghXhG/IA6Dqy/ohKbusrEZY0z8cs5CaZrF/3UopjHj5JW5IQkF+BfQkRYl0PbmbQ/c4XxyB0Z/BuBJGeeVLYnpYfWGBXkAMlOU0VOJKc5eL9jaZwcYmmcKKkpUAeJkscaB5W68+loWbUAQP2UwN2OczPN51CFD2DqH98IHiq3g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122593; c=relaxed/simple; bh=6+yM8RyY0lple2vyuGGrfcoOL61ZK5XFYhTCEXNR6qk=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=DDiOcB+uiUWxscPjLDvJCLF4fyQDAqBvRJv1wY7PxZFPFu2KfV2BogSG5XlWNT6JO/ZUEWOT3dXRlvFOowOI60S+4Adc9CXXytyQ/9wtO9kKSbD8jdGXNnZdD/yRLBtuB+JxP/CoWCvcSazzVgSIpG12C8g8vEM9Nm6JBMTudS4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=5jnA4dq9; arc=none smtp.client-ip=113.46.200.216 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="5jnA4dq9" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=1vC1dipBzi5VPWTFrtqb/gr0BglC0lgOI2GhnaEr1Zs=; b=5jnA4dq9VaC1/snZXKcsPc//A28fFhigwffGtmTHC4SVVKeORkDhZ24Ar1CghN83oHQ5lXzoT VABzjh5VI7i0rxPa6/moKL0cEoXEDJrkkOvSEU8x4sdNWQEPH1dlqWAW5uQxSHTCHCqRctO+PMv Tyw5GU+b7OEiDr2dxJl5B+A= Received: from mail.maildlp.com (unknown [172.19.162.140]) by canpmsgout01.his.huawei.com (SkyGuard) with ESMTPS id 4hh9VD52pVz1T4Mc; Fri, 11 Sep 2026 18:18:12 +0800 (CST) Received: from whupemk200001.china.huawei.com (unknown [7.152.184.93]) by mail.maildlp.com (Postfix) with ESMTPS id 212C8202E6; Fri, 11 Sep 2026 18:29:47 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by whupemk200001.china.huawei.com (7.152.184.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 11 Sep 2026 18:29:46 +0800 From: Chenghai Huang To: , CC: , , , , , Subject: [PATCH 3/4] crypto: hisilicon/qm - fix memory leak in hisi_qm_sort_devices Date: Fri, 11 Sep 2026 18:29:41 +0800 Message-ID: <20260911102942.387778-4-huangchenghai2@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260911102942.387778-1-huangchenghai2@huawei.com> References: <20260911102942.387778-1-huangchenghai2@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To whupemk200001.china.huawei.com (7.152.184.93) Content-Type: text/plain; charset="utf-8" From: Wenkai Lin hisi_qm_sort_devices() allocates a struct hisi_qm_resource for each QM device and inserts it into one of two local lists (non_full_list or full_list). If kzalloc() fails mid-loop, the function returns -ENOMEM immediately without freeing the resources already inserted into the local lists. Because the splice into the caller's @head list happens only after the loop completes, the caller's free_list(&head) cannot reclaim them, so the already-allocated res entries are lost. Fix by freeing both local lists before returning -ENOMEM. Fixes: 2a75decec119 ("crypto: hisilicon/qm - optimize device selection prio= rity based on queue ref count and NUMA distance") Signed-off-by: Wenkai Lin Signed-off-by: Chenghai Huang --- drivers/crypto/hisilicon/qm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index e915cacef5c0..0448c68dbde4 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -3846,8 +3846,11 @@ static int hisi_qm_sort_devices(int node, struct lis= t_head *head, dev_node =3D 0; =20 res =3D kzalloc_obj(*res); - if (!res) + if (!res) { + free_list(&non_full_list); + free_list(&full_list); return -ENOMEM; + } =20 res->qm =3D qm; res->distance =3D node_distance(dev_node, node); --=20 2.43.0 From nobody Fri Sep 25 14:31:46 2026 Received: from canpmsgout02.his.huawei.com (canpmsgout02.his.huawei.com [113.46.200.217]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2A33B443C18; Fri, 11 Sep 2026 10:29:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=113.46.200.217 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122598; cv=none; b=ijOKNL93h3tvMyNzILq5Cfpr40QN6dij3Y2koeLaNa1DU4LmGttYpvdLBs5RJQ/1JPjK1mhbzYrSXs1Et6ZgtWZSyGiN6Y6Mvu/5scUH9U2H3fN7KY4M5fCY4Cjl2L69xjDwUNHbJfluFNPuYbN+bCbBcBZJGLch9Wa4h6nqYeg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789122598; c=relaxed/simple; bh=WCL7uOgiifywLHFHGRoos098dzPPZCj55DHJwok+QIM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=lEjX59ZpamzjkAAoqDpyAEsmRxbuqVz1bv4isMLpesdtSJCo/EZSlZHrVrcn/gC6nzAEiA3B8OZBWbnetMkrelp4Wa3v+uvNQQ2qSQBDa5BdZl5qw7CPwDEki40WqHCQ0tgHrXWhI+EvvIalLoGqHLq+BWOXGbne1/XQ9ouYKxs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b=FyAl8mkp; arc=none smtp.client-ip=113.46.200.217 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=huawei.com header.i=@huawei.com header.b="FyAl8mkp" dkim-signature: v=1; a=rsa-sha256; d=huawei.com; s=dkim; c=relaxed/relaxed; q=dns/txt; h=From; bh=P7dbQrqU/eRsFN4xEwuK1Epg9+fUboCEIZ8/RgquGGI=; b=FyAl8mkpi1hcDJ+bLHLahXURkoEwRycZww4ZSWqJbJEN99dLst7TKXP8iG4i10NYVMGHX/JSq HMvh1LJqicT0yXDGHmwE+6ttHcVvE9v0hDuNOucHAA3NQqPU4dNDg7giWz+u1ITA2MlgAh4UJSZ nftOiGP7CeQhTTNqVmKCKZs= Received: from mail.maildlp.com (unknown [172.19.162.197]) by canpmsgout02.his.huawei.com (SkyGuard) with ESMTPS id 4hh9Vs4cbqzcb3G; Fri, 11 Sep 2026 18:18:45 +0800 (CST) Received: from whupemk200001.china.huawei.com (unknown [7.152.184.93]) by mail.maildlp.com (Postfix) with ESMTPS id E716340579; Fri, 11 Sep 2026 18:29:47 +0800 (CST) Received: from localhost.localdomain (10.50.163.32) by whupemk200001.china.huawei.com (7.152.184.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.45; Fri, 11 Sep 2026 18:29:46 +0800 From: Chenghai Huang To: , CC: , , , , , Subject: [PATCH 4/4] crypto: hisilicon/qm - fix GFP flag inconsistency in hisi_qm_memory_init Date: Fri, 11 Sep 2026 18:29:42 +0800 Message-ID: <20260911102942.387778-5-huangchenghai2@huawei.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260911102942.387778-1-huangchenghai2@huawei.com> References: <20260911102942.387778-1-huangchenghai2@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: kwepems200002.china.huawei.com (7.221.188.68) To whupemk200001.china.huawei.com (7.152.184.93) Content-Type: text/plain; charset="utf-8" From: Wenkai Lin hisi_qm_memory_init() is called from hisi_qm_init() (process context) but uses GFP_ATOMIC for dma_alloc_coherent(). The equivalent allocation in qm_alloc_xqc_dma() uses GFP_KERNEL. GFP_ATOMIC cannot reclaim or compact memory, so it fails more easily under memory pressure even though sleeping is allowed here. Switch to GFP_KERNEL, which is safe in process context and consistent with qm_alloc_xqc_dma(). Fixes: 5308f6600a39 ("crypto: hisilicon - QM memory management optimization= ") Signed-off-by: Wenkai Lin Signed-off-by: Chenghai Huang --- drivers/crypto/hisilicon/qm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/hisilicon/qm.c b/drivers/crypto/hisilicon/qm.c index 0448c68dbde4..a5593ee3889c 100644 --- a/drivers/crypto/hisilicon/qm.c +++ b/drivers/crypto/hisilicon/qm.c @@ -6067,7 +6067,7 @@ static int hisi_qm_memory_init(struct hisi_qm *qm) QMC_ALIGN(sizeof(struct qm_sqc) * qm->qp_num) + QMC_ALIGN(sizeof(struct qm_cqc) * qm->qp_num); qm->qdma.va =3D dma_alloc_coherent(dev, qm->qdma.size, &qm->qdma.dma, - GFP_ATOMIC); + GFP_KERNEL); dev_dbg(dev, "allocate qm dma buf size=3D%zx)\n", qm->qdma.size); if (!qm->qdma.va) { ret =3D -ENOMEM; --=20 2.43.0