Skip to contentSkip to conversation

netdevsim: fix duplicated debugfs directory

PATCH Applied Jakub Kicinski 2 participants 2 messages Sep 26, 2020

Subsystems (6)
lore
Share & tools
lore

Jakub Kicinski

author maintainer
#0 lore raw

PATCH 1/1 netdevsim: fix duplicated debugfs directory

The "ethtool" debugfs directory holds per-netdev knobs, so move it from the device instance directory to the port directory.

This fixes the following warning when creating multiple ports:

debugfs: Directory 'ethtool' with parent 'netdevsim1' already present!

Fixes ff1f7c17fb20 ("netdevsim: add pause frame stats")
---
 drivers/net/netdevsim/ethtool.c                                | 2 +-
 tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/netdevsim/ethtool.c +1 -1
index 7a4c779b4c89..f1884d90a876 100644
@@ -54,7 +54,7 @@ void nsim_ethtool_init(struct netdevsim *ns)
 
 	ns->netdev->ethtool_ops = &nsim_ethtool_ops;
 
-	ethtool = debugfs_create_dir("ethtool", ns->nsim_dev->ddir);
+	ethtool = debugfs_create_dir("ethtool", ns->nsim_dev_port->ddir);
 
 	dir = debugfs_create_dir("pause", ethtool);
 	debugfs_create_bool("report_stats_rx", 0600, dir,
tools/testing/selftests/drivers/net/netdevsim/ethtool-pause.sh +1 -1
index dd6ad6501c9c..25c896b9e2eb 100755
@@ -3,7 +3,7 @@
 
 NSIM_ID=$((RANDOM % 1024))
 NSIM_DEV_SYS=/sys/bus/netdevsim/devices/netdevsim$NSIM_ID
-NSIM_DEV_DFS=/sys/kernel/debug/netdevsim/netdevsim$NSIM_ID
+NSIM_DEV_DFS=/sys/kernel/debug/netdevsim/netdevsim$NSIM_ID/ports/0
 NSIM_NETDEV=
 num_passes=0
 num_errors=0
Signature · 1 line
2.26.2
maintainer Applied
#1 lore raw

From: Jakub Kicinski <[email protected]>
Date: Fri, 25 Sep 2020 18:19:13 -0700

Quoted 9 lines

The "ethtool" debugfs directory holds per-netdev knobs, so move it from the device instance directory to the port directory.

This fixes the following warning when creating multiple ports:

debugfs: Directory 'ethtool' with parent 'netdevsim1' already present!

Fixes ff1f7c17fb20 ("netdevsim: add pause frame stats")

Applied.