From patchwork Wed Oct 9 15:15:26 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Cabaj X-Patchwork-Id: 1994964 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XNxKb6myJz1xsv for ; Thu, 10 Oct 2024 02:15:47 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1syYPe-0008Vf-Fc; Wed, 09 Oct 2024 15:15:42 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1syYPZ-0008Pl-4p for kernel-team@lists.ubuntu.com; Wed, 09 Oct 2024 15:15:37 +0000 Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id D267E3F1F4 for ; Wed, 9 Oct 2024 15:15:36 +0000 (UTC) Received: by mail-oi1-f197.google.com with SMTP id 5614622812f47-3db2adc6c81so5260521b6e.1 for ; Wed, 09 Oct 2024 08:15:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728486935; x=1729091735; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Qj1X9yl8vEIWx9yzx4jeMJUwB0UFciLh6kHyrTk29N4=; b=MaZm7fGWEcZrg2+yQys8zc2Ui4Ne9EHCnimt7JSiyXaA9DSt8uK53gCDNtR4HzC1b5 uuzy77X9oBdN+CPsUBtRVQoYHR4hSIaPOxysX768XH09V6J4Y/IzTFivnvfiXMmxwaqp 1yHKprQqoC9SUS/jQXAtm0tH7AH6ifxh2R7Uwd6e05gbYxpWZ3hoHrhjJSeknLoq6NkX qE/7STmVSEFCCnAiab3+idzM/PV0WOI2WjxT98JwD3Wtg0an4aWUVHbvINMypnvUAEmF uqLrzktCNKxwlhWmBqDAezJCWcH+BAedhjDGHkohlAYmXky5vdSVtq8MzVCWFs731K2P LeYQ== X-Gm-Message-State: AOJu0YzAByvymGy7XvGJxfbBDQFQyr+8LUZa8qulm+Bu1Mv6Ew0cuQBl 3L0t01GQ9Twnv049bGHp1ykKcn7FHNS2KMizf0WYDZdhgS+RJ6IwsWknb7XVzVjmfTiryPNMRCO ae4jAGn6zn3G6WQTuQf6M2ROoYWs2vnVmHDUqLJMAUd5k0d5EoETHODtck8myLnN/+QUis/mada iLJUeMNRdcEg== X-Received: by 2002:a05:6358:5302:b0:1b8:445b:af5b with SMTP id e5c5f4694b2df-1c31574686dmr26561155d.17.1728486935727; Wed, 09 Oct 2024 08:15:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFSVe3og2pcrObYVS4qksvSIXkmGLYNlIBlWlI9rWgqnVujD9ni8SzEh/mLGZrKZyqLwN6szw== X-Received: by 2002:a05:6358:5302:b0:1b8:445b:af5b with SMTP id e5c5f4694b2df-1c31574686dmr26558255d.17.1728486935252; Wed, 09 Oct 2024 08:15:35 -0700 (PDT) Received: from smtp.gmail.com (h208-73-92-250.mdtnwi.broadband.dynamic.tds.net. [208.73.92.250]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-45da755aa81sm47597671cf.53.2024.10.09.08.15.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2024 08:15:34 -0700 (PDT) From: John Cabaj To: kernel-team@lists.ubuntu.com Subject: [SRU][jammy:linux-azure][PATCH 1/2] RDMA/mana_ib: use the correct page table index based on hardware page size Date: Wed, 9 Oct 2024 10:15:26 -0500 Message-ID: <20241009151527.671047-6-john.cabaj@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241009151527.671047-1-john.cabaj@canonical.com> References: <20241009151527.671047-1-john.cabaj@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Long Li BugLink: https://bugs.launchpad.net/bugs/2084052 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 (backported from commit 9e517a8e9d9a303bf9bde35e5c5374795544c152) [john-cabaj: context changes] Signed-off-by: John Cabaj --- 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 8b3bc302d6f3..f2dde3773aea 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -358,7 +358,7 @@ int mana_ib_gd_create_dma_region(struct mana_ib_dev *dev, struct ib_umem *umem, create_req->length = umem->length; create_req->offset_in_page = umem->address & (page_sz - 1); - 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",