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 C43B81DB52F for ; Mon, 7 Oct 2024 16:27:02 +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=1728318422; cv=none; b=nlNW+Q6gMxi+nsBVbdoWFU7CvwPjUA+XxgCyO0H/FFIKWZ1//fUFlOsCeQMYmI+ptE3ZNqQBVn3K5ypAA23v3fn4yYCuiMVQ5O7DfH8TUSyYDnCriM9rAOSkmMh1pC69CSOuQVzxlx3PUznmUQKw+cWn/mIovWwaQPPToZauHn8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728318422; c=relaxed/simple; bh=Q3p34SQP0ji9DziWHq+5awj8qEUu1NT9AT0kWzf8HKw=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=bfuOC1klnMZ+O8MEQLDxdFaCe3RjuhoFyf9Ldwn4gGcUk5ow/L8i2QZq0T6itC0OkEM5DAQEm6gPJAY9w9LsZxqW8Nv4e0KSs95K0O4+cJb8BjiAr4Ez2jzSVlBbyAvwE8+hEsHHQzbpBMHw0lBcOBGVuW5i4D9aSzBf2RBf3cA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Bqn2uTy/; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Bqn2uTy/" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F2FF6C4CED5; Mon, 7 Oct 2024 16:27:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1728318422; bh=Q3p34SQP0ji9DziWHq+5awj8qEUu1NT9AT0kWzf8HKw=; h=Subject:To:Cc:From:Date:From; b=Bqn2uTy/uMb9pYegF4NAGdMbkPwrk/Qw4C3FXWeza9jvLqlXrPemXg9wkYVNzSK+Q 0f2ZszHzAXR9tFaFlxtAKTufcqORPjkvQPIYUUKRpB0zdeBPC//Z/weQ5jtpxjTEg2 ArD8rtLNFUiQVd+6hyEw0PlXpOrt4NECa3/pAMsc= Subject: FAILED: patch "[PATCH] RDMA/mana_ib: use the correct page table index based on" failed to apply to 6.6-stable tree To: longli@microsoft.com,leon@kernel.org Cc: From: Date: Mon, 07 Oct 2024 18:26:59 +0200 Message-ID: <2024100758-morbidly-ramp-77b2@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.6-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 . 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.6.y git checkout FETCH_HEAD git cherry-pick -x 9e517a8e9d9a303bf9bde35e5c5374795544c152 # git commit -s git send-email --to '' --in-reply-to '2024100758-morbidly-ramp-77b2@gregkh' --subject-prefix 'PATCH 6.6.y' HEAD^.. Possible dependencies: 9e517a8e9d9a ("RDMA/mana_ib: use the correct page table index based on hardware page size") e02497fb6546 ("RDMA/mana_ib: Fix bug in creation of dma regions") thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From 9e517a8e9d9a303bf9bde35e5c5374795544c152 Mon Sep 17 00:00:00 2001 From: Long Li 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 Link: https://patch.msgid.link/1725030993-16213-1-git-send-email-longli@linuxonhyperv.com Signed-off-by: Leon Romanovsky 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",