psp: Add support for dev-assoc/disassoc
Subsystems (6)
v16 cover psp: Add support for dev-assoc/disassoc
From: Wei Wang <[email protected]>
The main purpose of this feature is to associate virtual devices like veth or netkit with a real PSP device, so we could provide PSP functionality to the application running with virtual devices.
A typical deployment that works with this feature is as follows:
Host Namespace:
psp_dev_local ←──physically linked──→ psp_dev_peer
(PSP device)
│
│ BPF on psp_dev_local ingress: bpf_redirect_peer() to nk_guest │
nk_host / veth_host
│
│ BPF on nk_host ingress: bpf_redirect_neigh() to psp_dev_local │
Guest Namespace (netns):
│
nk_guest / veth_guest
★ PSP application run here
Remote Namespace (_netns):
psp_dev_peer
★ PSP server application runs here
Note:
The general requirement for this feature to work:
For PSP to work correctly, the egress device at validate_xmit_skb() time must have psp_dev matching the association's psd. Any device stacking or traffic redirection that changes the egress device will cause either:
1. TX validation failure (SKB_DROP_REASON_PSP_OUTPUT) - fail-safe
2. RX policy failure after tx-assoc - packets without PSP extension are rejected by receiver expecting encrypted traffic
Here are a few examples that this feature would not work:
- Bonding with load balancing in round-robin, XOR, 802.3ad mode across multiple PSP devices, or mixed PSP and non-PSP devices
- Bonding with active-backup mode might work without PSP migration for failover case.
- ipvlan/macvlan in bridge mode would not work given packets are loopbacked locally without going through the PSP device.
Changes since v15:
- Rebase
Changes since v14:
- Selftests:
- Dropped separate nk_redirect.bpf.c BPF program and reuses nk_primary_rx_redirect.bpf.c
- Dropped _setup_psp_routes()
- Added _assoc_check_list() standalone test
- Added _check_assoc_list() helper and use it in various tests
- Notification tests use pspnl.poll_ntf() instead of manual poll
- Renamed _nk_host_ifname to nk_host_ifname
- Kernel code:
- Addressed all comments from sashiko on last version
- Address all pylint errors except for this one:
C0302: Too many lines in module (1035/1000)
- psp_main.c:
- psp_dev_check_access() calls the shared psp_has_assoc_dev_in_ns() helper instead of an inline list walk.
- psp_dev_is_registered() before sending DEV_CHANGE_NTF.
- psp_attach_netdev_notifier() comment was changed to plain text.
- psp_nl.c: kzalloc_obj() call drops the redundant GFP_KERNEL argument.
Changes since v13:
- Added flags: [admin-perm] to both dev-assoc and dev-disassoc in patch 2
- Added psp_nl_notify_dev(psd, PSP_CMD_DEV_CHANGE_NTF) in psp_netdev_event before calling psp_dev_disassoc_one in patch 2
- In patch 5:
- Added _find_bpf_obj() helper that searches test_dir first, then test_dir / "hw/" as fallback
- Register clean up functions with defer() so we properly clean up for failures
- Added cfg._nk_host_tc_attached = False and cfg._tc_attached = False after deleting the netkit pair
- Replaced hardcoded cfg.nsim_v6_pfx with cfg.addr_v["6"] and cfg.remote_addr_v["6"] so routes work on real hardware
Changes since v12:
- Rebase
Changes since v11:
- Cap max number of associated devs per psd to 128 to avoid overflowing GENLMSG_DEFAULT_SIZE for netlink msg in patch 2
- Make common function for getting net in psp_nl_dev_assoc_doit() and psp_nl_dev_disassoc_doit() in patch 2
- Only allow NSID to be passed in when user is in dev_net(psd->main_netdev) to avoid manipulation of dev-assoc/dev-disassoc from netns other than its own in patch 2
- Fixed the race between netdev_unregister() and psp_nl_dev_assoc_doit() by adding devreg status check in psp_nl_dev_assoc_doit().
Changes since v10:
- Corrected typo on patch 1
- Removed the kdoc style comments, Use goto style in psp_nl_dev_assoc_doit() clean up code, Resolved "TOCTOU" issue in psp_assoc_device_get_locked() in patch 2
- Replaced psp_devs_lock with a new mutex in psp_attach_netdev_notifier(), Fixed kdoc style comments in patch 3
Changes since v9:
- Added comments for psp_device_get_locked(), fixed lint issue, fixed rcu warning in patch 2
- Return error if register_netdevice_notifier() fails in psp_device_get_locked_dev_assoc() in patch 3
- Removed psp version and ip version for unnecessary tests cases in patch 5
Changes since v8:
- Rebase
Changes since v7:
- Refactor in patch 1 to have a common helper for psp_device_get_locked_admin() and psp_device_get_locked()
- Take psd->lock in psp_assoc_device_get_locked() before psp_dev_check_access() in patch 2
- Use cmpxchg() for assoc_dev->psp_dev assignment when doing dev-assoc in patch 2
- Check for err for register_netdevice_notifier() in patch 3
- Call psp_attach_netdev_notifier() in pre_doit handler for dev-assoc to avoid releasing of psd->lock in patch 3
Changes since v6:
- Remove the unused remote_addr, nk_guest_addr and import cmd in patch 5
Changes since v5:
- Remove module_exit() in patch 3
Changes since v4:
- Address compilation warning in patch 3
- Removed the call to psp_nl_has_listeners_any_ns() and check listeners when looping through netns in psp_nl_notify_dev() in patch 2. This makes sure we only send notification to netns that has listeners.
Changes since v3:
- Make nsid optional for dev-assoc/dev-disassoc operation, and use the ns user is in when it's not specified. Also added a test for this.
- Fix psp_nl_notify_dev() to compute the correct nsid relative to the listener's netns.
- Only register the new netdev event for psp dev cleanup upon the first successful dev-assoc operation.
- Change the following in selftest:
- Add CONFIG_NETKIT to driver/net's config
- Fall back to NetDrvEpEnv and run basic test cases if NetDrvContEnv does not load
- Use ksft_variants instead of psp_ip_ver_test_builder
Changes since v2:
- Change the newly added parameter to psp_device_get_and_lock() to admin in patch 1. Introduce 2 device check functions:
- psp_device_get_locked_admin() for dev-set and key-rotate
- psp_device_get_locked() for all other operations
Flip the logic for checking the dev_assoc_list accordingly in patch 2.
- Move psp_nl_notify_dev() before removing the dev from assoc_dev_list in psp_nl_dev_disassoc_doit() and correct the typo in commit msg in patch 2.
- Remove the threading and subprocess and some comment updates in patch 5.
Changes since v1:
- Update the first 4 patches to reflect the latest changes in
https://lore.kernel.org/netdev/[email protected]/
- Update patch 9 to add a param to NetDrvContEnv to control the loading of the tx forwarding bpf program
Wei Wang (10):
psp: add admin/non-admin version of psp_device_get_locked
psp: add new netlink cmd for dev-assoc and dev-disassoc
psp: add a new netdev event for dev unregister selftests/net: psp: refactor test builders to use ksft_variants selftests/net: add _find_bpf_obj() to search hw/ for BPF objects selftests/net: rename _nk_host_ifname to nk_host_ifname selftests/net: psp: support PSP in NetDrvContEnv infrastructure selftests/net: psp: add dev-assoc data path test selftests/net: psp: add cross-namespace notification tests selftests/net: psp: add dev-get, no-nsid, and cleanup tests
Documentation/netlink/specs/psp.yaml | 73 ++- include/net/psp/types.h | 23 + include/uapi/linux/psp.h | 13 + net/psp/psp-nl-gen.c | 36 +- net/psp/psp-nl-gen.h | 7 + net/psp/psp.h | 4 +- net/psp/psp_main.c | 97 +++- net/psp/psp_nl.c | 387 +++++++++++++++- tools/testing/selftests/drivers/net/config | 1 + .../selftests/drivers/net/hw/nk_qlease.py | 4 +- .../selftests/drivers/net/lib/py/env.py | 50 ++- tools/testing/selftests/drivers/net/psp.py | 423 ++++++++++++++++-- 12 files changed, 1041 insertions(+), 77 deletions(-)
Signature · 1 line
2.52.0
PATCH v16 1/10 psp: add admin/non-admin version of psp_device_get_locked
From: Wei Wang <[email protected]>
Introduce 2 versions of psp_device_get_locked:
1. psp_device_get_locked_admin(): This version is used for operations that would change the status of the psd, and are currently used for dev-set and key-rotation.
2. psp_device_get_locked(): This is the non-admin version, which are used for broader user issued operations including: dev-get, rx-assoc, tx-assoc, get-stats.
Following commit will be implementing both of the checks.
--- Documentation/netlink/specs/psp.yaml | 4 ++-- net/psp/psp-nl-gen.c | 4 ++-- net/psp/psp-nl-gen.h | 2 ++ net/psp/psp.h | 2 +- net/psp/psp_main.c | 7 +++++- net/psp/psp_nl.c | 33 ++++++++++++++++++++-------- 6 files changed, 37 insertions(+), 15 deletions(-)
Documentation/netlink/specs/psp.yaml +2 -2
@@ -196,7 +196,7 @@ operations: - psp-versions-ena reply: attributes: [] - pre: psp-device-get-locked + pre: psp-device-get-locked-admin post: psp-device-unlock - name: dev-change-ntf
@@ -216,7 +216,7 @@ operations: reply: attributes: - id - pre: psp-device-get-locked + pre: psp-device-get-locked-admin post: psp-device-unlock - name: key-rotate-ntf
net/psp/psp-nl-gen.c +2 -2
@@ -71,7 +71,7 @@ static const struct genl_split_ops psp_nl_ops[] = { }, { .cmd = PSP_CMD_DEV_SET, - .pre_doit = psp_device_get_locked, + .pre_doit = psp_device_get_locked_admin, .doit = psp_nl_dev_set_doit, .post_doit = psp_device_unlock, .policy = psp_dev_set_nl_policy,
@@ -80,7 +80,7 @@ static const struct genl_split_ops psp_nl_ops[] = { }, { .cmd = PSP_CMD_KEY_ROTATE, - .pre_doit = psp_device_get_locked, + .pre_doit = psp_device_get_locked_admin, .doit = psp_nl_key_rotate_doit, .post_doit = psp_device_unlock, .policy = psp_key_rotate_nl_policy,
net/psp/psp-nl-gen.h +2 -0
@@ -17,6 +17,8 @@ extern const struct nla_policy psp_keys_nl_policy[PSP_A_KEYS_SPI + 1];int psp_device_get_locked (const struct genl_split_ops *ops,struct sk_buff *skb,struct genl_info *info); +int psp_device_get_locked_admin (const struct genl_split_ops *ops, +struct sk_buff *skb,struct genl_info *info);int psp_assoc_device_get_locked (const struct genl_split_ops *ops,struct sk_buff *skb,struct genl_info *info);void
net/psp/psp.h +1 -1
@@ -14,7 +14,7 @@ extern struct xarray psp_devs;extern struct mutex psp_devs_lock;void psp_dev_free (struct psp_dev *psd); -int psp_dev_check_access (struct psp_dev *psd,struct net *net); +int psp_dev_check_access (struct psp_dev *psd,struct net *net,bool admin);void psp_nl_notify_dev (struct psp_dev *psd,u32 cmd);
net/psp/psp_main.c +6 -1
@@ -27,10 +27,15 @@ struct mutex psp_devs_lock;* psp_dev_check_access() - check if user in a given net ns can access PSP dev * @psd: PSP device structure user is trying to access * @net: net namespace user is in +* @admin: If true, only allow access from @psd's main device's netns, +* for admin operations like config changes and key rotation. +* If false, also allow access from network namespaces that have +* an associated device with @psd, for read-only and association +* management operations. * * Return: 0 if PSP device should be visible in @net, errno otherwise. */ -int psp_dev_check_access (struct psp_dev *psd,struct net *net) +int psp_dev_check_access (struct psp_dev *psd,struct net *net,bool admin) {if (dev_net (psd->main_netdev) == net)return 0 ;
net/psp/psp_nl.c +24 -9
@@ -41,7 +41,8 @@ static int psp_nl_reply_send(struct sk_buff *rsp, struct genl_info *info)/* Device stuff */ static struct psp_dev * -psp_device_get_and_lock (struct net *net,struct nlattr *dev_id) +psp_device_get_and_lock (struct net *net,struct nlattr *dev_id, +bool admin) {struct psp_dev *psd;int err;
@@ -56,7 +57,7 @@ psp_device_get_and_lock(struct net *net, struct nlattr *dev_id)mutex_lock (&psd->lock);mutex_unlock (&psp_devs_lock); - err =psp_dev_check_access (psd, net); + err =psp_dev_check_access (psd, net, admin);if (err) {mutex_unlock (&psd->lock);return ERR_PTR (err);
@@ -65,17 +66,31 @@ psp_device_get_and_lock(struct net *net, struct nlattr *dev_id)return psd; } -int psp_device_get_locked (const struct genl_split_ops *ops, -struct sk_buff *skb,struct genl_info *info) +static int __psp_device_get_locked (const struct genl_split_ops *ops, +struct sk_buff *skb,struct genl_info *info, +bool admin) {if (GENL_REQ_ATTR_CHECK (info,PSP_A_DEV_ID ))return -EINVAL ; info->user_ptr[0 ] =psp_device_get_and_lock (genl_info_net (info), - info->attrs[PSP_A_DEV_ID ]); + info->attrs[PSP_A_DEV_ID ], + admin);return PTR_ERR_OR_ZERO (info->user_ptr[0 ]); } +int psp_device_get_locked_admin (const struct genl_split_ops *ops, +struct sk_buff *skb,struct genl_info *info) +{ +return __psp_device_get_locked (ops, skb, info, true); +} + +int psp_device_get_locked (const struct genl_split_ops *ops, +struct sk_buff *skb,struct genl_info *info) +{ +return __psp_device_get_locked (ops, skb, info, false); +} +void psp_device_unlock (const struct genl_split_ops *ops,struct sk_buff *skb,struct genl_info *info)
@@ -160,7 +175,7 @@ static int psp_nl_dev_get_dumpit_one(struct sk_buff *rsp, struct netlink_callback *cb, struct psp_dev *psd) { - if (psp_dev_check_access(psd, sock_net(rsp->sk))) + if (psp_dev_check_access(psd, sock_net(rsp->sk), false)) return 0; return psp_nl_dev_fill(psd, rsp, genl_info_dump(cb));
@@ -310,7 +325,7 @@ int psp_assoc_device_get_locked(const struct genl_split_ops *ops,*/ mutex_lock (&psd->lock);if (!psp_dev_is_registered (psd) || -psp_dev_check_access (psd,genl_info_net (info))) { +psp_dev_check_access (psd,genl_info_net (info), false)) {mutex_unlock (&psd->lock);psp_dev_put (psd); psd =NULL ;
@@ -334,7 +349,7 @@ int psp_assoc_device_get_locked(const struct genl_split_ops *ops,psp_dev_put (psd); }else { - psd =psp_device_get_and_lock (genl_info_net (info), id); + psd =psp_device_get_and_lock (genl_info_net (info), id, false);if (IS_ERR (psd)) { err =PTR_ERR (psd); goto err_sock_put;
@@ -577,7 +592,7 @@ static int psp_nl_stats_get_dumpit_one(struct sk_buff *rsp, struct netlink_callback *cb, struct psp_dev *psd) { - if (psp_dev_check_access(psd, sock_net(rsp->sk))) + if (psp_dev_check_access(psd, sock_net(rsp->sk), false)) return 0; return psp_nl_stats_fill(psd, rsp, genl_info_dump(cb));
Signature · 1 line
2.52.0
PATCH v16 2/10 psp: add new netlink cmd for dev-assoc and dev-disassoc
In reply to Wei WangFrom: Wei Wang <[email protected]>
The main purpose of this cmd is to be able to associate a non-psp-capable device (e.g. veth or netkit) with a psp device. One use case is if we create a pair of veth/netkit, and assign 1 end inside a netns, while leaving the other end within the default netns, with a real PSP device, e.g. netdevsim or a physical PSP-capable NIC. With this command, we could associate the veth/netkit inside the netns with PSP device, so the virtual device could act as PSP-capable device to initiate PSP connections, and performs PSP encryption/decryption on the real PSP device.
--- Documentation/netlink/specs/psp.yaml | 69 +++++- include/net/psp/types.h | 23 ++ include/uapi/linux/psp.h | 13 ++ net/psp/psp-nl-gen.c | 32 +++ net/psp/psp-nl-gen.h | 2 + net/psp/psp.h | 1 + net/psp/psp_main.c | 15 ++ net/psp/psp_nl.c | 325 ++++++++++++++++++++++++++- 8 files changed, 469 insertions(+), 11 deletions(-)
Documentation/netlink/specs/psp.yaml +68 -1
@@ -13,6 +13,17 @@ definitions: hdr0-aes-gmac-128, hdr0-aes-gmac-256] attribute-sets: + - + name: assoc-dev-info + attributes: + - + name: ifindex + doc: ifindex of an associated network device. + type: u32 + - + name: nsid + doc: Network namespace ID of the associated device. + type: s32 - name: dev attributes:
@@ -24,7 +35,9 @@ attribute-sets: min: 1 - name: ifindex - doc: ifindex of the main netdevice linked to the PSP device. + doc: | + ifindex of the main netdevice linked to the PSP device, + or the ifindex to associate with the PSP device. type: u32 - name: psp-versions-cap
@@ -38,6 +51,28 @@ attribute-sets: type: u32 enum: version enum-as-flags: true + - + name: assoc-list + doc: List of associated virtual devices. + type: nest + nested-attributes: assoc-dev-info + multi-attr: true + - + name: nsid + doc: | + Network namespace ID for the device to associate/disassociate. + Optional for dev-assoc and dev-disassoc; if not present, the + device is looked up in the caller's network namespace. + type: s32 + - + name: by-association + doc: | + Flag indicating the PSP device is an associated device from a + different network namespace. + Present when in associated namespace, absent when in primary/host + namespace. + type: flag + - name: assoc attributes:
@@ -170,6 +205,8 @@ operations: - ifindex - psp-versions-cap - psp-versions-ena + - assoc-list + - by-association pre: psp-device-get-locked post: psp-device-unlock dump:
@@ -281,6 +318,36 @@ operations: post: psp-device-unlock dump: reply: *stats-all + - + name: dev-assoc + doc: Associate a network device with a PSP device. + attribute-set: dev + flags: [admin-perm] + do: + request: + attributes: + - id + - ifindex + - nsid + reply: + attributes: [] + pre: psp-device-get-locked + post: psp-device-unlock + - + name: dev-disassoc + doc: Disassociate a network device from a PSP device. + attribute-set: dev + flags: [admin-perm] + do: + request: + attributes: + - id + - ifindex + - nsid + reply: + attributes: [] + pre: psp-device-get-locked + post: psp-device-unlock mcast-groups: list:
include/net/psp/types.h +23 -0
@@ -5,6 +5,7 @@#include <linux/mutex.h> #include <linux/refcount.h> +#include <net/net_trackers.h> struct netlink_ext_ack ;
@@ -43,9 +44,29 @@ struct psp_dev_config {u32 versions; }; +/* Max number of devices that can be associated with a single PSP device. +* Each entry consumes ~24 bytes in the netlink dev-get response, and the +* response must fit in GENLMSG_DEFAULT_SIZE (~3.7KB). +*/ +#define PSP_ASSOC_DEV_MAX 128 + +/** +* struct psp_assoc_dev - wrapper for associated net_device +* @dev_list: list node for psp_dev::assoc_dev_list +* @assoc_dev: the associated net_device +* @dev_tracker: tracker for the net_device reference +*/ +struct psp_assoc_dev { +struct list_head dev_list; +struct net_device *assoc_dev; +netdevice_tracker dev_tracker; +}; +/** * struct psp_dev - PSP device struct * @main_netdev: original netdevice of this PSP device +* @assoc_dev_list: list of psp_assoc_dev entries associated with this PSP device +* @assoc_dev_cnt: number of entries in @assoc_dev_list * @ops: driver callbacks * @caps: device capabilities * @drv_priv: driver priv pointer
@@ -67,6 +88,8 @@ struct psp_dev_config {*/ struct psp_dev {struct net_device *main_netdev; +struct list_head assoc_dev_list; +int assoc_dev_cnt;struct psp_dev_ops *ops;struct psp_dev_caps *caps;
include/uapi/linux/psp.h +13 -0
@@ -17,11 +17,22 @@ enum psp_version { PSP_VERSION_HDR0_AES_GMAC_256, }; +enum { +PSP_A_ASSOC_DEV_INFO_IFINDEX =1 , +PSP_A_ASSOC_DEV_INFO_NSID , + + __PSP_A_ASSOC_DEV_INFO_MAX, +PSP_A_ASSOC_DEV_INFO_MAX = (__PSP_A_ASSOC_DEV_INFO_MAX -1 ) +}; +enum {PSP_A_DEV_ID =1 ,PSP_A_DEV_IFINDEX ,PSP_A_DEV_PSP_VERSIONS_CAP ,PSP_A_DEV_PSP_VERSIONS_ENA , +PSP_A_DEV_ASSOC_LIST , +PSP_A_DEV_NSID , +PSP_A_DEV_BY_ASSOCIATION , __PSP_A_DEV_MAX,PSP_A_DEV_MAX = (__PSP_A_DEV_MAX -1 )
@@ -74,6 +85,8 @@ enum {PSP_CMD_RX_ASSOC ,PSP_CMD_TX_ASSOC ,PSP_CMD_GET_STATS , +PSP_CMD_DEV_ASSOC , +PSP_CMD_DEV_DISASSOC , __PSP_CMD_MAX,PSP_CMD_MAX = (__PSP_CMD_MAX -1 )
net/psp/psp-nl-gen.c +32 -0
@@ -53,6 +53,20 @@ static const struct nla_policy psp_get_stats_nl_policy[PSP_A_STATS_DEV_ID + 1] = [PSP_A_STATS_DEV_ID] = NLA_POLICY_MIN(NLA_U32, 1), }; +/* PSP_CMD_DEV_ASSOC - do */ +static const struct nla_policy psp_dev_assoc_nl_policy[PSP_A_DEV_NSID +1 ] = { + [PSP_A_DEV_ID ] =NLA_POLICY_MIN (NLA_U32 ,1 ), + [PSP_A_DEV_IFINDEX ] = { .type =NLA_U32 , }, + [PSP_A_DEV_NSID ] = { .type =NLA_S32 , }, +}; + +/* PSP_CMD_DEV_DISASSOC - do */ +static const struct nla_policy psp_dev_disassoc_nl_policy[PSP_A_DEV_NSID +1 ] = { + [PSP_A_DEV_ID ] =NLA_POLICY_MIN (NLA_U32 ,1 ), + [PSP_A_DEV_IFINDEX ] = { .type =NLA_U32 , }, + [PSP_A_DEV_NSID ] = { .type =NLA_S32 , }, +}; +/* Ops table for psp */ static const struct genl_split_ops psp_nl_ops[] = { {
@@ -119,6 +133,24 @@ static const struct genl_split_ops psp_nl_ops[] = { .dumpit = psp_nl_get_stats_dumpit, .flags = GENL_CMD_CAP_DUMP, }, + { + .cmd = PSP_CMD_DEV_ASSOC, + .pre_doit = psp_device_get_locked, + .doit = psp_nl_dev_assoc_doit, + .post_doit = psp_device_unlock, + .policy = psp_dev_assoc_nl_policy, + .maxattr = PSP_A_DEV_NSID, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, + { + .cmd = PSP_CMD_DEV_DISASSOC, + .pre_doit = psp_device_get_locked, + .doit = psp_nl_dev_disassoc_doit, + .post_doit = psp_device_unlock, + .policy = psp_dev_disassoc_nl_policy, + .maxattr = PSP_A_DEV_NSID, + .flags = GENL_ADMIN_PERM | GENL_CMD_CAP_DO, + }, }; static const struct genl_multicast_group psp_nl_mcgrps[] = {
net/psp/psp-nl-gen.h +2 -0
@@ -33,6 +33,8 @@ int psp_nl_rx_assoc_doit(struct sk_buff *skb, struct genl_info *info);int psp_nl_tx_assoc_doit (struct sk_buff *skb,struct genl_info *info);int psp_nl_get_stats_doit (struct sk_buff *skb,struct genl_info *info);int psp_nl_get_stats_dumpit (struct sk_buff *skb,struct netlink_callback *cb); +int psp_nl_dev_assoc_doit (struct sk_buff *skb,struct genl_info *info); +int psp_nl_dev_disassoc_doit (struct sk_buff *skb,struct genl_info *info);enum {PSP_NLGRP_MGMT ,
net/psp/psp.h +1 -0
@@ -15,6 +15,7 @@ extern struct mutex psp_devs_lock;void psp_dev_free (struct psp_dev *psd);int psp_dev_check_access (struct psp_dev *psd,struct net *net,bool admin); +bool psp_has_assoc_dev_in_ns (struct psp_dev *psd,struct net *net);void psp_nl_notify_dev (struct psp_dev *psd,u32 cmd);
net/psp/psp_main.c +15 -0
@@ -39,6 +39,10 @@ int psp_dev_check_access(struct psp_dev *psd, struct net *net, bool admin) {if (dev_net (psd->main_netdev) == net)return 0 ; + +if (!admin &&psp_has_assoc_dev_in_ns (psd, net)) +return 0 ; +return -ENOENT ; }
@@ -74,6 +78,7 @@ psp_dev_create(struct net_device *netdev,return ERR_PTR (-ENOMEM ); psd->main_netdev = netdev; +INIT_LIST_HEAD (&psd->assoc_dev_list); psd->ops = psd_ops; psd->caps = psd_caps; psd->drv_priv = priv_ptr;
@@ -125,6 +130,7 @@ void psp_dev_free(struct psp_dev *psd)*/ void psp_dev_unregister (struct psp_dev *psd) { +struct psp_assoc_dev *entry, *entry_tmp;struct psp_assoc *pas, *next;mutex_lock (&psp_devs_lock);
@@ -144,6 +150,15 @@ void psp_dev_unregister(struct psp_dev *psd)list_for_each_entry_safe (pas, next, &psd->stale_assocs, assocs_list)psp_dev_tx_key_del (psd, pas); +list_for_each_entry_safe (entry, entry_tmp, &psd->assoc_dev_list, + dev_list) { +list_del (&entry->dev_list); +rcu_assign_pointer (entry->assoc_dev->psp_dev,NULL ); +netdev_put (entry->assoc_dev, &entry->dev_tracker); +kfree (entry); + } + psd->assoc_dev_cnt =0 ; +rcu_assign_pointer (psd->main_netdev->psp_dev,NULL ); psd->ops =NULL ;
net/psp/psp_nl.c +315 -10
391 lines not on this page · raw message
Signature · 1 line
2.52.0
PATCH v16 3/10 psp: add a new netdev event for dev unregister
In reply to Wei WangFrom: Wei Wang <[email protected]>
Add a new netdev event for dev unregister and handle the removal of this dev from psp->assoc_dev_list, upon the first dev-assoc operation.
--- Documentation/netlink/specs/psp.yaml | 2 +- net/psp/psp-nl-gen.c | 2 +- net/psp/psp-nl-gen.h | 3 ++ net/psp/psp.h | 1 + net/psp/psp_main.c | 75 ++++++++++++++++++++++++++++ net/psp/psp_nl.c | 29 +++++++++++ 6 files changed, 110 insertions(+), 2 deletions(-)
Documentation/netlink/specs/psp.yaml +1 -1
@@ -331,7 +331,7 @@ operations: - nsid reply: attributes: [] - pre: psp-device-get-locked + pre: psp-device-get-locked-dev-assoc post: psp-device-unlock - name: dev-disassoc
net/psp/psp-nl-gen.c +1 -1
@@ -135,7 +135,7 @@ static const struct genl_split_ops psp_nl_ops[] = { }, { .cmd = PSP_CMD_DEV_ASSOC, - .pre_doit = psp_device_get_locked, + .pre_doit = psp_device_get_locked_dev_assoc, .doit = psp_nl_dev_assoc_doit, .post_doit = psp_device_unlock, .policy = psp_dev_assoc_nl_policy,
net/psp/psp-nl-gen.h +3 -0
@@ -21,6 +21,9 @@ int psp_device_get_locked_admin(const struct genl_split_ops *ops, struct sk_buff *skb, struct genl_info *info);int psp_assoc_device_get_locked (const struct genl_split_ops *ops,struct sk_buff *skb,struct genl_info *info); +int psp_device_get_locked_dev_assoc (const struct genl_split_ops *ops, +struct sk_buff *skb, +struct genl_info *info);void psp_device_unlock (const struct genl_split_ops *ops,struct sk_buff *skb,struct genl_info *info);
net/psp/psp.h +1 -0
@@ -16,6 +16,7 @@ extern struct mutex psp_devs_lock;void psp_dev_free (struct psp_dev *psd);int psp_dev_check_access (struct psp_dev *psd,struct net *net,bool admin);bool psp_has_assoc_dev_in_ns (struct psp_dev *psd,struct net *net); +int psp_attach_netdev_notifier (void );void psp_nl_notify_dev (struct psp_dev *psd,u32 cmd);
net/psp/psp_main.c +75 -0
81 lines not on this page · raw message
net/psp/psp_nl.c +29 -0
@@ -160,6 +160,22 @@ int psp_device_get_locked(const struct genl_split_ops *ops,return __psp_device_get_locked (ops, skb, info, false); } +/* +* Non-admin version of psp_device_get_locked() + psp_attach_netdev_notifier() +* only used for dev-assoc. +*/ +int psp_device_get_locked_dev_assoc (const struct genl_split_ops *ops, +struct sk_buff *skb,struct genl_info *info) +{ +int err; + + err =psp_attach_netdev_notifier (); +if (err) +return err; + +return __psp_device_get_locked (ops, skb, info, false); +} +static struct net *psp_nl_resolve_assoc_dev_ns (struct psp_dev *psd,struct genl_info *info) {
@@ -518,6 +534,19 @@ int psp_nl_dev_assoc_doit(struct sk_buff *skb, struct genl_info *info) } psp_assoc_dev->assoc_dev = assoc_dev; + +/* Check for race with NETDEV_UNREGISTER. The cmpxchg above is a +* full barrier, and the unregister path has synchronize_net() +* between setting NETREG_UNREGISTERING and reading psp_dev in the +* notifier. So at least one side would do the clean-up if we are in +* the middle of unregitering assoc_dev. +* And the clean-up is serialized by psd->lock. +*/ +if (READ_ONCE (assoc_dev->reg_state) !=NETREG_REGISTERED ) { + err = -ENODEV ; + goto err_clean_ptr; + } + rsp =psp_nl_reply_new (info);if (!rsp) { err = -ENOMEM ;
Signature · 1 line
2.52.0
PATCH v16 4/10 selftests/net: psp: refactor test builders to use ksft_variants
In reply to Wei WangFrom: Wei Wang <[email protected]>
Replace the manual psp_ip_ver_test_builder() and ipver_test_builder() functions with @ksft_variants decorators for data_basic_send and data_mss_adjust. This is a pure refactor with no behavior change.
--- tools/testing/selftests/drivers/net/psp.py | 46 ++++++++++------------ 1 file changed, 21 insertions(+), 25 deletions(-)
tools/testing/selftests/drivers/net/psp.py +21 -25
@@ -14,6 +14,7 @@ from lib.py import defer from lib.py import ksft_run, ksft_exit, ksft_pr from lib.py import ksft_true, ksft_eq, ksft_ne, ksft_gt, ksft_raises from lib.py import ksft_not_none +from lib.py import ksft_variants, KsftNamedVariant from lib.py import KsftSkipEx from lib.py import NetDrvEpEnv, PSPFamily, NlError from lib.py import bkg, rand_port, wait_port_listen
@@ -571,24 +572,29 @@ def removal_device_bi(cfg): _close_conn(cfg, s) -def psp_ip_ver_test_builder(name, test_func, psp_ver, ipver): - """Build test cases for each combo of PSP version and IP version""" - def test_case(cfg): - cfg.require_ipver(ipver) - test_func(cfg, psp_ver, ipver) +def _get_psp_ver_ip_variants(): + for ver in range(4): + for ipv in ("4", "6"): + yield KsftNamedVariant(f"v{ver}_ip{ipv}", ver, ipv) - test_case.__name__ = f"{name}_v{psp_ver}_ip{ipver}" - return test_case +def _get_ip_variants(): + for ipv in ("4", "6"): + yield KsftNamedVariant(f"ip{ipv}", ipv) -def ipver_test_builder(name, test_func, ipver): - """Build test cases for each IP version""" - def test_case(cfg): - cfg.require_ipver(ipver) - test_func(cfg, ipver) - test_case.__name__ = f"{name}_ip{ipver}" - return test_case +@ksft_variants(_get_psp_ver_ip_variants()) +def data_basic_send(cfg, version, ipver): + """Test basic PSP data send.""" + cfg.require_ipver(ipver) + _data_basic_send(cfg, version, ipver) + + +@ksft_variants(_get_ip_variants()) +def data_mss_adjust(cfg, ipver): + """Test MSS adjustment with PSP.""" + cfg.require_ipver(ipver) + _data_mss_adjust(cfg, ipver) def main() -> None:
@@ -611,17 +617,7 @@ def main() -> None: cfg.comm_port), timeout=1) - cases = [ - psp_ip_ver_test_builder( - "data_basic_send", _data_basic_send, version, ipver - ) - for version in range(0, 4) - for ipver in ("4", "6") - ] - cases += [ - ipver_test_builder("data_mss_adjust", _data_mss_adjust, ipver) - for ipver in ("4", "6") - ] + cases = [data_basic_send, data_mss_adjust] ksft_run(cases=cases, globs=globals(), case_pfx={"dev_", "data_", "assoc_", "removal_"},
Signature · 1 line
2.52.0
PATCH v16 5/10 selftests/net: add _find_bpf_obj() to search hw/ for BPF objects
In reply to Wei WangFrom: Wei Wang <[email protected]>
Add _find_bpf_obj() helper to NetDrvContEnv that searches the test directory first, then falls back to the hw/ subdirectory. This allows tests outside drivers/net/hw/ (e.g. psp.py in drivers/net/) to find BPF objects built in the hw/ directory.
Update _attach_bpf() and _attach_primary_rx_redirect_bpf() to use _find_bpf_obj() for BPF object discovery.
--- .../selftests/drivers/net/lib/py/env.py | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-)
tools/testing/selftests/drivers/net/lib/py/env.py +15 -6
@@ -512,10 +512,19 @@ class NetDrvContEnv(NetDrvEpEnv): return map_id raise Exception(f"Failed to find .bss map for prog {prog_id}") + def _find_bpf_obj(self, name): + bpf_obj = self.test_dir / name + if bpf_obj.exists(): + return bpf_obj + bpf_obj = self.test_dir / "hw" / name + if bpf_obj.exists(): + return bpf_obj + return None + def _attach_bpf(self): - bpf_obj = self.test_dir / "nk_forward.bpf.o" - if not bpf_obj.exists(): - raise KsftSkipEx("BPF prog not found") + bpf_obj = self._find_bpf_obj("nk_forward.bpf.o") + if not bpf_obj: + raise KsftSkipEx("BPF prog nk_forward.bpf.o not found") if self._tc_ensure_clsact(): self._tc_clsact_added = True
@@ -535,9 +544,9 @@ class NetDrvContEnv(NetDrvEpEnv): def _attach_primary_rx_redirect_bpf(self): """Attach BPF redirect program on the primary netkit ingress.""" - bpf_obj = self.test_dir / "nk_primary_rx_redirect.bpf.o" - if not bpf_obj.exists(): - raise KsftSkipEx("Primary RX redirect BPF prog not found") + bpf_obj = self._find_bpf_obj("nk_primary_rx_redirect.bpf.o") + if not bpf_obj: + raise KsftSkipEx("nk_primary_rx_redirect.bpf.o not found") if self._tc_ensure_clsact(self._nk_host_ifname): self._primary_rx_redirect_clsact_added = True
Signature · 1 line
2.52.0
PATCH v16 6/10 selftests/net: rename _nk_host_ifname to nk_host_ifname
In reply to Wei WangFrom: Wei Wang <[email protected]>
Rename _nk_host_ifname to nk_host_ifname in NetDrvContEnv to make it a public attribute, matching the nk_guest_ifname rename. Tests that access the host-side netkit interface name (e.g. for cleanup after deleting the netkit pair) no longer trigger pylint protected-access warnings.
--- .../selftests/drivers/net/hw/nk_qlease.py | 4 +-- .../selftests/drivers/net/lib/py/env.py | 26 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-)
tools/testing/selftests/drivers/net/hw/nk_qlease.py +2 -2
@@ -193,9 +193,9 @@ def test_destroy(cfg) -> None: kill_timer = threading.Timer(1, rx_proc.proc.terminate) kill_timer.start() - ip(f"link del dev {cfg._nk_host_ifname}") + ip(f"link del dev {cfg.nk_host_ifname}") kill_timer.join() - cfg._nk_host_ifname = None + cfg.nk_host_ifname = None cfg.nk_guest_ifname = None queue_info = netdevnl.queue_get(
tools/testing/selftests/drivers/net/lib/py/env.py +13 -13
@@ -341,7 +341,7 @@ class NetDrvContEnv(NetDrvEpEnv): userns=False, **kwargs): self.netns = None self._userns = userns - self._nk_host_ifname = None + self.nk_host_ifname = None self.nk_guest_ifname = None self._tc_clsact_added = False self._tc_attached = False
@@ -395,7 +395,7 @@ class NetDrvContEnv(NetDrvEpEnv): raise KsftSkipEx("Failed to create netkit pair") netkit_links.sort(key=lambda x: x['ifindex']) - self._nk_host_ifname = netkit_links[1]['ifname'] + self.nk_host_ifname = netkit_links[1]['ifname'] self.nk_guest_ifname = netkit_links[0]['ifname'] self.nk_host_ifindex = netkit_links[1]['ifindex'] self.nk_guest_ifindex = netkit_links[0]['ifindex']
@@ -407,11 +407,11 @@ class NetDrvContEnv(NetDrvEpEnv): def __del__(self): if self._primary_rx_redirect_attached: - cmd(f"tc filter del dev {self._nk_host_ifname} ingress", fail=False) + cmd(f"tc filter del dev {self.nk_host_ifname} ingress", fail=False) self._primary_rx_redirect_attached = False if self._primary_rx_redirect_clsact_added: - cmd(f"tc qdisc del dev {self._nk_host_ifname} clsact", fail=False) + cmd(f"tc qdisc del dev {self.nk_host_ifname} clsact", fail=False) self._primary_rx_redirect_clsact_added = False if self._tc_attached:
@@ -427,9 +427,9 @@ class NetDrvContEnv(NetDrvEpEnv): host=self.remote, fail=False) self._remote_route_added = False - if self._nk_host_ifname: - cmd(f"ip link del dev {self._nk_host_ifname}") - self._nk_host_ifname = None + if self.nk_host_ifname: + cmd(f"ip link del dev {self.nk_host_ifname}") + self.nk_host_ifname = None self.nk_guest_ifname = None if self._init_ns_attached:
@@ -470,9 +470,9 @@ class NetDrvContEnv(NetDrvEpEnv): self._init_ns_attached = True ip("netns set init 0", ns=self.netns) ip(f"link set dev {self.nk_guest_ifname} netns {self.netns.name}") - ip(f"link set dev {self._nk_host_ifname} up") - ip(f"-6 addr add fe80::1/64 dev {self._nk_host_ifname} nodad") - ip(f"-6 route add {self.nk_guest_ipv6}/128 via fe80::2 dev {self._nk_host_ifname}") + ip(f"link set dev {self.nk_host_ifname} up") + ip(f"-6 addr add fe80::1/64 dev {self.nk_host_ifname} nodad") + ip(f"-6 route add {self.nk_guest_ipv6}/128 via fe80::2 dev {self.nk_host_ifname}") ip("link set lo up", ns=self.netns) ip(f"link set dev {self.nk_guest_ifname} up", ns=self.netns)
@@ -548,9 +548,9 @@ class NetDrvContEnv(NetDrvEpEnv): if not bpf_obj: raise KsftSkipEx("nk_primary_rx_redirect.bpf.o not found") - if self._tc_ensure_clsact(self._nk_host_ifname): + if self._tc_ensure_clsact(self.nk_host_ifname): self._primary_rx_redirect_clsact_added = True - cmd(f"tc filter add dev {self._nk_host_ifname} ingress" + cmd(f"tc filter add dev {self.nk_host_ifname} ingress" f" bpf obj {bpf_obj} sec tc/ingress direct-action") self._primary_rx_redirect_attached = True
@@ -559,7 +559,7 @@ class NetDrvContEnv(NetDrvEpEnv): self._remote_route_added = True filters = json.loads( - cmd(f"tc -j filter show dev {self._nk_host_ifname} ingress").stdout) + cmd(f"tc -j filter show dev {self.nk_host_ifname} ingress").stdout) redirect_prog_id = None for bpf in filters: if 'options' not in bpf:
Signature · 1 line
2.52.0
PATCH v16 7/10 selftests/net: psp: support PSP in NetDrvContEnv infrastructure
In reply to Wei WangFrom: Wei Wang <[email protected]>
Add infrastructure to support PSP tests across network namespaces using NetDrvContEnv with netkit pairs. This enables testing PSP device association, where a non-PSP-capable device (e.g. netkit) in a guest namespace is associated with a real PSP device in the host namespace, allowing the guest to perform PSP encryption/decryption through the host's PSP hardware.
The topology is:
Host NS: psp_dev_local <---> nk_host
| |
| | (netkit pair)
| |
Remote NS: psp_dev_peer Guest NS: nk_guest
(responder) (PSP tests)env.py:
- nk_guest_ifindex is queried after moving the device into the guest namespace, so tests can use it directly for dev-assoc
psp.py:
- PSP device lookup supports container environments where the PSP device is on the physical interface, not the test interface
- Association helpers handle dev-assoc/dev-disassoc with defer-based cleanup to prevent state leaks on test assertion failures
- main() tries NetDrvContEnv with primary_rx_redirect and falls back to NetDrvEpEnv, so existing tests continue to work without the container environment
--- tools/testing/selftests/drivers/net/config | 1 + .../selftests/drivers/net/lib/py/env.py | 3 + tools/testing/selftests/drivers/net/psp.py | 102 +++++++++++++++++- 3 files changed, 102 insertions(+), 4 deletions(-)
tools/testing/selftests/drivers/net/config +1 -0
@@ -8,6 +8,7 @@ CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE_DYNAMIC=y CONFIG_NETCONSOLE_EXTENDED_LOG=y CONFIG_NETDEVSIM=m +CONFIG_NETKIT=y CONFIG_NET_SCH_ETF=m CONFIG_NET_SCH_FQ=m CONFIG_PPP=y
tools/testing/selftests/drivers/net/lib/py/env.py +3 -0
@@ -470,6 +470,9 @@ class NetDrvContEnv(NetDrvEpEnv): self._init_ns_attached = True ip("netns set init 0", ns=self.netns) ip(f"link set dev {self.nk_guest_ifname} netns {self.netns.name}") + nk_guest_dev = ip(f"link show dev {self.nk_guest_ifname}", + json=True, ns=self.netns)[0] + self.nk_guest_ifindex = nk_guest_dev['ifindex'] ip(f"link set dev {self.nk_host_ifname} up") ip(f"-6 addr add fe80::1/64 dev {self.nk_host_ifname} nodad") ip(f"-6 route add {self.nk_guest_ipv6}/128 via fe80::2 dev {self.nk_host_ifname}")
tools/testing/selftests/drivers/net/psp.py +98 -4
136 lines not on this page · raw message
Signature · 1 line
2.52.0
PATCH v16 8/10 selftests/net: psp: add dev-assoc data path test
In reply to Wei WangFrom: Wei Wang <[email protected]>
Add _assoc_check_list() test that associates nk_guest with the PSP device and verifies the assoc-list is correctly populated.
Add _data_basic_send_netkit_psp_assoc() which tests PSP data send through a netkit interface associated with a PSP device. The test associates nk_guest with the PSP device, then sends PSP-encrypted traffic from the guest namespace.
--- tools/testing/selftests/drivers/net/psp.py | 72 ++++++++++++++++++++++ 1 file changed, 72 insertions(+)
tools/testing/selftests/drivers/net/psp.py +72 -0
@@ -19,6 +19,7 @@ from lib.py import ksft_variants, KsftNamedVariant from lib.py import KsftSkipEx from lib.py import NetDrvEpEnv, NetDrvContEnv from lib.py import NlError, PSPFamily +from lib.py import NetNSEnter from lib.py import bkg, rand_port, wait_port_listen from lib.py import ip
@@ -602,6 +603,71 @@ def data_mss_adjust(cfg, ipver): _data_mss_adjust(cfg, ipver) +def _check_assoc_list(cfg, psp_dev_id, ifindex, nsid=None): + """Verify assoc-list contains device with given ifindex, no duplicates.""" + dev_info = cfg.pspnl.dev_get({'id': psp_dev_id}) + + ksft_true('assoc-list' in dev_info, + "No assoc-list in dev_get() response after association") + found = False + for assoc in dev_info['assoc-list']: + if assoc['ifindex'] != ifindex: + continue + if nsid is not None and assoc['nsid'] != nsid: + continue + ksft_eq(found, False, "Duplicate assoc entry found") + found = True + ksft_eq(found, True, + "Associated device not found in dev_get() response") + + +def _data_basic_send_netkit_psp_assoc(cfg, version, ipver): + """ + Test basic data send with netkit interface associated with PSP dev. + """ + _assoc_nk_guest(cfg) + + # Enter guest namespace (netns) to run PSP test + with NetNSEnter(cfg.netns.name): + cfg.pspnl = PSPFamily() + + sock = _make_psp_conn(cfg, version, ipver) + + rx_assoc = cfg.pspnl.rx_assoc({"version": version, + "dev-id": cfg.psp_dev_id, + "sock-fd": sock.fileno()}) + rx_key = rx_assoc['rx-key'] + tx_key = _spi_xchg(sock, rx_key) + + cfg.pspnl.tx_assoc({"dev-id": cfg.psp_dev_id, + "version": version, + "tx-key": tx_key, + "sock-fd": sock.fileno()}) + + data_len = _send_careful(cfg, sock, 100) + _check_data_rx(cfg, data_len) + _close_psp_conn(cfg, sock) + + +def _assoc_check_list(cfg): + """Test that assoc-list is correctly populated after dev-assoc.""" + _assoc_nk_guest(cfg) + _check_assoc_list(cfg, cfg.psp_dev_id, cfg.nk_guest_ifindex, + cfg.psp_dev_peer_nsid) + + +def _get_psp_ver_ip6_variants(): + for ver in range(4): + yield KsftNamedVariant(f"v{ver}_ip6", ver, "6") + + +@ksft_variants(_get_psp_ver_ip6_variants()) +def data_basic_send_netkit_psp_assoc(cfg, version, ipver): + """Test PSP data send via netkit with dev-assoc.""" + cfg.require_ipver(ipver) + _data_basic_send_netkit_psp_assoc(cfg, version, ipver) + + def _try_disassoc(cfg, psp_dev_id, ifindex, nsid=None): """Best-effort disassociate, ignoring errors if already removed.""" try:
@@ -713,6 +779,12 @@ def main() -> None: cases = [data_basic_send, data_mss_adjust] + if has_cont: + cases += [ + _assoc_check_list, + data_basic_send_netkit_psp_assoc, + ] + ksft_run(cases=cases, globs=globals(), case_pfx={"dev_", "data_", "assoc_", "removal_"}, args=(cfg, ))
Signature · 1 line
2.52.0
PATCH v16 10/10 selftests/net: psp: add dev-get, no-nsid, and cleanup tests
In reply to Wei WangFrom: Wei Wang <[email protected]>
Add the following 3 tests:
- _psp_dev_get_check_netkit_psp_assoc: verifies dev-get output in both host and guest namespaces, checking assoc-list, by-association flag, and nsid values
- _dev_assoc_no_nsid: tests dev-assoc and dev-disassoc without the nsid attribute, verifying ifindex lookup in the caller's namespace
- _psp_dev_assoc_cleanup_on_netkit_del: verifies that deleting the associated netkit interface properly cleans up the assoc-list, using a disposable netkit pair to avoid disturbing the shared environment
--- tools/testing/selftests/drivers/net/psp.py | 146 ++++++++++++++++++++- 1 file changed, 145 insertions(+), 1 deletion(-)
tools/testing/selftests/drivers/net/psp.py +145 -1
@@ -18,7 +18,7 @@ from lib.py import ksft_not_none from lib.py import ksft_variants, KsftNamedVariant from lib.py import KsftSkipEx, KsftFailEx from lib.py import NetDrvEpEnv, NetDrvContEnv -from lib.py import NlError, PSPFamily +from lib.py import Netlink, NlError, PSPFamily, RtnlFamily from lib.py import NetNSEnter from lib.py import bkg, rand_port, wait_port_listen from lib.py import ip
@@ -723,6 +723,147 @@ def _dev_change_notify_multi_ns_netkit(cfg): f" in {label} namespace") +def _psp_dev_get_check_netkit_psp_assoc(cfg): + """ Check psp dev-get output with netkit interface associated with PSP dev """ + _assoc_nk_guest(cfg) + + # Check 1: In default netns, verify dev-get has correct ifindex and assoc-list + dev_info = cfg.pspnl.dev_get({'id': cfg.psp_dev_id}) + ksft_eq(dev_info['ifindex'], cfg.psp_ifindex) + _check_assoc_list(cfg, cfg.psp_dev_id, cfg.nk_guest_ifindex, + cfg.psp_dev_peer_nsid) + + # Check 2: In guest netns, verify dev-get has assoc-list with nk_guest device + with NetNSEnter(cfg.netns.name): + peer_pspnl = PSPFamily() + + # Dump all devices in the guest namespace + peer_devices = peer_pspnl.dev_get({}, dump=True) + + # Find the device with by-association flag + peer_dev = None + for dev in peer_devices: + if dev.get('by-association'): + peer_dev = dev + break + + ksft_not_none(peer_dev, "No PSP device found with by-association flag in guest netns") + + # Verify assoc-list contains the nk_guest device + ksft_true('assoc-list' in peer_dev and len(peer_dev['assoc-list']) > 0, + "Guest device should have assoc-list with local devices") + + # Verify the assoc-list contains nk_guest ifindex with nsid=-1 (same namespace) + found = False + for assoc in peer_dev['assoc-list']: + if assoc['ifindex'] == cfg.nk_guest_ifindex: + ksft_eq(assoc['nsid'], -1, + "nsid should be -1 (NETNSA_NSID_NOT_ASSIGNED) for same-namespace device") + found = True + break + ksft_true(found, "nk_guest ifindex not found in assoc-list") + + +def _dev_assoc_no_nsid(cfg): + """ Test dev-assoc and dev-disassoc without nsid attribute """ + _init_psp_dev(cfg, True) + + # Associate without nsid - should look up ifindex in caller's netns + cfg.pspnl.dev_assoc({'id': cfg.psp_dev_id, + 'ifindex': cfg.nk_host_ifindex}) + defer(_try_disassoc, cfg, + cfg.psp_dev_id, cfg.nk_host_ifindex) + defer(delattr, cfg, 'psp_dev_id') + defer(delattr, cfg, 'psp_info') + + # Verify assoc-list contains the device (match by ifindex only) + _check_assoc_list(cfg, cfg.psp_dev_id, cfg.nk_host_ifindex) + + # Disassociate without nsid - should also use caller's netns + cfg.pspnl.dev_disassoc({'id': cfg.psp_dev_id, + 'ifindex': cfg.nk_host_ifindex}) + + # Verify assoc-list no longer contains the device + dev_info = cfg.pspnl.dev_get({'id': cfg.psp_dev_id}) + found = False + if 'assoc-list' in dev_info: + for assoc in dev_info['assoc-list']: + if assoc['ifindex'] == cfg.nk_host_ifindex: + found = True + break + ksft_true(not found, "Device should not be in assoc-list after disassociation") + + +def _psp_dev_assoc_cleanup_on_netkit_del(cfg): + """Test that assoc-list is cleared when associated netkit is deleted. + + Creates a disposable netkit pair for this test to avoid destroying + the shared environment. + """ + _init_psp_dev(cfg, True) + defer(delattr, cfg, 'psp_dev_id') + defer(delattr, cfg, 'psp_info') + + existing = {cfg.nk_host_ifindex, cfg.nk_guest_ifindex} + + # Create a temporary netkit pair + tmp_host_name = "tmp_nk_host" + tmp_guest_name = "tmp_nk_guest" + rtnl = RtnlFamily() + rtnl.newlink( + { + "ifname": tmp_host_name, + "linkinfo": { + "kind": "netkit", + "data": { + "mode": "l2", + "policy": "forward", + "peer-policy": "forward", + }, + }, + }, + flags=[Netlink.NLM_F_CREATE, Netlink.NLM_F_EXCL], + ) + cleanup_netkit = defer(ip, f"link del {tmp_host_name}") + + # Find the peer by diffing against existing netkit ifindexes + all_links = ip("-d link show", json=True) + tmp_peer = [link for link in all_links + if link.get('linkinfo', {}).get('info_kind') == 'netkit' + and link['ifindex'] not in existing + and link['ifname'] != tmp_host_name] + ksft_eq(len(tmp_peer), 1, + "Failed to find temporary netkit peer") + guest_name = tmp_peer[0]['ifname'] + + # Rename and move guest end into the test namespace + ip(f"link set dev {guest_name} name {tmp_guest_name}") + ip(f"link set dev {tmp_guest_name} netns {cfg.netns.name}") + tmp_guest_dev = ip(f"link show dev {tmp_guest_name}", + json=True, ns=cfg.netns)[0] + tmp_guest_ifindex = tmp_guest_dev['ifindex'] + ip(f"link set dev {tmp_guest_name} up", ns=cfg.netns) + + # Associate PSP device with the temporary guest interface + cfg.pspnl.dev_assoc({'id': cfg.psp_dev_id, + 'ifindex': tmp_guest_ifindex, + 'nsid': cfg.psp_dev_peer_nsid}) + + # Verify assoc-list contains the temporary device + _check_assoc_list(cfg, cfg.psp_dev_id, tmp_guest_ifindex, + cfg.psp_dev_peer_nsid) + + # Delete the temporary netkit pair (deleting one end removes both) + ip(f"link del {tmp_host_name}") + cleanup_netkit.cancel() + + # Verify assoc-list is cleared after netkit deletion + dev_info = cfg.pspnl.dev_get({'id': cfg.psp_dev_id}) + ksft_true('assoc-list' not in dev_info + or len(dev_info['assoc-list']) == 0, + "assoc-list should be empty after netkit deletion") + + def _try_disassoc(cfg, psp_dev_id, ifindex, nsid=None): """Best-effort disassociate, ignoring errors if already removed.""" try:
@@ -840,6 +981,9 @@ def main() -> None: data_basic_send_netkit_psp_assoc, _key_rotation_notify_multi_ns_netkit, _dev_change_notify_multi_ns_netkit, + _psp_dev_get_check_netkit_psp_assoc, + _dev_assoc_no_nsid, + _psp_dev_assoc_cleanup_on_netkit_del, ] ksft_run(cases=cases, globs=globals(),
Signature · 1 line
2.52.0
PATCH v16 9/10 selftests/net: psp: add cross-namespace notification tests
In reply to Wei WangFrom: Wei Wang <[email protected]>
Add tests that verify PSP notifications are delivered to listeners in associated namespaces:
- _key_rotation_notify_multi_ns_netkit: triggers key rotation and verifies the notification is received in both main and guest namespaces
- _dev_change_notify_multi_ns_netkit: triggers dev_set and verifies the dev_change notification is received in both namespaces
--- tools/testing/selftests/drivers/net/psp.py | 59 +++++++++++++++++++++- 1 file changed, 58 insertions(+), 1 deletion(-)
tools/testing/selftests/drivers/net/psp.py +58 -1
@@ -16,7 +16,7 @@ from lib.py import ksft_run, ksft_exit, ksft_pr from lib.py import ksft_true, ksft_eq, ksft_ne, ksft_gt, ksft_raises from lib.py import ksft_not_none from lib.py import ksft_variants, KsftNamedVariant -from lib.py import KsftSkipEx +from lib.py import KsftSkipEx, KsftFailEx from lib.py import NetDrvEpEnv, NetDrvContEnv from lib.py import NlError, PSPFamily from lib.py import NetNSEnter
@@ -668,6 +668,61 @@ def data_basic_send_netkit_psp_assoc(cfg, version, ipver): _data_basic_send_netkit_psp_assoc(cfg, version, ipver) +def _key_rotation_notify_multi_ns_netkit(cfg): + """ Test key rotation notifications across multiple namespaces using netkit """ + _assoc_nk_guest(cfg) + + # Create listener in guest namespace; socket stays bound to that ns + with NetNSEnter(cfg.netns.name): + peer_pspnl = PSPFamily() + peer_pspnl.ntf_subscribe('use') + + # Create listener in main namespace + main_pspnl = PSPFamily() + main_pspnl.ntf_subscribe('use') + + # Trigger key rotation on the PSP device + cfg.pspnl.key_rotate({"id": cfg.psp_dev_id}) + + # Poll both sockets from main thread + for pspnl, label in [(main_pspnl, "main"), (peer_pspnl, "guest")]: + for ntf in pspnl.poll_ntf(duration=10): + if ntf['msg'].get('id') == cfg.psp_dev_id: + break + else: + raise KsftFailEx( + f"No key rotation notification received" + f" in {label} namespace") + + +def _dev_change_notify_multi_ns_netkit(cfg): + """ Test dev_change notifications across multiple namespaces using netkit """ + _assoc_nk_guest(cfg) + + # Create listener in guest namespace; socket stays bound to that ns + with NetNSEnter(cfg.netns.name): + peer_pspnl = PSPFamily() + peer_pspnl.ntf_subscribe('mgmt') + + # Create listener in main namespace + main_pspnl = PSPFamily() + main_pspnl.ntf_subscribe('mgmt') + + # Trigger dev_change by calling dev_set (notification is always sent) + cfg.pspnl.dev_set({'id': cfg.psp_dev_id, + 'psp-versions-ena': cfg.psp_info['psp-versions-cap']}) + + # Poll both sockets from main thread + for pspnl, label in [(main_pspnl, "main"), (peer_pspnl, "guest")]: + for ntf in pspnl.poll_ntf(duration=10): + if ntf['msg'].get('id') == cfg.psp_dev_id: + break + else: + raise KsftFailEx( + f"No dev_change notification received" + f" in {label} namespace") + + def _try_disassoc(cfg, psp_dev_id, ifindex, nsid=None): """Best-effort disassociate, ignoring errors if already removed.""" try:
@@ -783,6 +838,8 @@ def main() -> None: cases += [ _assoc_check_list, data_basic_send_netkit_psp_assoc, + _key_rotation_notify_multi_ns_netkit, + _dev_change_notify_multi_ns_netkit, ] ksft_run(cases=cases, globs=globals(),
Signature · 1 line
2.52.0
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 22 lines · On Mon, 8 Jun 2026 16:31:08 -0700 you wrote:
From: Wei Wang <[email protected]>
The main purpose of this feature is to associate virtual devices like veth or netkit with a real PSP device, so we could provide PSP functionality to the application running with virtual devices.
A typical deployment that works with this feature is as follows:
Host Namespace:
psp_dev_local←──physically linked──→psp_dev_peer
(PSP device)
│
│ BPF onpsp_dev_localingress:bpf_redirect_peer()tonk_guest│
nk_host/veth_host
│
│ BPF onnk_hostingress:bpf_redirect_neigh()topsp_dev_local│
Guest Namespace (netns):
│
nk_guest/veth_guest
★ PSP application run here
Quoted 1 line
[...]
Here is the summary with links:
- [v16,net-next,01/10] psp: add admin/non-admin version of psp_device_get_locked
https://git.kernel.org/netdev/net-next/c/1c88a4664779 - [v16,net-next,02/10] psp: add new netlink cmd for dev-assoc and dev-disassoc https://git.kernel.org/netdev/net-next/c/06c2dce2d0f6 - [v16,net-next,03/10] psp: add a new netdev event for dev unregister https://git.kernel.org/netdev/net-next/c/0ddb69e2406e - [v16,net-next,04/10] selftests/net: psp: refactor test builders to use ksft_variants https://git.kernel.org/netdev/net-next/c/89ed478a6c90 - [v16,net-next,05/10] selftests/net: add _find_bpf_obj() to search hw/ for BPF objects https://git.kernel.org/netdev/net-next/c/b9d51f2e133c - [v16,net-next,06/10] selftests/net: rename _nk_host_ifname to nk_host_ifname https://git.kernel.org/netdev/net-next/c/593e22f6524b - [v16,net-next,07/10] selftests/net: psp: support PSP in NetDrvContEnv infrastructure https://git.kernel.org/netdev/net-next/c/1c1c2e5b1fe9 - [v16,net-next,08/10] selftests/net: psp: add dev-assoc data path test https://git.kernel.org/netdev/net-next/c/43cf629700fa - [v16,net-next,09/10] selftests/net: psp: add cross-namespace notification tests https://git.kernel.org/netdev/net-next/c/5280303605bc - [v16,net-next,10/10] selftests/net: psp: add dev-get, no-nsid, and cleanup tests https://git.kernel.org/netdev/net-next/c/50d3bdfb84c8
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html