summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorshmilee2020-09-12 10:13:31 +0800
committershmilee2020-09-12 10:13:31 +0800
commit2cd9e9db17cdad91f90f54ebf7d6e6652f1ecbe5 (patch)
tree4cfde3b02de1fb81f90cc010f32c8e21c8dd8593
parent692c44f1dd3870cc830b51c3acd76ff5ab3c37cb (diff)
downloadaur-2cd9e9db17cdad91f90f54ebf7d6e6652f1ecbe5.tar.gz
update to LTS 5.4.64
-rw-r--r--.SRCINFO24
-rw-r--r--broken-sleep-5.4.48+.patch152
2 files changed, 16 insertions, 160 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ba6aef35c19..442ec745aec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
-# Generated by makepkg 5.2.1
-# Fri Jul 3 11:28:29 UTC 2020
+# Generated by makepkg 5.2.2
+# Sat Sep 12 02:10:52 UTC 2020
pkgbase = linux-shmilee
- pkgver = 5.4.50
- pkgrel = 2
+ pkgver = 5.4.64
+ pkgrel = 1
url = https://www.kernel.org/
arch = x86_64
license = GPL2
@@ -16,15 +16,19 @@ pkgbase = linux-shmilee
options = !strip
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz
source = https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.sign
- source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.50.xz
+ source = https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.4.64.xz
source = http://ck.kolivas.org/patches/5.0/5.4/5.4-ck1/patch-5.4-ck1.xz
source = https://raw.githubusercontent.com/dolohow/uksm/150e27c4e7f66e4519c89573305eca8c42091f4d/v5.x/uksm-5.4.patch
source = linux-cjktty-5.4.patch::https://github.com/torvalds/linux/compare/v5.4...Gentoo-zh:5.4-utf8.patch
source = legacy-wireless-ioctls-4.9+.patch
source = sphinx-workaround.patch
+ source = ck-patch-for-5.4.57+.patch
+ source = ck-patch-for-5.4.62+.patch
+ source = fix-ck-broken-sleep2ram-5.4.48+.patch::https://github.com/zen-kernel/zen-kernel/commit/fb7e2cfaf61cf5f9c2336331e73296f455bd2d51.patch
source = uksm-patch-for-5.4.33+.patch
source = linux-cjktty-patch-for-5.4.36+.patch
- source = broken-sleep-5.4.48+.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=f7757368e0f0b3e108088ca7b5b8abda6faa7ebc
+ source = linux-cjktty-patch-for-5.4.54+.patch
+ source = linux-cjktty-patch-for-5.4.62+.patch
source = config
source = 60-linux.hook
source = 90-linux.hook
@@ -33,15 +37,19 @@ pkgbase = linux-shmilee
validpgpkeys = 647F28654894E3BD457199BE38DBBDC86092693E
sha256sums = bf338980b1670bca287f9994b7441c2361907635879169c64ae78364efc5f491
sha256sums = SKIP
- sha256sums = f510a113463889975233c14678664b3f777c744becc671e5416a3f9f21200e48
+ sha256sums = 01ceb94f15a8e1877cc10b85179f2f1e6fafdede793c53e8a0b75771e9769a53
sha256sums = f445eea4d0ec2015a25f1ad625c848f4f2252099795966fa4105e0aa29674c5c
sha256sums = 81d34bf02e771a126af5cb382d44a86dcc759c88b7c89fc7e5b7737731b9130e
sha256sums = 50213f3270499fceb452946252d61f5471571c77baf3dd510fbb00cfa9831c9a
sha256sums = edfb9939840b8710d6ee0385a8e968609eef348295465bb087744c18ed3496e0
sha256sums = b7c814c8183e4645947a6dcc3cbf80431de8a8fd4e895b780f9a5fd92f82cb8e
+ sha256sums = a10a4848c7a9842c0c7760b087ea38a4356dc1a2c2e26334cb0106c25785554f
+ sha256sums = 0334391900f31d6aaedaa68e8917f93262ba3e523f2654774b289e9b18c1a923
+ sha256sums = 961ed94b8d905f1e901cacb08d253c4170af0a25828111b7558d9c874e923558
sha256sums = 6826624f65276927de012f040e77b02231fe6345b9da7c702deacd9372ea001e
sha256sums = 573f1c40951a6ee4cf6b07a6a8a1123b00fcd8bff29843905cf191e08f1d87f2
- sha256sums = 9f9ec5becca27bc7b65b372254bcd4c64069deff1d3b7fa15e6e416595163654
+ sha256sums = 2c9faabb5e09b1f818b051ced3eb90b6c04aa08616952d99eedf328c7c8dda2f
+ sha256sums = 4d511fb62966549b9ea4a1d97769f79e4d66fc141cd0b001e7d286367a038a09
sha256sums = 7ce388e429d8df479a721285e445e116c5ee41e3126a702862e59056460b655e
sha256sums = ae2e95db94ef7176207c690224169594d49445e04249d2499e9d2fbc117a0b21
sha256sums = 75f99f5239e03238f88d1a834c50043ec32b1dc568f2cc291b07d04718483919
diff --git a/broken-sleep-5.4.48+.patch b/broken-sleep-5.4.48+.patch
deleted file mode 100644
index e922de302b1..00000000000
--- a/broken-sleep-5.4.48+.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From f7757368e0f0b3e108088ca7b5b8abda6faa7ebc Mon Sep 17 00:00:00 2001
-From: Peter Zijlstra <peterz@infradead.org>
-Date: Wed, 1 Apr 2020 17:40:33 -0400
-Subject: sched/core: Fix illegal RCU from offline CPUs
-
-[ Upstream commit bf2c59fce4074e55d622089b34be3a6bc95484fb ]
-
-In the CPU-offline process, it calls mmdrop() after idle entry and the
-subsequent call to cpuhp_report_idle_dead(). Once execution passes the
-call to rcu_report_dead(), RCU is ignoring the CPU, which results in
-lockdep complaining when mmdrop() uses RCU from either memcg or
-debugobjects below.
-
-Fix it by cleaning up the active_mm state from BP instead. Every arch
-which has CONFIG_HOTPLUG_CPU should have already called idle_task_exit()
-from AP. The only exception is parisc because it switches them to
-&init_mm unconditionally (see smp_boot_one_cpu() and smp_cpu_init()),
-but the patch will still work there because it calls mmgrab(&init_mm) in
-smp_cpu_init() and then should call mmdrop(&init_mm) in finish_cpu().
-
- WARNING: suspicious RCU usage
- -----------------------------
- kernel/workqueue.c:710 RCU or wq_pool_mutex should be held!
-
- other info that might help us debug this:
-
- RCU used illegally from offline CPU!
- Call Trace:
- dump_stack+0xf4/0x164 (unreliable)
- lockdep_rcu_suspicious+0x140/0x164
- get_work_pool+0x110/0x150
- __queue_work+0x1bc/0xca0
- queue_work_on+0x114/0x120
- css_release+0x9c/0xc0
- percpu_ref_put_many+0x204/0x230
- free_pcp_prepare+0x264/0x570
- free_unref_page+0x38/0xf0
- __mmdrop+0x21c/0x2c0
- idle_task_exit+0x170/0x1b0
- pnv_smp_cpu_kill_self+0x38/0x2e0
- cpu_die+0x48/0x64
- arch_cpu_idle_dead+0x30/0x50
- do_idle+0x2f4/0x470
- cpu_startup_entry+0x38/0x40
- start_secondary+0x7a8/0xa80
- start_secondary_resume+0x10/0x14
-
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Signed-off-by: Qian Cai <cai@lca.pw>
-Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
-Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
-Link: https://lkml.kernel.org/r/20200401214033.8448-1-cai@lca.pw
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- arch/powerpc/platforms/powernv/smp.c | 1 -
- include/linux/sched/mm.h | 2 ++
- kernel/cpu.c | 18 +++++++++++++++++-
- kernel/sched/core.c | 5 +++--
- 4 files changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
-index 13e251699346..b2ba3e95bda7 100644
---- a/arch/powerpc/platforms/powernv/smp.c
-+++ b/arch/powerpc/platforms/powernv/smp.c
-@@ -167,7 +167,6 @@ static void pnv_smp_cpu_kill_self(void)
- /* Standard hot unplug procedure */
-
- idle_task_exit();
-- current->active_mm = NULL; /* for sanity */
- cpu = smp_processor_id();
- DBG("CPU%d offline\n", cpu);
- generic_set_cpu_dead(cpu);
-diff --git a/include/linux/sched/mm.h b/include/linux/sched/mm.h
-index c49257a3b510..a132d875d351 100644
---- a/include/linux/sched/mm.h
-+++ b/include/linux/sched/mm.h
-@@ -49,6 +49,8 @@ static inline void mmdrop(struct mm_struct *mm)
- __mmdrop(mm);
- }
-
-+void mmdrop(struct mm_struct *mm);
-+
- /*
- * This has to be called after a get_task_mm()/mmget_not_zero()
- * followed by taking the mmap_sem for writing before modifying the
-diff --git a/kernel/cpu.c b/kernel/cpu.c
-index d7890c1285bf..7527825ac7da 100644
---- a/kernel/cpu.c
-+++ b/kernel/cpu.c
-@@ -3,6 +3,7 @@
- *
- * This code is licenced under the GPL.
- */
-+#include <linux/sched/mm.h>
- #include <linux/proc_fs.h>
- #include <linux/smp.h>
- #include <linux/init.h>
-@@ -564,6 +565,21 @@ static int bringup_cpu(unsigned int cpu)
- return bringup_wait_for_ap(cpu);
- }
-
-+static int finish_cpu(unsigned int cpu)
-+{
-+ struct task_struct *idle = idle_thread_get(cpu);
-+ struct mm_struct *mm = idle->active_mm;
-+
-+ /*
-+ * idle_task_exit() will have switched to &init_mm, now
-+ * clean up any remaining active_mm state.
-+ */
-+ if (mm != &init_mm)
-+ idle->active_mm = &init_mm;
-+ mmdrop(mm);
-+ return 0;
-+}
-+
- /*
- * Hotplug state machine related functions
- */
-@@ -1434,7 +1450,7 @@ static struct cpuhp_step cpuhp_hp_states[] = {
- [CPUHP_BRINGUP_CPU] = {
- .name = "cpu:bringup",
- .startup.single = bringup_cpu,
-- .teardown.single = NULL,
-+ .teardown.single = finish_cpu,
- .cant_stop = true,
- },
- /* Final state before CPU kills itself */
-diff --git a/kernel/sched/core.c b/kernel/sched/core.c
-index e99d326fa569..4874e1468279 100644
---- a/kernel/sched/core.c
-+++ b/kernel/sched/core.c
-@@ -6177,13 +6177,14 @@ void idle_task_exit(void)
- struct mm_struct *mm = current->active_mm;
-
- BUG_ON(cpu_online(smp_processor_id()));
-+ BUG_ON(current != this_rq()->idle);
-
- if (mm != &init_mm) {
- switch_mm(mm, &init_mm, current);
-- current->active_mm = &init_mm;
- finish_arch_post_lock_switch();
- }
-- mmdrop(mm);
-+
-+ /* finish_cpu(), as ran on the BP, will clean up the active_mm state */
- }
-
- /*
---
-cgit 1.2.3-1.el7
-