RepoMirrors
/
mars
mirror of https://github.com/schoebel/mars
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pre-patches/vanilla-5.8/

This commit is contained in:
Thomas Schoebel-Theuer 2022-10-02 14:31:27 +02:00 committed by Thomas Schoebel-Theuer
parent 35001fddb7
commit 655c9d0422
4 changed files with 516 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pre-patches/vanilla-5.8/0001-mars-SPECIAL-for-in-tree-build.patch Normal file
View File

@ -0,0 +1,36 @@
From c5961a6b73ab2fc073348d93d6d2093c59d7bdde Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Fri, 28 Jun 2013 11:03:14 +0200
Subject: [PATCH] mars: SPECIAL for in-tree build
---
block/Kconfig | 2 ++
block/Makefile | 2 ++
2 files changed, 4 insertions(+)
diff --git a/block/Kconfig b/block/Kconfig
index 9357d7302398..65d3b4e2f671 100644
--- a/block/Kconfig
+++ b/block/Kconfig
@@ -209,6 +209,8 @@ source "block/partitions/Kconfig"
endmenu
+source "block/mars/kernel/Kconfig.v5.4"
+
endif # BLOCK
config BLOCK_COMPAT
diff --git a/block/Makefile b/block/Makefile
index 78719169fb2a..a863f1912ddb 100644
--- a/block/Makefile
+++ b/block/Makefile
@@ -38,3 +38,5 @@ obj-$(CONFIG_BLK_SED_OPAL) += sed-opal.o
obj-$(CONFIG_BLK_PM) += blk-pm.o
obj-$(CONFIG_BLK_INLINE_ENCRYPTION) += keyslot-manager.o blk-crypto.o
obj-$(CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK) += blk-crypto-fallback.o
+
+obj-$(CONFIG_MARS) += mars/kernel/
--
2.35.3

327
pre-patches/vanilla-5.8/0001-mars-v3-minimum-pre-patch-for-mars-v3a.patch Normal file
View File

@ -0,0 +1,327 @@
From af6e2bcafcadf2ac64e2212f1aa0ce7fe3e64821 Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <mars@box>
Date: Sun, 2 Oct 2022 13:24:57 +0200
Subject: [PATCH] mars: v3 minimum pre-patch for mars v3a
---
fs/aio.c | 47 ++++++++++++++++++++++++++++++--------
fs/namei.c | 9 +++++++-
fs/open.c | 2 ++
fs/utimes.c | 2 ++
include/linux/aio.h | 1 +
include/linux/syscalls.h | 19 +++++++++++++++
include/uapi/linux/major.h | 1 +
mm/page_alloc.c | 2 ++
8 files changed, 73 insertions(+), 10 deletions(-)
diff --git a/fs/aio.c b/fs/aio.c
index 91e7cc4a9f17..6dc7f71e5961 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -222,6 +222,7 @@ struct aio_kiocb {
static DEFINE_SPINLOCK(aio_nr_lock);
unsigned long aio_nr; /* current system wide number of aio requests */
unsigned long aio_max_nr = 0x10000; /* system wide maximum number of aio requests */
+EXPORT_SYMBOL_GPL(aio_max_nr);
/*----end sysctl variables---*/
static struct kmem_cache *kiocb_cachep;
@@ -1309,7 +1310,7 @@ static long read_events(struct kioctx *ctx, long min_nr, long nr,
* pointer is passed for ctxp. Will fail with -ENOSYS if not
* implemented.
*/
-SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp)
+long ksys_io_setup(unsigned nr_events, aio_context_t *ctxp)
{
struct kioctx *ioctx = NULL;
unsigned long ctx;
@@ -1338,6 +1339,12 @@ SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp)
out:
return ret;
}
+EXPORT_SYMBOL_GPL(ksys_io_setup);
+
+SYSCALL_DEFINE2(io_setup, unsigned, nr_events, aio_context_t __user *, ctxp)
+{
+ return ksys_io_setup(nr_events, ctxp);
+}
#ifdef CONFIG_COMPAT
COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_events, u32 __user *, ctx32p)
@@ -1378,7 +1385,7 @@ COMPAT_SYSCALL_DEFINE2(io_setup, unsigned, nr_events, u32 __user *, ctx32p)
* implemented. May fail with -EINVAL if the context pointed to
* is invalid.
*/
-SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
+long ksys_io_destroy(aio_context_t ctx)
{
struct kioctx *ioctx = lookup_ioctx(ctx);
if (likely(NULL != ioctx)) {
@@ -1407,6 +1414,12 @@ SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
pr_debug("EINVAL: invalid context id\n");
return -EINVAL;
}
+EXPORT_SYMBOL_GPL(ksys_io_destroy);
+
+SYSCALL_DEFINE1(io_destroy, aio_context_t, ctx)
+{
+ return ksys_io_destroy(ctx);
+}
static void aio_remove_iocb(struct aio_kiocb *iocb)
{
@@ -1911,8 +1924,8 @@ static int io_submit_one(struct kioctx *ctx, struct iocb __user *user_iocb,
* are available to queue any iocbs. Will return 0 if nr is 0. Will
* fail with -ENOSYS if not implemented.
*/
-SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,
- struct iocb __user * __user *, iocbpp)
+long ksys_io_submit(aio_context_t ctx_id, long nr,
+ struct iocb __user *__user *iocbpp)
{
struct kioctx *ctx;
long ret = 0;
@@ -1951,6 +1964,13 @@ SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,
percpu_ref_put(&ctx->users);
return i ? i : ret;
}
+EXPORT_SYMBOL_GPL(ksys_io_submit);
+
+SYSCALL_DEFINE3(io_submit, aio_context_t, ctx_id, long, nr,
+ struct iocb __user * __user *, iocbpp)
+{
+ return ksys_io_submit(ctx_id, nr, iocbpp);
+}
#ifdef CONFIG_COMPAT
COMPAT_SYSCALL_DEFINE3(io_submit, compat_aio_context_t, ctx_id,
@@ -2081,11 +2101,11 @@ static long do_io_getevents(aio_context_t ctx_id,
*/
#ifdef CONFIG_64BIT
-SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
- long, min_nr,
- long, nr,
- struct io_event __user *, events,
- struct __kernel_timespec __user *, timeout)
+int ksys_io_getevents(aio_context_t ctx_id,
+ long min_nr,
+ long nr,
+ struct io_event __user * events,
+ struct __kernel_timespec __user * timeout)
{
struct timespec64 ts;
int ret;
@@ -2098,7 +2118,16 @@ SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
ret = -EINTR;
return ret;
}
+EXPORT_SYMBOL_GPL(ksys_io_getevents);
+SYSCALL_DEFINE5(io_getevents, aio_context_t, ctx_id,
+ long, min_nr,
+ long, nr,
+ struct io_event __user *, events,
+ struct __kernel_timespec __user *, timeout)
+{
+ return ksys_io_getevents(ctx_id, min_nr, nr, events, timeout);
+}
#endif
struct __aio_sigset {
diff --git a/fs/namei.c b/fs/namei.c
index 72d4219c93ac..dc42ffd7ddae 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -208,6 +208,7 @@ getname(const char __user * filename)
{
return getname_flags(filename, 0, NULL);
}
+EXPORT_SYMBOL(getname); /* required for ksys_unlink() */
struct filename *
getname_kernel(const char * filename)
@@ -244,6 +245,7 @@ getname_kernel(const char * filename)
return result;
}
+EXPORT_SYMBOL_GPL(getname_kernel);
void putname(struct filename *name)
{
@@ -3669,6 +3671,7 @@ long do_mkdirat(int dfd, const char __user *pathname, umode_t mode)
}
return error;
}
+EXPORT_SYMBOL(do_mkdirat); /* required for ksys_mkdir() */
SYSCALL_DEFINE3(mkdirat, int, dfd, const char __user *, pathname, umode_t, mode)
{
@@ -3778,6 +3781,7 @@ long do_rmdir(int dfd, const char __user *pathname)
}
return error;
}
+EXPORT_SYMBOL(do_rmdir); /* required for ksys_rmdir() */
SYSCALL_DEFINE1(rmdir, const char __user *, pathname)
{
@@ -3919,6 +3923,7 @@ long do_unlinkat(int dfd, struct filename *name)
error = -ENOTDIR;
goto exit2;
}
+EXPORT_SYMBOL(do_unlinkat); /* required for ksys_unlink() */
SYSCALL_DEFINE3(unlinkat, int, dfd, const char __user *, pathname, int, flag)
{
@@ -3987,6 +3992,7 @@ long do_symlinkat(const char __user *oldname, int newdfd,
putname(from);
return error;
}
+EXPORT_SYMBOL(do_symlinkat); /* required for ksys_symlink() */
SYSCALL_DEFINE3(symlinkat, const char __user *, oldname,
int, newdfd, const char __user *, newname)
@@ -4339,7 +4345,7 @@ int vfs_rename(struct inode *old_dir, struct dentry *old_dentry,
}
EXPORT_SYMBOL(vfs_rename);
-static int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
+int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
const char __user *newname, unsigned int flags)
{
struct dentry *old_dentry, *new_dentry;
@@ -4478,6 +4484,7 @@ static int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
exit:
return error;
}
+EXPORT_SYMBOL(do_renameat2);
SYSCALL_DEFINE5(renameat2, int, olddfd, const char __user *, oldname,
int, newdfd, const char __user *, newname, unsigned int, flags)
diff --git a/fs/open.c b/fs/open.c
index 6cd48a61cda3..4c454a9c3072 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -637,6 +637,7 @@ int do_fchmodat(int dfd, const char __user *filename, umode_t mode)
}
return error;
}
+EXPORT_SYMBOL(do_fchmodat);
SYSCALL_DEFINE3(fchmodat, int, dfd, const char __user *, filename,
umode_t, mode)
@@ -722,6 +723,7 @@ int do_fchownat(int dfd, const char __user *filename, uid_t user, gid_t group,
out:
return error;
}
+EXPORT_SYMBOL(do_fchownat); /* required for ksys_chown() */
SYSCALL_DEFINE5(fchownat, int, dfd, const char __user *, filename, uid_t, user,
gid_t, group, int, flag)
diff --git a/fs/utimes.c b/fs/utimes.c
index b7b927502d6e..3e23f06ef2b0 100644
--- a/fs/utimes.c
+++ b/fs/utimes.c
@@ -1,4 +1,5 @@
// SPDX-License-Identifier: GPL-2.0
+#include <linux/module.h>
#include <linux/file.h>
#include <linux/mount.h>
#include <linux/namei.h>
@@ -135,6 +136,7 @@ long do_utimes(int dfd, const char __user *filename, struct timespec64 *times,
out:
return error;
}
+EXPORT_SYMBOL(do_utimes);
SYSCALL_DEFINE4(utimensat, int, dfd, const char __user *, filename,
struct __kernel_timespec __user *, utimes, int, flags)
diff --git a/include/linux/aio.h b/include/linux/aio.h
index b83e68dd006f..62061e975682 100644
--- a/include/linux/aio.h
+++ b/include/linux/aio.h
@@ -12,6 +12,7 @@ typedef int (kiocb_cancel_fn)(struct kiocb *);
/* prototypes */
#ifdef CONFIG_AIO
+#define HAS_AIO_MAX
extern void exit_aio(struct mm_struct *mm);
void kiocb_set_cancel_fn(struct kiocb *req, kiocb_cancel_fn *cancel);
#else
diff --git a/include/linux/syscalls.h b/include/linux/syscalls.h
index b951a87da987..68478d33c522 100644
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
@@ -1235,6 +1235,15 @@ asmlinkage long sys_ni_syscall(void);
* Instead, use one of the functions which work equivalently, such as
* the ksys_xyzyyz() functions prototyped below.
*/
+long ksys_io_submit(aio_context_t ctx_id, long nr,
+ struct iocb __user *__user *iocbpp);
+int ksys_io_getevents(aio_context_t ctx_id,
+ long min_nr,
+ long nr,
+ struct io_event __user * events,
+ struct __kernel_timespec __user * timeout);
+long ksys_io_setup(unsigned nr_events, aio_context_t *ctxp);
+long ksys_io_destroy(aio_context_t ctx);
int ksys_umount(char __user *name, int flags);
int ksys_dup(unsigned int fildes);
@@ -1405,6 +1414,9 @@ static inline unsigned int ksys_personality(unsigned int personality)
return old;
}
+extern int do_renameat2(int olddfd, const char __user *oldname, int newdfd,
+ const char __user *newname, unsigned int flags);
+
/* for __ARCH_WANT_SYS_IPC */
long ksys_semtimedop(int semid, struct sembuf __user *tsops,
unsigned int nsops,
@@ -1424,4 +1436,11 @@ long compat_ksys_semtimedop(int semid, struct sembuf __user *tsems,
unsigned int nsops,
const struct old_timespec32 __user *timeout);
+/* Out of tree:
+ * Report the MARS prepatch version, starting with V3
+ */
+#define MARS_HAS_PREPATCH_V3
+/* The following is an additional subversion info */
+#define MARS_HAS_PREPATCH_V3a
+
#endif
diff --git a/include/uapi/linux/major.h b/include/uapi/linux/major.h
index 7e5fa8e15c43..edfbce01e4ac 100644
--- a/include/uapi/linux/major.h
+++ b/include/uapi/linux/major.h
@@ -149,6 +149,7 @@
#define UNIX98_PTY_SLAVE_MAJOR (UNIX98_PTY_MASTER_MAJOR+UNIX98_PTY_MAJOR_COUNT)
#define DRBD_MAJOR 147
+#define MARS_MAJOR 148
#define RTF_MAJOR 150
#define RAW_MAJOR 162
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 8cc774340d49..62ecc207912a 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -316,6 +316,7 @@ compound_page_dtor * const compound_page_dtors[NR_COMPOUND_DTORS] = {
};
int min_free_kbytes = 1024;
+EXPORT_SYMBOL(min_free_kbytes);
int user_min_free_kbytes = -1;
#ifdef CONFIG_DISCONTIGMEM
/*
@@ -7817,6 +7818,7 @@ static void __setup_per_zone_wmarks(void)
/* update totalreserve_pages */
calculate_totalreserve_pages();
}
+EXPORT_SYMBOL(setup_per_zone_wmarks);
/**
* setup_per_zone_wmarks - called when min_free_kbytes changes
--
2.35.3

49
pre-patches/vanilla-5.8/0001-objtool-Don-t-fail-on-missing-symbol-table.patch Normal file
View File

@ -0,0 +1,49 @@
From 91b6847ca89d9e7e38770f56c13b80c8f9f810b2 Mon Sep 17 00:00:00 2001
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Thu, 14 Jan 2021 16:14:01 -0600
Subject: [PATCH 1/4] objtool: Don't fail on missing symbol table
[ Upstream commit 1d489151e9f9d1647110277ff77282fe4d96d09b ]
Thanks to a recent binutils change which doesn't generate unused
symbols, it's now possible for thunk_64.o be completely empty without
CONFIG_PREEMPTION: no text, no data, no symbols.
We could edit the Makefile to only build that file when
CONFIG_PREEMPTION is enabled, but that will likely create confusion
if/when the thunks end up getting used by some other code again.
Just ignore it and move on.
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Reviewed-by: Miroslav Benes <mbenes@suse.cz>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Link: https://github.com/ClangBuiltLinux/linux/issues/1254
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
tools/objtool/elf.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/objtool/elf.c b/tools/objtool/elf.c
index 26d11d821941..d68d3efabff4 100644
--- a/tools/objtool/elf.c
+++ b/tools/objtool/elf.c
@@ -354,8 +354,11 @@ static int read_symbols(struct elf *elf)
symtab = find_section_by_name(elf, ".symtab");
if (!symtab) {
- WARN("missing symbol table");
- return -1;
+ /*
+ * A missing symbol table is actually possible if it's an empty
+ * .o file. This can happen for thunk_64.o.
+ */
+ return 0;
}
symtab_shndx = find_section_by_name(elf, ".symtab_shndx");
--
2.35.3

