Skip to content

Netfilter 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 Latest21 patches 1 replyIn review

Patches in v1 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/21netfilter: nft_bitwise: correct uapi header comment.include/uapi/linux/netfilter/nf_tables.h+1 -10 replies
2/21netfilter: flowtable: fetch stats only if flow is still alivenet/netfilter/nf_flow_table_core.c net/netfilter/nf_flow_table_offload.c+3 -50 replies
3/21netfilter: flowtable: restrict flow dissector match on meta ingress devicenet/netfilter/nf_flow_table_offload.c+7 -10 replies
4/21netfilter: flowtable: add nf_flow_offload_work_alloc()net/netfilter/nf_flow_table_offload.c+22 -160 replies
5/21netfilter: flowtable: remove dying bit, use teardown bit insteadinclude/net/netfilter/nf_flow_table.h net/netfilter/nf_flow_table_core.c+3 -100 replies
6/21netfilter: flowtable: use atomic bitwise operations for flow flagsinclude/net/netfilter/nf_flow_table.h net/netfilter/nf_flow_table_core.c net/netfilter/nf_flow_table_ip.c +1 more+33 -310 replies
7/21netfilter: flowtable: add nf_flowtable_hw_offload() helper functioninclude/net/netfilter/nf_flow_table.h net/netfilter/nf_flow_table_core.c net/netfilter/nf_flow_table_offload.c+8 -30 replies
8/21netfilter: flowtable: refresh flow if hardware offload failsinclude/net/netfilter/nf_flow_table.h net/netfilter/nf_flow_table_core.c net/netfilter/nf_flow_table_ip.c +1 more+22 -100 replies
9/21netfilter: hashlimit: do not use indirect calls during gcnet/netfilter/xt_hashlimit.c+4 -180 replies
10/21netfilter: flowtable: add nf_flow_offload_tuple() helpernet/netfilter/nf_flow_table_offload.c+24 -230 replies
11/21netfilter: flowtable: add nf_flow_table_offload_cmd()net/netfilter/nf_flow_table_offload.c+28 -120 replies
12/21netfilter: nf_tables: white-space fixes.net/netfilter/nft_bitwise.c net/netfilter/nft_set_bitmap.c net/netfilter/nft_set_hash.c+5 -50 replies
13/21netfilter: bitwise: remove NULL comparisons from attribute checks.net/netfilter/nft_bitwise.c+5 -50 replies
14/21netfilter: bitwise: replace gotos with returns.net/netfilter/nft_bitwise.c+5 -80 replies
15/21netfilter: bitwise: add NFTA_BITWISE_OP netlink attribute.include/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_bitwise.c+28 -00 replies
16/21netfilter: bitwise: add helper for initializing boolean operations.net/netfilter/nft_bitwise.c+41 -250 replies
17/21netfilter: bitwise: add helper for evaluating boolean operations.net/netfilter/nft_bitwise.c+14 -30 replies
18/21netfilter: bitwise: add helper for dumping boolean operations.net/netfilter/nft_bitwise.c+21 -80 replies
19/21netfilter: bitwise: only offload boolean operations.net/netfilter/nft_bitwise.c+3 -00 replies
20/21netfilter: bitwise: add NFTA_BITWISE_DATA attribute.include/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_bitwise.c+8 -00 replies
21/21netfilter: bitwise: add support for shifts.include/uapi/linux/netfilter/nf_tables.h net/netfilter/nft_bitwise.c+84 -20 replies

Reviews trailers per patch

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

Patchwenxu
1/21
2/21A-b
3/21
4/21
5/21
6/21
7/21
8/21
9/21
10/21
11/21
12/21
13/21
14/21
15/21
16/21
17/21
18/21
19/21
20/21
21/21

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/21] Netfilter updates for net-next

Hi,

The following patchset contains Netfilter updates for net-next, they are:

1) Incorrect uapi header comment in bitwise, from Jeremy Sowden.

2) Fetch flow statistics if flow is still active.

3) Restrict flow matching on hardware based on input device.

