Skip to content

netfilter: remove skb_make_writable helper

Florian Westphal netfilter-devel 1 version In review

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest8 patches 2 repliesIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/8netfilter: 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
2/8netfilter: 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 -181 reply
3/8netfilter: 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
4/8netfilter: 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
5/8netfilter: nf_tables: prefer skb_ensure_writablenet/netfilter/nft_exthdr.c net/netfilter/nft_payload.c+5 -40 replies
6/8netfilter: xt_HL: prefer skb_ensure_writablenet/netfilter/xt_HL.c+2 -20 replies
7/8netfilter: tcpmss, optstrip: prefer skb_ensure_writablenet/netfilter/xt_TCPMSS.c net/netfilter/xt_TCPOPTSTRIP.c+14 -160 replies
8/8netfilter: 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

Reviews trailers per patch

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

PatchSimon Horman
1/8
2/8A-b
3/8
4/8
5/8
6/8
7/8
8/8

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 nf-next 0/8] netfilter: remove skb_make_writable helper

This series removes skb_make_writable. All users are converted to skb_ensure_writable.

In Hindsight, skb_ensure_writable() should never have been added to the tree, and instead we should have moved skb_make_writable to the core.

What happened instead that skb_ensure_writable was added to OVS, then moved to core, then extended in functionality until the point it has the same effect and same pre and post-conditions as skb_make_writable.

So, remove skb_make_writable and use the new function everywhere. Patch 1 has a more detailed explanation/walkthrough of the two functions and their pre and post-conditions.

Florian Westphal (8):
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

 include/linux/netfilter.h                   |    5 -----
 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             |    4 ++--
 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             |   12 ++++++------
 net/netfilter/nf_conntrack_proto_sctp.c     |    2 +-
 net/netfilter/nf_conntrack_seqadj.c         |    4 ++--
 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/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 +++++++++++++---------------
 29 files changed, 71 insertions(+), 99 deletions(-)