]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: hns3: remove the affinity settings of vector0
authorYufeng Mo <moyufeng@huawei.com>
Mon, 9 May 2022 07:55:28 +0000 (15:55 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 9 May 2022 13:30:37 +0000 (14:30 +0100)
Vector0 is used for common interrupt control events and is
irrelevant to performance. Currently, the driver sets the
default affinity of vector0 to NUMA nodes, which is unnecessary.
Therefore, the default setting is removed, and the driver does
not set the affinity for vector0.

Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
Signed-off-by: Guangbin Huang <huangguangbin2@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h

index a5dd2c8c244a963bc49880f4de6f60be83e60114..1ebad0e50e6a2a30aa7d6d6e20389318e1e4cb42 100644 (file)
@@ -1546,9 +1546,8 @@ static void hclge_init_tc_config(struct hclge_dev *hdev)
 static int hclge_configure(struct hclge_dev *hdev)
 {
        struct hnae3_ae_dev *ae_dev = pci_get_drvdata(hdev->pdev);
-       const struct cpumask *cpumask = cpu_online_mask;
        struct hclge_cfg cfg;
-       int node, ret;
+       int ret;
 
        ret = hclge_get_cfg(hdev, &cfg);
        if (ret)
@@ -1594,13 +1593,6 @@ static int hclge_configure(struct hclge_dev *hdev)
        hclge_init_tc_config(hdev);
        hclge_init_kdump_kernel_config(hdev);
 
-       /* Set the affinity based on numa node */
-       node = dev_to_node(&hdev->pdev->dev);
-       if (node != NUMA_NO_NODE)
-               cpumask = cpumask_of_node(node);
-
-       cpumask_copy(&hdev->affinity_mask, cpumask);
-
        return ret;
 }
 
@@ -3564,17 +3556,6 @@ static void hclge_get_misc_vector(struct hclge_dev *hdev)
        hdev->num_msi_used += 1;
 }
 
-static void hclge_misc_affinity_setup(struct hclge_dev *hdev)
-{
-       irq_set_affinity_hint(hdev->misc_vector.vector_irq,
-                             &hdev->affinity_mask);
-}
-
-static void hclge_misc_affinity_teardown(struct hclge_dev *hdev)
-{
-       irq_set_affinity_hint(hdev->misc_vector.vector_irq, NULL);
-}
-
 static int hclge_misc_irq_init(struct hclge_dev *hdev)
 {
        int ret;
@@ -11457,11 +11438,6 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
        timer_setup(&hdev->reset_timer, hclge_reset_timer, 0);
        INIT_DELAYED_WORK(&hdev->service_task, hclge_service_task);
 
-       /* Setup affinity after service timer setup because add_timer_on
-        * is called in affinity notify.
-        */
-       hclge_misc_affinity_setup(hdev);
-
        hclge_clear_all_event_cause(hdev);
        hclge_clear_resetting_state(hdev);
 
@@ -11879,7 +11855,6 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
 
        hclge_reset_vf_rate(hdev);
        hclge_clear_vf_vlan(hdev);
-       hclge_misc_affinity_teardown(hdev);
        hclge_state_uninit(hdev);
        hclge_ptp_uninit(hdev);
        hclge_uninit_rxd_adv_layout(hdev);
index c70239758bb258d4f56e9c87008803ceb781828c..ab5c37848a7bcf0e476702f89402e69e7e5aeedd 100644 (file)
@@ -938,8 +938,6 @@ struct hclge_dev {
        DECLARE_KFIFO(mac_tnl_log, struct hclge_mac_tnl_stats,
                      HCLGE_MAC_TNL_LOG_SIZE);
 
-       /* affinity mask and notify for misc interrupt */
-       cpumask_t affinity_mask;
        struct hclge_ptp *ptp;
        struct devlink *devlink;
        struct hclge_comm_rss_cfg rss_cfg;