Skip to content

ip_gre, ip6_gre: Make [IP6]GRE[TAP] devices always NETIF_F_LLTX

Peilin Ye lkml netdev 2 versions – 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 · linked by author and title

  1. v2 Latest2 patches 0 repliesApplied 2/2
  2. v12 patches 2 repliesSuperseded

Changes in v2 from the cover letter

- deleted "depends on patch..." in [1/2]'s commit message

Patches in v2 All 2 applied

#Subject and filesSizeRepliesApplied
1/2ip_gre: Make GRE and GRETAP devices always NETIF_F_LLTXnet/ipv4/ip_gre.c+22 -280 repliesApplied
2/2ip6_gre: Make IP6GRE and IP6GRETAP devices always NETIF_F_LLTXnet/ipv6/ip6_gre.c+13 -210 repliesApplied

Reviews trailers per patch

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

Read the v2 thread

Cover letter [PATCH v2 net-next 0/2] ip_gre, ip6_gre: Make [IP6]GRE[TAP] devices always NETIF_F_LLTX

From: Peilin Ye <[email protected]>

v1: https://lore.kernel.org/netdev/[email protected]/

change since v1:
- deleted "depends on patch..." in [1/2]'s commit message

Hi all,

This patchset depends on these fixes [1], which has been merged into net-next. Since o_seqno is now atomic_t, we can always turn on NETIF_F_LLTX for [IP6]GRE[TAP] devices, since we no longer need the TX lock (&txq->_xmit_lock).

We could probably do the same thing to [IP6]ERSPAN devices as well, but I'm not familiar with them yet. For example, ERSPAN devices are initialized as |= GRE_FEATURES in erspan_tunnel_init(), but I don't see IP6ERSPAN devices being initialized as |= GRE6_FEATURES. Where should we initialize IP6ERSPAN devices' ->features? Please suggest if I'm missing something, thanks!

[1] https://lore.kernel.org/netdev/[email protected]/

Thanks,
Peilin Ye (2):
ip_gre: Make GRE and GRETAP devices always NETIF_F_LLTX
ip6_gre: Make IP6GRE and IP6GRETAP devices always NETIF_F_LLTX

 net/ipv4/ip_gre.c  | 50 ++++++++++++++++++++--------------------------
 net/ipv6/ip6_gre.c | 34 ++++++++++++-------------------
 2 files changed, 35 insertions(+), 49 deletions(-)
Signature · 1 line
2.20.1