public inbox for netdev@vger.kernel.org 
 help / color / mirror / Atom feed
From: Paul Blakey <paulb@nvidia•com>
To: Paul Blakey <paulb@nvidia•com>, <dev@openvswitch•org>,
	<netdev@vger•kernel.org>, Saeed Mahameed <saeedm@nvidia•com>,
	Cong Wang <xiyou.wangcong@gmail•com>,
	Jamal Hadi Salim <jhs@mojatatu•com>,
	"Pravin B Shelar" <pshelar@ovn•org>, <davem@davemloft•net>,
	Jiri Pirko <jiri@nvidia•com>, Jakub Kicinski <kuba@kernel•org>,
	Marcelo Ricardo Leitner <marcelo.leitner@gmail•com>
Cc: Oz Shlomo <ozsh@nvidia•com>, Vlad Buslov <vladbu@nvidia•com>,
	Roi Dayan <roid@nvidia•com>
Subject: [PATCH net-next 2/3] net: openvswitch: Fill act ct extension
Date: Mon, 3 Jan 2022 13:44:51 +0200	[thread overview]
Message-ID: <20220103114452.406-3-paulb@nvidia.com> (raw)
In-Reply-To: <20220103114452.406-1-paulb@nvidia.com>

To give drivers the originating device information for optimized
connection tracking offload, fill in act ct extension with
ifindex from skb.

Signed-off-by: Paul Blakey <paulb@nvidia•com>
---
 net/openvswitch/conntrack.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/net/openvswitch/conntrack.c b/net/openvswitch/conntrack.c
index 1b5eae57bc90..13294a55073a 100644
--- a/net/openvswitch/conntrack.c
+++ b/net/openvswitch/conntrack.c
@@ -25,6 +25,8 @@
 #include <net/netfilter/nf_nat.h>
 #endif
 
+#include <net/netfilter/nf_conntrack_act_ct.h>
+
 #include "datapath.h"
 #include "conntrack.h"
 #include "flow.h"
@@ -1045,6 +1047,8 @@ static int __ovs_ct_lookup(struct net *net, struct sw_flow_key *key,
 			 */
 			nf_ct_set_tcp_be_liberal(ct);
 		}
+
+		nf_conn_act_ct_ext_fill(skb, ct, ctinfo);
 	}
 
 	return 0;
@@ -1245,6 +1249,8 @@ static int ovs_ct_commit(struct net *net, struct sw_flow_key *key,
 					 &info->labels.mask);
 		if (err)
 			return err;
+
+		nf_conn_act_ct_ext_add(ct);
 	} else if (IS_ENABLED(CONFIG_NF_CONNTRACK_LABELS) &&
 		   labels_nonzero(&info->labels.mask)) {
 		err = ovs_ct_set_labels(ct, key, &info->labels.value,
-- 
2.30.1


  parent reply	other threads:[~2022-01-03 11:45 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-03 11:44 [PATCH net-next 0/3] net/sched: Pass originating device to drivers offloading ct connection Paul Blakey
2022-01-03 11:44 ` [PATCH net-next 1/3] net/sched: act_ct: Fill offloading tuple iifidx Paul Blakey
2022-01-03 11:44 ` Paul Blakey [this message]
2022-01-03 11:44 ` [PATCH net-next 3/3] net/mlx5: CT: Set flow source hint from provided tuple device Paul Blakey
2022-01-04 12:20 ` [PATCH net-next 0/3] net/sched: Pass originating device to drivers offloading ct connection patchwork-bot+netdevbpf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220103114452.406-3-paulb@nvidia.com \
    --to=paulb@nvidia$(echo .)com \
    --cc=davem@davemloft$(echo .)net \
    --cc=dev@openvswitch$(echo .)org \
    --cc=jhs@mojatatu$(echo .)com \
    --cc=jiri@nvidia$(echo .)com \
    --cc=kuba@kernel$(echo .)org \
    --cc=marcelo.leitner@gmail$(echo .)com \
    --cc=netdev@vger$(echo .)kernel.org \
    --cc=ozsh@nvidia$(echo .)com \
    --cc=pshelar@ovn$(echo .)org \
    --cc=roid@nvidia$(echo .)com \
    --cc=saeedm@nvidia$(echo .)com \
    --cc=vladbu@nvidia$(echo .)com \
    --cc=xiyou.wangcong@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox