Skip to content

Introduce conntrack offloading to the nfp driver

Simon Horman netdev 3 versions – Applied

Status from this message: This series was applied to netdev/net-next.git (refs/heads/master):

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest8 patches 1 replyApplied 8/8
  2. v28 patches 6 repliesSuperseded
  3. v18 patches 1 replySuperseded

Changes in v3 from the cover letter

- nfp: flower-ct: add zone table entry when handling pre/post_ct flows Fixed another docstring. Should finally have the patch check environment properly configured now to avoid more of these.
- nfp: flower-ct: add tc merge functionality
Fixed warning found by "kernel test robot <[email protected]>" Added code comment explaining chain_index comparison

Patches in v3 All 8 applied

#Subject and filesSizeRepliesApplied
1/8nfp: flower: move non-zero chain checkdrivers/net/ethernet/netronome/nfp/flower/offload.c+19 -50 repliesApplied
2/8nfp: flower-ct: add pre and post ct checksdrivers/net/ethernet/netronome/nfp/Makefile drivers/net/ethernet/netronome/nfp/flower/conntrack.c drivers/net/ethernet/netronome/nfp/flower/conntrack.h +1 more+102 -10 repliesApplied
3/8nfp: flower-ct: add ct zone tabledrivers/net/ethernet/netronome/nfp/flower/conntrack.h drivers/net/ethernet/netronome/nfp/flower/main.h drivers/net/ethernet/netronome/nfp/flower/metadata.c+40 -10 repliesApplied
4/8nfp: flower-ct: add zone table entry when handling pre/post_ct flowsdrivers/net/ethernet/netronome/nfp/flower/conntrack.c drivers/net/ethernet/netronome/nfp/flower/main.h drivers/net/ethernet/netronome/nfp/flower/metadata.c+131 -00 repliesApplied
5/8nfp: flower-ct: add nfp_fl_ct_flow_entriesdrivers/net/ethernet/netronome/nfp/flower/conntrack.c drivers/net/ethernet/netronome/nfp/flower/conntrack.h drivers/net/ethernet/netronome/nfp/flower/metadata.c+209 -30 repliesApplied
6/8nfp: flower-ct: add a table to map flow cookies to ct flowsdrivers/net/ethernet/netronome/nfp/flower/conntrack.c drivers/net/ethernet/netronome/nfp/flower/conntrack.h drivers/net/ethernet/netronome/nfp/flower/main.h +1 more+89 -70 repliesApplied
7/8nfp: flower-ct: add tc_merge_tbdrivers/net/ethernet/netronome/nfp/flower/conntrack.c drivers/net/ethernet/netronome/nfp/flower/conntrack.h drivers/net/ethernet/netronome/nfp/flower/metadata.c+47 -00 repliesApplied
8/8nfp: flower-ct: add tc merge functionalitydrivers/net/ethernet/netronome/nfp/flower/conntrack.c+158 -40 repliesApplied

Reviews trailers per patch

None of the 8 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchJakub Kicinski
SeriesA-b
1/8
2/8
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 v3 thread

Cover letter [PATCH net-next v3 0/8] Introduce conntrack offloading to the nfp driver

Louis Peens says:

This is the first in a series of patches to offload conntrack to the nfp. The approach followed is to flatten out three different flow rules into a single offloaded flow. The three different flows are:

1) The rule sending the packet to conntrack (pre_ct)
2) The rule matching on +trk+est after a packet has been through conntrack. (post_ct)
3) The rule received via callback from the netfilter (nft)

In order to offload a flow we need a combination of all three flows, but they could be added/deleted at different times and in different order.

To solve this we save potential offloadable CT flows in the driver, and every time we receive a callback we check against these saved flows for valid merges. Once we have a valid combination of all three flows this will be offloaded to the NFP. This is demonstrated in the diagram below.

	+-------------+                      +----------+
	| pre_ct flow +--------+             | nft flow |
	+-------------+        v             +------+---+
	                  +----------+              |
	                  | tc_merge +--------+     |
	                  +----------+        v     v
	+--------------+       ^           +-------------+
	| post_ct flow +-------+       +---+nft_tc merge |
	+--------------+               |   +-------------+
	                               |
	                               |
	                               |

v
Offload to nfp

This series is only up to the point of the pre_ct and post_ct merges into the tc_merge. Follow up series will continue to add the nft flows and merging of these flows with the result of the pre_ct and post_ct merged flows.

Changes since v2:
- nfp: flower-ct: add zone table entry when handling pre/post_ct flows Fixed another docstring. Should finally have the patch check environment properly configured now to avoid more of these.
- nfp: flower-ct: add tc merge functionality
Fixed warning found by "kernel test robot <[email protected]>" Added code comment explaining chain_index comparison

Changes since v1:
- nfp: flower-ct: add ct zone table
Fixed unused variable compile warning
Fixed missing colon in struct description

Louis Peens (8):
nfp: flower: move non-zero chain check
nfp: flower-ct: add pre and post ct checks
nfp: flower-ct: add ct zone table
nfp: flower-ct: add zone table entry when handling pre/post_ct flows
nfp: flower-ct: add nfp_fl_ct_flow_entries
nfp: flower-ct: add a table to map flow cookies to ct flows
nfp: flower-ct: add tc_merge_tb
nfp: flower-ct: add tc merge functionality

 drivers/net/ethernet/netronome/nfp/Makefile   |   3 +-
 .../ethernet/netronome/nfp/flower/conntrack.c | 492 ++++++++++++++++++
 .../ethernet/netronome/nfp/flower/conntrack.h | 155 ++++++
 .../net/ethernet/netronome/nfp/flower/main.h  |   6 +
 .../ethernet/netronome/nfp/flower/metadata.c  | 101 +++-
 .../ethernet/netronome/nfp/flower/offload.c   |  31 +-
 6 files changed, 781 insertions(+), 7 deletions(-)
 create mode 100644 drivers/net/ethernet/netronome/nfp/flower/conntrack.c
 create mode 100644 drivers/net/ethernet/netronome/nfp/flower/conntrack.h
Signature · 1 line
2.20.1