net: devlink: Remove overzealous WARN_ON with snapshots

lunn · davem330 · commit bd71ea606731 · 2020-08-16T21:07:06.000-07:00
It is possible to trigger this WARN_ON from user space by triggering a
devlink snapshot with an ID which already exists. We don't need both
-EEXISTS being reported and spamming the kernel log.

Signed-off-by: Andrew Lunn &lt;andrew@lunn.ch&gt;
Tested-by: Chris Healy &lt;cphealy@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/core/devlink.c b/net/core/devlink.c
@@ -4063,7 +4063,7 @@ static int __devlink_snapshot_id_insert(struct devlink *devlink, u32 id)
 {
 	lockdep_assert_held(&devlink->lock);
 
-	if (WARN_ON(xa_load(&devlink->snapshot_ids, id)))
+	if (xa_load(&devlink->snapshot_ids, id))
 		return -EEXIST;
 
 	return xa_err(xa_store(&devlink->snapshot_ids, id, xa_mk_value(0),

Original file line number	Diff line number	Diff line change
`@@ -4063,7 +4063,7 @@ static int __devlink_snapshot_id_insert(struct devlink *devlink, u32 id)`
`4063`	`4063`	`{`
`4064`	`4064`	`lockdep_assert_held(&devlink->lock);`
`4065`	`4065`
`4066`		`- if (WARN_ON(xa_load(&devlink->snapshot_ids, id)))`
	`4066`	`+ if (xa_load(&devlink->snapshot_ids, id))`
`4067`	`4067`	`return -EEXIST;`
`4068`	`4068`
`4069`	`4069`	`return xa_err(xa_store(&devlink->snapshot_ids, id, xa_mk_value(0),`