Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 1 | From c7a4efb8bccb52e1714c151929c23e12bde59b82 Mon Sep 17 00:00:00 2001 |
| 2 | From: Chen Qi <Qi.Chen@windriver.com> |
| 3 | Date: Wed, 4 Jul 2018 15:00:44 +0800 |
| 4 | Subject: [PATCH 17/24] Do not disable buffering when writing to oom_score_adj |
| 5 | |
| 6 | On musl, disabling buffering when writing to oom_score_adj will |
| 7 | cause the following error. |
| 8 | |
| 9 | Failed to adjust OOM setting: Invalid argument |
| 10 | |
| 11 | This error appears for systemd-udevd.service and dbus.service. |
| 12 | This is because kernel receives '-' instead of the whole '-900' |
| 13 | if buffering is disabled. |
| 14 | |
| 15 | This is libc implementation specific, as glibc does not have this issue. |
| 16 | |
| 17 | Upstream-Status: Inappropriate [musl specific] |
| 18 | |
| 19 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 20 | [rebased for systemd 243] |
| 21 | Signed-off-by: Scott Murray <scott.murray@konsulko.com> |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 22 | --- |
| 23 | src/basic/process-util.c | 2 +- |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 25 | |
| 26 | diff --git a/src/basic/process-util.c b/src/basic/process-util.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 27 | index b1c08fcade..0a7a1f7d89 100644 |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 28 | --- a/src/basic/process-util.c |
| 29 | +++ b/src/basic/process-util.c |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 30 | @@ -1474,7 +1474,7 @@ int set_oom_score_adjust(int value) { |
Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame] | 31 | sprintf(t, "%i", value); |
| 32 | |
| 33 | return write_string_file("/proc/self/oom_score_adj", t, |
| 34 | - WRITE_STRING_FILE_VERIFY_ON_FAILURE|WRITE_STRING_FILE_DISABLE_BUFFER); |
| 35 | + WRITE_STRING_FILE_VERIFY_ON_FAILURE); |
| 36 | } |
| 37 | |
Brad Bishop | a34c030 | 2019-09-23 22:34:48 -0400 | [diff] [blame^] | 38 | static const char *const ioprio_class_table[] = { |