git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-18 03:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

ethtool: rss: factor out populating response from context

Browse Source 
Similarly to previous change, factor out populating the response.
We will use this after the context was allocated to send a notification
so this time factor out from the additional context handling, rather
than context 0 handling (for request context didn't exist, for response
it does).

Reviewed-by: Gal Pressman <gal@nvidia.com>
Link: https://patch.msgid.link/20250717234343.2328602-5-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Jakub Kicinski
2025-07-17 16:43:39 -07:00
parent a45f98efa4
commit 5c090d9eae
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
net/ethtool/rss.c
View File

@@ -179,6 +179,25 @@ out_unlock:
return ret;
}
static void
__rss_prepare_ctx(struct net_device *dev, struct rss_reply_data *data,
struct ethtool_rxfh_context *ctx)
{
if (WARN_ON_ONCE(data->indir_size != ctx->indir_size ||
data->hkey_size != ctx->key_size))
return;
data->no_key_fields = !dev->ethtool_ops->rxfh_per_ctx_key;
data->hfunc = ctx->hfunc;
data->input_xfrm = ctx->input_xfrm;
memcpy(data->indir_table, ethtool_rxfh_context_indir(ctx),
data->indir_size * sizeof(u32));
if (data->hkey_size)
memcpy(data->hkey, ethtool_rxfh_context_key(ctx),
data->hkey_size);
}
static int
rss_prepare_ctx(const struct rss_req_info *request, struct net_device *dev,
struct rss_reply_data *data, const struct genl_info *info)
@@ -188,8 +207,6 @@ rss_prepare_ctx(const struct rss_req_info *request, struct net_device *dev,
u8 *rss_config;
int ret;
data->no_key_fields = !dev->ethtool_ops->rxfh_per_ctx_key;
mutex_lock(&dev->ethtool->rss_lock);
ctx = xa_load(&dev->ethtool->rss_ctx, request->rss_context);
if (!ctx) {
@@ -199,8 +216,6 @@ rss_prepare_ctx(const struct rss_req_info *request, struct net_device *dev,
data->indir_size = ctx->indir_size;
data->hkey_size = ctx->key_size;
data->hfunc = ctx->hfunc;
data->input_xfrm = ctx->input_xfrm;
indir_bytes = data->indir_size * sizeof(u32);
total_size = indir_bytes + data->hkey_size;
@@ -211,13 +226,10 @@ rss_prepare_ctx(const struct rss_req_info *request, struct net_device *dev,
}
data->indir_table = (u32 *)rss_config;
memcpy(data->indir_table, ethtool_rxfh_context_indir(ctx), indir_bytes);
if (data->hkey_size) {
if (data->hkey_size)
data->hkey = rss_config + indir_bytes;
memcpy(data->hkey, ethtool_rxfh_context_key(ctx),
data->hkey_size);
}
__rss_prepare_ctx(dev, data, ctx);
ret = 0;
out_unlock: