| Message ID | 20240404164604.3055832-1-edumazet@google.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | db77cdc69684890b37ff2bb9fb9e0be2ba4d6efe |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next] net: dqs: use sysfs_emit() in favor of sprintf() | expand |
On 2024-04-04 09:46, Eric Dumazet wrote: > Commit 6025b9135f7a ("net: dqs: add NIC stall detector based on BQL") > added three sysfs files. > > Use the recommended sysfs_emit() helper. > > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Breno Leitao <leitao@debian.org> > --- > net/core/net-sysfs.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index e3d7a8cfa20b7d1052f2b6c54b7a9810c55f91fc..ff3ee45be64a6a91d1abdcac5cd04b4bdd03e39c 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -1419,7 +1419,7 @@ static ssize_t bql_show_stall_thrs(struct netdev_queue *queue, char *buf) > { > struct dql *dql = &queue->dql; > > - return sprintf(buf, "%u\n", jiffies_to_msecs(dql->stall_thrs)); > + return sysfs_emit(buf, "%u\n", jiffies_to_msecs(dql->stall_thrs)); > } > > static ssize_t bql_set_stall_thrs(struct netdev_queue *queue, > @@ -1451,7 +1451,7 @@ static struct netdev_queue_attribute bql_stall_thrs_attribute __ro_after_init = > > static ssize_t bql_show_stall_max(struct netdev_queue *queue, char *buf) > { > - return sprintf(buf, "%u\n", READ_ONCE(queue->dql.stall_max)); > + return sysfs_emit(buf, "%u\n", READ_ONCE(queue->dql.stall_max)); > } > > static ssize_t bql_set_stall_max(struct netdev_queue *queue, > @@ -1468,7 +1468,7 @@ static ssize_t bql_show_stall_cnt(struct netdev_queue *queue, char *buf) > { > struct dql *dql = &queue->dql; > > - return sprintf(buf, "%lu\n", dql->stall_cnt); > + return sysfs_emit(buf, "%lu\n", dql->stall_cnt); > } > > static struct netdev_queue_attribute bql_stall_cnt_attribute __ro_after_init = Checked that the above are the only 3 instances of sprintf() in net-sysfs.c. Rest of the file uses sysfs_emit() which has the same args as sprintf(). Interestingly the docs for sysfs_emit() claims it is an scnprintf() equivalent, but has no size_t size param. So it's more like a sprintf() equivalent.
On Thu, Apr 4, 2024 at 7:57 PM David Wei <dw@davidwei.uk> wrote: > Checked that the above are the only 3 instances of sprintf() in > net-sysfs.c. Rest of the file uses sysfs_emit() which has the same args > as sprintf(). > > Interestingly the docs for sysfs_emit() claims it is an scnprintf() > equivalent, but has no size_t size param. So it's more like a sprintf() > equivalent. sysfs uses PAGE_SIZE allocated buffers, this is kind of hardcoded in it.
On Thu, Apr 04, 2024 at 04:46:04PM +0000, Eric Dumazet wrote: > Commit 6025b9135f7a ("net: dqs: add NIC stall detector based on BQL") > added three sysfs files. > > Use the recommended sysfs_emit() helper. > > Signed-off-by: Eric Dumazet <edumazet@google.com> Reviwed-by: Breno Leitao <leitao@debian.org>
Hello: This patch was applied to netdev/net-next.git (main) by David S. Miller <davem@davemloft.net>: On Thu, 4 Apr 2024 16:46:04 +0000 you wrote: > Commit 6025b9135f7a ("net: dqs: add NIC stall detector based on BQL") > added three sysfs files. > > Use the recommended sysfs_emit() helper. > > Signed-off-by: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Breno Leitao <leitao@debian.org> > > [...] Here is the summary with links: - [net-next] net: dqs: use sysfs_emit() in favor of sprintf() https://git.kernel.org/netdev/net-next/c/db77cdc69684 You are awesome, thank you!
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index e3d7a8cfa20b7d1052f2b6c54b7a9810c55f91fc..ff3ee45be64a6a91d1abdcac5cd04b4bdd03e39c 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1419,7 +1419,7 @@ static ssize_t bql_show_stall_thrs(struct netdev_queue *queue, char *buf) { struct dql *dql = &queue->dql; - return sprintf(buf, "%u\n", jiffies_to_msecs(dql->stall_thrs)); + return sysfs_emit(buf, "%u\n", jiffies_to_msecs(dql->stall_thrs)); } static ssize_t bql_set_stall_thrs(struct netdev_queue *queue, @@ -1451,7 +1451,7 @@ static struct netdev_queue_attribute bql_stall_thrs_attribute __ro_after_init = static ssize_t bql_show_stall_max(struct netdev_queue *queue, char *buf) { - return sprintf(buf, "%u\n", READ_ONCE(queue->dql.stall_max)); + return sysfs_emit(buf, "%u\n", READ_ONCE(queue->dql.stall_max)); } static ssize_t bql_set_stall_max(struct netdev_queue *queue, @@ -1468,7 +1468,7 @@ static ssize_t bql_show_stall_cnt(struct netdev_queue *queue, char *buf) { struct dql *dql = &queue->dql; - return sprintf(buf, "%lu\n", dql->stall_cnt); + return sysfs_emit(buf, "%lu\n", dql->stall_cnt); } static struct netdev_queue_attribute bql_stall_cnt_attribute __ro_after_init =
Commit 6025b9135f7a ("net: dqs: add NIC stall detector based on BQL") added three sysfs files. Use the recommended sysfs_emit() helper. Signed-off-by: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Breno Leitao <leitao@debian.org> --- net/core/net-sysfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)