net: hns3: fixed hclge_fetch_pf_reg accesses bar space out of bounds issue

The TQP BAR space is divided into two segments. TQPs 0-1023 and TQPs
1024-1279 are in different BAR space addresses. However,
hclge_fetch_pf_reg does not distinguish the tqp space information when
reading the tqp space information. When the number of TQPs is greater
than 1024, access bar space overwriting occurs.
The problem of different segments has been considered during the
initialization of tqp.io_base. Therefore, tqp.io_base is directly used
when the queue is read in hclge_fetch_pf_reg.

The error message:

Unable to handle kernel paging request at virtual address ffff800037200000
pc : hclge_fetch_pf_reg+0x138/0x250 [hclge]
lr : hclge_get_regs+0x84/0x1d0 [hclge]
Call trace:
 hclge_fetch_pf_reg+0x138/0x250 [hclge]
 hclge_get_regs+0x84/0x1d0 [hclge]
 hns3_get_regs+0x2c/0x50 [hns3]
 ethtool_get_regs+0xf4/0x270
 dev_ethtool+0x674/0x8a0
 dev_ioctl+0x270/0x36c
 sock_do_ioctl+0x110/0x2a0
 sock_ioctl+0x2ac/0x530
 __arm64_sys_ioctl+0xa8/0x100
 invoke_syscall+0x4c/0x124
 el0_svc_common.constprop.0+0x140/0x15c
 do_el0_svc+0x30/0xd0
 el0_svc+0x1c/0x2c
 el0_sync_handler+0xb0/0xb4
 el0_sync+0x168/0x180

Fixes: 939ccd107ffc ("net: hns3: move dump regs function to a separate file")
Signed-off-by: Hao Lan <lanhao@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
Signed-off-by: Paolo Abeni <pabeni@redhat.com>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
index 43c1c18fa81f8d572d37d15f2c7cc6d4dcbf3391..8c057192aae6e16abe24fdd1bbed3f088c111f8e 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_regs.c
@@ -510,9 +510,9 @@ out:
 static int hclge_fetch_pf_reg(struct hclge_dev *hdev, void *data,
                              struct hnae3_knic_private_info *kinfo)
 {
-#define HCLGE_RING_REG_OFFSET          0x200
 #define HCLGE_RING_INT_REG_OFFSET      0x4
 
+       struct hnae3_queue *tqp;
        int i, j, reg_num;
        int data_num_sum;
        u32 *reg = data;
@@ -533,10 +533,11 @@ static int hclge_fetch_pf_reg(struct hclge_dev *hdev, void *data,
        reg_num = ARRAY_SIZE(ring_reg_addr_list);
        for (j = 0; j < kinfo->num_tqps; j++) {
                reg += hclge_reg_get_tlv(HCLGE_REG_TAG_RING, reg_num, reg);
+               tqp = kinfo->tqp[j];
                for (i = 0; i < reg_num; i++)
-                       *reg++ = hclge_read_dev(&hdev->hw,
-                                               ring_reg_addr_list[i] +
-                                               HCLGE_RING_REG_OFFSET * j);
+                       *reg++ = readl_relaxed(tqp->io_base -
+                                              HCLGE_TQP_REG_OFFSET +
+                                              ring_reg_addr_list[i]);
        }
        data_num_sum += (reg_num + HCLGE_REG_TLV_SPACE) * kinfo->num_tqps;
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
index 6db415d8b9176cfb2b480518991fa2f14f097551..7d9d9dbc75603a3d6e8d2add3be51776bc1400ce 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_regs.c
@@ -123,10 +123,10 @@ int hclgevf_get_regs_len(struct hnae3_handle *handle)
 void hclgevf_get_regs(struct hnae3_handle *handle, u32 *version,
                      void *data)
 {
-#define HCLGEVF_RING_REG_OFFSET                0x200
 #define HCLGEVF_RING_INT_REG_OFFSET    0x4
 
        struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
+       struct hnae3_queue *tqp;
        int i, j, reg_um;
        u32 *reg = data;
 
@@ -147,10 +147,11 @@ void hclgevf_get_regs(struct hnae3_handle *handle, u32 *version,
        reg_um = ARRAY_SIZE(ring_reg_addr_list);
        for (j = 0; j < hdev->num_tqps; j++) {
                reg += hclgevf_reg_get_tlv(HCLGEVF_REG_TAG_RING, reg_um, reg);
+               tqp = &hdev->htqp[j].q;
                for (i = 0; i < reg_um; i++)
-                       *reg++ = hclgevf_read_dev(&hdev->hw,
-                                                 ring_reg_addr_list[i] +
-                                                 HCLGEVF_RING_REG_OFFSET * j);
+                       *reg++ = readl_relaxed(tqp->io_base -
+                                              HCLGEVF_TQP_REG_OFFSET +
+                                              ring_reg_addr_list[i]);
        }
 
        reg_um = ARRAY_SIZE(tqp_intr_reg_addr_list);