Commit 55ef461c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

ethtool: move ethtool_rxfh_ctx_alloc() to common code 



Move ethtool_rxfh_ctx_alloc() to common code, Netlink will need it.

Reviewed-by: default avatarGal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20250717234343.2328602-6-kuba@kernel.org


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

net/ethtool/common.c

+34 −0
Original line number Diff line number Diff line
@@ -806,6 +806,40 @@ int ethtool_check_rss_ctx_busy(struct net_device *dev, u32 rss_context) 
	return rc;

}



struct ethtool_rxfh_context *

ethtool_rxfh_ctx_alloc(const struct ethtool_ops *ops,

		       u32 indir_size, u32 key_size)

{

	size_t indir_bytes, flex_len, key_off, size;

	struct ethtool_rxfh_context *ctx;

	u32 priv_bytes, indir_max;

	u16 key_max;



	key_max = max(key_size, ops->rxfh_key_space);

	indir_max = max(indir_size, ops->rxfh_indir_space);



	priv_bytes = ALIGN(ops->rxfh_priv_size, sizeof(u32));

	indir_bytes = array_size(indir_max, sizeof(u32));



	key_off = size_add(priv_bytes, indir_bytes);

	flex_len = size_add(key_off, key_max);

	size = struct_size_t(struct ethtool_rxfh_context, data, flex_len);



	ctx = kzalloc(size, GFP_KERNEL_ACCOUNT);

	if (!ctx)

		return NULL;



	ctx->indir_size = indir_size;

	ctx->key_size = key_size;

	ctx->key_off = key_off;

	ctx->priv_size = ops->rxfh_priv_size;



	ctx->hfunc = ETH_RSS_HASH_NO_CHANGE;

	ctx->input_xfrm = RXH_XFRM_NO_CHANGE;



	return ctx;

}



/* Check if fields configured for flow hash are symmetric - if src is included

 * so is dst and vice versa.

 */

net/ethtool/common.h

+3 −0
Original line number Diff line number Diff line
@@ -43,6 +43,9 @@ bool convert_legacy_settings_to_link_ksettings( 
int ethtool_check_max_channel(struct net_device *dev,

			      struct ethtool_channels channels,

			      struct genl_info *info);

struct ethtool_rxfh_context *

ethtool_rxfh_ctx_alloc(const struct ethtool_ops *ops,

		       u32 indir_size, u32 key_size);

int ethtool_check_rss_ctx_busy(struct net_device *dev, u32 rss_context);

int ethtool_rxfh_config_is_sym(u64 rxfh);

net/ethtool/ioctl.c

+0 −34
Original line number Diff line number Diff line
@@ -1473,40 +1473,6 @@ static noinline_for_stack int ethtool_get_rxfh(struct net_device *dev, 
	return ret;

}



static struct ethtool_rxfh_context *

ethtool_rxfh_ctx_alloc(const struct ethtool_ops *ops,

		       u32 indir_size, u32 key_size)

{

	size_t indir_bytes, flex_len, key_off, size;

	struct ethtool_rxfh_context *ctx;

	u32 priv_bytes, indir_max;

	u16 key_max;



	key_max = max(key_size, ops->rxfh_key_space);

	indir_max = max(indir_size, ops->rxfh_indir_space);



	priv_bytes = ALIGN(ops->rxfh_priv_size, sizeof(u32));

	indir_bytes = array_size(indir_max, sizeof(u32));



	key_off = size_add(priv_bytes, indir_bytes);

	flex_len = size_add(key_off, key_max);

	size = struct_size_t(struct ethtool_rxfh_context, data, flex_len);



	ctx = kzalloc(size, GFP_KERNEL_ACCOUNT);

	if (!ctx)

		return NULL;



	ctx->indir_size = indir_size;

	ctx->key_size = key_size;

	ctx->key_off = key_off;

	ctx->priv_size = ops->rxfh_priv_size;



	ctx->hfunc = ETH_RSS_HASH_NO_CHANGE;

	ctx->input_xfrm = RXH_XFRM_NO_CHANGE;



	return ctx;

}



static noinline_for_stack int ethtool_set_rxfh(struct net_device *dev,

					       void __user *useraddr)

{