pull request (net-next): ipsec-next 2019-04-30

1) A lot of work to remove indirections from the xfrm code.
   From Florian Westphal.

2) Support ESP offload in combination with gso partial.
   From Boris Pismenny.

3) Remove some duplicated code from vti4.
   From Jeremy Sowden.

Please note that there is merge conflict

between commit:

8742dc86d0c7 ("xfrm4: Fix uninitialized memory read in _decode_session4")

from the ipsec tree and commit:

c53ac41e3720 ("xfrm: remove decode_session indirection from afinfo_policy")

from the ipsec-next tree. The merge conflict will appear
when those trees get merged during the merge window.
The conflict can be solved as it is done in linux-next:

https://lkml.org/lkml/2019/4/25/1207

Please pull or let me know if there are problems.

Thanks!

The following changes since commit e6d1407013a91722ffc89e980d715eb9ce7b57f6:

  tcp: remove conditional branches from tcp_mstamp_refresh() (2019-03-23 21:43:21 -0400)

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 bb9cd077e216b886438c5698e1cd75f762ecd3c9:

  xfrm: remove unneeded export_symbols (2019-04-23 07:42:20 +0200)

----------------------------------------------------------------
Boris Pismenny (1):
      xfrm: gso partial offload support

Florian Westphal (16):
      xfrm: place af number into xfrm_mode struct
      xfrm: prefer family stored in xfrm_mode struct
      xfrm: remove input indirection from xfrm_mode
      xfrm: remove output indirection from xfrm_mode
      xfrm: remove xmit indirection from xfrm_mode
      xfrm: remove gso_segment indirection from xfrm_mode
      xfrm: remove input2 indirection from xfrm_mode
      xfrm: remove output2 indirection from xfrm_mode
      xfrm: remove afinfo pointer from xfrm_mode
      xfrm: make xfrm modes builtin
      xfrm: store xfrm_mode directly, not its address
      xfrm: kconfig: make xfrm depend on inet
      xfrm: remove tos indirection from afinfo_policy
      xfrm: remove init_path indirection from afinfo_policy
      xfrm: remove decode_session indirection from afinfo_policy
      xfrm: remove unneeded export_symbols

Jeremy Sowden (1):
      vti4: eliminated some duplicate code.

 include/net/xfrm.h                 | 116 +++--------
 net/core/pktgen.c                  |   2 +-
 net/ipv4/Kconfig                   |  29 +--
 net/ipv4/Makefile                  |   3 -
 net/ipv4/esp4_offload.c            |  50 ++++-
 net/ipv4/ip_vti.c                  |  66 +++----
 net/ipv4/xfrm4_mode_beet.c         | 155 ---------------
 net/ipv4/xfrm4_mode_transport.c    | 114 -----------
 net/ipv4/xfrm4_mode_tunnel.c       | 152 ---------------
 net/ipv4/xfrm4_output.c            |  27 ++-
 net/ipv4/xfrm4_policy.c            | 127 -------------
 net/ipv4/xfrm4_protocol.c          |   3 +-
 net/ipv6/Kconfig                   |  35 +---
 net/ipv6/Makefile                  |   4 -
 net/ipv6/esp6_offload.c            |  40 +++-
 net/ipv6/ip6_vti.c                 |   6 +-
 net/ipv6/xfrm6_mode_beet.c         | 131 -------------
 net/ipv6/xfrm6_mode_ro.c           |  85 ---------
 net/ipv6/xfrm6_mode_transport.c    | 121 ------------
 net/ipv6/xfrm6_mode_tunnel.c       | 151 ---------------
 net/ipv6/xfrm6_output.c            |  36 ++--
 net/ipv6/xfrm6_policy.c            | 126 ------------
 net/ipv6/xfrm6_protocol.c          |   3 +-
 net/xfrm/Kconfig                   |   8 +-
 net/xfrm/xfrm_device.c             |  61 +++++-
 net/xfrm/xfrm_inout.h              |  38 ++++
 net/xfrm/xfrm_input.c              | 299 +++++++++++++++++++++++++++--
 net/xfrm/xfrm_interface.c          |   6 +-
 net/xfrm/xfrm_output.c             | 381 ++++++++++++++++++++++++++++++++++++-
 net/xfrm/xfrm_policy.c             | 280 +++++++++++++++++++++++----
 net/xfrm/xfrm_state.c              | 186 +++++++-----------
 tools/testing/selftests/net/config |   2 -
 32 files changed, 1249 insertions(+), 1594 deletions(-)
 delete mode 100644 net/ipv4/xfrm4_mode_beet.c
 delete mode 100644 net/ipv4/xfrm4_mode_transport.c
 delete mode 100644 net/ipv4/xfrm4_mode_tunnel.c
 delete mode 100644 net/ipv6/xfrm6_mode_beet.c
 delete mode 100644 net/ipv6/xfrm6_mode_ro.c
 delete mode 100644 net/ipv6/xfrm6_mode_transport.c
 delete mode 100644 net/ipv6/xfrm6_mode_tunnel.c
 create mode 100644 net/xfrm/xfrm_inout.h

From: Steffen Klassert <steffen.klassert@secunet.com>
Date: Tue, 30 Apr 2019 08:37:09 +0200

> 1) A lot of work to remove indirections from the xfrm code.
>    From Florian Westphal.
> 
> 2) Support ESP offload in combination with gso partial.
>    From Boris Pismenny.
> 
> 3) Remove some duplicated code from vti4.
>    From Jeremy Sowden.
> 
> Please note that there is merge conflict
 ...

Thank you for the merge conflict info.

>   git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git master

Pulled, thanks a lot.