From: Simon Horman <simon.horman@corigine.com>
To: David Miller <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org, oss-drivers@corigine.com,
Louis Peens <louis.peens@corigine.com>,
Yinjun Zhang <yinjun.zhang@corigine.com>,
Simon Horman <simon.horman@corigine.com>
Subject: [PATCH net-next v3 1/8] nfp: flower: move non-zero chain check
Date: Wed, 2 Jun 2021 13:59:45 +0200 [thread overview]
Message-ID: <20210602115952.17591-2-simon.horman@corigine.com> (raw)
In-Reply-To: <20210602115952.17591-1-simon.horman@corigine.com>
From: Louis Peens <louis.peens@corigine.com>
This is in preparation for conntrack offload support which makes
used of different chains. Add explicit checks for conntrack and
non-zero chains in the add_offload path.
Signed-off-by: Louis Peens <louis.peens@corigine.com>
Signed-off-by: Yinjun Zhang <yinjun.zhang@corigine.com>
Signed-off-by: Simon Horman <simon.horman@corigine.com>
---
.../ethernet/netronome/nfp/flower/offload.c | 24 +++++++++++++++----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/netronome/nfp/flower/offload.c b/drivers/net/ethernet/netronome/nfp/flower/offload.c
index e95969c462e4..16ef960a150d 100644
--- a/drivers/net/ethernet/netronome/nfp/flower/offload.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/offload.c
@@ -1276,6 +1276,20 @@ nfp_flower_validate_pre_tun_rule(struct nfp_app *app,
return 0;
}
+static bool offload_pre_check(struct flow_cls_offload *flow)
+{
+ struct flow_rule *rule = flow_cls_offload_flow_rule(flow);
+ struct flow_dissector *dissector = rule->match.dissector;
+
+ if (dissector->used_keys & BIT(FLOW_DISSECTOR_KEY_CT))
+ return false;
+
+ if (flow->common.chain_index)
+ return false;
+
+ return true;
+}
+
/**
* nfp_flower_add_offload() - Adds a new flow to hardware.
* @app: Pointer to the APP handle
@@ -1302,6 +1316,9 @@ nfp_flower_add_offload(struct nfp_app *app, struct net_device *netdev,
if (nfp_netdev_is_nfp_repr(netdev))
port = nfp_port_from_netdev(netdev);
+ if (!offload_pre_check(flow))
+ return -EOPNOTSUPP;
+
key_layer = kmalloc(sizeof(*key_layer), GFP_KERNEL);
if (!key_layer)
return -ENOMEM;
@@ -1646,9 +1663,10 @@ nfp_flower_repr_offload(struct nfp_app *app, struct net_device *netdev,
static int nfp_flower_setup_tc_block_cb(enum tc_setup_type type,
void *type_data, void *cb_priv)
{
+ struct flow_cls_common_offload *common = type_data;
struct nfp_repr *repr = cb_priv;
- if (!tc_cls_can_offload_and_chain0(repr->netdev, type_data))
+ if (!tc_can_offload_extack(repr->netdev, common->extack))
return -EOPNOTSUPP;
switch (type) {
@@ -1746,10 +1764,6 @@ static int nfp_flower_setup_indr_block_cb(enum tc_setup_type type,
void *type_data, void *cb_priv)
{
struct nfp_flower_indr_block_cb_priv *priv = cb_priv;
- struct flow_cls_offload *flower = type_data;
-
- if (flower->common.chain_index)
- return -EOPNOTSUPP;
switch (type) {
case TC_SETUP_CLSFLOWER:
--
2.20.1
next prev parent reply other threads:[~2021-06-02 12:00 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 11:59 [PATCH net-next v3 0/8] Introduce conntrack offloading to the nfp driver Simon Horman
2021-06-02 11:59 ` Simon Horman [this message]
2021-06-02 11:59 ` [PATCH net-next v3 2/8] nfp: flower-ct: add pre and post ct checks Simon Horman
2021-06-02 11:59 ` [PATCH net-next v3 3/8] nfp: flower-ct: add ct zone table Simon Horman
2021-06-02 11:59 ` [PATCH net-next v3 4/8] nfp: flower-ct: add zone table entry when handling pre/post_ct flows Simon Horman
2021-06-02 11:59 ` [PATCH net-next v3 5/8] nfp: flower-ct: add nfp_fl_ct_flow_entries Simon Horman
2021-06-02 11:59 ` [PATCH net-next v3 6/8] nfp: flower-ct: add a table to map flow cookies to ct flows Simon Horman
2021-06-02 11:59 ` [PATCH net-next v3 7/8] nfp: flower-ct: add tc_merge_tb Simon Horman
2021-06-02 11:59 ` [PATCH net-next v3 8/8] nfp: flower-ct: add tc merge functionality Simon Horman
2021-06-02 16:59 ` [PATCH net-next v3 0/8] Introduce conntrack offloading to the nfp driver Jakub Kicinski
2021-06-02 21:10 ` 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=20210602115952.17591-2-simon.horman@corigine.com \
--to=simon.horman@corigine.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=louis.peens@corigine.com \
--cc=netdev@vger.kernel.org \
--cc=oss-drivers@corigine.com \
--cc=yinjun.zhang@corigine.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).