Skip to contentSkip to conversation

net: hsr: Fix PRP duplicate detection

PATCH Superseded Jaakko Karrenpalo 2 participants 4 messages Mar 4, 2025 – Mar 10, 2025 1 message not in the archive

Subsystems (3)

v4 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v4 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
Changes in v4:
- Fix indentation issues missed in previous version

Thanks to Paolo and Simon for reviewing!

 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
index b6fb18469439..2c43776b7c4f 100644
@@ -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
index a4bacf198555..c67c0d35921d 100644
@@ -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
index 993fa950d814..b04948659d84 100644
@@ -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
index 7561845b8bf6..1bc47b17a296 100644
@@ -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
#1 lore raw

PATCH v4 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 Changes in v4:
- Use IS_MODULE for checking if the unit test is compiled as a loadable module

Thanks to Paolo and Simon for reviewing!

 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
index 1b048c17b6c8..fcacdf4f0ffc 100644
@@ -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
index 75df90d3b416..34e581db5c41 100644
@@ -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
index 85991fab7db5..1404f71b9e3f 100644
@@ -588,6 +588,10 @@ int prp_register_frame_out(struct hsr_port *port, struct hsr_frame_info *frame)
 	return 0;
 }
 
+#if IS_MODULE(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
maintainer
#2 lore raw

Re: [PATCH net-next v4 2/2] net: hsr: Add KUnit test for PRP

Quoted 1 line · On Tue, 4 Mar 2025 12:40:30 +0200 Jaakko Karrenpalo wrote:

Add unit tests for the PRP duplicate detection

The patch appears unable to survive an allmodconfig build:
ERROR: modpost: "prp_register_frame_out" [net/hsr/prp_dup_discard_test.ko] undefined!

Guessing that it ends up built in and the function is in a module? Maybe a depends on ?

Signature · 1 line
pw-bot: cr

A message that is not in the archive (sent off-list or not yet received): CAGp9GRaAHRW=a2yT42e+_TACic+keVeNkeuUVRY=n67dhjt3jA@mail.gmail.com

#4 lore raw

Re: [PATCH net-next v4 2/2] net: hsr: Add KUnit test for PRP

Quoted 17 lines · Not Teknology
Quoted 11 lines · On Fri, Mar 7, 2025, 03:52 Jakub Kicinski <[email protected]> wrote:
Quoted 1 line · On Tue, 4 Mar 2025 12:40:30 +0200 Jaakko Karrenpalo wrote:

Add unit tests for the PRP duplicate detection

The patch appears unable to survive an allmodconfig build:
ERROR: modpost: "prp_register_frame_out" [net/hsr/prp_dup_discard_test.ko] undefined!

Guessing that it ends up built in and the function is in a module? Maybe a depends on ?
--
pw-bot: cr

Quoted 5 lines

I used the wrong CONFIG_ define with IS_MODULE(). It should be the one without _MODULE at the end. Not that familiar with those.

I must have messed up something when running the build locally, because I did manage to compile somehow.

/Jaakko

And sorry about the previous mail not being plain text, gmail decided to send it in html-mode

/Jaakko