From nobody Sun Sep 14 22:43:21 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 91646C54EE9 for ; Tue, 13 Sep 2022 14:35:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234135AbiIMOf5 (ORCPT ); Tue, 13 Sep 2022 10:35:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234112AbiIMOey (ORCPT ); Tue, 13 Sep 2022 10:34:54 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4901865542; Tue, 13 Sep 2022 07:20:09 -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 ams.source.kernel.org (Postfix) with ESMTPS id 8E052B80FA1; Tue, 13 Sep 2022 14:18:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E622BC433D6; Tue, 13 Sep 2022 14:18:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1663078705; bh=ysDHgRV0xLmN+RI1iJE8p7h816Gooaa+M1YwDcwNEmA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q1edj/mGS0aRr1dwWqxniUDHDWd5qmSKLh6aBsOsXDvj0TiIg6UmTT9deCmRZchKK cwwX2u4tL+lCV4FIBSBgm8USmAAPYsk6KVtNx5U5+4zmVSKf3fskPNxi7tE4Em+xlE FlMZYD47NfqCPNTL4sannswsuU2cTKQwAQN9kZ54= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jack Wang , Aleksei Marov , Leon Romanovsky , Sasha Levin Subject: [PATCH 5.15 051/121] RDMA/rtrs-srv: Pass the correct number of entries for dma mapped SGL Date: Tue, 13 Sep 2022 16:04:02 +0200 Message-Id: <20220913140359.553981890@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220913140357.323297659@linuxfoundation.org> References: <20220913140357.323297659@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: Jack Wang [ Upstream commit 56c310de0b4b3aca1c4fdd9c1093fc48372a7335 ] ib_dma_map_sg() augments the SGL into a 'dma mapped SGL'. This process may change the number of entries and the lengths of each entry. Code that touches dma_address is iterating over the 'dma mapped SGL' and must use dma_nents which returned from ib_dma_map_sg(). We should use the return count from ib_dma_map_sg for futher usage. Fixes: 9cb837480424e ("RDMA/rtrs: server: main functionality") Link: https://lore.kernel.org/r/20220818105355.110344-4-haris.iqbal@ionos.c= om Signed-off-by: Jack Wang Reviewed-by: Aleksei Marov Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ul= p/rtrs/rtrs-srv.c index 1ca31b919e987..733116554e0bc 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c @@ -600,7 +600,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path) struct sg_table *sgt =3D &srv_mr->sgt; struct scatterlist *s; struct ib_mr *mr; - int nr, chunks; + int nr, nr_sgt, chunks; =20 chunks =3D chunks_per_mr * mri; if (!always_invalidate) @@ -615,19 +615,19 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_pa= th) sg_set_page(s, srv->chunks[chunks + i], max_chunk_size, 0); =20 - nr =3D ib_dma_map_sg(srv_path->s.dev->ib_dev, sgt->sgl, + nr_sgt =3D ib_dma_map_sg(srv_path->s.dev->ib_dev, sgt->sgl, sgt->nents, DMA_BIDIRECTIONAL); - if (nr < sgt->nents) { - err =3D nr < 0 ? nr : -EINVAL; + if (!nr_sgt) { + err =3D -EINVAL; goto free_sg; } mr =3D ib_alloc_mr(srv_path->s.dev->ib_pd, IB_MR_TYPE_MEM_REG, - sgt->nents); + nr_sgt); if (IS_ERR(mr)) { err =3D PTR_ERR(mr); goto unmap_sg; } - nr =3D ib_map_mr_sg(mr, sgt->sgl, sgt->nents, + nr =3D ib_map_mr_sg(mr, sgt->sgl, nr_sgt, NULL, max_chunk_size); if (nr < 0 || nr < sgt->nents) { err =3D nr < 0 ? nr : -EINVAL; @@ -646,7 +646,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path) } } /* Eventually dma addr for each chunk can be cached */ - for_each_sg(sgt->sgl, s, sgt->orig_nents, i) + for_each_sg(sgt->sgl, s, nr_sgt, i) srv_path->dma_addr[chunks + i] =3D sg_dma_address(s); =20 ib_update_fast_reg_key(mr, ib_inc_rkey(mr->rkey)); --=20 2.35.1