net: shell: filter: Update table

Adjust table to print newly available information.

Signed-off-by: Cla Mattia Galliard <[email protected]>

Author: ClaCodes

subsys/net/ip/net_core.c

@@ -507,9 +507,7 @@ static void net_queue_rx(struct net_if *iface, struct net_pkt *pkt)
 #if NET_TC_RX_COUNT > 1
 	NET_DBG("TC %d with prio %d pkt %p", tc, prio, pkt);
 #endif
-
-	if ((IS_ENABLED(CONFIG_NET_TC_RX_SKIP_FOR_HIGH_PRIO) &&
-	     prio >= NET_PRIORITY_CA) || NET_TC_RX_COUNT == 0) {
+	if (!net_tc_rx_is_deferred(tc, prio)) {
 		net_process_rx_packet(pkt);
 	} else {
 		if (net_tc_submit_to_rx_queue(tc, pkt) != NET_OK) {

subsys/net/ip/net_if.c

@@ -366,10 +366,8 @@ void net_if_try_queue_tx(struct net_if *iface, struct net_pkt *pkt, k_timeout_t
 	 * the driver. Also if there are no TX queue/thread, push the packet
 	 * directly to the driver.
 	 */
-	if ((IS_ENABLED(CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO) &&
-	     prio >= NET_PRIORITY_CA) || NET_TC_TX_COUNT == 0) {
+	if (!net_tc_tx_is_deferred(tc, prio)) {
 		net_pkt_set_tx_stats_tick(pkt, k_cycle_get_32());
-
 		net_if_tx(net_pkt_iface(pkt), pkt);
 	} else {
 		if (net_tc_try_submit_to_tx_queue(tc, pkt, timeout) != NET_OK) {

subsys/net/ip/net_private.h

@@ -210,6 +210,20 @@ enum net_verdict net_tc_try_submit_to_tx_queue(uint8_t tc, struct net_pkt *pkt,
 extern enum net_verdict net_tc_submit_to_rx_queue(uint8_t tc, struct net_pkt *pkt);
 extern int net_tc_tx_thread_priority(int tc);
 extern int net_tc_rx_thread_priority(int tc);
+static inline bool net_tc_tx_is_deferred(int tc, int prio)
+{
+	bool high_prio = (prio >= NET_PRIORITY_CA);
+	bool skipping = IS_ENABLED(CONFIG_NET_TC_TX_SKIP_FOR_HIGH_PRIO);
+	bool no_queues = (0 == CONFIG_NET_TC_TX_COUNT);
+	return no_queues || !(high_prio && skipping);
+}
+static inline bool net_tc_rx_is_deferred(int tc, int prio)
+{
+	bool high_prio = (prio >= NET_PRIORITY_CA);
+	bool skipping = IS_ENABLED(CONFIG_NET_TC_RX_SKIP_FOR_HIGH_PRIO);
+	bool no_queues = (0 == NET_TC_RX_COUNT);
+	return no_queues || !(high_prio && skipping);
+}
 extern enum net_verdict net_promisc_mode_input(struct net_pkt *pkt);
 
 char *net_sprint_addr(sa_family_t af, const void *addr);

subsys/net/lib/shell/filter.c

@@ -57,8 +57,31 @@ static void rule_cb(struct npf_rule *rule, enum npf_rule_type type, void *user_d
 	const struct shell *sh = data->sh;
 	int *count = data->user_data;
 
-	PR("[%2d]  %-10s  %-7s  %-5d",
-	   (*count) + 1, rule_type2str(type), verdict2str(rule->result), rule->nb_tests);
+	PR("[%2d]  %-10s  %-8s  ",
+	   (*count) + 1, rule_type2str(type), verdict2str(rule->result));
+
+	/* int thread_prio =  net_tc_rx_thread_priority(int tc); */
+	if (rule->result == NET_CONTINUE && type == NPF_RULE_TYPE_SEND) {
+		uint8_t tc = net_tx_priority2tc(rule->priority);
+		if (net_tc_tx_is_deferred(tc, rule->priority)) {
+			int thread_prio =  net_tc_tx_thread_priority(tc);
+			PR("%8d  %5d  %11d  ", rule->priority, tc, thread_prio);
+		} else {
+			PR("%8d  %5d         SKIP  ", rule->priority, tc);
+		}
+	} else if (rule->result == NET_CONTINUE) {
+		uint8_t tc = net_rx_priority2tc(rule->priority);
+		if (net_tc_rx_is_deferred(tc, rule->priority)) {
+			int thread_prio =  net_tc_rx_thread_priority(tc);
+			PR("%8d  %5d  %11d  ", rule->priority, tc, thread_prio);
+		} else {
+			PR("%8d  %5d         SKIP  ", rule->priority, tc);
+		}
+	} else {
+		PR("     N/A    N/A          N/A  ");
+	}
+
+	PR("%-5d", rule->nb_tests);
 
 	for (int i = 0; i < rule->nb_tests; i++) {
 		/* Allocate room for storing two full IPv4/6 addresses */
@@ -89,7 +112,7 @@ static int cmd_net_filter(const struct shell *sh, size_t argc, char *argv[])
 	struct net_shell_user_data user_data;
 	int count = 0;
 
-	PR("Rule  %-10s  Verdict  Tests\n", "Type");
+	PR("Rule  %-10s  Verdict   Pkt-Prio  Queue  Thread-Prio  Tests\n", "Type");
 
 	user_data.sh = sh;
 	user_data.user_data = &count;