net: context: Set priority based on DSCP

If a socket has DSCP set then the packets from the socket should also be marked with appropriate priority in case traffic classes are used in networking stack. Signed-off-by: Krishna T <[email protected]>
zephyrproject-rtos · May 16, 2023 · 2c12960 · 2c12960
1 parent 10f3ca2
commit 2c12960
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 0 deletions.
diff --git a/subsys/net/ip/ipv4.h b/subsys/net/ip/ipv4.h
@@ -231,6 +231,16 @@ static inline void net_ipv4_set_dscp(uint8_t *tos, uint8_t dscp)
 	*tos |= (dscp << NET_IPV4_DSCP_OFFSET) & NET_IPV4_DSCP_MASK;
 }
 
+/**
+ * @brief Convert DSCP value to priority.
+ *
+ * @param dscp DSCP value.
+ */
+static inline uint8_t net_ipv4_dscp_to_priority(uint8_t dscp)
+{
+	return dscp >> 3;
+}
+
 /**
  * @brief Decode ECN value from ToS field.
  *

diff --git a/subsys/net/ip/ipv6.h b/subsys/net/ip/ipv6.h
@@ -523,6 +523,16 @@ static inline void net_ipv6_set_dscp(uint8_t *tc, uint8_t dscp)
 	*tc |= (dscp << NET_IPV6_DSCP_OFFSET) & NET_IPV6_DSCP_MASK;
 }
 
+/**
+ * @brief Convert DSCP value to priority.
+ *
+ * @param dscp DSCP value.
+ */
+static inline uint8_t net_ipv6_dscp_to_priority(uint8_t dscp)
+{
+	return dscp >> 3;
+}
+
 /**
  * @brief Decode ECN value from TC field.
  *

diff --git a/subsys/net/ip/net_context.c b/subsys/net/ip/net_context.c
@@ -898,6 +898,11 @@ int net_context_create_ipv4_new(struct net_context *context,
 #if defined(CONFIG_NET_CONTEXT_DSCP_ECN)
 	net_pkt_set_ip_dscp(pkt, net_ipv4_get_dscp(context->options.dscp_ecn));
 	net_pkt_set_ip_ecn(pkt, net_ipv4_get_ecn(context->options.dscp_ecn));
+	/* Direct priority takes precedence over DSCP */
+	if (!IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
+		net_pkt_set_priority(pkt, net_ipv4_dscp_to_priority(
+			net_ipv4_get_dscp(context->options.dscp_ecn)));
+	}
 #endif
 
 	return net_ipv4_create(pkt, src, dst);
@@ -928,6 +933,11 @@ int net_context_create_ipv6_new(struct net_context *context,
 #if defined(CONFIG_NET_CONTEXT_DSCP_ECN)
 	net_pkt_set_ip_dscp(pkt, net_ipv6_get_dscp(context->options.dscp_ecn));
 	net_pkt_set_ip_ecn(pkt, net_ipv6_get_ecn(context->options.dscp_ecn));
+	/* Direct priority takes precedence over DSCP */
+	if (!IS_ENABLED(CONFIG_NET_CONTEXT_PRIORITY)) {
+		net_pkt_set_priority(pkt, net_ipv6_dscp_to_priority(
+			net_ipv6_get_dscp(context->options.dscp_ecn)));
+	}
 #endif
 
 	return net_ipv6_create(pkt, src, dst);