Skip to content

Tunneling fixes

Jesse Gross netdev 2 versions – Applied

Status from this message: Applied, thanks for respinning this Jesse.

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest3 patches 14 repliesApplied
  2. v13 patches 3 repliesSuperseded

Patches in v2 Applied

#Subject and filesSizeRepliesApplied
1/3ipip: Properly mark ipip GRO packets as encapsulated.net/ipv4/af_inet.c+8 -10 replies
2/3tunnels: Don't apply GRO to multiple layers of encapsulation.include/linux/netdevice.h net/core/dev.c net/ipv4/af_inet.c +3 more+39 -813 replies
3/3tunnels: Remove encapsulation offloads on decap.include/net/ip_tunnels.h net/ipv4/fou.c net/ipv4/ip_tunnel_core.c +1 more+33 -50 replies

Reviews trailers per patch

1 of 3 patches has a Reviewed-by or Acked-by.

PatchPatrick BoutilierEric Dumazet
1/3T-b A-b
2/3
3/3

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v2 thread

Cover letter [PATCH net v2 0/3] Tunneling fixes

This series fixes a problem that was reported where encapsulated packets do not have their encapsulation offload markers stripped off when being decapsulated. This causes a significant performance drop if the packets are later retransmitted.

Fixing this revealed two other bugs which are also addressed as prerequisites:
* GRO can aggregate packets for multiple layers of encapsulation which the stack cannot properly handle.
* IPIP packets which are combined by GRO are not marked properly with their GSO type.

Note that this is based off the net-next tree as the current target for bug fixes.

v2: No code changes, just additional information in commit messages and
a new cover letter.

Jesse Gross (3):
ipip: Properly mark ipip GRO packets as encapsulated.
tunnels: Don't apply GRO to multiple layers of encapsulation.
tunnels: Remove encapsulation offloads on decap.

 include/linux/netdevice.h |  4 ++--
 include/net/ip_tunnels.h  | 16 ++++++++++++++++
 net/core/dev.c            |  2 +-
 net/ipv4/af_inet.c        | 24 ++++++++++++++++++++++--
 net/ipv4/fou.c            | 13 +++++++++++--
 net/ipv4/gre_offload.c    |  5 +++++
 net/ipv4/ip_tunnel_core.c |  3 ++-
 net/ipv4/udp_offload.c    |  6 +++---
 net/ipv6/ip6_offload.c    | 15 ++++++++++++++-
 net/ipv6/sit.c            |  6 ++++--
 10 files changed, 80 insertions(+), 14 deletions(-)
Signature · 1 line
2.5.0