Commit dce08107 authored by Breno Leitao's avatar Breno Leitao Committed by Jakub Kicinski
Browse files

net: ethtool: update set_rxfh_indir to use ethtool_get_rx_ring_count helper 



Modify ethtool_set_rxfh() to use the new ethtool_get_rx_ring_count()
helper function for retrieving the number of RX rings instead of
directly calling get_rxnfc with ETHTOOL_GRXRINGS.

This way, we can leverage the new helper if it is available in ethtool_ops.

Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Link: https://patch.msgid.link/20250917-gxrings-v4-6-dae520e2e1cb@debian.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d5544688

net/ethtool/ioctl.c

+8 −8
Original line number Diff line number Diff line
@@ -1350,13 +1350,12 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev, 
	const struct ethtool_ops *ops = dev->ethtool_ops;

	struct ethtool_rxfh_param rxfh_dev = {};

	struct netlink_ext_ack *extack = NULL;

	struct ethtool_rxnfc rx_rings;

	int num_rx_rings;

	u32 user_size, i;

	int ret;

	u32 ringidx_offset = offsetof(struct ethtool_rxfh_indir, ring_index[0]);



	if (!ops->get_rxfh_indir_size || !ops->set_rxfh ||

	    !ops->get_rxnfc)

	if (!ops->get_rxfh_indir_size || !ops->set_rxfh)

		return -EOPNOTSUPP;



	rxfh_dev.indir_size = ops->get_rxfh_indir_size(dev);
@@ -1376,20 +1375,21 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev, 
	if (!rxfh_dev.indir)

		return -ENOMEM;



	rx_rings.cmd = ETHTOOL_GRXRINGS;

	ret = ops->get_rxnfc(dev, &rx_rings, NULL);

	if (ret)

	num_rx_rings = ethtool_get_rx_ring_count(dev);

	if (num_rx_rings < 0) {

		ret = num_rx_rings;

		goto out;

	}



	if (user_size == 0) {

		u32 *indir = rxfh_dev.indir;



		for (i = 0; i < rxfh_dev.indir_size; i++)

			indir[i] = ethtool_rxfh_indir_default(i, rx_rings.data);

			indir[i] = ethtool_rxfh_indir_default(i, num_rx_rings);

	} else {

		ret = ethtool_copy_validate_indir(rxfh_dev.indir,

						  useraddr + ringidx_offset,

						  rx_rings.data,

						  num_rx_rings,

						  rxfh_dev.indir_size);

		if (ret)

			goto out;