Skip to content

Commit

Permalink
net: sysfs: Do not create sysfs for non BQL device
Browse files Browse the repository at this point in the history
Creation of sysfs entries is expensive, mainly for workloads that
constantly creates netdev and netns often.

Do not create BQL sysfs entries for devices that don't need,
basically those that do not have a real queue, i.e, devices that has
NETIF_F_LLTX and IFF_NO_QUEUE, such as `lo` interface.

This will remove the /sys/class/net/eth0/queues/tx-X/byte_queue_limits/
directory for these devices.

In the example below, eth0 has the `byte_queue_limits` directory but not
`lo`.

	# ls /sys/class/net/lo/queues/tx-0/
	traffic_class  tx_maxrate  tx_timeout  xps_cpus  xps_rxqs

	# ls /sys/class/net/eth0/queues/tx-0/byte_queue_limits/
	hold_time  inflight  limit  limit_max  limit_min

This also removes the #ifdefs, since we can also use netdev_uses_bql() to
check if the config is enabled. (as suggested by Jakub).

Suggested-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: Breno Leitao <leitao@debian.org>
Link: https://lore.kernel.org/r/20240216094154.3263843-1-leitao@debian.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Breno Leitao authored and Jakub Kicinski committed Feb 19, 2024
1 parent f853fa5 commit 74293ea
Showing 1 changed file with 24 additions and 11 deletions.
35 changes: 24 additions & 11 deletions net/core/net-sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,9 @@ static const struct attribute_group dql_group = {
.name = "byte_queue_limits",
.attrs = dql_attrs,
};
#else
/* Fake declaration, all the code using it should be dead */
extern const struct attribute_group dql_group;
#endif /* CONFIG_BQL */

#ifdef CONFIG_XPS
Expand Down Expand Up @@ -1696,6 +1699,15 @@ static const struct kobj_type netdev_queue_ktype = {
.get_ownership = netdev_queue_get_ownership,
};

static bool netdev_uses_bql(const struct net_device *dev)
{
if (dev->features & NETIF_F_LLTX ||
dev->priv_flags & IFF_NO_QUEUE)
return false;

return IS_ENABLED(CONFIG_BQL);
}

static int netdev_queue_add_kobject(struct net_device *dev, int index)
{
struct netdev_queue *queue = dev->_tx + index;
Expand All @@ -1713,11 +1725,11 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index)
if (error)
goto err;

#ifdef CONFIG_BQL
error = sysfs_create_group(kobj, &dql_group);
if (error)
goto err;
#endif
if (netdev_uses_bql(dev)) {
error = sysfs_create_group(kobj, &dql_group);
if (error)
goto err;
}

kobject_uevent(kobj, KOBJ_ADD);
return 0;
Expand All @@ -1738,9 +1750,9 @@ static int tx_queue_change_owner(struct net_device *ndev, int index,
if (error)
return error;

#ifdef CONFIG_BQL
error = sysfs_group_change_owner(kobj, &dql_group, kuid, kgid);
#endif
if (netdev_uses_bql(ndev))
error = sysfs_group_change_owner(kobj, &dql_group, kuid, kgid);

return error;
}
#endif /* CONFIG_SYSFS */
Expand Down Expand Up @@ -1772,9 +1784,10 @@ netdev_queue_update_kobjects(struct net_device *dev, int old_num, int new_num)

if (!refcount_read(&dev_net(dev)->ns.count))
queue->kobj.uevent_suppress = 1;
#ifdef CONFIG_BQL
sysfs_remove_group(&queue->kobj, &dql_group);
#endif

if (netdev_uses_bql(dev))
sysfs_remove_group(&queue->kobj, &dql_group);

kobject_put(&queue->kobj);
}

Expand Down

0 comments on commit 74293ea

Please sign in to comment.