From patchwork Wed Oct 16 14:43:48 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jacob Martin X-Patchwork-Id: 1998108 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 4XTDHx1VWxz1xw5 for ; Thu, 17 Oct 2024 01:44:13 +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 1t15Ft-0005q7-6Z; Wed, 16 Oct 2024 14:44:05 +0000 Received: from smtp-relay-internal-0.internal ([10.131.114.225] helo=smtp-relay-internal-0.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1t15Fp-0005kV-7a for kernel-team@lists.ubuntu.com; Wed, 16 Oct 2024 14:44:01 +0000 Received: from mail-il1-f198.google.com (mail-il1-f198.google.com [209.85.166.198]) (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-0.canonical.com (Postfix) with ESMTPS id EA1B03F2B8 for ; Wed, 16 Oct 2024 14:44:00 +0000 (UTC) Received: by mail-il1-f198.google.com with SMTP id e9e14a558f8ab-3a3c9886eccso32884055ab.2 for ; Wed, 16 Oct 2024 07:44:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729089840; x=1729694640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=j4CzUBxQigrbz7P+ZP3a5O6fUf4QRbm0Tau7YpRbg4s=; b=quSLaJqbTCxrDFUixwSYpXTYR8itVaD/0JP6j4N0y0DApAFghuNE4DbfnUTWLJJV7l e9zYDpSfTGQTw4CqXS9XBYLM1gqbRQwUPu3jH0kFxzly+RZlZ7wIvvo/R18W0izw4JjD udWwjEdxKm0POffnoqTkeIyjH3GO7CEzGr/Egb20FZbp269v+/XMcHAB65ftQmk/yjim 8YwBWwEIDLX/femjCHBsgcQCbW9qn+nMDiQ5NVd0UQNOrj7Nboi2Rimw8LH156GBN7v4 GU3wmAzxwOZd+xuKK7IzfJkjielRe4itrybzOsPBzK8K1HUxcO0Wj1SDA4rIZ0s5fQI3 PyMw== X-Gm-Message-State: AOJu0YzYwIu38q+rFAgbcAfl4mrIJsoQm+LCC5OFQj4bgn8f9oW3nyTv KAgD7dQoRVLw2bkDVdXYxaNsz/LtcUZKh+hcFsW89OlVndrV2EoXZfSkV7PzMEhGlfvIpvQjadn m8ph/ney4gcsArSCMGWUm1jTVf1B/tWYfSHSISMucI0EHxW30kdhEEX5hL78EVakDT08cL7zEAf OqpucMxx8lCg== X-Received: by 2002:a92:8710:0:b0:3a3:da4f:79f8 with SMTP id e9e14a558f8ab-3a3da4f7c7fmr45019515ab.5.1729089839823; Wed, 16 Oct 2024 07:43:59 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHDLD0vxERwEClsNZbyzy/9YVlf82EdbAC5oUg+Az8FrxrlmE5+Z5NtNitDbLK44nsem/NzQQ== X-Received: by 2002:a92:8710:0:b0:3a3:da4f:79f8 with SMTP id e9e14a558f8ab-3a3da4f7c7fmr45019335ab.5.1729089839470; Wed, 16 Oct 2024 07:43:59 -0700 (PDT) Received: from localhost ([2601:441:8201:e8ff:574d:d195:6f49:7c30]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a3d70aed3fsm8381685ab.28.2024.10.16.07.43.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Oct 2024 07:43:59 -0700 (PDT) From: Jacob Martin To: kernel-team@lists.ubuntu.com Subject: [SRU][N:nvidia][PATCH v2 5/8] RDMA/mana_ib: use the correct page table index based on hardware page size Date: Wed, 16 Oct 2024 09:43:48 -0500 Message-ID: <20241016144352.177011-6-jacob.martin@canonical.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241016144352.177011-1-jacob.martin@canonical.com> References: <20241016144352.177011-1-jacob.martin@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/2084598 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 (cherry picked from commit 9e517a8e9d9a303bf9bde35e5c5374795544c152) Signed-off-by: John Cabaj Signed-off-by: Jacob Martin --- 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 4524c6b80748..dfed1d97edfd 100644 --- a/drivers/infiniband/hw/mana/main.c +++ b/drivers/infiniband/hw/mana/main.c @@ -385,7 +385,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",