Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'net-hsr-use-the-seqnr-lock-for-frames-received-via-interlink-port'
Sebastian Andrzej Siewior says:
====================
net: hsr: Use the seqnr lock for frames received via interlink port.
This is follow-up to the thread at
https://lore.kernel.org/all/20240904133725.1073963-1-edumazet@google.com/
====================
Link: https://patch.msgid.link/20240906132816.657485-1-bigeasy@linutronix.de
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+10
-3
-1
net/hsr/hsr_device.c
-1
net/hsr/hsr_device.c
···
625
625
/* Overflow soon to find bugs easier: */
626
626
hsr->sequence_nr = HSR_SEQNR_START;
627
627
hsr->sup_sequence_nr = HSR_SUP_SEQNR_START;
628
-
hsr->interlink_sequence_nr = HSR_SEQNR_START;
629
628
630
629
timer_setup(&hsr->announce_timer, hsr_announce, 0);
631
630
timer_setup(&hsr->prune_timer, hsr_prune_nodes, 0);
-1
net/hsr/hsr_main.h
-1
net/hsr/hsr_main.h
···
203
203
struct timer_list prune_proxy_timer;
204
204
int announce_count;
205
205
u16 sequence_nr;
206
-
u16 interlink_sequence_nr; /* Interlink port seq_nr */
207
206
u16 sup_sequence_nr; /* For HSRv1 separate seq_nr for supervision */
208
207
enum hsr_version prot_version; /* Indicate if HSRv0, HSRv1 or PRPv1 */
209
208
spinlock_t seqnr_lock; /* locking for sequence_nr */
+10
-1
net/hsr/hsr_slave.c
+10
-1
net/hsr/hsr_slave.c
···
67
67
skb_set_network_header(skb, ETH_HLEN + HSR_HLEN);
68
68
skb_reset_mac_len(skb);
69
69
70
-
hsr_forward_skb(skb, port);
70
+
/* Only the frames received over the interlink port will assign a
71
+
* sequence number and require synchronisation vs other sender.
72
+
*/
73
+
if (port->type == HSR_PT_INTERLINK) {
74
+
spin_lock_bh(&hsr->seqnr_lock);
75
+
hsr_forward_skb(skb, port);
76
+
spin_unlock_bh(&hsr->seqnr_lock);
77
+
} else {
78
+
hsr_forward_skb(skb, port);
79
+
}
71
80
72
81
finish_consume:
73
82
return RX_HANDLER_CONSUMED;