Commit 8f9fee25 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-ethtool-add-dedicated-rxfh-driver-callbacks' 

Jakub Kicinski says:

====================
net: ethtool: add dedicated RXFH driver callbacks

Andrew asked me to plumb the RXFH header fields configuration
thru to netlink. Before we do that we need to clean up the driver
facing API a little bit. Right now RXFH configuration shares the
callbacks with n-tuple filters. The future of n-tuple filters
is uncertain within netlink. Separate the two for clarity both
of the core code and the driver facing API.

This series adds the new callbacks and converts the initial
handful of drivers. There is 31 more driver patches to come,
then we can stop calling rxnfc in the core for rxfh.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 535de528 6867fbe3

drivers/net/ethernet/google/gve/gve_ethtool.c

+0 −6
Original line number Diff line number Diff line
@@ -798,9 +798,6 @@ static int gve_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd) 
	case ETHTOOL_SRXCLSRLDEL:

		err = gve_del_flow_rule(priv, cmd);

		break;

	case ETHTOOL_SRXFH:

		err = -EOPNOTSUPP;

		break;

	default:

		err = -EOPNOTSUPP;

		break;
@@ -835,9 +832,6 @@ static int gve_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, u 
	case ETHTOOL_GRXCLSRLALL:

		err = gve_get_flow_rule_ids(priv, cmd, (u32 *)rule_locs);

		break;

	case ETHTOOL_GRXFH:

		err = -EOPNOTSUPP;

		break;

	default:

		err = -EOPNOTSUPP;

		break;

drivers/net/ethernet/marvell/mvneta.c

+0 −2
Original line number Diff line number Diff line
@@ -5014,8 +5014,6 @@ static int mvneta_ethtool_get_rxnfc(struct net_device *dev, 
	case ETHTOOL_GRXRINGS:

		info->data =  rxq_number;

		return 0;

	case ETHTOOL_GRXFH:

		return -EOPNOTSUPP;

	default:

		return -EOPNOTSUPP;

	}

drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -2616,6 +2616,7 @@ static void mlx5e_get_ts_stats(struct net_device *netdev, 
const struct ethtool_ops mlx5e_ethtool_ops = {

	.cap_link_lanes_supported = true,

	.cap_rss_ctx_supported	= true,

	.rxfh_per_ctx_fields	= true,

	.rxfh_per_ctx_key	= true,

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c

+56 −55
Original line number Diff line number Diff line
@@ -531,20 +531,6 @@ static int fbnic_get_rss_hash_idx(u32 flow_type) 
	return -1;

}



static int

fbnic_get_rss_hash_opts(struct fbnic_net *fbn, struct ethtool_rxnfc *cmd)

{

	int hash_opt_idx = fbnic_get_rss_hash_idx(cmd->flow_type);



	if (hash_opt_idx < 0)

		return -EINVAL;



	/* Report options from rss_en table in fbn */

	cmd->data = fbn->rss_flow_hash[hash_opt_idx];



	return 0;

}



static int fbnic_get_cls_rule_all(struct fbnic_net *fbn,

				  struct ethtool_rxnfc *cmd,

				  u32 *rule_locs)
@@ -779,9 +765,6 @@ static int fbnic_get_rxnfc(struct net_device *netdev, 
		cmd->data = fbn->num_rx_queues;

		ret = 0;

		break;

	case ETHTOOL_GRXFH:

		ret = fbnic_get_rss_hash_opts(fbn, cmd);

		break;

	case ETHTOOL_GRXCLSRULE:

		ret = fbnic_get_cls_rule(fbn, cmd);

		break;
@@ -803,41 +786,6 @@ static int fbnic_get_rxnfc(struct net_device *netdev, 
	return ret;

}



#define FBNIC_L2_HASH_OPTIONS \

	(RXH_L2DA | RXH_DISCARD)

#define FBNIC_L3_HASH_OPTIONS \

	(FBNIC_L2_HASH_OPTIONS | RXH_IP_SRC | RXH_IP_DST)

#define FBNIC_L4_HASH_OPTIONS \

	(FBNIC_L3_HASH_OPTIONS | RXH_L4_B_0_1 | RXH_L4_B_2_3)



static int

fbnic_set_rss_hash_opts(struct fbnic_net *fbn, const struct ethtool_rxnfc *cmd)

{

	int hash_opt_idx;



	/* Verify the type requested is correct */

	hash_opt_idx = fbnic_get_rss_hash_idx(cmd->flow_type);

	if (hash_opt_idx < 0)

		return -EINVAL;



	/* Verify the fields asked for can actually be assigned based on type */

	if (cmd->data & ~FBNIC_L4_HASH_OPTIONS ||

	    (hash_opt_idx > FBNIC_L4_HASH_OPT &&

	     cmd->data & ~FBNIC_L3_HASH_OPTIONS) ||

	    (hash_opt_idx > FBNIC_IP_HASH_OPT &&

	     cmd->data & ~FBNIC_L2_HASH_OPTIONS))

		return -EINVAL;



	fbn->rss_flow_hash[hash_opt_idx] = cmd->data;



	if (netif_running(fbn->netdev)) {

		fbnic_rss_reinit(fbn->fbd, fbn);

		fbnic_write_rules(fbn->fbd);

	}



	return 0;

}



static int fbnic_cls_rule_any_loc(struct fbnic_dev *fbd)

{

	int i;
@@ -1244,9 +1192,6 @@ static int fbnic_set_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd) 
	int ret = -EOPNOTSUPP;



	switch (cmd->cmd) {

	case ETHTOOL_SRXFH:

		ret = fbnic_set_rss_hash_opts(fbn, cmd);

		break;

	case ETHTOOL_SRXCLSRLINS:

		ret = fbnic_set_cls_rule_ins(fbn, cmd);

		break;
@@ -1346,6 +1291,60 @@ fbnic_set_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rxfh, 
	return 0;

}



static int

fbnic_get_rss_hash_opts(struct net_device *netdev,

			struct ethtool_rxfh_fields *cmd)

{

	int hash_opt_idx = fbnic_get_rss_hash_idx(cmd->flow_type);

	struct fbnic_net *fbn = netdev_priv(netdev);



	if (hash_opt_idx < 0)

		return -EINVAL;



	/* Report options from rss_en table in fbn */

	cmd->data = fbn->rss_flow_hash[hash_opt_idx];



	return 0;

}



#define FBNIC_L2_HASH_OPTIONS \

	(RXH_L2DA | RXH_DISCARD)

#define FBNIC_L3_HASH_OPTIONS \

	(FBNIC_L2_HASH_OPTIONS | RXH_IP_SRC | RXH_IP_DST)

#define FBNIC_L4_HASH_OPTIONS \

	(FBNIC_L3_HASH_OPTIONS | RXH_L4_B_0_1 | RXH_L4_B_2_3)



static int

fbnic_set_rss_hash_opts(struct net_device *netdev,

			const struct ethtool_rxfh_fields *cmd,

			struct netlink_ext_ack *extack)

{

	struct fbnic_net *fbn = netdev_priv(netdev);

	int hash_opt_idx;



	/* Verify the type requested is correct */

	hash_opt_idx = fbnic_get_rss_hash_idx(cmd->flow_type);

	if (hash_opt_idx < 0)

		return -EINVAL;



	/* Verify the fields asked for can actually be assigned based on type */

	if (cmd->data & ~FBNIC_L4_HASH_OPTIONS ||

	    (hash_opt_idx > FBNIC_L4_HASH_OPT &&

	     cmd->data & ~FBNIC_L3_HASH_OPTIONS) ||

	    (hash_opt_idx > FBNIC_IP_HASH_OPT &&

	     cmd->data & ~FBNIC_L2_HASH_OPTIONS))

		return -EINVAL;



	fbn->rss_flow_hash[hash_opt_idx] = cmd->data;



	if (netif_running(fbn->netdev)) {

		fbnic_rss_reinit(fbn->fbd, fbn);

		fbnic_write_rules(fbn->fbd);

	}



	return 0;

}



static int

fbnic_modify_rxfh_context(struct net_device *netdev,

			  struct ethtool_rxfh_context *ctx,
@@ -1697,6 +1696,8 @@ static const struct ethtool_ops fbnic_ethtool_ops = { 
	.get_rxfh_indir_size	= fbnic_get_rxfh_indir_size,

	.get_rxfh		= fbnic_get_rxfh,

	.set_rxfh		= fbnic_set_rxfh,

	.get_rxfh_fields	= fbnic_get_rss_hash_opts,

	.set_rxfh_fields	= fbnic_set_rss_hash_opts,

	.create_rxfh_context	= fbnic_create_rxfh_context,

	.modify_rxfh_context	= fbnic_modify_rxfh_context,

	.remove_rxfh_context	= fbnic_remove_rxfh_context,

drivers/net/ethernet/sfc/ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -262,6 +262,7 @@ const struct ethtool_ops efx_ethtool_ops = { 
	.set_rxnfc		= efx_ethtool_set_rxnfc,

	.get_rxfh_indir_size	= efx_ethtool_get_rxfh_indir_size,

	.get_rxfh_key_size	= efx_ethtool_get_rxfh_key_size,

	.rxfh_per_ctx_fields	= true,

	.rxfh_per_ctx_key	= true,

	.cap_rss_rxnfc_adds	= true,

	.rxfh_priv_size		= sizeof(struct efx_rss_context_priv),