netdevsim: support setting a permanent address
Subsystems (4)
v2 cover netdevsim: support setting a permanent address
Network management daemons that match on the device permanent address currently have no virtual interface types to test against. NetworkManager, in particular, has carried an out of tree patch to set the permanent address on netdevsim devices to use in its CI for this purpose.
This series adds support to netdevsim to set a permanent address on port creation, and adds a test script to test setting and getting of the different L2 address types.
---
Changes in v2:
- Set the permanent address on port creation instead of through debugfs
- Add test script for testing L2 address setting and getting
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Toke Høiland-Jørgensen (2):
net: netdevsim: Support setting dev->perm_addr on port creation
selftests: net: add netdev-l2addr.sh for testing L2 address functionality
drivers/net/netdevsim/bus.c | 22 +++++++-- drivers/net/netdevsim/dev.c | 14 +++--- drivers/net/netdevsim/netdev.c | 9 ++-- drivers/net/netdevsim/netdevsim.h | 9 ++-- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/lib.sh | 17 +++++++ tools/testing/selftests/net/netdev-l2addr.sh | 68 ++++++++++++++++++++++++++++ 7 files changed, 122 insertions(+), 18 deletions(-)
---
base-commit: e96ee511c906c59b7c4e6efd9d9b33917730e000
change-id: 20250128-netdevsim-perm_addr-5fca47a08157
PATCH v2 1/2 net: netdevsim: Support setting dev->perm_addr on port creation
Network management daemons that match on the device permanent address currently have no virtual interface types to test against. NetworkManager, in particular, has carried an out of tree patch to set the permanent address on netdevsim devices to use in its CI for this purpose.
To support this use case, support setting netdev->perm_addr when creating a netdevsim port.
--- drivers/net/netdevsim/bus.c | 22 ++++++++++++++++++---- drivers/net/netdevsim/dev.c | 14 +++++++------- drivers/net/netdevsim/netdev.c | 9 ++++++--- drivers/net/netdevsim/netdevsim.h | 9 +++++---- 4 files changed, 36 insertions(+), 18 deletions(-)
drivers/net/netdevsim/bus.c +18 -4
@@ -66,17 +66,31 @@ new_port_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) {struct nsim_bus_dev *nsim_bus_dev =to_nsim_bus_dev (dev); +u8 eth_addr[ETH_ALEN ] = {};unsigned int port_index; +bool addr_set = false;int ret;/* Prevent to use nsim_bus_dev before initialization. */ if (!smp_load_acquire (&nsim_bus_dev->init))return -EBUSY ; - ret =kstrtouint (buf,0 , &port_index); -if (ret) -return ret; - ret =nsim_drv_port_add (nsim_bus_dev,NSIM_DEV_PORT_TYPE_PF , port_index); + ret =sscanf (buf,"%u %hhx:%hhx:%hhx:%hhx:%hhx:%hhx" , &port_index, + ð_addr[0 ], ð_addr[1 ], ð_addr[2 ], ð_addr[3 ], + ð_addr[4 ], ð_addr[5 ]); +switch (ret) { +case 7 : + addr_set = true; + fallthrough; +case 1 : +break ; +default : +pr_err ("Format for adding new port is \"id [perm_addr]\" (uint MAC).\n" ); +return -EINVAL ; + } + + ret =nsim_drv_port_add (nsim_bus_dev,NSIM_DEV_PORT_TYPE_PF , port_index, + addr_set ? eth_addr :NULL );return ret ? ret : count; }
drivers/net/netdevsim/dev.c +7 -7
@@ -576,7 +576,7 @@ static void nsim_dev_dummy_region_exit(struct nsim_dev *nsim_dev)static int __nsim_dev_port_add (struct nsim_dev *nsim_dev,enum nsim_dev_port_type type, -unsigned int port_index); +unsigned int port_index,u8 perm_addr[ETH_ALEN ]);static void __nsim_dev_port_del (struct nsim_dev_port *nsim_dev_port); static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev,
@@ -600,7 +600,7 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev,int i, err;for (i =0 ; i <nsim_dev_get_vfs (nsim_dev); i++) { - err =__nsim_dev_port_add (nsim_dev,NSIM_DEV_PORT_TYPE_VF , i); + err =__nsim_dev_port_add (nsim_dev,NSIM_DEV_PORT_TYPE_VF , i,NULL );if (err) {NL_SET_ERR_MSG_MOD (extack,"Failed to initialize VFs' netdevsim ports" );pr_err ("Failed to initialize VF id=%d. %d.\n" , i, err);
@@ -1353,7 +1353,7 @@ static const struct devlink_ops nsim_dev_devlink_ops = {#define NSIM_DEV_TEST1_DEFAULT truestatic int __nsim_dev_port_add (struct nsim_dev *nsim_dev,enum nsim_dev_port_type type, -unsigned int port_index) +unsigned int port_index,u8 perm_addr[ETH_ALEN ]) {struct devlink_port_attrs attrs = {};struct nsim_dev_port *nsim_dev_port;
@@ -1390,7 +1390,7 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_typif (err) goto err_dl_port_unregister; - nsim_dev_port->ns =nsim_create (nsim_dev, nsim_dev_port); + nsim_dev_port->ns =nsim_create (nsim_dev, nsim_dev_port, perm_addr);if (IS_ERR (nsim_dev_port->ns)) { err =PTR_ERR (nsim_dev_port->ns); goto err_port_debugfs_exit;
@@ -1446,7 +1446,7 @@ static int nsim_dev_port_add_all(struct nsim_dev *nsim_dev,int i, err;for (i =0 ; i < port_count; i++) { - err =__nsim_dev_port_add (nsim_dev,NSIM_DEV_PORT_TYPE_PF , i); + err =__nsim_dev_port_add (nsim_dev,NSIM_DEV_PORT_TYPE_PF , i,NULL );if (err) goto err_port_del_all; }
@@ -1702,7 +1702,7 @@ __nsim_dev_port_lookup(struct nsim_dev *nsim_dev, enum nsim_dev_port_type type, }int nsim_drv_port_add (struct nsim_bus_dev *nsim_bus_dev,enum nsim_dev_port_type type, -unsigned int port_index) +unsigned int port_index,u8 perm_addr[ETH_ALEN ]) {struct nsim_dev *nsim_dev =dev_get_drvdata (&nsim_bus_dev->dev);int err;
@@ -1711,7 +1711,7 @@ int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_typeif (__nsim_dev_port_lookup (nsim_dev, type, port_index)) err = -EEXIST ;else - err =__nsim_dev_port_add (nsim_dev, type, port_index); + err =__nsim_dev_port_add (nsim_dev, type, port_index, perm_addr);devl_unlock (priv_to_devlink (nsim_dev));return err; }
drivers/net/netdevsim/netdev.c +6 -3
@@ -998,8 +998,9 @@ static void nsim_exit_netdevsim(struct netdevsim *ns)mock_phc_destroy (ns->phc); } -struct netdevsim * -nsim_create (struct nsim_dev *nsim_dev,struct nsim_dev_port *nsim_dev_port) +struct netdevsim *nsim_create (struct nsim_dev *nsim_dev, +struct nsim_dev_port *nsim_dev_port, +u8 perm_addr[ETH_ALEN ]) {struct net_device *dev;struct netdevsim *ns;
@@ -1010,6 +1011,9 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port)if (!dev)return ERR_PTR (-ENOMEM ); +if (perm_addr) +memcpy (dev->perm_addr, perm_addr,ETH_ALEN ); +dev_net_set (dev,nsim_dev_net (nsim_dev)); ns =netdev_priv (dev); ns->netdev = dev;
@@ -1031,7 +1035,6 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) ns->qr_dfs =debugfs_create_file ("queue_reset" ,0200 , nsim_dev_port->ddir, ns, &nsim_qreset_fops); -return ns; err_free_netdev:
drivers/net/netdevsim/netdevsim.h +5 -4
@@ -143,8 +143,9 @@ struct netdevsim {struct netdev_net_notifier nn; }; -struct netdevsim * -nsim_create (struct nsim_dev *nsim_dev,struct nsim_dev_port *nsim_dev_port); +struct netdevsim *nsim_create (struct nsim_dev *nsim_dev, +struct nsim_dev_port *nsim_dev_port, +u8 perm_addr[ETH_ALEN ]);void nsim_destroy (struct netdevsim *ns);bool netdev_is_nsim (struct net_device *dev);
@@ -361,8 +362,8 @@ void nsim_dev_exit(void);int nsim_drv_probe (struct nsim_bus_dev *nsim_bus_dev);void nsim_drv_remove (struct nsim_bus_dev *nsim_bus_dev);int nsim_drv_port_add (struct nsim_bus_dev *nsim_bus_dev, -enum nsim_dev_port_type type, -unsigned int port_index); +enum nsim_dev_port_type type,unsigned int port_index, +u8 perm_addr[ETH_ALEN ]);int nsim_drv_port_del (struct nsim_bus_dev *nsim_bus_dev,enum nsim_dev_port_type type,unsigned int port_index);
Signature · 1 line
2.50.0
PATCH v2 2/2 selftests: net: add netdev-l2addr.sh for testing L2 address functionality
In reply to Toke Høiland-JørgensenAdd a new test script to the network selftests which tests getting and setting of layer 2 addresses through netlink, including the newly added support for setting a permaddr on netdevsim devices.
--- tools/testing/selftests/net/Makefile | 1 + tools/testing/selftests/net/lib.sh | 17 +++++++ tools/testing/selftests/net/netdev-l2addr.sh | 68 ++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+)
tools/testing/selftests/net/Makefile +1 -0
@@ -63,6 +63,7 @@ TEST_PROGS += ip_local_port_range.sh TEST_PROGS += rps_default_mask.sh TEST_PROGS += big_tcp.sh TEST_PROGS += netns-sysctl.sh +TEST_PROGS += netdev-l2addr.sh TEST_PROGS_EXTENDED := toeplitz_client.sh toeplitz.sh xfrm_policy_add_speed.sh TEST_GEN_FILES = socket nettest TEST_GEN_FILES += psock_fanout psock_tpacket msg_zerocopy reuseport_addr_any
tools/testing/selftests/net/lib.sh +17 -0
@@ -240,6 +240,23 @@ create_netdevsim() { echo nsim$id } +create_netdevsim_port() { + local nsim_id="$1" + local ns="$2" + local port_id="$3" + local perm_addr="$4" + + echo "$port_id $perm_addr" | ip netns exec $ns tee /sys/bus/netdevsim/devices/netdevsim$nsim_id/new_port > /dev/null + + local orig_dev=$(basename $(ip netns exec $ns find /sys/bus/netdevsim/devices/netdevsim$nsim_id/net/ -maxdepth 1 -name 'e*' | tail -n 1)) + local new_dev=nsim${id}p$port_id + + ip -netns $ns link set dev $orig_dev name $new_dev + ip -netns $ns link set dev $new_dev up + + echo $new_dev +} + # Remove netdevsim with given id. cleanup_netdevsim() { local id="$1"
tools/testing/selftests/net/netdev-l2addr.sh new file +68 -0
68 lines not on this page · raw message
Signature · 1 line
2.50.0