Skip to content

net: gro: encapsulation bug fix and flush checks improvements

Richard Gobert linux-kselftest lkml netdev 6 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v6 Latest6 patches 8 repliesIn review
  2. v56 patches 2 repliesSuperseded
  3. v44 patches 15 repliesSuperseded
Earlier versions · 3
VersionPostedPatchesRepliesStatus
v34 patches7 repliesSuperseded
v24 patches2 repliesSuperseded
v13 patches4 repliesSuperseded

Changes in v6 from the cover letter

- Write inner_network_offset in vxlan, geneve and ipsec
- Ignore is_atomic when DF=0
- v5:
https://lore.kernel.org/all/[email protected]/

Patches in v6 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/6net: gro: add flush check in udp_gro_receive_segmentnet/ipv4/udp_offload.c+12 -10 replies
2/6net: gro: add p_off param in *_gro_completedrivers/net/geneve.c drivers/net/vxlan/vxlan_core.c include/linux/etherdevice.h +20 more+93 -744 replies
3/6selftests/net: add local address bind in vxlan selftesttools/testing/selftests/net/udpgro_fwd.sh+7 -30 replies
4/6net: gro: add {inner_}network_offset to napi_gro_cbdrivers/net/geneve.c drivers/net/vxlan/vxlan_core.c include/net/gro.h +6 more+28 -100 replies
5/6net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segmentinclude/net/gro.h net/core/gro.c net/ipv4/af_inet.c +3 more+67 -864 replies
6/6selftests/net: add flush id selfteststools/testing/selftests/net/gro.c+144 -00 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v6 yet.

Read the v6 thread

Cover letter [PATCH net-next v6 0/6] net: gro: encapsulation bug fix and flush checks improvements

This series fixes a bug in the complete phase of UDP in GRO, in which socket lookup fails due to using network_header when parsing encapsulated packets. The fix is to pass p_off parameter in *_gro_complete.

Next, the fields network_offset and inner_network_offset are added to napi_gro_cb, and are both set during the receive phase of GRO. This is then leveraged in the next commit to remove flush_id state from napi_gro_cb, and stateful code in {ipv6,inet}_gro_receive which may be unnecessarily complicated due to encapsulation support in GRO.

In addition, udpgro_fwd selftest is adjusted to include the socket lookup
case for vxlan. This selftest will test its supposed functionality once
local bind support is merged (https://lore.kernel.org/netdev/[email protected]/).

v5 -> v6:
- Write inner_network_offset in vxlan, geneve and ipsec
- Ignore is_atomic when DF=0
- v5:
https://lore.kernel.org/all/[email protected]/

v4 -> v5:
- Add 1st commit - flush id checks in udp_gro_receive segment which can be backported by itself
- Add TCP measurements for the 5th commit
- Add flush id tests to ensure flush id logic is preserved in GRO
- Simplify gro_inet_flush by removing a branch
- v4:
https://lore.kernel.org/all/[email protected]/

v3 -> v4:
- Fix code comment and commit message typos
- v3:
https://lore.kernel.org/all/[email protected]/

v2 -> v3:
- Use napi_gro_cb instead of skb->{offset}
- v2:
https://lore.kernel.org/all/[email protected]/

v1 -> v2:
- Pass p_off in *_gro_complete to fix UDP bug
- Remove more conditionals and memory fetches from inet_gro_flush
- v1:
https://lore.kernel.org/netdev/[email protected]/

Richard Gobert (6):
net: gro: add flush check in udp_gro_receive_segment
net: gro: add p_off param in *_gro_complete
selftests/net: add local address bind in vxlan selftest
net: gro: add {inner_}network_offset to napi_gro_cb
net: gro: move L3 flush checks to tcp_gro_receive and udp_gro_receive_segment selftests/net: add flush id selftests

 drivers/net/geneve.c                      |   8 +-
 drivers/net/vxlan/vxlan_core.c            |  12 +-
 include/linux/etherdevice.h               |   2 +-
 include/linux/netdevice.h                 |   3 +-
 include/linux/udp.h                       |   2 +-
 include/net/gro.h                         |  93 ++++++++++++--
 include/net/inet_common.h                 |   2 +-
 include/net/tcp.h                         |   6 +-
 include/net/udp.h                         |   8 +-
 include/net/udp_tunnel.h                  |   2 +-
 net/8021q/vlan_core.c                     |   6 +-
 net/core/gro.c                            |   7 +-
 net/ethernet/eth.c                        |   5 +-
 net/ipv4/af_inet.c                        |  54 +-------
 net/ipv4/fou_core.c                       |   9 +-
 net/ipv4/gre_offload.c                    |   6 +-
 net/ipv4/tcp_offload.c                    |  22 +---
 net/ipv4/udp.c                            |   3 +-
 net/ipv4/udp_offload.c                    |  31 +++--
 net/ipv6/ip6_offload.c                    |  41 +++---
 net/ipv6/tcpv6_offload.c                  |   7 +-
 net/ipv6/udp.c                            |   3 +-
 net/ipv6/udp_offload.c                    |  13 +-
 tools/testing/selftests/net/gro.c         | 144 ++++++++++++++++++++++
 tools/testing/selftests/net/udpgro_fwd.sh |  10 +-
 25 files changed, 338 insertions(+), 161 deletions(-)
Signature · 1 line
2.36.1