The patch below does not apply to the 6.10-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.

To reproduce the conflict and resubmit, you may use the following commands:

git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.10.y git checkout FETCH_HEAD git cherry-pick -x 9e517a8e9d9a303bf9bde35e5c5374795544c152 # <resolve conflicts, build, test, etc.> git commit -s git send-email --to 'stable@vger.kernel.org' --in-reply-to '2024100759-plunging-siesta-d577@gregkh' --subject-prefix 'PATCH 6.10.y' HEAD^..

Possible dependencies:

9e517a8e9d9a ("RDMA/mana_ib: use the correct page table index based on hardware page size")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 9e517a8e9d9a303bf9bde35e5c5374795544c152 Mon Sep 17 00:00:00 2001 From: Long Li longli@microsoft.com Date: Fri, 30 Aug 2024 08:16:32 -0700 Subject: [PATCH] RDMA/mana_ib: use the correct page table index based on hardware page size

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 Link: https://patch.msgid.link/1725030993-16213-1-git-send-email-longli@linuxonhyp... Signed-off-by: Leon Romanovsky leon@kernel.org

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",