summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/systemd
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2015-08-28 11:15:01 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-29 13:39:13 +0100
commit995b6d68df28dbe5770a2202de003d2516690e13 (patch)
tree0c98e76f2be226892e0e406e9bb3283a48cb8518 /meta/recipes-core/systemd
parent70b45d62168fb39687ec35c56b11511e5b75acd8 (diff)
downloadpoky-995b6d68df28dbe5770a2202de003d2516690e13.tar.gz
systemd: Increase devices timeout in QEMU machines to avoid failures on serial-getty
Systemd serial-getty is failing because dev-tty ends with timeout, systemd uses a default timeout of 90 secs that it's reached on AB's production environment due to high I/O loads (nfs). When use QEMU is used without KVM support, the machine code is executed by TCG (software code execution) that is dependent on devices layer and causes locks between TCG/Devices increasing the machine code execution time [1]. QEMU don't support configuration of device timeout always uses a default one that is 90 secs, so the next patch increases the device timeout to 240 secs [2] in order give enough time to get devices ready. It ONLY applies on QEMU machines. [YOCTO #8141] [1] http://blog.vmsplice.net/2011/03/qemu-internals-overall-architecture-and.html [2] https://bugzilla.yoctoproject.org/show_bug.cgi?id=8141#c10 (From OE-Core rev: 5196d7bacaef1076c361adaa2867be31759c1b52) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd')
-rw-r--r--meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch31
-rw-r--r--meta/recipes-core/systemd/systemd_219.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch b/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
new file mode 100644
index 0000000000..c7e171152a
--- /dev/null
+++ b/meta/recipes-core/systemd/systemd/qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch
@@ -0,0 +1,31 @@
1Upstream-Status: Inappropriate [Specific case QEMU/AB]
2
3From 7b8c4e0a67a79a75e1bd77df3a452a5497322108 Mon Sep 17 00:00:00 2001
4From: =?UTF-8?q?An=C3=ADbal=20Lim=C3=B3n?= <anibal.limon@linux.intel.com>
5Date: Thu, 27 Aug 2015 17:58:26 -0500
6Subject: [PATCH] core/device.c: Change the default device timeout to 240 sec.
7MIME-Version: 1.0
8Content-Type: text/plain; charset=UTF-8
9Content-Transfer-Encoding: 8bit
10
11Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com>
12---
13 src/core/device.c | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/src/core/device.c b/src/core/device.c
17index e7efcf0..4ed8f08 100644
18--- a/src/core/device.c
19+++ b/src/core/device.c
20@@ -110,7 +110,7 @@ static void device_init(Unit *u) {
21 * indefinitely for plugged in devices, something which cannot
22 * happen for the other units since their operations time out
23 * anyway. */
24- u->job_timeout = u->manager->default_timeout_start_usec;
25+ u->job_timeout = (240 * USEC_PER_SEC);
26
27 u->ignore_on_isolate = true;
28 u->ignore_on_snapshot = true;
29--
301.9.1
31
diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb
index e187cea5e2..232675374b 100644
--- a/meta/recipes-core/systemd/systemd_219.bb
+++ b/meta/recipes-core/systemd/systemd_219.bb
@@ -50,6 +50,7 @@ SRC_URI = "git://github.com/systemd/systemd-stable;branch=v219-stable;protocol=g
50 file://init \ 50 file://init \
51 file://run-ptest \ 51 file://run-ptest \
52 " 52 "
53SRC_URI_append_qemuall = "file://qemuall_io_latency-core-device.c-Change-the-default-device-timeout-to-2.patch"
53 54
54S = "${WORKDIR}/git" 55S = "${WORKDIR}/git"
55 56