---

changeLog:

v3 -> v4:

- Fixed an unclear sentence in commit log, suggested by Michal Kubiak

- Used devl_lock to disallow reload to race with initialization, suggested by Jiri Pirko

v3: https://lore.kernel.org/all/20240318132948.3624333-1-shaojijie@huawei.com/

v2 -> v3:

- Fixed a syntax error in commit log, suggested by Ratheesh Kannoth

v2: https://lore.kernel.org/all/20240316111057.277591-1-shaojijie@huawei.com/

v1 -> v2:

- Fixed some syntax errors in commit log and comments, suggested by Michal Kubiak

- Optimized the code by using a flag, suggested by Michal Kubiak

v1: https://lore.kernel.org/all/20240315100748.2913882-1-shaojijie@huawei.com/

---

net: hns3: mark unexcuted loopback test result as UNEXECUTED

Jie Wang (1):

net: hns3: fix index limit to support all queue stats

net: hns3: fix kernel crash when devlink reload during pf

initialization

.../hns3/hns3_common/hclge_comm_tqp_stats.c | 2 +-

.../ethernet/hisilicon/hns3/hns3_ethtool.c | 19 +++++++++++++++++--

.../hisilicon/hns3/hns3pf/hclge_main.c | 4 ++++

3 files changed, 22 insertions(+), 3 deletions(-)

2.30.0

From: Jie Wang <wangjie125@huawei.com>

Currently, hns hardware supports more than 512 queues and the index limit

in hclge_comm_tqps_update_stats is wrong. So this patch removes it.

Fixes: 287db5c40d15 ("net: hns3: create new set of common tqp stats APIs for PF and VF reuse")

Signed-off-by: Jie Wang <wangjie125@huawei.com>

.../ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c | 2 +-

1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_tqp_stats.c

@@ -XXX,XX +XXX,XX @@ int hclge_comm_tqps_update_stats(struct hnae3_handle *handle,

        hclge_comm_cmd_setup_basic_desc(&desc, HCLGE_OPC_QUERY_TX_STATS,

                        true);

-        desc.data[0] = cpu_to_le32(tqp->index & 0x1ff);

+        desc.data[0] = cpu_to_le32(tqp->index);

        ret = hclge_comm_cmd_send(hw, &desc, 1);

        if (ret) {

            dev_err(&hw->cmq.csq.pdev->dev,

2.30.0

The devlink reload process will access the hardware resources,

but the register operation is done before the hardware is initialized.

So, processing the devlink reload during initialization may lead to kernel

crash. This patch fixes this by taking devl_lock during initialization.

Fixes: b741269b2759 ("net: hns3: add support for registering devlink for PF")

drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 4 ++++

1 file changed, 4 insertions(+)

@@ -XXX,XX +XXX,XX @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)

    if (ret)

        goto err_pci_uninit;

+    devl_lock(hdev->devlink);

+

    /* Firmware command queue initialize */

    ret = hclge_comm_cmd_queue_init(hdev->pdev, &hdev->hw.hw);

    if (ret)

@@ -XXX,XX +XXX,XX @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)

    hclge_task_schedule(hdev, round_jiffies_relative(HZ));

+    devl_unlock(hdev->devlink);

    return 0;

err_mdiobus_unreg:

@@ -XXX,XX +XXX,XX @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)

err_cmd_uninit:

    hclge_comm_cmd_uninit(hdev->ae_dev, &hdev->hw.hw);

err_devlink_uninit:

+    devl_unlock(hdev->devlink);

    hclge_devlink_uninit(hdev);

err_pci_uninit:

    pcim_iounmap(pdev, hdev->hw.hw.io_base);

2.30.0

Currently, loopback test may be skipped when resetting, but the test

result will still show as 'PASS', because the driver doesn't set

ETH_TEST_FL_FAILED flag. Fix it by setting the flag and

initializating the value to UNEXECUTED.

Fixes: 4c8dab1c709c ("net: hns3: reconstruct function hns3_self_test")

.../ethernet/hisilicon/hns3/hns3_ethtool.c | 19 +++++++++++++++++--

1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c

@@ -XXX,XX +XXX,XX @@ static const struct hns3_stats hns3_rxq_stats[] = {

#define HNS3_NIC_LB_TEST_NO_MEM_ERR    1

#define HNS3_NIC_LB_TEST_TX_CNT_ERR    2

#define HNS3_NIC_LB_TEST_RX_CNT_ERR    3

+#define HNS3_NIC_LB_TEST_UNEXECUTED    4

+

+static int hns3_get_sset_count(struct net_device *netdev, int stringset);

static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en)

{

@@ -XXX,XX +XXX,XX @@ static void hns3_do_external_lb(struct net_device *ndev,

static void hns3_self_test(struct net_device *ndev,

             struct ethtool_test *eth_test, u64 *data)

{

+    int cnt = hns3_get_sset_count(ndev, ETH_SS_TEST);

    struct hns3_nic_priv *priv = netdev_priv(ndev);

    struct hnae3_handle *h = priv->ae_handle;

    int st_param[HNAE3_LOOP_NONE][2];

    bool if_running = netif_running(ndev);

+    int i;

+

+    /* initialize the loopback test result, avoid marking an unexcuted

+     * loopback test as PASS.

+     */

+    for (i = 0; i < cnt; i++)

+        data[i] = HNS3_NIC_LB_TEST_UNEXECUTED;

    if (hns3_nic_resetting(ndev)) {

        netdev_err(ndev, "dev resetting!");

-        return;

+        goto failure;

    }

    if (!(eth_test->flags & ETH_TEST_FL_OFFLINE))

-        return;

+        goto failure;

    if (netif_msg_ifdown(h))

        netdev_info(ndev, "self test start\n");

@@ -XXX,XX +XXX,XX @@ static void hns3_self_test(struct net_device *ndev,

    if (netif_msg_ifdown(h))

        netdev_info(ndev, "self test end\n");

+    return;

+

+failure:

+    eth_test->flags |= ETH_TEST_FL_FAILED;

static void hns3_update_limit_promisc_mode(struct net_device *netdev,

2.30.0