net: hsr: Fix PRP duplicate detection
Subsystems (3)
PATCH v3 1/2 net: hsr: Fix PRP duplicate detection
Add PRP specific function for handling duplicate packets. This is needed because of potential L2 802.1p prioritization done by network switches.
The L2 prioritization can re-order the PRP packets from a node causing the existing implementation to discard the frame(s) that have been received 'late' because the sequence number is before the previous received packet. This can happen if the node is sending multiple frames back-to-back with different priority.
---
Changes in v3:
- Fixed indentation
- Renamed local variables
net/hsr/hsr_device.c | 2 + net/hsr/hsr_forward.c | 4 +- net/hsr/hsr_framereg.c | 95 ++++++++++++++++++++++++++++++++++++++++-- net/hsr/hsr_framereg.h | 8 +++- net/hsr/hsr_main.h | 2 + 5 files changed, 104 insertions(+), 7 deletions(-)
net/hsr/hsr_device.c +2 -0
@@ -616,6 +616,7 @@ static struct hsr_proto_ops hsr_ops = { .drop_frame = hsr_drop_frame, .fill_frame_info = hsr_fill_frame_info, .invalid_dan_ingress_frame = hsr_invalid_dan_ingress_frame, + .register_frame_out = hsr_register_frame_out, };static struct hsr_proto_ops prp_ops = {
@@ -626,6 +627,7 @@ static struct hsr_proto_ops prp_ops = { .fill_frame_info = prp_fill_frame_info, .handle_san_frame = prp_handle_san_frame, .update_san_info = prp_update_san_info, + .register_frame_out = prp_register_frame_out, };void hsr_dev_setup (struct net_device *dev)
net/hsr/hsr_forward.c +2 -2
@@ -536,8 +536,8 @@ static void hsr_forward_do(struct hsr_frame_info *frame)* Also for SAN, this shouldn't be done. */ if (!frame->is_from_san && -hsr_register_frame_out (port, frame->node_src, - frame->sequence_nr)) + hsr->proto_ops->register_frame_out && + hsr->proto_ops->register_frame_out (port, frame))continue ; if (frame->is_supervision && port->type == HSR_PT_MASTER &&
net/hsr/hsr_framereg.c +92 -3
121 lines not on this page · raw message
net/hsr/hsr_framereg.h +6 -2
@@ -44,8 +44,7 @@ void hsr_addr_subst_dest(struct hsr_node *node_src, struct sk_buff *skb,void hsr_register_frame_in (struct hsr_node *node,struct hsr_port *port,u16 sequence_nr); -int hsr_register_frame_out (struct hsr_port *port,struct hsr_node *node, -u16 sequence_nr); +int hsr_register_frame_out (struct hsr_port *port,struct hsr_frame_info *frame);void hsr_prune_nodes (struct timer_list *t);void hsr_prune_proxy_nodes (struct timer_list *t);
@@ -73,6 +72,8 @@ void prp_update_san_info(struct hsr_node *node, bool is_sup);bool hsr_is_node_in_db (struct list_head *node_db,const unsigned char addr[ETH_ALEN ]); +int prp_register_frame_out (struct hsr_port *port,struct hsr_frame_info *frame); +struct hsr_node {struct list_head mac_list;/* Protect R/W access to seq_out */
@@ -89,6 +90,9 @@ struct hsr_node {bool san_b;u16 seq_out[HSR_PT_PORTS ];bool removed; +/* PRP specific duplicate handling */ +u16 seq_expected[HSR_PT_PORTS ]; +u16 seq_start[HSR_PT_PORTS ];struct rcu_head rcu_head; };
net/hsr/hsr_main.h +2 -0
@@ -175,6 +175,8 @@ struct hsr_proto_ops { struct hsr_frame_info *frame);bool (*invalid_dan_ingress_frame)(__be16 protocol);void (*update_san_info)(struct hsr_node *node,bool is_sup); +int (*register_frame_out)(struct hsr_port *port, +struct hsr_frame_info *frame); };struct hsr_self_node {
Signature · 1 line
2.43.0
PATCH v3 2/2 net: hsr: Add KUnit test for PRP
Add unit tests for the PRP duplicate detection
---
Changes in v2:
- Changed KUnit tests to compile as built-in only
Changes in v3:
- Changed the KUnit tests to compile as a module
net/hsr/Kconfig | 18 +++ net/hsr/Makefile | 2 + net/hsr/hsr_framereg.c | 4 + net/hsr/prp_dup_discard_test.c | 212 +++++++++++++++++++++++++++++++++ 4 files changed, 236 insertions(+) create mode 100644 net/hsr/prp_dup_discard_test.c
net/hsr/Kconfig +18 -0
@@ -38,3 +38,21 @@ config HSR relying on this code in a safety critical system! If unsure, say N. + +if HSR + +config PRP_DUP_DISCARD_KUNIT_TEST + tristate "PRP duplicate discard KUnit tests" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Covers the PRP duplicate discard algorithm. + Only useful for kernel devs running KUnit test harness and are not + for inclusion into a production build. + + For more information on KUnit and unit tests in general please refer + to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N. + +endif
net/hsr/Makefile +2 -0
@@ -8,3 +8,5 @@ obj-$(CONFIG_HSR) += hsr.o hsr-y := hsr_main.o hsr_framereg.o hsr_device.o \ hsr_netlink.o hsr_slave.o hsr_forward.o hsr-$(CONFIG_DEBUG_FS) += hsr_debugfs.o + +obj-$(CONFIG_PRP_DUP_DISCARD_KUNIT_TEST) += prp_dup_discard_test.o
net/hsr/hsr_framereg.c +4 -0
@@ -588,6 +588,10 @@ int prp_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame)return 0 ; } +#ifdef CONFIG_PRP_DUP_DISCARD_KUNIT_TEST_MODULE +EXPORT_SYMBOL (prp_register_frame_out); +#endif +static struct hsr_port *get_late_port (struct hsr_priv *hsr,struct hsr_node *node) {
net/hsr/prp_dup_discard_test.c new file +212 -0
212 lines not on this page · raw message
Signature · 1 line
2.43.0
Re: [PATCH net-next v3 2/2] net: hsr: Add KUnit test for PRP
Quoted 8 lines · Jaakko Karrenpalo
Add unit tests for the PRP duplicate detection
Signed-off-by Jaakko Karrenpalo <[email protected]>---
Changes in v2:
- Changed KUnit tests to compile as built-in only
Changes in v3:
- Changed the KUnit tests to compile as a module
Thanks, I see that this addresses Paolo's review of v2 and overall looks good to me.
Paolo Abeni
maintainerRe: [PATCH net-next v3 2/2] net: hsr: Add KUnit test for PRP
In reply to Jaakko KarrenpaloQuoted 57 lines · Jaakko Karrenpalo
Add unit tests for the PRP duplicate detection
Signed-off-by Jaakko Karrenpalo <[email protected]>---
Changes in v2:
- Changed KUnit tests to compile as built-in only
Changes in v3:
- Changed the KUnit tests to compile as a modulenet/hsr/Kconfig | 18 +++ net/hsr/Makefile | 2 + net/hsr/hsr_framereg.c | 4 + net/hsr/prp_dup_discard_test.c | 212 +++++++++++++++++++++++++++++++++ 4 files changed, 236 insertions(+) create mode 100644 net/hsr/prp_dup_discard_test.cnet/hsr/Kconfig +18
-0@@ -38,3 +38,21 @@ config HSR relying on this code in a safety critical system! If unsure, say N. + +if HSR + +config PRP_DUP_DISCARD_KUNIT_TEST + tristate "PRP duplicate discard KUnit tests" if !KUNIT_ALL_TESTS + depends on KUNIT + default KUNIT_ALL_TESTS + help + Covers the PRP duplicate discard algorithm. + Only useful for kernel devs running KUnit test harness and are not + for inclusion into a production build. + + For more information on KUnit and unit tests in general please refer + to the KUnit documentation in Documentation/dev-tools/kunit/. + + If unsure, say N. + +endifnet/hsr/Makefile +2
-0@@ -8,3 +8,5 @@ obj-$(CONFIG_HSR) += hsr.o hsr-y := hsr_main.o hsr_framereg.o hsr_device.o \ hsr_netlink.o hsr_slave.o hsr_forward.o hsr-$(CONFIG_DEBUG_FS) += hsr_debugfs.o + +obj-$(CONFIG_PRP_DUP_DISCARD_KUNIT_TEST) += prp_dup_discard_test.onet/hsr/hsr_framereg.c +0
-0
net/hsr/hsr_framereg.c int prp_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame) · line 591
Quoted 4 lines
net/hsr/hsr_framereg.c +1
-0@@ -588,6 +588,10 @@ int prp_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame)return 0 ; } +#ifdef CONFIG_PRP_DUP_DISCARD_KUNIT_TEST_MODULE
The more idiomatic way to express the above is:
#if IS_MODULE(CONFIG_PRP_DUP_DISCARD_KUNIT_TEST)
Otherwise LGTM,
Paolo
Quoted 12 lines · Jaakko Karrenpalo
Add PRP specific function for handling duplicate packets. This is needed because of potential L2 802.1p prioritization done by network switches.
The L2 prioritization can re-order the PRP packets from a node causing the existing implementation to discard the frame(s) that have been received 'late' because the sequence number is before the previous received packet. This can happen if the node is sending multiple frames back-to-back with different priority.
Quoted 5 lines
Signed-off-by Jaakko Karrenpalo <[email protected]>---
Changes in v3:
- Fixed indentation
- Renamed local variables
Thanks, I see that this addresses Paolo's review of v2 and overall looks good to me.
Please find below two minor nits.
I don't think you need to respin because of them. But do consider addressing them if there is a new revision for some other reason.
...
Quoted 1 line
net/hsr/hsr_framereg.c +0
-0
...
Quoted 20 lines
net/hsr/hsr_framereg.c +20
-0+/* Adaptation of the PRP duplicate discard algorithm described in wireshark +* wiki (https://wiki.wireshark.org/PRP) +* +* A drop window is maintained for both LANs with start sequence set to the +* first sequence accepted on the LAN that has not been seen on the other LAN, +* and expected sequence set to the latest received sequence number plus one. +* +* When a frame is received on either LAN it is compared against the received +* frames on the other LAN. If it is outside the drop window of the other LAN +* the frame is accepted and the drop window is updated. +* The drop window for the other LAN is reset. +* +* 'port' is the outgoing interface +* 'frame' is the frame to be sent +* +* Return: +* 1 if frame can be shown to have been sent recently on this interface, +* 0 otherwise +*/ +int prp_register_frame_out (struct hsr_port *port,struct hsr_frame_info *frame)
net/hsr/hsr_framereg.c int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node, · line 537
Quoted 10 lines
net/hsr/hsr_framereg.c +10
-0+{ +enum hsr_port_type other_port; +enum hsr_port_type rcv_port; +struct hsr_node *node; +u16 sequence_diff; +u16 sequence_exp; +u16 sequence_nr; + +/* out-going frames are always in order +*and can be checked the same way as for HSR
nit: space between '*' and 'and'.
Quoted 12 lines
net/hsr/hsr_framereg.c +12
-0+*/ +if (frame->port_rcv->type ==HSR_PT_MASTER ) +return hsr_register_frame_out (port, frame); + +/* for PRP we should only forward frames from the slave ports +* to the master port +*/ +if (port->type !=HSR_PT_MASTER ) +return 1 ; + + node = frame->node_src; + sequence_nr = frame->sequence_nr;
net/hsr/hsr_framereg.c int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node, · line 559
Quoted 10 lines
net/hsr/hsr_framereg.c +10
-0+ sequence_exp = sequence_nr +1 ; + rcv_port = frame->port_rcv->type; + other_port = + rcv_port ==HSR_PT_SLAVE_A ?HSR_PT_SLAVE_B :HSR_PT_SLAVE_A ; + +spin_lock_bh (&node->seq_out_lock); +if (time_is_before_jiffies (node->time_out[port->type] + +msecs_to_jiffies (HSR_ENTRY_FORGET_TIME )) || + (node->seq_start[rcv_port] == node->seq_expected[rcv_port] && + node->seq_start[other_port] == node->seq_expected[other_port])) {
nit: the line above should be indented to align with the inside of the
parentheses on the preceding line.
(node->seq_start[rcv_port] == node->seq_expected[rcv_port] &&
node->seq_start[other_port] == node->seq_expected[other_port])) {Quoted 34 lines
net/hsr/hsr_framereg.c +31
-0+/* the node hasn't been sending for a while +* or both drop windows are empty, forward the frame +*/ + node->seq_start[rcv_port] = sequence_nr; + }else if (seq_nr_before (sequence_nr, node->seq_expected[other_port]) && +seq_nr_before_or_eq (node->seq_start[other_port], sequence_nr)) { +/* drop the frame, update the drop window for the other port +* and reset our drop window +*/ + node->seq_start[other_port] = sequence_exp; + node->seq_expected[rcv_port] = sequence_exp; + node->seq_start[rcv_port] = node->seq_expected[rcv_port]; +spin_unlock_bh (&node->seq_out_lock); +return 1 ; + } + +/* update the drop window for the port where this frame was received +* and clear the drop window for the other port +*/ + node->seq_start[other_port] = node->seq_expected[other_port]; + node->seq_expected[rcv_port] = sequence_exp; + sequence_diff = sequence_exp - node->seq_start[rcv_port]; +if (sequence_diff >PRP_DROP_WINDOW_LEN ) + node->seq_start[rcv_port] = sequence_exp -PRP_DROP_WINDOW_LEN ; + + node->time_out[port->type] = jiffies; + node->seq_out[port->type] = sequence_nr; +spin_unlock_bh (&node->seq_out_lock); +return 0 ; +} +static struct hsr_port *get_late_port (struct hsr_priv *hsr,struct hsr_node *node) {
Paolo Abeni
maintainerQuoted 17 lines · Jaakko Karrenpalo
net/hsr/hsr_framereg.c +17
-0+int prp_register_frame_out (struct hsr_port *port,struct hsr_frame_info *frame) +{ +enum hsr_port_type other_port; +enum hsr_port_type rcv_port; +struct hsr_node *node; +u16 sequence_diff; +u16 sequence_exp; +u16 sequence_nr; + +/* out-going frames are always in order +*and can be checked the same way as for HSR +*/ +if (frame->port_rcv->type ==HSR_PT_MASTER ) +return hsr_register_frame_out (port, frame); + +/* for PRP we should only forward frames from the slave ports +* to the master port
net/hsr/hsr_framereg.c int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node, · line 553
Quoted 10 lines
net/hsr/hsr_framereg.c +10
-0+*/ +if (port->type !=HSR_PT_MASTER ) +return 1 ; + + node = frame->node_src; + sequence_nr = frame->sequence_nr; + sequence_exp = sequence_nr +1 ; + rcv_port = frame->port_rcv->type; + other_port = + rcv_port ==HSR_PT_SLAVE_A ?HSR_PT_SLAVE_B :HSR_PT_SLAVE_A ;
I'm again surprised checkpatch did not complain WRT the above. Please reformat it as:
other_port = rcv_port == HSR_PT_SLAVE_A ? HSR_PT_SLAVE_B : HSR_PT_SLAVE_A;
Also, please address the other things mentioned by Simon.
Note: you can retain Simon's tag in next iteration.
Thanks,
Paolo