* [PATCH net,v3 0/2] fix some issues in netdevsim driver
@ 2022-10-26 1:46 Zhengchao Shao
2022-10-26 1:46 ` [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed Zhengchao Shao
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Zhengchao Shao @ 2022-10-26 1:46 UTC (permalink / raw)
To: netdev, kuba, davem, edumazet, pabeni
Cc: dsa, jiri, weiyongjun1, yuehaibing, shaozhengchao
When strace tool is used to perform memory injection, memory leaks and
files not removed issues are found. Fix them.
Zhengchao Shao (2):
netdevsim: fix memory leak in nsim_drv_probe() when
nsim_dev_resources_register() failed
netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports
dir failed
drivers/net/netdevsim/dev.c | 31 ++++++++++++++++++++-----------
1 file changed, 20 insertions(+), 11 deletions(-)
--
2.17.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed
2022-10-26 1:46 [PATCH net,v3 0/2] fix some issues in netdevsim driver Zhengchao Shao
@ 2022-10-26 1:46 ` Zhengchao Shao
2022-10-27 3:36 ` Jakub Kicinski
2022-10-26 1:46 ` [PATCH net,v3 2/2] netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed Zhengchao Shao
2022-10-27 18:00 ` [PATCH net,v3 0/2] fix some issues in netdevsim driver patchwork-bot+netdevbpf
2 siblings, 1 reply; 5+ messages in thread
From: Zhengchao Shao @ 2022-10-26 1:46 UTC (permalink / raw)
To: netdev, kuba, davem, edumazet, pabeni
Cc: dsa, jiri, weiyongjun1, yuehaibing, shaozhengchao
If some items in nsim_dev_resources_register() fail, memory leak will
occur. The following is the memory leak information.
unreferenced object 0xffff888074c02600 (size 128):
comm "echo", pid 8159, jiffies 4294945184 (age 493.530s)
hex dump (first 32 bytes):
40 47 ea 89 ff ff ff ff 01 00 00 00 00 00 00 00 @G..............
ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ................
backtrace:
[<0000000011a31c98>] kmalloc_trace+0x22/0x60
[<0000000027384c69>] devl_resource_register+0x144/0x4e0
[<00000000a16db248>] nsim_drv_probe+0x37a/0x1260
[<000000007d1f448c>] really_probe+0x20b/0xb10
[<00000000c416848a>] __driver_probe_device+0x1b3/0x4a0
[<00000000077e0351>] driver_probe_device+0x49/0x140
[<0000000054f2465a>] __device_attach_driver+0x18c/0x2a0
[<000000008538f359>] bus_for_each_drv+0x151/0x1d0
[<0000000038e09747>] __device_attach+0x1c9/0x4e0
[<00000000dd86e533>] bus_probe_device+0x1d5/0x280
[<00000000839bea35>] device_add+0xae0/0x1cb0
[<000000009c2abf46>] new_device_store+0x3b6/0x5f0
[<00000000fb823d7f>] bus_attr_store+0x72/0xa0
[<000000007acc4295>] sysfs_kf_write+0x106/0x160
[<000000005f50cb4d>] kernfs_fop_write_iter+0x3a8/0x5a0
[<0000000075eb41bf>] vfs_write+0x8f0/0xc80
Fixes: 37923ed6b8ce ("netdevsim: Add simple FIB resource controller via devlink")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
drivers/net/netdevsim/dev.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 794fc0cc73b8..81c3e14af063 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -442,7 +442,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
¶ms);
if (err) {
pr_err("Failed to register IPv4 top resource\n");
- goto out;
+ goto err_out;
}
err = devl_resource_register(devlink, "fib", (u64)-1,
@@ -450,7 +450,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
NSIM_RESOURCE_IPV4, ¶ms);
if (err) {
pr_err("Failed to register IPv4 FIB resource\n");
- return err;
+ goto err_out;
}
err = devl_resource_register(devlink, "fib-rules", (u64)-1,
@@ -458,7 +458,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
NSIM_RESOURCE_IPV4, ¶ms);
if (err) {
pr_err("Failed to register IPv4 FIB rules resource\n");
- return err;
+ goto err_out;
}
/* Resources for IPv6 */
@@ -468,7 +468,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
¶ms);
if (err) {
pr_err("Failed to register IPv6 top resource\n");
- goto out;
+ goto err_out;
}
err = devl_resource_register(devlink, "fib", (u64)-1,
@@ -476,7 +476,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
NSIM_RESOURCE_IPV6, ¶ms);
if (err) {
pr_err("Failed to register IPv6 FIB resource\n");
- return err;
+ goto err_out;
}
err = devl_resource_register(devlink, "fib-rules", (u64)-1,
@@ -484,7 +484,7 @@ static int nsim_dev_resources_register(struct devlink *devlink)
NSIM_RESOURCE_IPV6, ¶ms);
if (err) {
pr_err("Failed to register IPv6 FIB rules resource\n");
- return err;
+ goto err_out;
}
/* Resources for nexthops */
@@ -492,8 +492,14 @@ static int nsim_dev_resources_register(struct devlink *devlink)
NSIM_RESOURCE_NEXTHOPS,
DEVLINK_RESOURCE_ID_PARENT_TOP,
¶ms);
+ if (err) {
+ pr_err("Failed to register NEXTHOPS resource\n");
+ goto err_out;
+ }
+ return 0;
-out:
+err_out:
+ devl_resources_unregister(devlink);
return err;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net,v3 2/2] netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed
2022-10-26 1:46 [PATCH net,v3 0/2] fix some issues in netdevsim driver Zhengchao Shao
2022-10-26 1:46 ` [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed Zhengchao Shao
@ 2022-10-26 1:46 ` Zhengchao Shao
2022-10-27 18:00 ` [PATCH net,v3 0/2] fix some issues in netdevsim driver patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: Zhengchao Shao @ 2022-10-26 1:46 UTC (permalink / raw)
To: netdev, kuba, davem, edumazet, pabeni
Cc: dsa, jiri, weiyongjun1, yuehaibing, shaozhengchao
Remove dir in nsim_dev_debugfs_init() when creating ports dir failed.
Otherwise, the netdevsim device will not be created next time. Kernel
reports an error: debugfs: Directory 'netdevsim1' with parent 'netdevsim'
already present!
Fixes: ab1d0cc004d7 ("netdevsim: change debugfs tree topology")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
drivers/net/netdevsim/dev.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 81c3e14af063..a7880c7ce94c 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -309,8 +309,10 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
if (IS_ERR(nsim_dev->ddir))
return PTR_ERR(nsim_dev->ddir);
nsim_dev->ports_ddir = debugfs_create_dir("ports", nsim_dev->ddir);
- if (IS_ERR(nsim_dev->ports_ddir))
- return PTR_ERR(nsim_dev->ports_ddir);
+ if (IS_ERR(nsim_dev->ports_ddir)) {
+ err = PTR_ERR(nsim_dev->ports_ddir);
+ goto err_ddir;
+ }
debugfs_create_bool("fw_update_status", 0600, nsim_dev->ddir,
&nsim_dev->fw_update_status);
debugfs_create_u32("fw_update_overwrite_mask", 0600, nsim_dev->ddir,
@@ -346,7 +348,7 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
nsim_dev->nodes_ddir = debugfs_create_dir("rate_nodes", nsim_dev->ddir);
if (IS_ERR(nsim_dev->nodes_ddir)) {
err = PTR_ERR(nsim_dev->nodes_ddir);
- goto err_out;
+ goto err_ports_ddir;
}
debugfs_create_bool("fail_trap_drop_counter_get", 0600,
nsim_dev->ddir,
@@ -354,8 +356,9 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
nsim_udp_tunnels_debugfs_create(nsim_dev);
return 0;
-err_out:
+err_ports_ddir:
debugfs_remove_recursive(nsim_dev->ports_ddir);
+err_ddir:
debugfs_remove_recursive(nsim_dev->ddir);
return err;
}
--
2.17.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed
2022-10-26 1:46 ` [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed Zhengchao Shao
@ 2022-10-27 3:36 ` Jakub Kicinski
0 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2022-10-27 3:36 UTC (permalink / raw)
To: Zhengchao Shao
Cc: netdev, davem, edumazet, pabeni, dsa, jiri, weiyongjun1, yuehaibing
On Wed, 26 Oct 2022 09:46:41 +0800 Zhengchao Shao wrote:
> If some items in nsim_dev_resources_register() fail, memory leak will
> occur. The following is the memory leak information.
Acked-by: Jakub Kicinski <kuba@kernel.org>
Thanks!
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH net,v3 0/2] fix some issues in netdevsim driver
2022-10-26 1:46 [PATCH net,v3 0/2] fix some issues in netdevsim driver Zhengchao Shao
2022-10-26 1:46 ` [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed Zhengchao Shao
2022-10-26 1:46 ` [PATCH net,v3 2/2] netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed Zhengchao Shao
@ 2022-10-27 18:00 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-10-27 18:00 UTC (permalink / raw)
To: shaozhengchao
Cc: netdev, kuba, davem, edumazet, pabeni, dsa, jiri, weiyongjun1,
yuehaibing
Hello:
This series was applied to netdev/net.git (master)
by Jakub Kicinski <kuba@kernel.org>:
On Wed, 26 Oct 2022 09:46:40 +0800 you wrote:
> When strace tool is used to perform memory injection, memory leaks and
> files not removed issues are found. Fix them.
>
> Zhengchao Shao (2):
> netdevsim: fix memory leak in nsim_drv_probe() when
> nsim_dev_resources_register() failed
> netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports
> dir failed
>
> [...]
Here is the summary with links:
- [net,v3,1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed
https://git.kernel.org/netdev/net/c/6b1da9f7126f
- [net,v3,2/2] netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed
https://git.kernel.org/netdev/net/c/a6aa8d0ce2cf
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-10-27 18:01 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-26 1:46 [PATCH net,v3 0/2] fix some issues in netdevsim driver Zhengchao Shao
2022-10-26 1:46 ` [PATCH net,v3 1/2] netdevsim: fix memory leak in nsim_drv_probe() when nsim_dev_resources_register() failed Zhengchao Shao
2022-10-27 3:36 ` Jakub Kicinski
2022-10-26 1:46 ` [PATCH net,v3 2/2] netdevsim: remove dir in nsim_dev_debugfs_init() when creating ports dir failed Zhengchao Shao
2022-10-27 18:00 ` [PATCH net,v3 0/2] fix some issues in netdevsim driver patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.