Commit 0a49abff authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'net-migrate-remaining-drivers-to-dedicated-_rxfh_context-ops' 

Jakub Kicinski says:

====================
net: migrate remaining drivers to dedicated _rxfh_context ops

Around a year ago Ed added dedicated ops for managing RSS contexts.
This significantly improved the clarity of the driver facing API.
Migrate the remaining 3 drivers and remove the old way of muxing
the RSS context operations via .set_rxfh().

v2: https://lore.kernel.org/20250702030606.1776293-1-kuba@kernel.org
v1: https://lore.kernel.org/20250630160953.1093267-1-kuba@kernel.org
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 19c066f9 cd7e8841

drivers/net/ethernet/intel/ice/ice_ethtool.c

+3 −25
Original line number Diff line number Diff line
@@ -3591,11 +3591,10 @@ static int 
ice_get_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rxfh)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);

	u32 rss_context = rxfh->rss_context;

	struct ice_vsi *vsi = np->vsi;

	struct ice_pf *pf = vsi->back;

	u16 qcount, offset;

	int err, num_tc, i;

	int err, i;

	u8 *lut;



	if (!test_bit(ICE_FLAG_RSS_ENA, pf->flags)) {
@@ -3603,24 +3602,8 @@ ice_get_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rxfh) 
		return -EOPNOTSUPP;

	}



	if (rss_context && !ice_is_adq_active(pf)) {

		netdev_err(netdev, "RSS context cannot be non-zero when ADQ is not configured.\n");

		return -EINVAL;

	}



	qcount = vsi->mqprio_qopt.qopt.count[rss_context];

	offset = vsi->mqprio_qopt.qopt.offset[rss_context];



	if (rss_context && ice_is_adq_active(pf)) {

		num_tc = vsi->mqprio_qopt.qopt.num_tc;

		if (rss_context >= num_tc) {

			netdev_err(netdev, "RSS context:%d  > num_tc:%d\n",

				   rss_context, num_tc);

			return -EINVAL;

		}

		/* Use channel VSI of given TC */

		vsi = vsi->tc_map_vsi[rss_context];

	}

	qcount = vsi->mqprio_qopt.qopt.count[0];

	offset = vsi->mqprio_qopt.qopt.offset[0];



	rxfh->hfunc = ETH_RSS_HASH_TOP;

	if (vsi->rss_hfunc == ICE_AQ_VSI_Q_OPT_RSS_HASH_SYM_TPLZ)
