--- v1
+++ v2
@@ -5,10 +5,10 @@
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
+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)
+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.
@@ -19,25 +19,30 @@
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
+ +-------------+ +----------+
+ | 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 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
@@ -51,11 +56,11 @@
drivers/net/ethernet/netronome/nfp/Makefile | 3 +-
.../ethernet/netronome/nfp/flower/conntrack.c | 486 ++++++++++++++++++
- .../ethernet/netronome/nfp/flower/conntrack.h | 154 ++++++
+ .../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, 774 insertions(+), 7 deletions(-)
+ 6 files changed, 775 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