4) Add nf_flow_offload_work_alloc() helper function.

5) Remove the last client of the FLOW_OFFLOAD_DYING flag, use teardown instead.

6) Use atomic bitwise operation to operate with flow flags.

7) Add nf_flowtable_hw_offload() helper function to check for the NF_FLOWTABLE_HW_OFFLOAD flag.

8) Add NF_FLOW_HW_REFRESH to retry hardware offload from the flowtable software datapath.

9) Remove indirect calls in xt_hashlimit, from Florian Westphal.

10) Add nf_flow_offload_tuple() helper to consolidate code.

11) Add nf_flow_table_offload_cmd() helper function.

12) A few whitespace cleanups in nf_tables in bitwise and the bitmap/hash set types, from Jeremy Sowden.

13) Cleanup netlink attribute checks in bitwise, from Jeremy Sowden.

14) Replace goto by return in error path of nft_bitwise_dump(), from Jeremy Sowden.

15) Add bitwise operation netlink attribute, also from Jeremy.

16) Add nft_bitwise_init_bool(), from Jeremy Sowden.

17) Add nft_bitwise_eval_bool(), also from Jeremy.

18) Add nft_bitwise_dump_bool(), from Jeremy Sowden.

19) Disallow hardware offload for other that NFT_BITWISE_BOOL, from Jeremy Sowden.

20) Add NFTA_BITWISE_DATA netlink attribute, again from Jeremy.

21) Add support for bitwise shift operation, from Jeremy Sowden.

You can pull these changes from:

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

Thank you.

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

The following changes since commit 6bc8038035267d12df2bf78a8e1a5f07069fabb8:

sfc: remove duplicated include from efx.c (2020-01-16 10:06:18 +0100)

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 567d746b55bc66d3800c9ae91d50f0c5deb2fd93:

netfilter: bitwise: add support for shifts. (2020-01-16 15:52:02 +0100)

----------------------------------------------------------------
Florian Westphal (1):
netfilter: hashlimit: do not use indirect calls during gc

Jeremy Sowden (11):
netfilter: nft_bitwise: correct uapi header comment.
netfilter: nf_tables: white-space fixes.
netfilter: bitwise: remove NULL comparisons from attribute checks.
netfilter: bitwise: replace gotos with returns.
netfilter: bitwise: add NFTA_BITWISE_OP netlink attribute.
netfilter: bitwise: add helper for initializing boolean operations.
netfilter: bitwise: add helper for evaluating boolean operations.
netfilter: bitwise: add helper for dumping boolean operations.
netfilter: bitwise: only offload boolean operations.
netfilter: bitwise: add NFTA_BITWISE_DATA attribute.
netfilter: bitwise: add support for shifts.

Pablo Neira Ayuso (9):
netfilter: flowtable: fetch stats only if flow is still alive
netfilter: flowtable: restrict flow dissector match on meta ingress device
netfilter: flowtable: add nf_flow_offload_work_alloc()
netfilter: flowtable: remove dying bit, use teardown bit instead
netfilter: flowtable: use atomic bitwise operations for flow flags
netfilter: flowtable: add nf_flowtable_hw_offload() helper function
netfilter: flowtable: refresh flow if hardware offload fails
netfilter: flowtable: add nf_flow_offload_tuple() helper
netfilter: flowtable: add nf_flow_table_offload_cmd()

 include/net/netfilter/nf_flow_table.h    |  27 ++--
 include/uapi/linux/netfilter/nf_tables.h |  26 +++-
 net/netfilter/nf_flow_table_core.c       |  31 +++--
 net/netfilter/nf_flow_table_ip.c         |  21 ++-
 net/netfilter/nf_flow_table_offload.c    | 164 ++++++++++++----------
 net/netfilter/nft_bitwise.c              | 224 +++++++++++++++++++++++++------
 net/netfilter/nft_set_bitmap.c           |   4 +-
 net/netfilter/nft_set_hash.c             |   2 +-
 net/netfilter/xt_hashlimit.c             |  22 +--
 9 files changed, 352 insertions(+), 169 deletions(-)