summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoy.Li <rongqing.li@windriver.com>2012-07-18 09:41:43 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-18 14:57:27 +0100
commitb68fb414f9661e4cf7c6c62940d44593aa9146df (patch)
treef108c83e0f195f2b597c97e44740ea63856dba35 /meta
parent617835990edf1d7ca4fc8c08993b1b6725f12290 (diff)
downloadpoky-b68fb414f9661e4cf7c6c62940d44593aa9146df.tar.gz
watchdog: fix ping mode failure
[YOCTO #2755] When watchdog works on ping mode, the system will be rebooted since watchdog can not receive the expected ECOREPLY on a setting interval. Ping mode uses a raw socket to send a ECO packet, then uses select() to wait and recvfrom() to receive the ECOREPLY packet, if select() shows the data is ready, and the data is not the expected ECOREPLY, and waiting time is not overdue, it will continue use select() and recvfrom(). Problem is that the raw socket can receive any icmp packets, if we do not set filters, and there are many icmp packets on socket, this program will not find its interested ECOREPLY packet in a special interval, which makes the ping mode fail. Other program is that watchdog sometime can not reach the call of recvfrom to try to receive packets since tv_sec of struct timeval of select parameter is 0. The timeout of select() is the result of ping interval minusing the time of calling gettimeofday spending, when ping interval is 1 second, and the call of gettimeofday() spends several useconds, the tv_sec of struct timeval of select parameter must be 0, at that condition, we should think it is valid of tv_sec of struct timeval of select parameter be 0 (From OE-Core rev: 90f3a90413aa1e08c3206b838dcaee0c1c640dc7) Signed-off-by: Roy.Li <rongqing.li@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/watchdog/files/fix-ping-failure.patch74
-rw-r--r--meta/recipes-extended/watchdog/watchdog_5.11.bb6
2 files changed, 78 insertions, 2 deletions
diff --git a/meta/recipes-extended/watchdog/files/fix-ping-failure.patch b/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
new file mode 100644
index 0000000000..c6ee84345e
--- /dev/null
+++ b/meta/recipes-extended/watchdog/files/fix-ping-failure.patch
@@ -0,0 +1,74 @@
1Fix ping mode failure
2
3Upstream-Status: Pending
4
5When watchdog works on ping mode, the system will be rebooted since
6watchdog can not receive the expected ECOREPLY on a setting interval.
7
8Ping mode uses a raw socket to send a ECO packet, then uses select()
9to wait and recvfrom() to receive the ECOREPLY packet, if select()
10shows the data is ready, and the data is not the expected ECOREPLY,
11and waiting time is not overdue, it will continue use select() and
12recvfrom().
13
14Problem is that the raw socket can receive any icmp packets, if we do
15not set filters, and there are many icmp packets on socket, this
16program will not find its interested ECOREPLY packet in a special
17interval, which makes the ping mode fail.
18
19
20Other program is that watchdog sometime can not reach the call of
21recvfrom to try to receive packets since tv_sec of struct timeval
22of select parameter is 0.
23
24The timeout of select() is the result of ping interval minusing the
25time of calling gettimeofday spending, when ping interval is 1 second,
26and the call of gettimeofday() spends several useconds, the tv_sec of
27struct timeval of select parameter must be 0, at that condition, we
28should it is valid of tv_sec of struct timeval of select parameter be 0
29
30Signed-off-by: Roy.Li <rongqing.li@windriver.com>
31---
32 src/net.c | 2 +-
33 src/watchdog.c | 5 ++++-
34 2 files changed, 5 insertions(+), 2 deletions(-)
35
36--- a/src/net.c
37+++ b/src/net.c
38@@ -118,7 +118,7 @@ int check_net(char *target, int sock_fp,
39 dtimeout.tv_usec -= 1000000;
40 dtimeout.tv_sec++;
41 }
42- if (dtimeout.tv_sec <= 0)
43+ if (dtimeout.tv_sec < 0)
44 break;
45 #if USE_SYSLOG
46 if (verbose && logtick && ticker == 1)
47--- a/src/watchdog.c
48+++ b/src/watchdog.c
49@@ -28,6 +28,7 @@
50 #include <sys/types.h>
51 #include <sys/ioctl.h>
52 #include <linux/oom.h>
53+#include <linux/icmp.h>
54 #include <linux/watchdog.h>
55 #include <string.h>
56
57@@ -567,6 +568,8 @@ int main(int argc, char *const argv[])
58 pid_t child_pid;
59 int oom_adjusted = 0;
60 struct stat s;
61+ struct icmp_filter filt;
62+ filt.data = ~(1<<ICMP_ECHOREPLY);
63
64 #if USE_SYSLOG
65 char *opts = "d:i:n:Ffsvbql:p:t:c:r:m:a:";
66@@ -703,7 +706,7 @@ int main(int argc, char *const argv[])
67 perror(progname);
68 exit(1);
69 }
70-
71+ setsockopt(net->sock_fp, SOL_RAW, ICMP_FILTER, (char*)&filt, sizeof(filt));
72 /* this is necessary for broadcast pings to work */
73 (void) setsockopt(net->sock_fp, SOL_SOCKET, SO_BROADCAST, (char *)&hold, sizeof(hold));
74
diff --git a/meta/recipes-extended/watchdog/watchdog_5.11.bb b/meta/recipes-extended/watchdog/watchdog_5.11.bb
index 3c4f77b141..6a611c99bb 100644
--- a/meta/recipes-extended/watchdog/watchdog_5.11.bb
+++ b/meta/recipes-extended/watchdog/watchdog_5.11.bb
@@ -8,9 +8,11 @@ BUGTRACKER = "http://sourceforge.net/tracker/?group_id=172030&atid=860194"
8LICENSE = "GPL-1.0+" 8LICENSE = "GPL-1.0+"
9LIC_FILES_CHKSUM = "file://COPYING;md5=8a7258c60a71a2f04b67fb01f495889c" 9LIC_FILES_CHKSUM = "file://COPYING;md5=8a7258c60a71a2f04b67fb01f495889c"
10 10
11PR = "r0" 11PR = "r1"
12
13SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog_${PV}.tar.gz \
14 file://fix-ping-failure.patch"
12 15
13SRC_URI = "${SOURCEFORGE_MIRROR}/watchdog/watchdog_${PV}.tar.gz"
14 16
15SRC_URI[md5sum] = "02c764219b3bdb2373091cbd67109eb6" 17SRC_URI[md5sum] = "02c764219b3bdb2373091cbd67109eb6"
16SRC_URI[sha256sum] = "723a7966e0c3d58e3f4df20943a5c9aa1553381f46aa0dbcf832016756e62792" 18SRC_URI[sha256sum] = "723a7966e0c3d58e3f4df20943a5c9aa1553381f46aa0dbcf832016756e62792"