add MACsec offload selftests
Subsystems (4)
v3 cover add MACsec offload selftests
Patch 1 adds MACsec offload to netdevsim (unchanged from v2).
Patch 2 adds a corresponding selftest to the rtnetlink testsuite.
Sabrina Dubroca (2):
netdevsim: add dummy macsec offload
selftests: rtnetlink: add MACsec offload tests
drivers/net/netdevsim/Makefile | 4 + drivers/net/netdevsim/macsec.c | 356 +++++++++++++++++++++++ drivers/net/netdevsim/netdev.c | 3 + drivers/net/netdevsim/netdevsim.h | 34 +++ tools/testing/selftests/net/rtnetlink.sh | 83 ++++++ 5 files changed, 480 insertions(+) create mode 100644 drivers/net/netdevsim/macsec.c
Signature · 1 line
2.40.1
PATCH v3 1/2 netdevsim: add dummy macsec offload
When the kernel is compiled with MACsec support, add the NETIF_F_HW_MACSEC feature to netdevsim devices and implement macsec_ops.
To allow easy testing of failure from the device, support is limited to 3 SecY's per netdevsim device, and 1 RXSC per SecY.
v2:
- nsim_macsec_add_secy, return -ENOSPC if secy_count isn't full but we can't find an empty slot (Simon Horman)
- add sci_to_cpu to make sparse happy (Simon Horman)
- remove set but not used secy variable (kernel test robot and Simon Horman)
--- drivers/net/netdevsim/Makefile | 4 + drivers/net/netdevsim/macsec.c | 356 ++++++++++++++++++++++++++++++ drivers/net/netdevsim/netdev.c | 3 + drivers/net/netdevsim/netdevsim.h | 34 +++ 4 files changed, 397 insertions(+) create mode 100644 drivers/net/netdevsim/macsec.c
drivers/net/netdevsim/Makefile +4 -0
@@ -17,3 +17,7 @@ endif ifneq ($(CONFIG_PSAMPLE),) netdevsim-objs += psample.o endif + +ifneq ($(CONFIG_MACSEC),) +netdevsim-objs += macsec.o +endif
drivers/net/netdevsim/macsec.c new file +356 -0
356 lines not on this page · raw message
drivers/net/netdevsim/netdev.c +3 -0
@@ -304,6 +304,7 @@ static int nsim_init_netdevsim(struct netdevsim *ns)if (err) goto err_utn_destroy; +nsim_macsec_init (ns);nsim_ipsec_init (ns); err =register_netdevice (ns->netdev);
@@ -314,6 +315,7 @@ static int nsim_init_netdevsim(struct netdevsim *ns) err_ipsec_teardown:nsim_ipsec_teardown (ns); +nsim_macsec_teardown (ns);nsim_bpf_uninit (ns); err_utn_destroy:rtnl_unlock ();
@@ -374,6 +376,7 @@ void nsim_destroy(struct netdevsim *ns)rtnl_lock ();unregister_netdevice (dev);if (nsim_dev_port_is_pf (ns->nsim_dev_port)) { +nsim_macsec_teardown (ns);nsim_ipsec_teardown (ns);nsim_bpf_uninit (ns); }
drivers/net/netdevsim/netdevsim.h +34 -0
@@ -23,6 +23,7 @@#include <net/devlink.h> #include <net/udp_tunnel.h> #include <net/xdp.h> +#include <net/macsec.h> #define DRV_NAME "netdevsim"
@@ -52,6 +53,25 @@ struct nsim_ipsec {u32 ok; }; +#define NSIM_MACSEC_MAX_SECY_COUNT 3 +#define NSIM_MACSEC_MAX_RXSC_COUNT 1 +struct nsim_rxsc { +sci_t sci; +bool used; +}; + +struct nsim_secy { +sci_t sci; +struct nsim_rxsc nsim_rxsc[NSIM_MACSEC_MAX_RXSC_COUNT ]; +u8 nsim_rxsc_count; +bool used; +}; + +struct nsim_macsec { +struct nsim_secy nsim_secy[NSIM_MACSEC_MAX_SECY_COUNT ]; +u8 nsim_secy_count; +}; +struct nsim_ethtool_pauseparam {bool rx;bool tx;
@@ -93,6 +113,7 @@ struct netdevsim {bool bpf_map_accept;struct nsim_ipsec ipsec; +struct nsim_macsec macsec;struct {u32 inject_error;u32 sleep;
@@ -366,6 +387,19 @@ static inline bool nsim_ipsec_tx(struct netdevsim *ns, struct sk_buff *skb) }#endif +#if IS_ENABLED (CONFIG_MACSEC ) +void nsim_macsec_init (struct netdevsim *ns); +void nsim_macsec_teardown (struct netdevsim *ns); +#else +static inline void nsim_macsec_init (struct netdevsim *ns) +{ +} + +static inline void nsim_macsec_teardown (struct netdevsim *ns) +{ +} +#endif +struct nsim_bus_dev {struct device dev;struct list_head list;
Signature · 1 line
2.40.1
PATCH v3 2/2 selftests: rtnetlink: add MACsec offload tests
In reply to Sabrina DubrocaLike the IPsec offload test, this requires netdevsim.
--- tools/testing/selftests/net/rtnetlink.sh | 83 ++++++++++++++++++++++++ 1 file changed, 83 insertions(+)
tools/testing/selftests/net/rtnetlink.sh +83 -0
@@ -21,6 +21,7 @@ ALL_TESTS=" kci_test_vrf kci_test_encap kci_test_macsec + kci_test_macsec_offload kci_test_ipsec kci_test_ipsec_offload kci_test_fdb_get
@@ -643,6 +644,88 @@ kci_test_macsec() echo "PASS: macsec" } +kci_test_macsec_offload() +{ + sysfsd=/sys/kernel/debug/netdevsim/netdevsim0/ports/0/ + sysfsnet=/sys/bus/netdevsim/devices/netdevsim0/net/ + probed=false + local ret=0 + + ip macsec help 2>&1 | grep -q "^Usage: ip macsec" + if [ $? -ne 0 ]; then + echo "SKIP: macsec: iproute2 too old" + return $ksft_skip + fi + + # setup netdevsim since dummydev doesn't have offload support + if [ ! -w /sys/bus/netdevsim/new_device ] ; then + modprobe -q netdevsim + check_err $? + if [ $ret -ne 0 ]; then + echo "SKIP: macsec_offload can't load netdevsim" + return $ksft_skip + fi + probed=true + fi + + echo "0" > /sys/bus/netdevsim/new_device + while [ ! -d $sysfsnet ] ; do :; done + udevadm settle + dev=`ls $sysfsnet` + + ip link set $dev up + if [ ! -d $sysfsd ] ; then + echo "FAIL: macsec_offload can't create device $dev" + return 1 + fi + + ethtool -k $dev | grep -q 'macsec-hw-offload: on' + if [ $? -eq 1 ] ; then + echo "FAIL: macsec_offload netdevsim doesn't support MACsec offload" + return 1 + fi + + ip link add link $dev kci_macsec1 type macsec port 4 offload mac + check_err $? + + ip link add link $dev kci_macsec2 type macsec address "aa:bb:cc:dd:ee:ff" port 5 offload mac + check_err $? + + ip link add link $dev kci_macsec3 type macsec sci abbacdde01020304 offload mac + check_err $? + + ip link add link $dev kci_macsec4 type macsec port 8 offload mac 2> /dev/null + check_fail $? + + msname=kci_macsec1 + + ip macsec add "$msname" tx sa 0 pn 1024 on key 01 12345678901234567890123456789012 + check_err $? + + ip macsec add "$msname" rx port 1234 address "1c:ed:de:ad:be:ef" + check_err $? + + ip macsec add "$msname" rx port 1234 address "1c:ed:de:ad:be:ef" sa 0 pn 1 on \ + key 00 0123456789abcdef0123456789abcdef + check_err $? + + ip macsec add "$msname" rx port 1235 address "1c:ed:de:ad:be:ef" 2> /dev/null + check_fail $? + + # clean up any leftovers + for msdev in kci_macsec{1,2,3,4} ; do + ip link del $msdev 2> /dev/null + done + echo 0 > /sys/bus/netdevsim/del_device + $probed && rmmod netdevsim + + if [ $ret -ne 0 ]; then + echo "FAIL: macsec_offload" + return 1 + fi + echo "PASS: macsec_offload" +} + #------------------------------------------------------------------- # Example commands # ip x s add proto esp src 14.0.0.52 dst 14.0.0.70 \
Signature · 1 line
2.40.1
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by David S. Miller <[email protected]>:
Quoted 9 lines · On Thu, 13 Jul 2023 15:20:22 +0200 you wrote:
Patch 1 adds MACsec offload to netdevsim (unchanged from v2).
Patch 2 adds a corresponding selftest to the rtnetlink testsuite.
Sabrina Dubroca (2):
netdevsim: add dummy macsec offload
selftests: rtnetlink: add MACsec offload tests[...]
Here is the summary with links:
- [net-next,v3,1/2] netdevsim: add dummy macsec offload
https://git.kernel.org/netdev/net-next/c/02b34d03a24b - [net-next,v3,2/2] selftests: rtnetlink: add MACsec offload tests https://git.kernel.org/netdev/net-next/c/3b5222e2ac57
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html