RDMA/mana_ib: fix a bug in calculating the wrong page table index when 64kb page table is used

[PATCH net] RDMA/mana_ib: fix a bug in calculating the wrong page table index when 64kb page table is used

Posted by longli@linuxonhyperv.com 1 year, 3 months ago

From: Long Li <longli@microsoft.com>

MANA hardware uses 4k page size. When calculating the page table index,
it should use the hardware page size, not the system page size.

Cc: stable@vger.kernel.org
Fixes: 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter")
Signed-off-by: Long Li <longli@microsoft.com>
---
 drivers/infiniband/hw/mana/main.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
index d13abc954d2a..f68f54aea820 100644
--- a/drivers/infiniband/hw/mana/main.c
+++ b/drivers/infiniband/hw/mana/main.c
@@ -383,7 +383,7 @@ static int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem
 
 	create_req->length = umem->length;
 	create_req->offset_in_page = ib_umem_dma_offset(umem, page_sz);
-	create_req->gdma_page_type = order_base_2(page_sz) - PAGE_SHIFT;
+	create_req->gdma_page_type = order_base_2(page_sz) - MANA_PAGE_SHIFT;
 	create_req->page_count = num_pages_total;
 
 	ibdev_dbg(&dev->ib_dev, "size_dma_region %lu num_pages_total %lu\n",
-- 
2.17.1

Re: [PATCH net] RDMA/mana_ib: fix a bug in calculating the wrong page table index when 64kb page table is used

Posted by Leon Romanovsky 1 year, 3 months ago

On Wed, Aug 28, 2024 at 01:06:08PM -0700, longli@linuxonhyperv.com wrote:
> From: Long Li <longli@microsoft.com>
> 
> MANA hardware uses 4k page size. When calculating the page table index,
> it should use the hardware page size, not the system page size.
> 
> Cc: stable@vger.kernel.org
> Fixes: 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter")
> Signed-off-by: Long Li <longli@microsoft.com>
> ---
>  drivers/infiniband/hw/mana/main.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

These two patches are RDMA ones, please fix the target tree, rephrase
the commit title to simplify it and resend.

Thanks

> 
> diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
> index d13abc954d2a..f68f54aea820 100644
> --- a/drivers/infiniband/hw/mana/main.c
> +++ b/drivers/infiniband/hw/mana/main.c
> @@ -383,7 +383,7 @@ static int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem
>  
>  	create_req->length = umem->length;
>  	create_req->offset_in_page = ib_umem_dma_offset(umem, page_sz);
> -	create_req->gdma_page_type = order_base_2(page_sz) - PAGE_SHIFT;
> +	create_req->gdma_page_type = order_base_2(page_sz) - MANA_PAGE_SHIFT;
>  	create_req->page_count = num_pages_total;
>  
>  	ibdev_dbg(&dev->ib_dev, "size_dma_region %lu num_pages_total %lu\n",
> -- 
> 2.17.1
>

[PATCH net] RDMA/mana_ib: use the correct page size for mapping user-mode doorbell page

Posted by longli@linuxonhyperv.com 1 year, 3 months ago

From: Long Li <longli@microsoft.com>

When mapping doorbell page from user-mode, the driver should use the system
page size as the doorbell is allocated via mmap() from user-mode.

Cc: stable@vger.kernel.org
Fixes: 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter")
Signed-off-by: Long Li <longli@microsoft.com>
---
 drivers/infiniband/hw/mana/main.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
index f68f54aea820..b26c4ebec2e0 100644
--- a/drivers/infiniband/hw/mana/main.c
+++ b/drivers/infiniband/hw/mana/main.c
@@ -511,13 +511,13 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)
 	      PAGE_SHIFT;
 	prot = pgprot_writecombine(vma->vm_page_prot);
 
-	ret = rdma_user_mmap_io(ibcontext, vma, pfn, gc->db_page_size, prot,
+	ret = rdma_user_mmap_io(ibcontext, vma, pfn, PAGE_SIZE, prot,
 				NULL);
 	if (ret)
 		ibdev_dbg(ibdev, "can't rdma_user_mmap_io ret %d\n", ret);
 	else
 		ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %u, ret %d\n",
-			  pfn, gc->db_page_size, ret);
+			  pfn, PAGE_SIZE, ret);
 
 	return ret;
 }
-- 
2.17.1

Re: [PATCH net] RDMA/mana_ib: use the correct page size for mapping user-mode doorbell page

Posted by Simon Horman 1 year, 3 months ago

On Wed, Aug 28, 2024 at 01:06:09PM -0700, longli@linuxonhyperv.com wrote:
> From: Long Li <longli@microsoft.com>
> 
> When mapping doorbell page from user-mode, the driver should use the system
> page size as the doorbell is allocated via mmap() from user-mode.
> 
> Cc: stable@vger.kernel.org
> Fixes: 0266a177631d ("RDMA/mana_ib: Add a driver for Microsoft Azure Network Adapter")
> Signed-off-by: Long Li <longli@microsoft.com>
> ---
>  drivers/infiniband/hw/mana/main.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/mana/main.c b/drivers/infiniband/hw/mana/main.c
> index f68f54aea820..b26c4ebec2e0 100644
> --- a/drivers/infiniband/hw/mana/main.c
> +++ b/drivers/infiniband/hw/mana/main.c
> @@ -511,13 +511,13 @@ int mana_ib_mmap(struct ib_ucontext *ibcontext, struct vm_area_struct *vma)
>  	      PAGE_SHIFT;
>  	prot = pgprot_writecombine(vma->vm_page_prot);
>  
> -	ret = rdma_user_mmap_io(ibcontext, vma, pfn, gc->db_page_size, prot,
> +	ret = rdma_user_mmap_io(ibcontext, vma, pfn, PAGE_SIZE, prot,
>  				NULL);
>  	if (ret)
>  		ibdev_dbg(ibdev, "can't rdma_user_mmap_io ret %d\n", ret);
>  	else
>  		ibdev_dbg(ibdev, "mapped I/O pfn 0x%llx page_size %u, ret %d\n",
> -			  pfn, gc->db_page_size, ret);
> +			  pfn, PAGE_SIZE, ret);

This is not a full review, but according to both clang-18 and gcc-14,
this patch should also update the format specifier from %u to %lu.

>  
>  	return ret;
>  }
> -- 
> 2.17.1
> 
>