Skip to content

Netfilter/IPVS updates for net-next

Pablo Neira Ayuso netdev netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest15 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/15ipvs: allow rs_table to contain different real server typesinclude/net/ip_vs.h net/netfilter/ipvs/ip_vs_ctl.c+38 -80 replies
2/15ipvs: add function to find tunnelsinclude/net/ip_vs.h net/netfilter/ipvs/ip_vs_core.c net/netfilter/ipvs/ip_vs_ctl.c+40 -00 replies
3/15ipvs: strip udp tunnel headers from icmp errorsnet/netfilter/ipvs/ip_vs_core.c+60 -00 replies
4/15netfilter: xt_owner: Add supplementary groups optioninclude/uapi/linux/netfilter/xt_owner.h net/netfilter/xt_owner.c+24 -60 replies
5/15netfilter: nf_flow_table: remove unnecessary variable in flow_offload_tupleinclude/net/netfilter/nf_flow_table.h net/netfilter/nf_flow_table_core.c+0 -30 replies
6/15netfilter: nf_tables: free base chain counters from workernet/netfilter/nf_tables_api.c+10 -160 replies
7/15netfilter: bridge: convert skb_make_writable to skb_ensure_writablenet/bridge/netfilter/ebt_dnat.c net/bridge/netfilter/ebt_redirect.c net/bridge/netfilter/ebt_snat.c+3 -30 replies
8/15netfilter: ipvs: prefer skb_ensure_writablenet/netfilter/ipvs/ip_vs_app.c net/netfilter/ipvs/ip_vs_core.c net/netfilter/ipvs/ip_vs_ftp.c +4 more+18 -180 replies
9/15netfilter: conntrack, nat: prefer skb_ensure_writablenet/netfilter/nf_conntrack_proto_sctp.c net/netfilter/nf_conntrack_seqadj.c net/netfilter/nf_nat_helper.c +1 more+17 -170 replies
10/15netfilter: ipv4: prefer skb_ensure_writablenet/ipv4/netfilter/arpt_mangle.c net/ipv4/netfilter/ipt_ECN.c net/ipv4/netfilter/nf_nat_h323.c +2 more+6 -60 replies
11/15netfilter: nf_tables: prefer skb_ensure_writablenet/netfilter/nft_exthdr.c net/netfilter/nft_payload.c+5 -40 replies
12/15netfilter: xt_HL: prefer skb_ensure_writablenet/netfilter/xt_HL.c+2 -20 replies
13/15netfilter: tcpmss, optstrip: prefer skb_ensure_writablenet/netfilter/xt_TCPMSS.c net/netfilter/xt_TCPOPTSTRIP.c+14 -160 replies
14/15netfilter: replace skb_make_writable with skb_ensure_writableinclude/linux/netfilter.h net/netfilter/core.c net/netfilter/nf_synproxy_core.c +2 more+6 -330 replies
15/15ipvs: add checksum support for gue encapsulationinclude/net/ip_vs.h include/uapi/linux/ip_vs.h net/netfilter/ipvs/ip_vs_ctl.c +1 more+146 -170 replies

Reviews trailers per patch

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

PatchSimon Horman
1/15
2/15
3/15
4/15
5/15
6/15
7/15
8/15A-b
9/15
10/15
11/15
12/15
13/15
14/15
15/15

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 00/15] Netfilter/IPVS updates for net-next

Hi David,

The following patchset container Netfilter/IPVS update for net-next:

1) Add UDP tunnel support for ICMP errors in IPVS.

Julian Anastasov says:

This patchset is a followup to the commit that adds UDP/GUE tunnel:
"ipvs: allow tunneling with gue encapsulation".

What we do is to put tunnel real servers in hash table (patch 1), add function to lookup tunnels (patch 2) and use it to strip the embedded tunnel headers from ICMP errors (patch 3).

2) Extend xt_owner to match for supplementary groups, from Lukasz Pawelczyk.

3) Remove unused oif field in flow_offload_tuple object, from Taehee Yoo.

4) Release basechain counters from workqueue to skip synchronize_rcu() call. From Florian Westphal.

5) Replace skb_make_writable() by skb_ensure_writable(). Patchset from Florian Westphal.

6) Checksum support for gue encapsulation in IPVS, from Jacky Hu.

