* [PATCH 0/2] net/mlx5: support MPLSoUDP for HWS
@ 2023-02-08 6:19 Michael Baum
2023-02-08 6:19 ` [PATCH 1/2] net/mlx5/hws: support matching on MPLSoUDP Michael Baum
2023-02-08 6:19 ` [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS Michael Baum
0 siblings, 2 replies; 4+ messages in thread
From: Michael Baum @ 2023-02-08 6:19 UTC (permalink / raw)
To: dev; +Cc: Matan Azrad, Raslan Darawsheh, Viacheslav Ovsiienko
Add support for matching/encap/decap MPLSoUDP including multiple MPLS
headers.
Erez Shitrit (1):
net/mlx5/hws: support matching on MPLSoUDP
Michael Baum (1):
net/mlx5: add MPLS tunnel support for HWS
doc/guides/nics/mlx5.rst | 4 +
doc/guides/rel_notes/release_23_03.rst | 4 +
drivers/net/mlx5/hws/mlx5dr_definer.c | 183 ++++++++++++++++++++++++-
drivers/net/mlx5/hws/mlx5dr_definer.h | 32 ++++-
drivers/net/mlx5/mlx5_flow_hw.c | 1 +
5 files changed, 221 insertions(+), 3 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 1/2] net/mlx5/hws: support matching on MPLSoUDP
2023-02-08 6:19 [PATCH 0/2] net/mlx5: support MPLSoUDP for HWS Michael Baum
@ 2023-02-08 6:19 ` Michael Baum
2023-02-08 6:19 ` [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS Michael Baum
1 sibling, 0 replies; 4+ messages in thread
From: Michael Baum @ 2023-02-08 6:19 UTC (permalink / raw)
To: dev; +Cc: Matan Azrad, Raslan Darawsheh, Viacheslav Ovsiienko, Erez Shitrit
From: Erez Shitrit <erezsh@nvidia.com>
Add support for matching MPLS labels while it is under UDP protocol.
Matching up to 5 MPLS labels with or without the MPLS value.
Signed-off-by: Erez Shitrit <erezsh@nvidia.com>
---
drivers/net/mlx5/hws/mlx5dr_definer.c | 183 +++++++++++++++++++++++++-
drivers/net/mlx5/hws/mlx5dr_definer.h | 32 ++++-
2 files changed, 212 insertions(+), 3 deletions(-)
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.c b/drivers/net/mlx5/hws/mlx5dr_definer.c
index 6b98eb8c96..3aa66195b2 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.c
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.c
@@ -9,6 +9,8 @@
#define ETH_TYPE_IPV4_VXLAN 0x0800
#define ETH_TYPE_IPV6_VXLAN 0x86DD
#define ETH_VXLAN_DEFAULT_PORT 4789
+#define IP_UDP_PORT_MPLS 6635
+#define DR_FLOW_LAYER_TUNNEL_NO_MPLS (MLX5_FLOW_LAYER_TUNNEL & ~MLX5_FLOW_LAYER_MPLS)
#define STE_NO_VLAN 0x0
#define STE_SVLAN 0x1
@@ -105,6 +107,8 @@ struct mlx5dr_definer_conv_data {
uint8_t relaxed;
uint8_t tunnel;
uint8_t *hl;
+ uint8_t mpls_idx;
+ enum rte_flow_item_type last_item;
};
/* Xmacro used to create generic item setter from items */
@@ -153,6 +157,7 @@ struct mlx5dr_definer_conv_data {
X(SET, gtp_ext_hdr_qfi, v->hdr.qfi, rte_flow_item_gtp_psc) \
X(SET, vxlan_flags, v->flags, rte_flow_item_vxlan) \
X(SET, vxlan_udp_port, ETH_VXLAN_DEFAULT_PORT, rte_flow_item_vxlan) \
+ X(SET, mpls_udp_port, IP_UDP_PORT_MPLS, rte_flow_item_mpls) \
X(SET, source_qp, v->queue, mlx5_rte_flow_item_sq) \
X(SET, tag, v->data, rte_flow_item_tag) \
X(SET, metadata, v->data, rte_flow_item_meta) \
@@ -398,6 +403,89 @@ mlx5dr_definer_vport_set(struct mlx5dr_definer_fc *fc,
DR_SET(tag, regc_value, fc->byte_off, fc->bit_off, fc->bit_mask);
}
+static struct mlx5dr_definer_fc *
+mlx5dr_definer_get_mpls_fc(struct mlx5dr_definer_conv_data *cd, bool inner)
+{
+ uint8_t mpls_idx = cd->mpls_idx;
+ struct mlx5dr_definer_fc *fc;
+
+ switch (mpls_idx) {
+ case 0:
+ fc = &cd->fc[DR_CALC_FNAME(MPLS0, inner)];
+ DR_CALC_SET_HDR(fc, mpls_inner, mpls0_label);
+ break;
+ case 1:
+ fc = &cd->fc[DR_CALC_FNAME(MPLS1, inner)];
+ DR_CALC_SET_HDR(fc, mpls_inner, mpls1_label);
+ break;
+ case 2:
+ fc = &cd->fc[DR_CALC_FNAME(MPLS2, inner)];
+ DR_CALC_SET_HDR(fc, mpls_inner, mpls2_label);
+ break;
+ case 3:
+ fc = &cd->fc[DR_CALC_FNAME(MPLS3, inner)];
+ DR_CALC_SET_HDR(fc, mpls_inner, mpls3_label);
+ break;
+ case 4:
+ fc = &cd->fc[DR_CALC_FNAME(MPLS4, inner)];
+ DR_CALC_SET_HDR(fc, mpls_inner, mpls4_label);
+ break;
+ default:
+ rte_errno = ENOTSUP;
+ DR_LOG(ERR, "MPLS index %d is not supported\n", mpls_idx);
+ return NULL;
+ }
+
+ return fc;
+}
+
+static struct mlx5dr_definer_fc *
+mlx5dr_definer_get_mpls_oks_fc(struct mlx5dr_definer_conv_data *cd, bool inner)
+{
+ uint8_t mpls_idx = cd->mpls_idx;
+ struct mlx5dr_definer_fc *fc;
+
+ switch (mpls_idx) {
+ case 0:
+ fc = &cd->fc[DR_CALC_FNAME(OKS2_MPLS0, inner)];
+ DR_CALC_SET_HDR(fc, oks2, second_mpls0_qualifier);
+ break;
+ case 1:
+ fc = &cd->fc[DR_CALC_FNAME(OKS2_MPLS1, inner)];
+ DR_CALC_SET_HDR(fc, oks2, second_mpls1_qualifier);
+ break;
+ case 2:
+ fc = &cd->fc[DR_CALC_FNAME(OKS2_MPLS2, inner)];
+ DR_CALC_SET_HDR(fc, oks2, second_mpls2_qualifier);
+ break;
+ case 3:
+ fc = &cd->fc[DR_CALC_FNAME(OKS2_MPLS3, inner)];
+ DR_CALC_SET_HDR(fc, oks2, second_mpls3_qualifier);
+ break;
+ case 4:
+ fc = &cd->fc[DR_CALC_FNAME(OKS2_MPLS4, inner)];
+ DR_CALC_SET_HDR(fc, oks2, second_mpls4_qualifier);
+ break;
+ default:
+ rte_errno = ENOTSUP;
+ DR_LOG(ERR, "MPLS index %d is not supported\n", mpls_idx);
+ return NULL;
+ }
+
+ return fc;
+}
+
+static void
+mlx5dr_definer_mpls_label_set(struct mlx5dr_definer_fc *fc,
+ const void *item_spec,
+ uint8_t *tag)
+{
+ const struct rte_flow_item_mpls *v = item_spec;
+
+ memcpy(tag + fc->byte_off, v->label_tc_s, sizeof(v->label_tc_s));
+ memcpy(tag + fc->byte_off + sizeof(v->label_tc_s), &v->ttl, sizeof(v->ttl));
+}
+
static int
mlx5dr_definer_conv_item_eth(struct mlx5dr_definer_conv_data *cd,
struct rte_flow_item *item,
@@ -1047,6 +1135,74 @@ mlx5dr_definer_conv_item_vxlan(struct mlx5dr_definer_conv_data *cd,
return 0;
}
+static int
+mlx5dr_definer_conv_item_mpls(struct mlx5dr_definer_conv_data *cd,
+ struct rte_flow_item *item,
+ int item_idx)
+{
+ const struct rte_flow_item_mpls *m = item->mask;
+ struct mlx5dr_definer_fc *fc;
+ bool inner = cd->tunnel;
+
+ if (inner) {
+ DR_LOG(ERR, "Inner MPLS item not supported");
+ rte_errno = ENOTSUP;
+ return rte_errno;
+ }
+
+ if (cd->relaxed) {
+ DR_LOG(ERR, "Relaxed mode is not supported");
+ rte_errno = ENOTSUP;
+ return rte_errno;
+ }
+
+ /* Currently support only MPLSoUDP */
+ if (cd->last_item != RTE_FLOW_ITEM_TYPE_UDP &&
+ cd->last_item != RTE_FLOW_ITEM_TYPE_MPLS) {
+ DR_LOG(ERR, "MPLS supported only after UDP");
+ rte_errno = ENOTSUP;
+ return rte_errno;
+ }
+
+ /* In order to match on MPLS we must match on ip_protocol and l4_dport. */
+ fc = &cd->fc[DR_CALC_FNAME(IP_PROTOCOL, false)];
+ if (!fc->tag_set) {
+ fc->item_idx = item_idx;
+ fc->tag_mask_set = &mlx5dr_definer_ones_set;
+ fc->tag_set = &mlx5dr_definer_udp_protocol_set;
+ DR_CALC_SET(fc, eth_l2, l4_type_bwc, false);
+ }
+
+ fc = &cd->fc[DR_CALC_FNAME(L4_DPORT, false)];
+ if (!fc->tag_set) {
+ fc->item_idx = item_idx;
+ fc->tag_mask_set = &mlx5dr_definer_ones_set;
+ fc->tag_set = &mlx5dr_definer_mpls_udp_port_set;
+ DR_CALC_SET(fc, eth_l4, destination_port, false);
+ }
+
+ if (m && (!is_mem_zero(m->label_tc_s, 3) || m->ttl)) {
+ /* According to HW MPLSoUDP is handled as inner */
+ fc = mlx5dr_definer_get_mpls_fc(cd, true);
+ if (!fc)
+ return rte_errno;
+
+ fc->item_idx = item_idx;
+ fc->tag_set = &mlx5dr_definer_mpls_label_set;
+ } else { /* Mask relevant oks2 bit, indicates MPLS lable exists.
+ * According to HW MPLSoUDP is handled as inner
+ */
+ fc = mlx5dr_definer_get_mpls_oks_fc(cd, true);
+ if (!fc)
+ return rte_errno;
+
+ fc->item_idx = item_idx;
+ fc->tag_set = mlx5dr_definer_ones_set;
+ }
+
+ return 0;
+}
+
static struct mlx5dr_definer_fc *
mlx5dr_definer_get_register_fc(struct mlx5dr_definer_conv_data *cd, int reg)
{
@@ -1465,6 +1621,24 @@ mlx5dr_definer_conv_item_meter_color(struct mlx5dr_definer_conv_data *cd,
return 0;
}
+static void mlx5dr_definer_set_conv_tunnel(enum rte_flow_item_type cur_type,
+ uint64_t item_flags,
+ struct mlx5dr_definer_conv_data *cd)
+{
+ /* already tunnel nothing to change */
+ if (cd->tunnel)
+ return;
+
+ /* we can have more than one MPLS label at each level (inner/outer), so
+ * consider tunnel only when it is already under tunnel or if we moved to the
+ * second MPLS level.
+ */
+ if (cur_type != RTE_FLOW_ITEM_TYPE_MPLS)
+ cd->tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
+ else
+ cd->tunnel = !!(item_flags & DR_FLOW_LAYER_TUNNEL_NO_MPLS);
+}
+
static int
mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
struct mlx5dr_match_template *mt,
@@ -1485,7 +1659,7 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
/* Collect all RTE fields to the field array and set header layout */
for (i = 0; items->type != RTE_FLOW_ITEM_TYPE_END; i++, items++) {
- cd.tunnel = !!(item_flags & MLX5_FLOW_LAYER_TUNNEL);
+ mlx5dr_definer_set_conv_tunnel(items->type, item_flags, &cd);
switch ((int)items->type) {
case RTE_FLOW_ITEM_TYPE_ETH:
@@ -1581,12 +1755,19 @@ mlx5dr_definer_conv_items_to_hl(struct mlx5dr_context *ctx,
ret = mlx5dr_definer_conv_item_meter_color(&cd, items, i);
item_flags |= MLX5_FLOW_ITEM_METER_COLOR;
break;
+ case RTE_FLOW_ITEM_TYPE_MPLS:
+ ret = mlx5dr_definer_conv_item_mpls(&cd, items, i);
+ item_flags |= MLX5_FLOW_LAYER_MPLS;
+ cd.mpls_idx++;
+ break;
default:
DR_LOG(ERR, "Unsupported item type %d", items->type);
rte_errno = ENOTSUP;
return rte_errno;
}
+ cd.last_item = items->type;
+
if (ret) {
DR_LOG(ERR, "Failed processing item type: %d", items->type);
return ret;
diff --git a/drivers/net/mlx5/hws/mlx5dr_definer.h b/drivers/net/mlx5/hws/mlx5dr_definer.h
index d52c6b0627..7755d8967e 100644
--- a/drivers/net/mlx5/hws/mlx5dr_definer.h
+++ b/drivers/net/mlx5/hws/mlx5dr_definer.h
@@ -106,6 +106,26 @@ enum mlx5dr_definer_fname {
MLX5DR_DEFINER_FNAME_INTEGRITY_I,
MLX5DR_DEFINER_FNAME_ICMP_DW1,
MLX5DR_DEFINER_FNAME_ICMP_DW2,
+ MLX5DR_DEFINER_FNAME_MPLS0_O,
+ MLX5DR_DEFINER_FNAME_MPLS1_O,
+ MLX5DR_DEFINER_FNAME_MPLS2_O,
+ MLX5DR_DEFINER_FNAME_MPLS3_O,
+ MLX5DR_DEFINER_FNAME_MPLS4_O,
+ MLX5DR_DEFINER_FNAME_MPLS0_I,
+ MLX5DR_DEFINER_FNAME_MPLS1_I,
+ MLX5DR_DEFINER_FNAME_MPLS2_I,
+ MLX5DR_DEFINER_FNAME_MPLS3_I,
+ MLX5DR_DEFINER_FNAME_MPLS4_I,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS0_O,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS1_O,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS2_O,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS3_O,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS4_O,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS0_I,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS1_I,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS2_I,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS3_I,
+ MLX5DR_DEFINER_FNAME_OKS2_MPLS4_I,
MLX5DR_DEFINER_FNAME_MAX,
};
@@ -424,6 +444,14 @@ struct mlx5_ifc_definer_hl_registers_bits {
u8 register_c_1[0x20];
};
+struct mlx5_ifc_definer_hl_mpls_bits {
+ u8 mpls0_label[0x20];
+ u8 mpls1_label[0x20];
+ u8 mpls2_label[0x20];
+ u8 mpls3_label[0x20];
+ u8 mpls4_label[0x20];
+};
+
struct mlx5_ifc_definer_hl_bits {
struct mlx5_ifc_definer_hl_eth_l2_bits eth_l2_outer;
struct mlx5_ifc_definer_hl_eth_l2_bits eth_l2_inner;
@@ -452,8 +480,8 @@ struct mlx5_ifc_definer_hl_bits {
u8 unsupported_udp_misc_inner[0x20];
struct mlx5_ifc_definer_tcp_icmp_header_bits tcp_icmp;
struct mlx5_ifc_definer_hl_tunnel_header_bits tunnel_header;
- u8 unsupported_mpls_outer[0xa0];
- u8 unsupported_mpls_inner[0xa0];
+ struct mlx5_ifc_definer_hl_mpls_bits mpls_outer;
+ struct mlx5_ifc_definer_hl_mpls_bits mpls_inner;
u8 unsupported_config_headers_outer[0x80];
u8 unsupported_config_headers_inner[0x80];
u8 unsupported_random_number[0x20];
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS
2023-02-08 6:19 [PATCH 0/2] net/mlx5: support MPLSoUDP for HWS Michael Baum
2023-02-08 6:19 ` [PATCH 1/2] net/mlx5/hws: support matching on MPLSoUDP Michael Baum
@ 2023-02-08 6:19 ` Michael Baum
2023-03-07 12:40 ` Slava Ovsiienko
1 sibling, 1 reply; 4+ messages in thread
From: Michael Baum @ 2023-02-08 6:19 UTC (permalink / raw)
To: dev; +Cc: Matan Azrad, Raslan Darawsheh, Viacheslav Ovsiienko, Ori Kam
Add support for MPLS tunnel item in HWS.
Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Ori Kam <orika@nvidia.com>
---
doc/guides/nics/mlx5.rst | 4 ++++
doc/guides/rel_notes/release_23_03.rst | 4 ++++
drivers/net/mlx5/mlx5_flow_hw.c | 1 +
3 files changed, 9 insertions(+)
diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst
index f137f156f9..557784844c 100644
--- a/doc/guides/nics/mlx5.rst
+++ b/doc/guides/nics/mlx5.rst
@@ -241,6 +241,10 @@ Limitations
- L3 VXLAN and VXLAN-GPE tunnels cannot be supported together with MPLSoGRE and MPLSoUDP.
+- MPLSoGRE is not supported in HW steering (``dv_flow_en`` = 2).
+
+- MPLSoUDP with multiple MPLS headers is only supported in HW steering (``dv_flow_en`` = 2).
+
- Match on Geneve header supports the following fields only:
- VNI
diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst
index c15f6fbb9f..2d831d64cb 100644
--- a/doc/guides/rel_notes/release_23_03.rst
+++ b/doc/guides/rel_notes/release_23_03.rst
@@ -55,6 +55,10 @@ New Features
Also, make sure to start the actual text at the margin.
=======================================================
+* **Updated NVIDIA mlx5 driver.**
+
+ * Added support for MPLSoUDP in hardware steering.
+
* **Updated Intel QuickAssist Technology (QAT) crypto driver.**
* Added support for SHA3 224/256/384/512 plain hash in QAT GEN 3.
diff --git a/drivers/net/mlx5/mlx5_flow_hw.c b/drivers/net/mlx5/mlx5_flow_hw.c
index 20c71ff7f0..828446f45a 100644
--- a/drivers/net/mlx5/mlx5_flow_hw.c
+++ b/drivers/net/mlx5/mlx5_flow_hw.c
@@ -4725,6 +4725,7 @@ flow_hw_pattern_validate(struct rte_eth_dev *dev,
case RTE_FLOW_ITEM_TYPE_GTP:
case RTE_FLOW_ITEM_TYPE_GTP_PSC:
case RTE_FLOW_ITEM_TYPE_VXLAN:
+ case RTE_FLOW_ITEM_TYPE_MPLS:
case MLX5_RTE_FLOW_ITEM_TYPE_SQ:
case RTE_FLOW_ITEM_TYPE_GRE:
case RTE_FLOW_ITEM_TYPE_GRE_KEY:
--
2.25.1
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS
2023-02-08 6:19 ` [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS Michael Baum
@ 2023-03-07 12:40 ` Slava Ovsiienko
0 siblings, 0 replies; 4+ messages in thread
From: Slava Ovsiienko @ 2023-03-07 12:40 UTC (permalink / raw)
To: Michael Baum, dev; +Cc: Matan Azrad, Raslan Darawsheh, Ori Kam
> -----Original Message-----
> From: Michael Baum <michaelba@nvidia.com>
> Sent: среда, 8 февраля 2023 г. 08:19
> To: dev@dpdk.org
> Cc: Matan Azrad <matan@nvidia.com>; Raslan Darawsheh
> <rasland@nvidia.com>; Slava Ovsiienko <viacheslavo@nvidia.com>; Ori Kam
> <orika@nvidia.com>
> Subject: [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS
>
> Add support for MPLS tunnel item in HWS.
>
> Signed-off-by: Michael Baum <michaelba@nvidia.com>
> Acked-by: Ori Kam <orika@nvidia.com>
Acked-by: Viacheslav Ovsiienko <viacheslavo@nvidia.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-03-07 12:40 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-02-08 6:19 [PATCH 0/2] net/mlx5: support MPLSoUDP for HWS Michael Baum
2023-02-08 6:19 ` [PATCH 1/2] net/mlx5/hws: support matching on MPLSoUDP Michael Baum
2023-02-08 6:19 ` [PATCH 2/2] net/mlx5: add MPLS tunnel support for HWS Michael Baum
2023-03-07 12:40 ` Slava Ovsiienko
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).