Commit 14e1e7aa authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'eth-finish-migration-to-the-new-rxfh-callbacks' 

Jakub Kicinski says:

====================
eth: finish migration to the new RXFH callbacks

Finish drivers conversions to callbacks added by
commit 9bb00786 ("net: ethtool: add dedicated callbacks for
getting and setting rxfh fields"). Remove the conditional calling
in the core, rxnfc callbacks are no longer used for RXFH.
====================

Link: https://patch.msgid.link/20250618203823.1336156-1-kuba@kernel.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4922ca77 72792461

drivers/net/ethernet/emulex/benet/be_ethtool.c

+25 −31
Original line number Diff line number Diff line
@@ -1073,10 +1073,19 @@ static void be_set_msg_level(struct net_device *netdev, u32 level) 
	adapter->msg_enable = level;

}



static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type)

static int be_get_rxfh_fields(struct net_device *netdev,

			      struct ethtool_rxfh_fields *cmd)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	u64 flow_type = cmd->flow_type;

	u64 data = 0;



	if (!be_multi_rxq(adapter)) {

		dev_info(&adapter->pdev->dev,

			 "ethtool::get_rxfh: RX flow hashing is disabled\n");

		return -EINVAL;

	}



	switch (flow_type) {

	case TCP_V4_FLOW:

		if (adapter->rss_info.rss_flags & RSS_ENABLE_IPV4)
@@ -1104,7 +1113,8 @@ static u64 be_get_rss_hash_opts(struct be_adapter *adapter, u64 flow_type) 
		break;

	}



	return data;

	cmd->data = data;

	return 0;

}



static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd,
@@ -1119,9 +1129,6 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 
	}



	switch (cmd->cmd) {

	case ETHTOOL_GRXFH:

		cmd->data = be_get_rss_hash_opts(adapter, cmd->flow_type);

		break;

	case ETHTOOL_GRXRINGS:

		cmd->data = adapter->num_rx_qs;

		break;
@@ -1132,11 +1139,19 @@ static int be_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, 
	return 0;

}



static int be_set_rss_hash_opts(struct be_adapter *adapter,

				struct ethtool_rxnfc *cmd)

static int be_set_rxfh_fields(struct net_device *netdev,

			      const struct ethtool_rxfh_fields *cmd,

			      struct netlink_ext_ack *extack)

{

	int status;

	struct be_adapter *adapter = netdev_priv(netdev);

	u32 rss_flags = adapter->rss_info.rss_flags;

	int status;



	if (!be_multi_rxq(adapter)) {

		dev_err(&adapter->pdev->dev,

			"ethtool::set_rxfh: RX flow hashing is disabled\n");

		return -EINVAL;

	}



	if (cmd->data != L3_RSS_FLAGS &&

	    cmd->data != (L3_RSS_FLAGS | L4_RSS_FLAGS))
@@ -1195,28 +1210,6 @@ static int be_set_rss_hash_opts(struct be_adapter *adapter, 
	return be_cmd_status(status);

}



static int be_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)

{

	struct be_adapter *adapter = netdev_priv(netdev);

	int status = 0;



	if (!be_multi_rxq(adapter)) {

		dev_err(&adapter->pdev->dev,

			"ethtool::set_rxnfc: RX flow hashing is disabled\n");

		return -EINVAL;

	}



	switch (cmd->cmd) {

	case ETHTOOL_SRXFH:

		status = be_set_rss_hash_opts(adapter, cmd);

		break;

	default:

		return -EINVAL;

	}



	return status;

}



static void be_get_channels(struct net_device *netdev,

			    struct ethtool_channels *ch)

{
@@ -1449,7 +1442,8 @@ const struct ethtool_ops be_ethtool_ops = { 
	.flash_device = be_do_flash,

	.self_test = be_self_test,

	.get_rxnfc = be_get_rxnfc,

	.set_rxnfc = be_set_rxnfc,

	.get_rxfh_fields = be_get_rxfh_fields,

	.set_rxfh_fields = be_set_rxfh_fields,

	.get_rxfh_indir_size = be_get_rxfh_indir_size,

	.get_rxfh_key_size = be_get_rxfh_key_size,

	.get_rxfh = be_get_rxfh,

drivers/net/ethernet/hisilicon/hns3/hnae3.h

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.c

+3 −3
Original line number Diff line number Diff line
@@ -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)

{

drivers/net/ethernet/hisilicon/hns3/hns3_common/hclge_comm_rss.h

+2 −2
Original line number Diff line number Diff line
@@ -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

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

+25 −8
Original line number Diff line number Diff line
@@ -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_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd)

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);



	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;

}



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_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,