From nobody Fri Dec 19 17:33:12 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D3661C38A2D for ; Mon, 24 Oct 2022 13:35:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232604AbiJXNdb (ORCPT ); Mon, 24 Oct 2022 09:33:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236087AbiJXN3f (ORCPT ); Mon, 24 Oct 2022 09:29:35 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E324AC284; Mon, 24 Oct 2022 05:32:44 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4CBE4612EA; Mon, 24 Oct 2022 12:28:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5EE4FC433C1; Mon, 24 Oct 2022 12:28:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614486; bh=rOZy5jmHipFrh/N8gaOxnhHAc/Cy3p/sYUSneBQ699w=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A3Gk6v6H8Dy3idm1DU5qyn20PdnWM1EvN/GYXvmFAf5dsaoJxJJ2uyrX+pwteSEsm r136orKZXkPrZEWlRQm11IFdZalV/try7mAKzZojdU83RqXRM8S6pS+Sf/ytXD/GUh 8OQiP2V31H6pBb94/Udvfe0aa3CoOEd81f+gVE8U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hui Tang , kernel test robot , Dan Carpenter , Herbert Xu , Sasha Levin Subject: [PATCH 5.10 279/390] crypto: qat - fix use of dma_map_single Date: Mon, 24 Oct 2022 13:31:16 +0200 Message-Id: <20221024113034.829454728@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Hui Tang [ Upstream commit 7cc05071f930a631040fea16a41f9d78771edc49 ] DMA_TO_DEVICE synchronisation must be done after the last modification of the memory region by the software and before it is handed off to the device. Signed-off-by: Hui Tang Reported-by: kernel test robot Reported-by: Dan Carpenter Signed-off-by: Herbert Xu Stable-dep-of: cf5bb835b7c8 ("crypto: qat - fix DMA transfer direction") Signed-off-by: Sasha Levin --- drivers/crypto/qat/qat_common/qat_algs.c | 27 ++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/drivers/crypto/qat/qat_common/qat_algs.c b/drivers/crypto/qat/= qat_common/qat_algs.c index 06abe1e2074e..8625e299d445 100644 --- a/drivers/crypto/qat/qat_common/qat_algs.c +++ b/drivers/crypto/qat/qat_common/qat_algs.c @@ -669,8 +669,8 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instan= ce *inst, int n =3D sg_nents(sgl); struct qat_alg_buf_list *bufl; struct qat_alg_buf_list *buflout =3D NULL; - dma_addr_t blp; - dma_addr_t bloutp; + dma_addr_t blp =3D DMA_MAPPING_ERROR; + dma_addr_t bloutp =3D DMA_MAPPING_ERROR; struct scatterlist *sg; size_t sz_out, sz =3D struct_size(bufl, bufers, n + 1); =20 @@ -685,10 +685,6 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_insta= nce *inst, for_each_sg(sgl, sg, n, i) bufl->bufers[i].addr =3D DMA_MAPPING_ERROR; =20 - blp =3D dma_map_single(dev, bufl, sz, DMA_TO_DEVICE); - if (unlikely(dma_mapping_error(dev, blp))) - goto err_in; - for_each_sg(sgl, sg, n, i) { int y =3D sg_nctr; =20 @@ -704,6 +700,9 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instan= ce *inst, sg_nctr++; } bufl->num_bufs =3D sg_nctr; + blp =3D dma_map_single(dev, bufl, sz, DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev, blp))) + goto err_in; qat_req->buf.bl =3D bufl; qat_req->buf.blp =3D blp; qat_req->buf.sz =3D sz; @@ -723,9 +722,6 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instan= ce *inst, for_each_sg(sglout, sg, n, i) bufers[i].addr =3D DMA_MAPPING_ERROR; =20 - bloutp =3D dma_map_single(dev, buflout, sz_out, DMA_TO_DEVICE); - if (unlikely(dma_mapping_error(dev, bloutp))) - goto err_out; for_each_sg(sglout, sg, n, i) { int y =3D sg_nctr; =20 @@ -742,6 +738,9 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instan= ce *inst, } buflout->num_bufs =3D sg_nctr; buflout->num_mapped_bufs =3D sg_nctr; + bloutp =3D dma_map_single(dev, buflout, sz_out, DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(dev, bloutp))) + goto err_out; qat_req->buf.blout =3D buflout; qat_req->buf.bloutp =3D bloutp; qat_req->buf.sz_out =3D sz_out; @@ -753,17 +752,21 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_inst= ance *inst, return 0; =20 err_out: + if (!dma_mapping_error(dev, bloutp)) + dma_unmap_single(dev, bloutp, sz_out, DMA_TO_DEVICE); + n =3D sg_nents(sglout); for (i =3D 0; i < n; i++) if (!dma_mapping_error(dev, buflout->bufers[i].addr)) dma_unmap_single(dev, buflout->bufers[i].addr, buflout->bufers[i].len, DMA_BIDIRECTIONAL); - if (!dma_mapping_error(dev, bloutp)) - dma_unmap_single(dev, bloutp, sz_out, DMA_TO_DEVICE); kfree(buflout); =20 err_in: + if (!dma_mapping_error(dev, blp)) + dma_unmap_single(dev, blp, sz, DMA_TO_DEVICE); + n =3D sg_nents(sgl); for (i =3D 0; i < n; i++) if (!dma_mapping_error(dev, bufl->bufers[i].addr)) @@ -771,8 +774,6 @@ static int qat_alg_sgl_to_bufl(struct qat_crypto_instan= ce *inst, bufl->bufers[i].len, DMA_BIDIRECTIONAL); =20 - if (!dma_mapping_error(dev, blp)) - dma_unmap_single(dev, blp, sz, DMA_TO_DEVICE); kfree(bufl); =20 dev_err(dev, "Failed to map buf for dma\n"); --=20 2.35.1