104
pre-patches/vanilla-5.8/0001-sched-wait-fix-endless-kthread-loop-at-timeout.patch Normal file
View File

@ -0,0 +1,104 @@
From ffa9a3c42d05ec2af33756bfabea7717a2299fef Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Fri, 8 Mar 2019 08:21:15 +0100
Subject: [PATCH] sched/wait: fix endless kthread loop at timeout
Scenario, possible since kernel 4.11.x and later:
1) kthread calls a waiting function with a timeout, and blocks.
2) kthread_stop() is called by somebody else.
3) kthread makes some progress, but neither finishes nor timeouts.
4) Nothing happens => normally the timeout would be reached by the kthread.
However, the condition in wait_woken() now prevents the call to
schedule_timeout().
As a consequence, the timeout value will never be decreased, resulting
in an endless loop.
This fix ensures the following semantics: kthread_should_stop() is treated
as equivalent to a timeout. This is beneficial because most users do not
want to wait for the timeout, but to stop the kthread as soon as possible.
It appears that this semantics was probably intended (otherwise the check
is_kthread_should_stop() would not make much sense), but just went wrong
due to the bug.
Here is an example, triggered by external kernel module MARS on a
production kernel. However, the problem can be also triggered by other
kthreads and on newer kernels, and also in very different scenarios,
not only during tcp_revcmsg().
In the following example, the kthread simply waits for network packets
to arrive, but in the test scenario the network had been blocked
underneath by a firewall rule in order to trigger the bug:
Mar 08 07:40:08 icpu5133 kernel: watchdog: BUG: soft lockup - CPU#29 stuck for 23s! [mars_receiver8.:8139]
Mar 08 07:40:08 icpu5133 kernel: Modules linked in: mars(-) ip6table_mangle ip6table_raw iptable_raw ip_set_bitmap_port xt_DSCP xt_multiport ip_set_hash_ip xt_own
Mar 08 07:40:08 icpu5133 kernel: irq event stamp: 300719885
Mar 08 07:40:08 icpu5133 kernel: hardirqs last enabled at (300719883): [<ffffffff81bb96d0>] _raw_spin_unlock_irqrestore+0x3d/0x4f
Mar 08 07:40:08 icpu5133 kernel: hardirqs last disabled at (300719885): [<ffffffff81c01a02>] apic_timer_interrupt+0x82/0x90
Mar 08 07:40:08 icpu5133 kernel: softirqs last enabled at (300719878): [<ffffffff819de0af>] lock_sock_nested+0x50/0x98
Mar 08 07:40:08 icpu5133 kernel: softirqs last disabled at (300719884): [<ffffffff819df5f2>] release_sock+0x16/0xda
Mar 08 07:40:08 icpu5133 kernel: CPU: 29 PID: 8139 Comm: mars_receiver8. Not tainted 4.14.104+ #121
Mar 08 07:40:08 icpu5133 kernel: Hardware name: Dell Inc. PowerEdge R630/02C2CP, BIOS 2.5.5 08/16/2017
Mar 08 07:40:08 icpu5133 kernel: task: ffff88bf82764fc0 task.stack: ffffc90012430000
Mar 08 07:40:08 icpu5133 kernel: RIP: 0010:arch_local_irq_restore+0x2/0x8
Mar 08 07:40:08 icpu5133 kernel: RSP: 0018:ffffc90012433b78 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff10
Mar 08 07:40:08 icpu5133 kernel: RAX: 0000000000000000 RBX: ffff88bf82764fc0 RCX: 00000000fec792b4
Mar 08 07:40:08 icpu5133 kernel: RDX: 00000000c18b50d3 RSI: 0000000000000000 RDI: 0000000000000246
Mar 08 07:40:08 icpu5133 kernel: RBP: 0000000000000001 R08: 0000000000000001 R09: 0000000000000000
Mar 08 07:40:08 icpu5133 kernel: R10: ffffc90012433b08 R11: ffffc90012433ba8 R12: 0000000000000246
Mar 08 07:40:08 icpu5133 kernel: R13: ffffffff819df735 R14: 0000000000000001 R15: ffff88bf82765818
Mar 08 07:40:08 icpu5133 kernel: FS: 0000000000000000(0000) GS:ffff88c05fb80000(0000) knlGS:0000000000000000
Mar 08 07:40:08 icpu5133 kernel: CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
Mar 08 07:40:08 icpu5133 kernel: CR2: 000055abd12eb688 CR3: 000000000241e006 CR4: 00000000001606e0
Mar 08 07:40:08 icpu5133 kernel: Call Trace:
Mar 08 07:40:08 icpu5133 kernel: lock_release+0x32f/0x33b
Mar 08 07:40:08 icpu5133 kernel: release_sock+0x90/0xda
Mar 08 07:40:08 icpu5133 kernel: sk_wait_data+0x7f/0x13f
Mar 08 07:40:08 icpu5133 kernel: ? prepare_to_wait_exclusive+0xc1/0xc1
Mar 08 07:40:08 icpu5133 kernel: tcp_recvmsg+0x4e6/0x91a
Mar 08 07:40:08 icpu5133 kernel: ? flush_signals+0x2b/0x6a
Mar 08 07:40:08 icpu5133 kernel: ? lock_acquire+0x20a/0x25a
Mar 08 07:40:08 icpu5133 kernel: inet_recvmsg+0x8d/0xc0
Mar 08 07:40:08 icpu5133 kernel: kernel_recvmsg+0x8f/0xaa
Mar 08 07:40:08 icpu5133 kernel: ? ___might_sleep+0xf2/0x256
Mar 08 07:40:08 icpu5133 kernel: mars_recv_raw+0x22a/0x4da [mars]
Mar 08 07:40:08 icpu5133 kernel: desc_recv_struct+0x40/0x375 [mars]
Mar 08 07:40:08 icpu5133 kernel: receiver_thread+0xa2/0x61a [mars]
Mar 08 07:40:08 icpu5133 kernel: ? _hash_insert+0x160/0x160 [mars]
Mar 08 07:40:08 icpu5133 kernel: ? kthread+0x1a6/0x1ae
Mar 08 07:40:08 icpu5133 kernel: kthread+0x1a6/0x1ae
Mar 08 07:40:08 icpu5133 kernel: ? __list_del_entry+0x60/0x60
Mar 08 07:40:08 icpu5133 kernel: ret_from_fork+0x3a/0x50
Mar 08 07:40:08 icpu5133 kernel: Code: ee e8 c5 17 00 00 48 85 db 75 0e 31 f6 48 c7 c7 c0 5f 53 82 e8 68 b9 58 00 48 89 5b 58 58 5b 5d c3 9c 58 0f 1f 44 00 00 c3
Signed-off-by: Thomas Schoebel-Theuer <tst@1und1.de>
---
kernel/sched/wait.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/kernel/sched/wait.c b/kernel/sched/wait.c
index c1e566a114ca..08f121154a91 100644
--- a/kernel/sched/wait.c
+++ b/kernel/sched/wait.c
@@ -412,8 +412,15 @@ long wait_woken(struct wait_queue_entry *wq_entry, unsigned mode, long timeout)
* or woken_wake_function() sees our store to current->state.
*/
set_current_state(mode); /* A */
- if (!(wq_entry->flags & WQ_FLAG_WOKEN) && !is_kthread_should_stop())
- timeout = schedule_timeout(timeout);
+ if (!(wq_entry->flags & WQ_FLAG_WOKEN)) {
+ /*
+ * Treat kthread stopping as equivalent to a timeout.
+ */
+ if (is_kthread_should_stop())
+ timeout = 0;
+ else
+ timeout = schedule_timeout(timeout);
+ }
__set_current_state(TASK_RUNNING);
/*
--
2.26.2