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 35DBFA04DD;
Tue, 20 Oct 2020 11:08:10 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id A6C5AC9D8;
Tue, 20 Oct 2020 10:50:22 +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 5A31DAD31
for <dev@dpdk.org>; Tue, 20 Oct 2020 10:49:07 +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
2BF2D60085 for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:07 +0000 (UTC)
Received: from us4-mdac16-60.ut7.mdlocal (unknown [10.7.66.51])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTP id 2B3CE8009B
for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:07 +0000 (UTC)
X-Virus-Scanned: Proofpoint Essentials engine
Received: from mx1-us1.ppe-hosted.com (unknown [10.7.65.199])
by mx1-us1.ppe-hosted.com (PPE Hosted ESMTP Server) with ESMTPS id ADDE3280052
for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:06 +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 632FC18005C
for <dev@dpdk.org>; Tue, 20 Oct 2020 08:49:06 +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 09:48:50 +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 09:48:50 +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 09K8mowK030915;
Tue, 20 Oct 2020 09:48:50 +0100
Received: from ukv-loginhost.uk.solarflarecom.com (localhost [127.0.0.1])
by ukv-loginhost.uk.solarflarecom.com (Postfix) with ESMTP id 9D8121613AB;
Tue, 20 Oct 2020 09:48:50 +0100 (BST)
From: Andrew Rybchenko <arybchenko@solarflare.com>
To: <y@solarflare.com>
CC: <dev@dpdk.org>, Ivan Malov <ivan.malov@oktetlabs.ru>
Date: Tue, 20 Oct 2020 09:48:21 +0100
Message-ID: <1603183709-23420-55-git-send-email-arybchenko@solarflare.com>
X-Mailer: git-send-email 1.8.3.1
In-Reply-To: <1603183709-23420-1-git-send-email-arybchenko@solarflare.com>
References: <1603183709-23420-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.505800-8.000000-10
X-TMASE-MatchedRID: 45LChreVRiQfKML5AJtfLS2416nc3bQleouvej40T4gd0WOKRkwsh3Io
zGa69omdrdoLblq9S5oV+ztbPoSlM0jn8cIz0h4xHl2pJS1lPFtj0mUvAvV2DU8iLpubparmjZy
eZR8NxX75Xk8N8430QJSmVaNYk8rS1DZoJkSjra4mGnPVO3Qin+ZM8S4DYUopDpCUEeEFm7AVAs
f1+cZFJ7N4hcW6TGp2Qr7W/2h+I70fE8yM4pjsDzXJPZYaymc4xEHRux+uk8hxKpvEGAbTDuqKL
FY8vs6J7KPUUOwL++F0n8xGScnpLzekwf7SLln+3d5o1G92BDTJGMijlL4l6loNzNxWS2uNmO59
S5epWL8WHfn54hdOcZN1JFeUKeMEiOOUXfTkScBZSbxIRLLN380Goa3UM++8
X-TM-AS-User-Approved-Sender: Yes
X-TM-AS-User-Blocked-Sender: No
X-TMASE-Result: 10--0.505800-8.000000
X-TMASE-Version: SMEX-12.5.0.1300-8.6.1012-25736.003
X-MDID: 1603183747-TQKIx4oSSN1o
X-PPE-DISP: 1603183747;TQKIx4oSSN1o
Subject: [dpdk-dev] [PATCH 54/62] net/sfc: support flow item UDP 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 | 53 +++++++++++++++++++++++++++++++++++++
drivers/net/sfc/sfc_mae.h | 4 +++
3 files changed, 59 insertions(+)
diff --git a/doc/guides/nics/sfc_efx.rst b/doc/guides/nics/sfc_efx.rst
index 661af43a20..e8f8fa987b 100644
--- a/doc/guides/nics/sfc_efx.rst
+++ b/doc/guides/nics/sfc_efx.rst
@@ -210,6 +210,8 @@ Supported pattern items (***transfer*** rules):
- TCP (source/destination ports, TCP header length + TCP flags)
+- UDP (source/destination ports)
+
Supported actions (***transfer*** rules):
- OF_POP_VLAN
diff --git a/drivers/net/sfc/sfc_mae.c b/drivers/net/sfc/sfc_mae.c
index 59c53a96f3..3dd233c6dc 100644
--- a/drivers/net/sfc/sfc_mae.c
+++ b/drivers/net/sfc/sfc_mae.c
@@ -1115,6 +1115,52 @@ sfc_mae_rule_parse_item_tcp(const struct rte_flow_item *item,
ctx_mae->match_spec_action, error);
}
+static const struct sfc_mae_field_locator flocs_udp[] = {
+ {
+ EFX_MAE_FIELD_L4_SPORT_BE,
+ RTE_SIZEOF_FIELD(struct rte_flow_item_udp, hdr.src_port),
+ offsetof(struct rte_flow_item_udp, hdr.src_port),
+ },
+ {
+ EFX_MAE_FIELD_L4_DPORT_BE,
+ RTE_SIZEOF_FIELD(struct rte_flow_item_udp, hdr.dst_port),
+ offsetof(struct rte_flow_item_udp, hdr.dst_port),
+ },
+};
+
+static int
+sfc_mae_rule_parse_item_udp(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_udp supp_mask;
+ const uint8_t *spec = NULL;
+ const uint8_t *mask = NULL;
+ int rc;
+
+ sfc_mae_item_build_supp_mask(flocs_udp, RTE_DIM(flocs_udp),
+ &supp_mask, sizeof(supp_mask));
+
+ rc = sfc_flow_parse_init(item,
+ (const void **)&spec, (const void **)&mask,
+ (const void *)&supp_mask,
+ &rte_flow_item_udp_mask,
+ sizeof(struct rte_flow_item_udp), error);
+ if (rc != 0)
+ return rc;
+
+ pdata->l3_next_proto_restriction_value = IPPROTO_UDP;
+ pdata->l3_next_proto_restriction_mask = 0xff;
+
+ if (spec == NULL)
+ return 0;
+
+ return sfc_mae_parse_item(flocs_udp, RTE_DIM(flocs_udp), spec, mask,
+ ctx_mae->match_spec_action, error);
+}
+
static const struct sfc_flow_item sfc_flow_items[] = {
{
.type = RTE_FLOW_ITEM_TYPE_PORT_ID,
@@ -1195,6 +1241,13 @@ static const struct sfc_flow_item sfc_flow_items[] = {
.ctx_type = SFC_FLOW_PARSE_CTX_MAE,
.parse = sfc_mae_rule_parse_item_tcp,
},
+ {
+ .type = RTE_FLOW_ITEM_TYPE_UDP,
+ .prev_layer = SFC_FLOW_ITEM_L3,
+ .layer = SFC_FLOW_ITEM_L4,
+ .ctx_type = SFC_FLOW_PARSE_CTX_MAE,
+ .parse = sfc_mae_rule_parse_item_udp,
+ },
};
int
diff --git a/drivers/net/sfc/sfc_mae.h b/drivers/net/sfc/sfc_mae.h
index 71046f2308..8d9b4039f3 100644
--- a/drivers/net/sfc/sfc_mae.h
+++ b/drivers/net/sfc/sfc_mae.h
@@ -128,6 +128,9 @@ struct sfc_mae_pattern_data {
*
* - If a L3 item is followed by an item TCP, the former has
* its "proto" set to either 0x06/0xff or 0x00/0x00.
+ *
+ * - If a L3 item is followed by an item UDP, the former has
+ * its "proto" set to either 0x11/0xff or 0x00/0x00.
*/
uint8_t l3_next_proto_value;
uint8_t l3_next_proto_mask;
@@ -136,6 +139,7 @@ struct sfc_mae_pattern_data {
* L4 requirement for L3 item's "proto".
* This contains one of:
* - 0x06/0xff: TCP
+ * - 0x11/0xff: UDP
* - 0x00/0x00: no L4 item
*/
uint8_t l3_next_proto_restriction_value;
--
2.17.1