From: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
To: shahafs@mellanox.com
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 1/3] net/mlx5: add tos and ttl flower match and tunnel keys
Date: Sun, 13 Jan 2019 14:15:22 +0000 [thread overview]
Message-ID: <1547388924-1908-2-git-send-email-viacheslavo@mellanox.com> (raw)
In-Reply-To: <1547388924-1908-1-git-send-email-viacheslavo@mellanox.com>
This patch is a preparation for adding the type-of-service and
time-to-live IP header fields support on E-Switch. There are
two types of keys added - one for match pattern, other for
tunnel encapsulation header.
This issue is critical for some Open VSwitch configuration
on overlayed (tunneled) networks, where the tos field can be
inherited from outer header to inner header.
Signed-off-by: Viacheslav Ovsiienko <viacheslavo@mellanox.com>
---
drivers/net/mlx5/Makefile | 50 ++++++++++++++++++++++++++++++++++++++++
drivers/net/mlx5/meson.build | 20 ++++++++++++++++
drivers/net/mlx5/mlx5_flow_tcf.c | 35 ++++++++++++++++++++++++++++
3 files changed, 105 insertions(+)
diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile
index 992769d..688678a 100644
--- a/drivers/net/mlx5/Makefile
+++ b/drivers/net/mlx5/Makefile
@@ -386,6 +386,26 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
enum TCA_FLOWER_KEY_TCP_FLAGS_MASK \
$(AUTOCONF_OUTPUT)
$Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_IP_TOS \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_IP_TOS \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_IP_TOS_MASK \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_IP_TOS_MASK \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_IP_TTL \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_IP_TTL \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_IP_TTL_MASK \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_IP_TTL_MASK \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
HAVE_TC_ACT_GOTO_CHAIN \
linux/pkt_cls.h \
define TC_ACT_GOTO_CHAIN \
@@ -461,6 +481,26 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
enum TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK \
$(AUTOCONF_OUTPUT)
$Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_ENC_IP_TOS \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_ENC_IP_TOS \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_ENC_IP_TOS_MASK \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_ENC_IP_TTL \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_ENC_IP_TTL \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK \
+ linux/pkt_cls.h \
+ enum TCA_FLOWER_KEY_ENC_IP_TTL_MASK \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
HAVE_TC_ACT_TUNNEL_KEY \
linux/tc_act/tc_tunnel_key.h \
define TCA_ACT_TUNNEL_KEY \
@@ -471,6 +511,16 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh
enum TCA_TUNNEL_KEY_ENC_DST_PORT \
$(AUTOCONF_OUTPUT)
$Q sh -- '$<' '$@' \
+ HAVE_TCA_TUNNEL_KEY_ENC_TOS \
+ linux/tc_act/tc_tunnel_key.h \
+ enum TCA_TUNNEL_KEY_ENC_TOS \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
+ HAVE_TCA_TUNNEL_KEY_ENC_TTL \
+ linux/tc_act/tc_tunnel_key.h \
+ enum TCA_TUNNEL_KEY_ENC_TTL \
+ $(AUTOCONF_OUTPUT)
+ $Q sh -- '$<' '$@' \
HAVE_TCA_TUNNEL_KEY_NO_CSUM \
linux/tc_act/tc_tunnel_key.h \
enum TCA_TUNNEL_KEY_NO_CSUM \
diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build
index 84f2006..6413cef 100644
--- a/drivers/net/mlx5/meson.build
+++ b/drivers/net/mlx5/meson.build
@@ -197,6 +197,14 @@ if build
'TCA_FLOWER_KEY_TCP_FLAGS' ],
[ 'HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK', 'linux/pkt_cls.h',
'TCA_FLOWER_KEY_TCP_FLAGS_MASK' ],
+ [ 'HAVE_TCA_FLOWER_KEY_IP_TOS', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_IP_TOS' ],
+ [ 'HAVE_TCA_FLOWER_KEY_IP_TOS_MASK', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_IP_TOS_MASK' ],
+ [ 'HAVE_TCA_FLOWER_KEY_IP_TTL', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_IP_TTL' ],
+ [ 'HAVE_TCA_FLOWER_KEY_IP_TTL_MASK', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_IP_TTL_MASK' ],
[ 'HAVE_TC_ACT_GOTO_CHAIN', 'linux/pkt_cls.h',
'TC_ACT_GOTO_CHAIN' ],
[ 'HAVE_TC_ACT_VLAN', 'linux/tc_act/tc_vlan.h',
@@ -227,10 +235,22 @@ if build
'TCA_FLOWER_KEY_ENC_UDP_DST_PORT' ],
[ 'HAVE_TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK', 'linux/pkt_cls.h',
'TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK' ],
+ [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TOS', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_ENC_IP_TOS' ],
+ [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_ENC_IP_TOS_MASK' ],
+ [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TTL', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_ENC_IP_TTL' ],
+ [ 'HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK', 'linux/pkt_cls.h',
+ 'TCA_FLOWER_KEY_ENC_IP_TTL_MASK' ],
[ 'HAVE_TC_ACT_TUNNEL_KEY', 'linux/tc_act/tc_tunnel_key.h',
'TCA_ACT_TUNNEL_KEY' ],
[ 'HAVE_TCA_TUNNEL_KEY_ENC_DST_PORT', 'linux/tc_act/tc_tunnel_key.h',
'TCA_TUNNEL_KEY_ENC_DST_PORT' ],
+ [ 'HAVE_TCA_TUNNEL_KEY_ENC_TOS', 'linux/tc_act/tc_tunnel_key.h',
+ 'TCA_TUNNEL_KEY_ENC_TOS' ],
+ [ 'HAVE_TCA_TUNNEL_KEY_ENC_TTL', 'linux/tc_act/tc_tunnel_key.h',
+ 'TCA_TUNNEL_KEY_ENC_TTL' ],
[ 'HAVE_TCA_TUNNEL_KEY_NO_CSUM', 'linux/tc_act/tc_tunnel_key.h',
'TCA_TUNNEL_KEY_NO_CSUM' ],
[ 'HAVE_TC_ACT_PEDIT', 'linux/tc_act/tc_pedit.h',
diff --git a/drivers/net/mlx5/mlx5_flow_tcf.c b/drivers/net/mlx5/mlx5_flow_tcf.c
index c7adbdf..f06f5d5 100644
--- a/drivers/net/mlx5/mlx5_flow_tcf.c
+++ b/drivers/net/mlx5/mlx5_flow_tcf.c
@@ -125,6 +125,14 @@ struct tc_pedit_sel {
#define TCA_TUNNEL_KEY_NO_CSUM 10
#endif
+#ifndef HAVE_TCA_TUNNEL_KEY_ENC_TOS
+#define TCA_TUNNEL_KEY_ENC_TOS 12
+#endif
+
+#ifndef HAVE_TCA_TUNNEL_KEY_ENC_TTL
+#define TCA_TUNNEL_KEY_ENC_TTL 13
+#endif
+
#else /* HAVE_TC_ACT_TUNNEL_KEY */
#define TCA_ACT_TUNNEL_KEY 17
@@ -138,6 +146,8 @@ struct tc_pedit_sel {
#define TCA_TUNNEL_KEY_ENC_KEY_ID 7
#define TCA_TUNNEL_KEY_ENC_DST_PORT 9
#define TCA_TUNNEL_KEY_NO_CSUM 10
+#define TCA_TUNNEL_KEY_ENC_TOS 12
+#define TCA_TUNNEL_KEY_ENC_TTL 13
struct tc_tunnel_key {
tc_gen;
@@ -292,6 +302,31 @@ struct tc_tunnel_key {
#ifndef HAVE_TCA_FLOWER_KEY_TCP_FLAGS_MASK
#define TCA_FLOWER_KEY_TCP_FLAGS_MASK 72
#endif
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TOS
+#define TCA_FLOWER_KEY_IP_TOS 73
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TOS_MASK
+#define TCA_FLOWER_KEY_IP_TOS_MASK 74
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TTL
+#define TCA_FLOWER_KEY_IP_TTL 75
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_IP_TTL_MASK
+#define TCA_FLOWER_KEY_IP_TTL_MASK 76
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IP_TOS
+#define TCA_FLOWER_KEY_ENC_IP_TOS 80
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IP_TOS_MASK
+#define TCA_FLOWER_KEY_ENC_IP_TOS_MASK 81
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IP_TTL
+#define TCA_FLOWER_KEY_ENC_IP_TTL 82
+#endif
+#ifndef HAVE_TCA_FLOWER_KEY_ENC_IP_TTL_MASK
+#define TCA_FLOWER_KEY_ENC_IP_TTL_MASK 83
+#endif
+
#ifndef HAVE_TC_ACT_GOTO_CHAIN
#define TC_ACT_GOTO_CHAIN 0x20000000
#endif
--
1.8.3.1
next prev parent reply other threads:[~2019-01-13 14:15 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-29 18:51 [dpdk-dev] [PATCH 0/4] " Viacheslav Ovsiienko
2018-12-29 18:51 ` [dpdk-dev] [PATCH 1/4] " Viacheslav Ovsiienko
2018-12-29 18:51 ` [dpdk-dev] [PATCH 2/4] net/mlx5: add tos and ttl fields support on E-Switch Viacheslav Ovsiienko
2018-12-29 18:51 ` [dpdk-dev] [PATCH 3/4] net/mlx5: add tos and ttl validation " Viacheslav Ovsiienko
2018-12-29 18:51 ` [dpdk-dev] [PATCH 4/4] app/testpmd: add tos and ttl field to vxlan encapsulation Viacheslav Ovsiienko
2019-01-13 14:15 ` [dpdk-dev] [PATCH v2 0/3] net/mlx5: add tos and ttl flower match and tunnel keys Viacheslav Ovsiienko
2019-01-13 14:15 ` Viacheslav Ovsiienko [this message]
2019-01-13 14:15 ` [dpdk-dev] [PATCH v2 2/3] net/mlx5: add tos and ttl fields support on E-Switch Viacheslav Ovsiienko
2019-01-13 14:15 ` [dpdk-dev] [PATCH v2 3/3] net/mlx5: add tos and ttl validation " Viacheslav Ovsiienko
2019-01-14 6:14 ` [dpdk-dev] [PATCH v2 0/3] net/mlx5: add tos and ttl flower match and tunnel keys Shahaf Shuler
2019-01-13 14:40 ` [dpdk-dev] [PATCH v2] app/testpmd: add tos and ttl field to vxlan encapsulation Viacheslav Ovsiienko
2019-01-14 6:04 ` Shahaf Shuler
2019-01-14 10:08 ` Iremonger, Bernard
2019-01-16 6:59 ` Ori Kam
2019-01-22 10:57 ` [dpdk-dev] [PATCH v3] " Viacheslav Ovsiienko
2019-01-23 19:45 ` Ori Kam
2019-02-07 12:08 ` Ferruh Yigit
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=1547388924-1908-2-git-send-email-viacheslavo@mellanox.com \
--to=viacheslavo@mellanox.com \
--cc=dev@dpdk.org \
--cc=shahafs@mellanox.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).