net_pkt: Store meta-information of processing in the net_pkt

Store a flag about which layer has already processed a packet in its meta
information. This enables deferred processing of it.

Author: ClaCodes

include/zephyr/net/net_pkt.h

@@ -231,9 +231,18 @@ struct net_pkt {
 				   * preserved. Useful only if
 				   * defined(CONFIG_NET_ETHERNET_BRIDGE).
 				   */
+	uint8_t raw_processed : 1; /* Set to 1 if this packet has already been
+				    * processed by SOCK_RAW
+				    */
+	uint8_t dgram_processed : 1; /* Set to 1 if this packet has already been
+				      * processed by SOCK_DGRAM
+				      */
 	uint8_t l2_processed : 1; /* Set to 1 if this packet has already been
 				   * processed by the L2
 				   */
+	uint8_t l3_processed : 1; /* Set to 1 if this packet has already been
+				   * processed by the L3
+				   */
 	uint8_t chksum_done : 1; /* Checksum has already been computed for
 				  * the packet.
 				  */
@@ -554,6 +563,28 @@ static inline void net_pkt_set_l2_bridged(struct net_pkt *pkt, bool is_l2_bridge
 	}
 }
 
+static inline bool net_pkt_is_raw_processed(struct net_pkt *pkt)
+{
+	return !!(pkt->raw_processed);
+}
+
+static inline void net_pkt_set_raw_processed(struct net_pkt *pkt,
+					    bool is_raw_processed)
+{
+	pkt->raw_processed = is_raw_processed;
+}
+
+static inline bool net_pkt_is_dgram_processed(struct net_pkt *pkt)
+{
+	return !!(pkt->dgram_processed);
+}
+
+static inline void net_pkt_set_dgram_processed(struct net_pkt *pkt,
+					    bool is_dgram_processed)
+{
+	pkt->dgram_processed = is_dgram_processed;
+}
+
 static inline bool net_pkt_is_l2_processed(struct net_pkt *pkt)
 {
 	return !!(pkt->l2_processed);
@@ -565,6 +596,17 @@ static inline void net_pkt_set_l2_processed(struct net_pkt *pkt,
 	pkt->l2_processed = is_l2_processed;
 }
 
+static inline bool net_pkt_is_l3_processed(struct net_pkt *pkt)
+{
+	return !!(pkt->l3_processed);
+}
+
+static inline void net_pkt_set_l3_processed(struct net_pkt *pkt,
+					    bool is_l3_processed)
+{
+	pkt->l3_processed = is_l3_processed;
+}
+
 static inline bool net_pkt_is_chksum_done(struct net_pkt *pkt)
 {
 	return !!(pkt->chksum_done);

subsys/net/ip/net_core.c

@@ -68,7 +68,10 @@ static inline enum net_verdict process_data(struct net_pkt *pkt)
 {
 	int ret;
 
-	net_packet_socket_input(pkt, ETH_P_ALL, SOCK_RAW);
+	if (!net_pkt_is_raw_processed(pkt)) {
+		net_pkt_set_raw_processed(pkt);
+		net_packet_socket_input(pkt, ETH_P_ALL, SOCK_RAW);
+	}
 
 	/* If there is no data, then drop the packet. */
 	if (!pkt->frags) {
@@ -79,8 +82,8 @@ static inline enum net_verdict process_data(struct net_pkt *pkt)
 	}
 
 	if (!net_pkt_is_l2_processed(pkt)) {
-		ret = net_if_recv_data(net_pkt_iface(pkt), pkt);
 		net_pkt_set_l2_processed(pkt, true);
+		ret = net_if_recv_data(net_pkt_iface(pkt), pkt);
 		if (ret != NET_CONTINUE) {
 			if (ret == NET_DROP) {
 				NET_DBG("Packet %p discarded by L2", pkt);
@@ -90,40 +93,48 @@ static inline enum net_verdict process_data(struct net_pkt *pkt)
 
 			return ret;
 		}
-	}
 
-	/* L2 has modified the buffer starting point, it is easier
-	 * to re-initialize the cursor rather than updating it.
-	 */
-	net_pkt_cursor_init(pkt);
+		/* L2 has modified the buffer starting point, it is easier
+		 * to re-initialize the cursor rather than updating it.
+		 */
+		net_pkt_cursor_init(pkt);
+	}
 
-	if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET_DGRAM)) {
+	if (IS_ENABLED(CONFIG_NET_SOCKETS_PACKET_DGRAM) &&
+	    !net_pkt_is_dgram_processed(pkt)) {
+		net_pkt_set_dgram_processed(pkt);
 		net_packet_socket_input(pkt, net_pkt_ll_proto_type(pkt), SOCK_DGRAM);
 	}
 
-	uint8_t family = net_pkt_family(pkt);
+	if (net_pkt_is_l3_processed(pkt)) {
+		net_pkt_set_l3_processed(pkt);
+		uint8_t family = net_pkt_family(pkt);
 
-	if (IS_ENABLED(CONFIG_NET_IP) && (family == AF_INET || family == AF_INET6 ||
-					  family == AF_UNSPEC || family == AF_PACKET)) {
-		/* IP version and header length. */
-		uint8_t vtc_vhl = NET_IPV6_HDR(pkt)->vtc & 0xf0;
+		if (IS_ENABLED(CONFIG_NET_IP) && (family == AF_INET || family == AF_INET6 ||
+					family == AF_UNSPEC || family == AF_PACKET)) {
+			/* IP version and header length. */
+			uint8_t vtc_vhl = NET_IPV6_HDR(pkt)->vtc & 0xf0;
 
-		if (IS_ENABLED(CONFIG_NET_IPV6) && vtc_vhl == 0x60) {
-			return net_ipv6_input(pkt);
-		} else if (IS_ENABLED(CONFIG_NET_IPV4) && vtc_vhl == 0x40) {
-			return net_ipv4_input(pkt);
-		}
+			if (IS_ENABLED(CONFIG_NET_IPV6) && vtc_vhl == 0x60) {
+				return net_ipv6_input(pkt);
+			} else if (IS_ENABLED(CONFIG_NET_IPV4) && vtc_vhl == 0x40) {
+				return net_ipv4_input(pkt);
+			}
 
-		NET_DBG("Unknown IP family packet (0x%x)", NET_IPV6_HDR(pkt)->vtc & 0xf0);
-		net_stats_update_ip_errors_protoerr(net_pkt_iface(pkt));
-		net_stats_update_ip_errors_vhlerr(net_pkt_iface(pkt));
-		return NET_DROP;
-	} else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN) {
-		return net_canbus_socket_input(pkt);
+			NET_DBG("Unknown IP family packet (0x%x)", NET_IPV6_HDR(pkt)->vtc & 0xf0);
+			net_stats_update_ip_errors_protoerr(net_pkt_iface(pkt));
+			net_stats_update_ip_errors_vhlerr(net_pkt_iface(pkt));
+			return NET_DROP;
+		} else if (IS_ENABLED(CONFIG_NET_SOCKETS_CAN) && family == AF_CAN) {
+			return net_canbus_socket_input(pkt);
+		} else {
+			NET_DBG("Unknown protocol family packet (0x%x)", family);
+			return NET_DROP;
+		}
 	}
 
-	NET_DBG("Unknown protocol family packet (0x%x)", family);
 	return NET_DROP;
+
 }
 
 static void processing_data(struct net_pkt *pkt)