You can pull these changes from:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git

Thanks!

----------------------------------------------------------------

The following changes since commit 7b3ed2a137b077bc0967352088b0adb6049eed20:

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue (2019-05-30 15:17:05 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git HEAD

for you to fetch changes up to 29930e314da3833437a2ddc7b17f6a954f38d8fb:

ipvs: add checksum support for gue encapsulation (2019-05-31 18:23:52 +0200)

----------------------------------------------------------------
Florian Westphal (9):
netfilter: nf_tables: free base chain counters from worker
netfilter: bridge: convert skb_make_writable to skb_ensure_writable
netfilter: ipvs: prefer skb_ensure_writable
netfilter: conntrack, nat: prefer skb_ensure_writable
netfilter: ipv4: prefer skb_ensure_writable
netfilter: nf_tables: prefer skb_ensure_writable
netfilter: xt_HL: prefer skb_ensure_writable
netfilter: tcpmss, optstrip: prefer skb_ensure_writable
netfilter: replace skb_make_writable with skb_ensure_writable

Jacky Hu (1):
ipvs: add checksum support for gue encapsulation

Julian Anastasov (3):
ipvs: allow rs_table to contain different real server types
ipvs: add function to find tunnels
ipvs: strip udp tunnel headers from icmp errors

Lukasz Pawelczyk (1):
netfilter: xt_owner: Add supplementary groups option

Taehee Yoo (1):
netfilter: nf_flow_table: remove unnecessary variable in flow_offload_tuple

 include/linux/netfilter.h                   |   5 -
 include/net/ip_vs.h                         |   8 ++
 include/net/netfilter/nf_flow_table.h       |   2 -
 include/uapi/linux/ip_vs.h                  |   7 ++
 include/uapi/linux/netfilter/xt_owner.h     |   7 +-
 net/bridge/netfilter/ebt_dnat.c             |   2 +-
 net/bridge/netfilter/ebt_redirect.c         |   2 +-
 net/bridge/netfilter/ebt_snat.c             |   2 +-
 net/ipv4/netfilter/arpt_mangle.c            |   2 +-
 net/ipv4/netfilter/ipt_ECN.c                |   4 +-
 net/ipv4/netfilter/nf_nat_h323.c            |   2 +-
 net/ipv4/netfilter/nf_nat_snmp_basic_main.c |   2 +-
 net/netfilter/core.c                        |  22 ----
 net/netfilter/ipvs/ip_vs_app.c              |   4 +-
 net/netfilter/ipvs/ip_vs_core.c             |  72 ++++++++++++-
 net/netfilter/ipvs/ip_vs_ctl.c              |  83 +++++++++++++--
 net/netfilter/ipvs/ip_vs_ftp.c              |   4 +-
 net/netfilter/ipvs/ip_vs_proto_sctp.c       |   4 +-
 net/netfilter/ipvs/ip_vs_proto_tcp.c        |   4 +-
 net/netfilter/ipvs/ip_vs_proto_udp.c        |   4 +-
 net/netfilter/ipvs/ip_vs_xmit.c             | 155 ++++++++++++++++++++++++----
 net/netfilter/nf_conntrack_proto_sctp.c     |   2 +-
 net/netfilter/nf_conntrack_seqadj.c         |   4 +-
 net/netfilter/nf_flow_table_core.c          |   1 -
 net/netfilter/nf_nat_helper.c               |   4 +-
 net/netfilter/nf_nat_proto.c                |  24 ++---
 net/netfilter/nf_nat_sip.c                  |   2 +-
 net/netfilter/nf_synproxy_core.c            |   2 +-
 net/netfilter/nf_tables_api.c               |  26 ++---
 net/netfilter/nfnetlink_queue.c             |   2 +-
 net/netfilter/nft_exthdr.c                  |   3 +-
 net/netfilter/nft_payload.c                 |   6 +-
 net/netfilter/xt_DSCP.c                     |   8 +-
 net/netfilter/xt_HL.c                       |   4 +-
 net/netfilter/xt_TCPMSS.c                   |   2 +-
 net/netfilter/xt_TCPOPTSTRIP.c              |  28 +++--
 net/netfilter/xt_owner.c                    |  23 ++++-
 37 files changed, 389 insertions(+), 149 deletions(-)