From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795029498; b=UPugfH5p2ePP1tqm4dipAG5aouNjfNlD9gpvUHnLn/6SWxTUDg2GG+GgFgz4v5b6fYyW G/f1waB0boMI3b7Znr49/Ma0pxYhP6qJMVZ9JDCk6kOMffXuDXj8Tn1M5PFTlfx8c4Bjo U+VnqK+jVJjuCBc3iTI97Tajp+diCFrGUFYoXAR/BUF0wF225LL6J8ftL4TlpMcbLoB2F 8y/BkunXR3MJS3L/kihUEoc1MGTP/fAaPGjpgzS1UQe+Llz5yP9ST8vSw/g/oxa7Vi0JU lrGQDBJP9kHG5wQHurEp+2mikxdPXwKV8iqzz94OECaZ/STdWuWvy54+UHPf4kPPb7A== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795029498; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=wwXp8x+Pt35g0RzPiMgVQ6PPr6UakdfgPYiNDmBJZaU=; b=HbwFUQEUvqc4b6bVcAlDQOg+FTG4zTuTn1VU2EbWeo9ZksJMMyGlZSGQxCJbu0tMYq3S kG7HTguOfegIhbr8vTkZZaa/D2tZZYswCQDfIR5DhGJgeOp+blpBmBnZgDcow86FiJhbh +YA+6ITAEAhAsTRlCkJiEEAFzG6YhISW7jLXiYzlfz32ZKD6wr2zTlzaypX1ay61fgrJV fRDCh3Z8Kt/gmSvfX3ygQPfmk26OC7K83gErvOOZ15BdNEVOhuo10ZWPsUsJKud8x95Hq +Tf+4dDW7b1mf8pti3QvJ73DYxXYK0On2Cl3x+CryOIJXCTIcmY4iKnXcclzrYhEjBw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b="hbfJIv/x"; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2218B606A32F; Wed, 18 Nov 2026 19:18:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=hbfJIv/x Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B40A1F000C5; Wed, 18 Nov 2026 19:18:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795029497; bh=wwXp8x+Pt35g0RzPiMgVQ6PPr6UakdfgPYiNDmBJZaU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=hbfJIv/xU+4ce0Ksz63NP46zxiXGBr5AUAhQmJe2YB1eo2Z2TKh16Dx+VXQ03Q/WL gUBP57Vjr+L/Zqw8WEyNRBSqPBZfW8pREmwyvWKgR3Y0j35iLlJxKmqU6sbIYBg9b1 Lgoc/mpNZ/p8IyTI0sNvpfHmBBP8/JeH6d1qpu2k= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Junxian Huang , Leon Romanovsky , Sasha Levin Subject: [PATCH 6.12 0324/1756] RDMA/hns: Fix GID capacity loss in 64K system Date: Wed, 18 Nov 2026 15:40:51 +0100 Message-ID: <20261118150021.182734369@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Junxian Huang [ Upstream commit 95761b8736c938759032e8d4eb42074d39d13007 ] Our HW always handles GMV BT pages with a fixed 4K size, but the driver calculates the needed GMV BT pages number with PAGE_SIZE, which is 64K in 64K system. Only the first 4K (GMV index 0-127) can be reached by HW, causing GID capacity loss and memory waste. Split a single 64K BT page into multiple 4K pages and register them to HW per 4K block so that HW can correctly reach all GMV entries. Fixes: 32053e584e4a ("RDMA/hns: Add support for filling GMV table") Signed-off-by: Junxian Huang Link: https://patch.msgid.link/20260907084901.2420703-4-huangjunxian6@hisilicon.com Signed-off-by: Leon Romanovsky Signed-off-by: Sasha Levin --- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 37 +++++++++++++++++----- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 8774715174b3e..065b76e9f29a3 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c @@ -4136,18 +4136,39 @@ static int get_op_for_set_hem(struct hns_roce_dev *hr_dev, u32 type, static int config_gmv_ba_to_hw(struct hns_roce_dev *hr_dev, unsigned long obj, dma_addr_t base_addr) { + u32 obj_num_per_bt = HNS_HW_PAGE_SIZE / hr_dev->caps.gmv_entry_sz; + u32 chunk_size = 1 << (hr_dev->caps.gmv_buf_pg_sz + PAGE_SHIFT); + u32 bt_num_per_chunk = chunk_size / HNS_HW_PAGE_SIZE; + u32 first = obj / obj_num_per_bt; + u32 last = min(first + bt_num_per_chunk, hr_dev->caps.gmv_bt_num); struct hns_roce_cmq_desc desc; - struct hns_roce_cmq_req *req = (struct hns_roce_cmq_req *)desc.data; - u32 idx = obj / (HNS_HW_PAGE_SIZE / hr_dev->caps.gmv_entry_sz); - u64 addr = to_hr_hw_page_addr(base_addr); + struct hns_roce_cmq_req *req; + u64 addr; + int ret; + u32 i; - hns_roce_cmq_setup_basic_desc(&desc, HNS_ROCE_OPC_CFG_GMV_BT, false); + /* The GMV BT entry of hardware covers a fixed 4K region, so a buffer + * chunk larger than 4K must be registered to hardware with one BT + * entry per 4K block, otherwise the GMV entries beyond the first + * 4K of the chunk are unreachable. + */ + for (i = first; i < last; i++) { + hns_roce_cmq_setup_basic_desc(&desc, HNS_ROCE_OPC_CFG_GMV_BT, + false); + req = (struct hns_roce_cmq_req *)desc.data; - hr_reg_write(req, CFG_GMV_BT_BA_L, lower_32_bits(addr)); - hr_reg_write(req, CFG_GMV_BT_BA_H, upper_32_bits(addr)); - hr_reg_write(req, CFG_GMV_BT_IDX, idx); + addr = to_hr_hw_page_addr(base_addr + + (u64)(i - first) * HNS_HW_PAGE_SIZE); + hr_reg_write(req, CFG_GMV_BT_BA_L, lower_32_bits(addr)); + hr_reg_write(req, CFG_GMV_BT_BA_H, upper_32_bits(addr)); + hr_reg_write(req, CFG_GMV_BT_IDX, i); - return hns_roce_cmq_send(hr_dev, &desc, 1); + ret = hns_roce_cmq_send(hr_dev, &desc, 1); + if (ret) + return ret; + } + + return 0; } static int set_hem_to_hw(struct hns_roce_dev *hr_dev, int obj, -- 2.53.0