pull request (net-next): ipsec-next 2022-10-02
Status from this message: This series was applied to netdev/net-next.git (master)
Get series with b4
b4 am [email protected]Versions newest first
Patches in v1 All 24 applied
| # | Subject and files | Size | Replies | Applied |
|---|---|---|---|---|
| 1/24 | selftests/net: Refactor xfrm_fill_key() to use array of structstools/ | +45 | 0 replies | Applied |
| 2/24 | xfrm: Drop unused argumentnet/ | +7 | 0 replies | Applied |
| 3/24 | net: allow storing xfrm interface metadata in metadata_dstinclude/ | +20 | 0 replies | Applied |
| 4/24 | xfrm: interface: support collect metadata modeinclude/ include/ net/ +2 more | +121 | 0 replies | Applied |
| 5/24 | xfrm: lwtunnel: add lwtunnel support for xfrm interfaces in collect_md modeinclude/ include/ net/ +1 more | +107 | 0 replies | Applied |
| 6/24 | xfrm: propagate extack to all netlink doit handlersnet/ | +34 | 0 replies | Applied |
| 7/24 | xfrm: add extack support to verify_newpolicy_infonet/ | +18 | 0 replies | Applied |
| 8/24 | xfrm: add extack to verify_policy_dirnet/ | +5 | 0 replies | Applied |
| 9/24 | xfrm: add extack to verify_policy_typenet/ | +17 | 0 replies | Applied |
| 10/24 | xfrm: add extack to validate_tmplnet/ | +20 | 0 replies | Applied |
| 11/24 | xfrm: add extack to verify_sec_ctx_lennet/ | +9 | 0 replies | Applied |
| 12/24 | xfrm: add extack support to verify_newsa_infonet/ | +69 | 0 replies | Applied |
| 13/24 | xfrm: add extack to verify_replaynet/ | +22 | 0 replies | Applied |
| 14/24 | xfrm: add extack to verify_one_alg, verify_auth_trunc, verify_aeadnet/ | +20 | 0 replies | Applied |
| 15/24 | xfrm: add extack support to xfrm_dev_state_addinclude/ net/ net/ | +23 | 0 replies | Applied |
| 16/24 | xfrm: add extack to attach_*net/ | +30 | 0 replies | Applied |
| 17/24 | xfrm: add extack to __xfrm_init_stateinclude/ net/ net/ | +22 | 0 replies | Applied |
| 18/24 | xfrm: add extack support to xfrm_init_replayinclude/ net/ net/ +1 more | +10 | 0 replies | Applied |
| 19/24 | xfrm: pass extack down to xfrm_type ->init_stateinclude/ net/ net/ +8 more | +15 | 0 replies | Applied |
| 20/24 | xfrm: ah: add extack to ah_init_state, ah6_init_statenet/ net/ | +27 | 0 replies | Applied |
| 21/24 | xfrm: esp: add extack to esp_init_state, esp6_init_statenet/ net/ | +64 | 0 replies | Applied |
| 22/24 | xfrm: tunnel: add extack to ipip_init_state, xfrm6_tunnel_init_statenet/ net/ | +12 | 0 replies | Applied |
| 23/24 | xfrm: ipcomp: add extack to ipcomp{4,6}_init_stateinclude/ net/ net/ +1 more | +18 | 0 replies | Applied |
| 24/24 | xfrm: mip6: add extack to mip6_destopt_init_state, mip6_rthdr_init_statenet/ | +4 | 0 replies | Applied |
Reviews trailers per patch
3 of 24 patches have a Reviewed-by or Acked-by.
| Patch | Nicolas Dichtel | Nikolay Aleksandrov |
|---|---|---|
| 1/24 | ||
| 2/24 | ||
| 3/24 | R-b | R-b |
| 4/24 | R-b | R-b |
| 5/24 | R-b | R-b |
| 6/24 | ||
| 7/24 | ||
| 8/24 | ||
| 9/24 | ||
| 10/24 | ||
| 11/24 | ||
| 12/24 | ||
| 13/24 | ||
| 14/24 | ||
| 15/24 | ||
| 16/24 | ||
| 17/24 | ||
| 18/24 | ||
| 19/24 | ||
| 20/24 | ||
| 21/24 | ||
| 22/24 | ||
| 23/24 | ||
| 24/24 |
Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.
Cover letter [PATCH 0/24] pull request (net-next): ipsec-next 2022-10-02
1) Refactor selftests to use an array of structs in xfrm_fill_key(). From Gautam Menghani.
2) Drop an unused argument from xfrm_policy_match. From Hongbin Wang.
3) Support collect metadata mode for xfrm interfaces. From Eyal Birger.
4) Add netlink extack support to xfrm.
From Sabrina Dubroca.
Please note, there is a merge conflict in:
include/net/dst_metadata.h
between commit:
0a28bfd4971f ("net/macsec: Add MACsec skb_metadata_dst Tx Data path support")
from the net-next tree and commit:
5182a5d48c3d ("net: allow storing xfrm interface metadata in metadata_dst")
from the ipsec-next tree.
Can be solved as done in linux-next.
Please pull or let me know if there are problems.
Thanks!
The following changes since commit 7ebfc85e2cd7b08f518b526173e9a33b56b3913b:
Merge tag 'net-6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (2022-08-11 13:45:37 -0700)
are available in the Git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master
for you to fetch changes up to c39596f6ad1bfe65fc2d926e0703cf26e3fae90a:
Merge branch 'xfrm: add netlink extack to all the ->init_stat' (2022-09-30 09:49:33 +0200)
----------------------------------------------------------------
Eyal Birger (3):
net: allow storing xfrm interface metadata in metadata_dst
xfrm: interface: support collect metadata mode
xfrm: lwtunnel: add lwtunnel support for xfrm interfaces in collect_md mode
Gautam Menghani (1):
selftests/net: Refactor xfrm_fill_key() to use array of structs
Hongbin Wang (1):
xfrm: Drop unused argument
Sabrina Dubroca (19):
xfrm: propagate extack to all netlink doit handlers
xfrm: add extack support to verify_newpolicy_info
xfrm: add extack to verify_policy_dir
xfrm: add extack to verify_policy_type
xfrm: add extack to validate_tmpl
xfrm: add extack to verify_sec_ctx_len
xfrm: add extack support to verify_newsa_info
xfrm: add extack to verify_replay
xfrm: add extack to verify_one_alg, verify_auth_trunc, verify_aead
xfrm: add extack support to xfrm_dev_state_add
xfrm: add extack to attach_*
xfrm: add extack to __xfrm_init_state
xfrm: add extack support to xfrm_init_replay
xfrm: pass extack down to xfrm_type ->init_state
xfrm: ah: add extack to ah_init_state, ah6_init_state
xfrm: esp: add extack to esp_init_state, esp6_init_state
xfrm: tunnel: add extack to ipip_init_state, xfrm6_tunnel_init_state
xfrm: ipcomp: add extack to ipcomp{4,6}_init_state
xfrm: mip6: add extack to mip6_destopt_init_state, mip6_rthdr_init_state
Steffen Klassert (3):
Merge remote-tracking branch 'xfrm: start adding netlink extack support' Merge branch 'xfrm: add netlink extack for state creation' Merge branch 'xfrm: add netlink extack to all the ->init_stat'
include/net/dst_metadata.h | 31 +++ include/net/ipcomp.h | 2 +- include/net/xfrm.h | 24 ++- include/uapi/linux/if_link.h | 1 + include/uapi/linux/lwtunnel.h | 10 + net/core/lwtunnel.c | 1 + net/ipv4/ah4.c | 23 ++- net/ipv4/esp4.c | 55 +++--- net/ipv4/ipcomp.c | 10 +- net/ipv4/xfrm4_tunnel.c | 10 +- net/ipv6/ah6.c | 23 ++- net/ipv6/esp6.c | 55 +++--- net/ipv6/ipcomp6.c | 10 +- net/ipv6/mip6.c | 14 +- net/ipv6/xfrm6_tunnel.c | 10 +- net/xfrm/xfrm_device.c | 20 +- net/xfrm/xfrm_input.c | 7 +- net/xfrm/xfrm_interface.c | 206 ++++++++++++++++++-- net/xfrm/xfrm_ipcomp.c | 10 +- net/xfrm/xfrm_policy.c | 25 ++- net/xfrm/xfrm_replay.c | 10 +- net/xfrm/xfrm_state.c | 30 ++- net/xfrm/xfrm_user.c | 370 ++++++++++++++++++++++++------------ tools/testing/selftests/net/ipsec.c | 104 +++++----- 24 files changed, 738 insertions(+), 323 deletions(-)