* [patch net-next 1/3] net: devlink: export devlink net setter
2019-10-05 6:10 [patch net-next 0/3] create netdevsim instances in namespace Jiri Pirko
@ 2019-10-05 6:10 ` Jiri Pirko
2019-10-05 6:10 ` [patch net-next 2/3] netdevsim: create devlink and netdev instances in namespace Jiri Pirko
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-10-05 6:10 UTC (permalink / raw)
To: netdev; +Cc: davem, idosch, jakub.kicinski, petrm, tariqt, saeedm, shuah, mlxsw
From: Jiri Pirko <jiri@mellanox.com>
For newly allocated devlink instance allow drivers to set net struct
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
include/net/devlink.h | 2 ++
net/core/devlink.c | 15 ++++++++++++---
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/include/net/devlink.h b/include/net/devlink.h
index 3c9d4a063c98..4095657fc23f 100644
--- a/include/net/devlink.h
+++ b/include/net/devlink.h
@@ -39,6 +39,7 @@ struct devlink {
possible_net_t _net;
struct mutex lock;
bool reload_failed;
+ bool registered;
char priv[0] __aligned(NETDEV_ALIGN);
};
@@ -772,6 +773,7 @@ static inline struct devlink *netdev_to_devlink(struct net_device *dev)
struct ib_device;
struct net *devlink_net(const struct devlink *devlink);
+void devlink_net_set(struct devlink *devlink, struct net *net);
struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size);
int devlink_register(struct devlink *devlink, struct device *dev);
void devlink_unregister(struct devlink *devlink);
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 6d16908f34b0..c628083cdf14 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -101,11 +101,19 @@ struct net *devlink_net(const struct devlink *devlink)
}
EXPORT_SYMBOL_GPL(devlink_net);
-static void devlink_net_set(struct devlink *devlink, struct net *net)
+static void __devlink_net_set(struct devlink *devlink, struct net *net)
{
write_pnet(&devlink->_net, net);
}
+void devlink_net_set(struct devlink *devlink, struct net *net)
+{
+ if (WARN_ON(devlink->registered))
+ return;
+ __devlink_net_set(devlink, net);
+}
+EXPORT_SYMBOL_GPL(devlink_net_set);
+
static struct devlink *devlink_get_from_attrs(struct net *net,
struct nlattr **attrs)
{
@@ -2750,7 +2758,7 @@ static void devlink_reload_netns_change(struct devlink *devlink,
DEVLINK_CMD_PARAM_DEL);
devlink_notify(devlink, DEVLINK_CMD_DEL);
- devlink_net_set(devlink, dest_net);
+ __devlink_net_set(devlink, dest_net);
devlink_notify(devlink, DEVLINK_CMD_NEW);
list_for_each_entry(param_item, &devlink->param_list, list)
@@ -6278,7 +6286,7 @@ struct devlink *devlink_alloc(const struct devlink_ops *ops, size_t priv_size)
if (!devlink)
return NULL;
devlink->ops = ops;
- devlink_net_set(devlink, &init_net);
+ __devlink_net_set(devlink, &init_net);
INIT_LIST_HEAD(&devlink->port_list);
INIT_LIST_HEAD(&devlink->sb_list);
INIT_LIST_HEAD_RCU(&devlink->dpipe_table_list);
@@ -6304,6 +6312,7 @@ int devlink_register(struct devlink *devlink, struct device *dev)
{
mutex_lock(&devlink_mutex);
devlink->dev = dev;
+ devlink->registered = true;
list_add_tail(&devlink->list, &devlink_list);
devlink_notify(devlink, DEVLINK_CMD_NEW);
mutex_unlock(&devlink_mutex);
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch net-next 2/3] netdevsim: create devlink and netdev instances in namespace
2019-10-05 6:10 [patch net-next 0/3] create netdevsim instances in namespace Jiri Pirko
2019-10-05 6:10 ` [patch net-next 1/3] net: devlink: export devlink net setter Jiri Pirko
@ 2019-10-05 6:10 ` Jiri Pirko
2019-10-05 6:10 ` [patch net-next 3/3] selftests: test creating netdevsim inside network namespace Jiri Pirko
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-10-05 6:10 UTC (permalink / raw)
To: netdev; +Cc: davem, idosch, jakub.kicinski, petrm, tariqt, saeedm, shuah, mlxsw
From: Jiri Pirko <jiri@mellanox.com>
When user does create new netdevsim instance using sysfs bus file,
create the devlink instance and related netdev instance in the namespace
of the caller.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
drivers/net/netdevsim/bus.c | 1 +
drivers/net/netdevsim/dev.c | 1 +
drivers/net/netdevsim/netdevsim.h | 3 +++
3 files changed, 5 insertions(+)
diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c
index 1a0ff3d7747b..6aeed0c600f8 100644
--- a/drivers/net/netdevsim/bus.c
+++ b/drivers/net/netdevsim/bus.c
@@ -283,6 +283,7 @@ nsim_bus_dev_new(unsigned int id, unsigned int port_count)
nsim_bus_dev->dev.bus = &nsim_bus;
nsim_bus_dev->dev.type = &nsim_bus_dev_type;
nsim_bus_dev->port_count = port_count;
+ nsim_bus_dev->initial_net = current->nsproxy->net_ns;
err = device_register(&nsim_bus_dev->dev);
if (err)
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 3f3c7cc21077..fbc4cdcfe551 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -726,6 +726,7 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev)
devlink = devlink_alloc(&nsim_dev_devlink_ops, sizeof(*nsim_dev));
if (!devlink)
return ERR_PTR(-ENOMEM);
+ devlink_net_set(devlink, nsim_bus_dev->initial_net);
nsim_dev = devlink_priv(devlink);
nsim_dev->nsim_bus_dev = nsim_bus_dev;
nsim_dev->switch_id.id_len = sizeof(nsim_dev->switch_id.id);
diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h
index 198ca31cec94..8168a5475fe7 100644
--- a/drivers/net/netdevsim/netdevsim.h
+++ b/drivers/net/netdevsim/netdevsim.h
@@ -220,6 +220,9 @@ struct nsim_bus_dev {
struct device dev;
struct list_head list;
unsigned int port_count;
+ struct net *initial_net; /* Purpose of this is to carry net pointer
+ * during the probe time only.
+ */
unsigned int num_vfs;
struct nsim_vf_config *vfconfigs;
};
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [patch net-next 3/3] selftests: test creating netdevsim inside network namespace
2019-10-05 6:10 [patch net-next 0/3] create netdevsim instances in namespace Jiri Pirko
2019-10-05 6:10 ` [patch net-next 1/3] net: devlink: export devlink net setter Jiri Pirko
2019-10-05 6:10 ` [patch net-next 2/3] netdevsim: create devlink and netdev instances in namespace Jiri Pirko
@ 2019-10-05 6:10 ` Jiri Pirko
2019-10-05 16:16 ` [patch net-next 0/3] create netdevsim instances in namespace Jakub Kicinski
2019-10-05 23:34 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jiri Pirko @ 2019-10-05 6:10 UTC (permalink / raw)
To: netdev; +Cc: davem, idosch, jakub.kicinski, petrm, tariqt, saeedm, shuah, mlxsw
From: Jiri Pirko <jiri@mellanox.com>
Add a test that creates netdevsim instance inside network namespace
and verifies that the related devlink instance and port netdevices
reside in the namespace.
Signed-off-by: Jiri Pirko <jiri@mellanox.com>
---
.../drivers/net/netdevsim/devlink_in_netns.sh | 72 +++++++++++++++++++
tools/testing/selftests/net/forwarding/lib.sh | 7 +-
2 files changed, 78 insertions(+), 1 deletion(-)
create mode 100755 tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh
diff --git a/tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh b/tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh
new file mode 100755
index 000000000000..7effd35369e1
--- /dev/null
+++ b/tools/testing/selftests/drivers/net/netdevsim/devlink_in_netns.sh
@@ -0,0 +1,72 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-2.0
+
+lib_dir=$(dirname $0)/../../../net/forwarding
+
+ALL_TESTS="check_devlink_test check_ports_test"
+NUM_NETIFS=0
+source $lib_dir/lib.sh
+
+BUS_ADDR=10
+PORT_COUNT=4
+DEV_NAME=netdevsim$BUS_ADDR
+SYSFS_NET_DIR=/sys/bus/netdevsim/devices/$DEV_NAME/net/
+DL_HANDLE=netdevsim/$DEV_NAME
+NETNS_NAME=testns1
+
+port_netdev_get()
+{
+ local port_index=$1
+
+ cmd_jq "devlink -N $NETNS_NAME port show -j" \
+ ".[][\"$DL_HANDLE/$port_index\"].netdev" "-e"
+}
+
+check_ports_test()
+{
+ RET=0
+
+ for i in $(seq 0 $(expr $PORT_COUNT - 1)); do
+ netdev_name=$(port_netdev_get $i)
+ check_err $? "Failed to get netdev name for port $DL_HANDLE/$i"
+ ip -n $NETNS_NAME link show $netdev_name &> /dev/null
+ check_err $? "Failed to find netdev $netdev_name"
+ done
+
+ log_test "check ports test"
+}
+
+check_devlink_test()
+{
+ RET=0
+
+ devlink -N $NETNS_NAME dev show $DL_HANDLE &> /dev/null
+ check_err $? "Failed to show devlink instance"
+
+ log_test "check devlink test"
+}
+
+setup_prepare()
+{
+ modprobe netdevsim
+ ip netns add $NETNS_NAME
+ ip netns exec $NETNS_NAME \
+ echo "$BUS_ADDR $PORT_COUNT" > /sys/bus/netdevsim/new_device
+ while [ ! -d $SYSFS_NET_DIR ] ; do :; done
+}
+
+cleanup()
+{
+ pre_cleanup
+ echo "$BUS_ADDR" > /sys/bus/netdevsim/del_device
+ ip netns del $NETNS_NAME
+ modprobe -r netdevsim
+}
+
+trap cleanup EXIT
+
+setup_prepare
+
+tests_run
+
+exit $EXIT_STATUS
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh
index 85c587a03c8a..8b48ec54d058 100644
--- a/tools/testing/selftests/net/forwarding/lib.sh
+++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -254,6 +254,7 @@ cmd_jq()
{
local cmd=$1
local jq_exp=$2
+ local jq_opts=$3
local ret
local output
@@ -263,7 +264,11 @@ cmd_jq()
if [[ $ret -ne 0 ]]; then
return $ret
fi
- output=$(echo $output | jq -r "$jq_exp")
+ output=$(echo $output | jq -r $jq_opts "$jq_exp")
+ ret=$?
+ if [[ $ret -ne 0 ]]; then
+ return $ret
+ fi
echo $output
# return success only in case of non-empty output
[ ! -z "$output" ]
--
2.21.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [patch net-next 0/3] create netdevsim instances in namespace
2019-10-05 6:10 [patch net-next 0/3] create netdevsim instances in namespace Jiri Pirko
` (2 preceding siblings ...)
2019-10-05 6:10 ` [patch net-next 3/3] selftests: test creating netdevsim inside network namespace Jiri Pirko
@ 2019-10-05 16:16 ` Jakub Kicinski
2019-10-05 23:34 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: Jakub Kicinski @ 2019-10-05 16:16 UTC (permalink / raw)
To: Jiri Pirko; +Cc: netdev, davem, idosch, petrm, tariqt, saeedm, shuah, mlxsw
On Sat, 5 Oct 2019 08:10:30 +0200, Jiri Pirko wrote:
> From: Jiri Pirko <jiri@mellanox.com>
>
> Allow user to create netdevsim devlink and netdevice instances in a
> network namespace according to the namespace where the user resides in.
> Add a selftest to test this.
Acked-by: Jakub Kicinski <jakub.kicinski@netronome.com>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [patch net-next 0/3] create netdevsim instances in namespace
2019-10-05 6:10 [patch net-next 0/3] create netdevsim instances in namespace Jiri Pirko
` (3 preceding siblings ...)
2019-10-05 16:16 ` [patch net-next 0/3] create netdevsim instances in namespace Jakub Kicinski
@ 2019-10-05 23:34 ` David Miller
4 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2019-10-05 23:34 UTC (permalink / raw)
To: jiri; +Cc: netdev, idosch, jakub.kicinski, petrm, tariqt, saeedm, shuah, mlxsw
From: Jiri Pirko <jiri@resnulli.us>
Date: Sat, 5 Oct 2019 08:10:30 +0200
> From: Jiri Pirko <jiri@mellanox.com>
>
> Allow user to create netdevsim devlink and netdevice instances in a
> network namespace according to the namespace where the user resides in.
> Add a selftest to test this.
Series applied.
^ permalink raw reply [flat|nested] 6+ messages in thread