eth: hns3: migrate to new RXFH callbacks

Migrate to new callbacks added by commit 9bb00786fc61 ("net: ethtool:
add dedicated callbacks for getting and setting rxfh fields").

Reviewed-by: Jijie Shao<shaojijie@huawei.com>
Link: https://patch.msgid.link/20250618203823.1336156-10-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hnae3.h b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
index 4e44f28288f9023aec03a91e578183ab90f56de2..8dc7d6fae224bb45a91d2a86ec3a85e9aa08a8b0 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hnae3.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hnae3.h
@@ -690,9 +690,9 @@ struct hnae3_ae_ops {
        int (*set_rss)(struct hnae3_handle *handle, const u32 *indir,
                       const u8 *key, const u8 hfunc);
        int (*set_rss_tuple)(struct hnae3_handle *handle,
-                            struct ethtool_rxnfc *cmd);
+                            const struct ethtool_rxfh_fields *cmd);
        int (*get_rss_tuple)(struct hnae3_handle *handle,
-                            struct ethtool_rxnfc *cmd);
+                            struct ethtool_rxfh_fields *cmd);
 
        int (*get_tc_size)(struct hnae3_handle *handle);
 

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c
index 4e2bb6556b1cea41566f54128d8d4f4f3505782e..1eca53aaf59852f33c028589a9fc344687fffbbd 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c
@@ -151,7 +151,7 @@ EXPORT_SYMBOL_GPL(hclge_comm_set_rss_hash_key);
 int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev,
                             struct hclge_comm_hw *hw,
                             struct hclge_comm_rss_cfg *rss_cfg,
-                            struct ethtool_rxnfc *nfc)
+                            const struct ethtool_rxfh_fields *nfc)
 {
        struct hclge_comm_rss_input_tuple_cmd *req;
        struct hclge_desc desc;
@@ -422,7 +422,7 @@ int hclge_comm_set_rss_algo_key(struct hclge_comm_hw *hw, const u8 hfunc,
 }
 EXPORT_SYMBOL_GPL(hclge_comm_set_rss_algo_key);
 
-static u8 hclge_comm_get_rss_hash_bits(struct ethtool_rxnfc *nfc)
+static u8 hclge_comm_get_rss_hash_bits(const struct ethtool_rxfh_fields *nfc)
 {
        u8 hash_sets = nfc->data & RXH_L4_B_0_1 ? HCLGE_COMM_S_PORT_BIT : 0;
 
@@ -448,7 +448,7 @@ static u8 hclge_comm_get_rss_hash_bits(struct ethtool_rxnfc *nfc)
 }
 
 int hclge_comm_init_rss_tuple_cmd(struct hclge_comm_rss_cfg *rss_cfg,
-                                 struct ethtool_rxnfc *nfc,
+                                 const struct ethtool_rxfh_fields *nfc,
                                  struct hnae3_ae_dev *ae_dev,
                                  struct hclge_comm_rss_input_tuple_cmd *req)
 {

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h
index cdafa63fe38bc13efff38d282a9f88067096e48a..cbc02b50c6e7d3045e48252134f15513f4848325 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h
@@ -108,7 +108,7 @@ void hclge_comm_get_rss_indir_tbl(struct hclge_comm_rss_cfg *rss_cfg,
 int hclge_comm_set_rss_algo_key(struct hclge_comm_hw *hw, const u8 hfunc,
                                const u8 *key);
 int hclge_comm_init_rss_tuple_cmd(struct hclge_comm_rss_cfg *rss_cfg,
-                                 struct ethtool_rxnfc *nfc,
+                                 const struct ethtool_rxfh_fields *nfc,
                                  struct hnae3_ae_dev *ae_dev,
                                  struct hclge_comm_rss_input_tuple_cmd *req);
 u64 hclge_comm_convert_rss_tuple(u8 tuple_sets);
@@ -129,5 +129,5 @@ int hclge_comm_set_rss_hash_key(struct hclge_comm_rss_cfg *rss_cfg,
 int hclge_comm_set_rss_tuple(struct hnae3_ae_dev *ae_dev,
                             struct hclge_comm_hw *hw,
                             struct hclge_comm_rss_cfg *rss_cfg,
-                            struct ethtool_rxnfc *nfc);
+                            const struct ethtool_rxfh_fields *nfc);
 #endif

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index 6715222aeb661e5e0f59b01ef7ad59cc1f56b1ea..3513293abda9e791346f6f3c88269f0e96fad9ff 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -978,6 +978,16 @@ static int hns3_set_rss(struct net_device *netdev,
                                        rxfh->hfunc);
 }
 
+static int hns3_get_rxfh_fields(struct net_device *netdev,
+                               struct ethtool_rxfh_fields *cmd)
+{
+       struct hnae3_handle *h = hns3_get_handle(netdev);
+
+       if (h->ae_algo->ops->get_rss_tuple)
+               return h->ae_algo->ops->get_rss_tuple(h, cmd);
+       return -EOPNOTSUPP;
+}
+
 static int hns3_get_rxnfc(struct net_device *netdev,
                          struct ethtool_rxnfc *cmd,
                          u32 *rule_locs)
@@ -988,10 +998,6 @@ static int hns3_get_rxnfc(struct net_device *netdev,
        case ETHTOOL_GRXRINGS:
                cmd->data = h->kinfo.num_tqps;
                return 0;
-       case ETHTOOL_GRXFH:
-               if (h->ae_algo->ops->get_rss_tuple)
-                       return h->ae_algo->ops->get_rss_tuple(h, cmd);
-               return -EOPNOTSUPP;
        case ETHTOOL_GRXCLSRLCNT:
                if (h->ae_algo->ops->get_fd_rule_cnt)
                        return h->ae_algo->ops->get_fd_rule_cnt(h, cmd);
@@ -1275,15 +1281,22 @@ static int hns3_set_ringparam(struct net_device *ndev,
        return ret;
 }
 
+static int hns3_set_rxfh_fields(struct net_device *netdev,
+                               const struct ethtool_rxfh_fields *cmd,
+                               struct netlink_ext_ack *extack)
+{
+       struct hnae3_handle *h = hns3_get_handle(netdev);
+
+       if (h->ae_algo->ops->set_rss_tuple)
+               return h->ae_algo->ops->set_rss_tuple(h, cmd);
+       return -EOPNOTSUPP;
+}
+
 static int hns3_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)
 {
        struct hnae3_handle *h = hns3_get_handle(netdev);
 
        switch (cmd->cmd) {
-       case ETHTOOL_SRXFH:
-               if (h->ae_algo->ops->set_rss_tuple)
-                       return h->ae_algo->ops->set_rss_tuple(h, cmd);
-               return -EOPNOTSUPP;
        case ETHTOOL_SRXCLSRLINS:
                if (h->ae_algo->ops->add_fd_entry)
                        return h->ae_algo->ops->add_fd_entry(h, cmd);
@@ -2105,6 +2118,8 @@ static const struct ethtool_ops hns3vf_ethtool_ops = {
        .get_rxfh_indir_size = hns3_get_rss_indir_size,
        .get_rxfh = hns3_get_rss,
        .set_rxfh = hns3_set_rss,
+       .get_rxfh_fields = hns3_get_rxfh_fields,
+       .set_rxfh_fields = hns3_set_rxfh_fields,
        .get_link_ksettings = hns3_get_link_ksettings,
        .get_channels = hns3_get_channels,
        .set_channels = hns3_set_channels,
@@ -2142,6 +2157,8 @@ static const struct ethtool_ops hns3_ethtool_ops = {
        .get_rxfh_indir_size = hns3_get_rss_indir_size,
        .get_rxfh = hns3_get_rss,
        .set_rxfh = hns3_set_rss,
+       .get_rxfh_fields = hns3_get_rxfh_fields,
+       .set_rxfh_fields = hns3_set_rxfh_fields,
        .get_link_ksettings = hns3_get_link_ksettings,
        .set_link_ksettings = hns3_set_link_ksettings,
        .nway_reset = hns3_nway_reset,

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index a5b480d59fbf408c785067d1d0c0c2741bee29d5..5acefd57df45e7c17586a57e783c6bea91629021 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -4872,7 +4872,7 @@ static int hclge_set_rss(struct hnae3_handle *handle, const u32 *indir,
 }
 
 static int hclge_set_rss_tuple(struct hnae3_handle *handle,
-                              struct ethtool_rxnfc *nfc)
+                              const struct ethtool_rxfh_fields *nfc)
 {
        struct hclge_vport *vport = hclge_get_vport(handle);
        struct hclge_dev *hdev = vport->back;
@@ -4890,7 +4890,7 @@ static int hclge_set_rss_tuple(struct hnae3_handle *handle,
 }
 
 static int hclge_get_rss_tuple(struct hnae3_handle *handle,
-                              struct ethtool_rxnfc *nfc)
+                              struct ethtool_rxfh_fields *nfc)
 {
        struct hclge_vport *vport = hclge_get_vport(handle);
        u8 tuple_sets;

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
index c4f35e8e217760ff57ed680b81ad604cf405df18..f1657f50cdda36e6f5a755017b1394e7bcdcc6b1 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -606,7 +606,7 @@ static int hclgevf_set_rss(struct hnae3_handle *handle, const u32 *indir,
 }
 
 static int hclgevf_set_rss_tuple(struct hnae3_handle *handle,
-                                struct ethtool_rxnfc *nfc)
+                                const struct ethtool_rxfh_fields *nfc)
 {
        struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
        int ret;
@@ -624,7 +624,7 @@ static int hclgevf_set_rss_tuple(struct hnae3_handle *handle,
 }
 
 static int hclgevf_get_rss_tuple(struct hnae3_handle *handle,
-                                struct ethtool_rxnfc *nfc)
+                                struct ethtool_rxfh_fields *nfc)
 {
        struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
        u8 tuple_sets;