Linux RDMA and InfiniBand development
 help / color / mirror / Atom feed
* [PATCH rdma-rc] RDMA/umem: Fix ib_umem_find_best_pgsz()
@ 2020-01-28 13:56 Leon Romanovsky
  2020-01-28 15:01 ` Gal Pressman
  2020-01-28 18:14 ` Jason Gunthorpe
  0 siblings, 2 replies; 3+ messages in thread
From: Leon Romanovsky @ 2020-01-28 13:56 UTC (permalink / raw)
  To: Doug Ledford, Jason Gunthorpe, Gal Pressman
  Cc: Artemy Kovalyov, RDMA mailing list, Shiraz Saleem,
	Leon Romanovsky

From: Artemy Kovalyov <artemyko@mellanox.com>

Except for the last entry, the ending iova alignment sets the maximum
possible page size as the low bits of the iova must be zero when
starting the next chunk.

Fixes: 4a35339958f1 ("RDMA/umem: Add API to find best driver supported page size in an MR")
Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
---
 drivers/infiniband/core/umem.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
index 933dc1aeed5f..82455a1392f1 100644
--- a/drivers/infiniband/core/umem.c
+++ b/drivers/infiniband/core/umem.c
@@ -166,10 +166,13 @@ unsigned long ib_umem_find_best_pgsz(struct ib_umem *umem,
 		 * for any address.
 		 */
 		mask |= (sg_dma_address(sg) + pgoff) ^ va;
-		if (i && i != (umem->nmap - 1))
-			/* restrict by length as well for interior SGEs */
-			mask |= sg_dma_len(sg);
 		va += sg_dma_len(sg) - pgoff;
+		/* Except for the last entry, the ending iova alignment sets
+		 * the maximum possible page size as the low bits of the iova
+		 * must be zero when starting the next chunk.
+		 */
+		if (i != (umem->nmap - 1))
+			mask |= va;
 		pgoff = 0;
 	}
 	best_pg_bit = rdma_find_pg_bit(mask, pgsz_bitmap);
--
2.24.1


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH rdma-rc] RDMA/umem: Fix ib_umem_find_best_pgsz()
  2020-01-28 13:56 [PATCH rdma-rc] RDMA/umem: Fix ib_umem_find_best_pgsz() Leon Romanovsky
@ 2020-01-28 15:01 ` Gal Pressman
  2020-01-28 18:14 ` Jason Gunthorpe
  1 sibling, 0 replies; 3+ messages in thread
From: Gal Pressman @ 2020-01-28 15:01 UTC (permalink / raw)
  To: Leon Romanovsky
  Cc: Doug Ledford, Jason Gunthorpe, Artemy Kovalyov, RDMA mailing list,
	Shiraz Saleem, Leon Romanovsky

On 28/01/2020 15:56, Leon Romanovsky wrote:
> From: Artemy Kovalyov <artemyko@mellanox.com>
> 
> Except for the last entry, the ending iova alignment sets the maximum
> possible page size as the low bits of the iova must be zero when
> starting the next chunk.
> 
> Fixes: 4a35339958f1 ("RDMA/umem: Add API to find best driver supported page size in an MR")
> Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>

This fixes the issue for EFA, thanks Leon.
Tested-by: Gal Pressman <galpress@amazon.com>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH rdma-rc] RDMA/umem: Fix ib_umem_find_best_pgsz()
  2020-01-28 13:56 [PATCH rdma-rc] RDMA/umem: Fix ib_umem_find_best_pgsz() Leon Romanovsky
  2020-01-28 15:01 ` Gal Pressman
@ 2020-01-28 18:14 ` Jason Gunthorpe
  1 sibling, 0 replies; 3+ messages in thread
From: Jason Gunthorpe @ 2020-01-28 18:14 UTC (permalink / raw)
  To: Leon Romanovsky
  Cc: Doug Ledford, Gal Pressman, Artemy Kovalyov, RDMA mailing list,
	Shiraz Saleem, Leon Romanovsky

On Tue, Jan 28, 2020 at 03:56:12PM +0200, Leon Romanovsky wrote:
> From: Artemy Kovalyov <artemyko@mellanox.com>
> 
> Except for the last entry, the ending iova alignment sets the maximum
> possible page size as the low bits of the iova must be zero when
> starting the next chunk.
> 
> Fixes: 4a35339958f1 ("RDMA/umem: Add API to find best driver supported page size in an MR")
> Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com>
> Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
> Tested-by: Gal Pressman <galpress@amazon.com>
> ---
>  drivers/infiniband/core/umem.c | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)

Applied to for-next, thanks

Jason

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2020-01-28 18:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-28 13:56 [PATCH rdma-rc] RDMA/umem: Fix ib_umem_find_best_pgsz() Leon Romanovsky
2020-01-28 15:01 ` Gal Pressman
2020-01-28 18:14 ` Jason Gunthorpe

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox