فهرست منبع

hsr/prp: fix don't prune the master node from the node_db

Don't prune master node in the hsr_prp_prune_nodes function.
Neither time_in[HSR_PRP_PT_SLAVE_A], nor time_in[HSR_PRP_PT_SLAVE_B],
will ever be updated by hsr_prp_register_frame_in for the master port.
Thus the master node will be repeatedly pruned leading to
repeated packet loss.
This bug never appeared because the hsr_prp_prune_nodes function
was only called once. Since commit 5150b45fd355
("net: hsr: Fix node prune function for forget time expiry") this issue
is fixed unvealing the issue described above.

Signed-off-by: Andreas Oetken <andreas.oetken@siemens.com>
Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
Murali Karicheri 6 سال پیش
والد
کامیت
b0a72fcb90
1فایلهای تغییر یافته به همراه8 افزوده شده و 0 حذف شده
  1. 8 0
      net/hsr-prp/hsr_prp_framereg.c

+ 8 - 0
net/hsr-prp/hsr_prp_framereg.c

@@ -391,6 +391,14 @@ void hsr_prp_prune_nodes(struct timer_list *t)
 
 	rcu_read_lock();
 	list_for_each_entry_rcu(node, &priv->node_db, mac_list) {
+		/* Don't prune own node. Neither time_in[HSR_PT_SLAVE_A]
+		 * nor time_in[HSR_PT_SLAVE_B], will ever be updated for
+		 * the master port. Thus the master node will be repeatedly
+		 * pruned leading to packet loss.
+		 */
+		if (hsr_prp_addr_is_self(priv, node->macaddress_A))
+			continue;
+
 		/* Shorthand */
 		time_a = node->time_in[HSR_PRP_PT_SLAVE_A];
 		time_b = node->time_in[HSR_PRP_PT_SLAVE_B];