Skip to content

pull request (net-next): ipsec-next 2022-10-02

Steffen Klassert netdev 1 version Applied

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

  1. v1 Latest24 patches 0 repliesApplied 24/24

Patches in v1 All 24 applied

#Subject and filesSizeRepliesApplied
1/24selftests/net: Refactor xfrm_fill_key() to use array of structstools/testing/selftests/net/ipsec.c+45 -590 repliesApplied
2/24xfrm: Drop unused argumentnet/xfrm/xfrm_policy.c+7 -80 repliesApplied
3/24net: allow storing xfrm interface metadata in metadata_dstinclude/net/dst_metadata.h+20 -00 repliesApplied
4/24xfrm: interface: support collect metadata modeinclude/net/xfrm.h include/uapi/linux/if_link.h net/xfrm/xfrm_input.c +2 more+121 -290 repliesApplied
5/24xfrm: lwtunnel: add lwtunnel support for xfrm interfaces in collect_md modeinclude/net/dst_metadata.h include/uapi/linux/lwtunnel.h net/core/lwtunnel.c +1 more+107 -00 repliesApplied
6/24xfrm: propagate extack to all netlink doit handlersnet/xfrm/xfrm_user.c+34 -220 repliesApplied
7/24xfrm: add extack support to verify_newpolicy_infonet/xfrm/xfrm_user.c+18 -70 repliesApplied
8/24xfrm: add extack to verify_policy_dirnet/xfrm/xfrm_user.c+5 -40 repliesApplied
9/24xfrm: add extack to verify_policy_typenet/xfrm/xfrm_user.c+17 -110 repliesApplied
10/24xfrm: add extack to validate_tmplnet/xfrm/xfrm_user.c+20 -90 repliesApplied
11/24xfrm: add extack to verify_sec_ctx_lennet/xfrm/xfrm_user.c+9 -70 repliesApplied
12/24xfrm: add extack support to verify_newsa_infonet/xfrm/xfrm_user.c+69 -210 repliesApplied
13/24xfrm: add extack to verify_replaynet/xfrm/xfrm_user.c+22 -80 repliesApplied
14/24xfrm: add extack to verify_one_alg, verify_auth_trunc, verify_aeadnet/xfrm/xfrm_user.c+20 -110 repliesApplied
15/24xfrm: add extack support to xfrm_dev_state_addinclude/net/xfrm.h net/xfrm/xfrm_device.c net/xfrm/xfrm_user.c+23 -100 repliesApplied
16/24xfrm: add extack to attach_*net/xfrm/xfrm_user.c+30 -160 repliesApplied
17/24xfrm: add extack to __xfrm_init_stateinclude/net/xfrm.h net/xfrm/xfrm_state.c net/xfrm/xfrm_user.c+22 -90 repliesApplied
18/24xfrm: add extack support to xfrm_init_replayinclude/net/xfrm.h net/xfrm/xfrm_replay.c net/xfrm/xfrm_state.c +1 more+10 -60 repliesApplied
19/24xfrm: pass extack down to xfrm_type ->init_stateinclude/net/xfrm.h net/ipv4/ah4.c net/ipv4/esp4.c +8 more+15 -120 repliesApplied
20/24xfrm: ah: add extack to ah_init_state, ah6_init_statenet/ipv4/ah4.c net/ipv6/ah6.c+27 -150 repliesApplied
21/24xfrm: esp: add extack to esp_init_state, esp6_init_statenet/ipv4/esp4.c net/ipv6/esp6.c+64 -420 repliesApplied
22/24xfrm: tunnel: add extack to ipip_init_state, xfrm6_tunnel_init_statenet/ipv4/xfrm4_tunnel.c net/ipv6/xfrm6_tunnel.c+12 -40 repliesApplied
23/24xfrm: ipcomp: add extack to ipcomp{4,6}_init_stateinclude/net/ipcomp.h net/ipv4/ipcomp.c net/ipv6/ipcomp6.c +1 more+18 -80 repliesApplied
24/24xfrm: mip6: add extack to mip6_destopt_init_state, mip6_rthdr_init_statenet/ipv6/mip6.c+4 -60 repliesApplied

Reviews trailers per patch

3 of 24 patches have a Reviewed-by or Acked-by.

PatchNicolas DichtelNikolay Aleksandrov
1/24
2/24
3/24R-b R-b
4/24R-b R-b
5/24R-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.

Read the v1 thread

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(-)