@@ -3680,9 +3663,6 @@ ice_set_rxfh(struct net_device *netdev, struct ethtool_rxfh_param *rxfh, 
	    rxfh->hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;



	if (rxfh->rss_context)

		return -EOPNOTSUPP;



	if (!test_bit(ICE_FLAG_RSS_ENA, pf->flags)) {

		/* RSS not supported return error here */

		netdev_warn(netdev, "RSS is not configured on this VSI!\n");
@@ -4750,12 +4730,10 @@ static int ice_repr_ethtool_reset(struct net_device *dev, u32 *flags) 
}



static const struct ethtool_ops ice_ethtool_ops = {

	.cap_rss_ctx_supported  = true,

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_USE_ADAPTIVE |

				     ETHTOOL_COALESCE_RX_USECS_HIGH,

	.supported_input_xfrm	= RXH_XFRM_SYM_XOR,

	.rxfh_per_ctx_key	= true,

	.get_link_ksettings	= ice_get_link_ksettings,

	.set_link_ksettings	= ice_set_link_ksettings,

	.get_fec_stats		= ice_get_fec_stats,

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.c

+9 −18
Original line number Diff line number Diff line
@@ -318,21 +318,20 @@ int otx2_set_flowkey_cfg(struct otx2_nic *pfvf) 
	return err;

}



int otx2_set_rss_table(struct otx2_nic *pfvf, int ctx_id)

int otx2_set_rss_table(struct otx2_nic *pfvf, int ctx_id, const u32 *ind_tbl)

{

	struct otx2_rss_info *rss = &pfvf->hw.rss_info;

	const int index = rss->rss_size * ctx_id;

	struct mbox *mbox = &pfvf->mbox;

	struct otx2_rss_ctx *rss_ctx;

	struct nix_aq_enq_req *aq;

	int idx, err;



	mutex_lock(&mbox->lock);

	rss_ctx = rss->rss_ctx[ctx_id];

	ind_tbl = ind_tbl ?: rss->ind_tbl;

	/* Get memory to put this msg */

	for (idx = 0; idx < rss->rss_size; idx++) {

		/* Ignore the queue if AF_XDP zero copy is enabled */

		if (test_bit(rss_ctx->ind_tbl[idx], pfvf->af_xdp_zc_qidx))

		if (test_bit(ind_tbl[idx], pfvf->af_xdp_zc_qidx))

			continue;



		aq = otx2_mbox_alloc_msg_nix_aq_enq(mbox);
@@ -352,7 +351,7 @@ int otx2_set_rss_table(struct otx2_nic *pfvf, int ctx_id) 
			}

		}



		aq->rss.rq = rss_ctx->ind_tbl[idx];

		aq->rss.rq = ind_tbl[idx];



		/* Fill AQ info */

		aq->qidx = index + idx;
@@ -390,30 +389,22 @@ void otx2_set_rss_key(struct otx2_nic *pfvf) 
int otx2_rss_init(struct otx2_nic *pfvf)

{

	struct otx2_rss_info *rss = &pfvf->hw.rss_info;

	struct otx2_rss_ctx *rss_ctx;

	int idx, ret = 0;



	rss->rss_size = sizeof(*rss->rss_ctx[DEFAULT_RSS_CONTEXT_GROUP]);

	rss->rss_size = sizeof(*rss->ind_tbl);



	/* Init RSS key if it is not setup already */

	if (!rss->enable)

		netdev_rss_key_fill(rss->key, sizeof(rss->key));

	otx2_set_rss_key(pfvf);



	if (!netif_is_rxfh_configured(pfvf->netdev)) {

		/* Set RSS group 0 as default indirection table */

		rss->rss_ctx[DEFAULT_RSS_CONTEXT_GROUP] = kzalloc(rss->rss_size,

								  GFP_KERNEL);

		if (!rss->rss_ctx[DEFAULT_RSS_CONTEXT_GROUP])

			return -ENOMEM;



		rss_ctx = rss->rss_ctx[DEFAULT_RSS_CONTEXT_GROUP];

	if (!netif_is_rxfh_configured(pfvf->netdev))

		for (idx = 0; idx < rss->rss_size; idx++)

			rss_ctx->ind_tbl[idx] =

			rss->ind_tbl[idx] =

				ethtool_rxfh_indir_default(idx,

							   pfvf->hw.rx_queues);

	}

	ret = otx2_set_rss_table(pfvf, DEFAULT_RSS_CONTEXT_GROUP);



	ret = otx2_set_rss_table(pfvf, DEFAULT_RSS_CONTEXT_GROUP, NULL);

	if (ret)

		return ret;

drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h

+2 −6
Original line number Diff line number Diff line
@@ -93,10 +93,6 @@ struct otx2_lmt_info { 
	u64 lmt_addr;

	u16 lmt_id;

};

/* RSS configuration */

struct otx2_rss_ctx {

	u8  ind_tbl[MAX_RSS_INDIR_TBL_SIZE];

};



struct otx2_rss_info {

	u8 enable;
@@ -104,7 +100,7 @@ struct otx2_rss_info { 
	u16 rss_size;

#define RSS_HASH_KEY_SIZE	44   /* 352 bit key */

	u8  key[RSS_HASH_KEY_SIZE];

	struct otx2_rss_ctx	*rss_ctx[MAX_RSS_GROUPS];

	u32 ind_tbl[MAX_RSS_INDIR_TBL_SIZE];

};



/* NIX (or NPC) RX errors */
@@ -1067,7 +1063,7 @@ int otx2_set_hw_capabilities(struct otx2_nic *pfvf); 
int otx2_rss_init(struct otx2_nic *pfvf);

int otx2_set_flowkey_cfg(struct otx2_nic *pfvf);

void otx2_set_rss_key(struct otx2_nic *pfvf);

int otx2_set_rss_table(struct otx2_nic *pfvf, int ctx_id);

int otx2_set_rss_table(struct otx2_nic *pfvf, int ctx_id, const u32 *ind_tbl);



/* Mbox handlers */

void mbox_handler_msix_offset(struct otx2_nic *pfvf,

drivers/net/ethernet/marvell/octeontx2/nic/otx2_ethtool.c

+77 −62
Original line number Diff line number Diff line
@@ -796,35 +796,75 @@ static u32 otx2_get_rxfh_indir_size(struct net_device *dev) 
	return  MAX_RSS_INDIR_TBL_SIZE;

}



static int otx2_rss_ctx_delete(struct otx2_nic *pfvf, int ctx_id)

static int otx2_create_rxfh(struct net_device *dev,

			    struct ethtool_rxfh_context *ctx,

			    const struct ethtool_rxfh_param *rxfh,

			    struct netlink_ext_ack *extack)

{

	struct otx2_rss_info *rss = &pfvf->hw.rss_info;

	struct otx2_nic *pfvf = netdev_priv(dev);

	struct otx2_rss_info *rss;

	unsigned int queues;

	u32 *ind_tbl;

	int idx;



	rss = &pfvf->hw.rss_info;

	queues = pfvf->hw.rx_queues;



	if (rxfh->hfunc && rxfh->hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;

	ctx->hfunc = ETH_RSS_HASH_TOP;



	if (!rss->enable) {

		netdev_err(dev, "RSS is disabled, cannot change settings\n");

		return -EIO;

	}



	otx2_rss_ctx_flow_del(pfvf, ctx_id);

	kfree(rss->rss_ctx[ctx_id]);

	rss->rss_ctx[ctx_id] = NULL;

	ind_tbl = rxfh->indir;

	if (!ind_tbl) {

		ind_tbl = ethtool_rxfh_context_indir(ctx);

		for (idx = 0; idx < rss->rss_size; idx++)

			ind_tbl[idx] = ethtool_rxfh_indir_default(idx, queues);

	}



	otx2_set_rss_table(pfvf, rxfh->rss_context, ind_tbl);

	return 0;

}



static int otx2_rss_ctx_create(struct otx2_nic *pfvf,

			       u32 *rss_context)

static int otx2_modify_rxfh(struct net_device *dev,

			    struct ethtool_rxfh_context *ctx,

			    const struct ethtool_rxfh_param *rxfh,

			    struct netlink_ext_ack *extack)

{

	struct otx2_rss_info *rss = &pfvf->hw.rss_info;

	u8 ctx;

	struct otx2_nic *pfvf = netdev_priv(dev);



	for (ctx = 0; ctx < MAX_RSS_GROUPS; ctx++) {

		if (!rss->rss_ctx[ctx])

			break;

	if (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE &&

	    rxfh->hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;



	if (!pfvf->hw.rss_info.enable) {

		netdev_err(dev, "RSS is disabled, cannot change settings\n");

		return -EIO;

	}



	if (rxfh->indir)

		otx2_set_rss_table(pfvf, rxfh->rss_context, rxfh->indir);



	return 0;

}

	if (ctx == MAX_RSS_GROUPS)

		return -EINVAL;



	rss->rss_ctx[ctx] = kzalloc(sizeof(*rss->rss_ctx[ctx]), GFP_KERNEL);

	if (!rss->rss_ctx[ctx])

		return -ENOMEM;

	*rss_context = ctx;

static int otx2_remove_rxfh(struct net_device *dev,

			    struct ethtool_rxfh_context *ctx,

			    u32 rss_context,

			    struct netlink_ext_ack *extack)

{

	struct otx2_nic *pfvf = netdev_priv(dev);



	if (!pfvf->hw.rss_info.enable) {

		netdev_err(dev, "RSS is disabled, cannot change settings\n");

		return -EIO;

	}



	otx2_rss_ctx_flow_del(pfvf, rss_context);

	return 0;

}
@@ -833,23 +873,14 @@ static int otx2_set_rxfh(struct net_device *dev, 
			 struct ethtool_rxfh_param *rxfh,

			 struct netlink_ext_ack *extack)

{

	u32 rss_context = DEFAULT_RSS_CONTEXT_GROUP;

	struct otx2_nic *pfvf = netdev_priv(dev);

	struct otx2_rss_ctx *rss_ctx;

	struct otx2_rss_info *rss;

	int ret, idx;

	int idx;



	if (rxfh->hfunc != ETH_RSS_HASH_NO_CHANGE &&

	    rxfh->hfunc != ETH_RSS_HASH_TOP)

		return -EOPNOTSUPP;



	if (rxfh->rss_context)

		rss_context = rxfh->rss_context;



	if (rss_context != ETH_RXFH_CONTEXT_ALLOC &&

	    rss_context >= MAX_RSS_GROUPS)

		return -EINVAL;



	rss = &pfvf->hw.rss_info;



	if (!rss->enable) {
@@ -861,21 +892,12 @@ static int otx2_set_rxfh(struct net_device *dev, 
		memcpy(rss->key, rxfh->key, sizeof(rss->key));

		otx2_set_rss_key(pfvf);

	}

	if (rxfh->rss_delete)

		return otx2_rss_ctx_delete(pfvf, rss_context);



	if (rss_context == ETH_RXFH_CONTEXT_ALLOC) {

		ret = otx2_rss_ctx_create(pfvf, &rss_context);

		rxfh->rss_context = rss_context;

		if (ret)

			return ret;

	}

	if (rxfh->indir) {

		rss_ctx = rss->rss_ctx[rss_context];

		for (idx = 0; idx < rss->rss_size; idx++)

			rss_ctx->ind_tbl[idx] = rxfh->indir[idx];

			rss->ind_tbl[idx] = rxfh->indir[idx];

	}

	otx2_set_rss_table(pfvf, rss_context);

	otx2_set_rss_table(pfvf, DEFAULT_RSS_CONTEXT_GROUP, NULL);



	return 0;

}
@@ -884,9 +906,7 @@ static int otx2_set_rxfh(struct net_device *dev, 
static int otx2_get_rxfh(struct net_device *dev,

			 struct ethtool_rxfh_param *rxfh)

{

	u32 rss_context = DEFAULT_RSS_CONTEXT_GROUP;

	struct otx2_nic *pfvf = netdev_priv(dev);

	struct otx2_rss_ctx *rss_ctx;

	struct otx2_rss_info *rss;

	u32 *indir = rxfh->indir;

	int idx, rx_queues;
@@ -894,32 +914,21 @@ static int otx2_get_rxfh(struct net_device *dev, 
	rss = &pfvf->hw.rss_info;



	rxfh->hfunc = ETH_RSS_HASH_TOP;

	if (rxfh->rss_context)

		rss_context = rxfh->rss_context;



	if (!indir)

		return 0;



	if (!rss->enable && rss_context == DEFAULT_RSS_CONTEXT_GROUP) {

	if (!rss->enable) {

		rx_queues = pfvf->hw.rx_queues;

		for (idx = 0; idx < MAX_RSS_INDIR_TBL_SIZE; idx++)

			indir[idx] = ethtool_rxfh_indir_default(idx, rx_queues);

		return 0;

	}

	if (rss_context >= MAX_RSS_GROUPS)

		return -ENOENT;



	rss_ctx = rss->rss_ctx[rss_context];

	if (!rss_ctx)

		return -ENOENT;



	if (indir) {

	for (idx = 0; idx < rss->rss_size; idx++) {

		/* Ignore if the rx queue is AF_XDP zero copy enabled */

			if (test_bit(rss_ctx->ind_tbl[idx], pfvf->af_xdp_zc_qidx))

		if (test_bit(rss->ind_tbl[idx], pfvf->af_xdp_zc_qidx))

			continue;

			indir[idx] = rss_ctx->ind_tbl[idx];

		}

		indir[idx] = rss->ind_tbl[idx];

	}

	if (rxfh->key)

		memcpy(rxfh->key, rss->key, sizeof(rss->key));
@@ -1307,12 +1316,12 @@ static void otx2_get_fec_stats(struct net_device *netdev, 
}



static const struct ethtool_ops otx2_ethtool_ops = {

	.cap_rss_ctx_supported	= true,

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE,

	.supported_ring_params  = ETHTOOL_RING_USE_RX_BUF_LEN |

				  ETHTOOL_RING_USE_CQE_SIZE,

	.rxfh_max_num_contexts	= MAX_RSS_GROUPS,

	.get_link		= otx2_get_link,

	.get_drvinfo		= otx2_get_drvinfo,

	.get_strings		= otx2_get_strings,
@@ -1332,6 +1341,9 @@ static const struct ethtool_ops otx2_ethtool_ops = { 
	.set_rxfh		= otx2_set_rxfh,

	.get_rxfh_fields	= otx2_get_rss_hash_opts,

	.set_rxfh_fields	= otx2_set_rss_hash_opts,

	.create_rxfh_context	= otx2_create_rxfh,

	.modify_rxfh_context	= otx2_modify_rxfh,

	.remove_rxfh_context	= otx2_remove_rxfh,

	.get_msglevel		= otx2_get_msglevel,

	.set_msglevel		= otx2_set_msglevel,

	.get_pauseparam		= otx2_get_pauseparam,
@@ -1426,12 +1438,12 @@ static int otx2vf_get_link_ksettings(struct net_device *netdev, 
}



static const struct ethtool_ops otx2vf_ethtool_ops = {

	.cap_rss_ctx_supported	= true,

	.supported_coalesce_params = ETHTOOL_COALESCE_USECS |

				     ETHTOOL_COALESCE_MAX_FRAMES |

				     ETHTOOL_COALESCE_USE_ADAPTIVE,

	.supported_ring_params  = ETHTOOL_RING_USE_RX_BUF_LEN |

				  ETHTOOL_RING_USE_CQE_SIZE,

	.rxfh_max_num_contexts	= MAX_RSS_GROUPS,

	.get_link		= otx2_get_link,

	.get_drvinfo		= otx2vf_get_drvinfo,

	.get_strings		= otx2vf_get_strings,
@@ -1447,6 +1459,9 @@ static const struct ethtool_ops otx2vf_ethtool_ops = { 
	.set_rxfh		= otx2_set_rxfh,

	.get_rxfh_fields	= otx2_get_rss_hash_opts,

	.set_rxfh_fields	= otx2_set_rss_hash_opts,

	.create_rxfh_context	= otx2_create_rxfh,

	.modify_rxfh_context	= otx2_modify_rxfh,

	.remove_rxfh_context	= otx2_remove_rxfh,

	.get_ringparam		= otx2_get_ringparam,

	.set_ringparam		= otx2_set_ringparam,

	.get_coalesce		= otx2_get_coalesce,

drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c

+1 −5
Original line number Diff line number Diff line
@@ -2158,7 +2158,6 @@ int otx2_stop(struct net_device *netdev) 
	struct otx2_nic *pf = netdev_priv(netdev);

	struct otx2_cq_poll *cq_poll = NULL;

	struct otx2_qset *qset = &pf->qset;

	struct otx2_rss_info *rss;

	int qidx, vec, wrk;



	/* If the DOWN flag is set resources are already freed */
@@ -2176,10 +2175,7 @@ int otx2_stop(struct net_device *netdev) 
	otx2_rxtx_enable(pf, false);



	/* Clear RSS enable flag */

	rss = &pf->hw.rss_info;

	rss->enable = false;

	if (!netif_is_rxfh_configured(netdev))

		kfree(rss->rss_ctx[DEFAULT_RSS_CONTEXT_GROUP]);

	pf->hw.rss_info.enable = false;



	/* Cleanup Queue IRQ */

	vec = pci_irq_vector(pf->pdev,