From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4675DA04DD;
Tue, 20 Oct 2020 11:36:26 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id AA073FC93;
Tue, 20 Oct 2020 11:15:48 +0200 (CEST)
Received: from dispatch1-us1.ppe-hosted.com (dispatch1-us1.ppe-hosted.com
[148.163.129.52]) by dpdk.org (Postfix) with ESMTP id 2B618C836
for <dev@dpdk.org>; Tue, 20 Oct 2020 11:14:17 +0200 (CEST)
Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.62])
by dispatch1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id
EB7666005F for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)
Received: from us4-mdac16-72.ut7.mdlocal (unknown [10.7.64.191])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id EB9008009B
for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)
X-Virus-Scanned: Proofpoint Essentials engine
Received: from mx1-us1.ppe-hosted.com (unknown [10.7.66.34])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 78383280052
for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)
Received: from webmail.solarflare.com (uk.solarflare.com [193.34.186.16])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits))
(No client certificate requested)
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id 2DD86600053
for <dev@dpdk.org>; Tue, 20 Oct 2020 09:14:16 +0000 (UTC)
Received: from ukex01.SolarFlarecom.com (10.17.10.4) by
ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server (TLS) id
15.0.1497.2; Tue, 20 Oct 2020 10:14:01 +0100
Received: from opal.uk.solarflarecom.com (10.17.10.1) by
ukex01.SolarFlarecom.com (10.17.10.4) with Microsoft SMTP Server id
15.0.1497.2 via Frontend Transport; Tue, 20 Oct 2020 10:14:01 +0100
Received: from ukv-loginhost.uk.solarflarecom.com
(ukv-loginhost.uk.solarflarecom.com [10.17.10.39])
by opal.uk.solarflarecom.com (8.13.8/8.13.8) with ESMTP id 09K9E1Kt028541;
Tue, 20 Oct 2020 10:14:01 +0100
Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])
by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id AE2751613A9;
Tue, 20 Oct 2020 10:14:01 +0100 (BST)
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <dev@dpdk.org>
CC: Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Tue, 20 Oct 2020 10:13:33 +0100
Message-ID: <1603185222-14831-54-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1603185222-14831-1-git-send-email-arybchenko@solarflare.com>
References: <1603183709-23420-1-git-send-email-arybchenko@solarflare.com>
<1603185222-14831-1-git-send-email-arybchenko@solarflare.com>
MIME-Version: 1.0
Content-Type: text/plain
X-TM-AS-Product-Ver: SMEX-12.5.0.1300-8.6.1012-25736.003
X-TM-AS-Result: No-0.042700-8.000000-10
X-TMASE-MatchedRID: 3ksEd+Y0lhQfKML5AJtfLS2416nc3bQleouvej40T4gd0WOKRkwsh66P
KQSZCnDqRjuuru99Q9KPQi9XuOWoOPyUSi1R/9mUpu2VUsoXjOnH6OsXtPNFLU8iLpubparmLYt
XmTkfIw66wYPx0ATBoKj/gQzO7EtvVumvLS6q4FCSvRb8EMdYRYfQ3g3I7jVbDpCUEeEFm7CGon
GL0jN7MrAvU1QKVuyLUWBVxR396r7JwIkjG/GOnCL/7WCg9OOSovA/6ONsv0rmQJUUegCCe+xvA
Z+P6819rIBzH3upzT+/0Zic4ZIFl7Ud2R7XKvn3I7qctJOE9rp9LQinZ4QefPcjNeVeWlqY+gtH
j7OwNO1Sa+jpKCDmEWz7+ViRut4I3ZNS0z0ZM49hoJiDekd93DNT61j9k+YbvHJcklp+bXU5Ydt
MJu+Xj06eURWUybDimvjwc3/yjPGG0ZyqkEqBXdpAu0sLxpSoQ8G+yYJYYdZRZDsGiXQioL4jxK
nHJRLcVcr204P67pw=
X-TM-AS-User-Approved-Sender: Yes
X-TM-AS-User-Blocked-Sender: No
X-TMASE-Result: 10-0.042700-8.000000
X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25736.003
X-MDID: 1603185256-buSz5aLqv_vc
X-PPE-DISP: 1603185256;buSz5aLqv_vc
Subject: [dpdk-dev] [PATCH v2 53/62] net/sfc: support flow item TCP in
transfer rules
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
From: Ivan Malov <ivan.malov@oktetlabs.ru>
Add support for this flow item to MAE-specific RTE flow implementation.
Signed-off-by: Ivan Malov <ivan.malov@oktetlabs.ru>
Signed-off-by: Andrew Rybchenko <arybchenko@solarflare.com>
Reviewed-by: Andy Moreton <amoreton@xilinx.com>
---
doc/guides/nics/sfc_efx.rst | 2 +
drivers/net/sfc/sfc_mae.c | 77 +++++++++++++++++++++++++++++++++++++
drivers/net/sfc/sfc_mae.h | 15 +++++++-
3 files changed, 93 insertions(+), 1 deletion(-)
diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index 8209990d23..661af43a20 100644
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -208,6 +208,8 @@ Supported pattern items (***transfer*** rules):
- IPV6 (source/destination addresses, IP transport protocol,
traffic class, hop limit)
+- TCP (source/destination ports, TCP header length + TCP flags)
+
Supported actions (***transfer*** rules):
- OF_POP_VLAN
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 2b0121c0ac..59c53a96f3 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -396,6 +396,19 @@ sfc_mae_rule_process_pattern_data(struct sfc_mae_parse_ctx *ctx,
if (rc != 0)
goto fail;
+ if (pdata->l3_next_proto_restriction_mask == 0xff) {
+ if (pdata->l3_next_proto_mask == 0) {
+ pdata->l3_next_proto_mask = 0xff;
+ pdata->l3_next_proto_value =
+ pdata->l3_next_proto_restriction_value;
+ } else if (pdata->l3_next_proto_mask != 0xff ||
+ pdata->l3_next_proto_value !=
+ pdata->l3_next_proto_restriction_value) {
+ rc = EINVAL;
+ goto fail;
+ }
+ }
+
valuep = (const uint8_t *)&pdata->l3_next_proto_value;
maskp = (const uint8_t *)&pdata->l3_next_proto_mask;
rc = efx_mae_match_spec_field_set(efx_spec, EFX_MAE_FIELD_IP_PROTO,
@@ -1045,6 +1058,63 @@ sfc_mae_rule_parse_item_ipv6(const struct rte_flow_item *item,
return 0;
}
+static const struct sfc_mae_field_locator flocs_tcp[] = {
+ {
+ EFX_MAE_FIELD_L4_SPORT_BE,
+ RTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.src_port),
+ offsetof(struct rte_flow_item_tcp, hdr.src_port),
+ },
+ {
+ EFX_MAE_FIELD_L4_DPORT_BE,
+ RTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.dst_port),
+ offsetof(struct rte_flow_item_tcp, hdr.dst_port),
+ },
+ {
+ EFX_MAE_FIELD_TCP_FLAGS_BE,
+ /*
+ * The values have been picked intentionally since the
+ * target MAE field is oversize (16 bit). This mapping
+ * relies on the fact that the MAE field is big-endian.
+ */
+ RTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.data_off) +
+ RTE_SIZEOF_FIELD(struct rte_flow_item_tcp, hdr.tcp_flags),
+ offsetof(struct rte_flow_item_tcp, hdr.data_off),
+ },
+};
+
+static int
+sfc_mae_rule_parse_item_tcp(const struct rte_flow_item *item,
+ struct sfc_flow_parse_ctx *ctx,
+ struct rte_flow_error *error)
+{
+ struct sfc_mae_parse_ctx *ctx_mae = ctx->mae;
+ struct sfc_mae_pattern_data *pdata = &ctx_mae->pattern_data;
+ struct rte_flow_item_tcp supp_mask;
+ const uint8_t *spec = NULL;
+ const uint8_t *mask = NULL;
+ int rc;
+
+ sfc_mae_item_build_supp_mask(flocs_tcp, RTE_DIM(flocs_tcp),
+ &supp_mask, sizeof(supp_mask));
+
+ rc = sfc_flow_parse_init(item,
+ (const void **)&spec, (const void **)&mask,
+ (const void *)&supp_mask,
+ &rte_flow_item_tcp_mask,
+ sizeof(struct rte_flow_item_tcp), error);
+ if (rc != 0)
+ return rc;
+
+ pdata->l3_next_proto_restriction_value = IPPROTO_TCP;
+ pdata->l3_next_proto_restriction_mask = 0xff;
+
+ if (spec == NULL)
+ return 0;
+
+ return sfc_mae_parse_item(flocs_tcp, RTE_DIM(flocs_tcp), spec, mask,
+ ctx_mae->match_spec_action, error);
+}
+
static const struct sfc_flow_item sfc_flow_items[] = {
{
.type = RTE_FLOW_ITEM_TYPE_PORT_ID,
@@ -1118,6 +1188,13 @@ static const struct sfc_flow_item sfc_flow_items[] = {
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
.parse = sfc_mae_rule_parse_item_ipv6,
},
+ {
+ .type = RTE_FLOW_ITEM_TYPE_TCP,
+ .prev_layer = SFC_FLOW_ITEM_L3,
+ .layer = SFC_FLOW_ITEM_L4,
+ .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+ .parse = sfc_mae_rule_parse_item_tcp,
+ },
};
int
diff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h
index 993a377861..71046f2308 100644
--- a/drivers/net/sfc/sfc_mae.h
+++ b/drivers/net/sfc/sfc_mae.h
@@ -123,10 +123,23 @@ struct sfc_mae_pattern_data {
/**
* The following two fields keep track of L3 "proto" mask and value.
* The corresponding fields get filled in MAE match specification
- * at the end of parsing.
+ * at the end of parsing. Also, the information is used by a
+ * post-check to enforce consistency requirements:
+ *
+ * - If a L3 item is followed by an item TCP, the former has
+ * its "proto" set to either 0x06/0xff or 0x00/0x00.
*/
uint8_t l3_next_proto_value;
uint8_t l3_next_proto_mask;
+
+ /*
+ * L4 requirement for L3 item's "proto".
+ * This contains one of:
+ * - 0x06/0xff: TCP
+ * - 0x00/0x00: no L4 item
+ */
+ uint8_t l3_next_proto_restriction_value;
+ uint8_t l3_next_proto_restriction_mask;
};
struct sfc_mae_parse_ctx {
--
2.17.1