From 99ab1dd812cd47181557ae89adcce4a153bb42e6 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 23 2023 08:09:12 +0000
Subject: import linuxptp-3.1.1-3.el8_7.1


---

diff --git a/SOURCES/linuxptp-faultrearm.patch b/SOURCES/linuxptp-faultrearm.patch
new file mode 100644
index 0000000..b298f79
--- /dev/null
+++ b/SOURCES/linuxptp-faultrearm.patch
@@ -0,0 +1,52 @@
+commit 134dc3c4655fcd9f314a5e56cd50db2f87366f5a
+Author: davidjm via Linuxptp-devel <linuxptp-devel@lists.sourceforge.net>
+Date:   Wed Nov 23 15:50:30 2022 -0800
+
+    Don't re-arm fault clearing timer on unrelated netlink events
+    
+    Set the timer only when an event causes the port to transition to the
+    FAULTY state, rather than potentially re-arming the timeout when an
+    event occurs while the port was already FAULTY.
+    
+    Concretely this occurs when a port is in fault, perhaps due to a
+    single time out while polling for tx-timestamp. If any other port in the
+    system (including unrelated ones ptp4l does not even know about) cause
+    netlink messages to be sent. As it stands, clock_poll() will note that
+    the port is in fault (from before, not due to the current event) and
+    reset the timeout to its original value.
+    
+    If such unrelated netlink messages arrive at a regular enough cadence
+    the timeout may be repeatedly reset, not trigger on time (if at all) and
+    the port may not get a chance to clear its fault, perhaps indefinitely.
+    
+    Signed-off-by: David Mirabito <davidjm@arista.com>
+
+diff --git a/clock.c b/clock.c
+index eea7983..451473e 100644
+--- a/clock.c
++++ b/clock.c
+@@ -1586,6 +1586,7 @@ void clock_set_sde(struct clock *c, int sde)
+ int clock_poll(struct clock *c)
+ {
+ 	int cnt, i;
++	enum port_state prior_state;
+ 	enum fsm_event event;
+ 	struct pollfd *cur;
+ 	struct port *p;
+@@ -1609,6 +1610,7 @@ int clock_poll(struct clock *c)
+ 		/* Let the ports handle their events. */
+ 		for (i = 0; i < N_POLLFD; i++) {
+ 			if (cur[i].revents & (POLLIN|POLLPRI|POLLERR)) {
++				prior_state = port_state(p);
+ 				if (cur[i].revents & POLLERR) {
+ 					pr_err("port %d: unexpected socket error",
+ 					       port_number(p));
+@@ -1624,7 +1626,7 @@ int clock_poll(struct clock *c)
+ 				}
+ 				port_dispatch(p, event, 0);
+ 				/* Clear any fault after a little while. */
+-				if (PS_FAULTY == port_state(p)) {
++				if ((PS_FAULTY == port_state(p)) && (prior_state != PS_FAULTY)) {
+ 					clock_fault_timeout(p, 1);
+ 					break;
+ 				}
diff --git a/SPECS/linuxptp.spec b/SPECS/linuxptp.spec
index cdfe382..2c5a704 100644
--- a/SPECS/linuxptp.spec
+++ b/SPECS/linuxptp.spec
@@ -4,7 +4,7 @@
 
 Name:		linuxptp
 Version:	3.1.1
-Release:	3%{?dist}
+Release:	3%{?dist}.1
 Summary:	PTP implementation for Linux
 
 Group:		System Environment/Base
@@ -41,6 +41,8 @@ Patch9:		linuxptp-zerolength.patch
 Patch10:	linuxptp-clockcheck.patch
 # handle PHC read failing with EBUSY in phc2sys
 Patch11:	linuxptp-phcerr.patch
+# don't re-arm fault clearing timer on unrelated netlink events
+Patch17:	linuxptp-faultrearm.patch
 
 BuildRequires:	kernel-headers > 4.18.0-87
 BuildRequires:	systemd
@@ -66,6 +68,7 @@ Supporting legacy APIs and other platforms is not a goal.
 %patch9 -p1 -b .zerolength
 %patch10 -p1 -b .clockcheck
 %patch11 -p1 -b .phcerr
+%patch17 -p1 -b .faultrearm
 mv linuxptp-testsuite-%{testsuite_ver}* testsuite
 mv clknetsim-%{clknetsim_ver}* testsuite/clknetsim
 
@@ -129,6 +132,9 @@ PATH=..:$PATH ./run
 %{_mandir}/man8/*.8*
 
 %changelog
+* Tue Mar 21 2023 Miroslav Lichvar <mlichvar@redhat.com> 3.1.1-3.el8_7.1
+- don't re-arm fault clearing timer on unrelated netlink events (#2180038)
+
 * Wed Jun 29 2022 Miroslav Lichvar <mlichvar@redhat.com> 3.1.1-3
 - handle PHC read failing with EBUSY in phc2sys (#2079129)