Commit 9a14b1c2 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-channels-rxfh-conflict' 



Jacob Keller says:

====================
ethtool: correct {GS}CHANNELS and {GS}RXFH conflict

This patch series fixes up ethtool_set_channels operation which
allowed modifying the RXFH table indirectly by reducing the number of
queues below the current max queue used by the Rx flow table. Most
drivers incorrectly allowed this to destroy the Rx flow table and
would then start by reinitializing it to default settings. However,
drivers are not able to correctly handle the conflict since there was
no way to differentiate between the default settings and the user
requested explicit settings.

To fix this, implement a new netdev private flag which we use to
indicate whether the RXFH has been user configured. If someone has
a better alternative of how to store this information, let me know.
I am not sure that priv_flags is the best solution but I have not had
any better idea.

Secondly, we add a function which just calls the driver's get_rxfh
callback to determine the current indirection table. Loop through this
and we can determine the current highest queue that will be used by
RSS.

Now, modify ethtool_set_channels to add a check ensuring that if (a)
we have had rxfh configured by user, (b) we can get the maximum RSS
queue currently used, then we ensure that the newly requested Rx count
(or combined count) is at least as high as this maximum RSS queue. The
reasoning here is that we can always safely increase the number of
queues. If we decrease the queues we must ensure that the decrease
does not go lower than the highest in-use queue for the Rx flow table.

Drivers may still need to be patched if they currently overwrite the
Rx flow table during channel configuration. If the driver currently
always resets Rx flow table when increasing number of queues it must
be patched to only do this when netif_is_rxfh_configured returns
false.

The second patch simply adds a check to ensure that all provided
channel counts fit within driver defined maximums.

The third patch fixes fm10k to correctly reconfigure the RSS reta
table whenever it is still unconfigured. This means that the default
state will provide RSS to every queue. Once the user has configured
RXFH, then we should maintain it. In addition, since the case where we
must reconfigure the RSS table in this case should now no longer
occur, add a dev_err message to indicate the user that we did so.

I have also supplied an ethtool patch to enable setting the default Rx
flow indirection table. Without this, current ethtool does not support
sending an indir_size of 0, and thus does not correctly support
configuring back to the default.

Changes in v2:
* fixed compile error
* fixed incorrect comparison with max_rx_in_use
* adjusted looping over dev_size
* removed inline on function
* dropped patch about separating combined vs asymmetric channels
* verified behavior using fm10k driver
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 64f10f6e 1012014e

drivers/net/ethernet/intel/fm10k/fm10k_main.c

+8 −2
Original line number Diff line number Diff line
@@ -1937,8 +1937,10 @@ static void fm10k_init_reta(struct fm10k_intfc *interface) 
	u16 i, rss_i = interface->ring_feature[RING_F_RSS].indices;

	u32 reta, base;



	/* If the netdev is initialized we have to maintain table if possible */

	if (interface->netdev->reg_state != NETREG_UNINITIALIZED) {

	/* If the Rx flow indirection table has been configured manually, we

	 * need to maintain it when possible.

	 */

	if (netif_is_rxfh_configured(interface->netdev)) {

		for (i = FM10K_RETA_SIZE; i--;) {

			reta = interface->reta[i];

			if ((((reta << 24) >> 24) < rss_i) &&
@@ -1946,6 +1948,10 @@ static void fm10k_init_reta(struct fm10k_intfc *interface) 
			    (((reta <<  8) >> 24) < rss_i) &&

			    (((reta)       >> 24) < rss_i))

				continue;



			/* this should never happen */

			dev_err(&interface->pdev->dev,

				"RSS indirection table assigned flows out of queue bounds. Reconfiguring.\n");

			goto repopulate_reta;

		}

include/linux/netdevice.h

+8 −0
Original line number Diff line number Diff line
@@ -1291,6 +1291,7 @@ struct net_device_ops { 
 * @IFF_OPENVSWITCH: device is a Open vSwitch master

 * @IFF_L3MDEV_SLAVE: device is enslaved to an L3 master device

 * @IFF_TEAM: device is a team device

 * @IFF_RXFH_CONFIGURED: device has had Rx Flow indirection table configured

 */

enum netdev_priv_flags {

	IFF_802_1Q_VLAN			= 1<<0,
@@ -1318,6 +1319,7 @@ enum netdev_priv_flags { 
	IFF_OPENVSWITCH			= 1<<22,

	IFF_L3MDEV_SLAVE		= 1<<23,

	IFF_TEAM			= 1<<24,

	IFF_RXFH_CONFIGURED		= 1<<25,

};



#define IFF_802_1Q_VLAN			IFF_802_1Q_VLAN
@@ -1345,6 +1347,7 @@ enum netdev_priv_flags { 
#define IFF_OPENVSWITCH			IFF_OPENVSWITCH

#define IFF_L3MDEV_SLAVE		IFF_L3MDEV_SLAVE

#define IFF_TEAM			IFF_TEAM

#define IFF_RXFH_CONFIGURED		IFF_RXFH_CONFIGURED



/**

 *	struct net_device - The DEVICE structure.
@@ -4048,6 +4051,11 @@ static inline bool netif_is_lag_port(const struct net_device *dev) 
	return netif_is_bond_slave(dev) || netif_is_team_port(dev);

}



static inline bool netif_is_rxfh_configured(const struct net_device *dev)

{

	return dev->priv_flags & IFF_RXFH_CONFIGURED;

}



/* This device needs to keep skb dst for qdisc enqueue or ndo_start_xmit() */

static inline void netif_keep_dst(struct net_device *dev)

{

net/core/ethtool.c

+66 −2
Original line number Diff line number Diff line
@@ -642,6 +642,37 @@ void netdev_rss_key_fill(void *buffer, size_t len) 
}

EXPORT_SYMBOL(netdev_rss_key_fill);



static int ethtool_get_max_rxfh_channel(struct net_device *dev, u32 *max)

{

	u32 dev_size, current_max = 0;

	u32 *indir;

	int ret;



	if (!dev->ethtool_ops->get_rxfh_indir_size ||

	    !dev->ethtool_ops->get_rxfh)

		return -EOPNOTSUPP;

	dev_size = dev->ethtool_ops->get_rxfh_indir_size(dev);

	if (dev_size == 0)

		return -EOPNOTSUPP;



	indir = kcalloc(dev_size, sizeof(indir[0]), GFP_USER);

	if (!indir)

		return -ENOMEM;



	ret = dev->ethtool_ops->get_rxfh(dev, indir, NULL, NULL);

	if (ret)

		goto out;



	while (dev_size--)

		current_max = max(current_max, indir[dev_size]);



	*max = current_max;



out:

	kfree(indir);

	return ret;

}



static noinline_for_stack int ethtool_get_rxfh_indir(struct net_device *dev,

						     void __user *useraddr)

{
@@ -738,6 +769,14 @@ static noinline_for_stack int ethtool_set_rxfh_indir(struct net_device *dev, 
	}



	ret = ops->set_rxfh(dev, indir, NULL, ETH_RSS_HASH_NO_CHANGE);

	if (ret)

		goto out;



	/* indicate whether rxfh was set to default */

	if (user_size == 0)

		dev->priv_flags &= ~IFF_RXFH_CONFIGURED;

	else

		dev->priv_flags |= IFF_RXFH_CONFIGURED;



out:

	kfree(indir);
@@ -897,6 +936,14 @@ static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev, 
	}



	ret = ops->set_rxfh(dev, indir, hkey, rxfh.hfunc);

	if (ret)

		goto out;



	/* indicate whether rxfh was set to default */

	if (rxfh.indir_size == 0)

		dev->priv_flags &= ~IFF_RXFH_CONFIGURED;

	else if (rxfh.indir_size != ETH_RXFH_INDIR_NO_CHANGE)

		dev->priv_flags |= IFF_RXFH_CONFIGURED;



out:

	kfree(rss_config);
@@ -1227,14 +1274,31 @@ static noinline_for_stack int ethtool_get_channels(struct net_device *dev, 
static noinline_for_stack int ethtool_set_channels(struct net_device *dev,

						   void __user *useraddr)

{

	struct ethtool_channels channels;

	struct ethtool_channels channels, max;

	u32 max_rx_in_use = 0;



	if (!dev->ethtool_ops->set_channels)

	if (!dev->ethtool_ops->set_channels || !dev->ethtool_ops->get_channels)

		return -EOPNOTSUPP;



	if (copy_from_user(&channels, useraddr, sizeof(channels)))

		return -EFAULT;



	dev->ethtool_ops->get_channels(dev, &max);



	/* ensure new counts are within the maximums */

	if ((channels.rx_count > max.max_rx) ||

	    (channels.tx_count > max.max_tx) ||

	    (channels.combined_count > max.max_combined) ||

	    (channels.other_count > max.max_other))

		return -EINVAL;



	/* ensure the new Rx count fits within the configured Rx flow

	 * indirection table settings */

	if (netif_is_rxfh_configured(dev) &&

	    !ethtool_get_max_rxfh_channel(dev, &max_rx_in_use) &&

	    (channels.combined_count + channels.rx_count) <= max_rx_in_use)

	    return -EINVAL;



	return dev->ethtool_ops->set_channels(dev, &channels);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE