diff options
| author | Arkadiusz Miśkiewicz | 2016-02-17 21:36:28 (GMT) |
|---|---|---|
| committer | Arkadiusz Miśkiewicz | 2016-02-17 21:36:28 (GMT) |
| commit | 54c4f23e2330f437b0385656fc5e89041f153f26 (patch) | |
| tree | c8a59b2b3d08adf837c7efc2a84251066f7093f8 | |
| parent | f229ffbeaa672478a86f9c15beec3ef4e0b242eb (diff) | |
| download | kernel-54c4f23e2330f437b0385656fc5e89041f153f26.zip kernel-54c4f23e2330f437b0385656fc5e89041f153f26.tar.gz | |
- up to 4.4.2auto/th/kernel-nopae-4.4.2-1auto/th/kernel-4.4.2-1
| -rw-r--r-- | kernel-small_fixes.patch | 47 | ||||
| -rw-r--r-- | kernel.spec | 6 |
2 files changed, 3 insertions, 50 deletions
diff --git a/kernel-small_fixes.patch b/kernel-small_fixes.patch index c13521f..92cfb5e 100644 --- a/kernel-small_fixes.patch +++ b/kernel-small_fixes.patch @@ -398,50 +398,3 @@ index aa67339..4f18fd9 100644 if (tout && tout <= 20) -- 2.5.0 -From: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> -Subject: mm, vmstat: fix wrong WQ sleep when memory reclaim doesn't make any progress - -Jan Stancek has reported that system occasionally hanging after "oom01" -testcase from LTP triggers OOM. Guessing from a result that there is a -kworker thread doing memory allocation and the values between "Node 0 -Normal free:" and "Node 0 Normal:" differs when hanging, vmstat is not -up-to-date for some reason. - -According to commit 373ccbe59270 ("mm, vmstat: allow WQ concurrency to -discover memory reclaim doesn't make any progress"), it meant to force the -kworker thread to take a short sleep, but it by error used -schedule_timeout(1). We missed that schedule_timeout() in state -TASK_RUNNING doesn't do anything. - -Fix it by using schedule_timeout_uninterruptible(1) which forces the -kworker thread to take a short sleep in order to make sure that vmstat is -up-to-date. - -Fixes: 373ccbe59270 ("mm, vmstat: allow WQ concurrency to discover memory reclaim doesn't make any progress") -Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> -Reported-by: Jan Stancek <jstancek@redhat.com> -Acked-by: Michal Hocko <mhocko@suse.com> -Cc: Tejun Heo <tj@kernel.org> -Cc: Cristopher Lameter <clameter@sgi.com> -Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com> -Cc: Arkadiusz Miskiewicz <arekm@maven.pl> -Cc: <stable@vger.kernel.org> -Signed-off-by: Andrew Morton <akpm@linux-foundation.org> ---- - - mm/backing-dev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff -puN mm/backing-dev.c~mm-vmstat-fix-wrong-wq-sleep-when-memory-reclaim-doesnt-make-any-progress mm/backing-dev.c ---- a/mm/backing-dev.c~mm-vmstat-fix-wrong-wq-sleep-when-memory-reclaim-doesnt-make-any-progress -+++ a/mm/backing-dev.c -@@ -989,7 +989,7 @@ long wait_iff_congested(struct zone *zon - * here rather than calling cond_resched(). - */ - if (current->flags & PF_WQ_WORKER) -- schedule_timeout(1); -+ schedule_timeout_uninterruptible(1); - else - cond_resched(); - -_ diff --git a/kernel.spec b/kernel.spec index 98cddfe..b4bd6d4 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,9 +69,9 @@ %define have_pcmcia 0 %endif -%define rel 2 +%define rel 1 %define basever 4.4 -%define postver .1 +%define postver .2 # define this to '-%{basever}' for longterm branch %define versuffix %{nil} @@ -120,7 +120,7 @@ Source0: http://www.kernel.org/pub/linux/kernel/v4.x/linux-%{basever}.tar.xz # Source0-md5: 9a78fa2eb6c68ca5a40ed5af08142599 %if "%{postver}" != ".0" Patch0: http://www.kernel.org/pub/linux/kernel/v4.x/patch-%{version}.xz -# Patch0-md5: d9e951895c8c249f0bf52d85f3e63bce +# Patch0-md5: abdfe599a4ea827f9975cf0631148e70 %endif Source1: kernel.sysconfig |