psp: Add support for dev-assoc/disassoc
Status from this message: This series was applied to netdev/net-next.git (main)
Get series with b4
b4 am [email protected]Versions newest first · linked by author and title
- v16 Latest10 patches 0 repliesApplied 10/10
- v15 posting 2/210 patches 0 repliesSuperseded
- v15 posting 1/20 of 11 patches 1 replySuperseded
Earlier versions · 13
| Version | Posted | Patches | Replies | Status |
|---|---|---|---|---|
| v14 | 5 patches | 4 replies | Superseded | |
| v13 | 5 patches | 2 replies | Superseded | |
| v12 posting 2/2 | 5 patches | 1 reply | Superseded | |
| v12 posting 1/2 | 5 patches | 1 reply | Superseded | |
| v11 | 5 patches | 5 replies | Superseded | |
| v10 | 5 patches | 6 replies | Superseded | |
| v9 | 5 patches | 8 replies | Superseded | |
| v8 | 5 patches | 2 replies | Superseded | |
| v7 | 5 patches | 6 replies | Superseded | |
| v6 | 5 patches | 1 reply | Superseded | |
| v5 | 5 patches | 2 replies | Superseded | |
| v4 | 5 patches | 0 replies | Superseded | |
| v3 | 5 patches | 10 replies | Superseded |
Changes in v16 from the cover letter
- Rebase
Patches in v16 All 10 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/10 | psp: add admin/non-admin version of psp_device_get_lockedDocumentation/ net/ net/ +3 more | +37 | 0 replies | Applied |
| 2/10 | psp: add new netlink cmd for dev-assoc and dev-disassocDocumentation/ include/ include/ +5 more | +469 | 0 replies | Applied |
| 3/10 | psp: add a new netdev event for dev unregisterDocumentation/ net/ net/ +3 more | +110 | 0 replies | Applied |
| 4/10 | selftests/net: psp: refactor test builders to use ksft_variantstools/ | +21 | 0 replies | Applied |
| 5/10 | selftests/net: add _find_bpf_obj() to search hw/ for BPF objectstools/ | +15 | 0 replies | Applied |
| 6/10 | selftests/net: rename _nk_host_ifname to nk_host_ifnametools/ tools/ | +15 | 0 replies | Applied |
| 7/10 | selftests/net: psp: support PSP in NetDrvContEnv infrastructuretools/ tools/ tools/ | +102 | 0 replies | Applied |
| 8/10 | selftests/net: psp: add dev-assoc data path testtools/ | +72 | 0 replies | Applied |
| 9/10 | selftests/net: psp: add cross-namespace notification teststools/ | +58 | 0 replies | Applied |
| 10/10 | selftests/net: psp: add dev-get, no-nsid, and cleanup teststools/ | +145 | 0 replies | Applied |
Reviews trailers per patch
3 of 10 patches have a Reviewed-by or Acked-by.
| Patch | Daniel Zahka |
|---|---|
| 1/10 | R-b |
| 2/10 | R-b |
| 3/10 | R-b |
| 4/10 | |
| 5/10 | |
| 6/10 | |
| 7/10 | |
| 8/10 | |
| 9/10 | |
| 10/10 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH v16 net-next 00/10] 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