lib/tc: add set ipv4 dscp and ecn action offload via pedit

Add setting of ipv4 dscp and ecn fields in tc offload using pedit.

Signed-off-by: Pieter Jansen van Vuuren <pieter.jansenvanvuuren@netronome.com>
Signed-off-by: Louis Peens <louis.peens@netronome.com>
Signed-off-by: Simon Horman <simon.horman@netronome.com>

diff --git a/lib/netdev-tc-offloads.c b/lib/netdev-tc-offloads.c
index 73ce7b95245cdbb59d4e9422914bc647eb23cc7b..90bd3c5858bd3eebd787dcb2fdf1c8580d0519de 100644 (file)
--- a/lib/netdev-tc-offloads.c
+++ b/lib/netdev-tc-offloads.c
@@ -52,7 +52,7 @@ struct netlink_field {
     int size;
 };
 
-static struct netlink_field set_flower_map[][3] = {
+static struct netlink_field set_flower_map[][4] = {
     [OVS_KEY_ATTR_IPV4] = {
         { offsetof(struct ovs_key_ipv4, ipv4_src),
           offsetof(struct tc_flower_key, ipv4.ipv4_src),
@@ -66,6 +66,10 @@ static struct netlink_field set_flower_map[][3] = {
           offsetof(struct tc_flower_key, ipv4.rewrite_ttl),
           MEMBER_SIZEOF(struct tc_flower_key, ipv4.rewrite_ttl)
         },
+        { offsetof(struct ovs_key_ipv4, ipv4_tos),
+          offsetof(struct tc_flower_key, ipv4.rewrite_tos),
+          MEMBER_SIZEOF(struct tc_flower_key, ipv4.rewrite_tos)
+        },
     },
     [OVS_KEY_ATTR_IPV6] = {
         { offsetof(struct ovs_key_ipv6, ipv6_src),

diff --git a/lib/tc.c b/lib/tc.c
index 953fffd018d37a37e6b819975d6094b2278575be..78905e1e98506b8cde2921d3c10f5be36619e6c6 100644 (file)
--- a/lib/tc.c
+++ b/lib/tc.c
@@ -91,6 +91,11 @@ static struct flower_key_to_pedit flower_pedit_map[] = {
         8,
         offsetof(struct tc_flower_key, ipv4.rewrite_ttl),
         MEMBER_SIZEOF(struct tc_flower_key, ipv4.rewrite_ttl)
+    }, {
+        TCA_PEDIT_KEY_EX_HDR_TYPE_IP4,
+        1,
+        offsetof(struct tc_flower_key, ipv4.rewrite_tos),
+        MEMBER_SIZEOF(struct tc_flower_key, ipv4.rewrite_tos)
     }, {
         TCA_PEDIT_KEY_EX_HDR_TYPE_IP6,
         7,

diff --git a/lib/tc.h b/lib/tc.h
index 7196a32d75b1166fa287cab6cf164763283d3f0a..04b08e298401631e80668ea8bad753831f3b3a13 100644 (file)
--- a/lib/tc.h
+++ b/lib/tc.h
@@ -103,6 +103,7 @@ struct tc_flower_key {
         ovs_be32 ipv4_src;
         ovs_be32 ipv4_dst;
         uint8_t rewrite_ttl;
+        uint8_t rewrite_tos;
     } ipv4;
     struct {
         struct in6_addr ipv6_src;