From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 359062737F2 for ; Sat, 28 Feb 2026 18:09:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772302181; cv=none; b=e7j88LMBfCIy1tlbgPW5HV8bcT/J0HopkylygwD4oxNrFvsQ9f3dL7KQzZyOUvKopNHto4RWA0ndmS9AgX6spXSmMAblVVA9N92t+czSPsoAIgIuhF9GTUMKn6NeJQX+2YhtdbfJG9f5E8YZ+s+qnQlnZcbT3N2MoQwMmzE5H7U= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772302181; c=relaxed/simple; bh=70BF8b7akNTsWAig41+VqK8PX3JlWtA6c4h/2ei7y/U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CfpM7zz9U9IB5XsXMJZeRs+60tNorznOOAtAQhG5JS9pXlGFfyR4o+BtfpupM/MbROjDt3yHlHtM3BDROGTQeSOPpvszOClJ7umjGcCMA3BKA/H5ktxAr+Rry6Ogk7kDaPtV10+0vrOc8vmsG/jonJ8CYUC++3K2Mnb/KGO+Oas= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=c43XwZi4; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="c43XwZi4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 70B61C19423; Sat, 28 Feb 2026 18:09:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772302181; bh=70BF8b7akNTsWAig41+VqK8PX3JlWtA6c4h/2ei7y/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=c43XwZi4BD7KA0wkLoQfJOA5C+XcVOdnqz0oQMiEhCmIKIpO9+gFTAPDdyJlPg6r4 iKLlu+Uxfb+Sg3dDELNsn/PcZNtppqfs8xRsD90fZDS9Lk+M+xhpPQN9rHhXzfralq PB1NFb7kOAuI4QZobttfAnTIP05Jg6cl0u5VCnGKG9npHNboZx8/wvnPz/sL+y7qr0 q5ZU7Hs7+IGikslwl+Q/ypp7qE/eYYXnWU3KI3sD5vWsnFwRGTSWaL4YK2NIF1+2DM TmMqJXvO5Jjf6Wa56zTPseo4fa/LlBQRZ8Ql/WFBNIdm7Nl6bovpLq2NX8rUx/fAVx FG9/l22GLiBuA== From: Sasha Levin To: patches@lists.linux.dev Cc: Roman Penyaev , Jack Wang , Grzegorz Prajsner , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.6 181/283] RDMA/rtrs-srv: fix SG mapping Date: Sat, 28 Feb 2026 13:05:23 -0500 Message-ID: <20260228180709.1583486-181-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228180709.1583486-1-sashal@kernel.org> References: <20260228180709.1583486-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Roman Penyaev [ Upstream commit 83835f7c07b523c7ca2a5ad0a511670b5810539e ] This fixes the following error on the server side: RTRS server session allocation failed: -EINVAL caused by the caller of the `ib_dma_map_sg()`, which does not expect less mapped entries, than requested, which is in the order of things and can be easily reproduced on the machine with enabled IOMMU. The fix is to treat any positive number of mapped sg entries as a successful mapping and cache DMA addresses by traversing modified SG table. Fixes: 9cb837480424 ("RDMA/rtrs: server: main functionality") Signed-off-by: Roman Penyaev Signed-off-by: Jack Wang Signed-off-by: Grzegorz Prajsner Link: https://patch.msgid.link/20260107161517.56357-2-haris.iqbal@ionos.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/ulp/rtrs/rtrs-srv.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/drivers/infiniband/ulp/rtrs/rtrs-srv.c b/drivers/infiniband/ulp/rtrs/rtrs-srv.c index f0beea7b90f25..2c3c8b32190f8 100644 --- a/drivers/infiniband/ulp/rtrs/rtrs-srv.c +++ b/drivers/infiniband/ulp/rtrs/rtrs-srv.c @@ -592,7 +592,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path) srv_path->mrs_num++) { struct rtrs_srv_mr *srv_mr = &srv_path->mrs[srv_path->mrs_num]; struct scatterlist *s; - int nr, nr_sgt, chunks; + int nr, nr_sgt, chunks, ind; sgt = &srv_mr->sgt; chunks = chunks_per_mr * srv_path->mrs_num; @@ -622,7 +622,7 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path) } nr = ib_map_mr_sg(mr, sgt->sgl, nr_sgt, NULL, max_chunk_size); - if (nr != nr_sgt) { + if (nr < nr_sgt) { err = nr < 0 ? nr : -EINVAL; goto dereg_mr; } @@ -638,9 +638,24 @@ static int map_cont_bufs(struct rtrs_srv_path *srv_path) goto dereg_mr; } } - /* Eventually dma addr for each chunk can be cached */ - for_each_sg(sgt->sgl, s, nr_sgt, i) - srv_path->dma_addr[chunks + i] = sg_dma_address(s); + + /* + * Cache DMA addresses by traversing sg entries. If + * regions were merged, an inner loop is required to + * populate the DMA address array by traversing larger + * regions. + */ + ind = chunks; + for_each_sg(sgt->sgl, s, nr_sgt, i) { + unsigned int dma_len = sg_dma_len(s); + u64 dma_addr = sg_dma_address(s); + u64 dma_addr_end = dma_addr + dma_len; + + do { + srv_path->dma_addr[ind++] = dma_addr; + dma_addr += max_chunk_size; + } while (dma_addr < dma_addr_end); + } ib_update_fast_reg_key(mr, ib_inc_rkey(mr->rkey)); srv_mr->mr = mr; -- 2.51.0