| From 0ef87c84455f409856528cc309e42e6e1dd560b8 Mon Sep 17 00:00:00 2001 |
| From: Artemy Kovalyov <artemyko@mellanox.com> |
| Date: Tue, 28 Jan 2020 15:56:12 +0200 |
| Subject: [PATCH] RDMA/umem: Fix ib_umem_find_best_pgsz() |
| |
| commit 36798d5ae1af62e830c5e045b2e41ce038690c61 upstream. |
| |
| 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") |
| Link: https://lore.kernel.org/r/20200128135612.174820-1-leon@kernel.org |
| Signed-off-by: Artemy Kovalyov <artemyko@mellanox.com> |
| Signed-off-by: Leon Romanovsky <leonro@mellanox.com> |
| Tested-by: Gal Pressman <galpress@amazon.com> |
| Reviewed-by: Jason Gunthorpe <jgg@mellanox.com> |
| Signed-off-by: Jason Gunthorpe <jgg@mellanox.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c |
| index e7ea819fcb11..b9f1dfb2a37a 100644 |
| --- a/drivers/infiniband/core/umem.c |
| +++ b/drivers/infiniband/core/umem.c |
| @@ -168,10 +168,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.7.4 |
| |
