Commit 0eb8516b authored by David S. Miller's avatar David S. Miller

Merge branch 'netdevsim-allow-to-test-reload-failures'

Jiri Pirko says:

====================
netdevsim: allow to test reload failures

Allow user to test devlink reload failures: Fail to reload and fail
during reload.
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d44dc741 9278bc9f
...@@ -90,6 +90,10 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev) ...@@ -90,6 +90,10 @@ static int nsim_dev_debugfs_init(struct nsim_dev *nsim_dev)
&nsim_dev->test1); &nsim_dev->test1);
debugfs_create_file("take_snapshot", 0200, nsim_dev->ddir, nsim_dev, debugfs_create_file("take_snapshot", 0200, nsim_dev->ddir, nsim_dev,
&nsim_dev_take_snapshot_fops); &nsim_dev_take_snapshot_fops);
debugfs_create_bool("dont_allow_reload", 0600, nsim_dev->ddir,
&nsim_dev->dont_allow_reload);
debugfs_create_bool("fail_reload", 0600, nsim_dev->ddir,
&nsim_dev->fail_reload);
return 0; return 0;
} }
...@@ -478,6 +482,14 @@ static int nsim_dev_reload_down(struct devlink *devlink, bool netns_change, ...@@ -478,6 +482,14 @@ static int nsim_dev_reload_down(struct devlink *devlink, bool netns_change,
{ {
struct nsim_dev *nsim_dev = devlink_priv(devlink); struct nsim_dev *nsim_dev = devlink_priv(devlink);
if (nsim_dev->dont_allow_reload) {
/* For testing purposes, user set debugfs dont_allow_reload
* value to true. So forbid it.
*/
NL_SET_ERR_MSG_MOD(extack, "User forbidded reload for testing purposes");
return -EOPNOTSUPP;
}
nsim_dev_reload_destroy(nsim_dev); nsim_dev_reload_destroy(nsim_dev);
return 0; return 0;
} }
...@@ -487,6 +499,14 @@ static int nsim_dev_reload_up(struct devlink *devlink, ...@@ -487,6 +499,14 @@ static int nsim_dev_reload_up(struct devlink *devlink,
{ {
struct nsim_dev *nsim_dev = devlink_priv(devlink); struct nsim_dev *nsim_dev = devlink_priv(devlink);
if (nsim_dev->fail_reload) {
/* For testing purposes, user set debugfs fail_reload
* value to true. Fail right away.
*/
NL_SET_ERR_MSG_MOD(extack, "User setup the reload to fail for testing purposes");
return -EINVAL;
}
return nsim_dev_reload_create(nsim_dev, extack); return nsim_dev_reload_create(nsim_dev, extack);
} }
......
...@@ -161,6 +161,8 @@ struct nsim_dev { ...@@ -161,6 +161,8 @@ struct nsim_dev {
bool fw_update_status; bool fw_update_status;
u32 max_macs; u32 max_macs;
bool test1; bool test1;
bool dont_allow_reload;
bool fail_reload;
struct devlink_region *dummy_region; struct devlink_region *dummy_region;
}; };
......
...@@ -150,6 +150,30 @@ reload_test() ...@@ -150,6 +150,30 @@ reload_test()
devlink dev reload $DL_HANDLE devlink dev reload $DL_HANDLE
check_err $? "Failed to reload" check_err $? "Failed to reload"
echo "y"> $DEBUGFS_DIR/fail_reload
check_err $? "Failed to setup devlink reload to fail"
devlink dev reload $DL_HANDLE
check_fail $? "Unexpected success of devlink reload"
echo "n"> $DEBUGFS_DIR/fail_reload
check_err $? "Failed to setup devlink reload not to fail"
devlink dev reload $DL_HANDLE
check_err $? "Failed to reload after set not to fail"
echo "y"> $DEBUGFS_DIR/dont_allow_reload
check_err $? "Failed to forbid devlink reload"
devlink dev reload $DL_HANDLE
check_fail $? "Unexpected success of devlink reload"
echo "n"> $DEBUGFS_DIR/dont_allow_reload
check_err $? "Failed to re-enable devlink reload"
devlink dev reload $DL_HANDLE
check_err $? "Failed to reload after re-enable"
log_test "reload test" log_test "reload test"
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment