summaryrefslogtreecommitdiff
path: root/target/linux/patches/4.9.32/patch-realtime
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2017-06-23 16:33:53 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2017-06-23 16:34:27 +0200
commit6250a3724618bbb13a47e16fe6a2e5ad860b8433 (patch)
tree655a5c4c39d59d52f08936ca0456ac0388acaf59 /target/linux/patches/4.9.32/patch-realtime
parent87f42711b67cac755a718991d61620d758c3679d (diff)
linux: update rt-patch for 4.4/4.9/rpi-git, update 4.11.x kernel
Diffstat (limited to 'target/linux/patches/4.9.32/patch-realtime')
-rw-r--r--target/linux/patches/4.9.32/patch-realtime8048
1 files changed, 4032 insertions, 4016 deletions
diff --git a/target/linux/patches/4.9.32/patch-realtime b/target/linux/patches/4.9.32/patch-realtime
index ab9028ddd..7abba16fe 100644
--- a/target/linux/patches/4.9.32/patch-realtime
+++ b/target/linux/patches/4.9.32/patch-realtime
@@ -1,6 +1,292 @@
-diff -Nur linux-4.9.28.orig/arch/arm/include/asm/irq.h linux-4.9.28/arch/arm/include/asm/irq.h
---- linux-4.9.28.orig/arch/arm/include/asm/irq.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/include/asm/irq.h 2017-05-19 03:37:25.122174217 +0200
+diff --git a/Documentation/sysrq.txt b/Documentation/sysrq.txt
+index 3a3b30ac2a75..9e0745cafbd8 100644
+--- a/Documentation/sysrq.txt
++++ b/Documentation/sysrq.txt
+@@ -59,10 +59,17 @@ On PowerPC - Press 'ALT - Print Screen (or F13) - <command key>,
+ On other - If you know of the key combos for other architectures, please
+ let me know so I can add them to this section.
+
+-On all - write a character to /proc/sysrq-trigger. e.g.:
+-
++On all - write a character to /proc/sysrq-trigger, e.g.:
+ echo t > /proc/sysrq-trigger
+
++On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
++ echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
++ Send an ICMP echo request with this pattern plus the particular
++ SysRq command key. Example:
++ # ping -c1 -s57 -p0102030468
++ will trigger the SysRq-H (help) command.
++
++
+ * What are the 'command' keys?
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ 'b' - Will immediately reboot the system without syncing or unmounting
+diff --git a/Documentation/trace/histograms.txt b/Documentation/trace/histograms.txt
+new file mode 100644
+index 000000000000..6f2aeabf7faa
+--- /dev/null
++++ b/Documentation/trace/histograms.txt
+@@ -0,0 +1,186 @@
++ Using the Linux Kernel Latency Histograms
++
++
++This document gives a short explanation how to enable, configure and use
++latency histograms. Latency histograms are primarily relevant in the
++context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
++and are used in the quality management of the Linux real-time
++capabilities.
++
++
++* Purpose of latency histograms
++
++A latency histogram continuously accumulates the frequencies of latency
++data. There are two types of histograms
++- potential sources of latencies
++- effective latencies
++
++
++* Potential sources of latencies
++
++Potential sources of latencies are code segments where interrupts,
++preemption or both are disabled (aka critical sections). To create
++histograms of potential sources of latency, the kernel stores the time
++stamp at the start of a critical section, determines the time elapsed
++when the end of the section is reached, and increments the frequency
++counter of that latency value - irrespective of whether any concurrently
++running process is affected by latency or not.
++- Configuration items (in the Kernel hacking/Tracers submenu)
++ CONFIG_INTERRUPT_OFF_LATENCY
++ CONFIG_PREEMPT_OFF_LATENCY
++
++
++* Effective latencies
++
++Effective latencies are actually occuring during wakeup of a process. To
++determine effective latencies, the kernel stores the time stamp when a
++process is scheduled to be woken up, and determines the duration of the
++wakeup time shortly before control is passed over to this process. Note
++that the apparent latency in user space may be somewhat longer, since the
++process may be interrupted after control is passed over to it but before
++the execution in user space takes place. Simply measuring the interval
++between enqueuing and wakeup may also not appropriate in cases when a
++process is scheduled as a result of a timer expiration. The timer may have
++missed its deadline, e.g. due to disabled interrupts, but this latency
++would not be registered. Therefore, the offsets of missed timers are
++recorded in a separate histogram. If both wakeup latency and missed timer
++offsets are configured and enabled, a third histogram may be enabled that
++records the overall latency as a sum of the timer latency, if any, and the
++wakeup latency. This histogram is called "timerandwakeup".
++- Configuration items (in the Kernel hacking/Tracers submenu)
++ CONFIG_WAKEUP_LATENCY
++ CONFIG_MISSED_TIMER_OFSETS
++
++
++* Usage
++
++The interface to the administration of the latency histograms is located
++in the debugfs file system. To mount it, either enter
++
++mount -t sysfs nodev /sys
++mount -t debugfs nodev /sys/kernel/debug
++
++from shell command line level, or add
++
++nodev /sys sysfs defaults 0 0
++nodev /sys/kernel/debug debugfs defaults 0 0
++
++to the file /etc/fstab. All latency histogram related files are then
++available in the directory /sys/kernel/debug/tracing/latency_hist. A
++particular histogram type is enabled by writing non-zero to the related
++variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
++Select "preemptirqsoff" for the histograms of potential sources of
++latencies and "wakeup" for histograms of effective latencies etc. The
++histogram data - one per CPU - are available in the files
++
++/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
++/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
++/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
++/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
++/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
++/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
++/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
++
++The histograms are reset by writing non-zero to the file "reset" in a
++particular latency directory. To reset all latency data, use
++
++#!/bin/sh
++
++TRACINGDIR=/sys/kernel/debug/tracing
++HISTDIR=$TRACINGDIR/latency_hist
++
++if test -d $HISTDIR
++then
++ cd $HISTDIR
++ for i in `find . | grep /reset$`
++ do
++ echo 1 >$i
++ done
++fi
++
++
++* Data format
++
++Latency data are stored with a resolution of one microsecond. The
++maximum latency is 10,240 microseconds. The data are only valid, if the
++overflow register is empty. Every output line contains the latency in
++microseconds in the first row and the number of samples in the second
++row. To display only lines with a positive latency count, use, for
++example,
++
++grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
++
++#Minimum latency: 0 microseconds.
++#Average latency: 0 microseconds.
++#Maximum latency: 25 microseconds.
++#Total samples: 3104770694
++#There are 0 samples greater or equal than 10240 microseconds
++#usecs samples
++ 0 2984486876
++ 1 49843506
++ 2 58219047
++ 3 5348126
++ 4 2187960
++ 5 3388262
++ 6 959289
++ 7 208294
++ 8 40420
++ 9 4485
++ 10 14918
++ 11 18340
++ 12 25052
++ 13 19455
++ 14 5602
++ 15 969
++ 16 47
++ 17 18
++ 18 14
++ 19 1
++ 20 3
++ 21 2
++ 22 5
++ 23 2
++ 25 1
++
++
++* Wakeup latency of a selected process
++
++To only collect wakeup latency data of a particular process, write the
++PID of the requested process to
++
++/sys/kernel/debug/tracing/latency_hist/wakeup/pid
++
++PIDs are not considered, if this variable is set to 0.
++
++
++* Details of the process with the highest wakeup latency so far
++
++Selected data of the process that suffered from the highest wakeup
++latency that occurred in a particular CPU are available in the file
++
++/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
++
++In addition, other relevant system data at the time when the
++latency occurred are given.
++
++The format of the data is (all in one line):
++<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
++<- <PID> <Priority> <Command> <Timestamp>
++
++The value of <Timeroffset> is only relevant in the combined timer
++and wakeup latency recording. In the wakeup recording, it is
++always 0, in the missed_timer_offsets recording, it is the same
++as <Latency>.
++
++When retrospectively searching for the origin of a latency and
++tracing was not enabled, it may be helpful to know the name and
++some basic data of the task that (finally) was switching to the
++late real-tlme task. In addition to the victim's data, also the
++data of the possible culprit are therefore displayed after the
++"<-" symbol.
++
++Finally, the timestamp of the time when the latency occurred
++in <seconds>.<microseconds> after the most recent system boot
++is provided.
++
++These data are also reset when the wakeup histogram is reset.
+diff --git a/MAINTAINERS b/MAINTAINERS
+index 63cefa62324c..be0ea1e5c4cc 100644
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -5196,6 +5196,23 @@ F: fs/fuse/
+ F: include/uapi/linux/fuse.h
+ F: Documentation/filesystems/fuse.txt
+
++FUTEX SUBSYSTEM
++M: Thomas Gleixner <tglx@linutronix.de>
++M: Ingo Molnar <mingo@redhat.com>
++R: Peter Zijlstra <peterz@infradead.org>
++R: Darren Hart <dvhart@infradead.org>
++L: linux-kernel@vger.kernel.org
++T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
++S: Maintained
++F: kernel/futex.c
++F: kernel/futex_compat.c
++F: include/asm-generic/futex.h
++F: include/linux/futex.h
++F: include/uapi/linux/futex.h
++F: tools/testing/selftests/futex/
++F: tools/perf/bench/futex*
++F: Documentation/*futex*
++
+ FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
+ M: Rik Faith <faith@cs.unc.edu>
+ L: linux-scsi@vger.kernel.org
+diff --git a/arch/Kconfig b/arch/Kconfig
+index 659bdd079277..099fc0f5155e 100644
+--- a/arch/Kconfig
++++ b/arch/Kconfig
+@@ -9,6 +9,7 @@ config OPROFILE
+ tristate "OProfile system profiling"
+ depends on PROFILING
+ depends on HAVE_OPROFILE
++ depends on !PREEMPT_RT_FULL
+ select RING_BUFFER
+ select RING_BUFFER_ALLOW_SWAP
+ help
+@@ -52,6 +53,7 @@ config KPROBES
+ config JUMP_LABEL
+ bool "Optimize very unlikely/likely branches"
+ depends on HAVE_ARCH_JUMP_LABEL
++ depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
+ help
+ This option enables a transparent branch optimization that
+ makes certain almost-always-true or almost-always-false branch
+diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
+index b5d529fdffab..5715844e83e3 100644
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -36,7 +36,7 @@ config ARM
+ select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
+ select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
+ select HAVE_ARCH_HARDENED_USERCOPY
+- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
++ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
+ select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
+ select HAVE_ARCH_MMAP_RND_BITS if MMU
+ select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
+@@ -75,6 +75,7 @@ config ARM
+ select HAVE_PERF_EVENTS
+ select HAVE_PERF_REGS
+ select HAVE_PERF_USER_STACK_DUMP
++ select HAVE_PREEMPT_LAZY
+ select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
+ select HAVE_REGS_AND_STACK_ACCESS_API
+ select HAVE_SYSCALL_TRACEPOINTS
+diff --git a/arch/arm/include/asm/irq.h b/arch/arm/include/asm/irq.h
+index e53638c8ed8a..6095a1649865 100644
+--- a/arch/arm/include/asm/irq.h
++++ b/arch/arm/include/asm/irq.h
@@ -22,6 +22,8 @@
#endif
@@ -10,9 +296,10 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/irq.h linux-4.9.28/arch/arm/inc
struct irqaction;
struct pt_regs;
extern void migrate_irqs(void);
-diff -Nur linux-4.9.28.orig/arch/arm/include/asm/switch_to.h linux-4.9.28/arch/arm/include/asm/switch_to.h
---- linux-4.9.28.orig/arch/arm/include/asm/switch_to.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/include/asm/switch_to.h 2017-05-19 03:37:25.122174217 +0200
+diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
+index 12ebfcc1d539..c962084605bc 100644
+--- a/arch/arm/include/asm/switch_to.h
++++ b/arch/arm/include/asm/switch_to.h
@@ -3,6 +3,13 @@
#include <linux/thread_info.h>
@@ -27,7 +314,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/switch_to.h linux-4.9.28/arch/a
/*
* For v7 SMP cores running a preemptible kernel we may be pre-empted
* during a TLB maintenance operation, so execute an inner-shareable dsb
-@@ -25,6 +32,7 @@
+@@ -25,6 +32,7 @@ extern struct task_struct *__switch_to(struct task_struct *, struct thread_info
#define switch_to(prev,next,last) \
do { \
__complete_pending_tlbi(); \
@@ -35,10 +322,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/switch_to.h linux-4.9.28/arch/a
last = __switch_to(prev,task_thread_info(prev), task_thread_info(next)); \
} while (0)
-diff -Nur linux-4.9.28.orig/arch/arm/include/asm/thread_info.h linux-4.9.28/arch/arm/include/asm/thread_info.h
---- linux-4.9.28.orig/arch/arm/include/asm/thread_info.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/include/asm/thread_info.h 2017-05-19 03:37:25.122174217 +0200
-@@ -49,6 +49,7 @@
+diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
+index 776757d1604a..1f36a4eccc72 100644
+--- a/arch/arm/include/asm/thread_info.h
++++ b/arch/arm/include/asm/thread_info.h
+@@ -49,6 +49,7 @@ struct cpu_context_save {
struct thread_info {
unsigned long flags; /* low level flags */
int preempt_count; /* 0 => preemptable, <0 => bug */
@@ -46,7 +334,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/thread_info.h linux-4.9.28/arch
mm_segment_t addr_limit; /* address limit */
struct task_struct *task; /* main task structure */
__u32 cpu; /* cpu */
-@@ -142,7 +143,8 @@
+@@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
#define TIF_SYSCALL_TRACE 4 /* syscall trace active */
#define TIF_SYSCALL_AUDIT 5 /* syscall auditing active */
#define TIF_SYSCALL_TRACEPOINT 6 /* syscall tracepoint instrumentation */
@@ -56,7 +344,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/thread_info.h linux-4.9.28/arch
#define TIF_NOHZ 12 /* in adaptive nohz mode */
#define TIF_USING_IWMMXT 17
-@@ -152,6 +154,7 @@
+@@ -152,6 +154,7 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
#define _TIF_SIGPENDING (1 << TIF_SIGPENDING)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
@@ -64,7 +352,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/thread_info.h linux-4.9.28/arch
#define _TIF_UPROBE (1 << TIF_UPROBE)
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
-@@ -167,7 +170,8 @@
+@@ -167,7 +170,8 @@ extern int vfp_restore_user_hwstate(struct user_vfp __user *,
* Change these and you break ASM code in entry-common.S
*/
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
@@ -74,30 +362,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/include/asm/thread_info.h linux-4.9.28/arch
#endif /* __KERNEL__ */
#endif /* __ASM_ARM_THREAD_INFO_H */
-diff -Nur linux-4.9.28.orig/arch/arm/Kconfig linux-4.9.28/arch/arm/Kconfig
---- linux-4.9.28.orig/arch/arm/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/Kconfig 2017-05-19 03:37:25.122174217 +0200
-@@ -36,7 +36,7 @@
- select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
- select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
- select HAVE_ARCH_HARDENED_USERCOPY
-- select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU
-+ select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32 && MMU && !PREEMPT_RT_BASE
- select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32 && MMU
- select HAVE_ARCH_MMAP_RND_BITS if MMU
- select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
-@@ -75,6 +75,7 @@
- select HAVE_PERF_EVENTS
- select HAVE_PERF_REGS
- select HAVE_PERF_USER_STACK_DUMP
-+ select HAVE_PREEMPT_LAZY
- select HAVE_RCU_TABLE_FREE if (SMP && ARM_LPAE)
- select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_SYSCALL_TRACEPOINTS
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/asm-offsets.c linux-4.9.28/arch/arm/kernel/asm-offsets.c
---- linux-4.9.28.orig/arch/arm/kernel/asm-offsets.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/asm-offsets.c 2017-05-19 03:37:25.122174217 +0200
-@@ -65,6 +65,7 @@
+diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c
+index 608008229c7d..3866da3f7bb7 100644
+--- a/arch/arm/kernel/asm-offsets.c
++++ b/arch/arm/kernel/asm-offsets.c
+@@ -65,6 +65,7 @@ int main(void)
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
@@ -105,10 +374,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/asm-offsets.c linux-4.9.28/arch/arm/
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/entry-armv.S linux-4.9.28/arch/arm/kernel/entry-armv.S
---- linux-4.9.28.orig/arch/arm/kernel/entry-armv.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/entry-armv.S 2017-05-19 03:37:25.122174217 +0200
-@@ -220,11 +220,18 @@
+diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
+index 9f157e7c51e7..468e224d76aa 100644
+--- a/arch/arm/kernel/entry-armv.S
++++ b/arch/arm/kernel/entry-armv.S
+@@ -220,11 +220,18 @@ ENDPROC(__dabt_svc)
#ifdef CONFIG_PREEMPT
ldr r8, [tsk, #TI_PREEMPT] @ get preempt count
@@ -129,7 +399,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/entry-armv.S linux-4.9.28/arch/arm/k
#endif
svc_exit r5, irq = 1 @ return from exception
-@@ -239,8 +246,14 @@
+@@ -239,8 +246,14 @@ ENDPROC(__irq_svc)
1: bl preempt_schedule_irq @ irq en/disable is done inside
ldr r0, [tsk, #TI_FLAGS] @ get new tasks TI_FLAGS
tst r0, #_TIF_NEED_RESCHED
@@ -145,9 +415,10 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/entry-armv.S linux-4.9.28/arch/arm/k
#endif
__und_fault:
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/entry-common.S linux-4.9.28/arch/arm/kernel/entry-common.S
---- linux-4.9.28.orig/arch/arm/kernel/entry-common.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/entry-common.S 2017-05-19 03:37:25.122174217 +0200
+diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
+index 10c3283d6c19..8872937862cc 100644
+--- a/arch/arm/kernel/entry-common.S
++++ b/arch/arm/kernel/entry-common.S
@@ -36,7 +36,9 @@
UNWIND(.cantunwind )
disable_irq_notrace @ disable interrupts
@@ -159,7 +430,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/entry-common.S linux-4.9.28/arch/arm
bne fast_work_pending
/* perform architecture specific actions before user return */
-@@ -62,8 +64,11 @@
+@@ -62,8 +64,11 @@ ENDPROC(ret_fast_syscall)
str r0, [sp, #S_R0 + S_OFF]! @ save returned r0
disable_irq_notrace @ disable interrupts
ldr r1, [tsk, #TI_FLAGS] @ re-check for syscall tracing
@@ -172,10 +443,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/entry-common.S linux-4.9.28/arch/arm
UNWIND(.fnend )
ENDPROC(ret_fast_syscall)
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/patch.c linux-4.9.28/arch/arm/kernel/patch.c
---- linux-4.9.28.orig/arch/arm/kernel/patch.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/patch.c 2017-05-19 03:37:25.122174217 +0200
-@@ -15,7 +15,7 @@
+diff --git a/arch/arm/kernel/patch.c b/arch/arm/kernel/patch.c
+index 69bda1a5707e..1f665acaa6a9 100644
+--- a/arch/arm/kernel/patch.c
++++ b/arch/arm/kernel/patch.c
+@@ -15,7 +15,7 @@ struct patch {
unsigned int insn;
};
@@ -184,7 +456,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/patch.c linux-4.9.28/arch/arm/kernel
static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
__acquires(&patch_lock)
-@@ -32,7 +32,7 @@
+@@ -32,7 +32,7 @@ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
return addr;
if (flags)
@@ -193,7 +465,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/patch.c linux-4.9.28/arch/arm/kernel
else
__acquire(&patch_lock);
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ static void __kprobes patch_unmap(int fixmap, unsigned long *flags)
clear_fixmap(fixmap);
if (flags)
@@ -202,10 +474,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/patch.c linux-4.9.28/arch/arm/kernel
else
__release(&patch_lock);
}
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/process.c linux-4.9.28/arch/arm/kernel/process.c
---- linux-4.9.28.orig/arch/arm/kernel/process.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/process.c 2017-05-19 03:37:25.122174217 +0200
-@@ -322,6 +322,30 @@
+diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
+index 91d2d5b01414..750550098b59 100644
+--- a/arch/arm/kernel/process.c
++++ b/arch/arm/kernel/process.c
+@@ -322,6 +322,30 @@ unsigned long arch_randomize_brk(struct mm_struct *mm)
}
#ifdef CONFIG_MMU
@@ -236,10 +509,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/process.c linux-4.9.28/arch/arm/kern
#ifdef CONFIG_KUSER_HELPERS
/*
* The vectors page is always readable from user space for the
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/signal.c linux-4.9.28/arch/arm/kernel/signal.c
---- linux-4.9.28.orig/arch/arm/kernel/signal.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/signal.c 2017-05-19 03:37:25.122174217 +0200
-@@ -572,7 +572,8 @@
+diff --git a/arch/arm/kernel/signal.c b/arch/arm/kernel/signal.c
+index 7b8f2141427b..96541e00b74a 100644
+--- a/arch/arm/kernel/signal.c
++++ b/arch/arm/kernel/signal.c
+@@ -572,7 +572,8 @@ do_work_pending(struct pt_regs *regs, unsigned int thread_flags, int syscall)
*/
trace_hardirqs_off();
do {
@@ -249,10 +523,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/signal.c linux-4.9.28/arch/arm/kerne
schedule();
} else {
if (unlikely(!user_mode(regs)))
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/smp.c linux-4.9.28/arch/arm/kernel/smp.c
---- linux-4.9.28.orig/arch/arm/kernel/smp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/smp.c 2017-05-19 03:37:25.122174217 +0200
-@@ -234,8 +234,6 @@
+diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
+index 7dd14e8395e6..4cd7e3d98035 100644
+--- a/arch/arm/kernel/smp.c
++++ b/arch/arm/kernel/smp.c
+@@ -234,8 +234,6 @@ int __cpu_disable(void)
flush_cache_louis();
local_flush_tlb_all();
@@ -261,7 +536,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/smp.c linux-4.9.28/arch/arm/kernel/s
return 0;
}
-@@ -251,6 +249,9 @@
+@@ -251,6 +249,9 @@ void __cpu_die(unsigned int cpu)
pr_err("CPU%u: cpu didn't die\n", cpu);
return;
}
@@ -271,10 +546,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/smp.c linux-4.9.28/arch/arm/kernel/s
pr_notice("CPU%u: shutdown\n", cpu);
/*
-diff -Nur linux-4.9.28.orig/arch/arm/kernel/unwind.c linux-4.9.28/arch/arm/kernel/unwind.c
---- linux-4.9.28.orig/arch/arm/kernel/unwind.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kernel/unwind.c 2017-05-19 03:37:25.122174217 +0200
-@@ -93,7 +93,7 @@
+diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
+index 0bee233fef9a..314cfb232a63 100644
+--- a/arch/arm/kernel/unwind.c
++++ b/arch/arm/kernel/unwind.c
+@@ -93,7 +93,7 @@ extern const struct unwind_idx __start_unwind_idx[];
static const struct unwind_idx *__origin_unwind_idx;
extern const struct unwind_idx __stop_unwind_idx[];
@@ -283,7 +559,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/unwind.c linux-4.9.28/arch/arm/kerne
static LIST_HEAD(unwind_tables);
/* Convert a prel31 symbol to an absolute address */
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
/* module unwind tables */
struct unwind_table *table;
@@ -292,7 +568,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/unwind.c linux-4.9.28/arch/arm/kerne
list_for_each_entry(table, &unwind_tables, list) {
if (addr >= table->begin_addr &&
addr < table->end_addr) {
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_find_idx(unsigned long addr)
break;
}
}
@@ -301,7 +577,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/unwind.c linux-4.9.28/arch/arm/kerne
}
pr_debug("%s: idx = %p\n", __func__, idx);
-@@ -529,9 +529,9 @@
+@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(unsigned long start, unsigned long size,
tab->begin_addr = text_addr;
tab->end_addr = text_addr + text_size;
@@ -313,7 +589,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/unwind.c linux-4.9.28/arch/arm/kerne
return tab;
}
-@@ -543,9 +543,9 @@
+@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_table *tab)
if (!tab)
return;
@@ -325,10 +601,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kernel/unwind.c linux-4.9.28/arch/arm/kerne
kfree(tab);
}
-diff -Nur linux-4.9.28.orig/arch/arm/kvm/arm.c linux-4.9.28/arch/arm/kvm/arm.c
---- linux-4.9.28.orig/arch/arm/kvm/arm.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/kvm/arm.c 2017-05-19 03:37:25.122174217 +0200
-@@ -619,7 +619,7 @@
+diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
+index 19b5f5c1c0ff..82aa639e6737 100644
+--- a/arch/arm/kvm/arm.c
++++ b/arch/arm/kvm/arm.c
+@@ -619,7 +619,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
* involves poking the GIC, which must be done in a
* non-preemptible context.
*/
@@ -337,7 +614,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kvm/arm.c linux-4.9.28/arch/arm/kvm/arm.c
kvm_pmu_flush_hwstate(vcpu);
kvm_timer_flush_hwstate(vcpu);
kvm_vgic_flush_hwstate(vcpu);
-@@ -640,7 +640,7 @@
+@@ -640,7 +640,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
kvm_pmu_sync_hwstate(vcpu);
kvm_timer_sync_hwstate(vcpu);
kvm_vgic_sync_hwstate(vcpu);
@@ -346,7 +623,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/kvm/arm.c linux-4.9.28/arch/arm/kvm/arm.c
continue;
}
-@@ -696,7 +696,7 @@
+@@ -696,7 +696,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run)
kvm_vgic_sync_hwstate(vcpu);
@@ -355,10 +632,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/kvm/arm.c linux-4.9.28/arch/arm/kvm/arm.c
ret = handle_exit(vcpu, run, ret);
}
-diff -Nur linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.9.28/arch/arm/mach-exynos/platsmp.c
---- linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-exynos/platsmp.c 2017-05-19 03:37:25.122174217 +0200
-@@ -229,7 +229,7 @@
+diff --git a/arch/arm/mach-exynos/platsmp.c b/arch/arm/mach-exynos/platsmp.c
+index 98ffe1e62ad5..df9769ddece5 100644
+--- a/arch/arm/mach-exynos/platsmp.c
++++ b/arch/arm/mach-exynos/platsmp.c
+@@ -229,7 +229,7 @@ static void __iomem *scu_base_addr(void)
return (void __iomem *)(S5P_VA_SCU);
}
@@ -367,7 +645,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.9.28/arch/arm
static void exynos_secondary_init(unsigned int cpu)
{
-@@ -242,8 +242,8 @@
+@@ -242,8 +242,8 @@ static void exynos_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -378,7 +656,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.9.28/arch/arm
}
int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
* Set synchronisation state between this boot processor
* and the secondary one
*/
@@ -387,7 +665,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.9.28/arch/arm
/*
* The secondary processor is waiting to be released from
-@@ -334,7 +334,7 @@
+@@ -334,7 +334,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
if (timeout == 0) {
printk(KERN_ERR "cpu1 power enable failed");
@@ -396,7 +674,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.9.28/arch/arm
return -ETIMEDOUT;
}
}
-@@ -380,7 +380,7 @@
+@@ -380,7 +380,7 @@ static int exynos_boot_secondary(unsigned int cpu, struct task_struct *idle)
* calibrations, then wait for it to finish
*/
fail:
@@ -405,9 +683,10 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-exynos/platsmp.c linux-4.9.28/arch/arm
return pen_release != -1 ? ret : 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/mach-hisi/platmcpm.c
---- linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-hisi/platmcpm.c 2017-05-19 03:37:25.122174217 +0200
+diff --git a/arch/arm/mach-hisi/platmcpm.c b/arch/arm/mach-hisi/platmcpm.c
+index 4b653a8cb75c..b03d5a922cb1 100644
+--- a/arch/arm/mach-hisi/platmcpm.c
++++ b/arch/arm/mach-hisi/platmcpm.c
@@ -61,7 +61,7 @@
static void __iomem *sysctrl, *fabric;
@@ -417,7 +696,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
static u32 fabric_phys_addr;
/*
* [0]: bootwrapper physical address
-@@ -113,7 +113,7 @@
+@@ -113,7 +113,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER)
return -EINVAL;
@@ -426,7 +705,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
if (hip04_cpu_table[cluster][cpu])
goto out;
-@@ -147,7 +147,7 @@
+@@ -147,7 +147,7 @@ static int hip04_boot_secondary(unsigned int l_cpu, struct task_struct *idle)
out:
hip04_cpu_table[cluster][cpu]++;
@@ -435,7 +714,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
return 0;
}
-@@ -162,11 +162,11 @@
+@@ -162,11 +162,11 @@ static void hip04_cpu_die(unsigned int l_cpu)
cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
@@ -449,7 +728,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
return;
} else if (hip04_cpu_table[cluster][cpu] > 1) {
pr_err("Cluster %d CPU%d boots multiple times\n", cluster, cpu);
-@@ -174,7 +174,7 @@
+@@ -174,7 +174,7 @@ static void hip04_cpu_die(unsigned int l_cpu)
}
last_man = hip04_cluster_is_down(cluster);
@@ -458,7 +737,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
if (last_man) {
/* Since it's Cortex A15, disable L2 prefetching. */
asm volatile(
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ static int hip04_cpu_kill(unsigned int l_cpu)
cpu >= HIP04_MAX_CPUS_PER_CLUSTER);
count = TIMEOUT_MSEC / POLL_MSEC;
@@ -467,7 +746,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
for (tries = 0; tries < count; tries++) {
if (hip04_cpu_table[cluster][cpu])
goto err;
-@@ -211,10 +211,10 @@
+@@ -211,10 +211,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster));
if (data & CORE_WFI_STATUS(cpu))
break;
@@ -480,7 +759,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
}
if (tries >= count)
goto err;
-@@ -231,10 +231,10 @@
+@@ -231,10 +231,10 @@ static int hip04_cpu_kill(unsigned int l_cpu)
goto err;
if (hip04_cluster_is_down(cluster))
hip04_set_snoop_filter(cluster, 0);
@@ -493,10 +772,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-hisi/platmcpm.c linux-4.9.28/arch/arm/
return 0;
}
#endif
-diff -Nur linux-4.9.28.orig/arch/arm/mach-omap2/omap-smp.c linux-4.9.28/arch/arm/mach-omap2/omap-smp.c
---- linux-4.9.28.orig/arch/arm/mach-omap2/omap-smp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-omap2/omap-smp.c 2017-05-19 03:37:25.122174217 +0200
-@@ -64,7 +64,7 @@
+diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
+index b4de3da6dffa..b52893319d75 100644
+--- a/arch/arm/mach-omap2/omap-smp.c
++++ b/arch/arm/mach-omap2/omap-smp.c
+@@ -64,7 +64,7 @@ static const struct omap_smp_config omap5_cfg __initconst = {
.startup_addr = omap5_secondary_startup,
};
@@ -505,7 +785,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-omap2/omap-smp.c linux-4.9.28/arch/arm
void __iomem *omap4_get_scu_base(void)
{
-@@ -131,8 +131,8 @@
+@@ -131,8 +131,8 @@ static void omap4_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -516,7 +796,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-omap2/omap-smp.c linux-4.9.28/arch/arm
}
static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
* Set synchronisation state between this boot processor
* and the secondary one
*/
@@ -525,7 +805,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-omap2/omap-smp.c linux-4.9.28/arch/arm
/*
* Update the AuxCoreBoot0 with boot state for secondary core.
-@@ -223,7 +223,7 @@
+@@ -223,7 +223,7 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
* Now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -534,9 +814,10 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-omap2/omap-smp.c linux-4.9.28/arch/arm
return 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mach-prima2/platsmp.c linux-4.9.28/arch/arm/mach-prima2/platsmp.c
---- linux-4.9.28.orig/arch/arm/mach-prima2/platsmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-prima2/platsmp.c 2017-05-19 03:37:25.122174217 +0200
+diff --git a/arch/arm/mach-prima2/platsmp.c b/arch/arm/mach-prima2/platsmp.c
+index 0875b99add18..18b6d98d2581 100644
+--- a/arch/arm/mach-prima2/platsmp.c
++++ b/arch/arm/mach-prima2/platsmp.c
@@ -22,7 +22,7 @@
static void __iomem *clk_base;
@@ -546,7 +827,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-prima2/platsmp.c linux-4.9.28/arch/arm
static void sirfsoc_secondary_init(unsigned int cpu)
{
-@@ -36,8 +36,8 @@
+@@ -36,8 +36,8 @@ static void sirfsoc_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -557,7 +838,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-prima2/platsmp.c linux-4.9.28/arch/arm
}
static const struct of_device_id clk_ids[] = {
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
/* make sure write buffer is drained */
mb();
@@ -566,7 +847,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-prima2/platsmp.c linux-4.9.28/arch/arm
/*
* The secondary processor is waiting to be released from
-@@ -107,7 +107,7 @@
+@@ -107,7 +107,7 @@ static int sirfsoc_boot_secondary(unsigned int cpu, struct task_struct *idle)
* now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -575,9 +856,10 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-prima2/platsmp.c linux-4.9.28/arch/arm
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mach-qcom/platsmp.c linux-4.9.28/arch/arm/mach-qcom/platsmp.c
---- linux-4.9.28.orig/arch/arm/mach-qcom/platsmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-qcom/platsmp.c 2017-05-19 03:37:25.122174217 +0200
+diff --git a/arch/arm/mach-qcom/platsmp.c b/arch/arm/mach-qcom/platsmp.c
+index 5494c9e0c909..e8ce157d3548 100644
+--- a/arch/arm/mach-qcom/platsmp.c
++++ b/arch/arm/mach-qcom/platsmp.c
@@ -46,7 +46,7 @@
extern void secondary_startup_arm(void);
@@ -587,7 +869,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-qcom/platsmp.c linux-4.9.28/arch/arm/m
#ifdef CONFIG_HOTPLUG_CPU
static void qcom_cpu_die(unsigned int cpu)
-@@ -60,8 +60,8 @@
+@@ -60,8 +60,8 @@ static void qcom_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -598,7 +880,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-qcom/platsmp.c linux-4.9.28/arch/arm/m
}
static int scss_release_secondary(unsigned int cpu)
-@@ -284,7 +284,7 @@
+@@ -284,7 +284,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
* set synchronisation state between this boot processor
* and the secondary one
*/
@@ -607,7 +889,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-qcom/platsmp.c linux-4.9.28/arch/arm/m
/*
* Send the secondary CPU a soft interrupt, thereby causing
-@@ -297,7 +297,7 @@
+@@ -297,7 +297,7 @@ static int qcom_boot_secondary(unsigned int cpu, int (*func)(unsigned int))
* now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -616,10 +898,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-qcom/platsmp.c linux-4.9.28/arch/arm/m
return ret;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mach-spear/platsmp.c linux-4.9.28/arch/arm/mach-spear/platsmp.c
---- linux-4.9.28.orig/arch/arm/mach-spear/platsmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-spear/platsmp.c 2017-05-19 03:37:25.122174217 +0200
-@@ -32,7 +32,7 @@
+diff --git a/arch/arm/mach-spear/platsmp.c b/arch/arm/mach-spear/platsmp.c
+index 8d1e2d551786..7fa56cc78118 100644
+--- a/arch/arm/mach-spear/platsmp.c
++++ b/arch/arm/mach-spear/platsmp.c
+@@ -32,7 +32,7 @@ static void write_pen_release(int val)
sync_cache_w(&pen_release);
}
@@ -628,7 +911,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-spear/platsmp.c linux-4.9.28/arch/arm/
static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
-@@ -47,8 +47,8 @@
+@@ -47,8 +47,8 @@ static void spear13xx_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -639,7 +922,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-spear/platsmp.c linux-4.9.28/arch/arm/
}
static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -59,7 +59,7 @@
+@@ -59,7 +59,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
* set synchronisation state between this boot processor
* and the secondary one
*/
@@ -648,7 +931,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-spear/platsmp.c linux-4.9.28/arch/arm/
/*
* The secondary processor is waiting to be released from
-@@ -84,7 +84,7 @@
+@@ -84,7 +84,7 @@ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
* now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -657,10 +940,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-spear/platsmp.c linux-4.9.28/arch/arm/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mach-sti/platsmp.c linux-4.9.28/arch/arm/mach-sti/platsmp.c
---- linux-4.9.28.orig/arch/arm/mach-sti/platsmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mach-sti/platsmp.c 2017-05-19 03:37:25.122174217 +0200
-@@ -35,7 +35,7 @@
+diff --git a/arch/arm/mach-sti/platsmp.c b/arch/arm/mach-sti/platsmp.c
+index ea5a2277ee46..b988e081ac79 100644
+--- a/arch/arm/mach-sti/platsmp.c
++++ b/arch/arm/mach-sti/platsmp.c
+@@ -35,7 +35,7 @@ static void write_pen_release(int val)
sync_cache_w(&pen_release);
}
@@ -669,7 +953,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-sti/platsmp.c linux-4.9.28/arch/arm/ma
static void sti_secondary_init(unsigned int cpu)
{
-@@ -48,8 +48,8 @@
+@@ -48,8 +48,8 @@ static void sti_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -680,7 +964,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-sti/platsmp.c linux-4.9.28/arch/arm/ma
}
static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -60,7 +60,7 @@
+@@ -60,7 +60,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
* set synchronisation state between this boot processor
* and the secondary one
*/
@@ -689,7 +973,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-sti/platsmp.c linux-4.9.28/arch/arm/ma
/*
* The secondary processor is waiting to be released from
-@@ -91,7 +91,7 @@
+@@ -91,7 +91,7 @@ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
* now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -698,10 +982,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/mach-sti/platsmp.c linux-4.9.28/arch/arm/ma
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mm/fault.c linux-4.9.28/arch/arm/mm/fault.c
---- linux-4.9.28.orig/arch/arm/mm/fault.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mm/fault.c 2017-05-19 03:37:25.122174217 +0200
-@@ -430,6 +430,9 @@
+diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
+index 0122ad1a6027..926b1be48043 100644
+--- a/arch/arm/mm/fault.c
++++ b/arch/arm/mm/fault.c
+@@ -430,6 +430,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
if (addr < TASK_SIZE)
return do_page_fault(addr, fsr, regs);
@@ -711,7 +996,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/fault.c linux-4.9.28/arch/arm/mm/fault.c
if (user_mode(regs))
goto bad_area;
-@@ -497,6 +500,9 @@
+@@ -497,6 +500,9 @@ do_translation_fault(unsigned long addr, unsigned int fsr,
static int
do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
{
@@ -721,10 +1006,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/fault.c linux-4.9.28/arch/arm/mm/fault.c
do_bad_area(addr, fsr, regs);
return 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm/mm/highmem.c linux-4.9.28/arch/arm/mm/highmem.c
---- linux-4.9.28.orig/arch/arm/mm/highmem.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/mm/highmem.c 2017-05-19 03:37:25.126174470 +0200
-@@ -34,6 +34,11 @@
+diff --git a/arch/arm/mm/highmem.c b/arch/arm/mm/highmem.c
+index d02f8187b1cc..542692dbd40a 100644
+--- a/arch/arm/mm/highmem.c
++++ b/arch/arm/mm/highmem.c
+@@ -34,6 +34,11 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr)
return *ptep;
}
@@ -736,7 +1022,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/highmem.c linux-4.9.28/arch/arm/mm/highm
void *kmap(struct page *page)
{
might_sleep();
-@@ -54,12 +59,13 @@
+@@ -54,12 +59,13 @@ EXPORT_SYMBOL(kunmap);
void *kmap_atomic(struct page *page)
{
@@ -751,7 +1037,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/highmem.c linux-4.9.28/arch/arm/mm/highm
pagefault_disable();
if (!PageHighMem(page))
return page_address(page);
-@@ -79,7 +85,7 @@
+@@ -79,7 +85,7 @@ void *kmap_atomic(struct page *page)
type = kmap_atomic_idx_push();
@@ -760,7 +1046,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/highmem.c linux-4.9.28/arch/arm/mm/highm
vaddr = __fix_to_virt(idx);
#ifdef CONFIG_DEBUG_HIGHMEM
/*
-@@ -93,7 +99,10 @@
+@@ -93,7 +99,10 @@ void *kmap_atomic(struct page *page)
* in place, so the contained TLB flush ensures the TLB is updated
* with the new mapping.
*/
@@ -772,7 +1058,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/highmem.c linux-4.9.28/arch/arm/mm/highm
return (void *)vaddr;
}
-@@ -106,44 +115,75 @@
+@@ -106,44 +115,75 @@ void __kunmap_atomic(void *kvaddr)
if (kvaddr >= (void *)FIXADDR_START) {
type = kmap_atomic_idx();
@@ -854,10 +1140,11 @@ diff -Nur linux-4.9.28.orig/arch/arm/mm/highmem.c linux-4.9.28/arch/arm/mm/highm
+ }
+}
+#endif
-diff -Nur linux-4.9.28.orig/arch/arm/plat-versatile/platsmp.c linux-4.9.28/arch/arm/plat-versatile/platsmp.c
---- linux-4.9.28.orig/arch/arm/plat-versatile/platsmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm/plat-versatile/platsmp.c 2017-05-19 03:37:25.126174470 +0200
-@@ -32,7 +32,7 @@
+diff --git a/arch/arm/plat-versatile/platsmp.c b/arch/arm/plat-versatile/platsmp.c
+index c2366510187a..6b60f582b738 100644
+--- a/arch/arm/plat-versatile/platsmp.c
++++ b/arch/arm/plat-versatile/platsmp.c
+@@ -32,7 +32,7 @@ static void write_pen_release(int val)
sync_cache_w(&pen_release);
}
@@ -866,7 +1153,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/plat-versatile/platsmp.c linux-4.9.28/arch/
void versatile_secondary_init(unsigned int cpu)
{
-@@ -45,8 +45,8 @@
+@@ -45,8 +45,8 @@ void versatile_secondary_init(unsigned int cpu)
/*
* Synchronise with the boot thread.
*/
@@ -877,7 +1164,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/plat-versatile/platsmp.c linux-4.9.28/arch/
}
int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
-@@ -57,7 +57,7 @@
+@@ -57,7 +57,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
* Set synchronisation state between this boot processor
* and the secondary one
*/
@@ -886,7 +1173,7 @@ diff -Nur linux-4.9.28.orig/arch/arm/plat-versatile/platsmp.c linux-4.9.28/arch/
/*
* This is really belt and braces; we hold unintended secondary
-@@ -87,7 +87,7 @@
+@@ -87,7 +87,7 @@ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
* now the secondary core is starting up let it run its
* calibrations, then wait for it to finish
*/
@@ -895,10 +1182,32 @@ diff -Nur linux-4.9.28.orig/arch/arm/plat-versatile/platsmp.c linux-4.9.28/arch/
return pen_release != -1 ? -ENOSYS : 0;
}
-diff -Nur linux-4.9.28.orig/arch/arm64/include/asm/thread_info.h linux-4.9.28/arch/arm64/include/asm/thread_info.h
---- linux-4.9.28.orig/arch/arm64/include/asm/thread_info.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm64/include/asm/thread_info.h 2017-05-19 03:37:25.126174470 +0200
-@@ -49,6 +49,7 @@
+diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
+index cf57a7799a0f..78d1b49fbed5 100644
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -91,6 +91,7 @@ config ARM64
+ select HAVE_PERF_EVENTS
+ select HAVE_PERF_REGS
+ select HAVE_PERF_USER_STACK_DUMP
++ select HAVE_PREEMPT_LAZY
+ select HAVE_REGS_AND_STACK_ACCESS_API
+ select HAVE_RCU_TABLE_FREE
+ select HAVE_SYSCALL_TRACEPOINTS
+@@ -704,7 +705,7 @@ config XEN_DOM0
+
+ config XEN
+ bool "Xen guest support on ARM64"
+- depends on ARM64 && OF
++ depends on ARM64 && OF && !PREEMPT_RT_FULL
+ select SWIOTLB_XEN
+ select PARAVIRT
+ help
+diff --git a/arch/arm64/include/asm/thread_info.h b/arch/arm64/include/asm/thread_info.h
+index e9ea5a6bd449..6c500ad63c6a 100644
+--- a/arch/arm64/include/asm/thread_info.h
++++ b/arch/arm64/include/asm/thread_info.h
+@@ -49,6 +49,7 @@ struct thread_info {
mm_segment_t addr_limit; /* address limit */
struct task_struct *task; /* main task structure */
int preempt_count; /* 0 => preemptable, <0 => bug */
@@ -906,7 +1215,7 @@ diff -Nur linux-4.9.28.orig/arch/arm64/include/asm/thread_info.h linux-4.9.28/ar
int cpu; /* cpu */
};
-@@ -112,6 +113,7 @@
+@@ -112,6 +113,7 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_NEED_RESCHED 1
#define TIF_NOTIFY_RESUME 2 /* callback before returning to user */
#define TIF_FOREIGN_FPSTATE 3 /* CPU's FP state is not current's */
@@ -914,7 +1223,7 @@ diff -Nur linux-4.9.28.orig/arch/arm64/include/asm/thread_info.h linux-4.9.28/ar
#define TIF_NOHZ 7
#define TIF_SYSCALL_TRACE 8
#define TIF_SYSCALL_AUDIT 9
-@@ -127,6 +129,7 @@
+@@ -127,6 +129,7 @@ static inline struct thread_info *current_thread_info(void)
#define _TIF_NEED_RESCHED (1 << TIF_NEED_RESCHED)
#define _TIF_NOTIFY_RESUME (1 << TIF_NOTIFY_RESUME)
#define _TIF_FOREIGN_FPSTATE (1 << TIF_FOREIGN_FPSTATE)
@@ -922,7 +1231,7 @@ diff -Nur linux-4.9.28.orig/arch/arm64/include/asm/thread_info.h linux-4.9.28/ar
#define _TIF_NOHZ (1 << TIF_NOHZ)
#define _TIF_SYSCALL_TRACE (1 << TIF_SYSCALL_TRACE)
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
-@@ -135,7 +138,9 @@
+@@ -135,7 +138,9 @@ static inline struct thread_info *current_thread_info(void)
#define _TIF_32BIT (1 << TIF_32BIT)
#define _TIF_WORK_MASK (_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
@@ -933,30 +1242,11 @@ diff -Nur linux-4.9.28.orig/arch/arm64/include/asm/thread_info.h linux-4.9.28/ar
#define _TIF_SYSCALL_WORK (_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
_TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
-diff -Nur linux-4.9.28.orig/arch/arm64/Kconfig linux-4.9.28/arch/arm64/Kconfig
---- linux-4.9.28.orig/arch/arm64/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm64/Kconfig 2017-05-19 03:37:25.126174470 +0200
-@@ -91,6 +91,7 @@
- select HAVE_PERF_EVENTS
- select HAVE_PERF_REGS
- select HAVE_PERF_USER_STACK_DUMP
-+ select HAVE_PREEMPT_LAZY
- select HAVE_REGS_AND_STACK_ACCESS_API
- select HAVE_RCU_TABLE_FREE
- select HAVE_SYSCALL_TRACEPOINTS
-@@ -704,7 +705,7 @@
-
- config XEN
- bool "Xen guest support on ARM64"
-- depends on ARM64 && OF
-+ depends on ARM64 && OF && !PREEMPT_RT_FULL
- select SWIOTLB_XEN
- select PARAVIRT
- help
-diff -Nur linux-4.9.28.orig/arch/arm64/kernel/asm-offsets.c linux-4.9.28/arch/arm64/kernel/asm-offsets.c
---- linux-4.9.28.orig/arch/arm64/kernel/asm-offsets.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm64/kernel/asm-offsets.c 2017-05-19 03:37:25.126174470 +0200
-@@ -38,6 +38,7 @@
+diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
+index c58ddf8c4062..a8f2f7c1fe12 100644
+--- a/arch/arm64/kernel/asm-offsets.c
++++ b/arch/arm64/kernel/asm-offsets.c
+@@ -38,6 +38,7 @@ int main(void)
BLANK();
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
@@ -964,10 +1254,11 @@ diff -Nur linux-4.9.28.orig/arch/arm64/kernel/asm-offsets.c linux-4.9.28/arch/ar
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.9.28.orig/arch/arm64/kernel/entry.S linux-4.9.28/arch/arm64/kernel/entry.S
---- linux-4.9.28.orig/arch/arm64/kernel/entry.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm64/kernel/entry.S 2017-05-19 03:37:25.126174470 +0200
-@@ -428,11 +428,16 @@
+diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
+index 79b0fe24d5b7..f3c959ade308 100644
+--- a/arch/arm64/kernel/entry.S
++++ b/arch/arm64/kernel/entry.S
+@@ -428,11 +428,16 @@ ENDPROC(el1_sync)
#ifdef CONFIG_PREEMPT
ldr w24, [tsk, #TI_PREEMPT] // get preempt count
@@ -987,7 +1278,7 @@ diff -Nur linux-4.9.28.orig/arch/arm64/kernel/entry.S linux-4.9.28/arch/arm64/ke
#endif
#ifdef CONFIG_TRACE_IRQFLAGS
bl trace_hardirqs_on
-@@ -446,6 +451,7 @@
+@@ -446,6 +451,7 @@ ENDPROC(el1_irq)
1: bl preempt_schedule_irq // irq en/disable is done inside
ldr x0, [tsk, #TI_FLAGS] // get new tasks TI_FLAGS
tbnz x0, #TIF_NEED_RESCHED, 1b // needs rescheduling?
@@ -995,10 +1286,11 @@ diff -Nur linux-4.9.28.orig/arch/arm64/kernel/entry.S linux-4.9.28/arch/arm64/ke
ret x24
#endif
-diff -Nur linux-4.9.28.orig/arch/arm64/kernel/signal.c linux-4.9.28/arch/arm64/kernel/signal.c
---- linux-4.9.28.orig/arch/arm64/kernel/signal.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/arm64/kernel/signal.c 2017-05-19 03:37:25.126174470 +0200
-@@ -409,7 +409,7 @@
+diff --git a/arch/arm64/kernel/signal.c b/arch/arm64/kernel/signal.c
+index 404dd67080b9..639dc6d12e72 100644
+--- a/arch/arm64/kernel/signal.c
++++ b/arch/arm64/kernel/signal.c
+@@ -409,7 +409,7 @@ asmlinkage void do_notify_resume(struct pt_regs *regs,
*/
trace_hardirqs_off();
do {
@@ -1007,29 +1299,11 @@ diff -Nur linux-4.9.28.orig/arch/arm64/kernel/signal.c linux-4.9.28/arch/arm64/k
schedule();
} else {
local_irq_enable();
-diff -Nur linux-4.9.28.orig/arch/Kconfig linux-4.9.28/arch/Kconfig
---- linux-4.9.28.orig/arch/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/Kconfig 2017-05-19 03:37:25.122174217 +0200
-@@ -9,6 +9,7 @@
- tristate "OProfile system profiling"
- depends on PROFILING
- depends on HAVE_OPROFILE
-+ depends on !PREEMPT_RT_FULL
- select RING_BUFFER
- select RING_BUFFER_ALLOW_SWAP
- help
-@@ -52,6 +53,7 @@
- config JUMP_LABEL
- bool "Optimize very unlikely/likely branches"
- depends on HAVE_ARCH_JUMP_LABEL
-+ depends on (!INTERRUPT_OFF_HIST && !PREEMPT_OFF_HIST && !WAKEUP_LATENCY_HIST && !MISSED_TIMER_OFFSETS_HIST)
- help
- This option enables a transparent branch optimization that
- makes certain almost-always-true or almost-always-false branch
-diff -Nur linux-4.9.28.orig/arch/mips/Kconfig linux-4.9.28/arch/mips/Kconfig
---- linux-4.9.28.orig/arch/mips/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/mips/Kconfig 2017-05-19 03:37:25.126174470 +0200
-@@ -2515,7 +2515,7 @@
+diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
+index 5e844f68e847..dc613cc10f54 100644
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -2516,7 +2516,7 @@ config MIPS_ASID_BITS_VARIABLE
#
config HIGHMEM
bool "High Memory Support"
@@ -1038,10 +1312,45 @@ diff -Nur linux-4.9.28.orig/arch/mips/Kconfig linux-4.9.28/arch/mips/Kconfig
config CPU_SUPPORTS_HIGHMEM
bool
-diff -Nur linux-4.9.28.orig/arch/powerpc/include/asm/thread_info.h linux-4.9.28/arch/powerpc/include/asm/thread_info.h
---- linux-4.9.28.orig/arch/powerpc/include/asm/thread_info.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/include/asm/thread_info.h 2017-05-19 03:37:25.126174470 +0200
-@@ -43,6 +43,8 @@
+diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
+index 8f01f21e78f1..619485b777d2 100644
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -52,10 +52,11 @@ config LOCKDEP_SUPPORT
+
+ config RWSEM_GENERIC_SPINLOCK
+ bool
++ default y if PREEMPT_RT_FULL
+
+ config RWSEM_XCHGADD_ALGORITHM
+ bool
+- default y
++ default y if !PREEMPT_RT_FULL
+
+ config GENERIC_LOCKBREAK
+ bool
+@@ -134,6 +135,7 @@ config PPC
+ select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ select GENERIC_STRNCPY_FROM_USER
+ select GENERIC_STRNLEN_USER
++ select HAVE_PREEMPT_LAZY
+ select HAVE_MOD_ARCH_SPECIFIC
+ select MODULES_USE_ELF_RELA
+ select CLONE_BACKWARDS
+@@ -321,7 +323,7 @@ menu "Kernel options"
+
+ config HIGHMEM
+ bool "High memory support"
+- depends on PPC32
++ depends on PPC32 && !PREEMPT_RT_FULL
+
+ source kernel/Kconfig.hz
+ source kernel/Kconfig.preempt
+diff --git a/arch/powerpc/include/asm/thread_info.h b/arch/powerpc/include/asm/thread_info.h
+index 87e4b2d8dcd4..981e501a4359 100644
+--- a/arch/powerpc/include/asm/thread_info.h
++++ b/arch/powerpc/include/asm/thread_info.h
+@@ -43,6 +43,8 @@ struct thread_info {
int cpu; /* cpu we're on */
int preempt_count; /* 0 => preemptable,
<0 => BUG */
@@ -1050,7 +1359,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/include/asm/thread_info.h linux-4.9.28/
unsigned long local_flags; /* private flags for thread */
#ifdef CONFIG_LIVEPATCH
unsigned long *livepatch_sp;
-@@ -88,8 +90,7 @@
+@@ -88,8 +90,7 @@ static inline struct thread_info *current_thread_info(void)
#define TIF_SYSCALL_TRACE 0 /* syscall trace active */
#define TIF_SIGPENDING 1 /* signal pending */
#define TIF_NEED_RESCHED 2 /* rescheduling necessary */
@@ -1060,7 +1369,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/include/asm/thread_info.h linux-4.9.28/
#define TIF_32BIT 4 /* 32 bit binary */
#define TIF_RESTORE_TM 5 /* need to restore TM FP/VEC/VSX */
#define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
-@@ -107,6 +108,8 @@
+@@ -107,6 +108,8 @@ static inline struct thread_info *current_thread_info(void)
#if defined(CONFIG_PPC64)
#define TIF_ELF2ABI 18 /* function descriptors must die! */
#endif
@@ -1069,7 +1378,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/include/asm/thread_info.h linux-4.9.28/
/* as above, but as bit values */
#define _TIF_SYSCALL_TRACE (1<<TIF_SYSCALL_TRACE)
-@@ -125,14 +128,16 @@
+@@ -125,14 +128,16 @@ static inline struct thread_info *current_thread_info(void)
#define _TIF_SYSCALL_TRACEPOINT (1<<TIF_SYSCALL_TRACEPOINT)
#define _TIF_EMULATE_STACK_STORE (1<<TIF_EMULATE_STACK_STORE)
#define _TIF_NOHZ (1<<TIF_NOHZ)
@@ -1087,43 +1396,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/include/asm/thread_info.h linux-4.9.28/
/* Bits in local_flags */
/* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
-diff -Nur linux-4.9.28.orig/arch/powerpc/Kconfig linux-4.9.28/arch/powerpc/Kconfig
---- linux-4.9.28.orig/arch/powerpc/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/Kconfig 2017-05-19 03:37:25.126174470 +0200
-@@ -52,10 +52,11 @@
-
- config RWSEM_GENERIC_SPINLOCK
- bool
-+ default y if PREEMPT_RT_FULL
-
- config RWSEM_XCHGADD_ALGORITHM
- bool
-- default y
-+ default y if !PREEMPT_RT_FULL
-
- config GENERIC_LOCKBREAK
- bool
-@@ -134,6 +135,7 @@
- select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
- select GENERIC_STRNCPY_FROM_USER
- select GENERIC_STRNLEN_USER
-+ select HAVE_PREEMPT_LAZY
- select HAVE_MOD_ARCH_SPECIFIC
- select MODULES_USE_ELF_RELA
- select CLONE_BACKWARDS
-@@ -321,7 +323,7 @@
-
- config HIGHMEM
- bool "High memory support"
-- depends on PPC32
-+ depends on PPC32 && !PREEMPT_RT_FULL
-
- source kernel/Kconfig.hz
- source kernel/Kconfig.preempt
-diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/asm-offsets.c linux-4.9.28/arch/powerpc/kernel/asm-offsets.c
---- linux-4.9.28.orig/arch/powerpc/kernel/asm-offsets.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kernel/asm-offsets.c 2017-05-19 03:37:25.126174470 +0200
-@@ -156,6 +156,7 @@
+diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
+index c833d88c423d..96e9fbc3f684 100644
+--- a/arch/powerpc/kernel/asm-offsets.c
++++ b/arch/powerpc/kernel/asm-offsets.c
+@@ -156,6 +156,7 @@ int main(void)
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_LOCAL_FLAGS, offsetof(struct thread_info, local_flags));
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
@@ -1131,10 +1408,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/asm-offsets.c linux-4.9.28/arch/
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
-diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_32.S linux-4.9.28/arch/powerpc/kernel/entry_32.S
---- linux-4.9.28.orig/arch/powerpc/kernel/entry_32.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kernel/entry_32.S 2017-05-19 03:37:25.126174470 +0200
-@@ -835,7 +835,14 @@
+diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
+index 3841d749a430..6dbaeff192b9 100644
+--- a/arch/powerpc/kernel/entry_32.S
++++ b/arch/powerpc/kernel/entry_32.S
+@@ -835,7 +835,14 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
cmpwi 0,r0,0 /* if non-zero, just restore regs and return */
bne restore
andi. r8,r8,_TIF_NEED_RESCHED
@@ -1149,7 +1427,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_32.S linux-4.9.28/arch/pow
lwz r3,_MSR(r1)
andi. r0,r3,MSR_EE /* interrupts off? */
beq restore /* don't schedule if so */
-@@ -846,11 +853,11 @@
+@@ -846,11 +853,11 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
*/
bl trace_hardirqs_off
#endif
@@ -1164,7 +1442,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_32.S linux-4.9.28/arch/pow
#ifdef CONFIG_TRACE_IRQFLAGS
/* And now, to properly rebalance the above, we tell lockdep they
* are being turned back on, which will happen when we return
-@@ -1171,7 +1178,7 @@
+@@ -1171,7 +1178,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
#endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
do_work: /* r10 contains MSR_KERNEL here */
@@ -1173,7 +1451,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_32.S linux-4.9.28/arch/pow
beq do_user_signal
do_resched: /* r10 contains MSR_KERNEL here */
-@@ -1192,7 +1199,7 @@
+@@ -1192,7 +1199,7 @@ do_resched: /* r10 contains MSR_KERNEL here */
MTMSRD(r10) /* disable interrupts */
CURRENT_THREAD_INFO(r9, r1)
lwz r9,TI_FLAGS(r9)
@@ -1182,10 +1460,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_32.S linux-4.9.28/arch/pow
bne- do_resched
andi. r0,r9,_TIF_USER_WORK_MASK
beq restore_user
-diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_64.S linux-4.9.28/arch/powerpc/kernel/entry_64.S
---- linux-4.9.28.orig/arch/powerpc/kernel/entry_64.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kernel/entry_64.S 2017-05-19 03:37:25.126174470 +0200
-@@ -656,7 +656,7 @@
+diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
+index 767ef6d68c9e..2cb4d5552319 100644
+--- a/arch/powerpc/kernel/entry_64.S
++++ b/arch/powerpc/kernel/entry_64.S
+@@ -656,7 +656,7 @@ _GLOBAL(ret_from_except_lite)
bl restore_math
b restore
#endif
@@ -1194,27 +1473,29 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_64.S linux-4.9.28/arch/pow
beq 2f
bl restore_interrupts
SCHEDULE_USER
-@@ -718,10 +718,18 @@
+@@ -718,10 +718,18 @@ _GLOBAL(ret_from_except_lite)
#ifdef CONFIG_PREEMPT
/* Check if we need to preempt */
-+ lwz r8,TI_PREEMPT(r9)
+- andi. r0,r4,_TIF_NEED_RESCHED
+- beq+ restore
+- /* Check that preempt_count() == 0 and interrupts are enabled */
+ lwz r8,TI_PREEMPT(r9)
+ cmpwi 0,r8,0 /* if non-zero, just restore regs and return */
+ bne restore
- andi. r0,r4,_TIF_NEED_RESCHED
++ andi. r0,r4,_TIF_NEED_RESCHED
+ bne+ check_count
+
+ andi. r0,r4,_TIF_NEED_RESCHED_LAZY
- beq+ restore
++ beq+ restore
+ lwz r8,TI_PREEMPT_LAZY(r9)
+
- /* Check that preempt_count() == 0 and interrupts are enabled */
-- lwz r8,TI_PREEMPT(r9)
++ /* Check that preempt_count() == 0 and interrupts are enabled */
+check_count:
cmpwi cr1,r8,0
ld r0,SOFTE(r1)
cmpdi r0,0
-@@ -738,7 +746,7 @@
+@@ -738,7 +746,7 @@ _GLOBAL(ret_from_except_lite)
/* Re-test flags and eventually loop */
CURRENT_THREAD_INFO(r9, r1)
ld r4,TI_FLAGS(r9)
@@ -1223,10 +1504,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/entry_64.S linux-4.9.28/arch/pow
bne 1b
/*
-diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/irq.c linux-4.9.28/arch/powerpc/kernel/irq.c
---- linux-4.9.28.orig/arch/powerpc/kernel/irq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kernel/irq.c 2017-05-19 03:37:25.126174470 +0200
-@@ -638,6 +638,7 @@
+diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
+index 3c05c311e35e..f83f6ac1274d 100644
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
+@@ -638,6 +638,7 @@ void irq_ctx_init(void)
}
}
@@ -1234,7 +1516,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/irq.c linux-4.9.28/arch/powerpc/
void do_softirq_own_stack(void)
{
struct thread_info *curtp, *irqtp;
-@@ -655,6 +656,7 @@
+@@ -655,6 +656,7 @@ void do_softirq_own_stack(void)
if (irqtp->flags)
set_bits(irqtp->flags, &curtp->flags);
}
@@ -1242,9 +1524,10 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/irq.c linux-4.9.28/arch/powerpc/
irq_hw_number_t virq_to_hw(unsigned int virq)
{
-diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/misc_32.S linux-4.9.28/arch/powerpc/kernel/misc_32.S
---- linux-4.9.28.orig/arch/powerpc/kernel/misc_32.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kernel/misc_32.S 2017-05-19 03:37:25.126174470 +0200
+diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
+index 030d72df5dd5..b471a709e100 100644
+--- a/arch/powerpc/kernel/misc_32.S
++++ b/arch/powerpc/kernel/misc_32.S
@@ -41,6 +41,7 @@
* We store the saved ksp_limit in the unused part
* of the STACK_FRAME_OVERHEAD
@@ -1253,7 +1536,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/misc_32.S linux-4.9.28/arch/powe
_GLOBAL(call_do_softirq)
mflr r0
stw r0,4(r1)
-@@ -57,6 +58,7 @@
+@@ -57,6 +58,7 @@ _GLOBAL(call_do_softirq)
stw r10,THREAD+KSP_LIMIT(r2)
mtlr r0
blr
@@ -1261,9 +1544,10 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/misc_32.S linux-4.9.28/arch/powe
/*
* void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
-diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/misc_64.S linux-4.9.28/arch/powerpc/kernel/misc_64.S
---- linux-4.9.28.orig/arch/powerpc/kernel/misc_64.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kernel/misc_64.S 2017-05-19 03:37:25.126174470 +0200
+diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
+index 4cefe6888b18..cb2ee4be999a 100644
+--- a/arch/powerpc/kernel/misc_64.S
++++ b/arch/powerpc/kernel/misc_64.S
@@ -31,6 +31,7 @@
.text
@@ -1272,7 +1556,7 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/misc_64.S linux-4.9.28/arch/powe
_GLOBAL(call_do_softirq)
mflr r0
std r0,16(r1)
-@@ -41,6 +42,7 @@
+@@ -41,6 +42,7 @@ _GLOBAL(call_do_softirq)
ld r0,16(r1)
mtlr r0
blr
@@ -1280,10 +1564,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kernel/misc_64.S linux-4.9.28/arch/powe
_GLOBAL(call_do_irq)
mflr r0
-diff -Nur linux-4.9.28.orig/arch/powerpc/kvm/Kconfig linux-4.9.28/arch/powerpc/kvm/Kconfig
---- linux-4.9.28.orig/arch/powerpc/kvm/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/kvm/Kconfig 2017-05-19 03:37:25.126174470 +0200
-@@ -175,6 +175,7 @@
+diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
+index 029be26b5a17..9528089ea142 100644
+--- a/arch/powerpc/kvm/Kconfig
++++ b/arch/powerpc/kvm/Kconfig
+@@ -175,6 +175,7 @@ config KVM_E500MC
config KVM_MPIC
bool "KVM in-kernel MPIC emulation"
depends on KVM && E500
@@ -1291,10 +1576,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/kvm/Kconfig linux-4.9.28/arch/powerpc/k
select HAVE_KVM_IRQCHIP
select HAVE_KVM_IRQFD
select HAVE_KVM_IRQ_ROUTING
-diff -Nur linux-4.9.28.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.9.28/arch/powerpc/platforms/ps3/device-init.c
---- linux-4.9.28.orig/arch/powerpc/platforms/ps3/device-init.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/powerpc/platforms/ps3/device-init.c 2017-05-19 03:37:25.126174470 +0200
-@@ -752,7 +752,7 @@
+diff --git a/arch/powerpc/platforms/ps3/device-init.c b/arch/powerpc/platforms/ps3/device-init.c
+index e48462447ff0..2670cee66064 100644
+--- a/arch/powerpc/platforms/ps3/device-init.c
++++ b/arch/powerpc/platforms/ps3/device-init.c
+@@ -752,7 +752,7 @@ static int ps3_notification_read_write(struct ps3_notification_device *dev,
}
pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
@@ -1303,10 +1589,11 @@ diff -Nur linux-4.9.28.orig/arch/powerpc/platforms/ps3/device-init.c linux-4.9.2
dev->done.done || kthread_should_stop());
if (kthread_should_stop())
res = -EINTR;
-diff -Nur linux-4.9.28.orig/arch/sh/kernel/irq.c linux-4.9.28/arch/sh/kernel/irq.c
---- linux-4.9.28.orig/arch/sh/kernel/irq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/sh/kernel/irq.c 2017-05-19 03:37:25.126174470 +0200
-@@ -147,6 +147,7 @@
+diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c
+index 6c0378c0b8b5..abd58b4dff97 100644
+--- a/arch/sh/kernel/irq.c
++++ b/arch/sh/kernel/irq.c
+@@ -147,6 +147,7 @@ void irq_ctx_exit(int cpu)
hardirq_ctx[cpu] = NULL;
}
@@ -1314,7 +1601,7 @@ diff -Nur linux-4.9.28.orig/arch/sh/kernel/irq.c linux-4.9.28/arch/sh/kernel/irq
void do_softirq_own_stack(void)
{
struct thread_info *curctx;
-@@ -174,6 +175,7 @@
+@@ -174,6 +175,7 @@ void do_softirq_own_stack(void)
"r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
);
}
@@ -1322,10 +1609,11 @@ diff -Nur linux-4.9.28.orig/arch/sh/kernel/irq.c linux-4.9.28/arch/sh/kernel/irq
#else
static inline void handle_one_irq(unsigned int irq)
{
-diff -Nur linux-4.9.28.orig/arch/sparc/Kconfig linux-4.9.28/arch/sparc/Kconfig
---- linux-4.9.28.orig/arch/sparc/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/sparc/Kconfig 2017-05-19 03:37:25.126174470 +0200
-@@ -194,12 +194,10 @@
+diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
+index 165ecdd24d22..b68a464a22be 100644
+--- a/arch/sparc/Kconfig
++++ b/arch/sparc/Kconfig
+@@ -194,12 +194,10 @@ config NR_CPUS
source kernel/Kconfig.hz
config RWSEM_GENERIC_SPINLOCK
@@ -1340,10 +1628,11 @@ diff -Nur linux-4.9.28.orig/arch/sparc/Kconfig linux-4.9.28/arch/sparc/Kconfig
config GENERIC_HWEIGHT
bool
-diff -Nur linux-4.9.28.orig/arch/sparc/kernel/irq_64.c linux-4.9.28/arch/sparc/kernel/irq_64.c
---- linux-4.9.28.orig/arch/sparc/kernel/irq_64.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/sparc/kernel/irq_64.c 2017-05-19 03:37:25.126174470 +0200
-@@ -854,6 +854,7 @@
+diff --git a/arch/sparc/kernel/irq_64.c b/arch/sparc/kernel/irq_64.c
+index 34a7930b76ef..773740521008 100644
+--- a/arch/sparc/kernel/irq_64.c
++++ b/arch/sparc/kernel/irq_64.c
+@@ -854,6 +854,7 @@ void __irq_entry handler_irq(int pil, struct pt_regs *regs)
set_irq_regs(old_regs);
}
@@ -1351,7 +1640,7 @@ diff -Nur linux-4.9.28.orig/arch/sparc/kernel/irq_64.c linux-4.9.28/arch/sparc/k
void do_softirq_own_stack(void)
{
void *orig_sp, *sp = softirq_stack[smp_processor_id()];
-@@ -868,6 +869,7 @@
+@@ -868,6 +869,7 @@ void do_softirq_own_stack(void)
__asm__ __volatile__("mov %0, %%sp"
: : "r" (orig_sp));
}
@@ -1359,10 +1648,45 @@ diff -Nur linux-4.9.28.orig/arch/sparc/kernel/irq_64.c linux-4.9.28/arch/sparc/k
#ifdef CONFIG_HOTPLUG_CPU
void fixup_irqs(void)
-diff -Nur linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.9.28/arch/x86/crypto/aesni-intel_glue.c
---- linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/crypto/aesni-intel_glue.c 2017-05-19 03:37:25.130174719 +0200
-@@ -372,14 +372,14 @@
+diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
+index bada636d1065..f8a995c90c01 100644
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -17,6 +17,7 @@ config X86_64
+ ### Arch settings
+ config X86
+ def_bool y
++ select HAVE_PREEMPT_LAZY
+ select ACPI_LEGACY_TABLES_LOOKUP if ACPI
+ select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
+ select ANON_INODES
+@@ -232,8 +233,11 @@ config ARCH_MAY_HAVE_PC_FDC
+ def_bool y
+ depends on ISA_DMA_API
+
++config RWSEM_GENERIC_SPINLOCK
++ def_bool PREEMPT_RT_FULL
++
+ config RWSEM_XCHGADD_ALGORITHM
+- def_bool y
++ def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
+
+ config GENERIC_CALIBRATE_DELAY
+ def_bool y
+@@ -897,7 +901,7 @@ config IOMMU_HELPER
+ config MAXSMP
+ bool "Enable Maximum number of SMP Processors and NUMA Nodes"
+ depends on X86_64 && SMP && DEBUG_KERNEL
+- select CPUMASK_OFFSTACK
++ select CPUMASK_OFFSTACK if !PREEMPT_RT_FULL
+ ---help---
+ Enable maximum number of CPUS and NUMA Nodes for this architecture.
+ If unsure, say N.
+diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
+index aa8b0672f87a..2429414bfc71 100644
+--- a/arch/x86/crypto/aesni-intel_glue.c
++++ b/arch/x86/crypto/aesni-intel_glue.c
+@@ -372,14 +372,14 @@ static int ecb_encrypt(struct blkcipher_desc *desc,
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1380,7 +1704,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.9.28/arch
return err;
}
-@@ -396,14 +396,14 @@
+@@ -396,14 +396,14 @@ static int ecb_decrypt(struct blkcipher_desc *desc,
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1397,7 +1721,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.9.28/arch
return err;
}
-@@ -420,14 +420,14 @@
+@@ -420,14 +420,14 @@ static int cbc_encrypt(struct blkcipher_desc *desc,
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1414,7 +1738,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.9.28/arch
return err;
}
-@@ -444,14 +444,14 @@
+@@ -444,14 +444,14 @@ static int cbc_decrypt(struct blkcipher_desc *desc,
err = blkcipher_walk_virt(desc, &walk);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1431,7 +1755,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.9.28/arch
return err;
}
-@@ -503,18 +503,20 @@
+@@ -503,18 +503,20 @@ static int ctr_crypt(struct blkcipher_desc *desc,
err = blkcipher_walk_virt_block(desc, &walk, AES_BLOCK_SIZE);
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
@@ -1454,10 +1778,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/aesni-intel_glue.c linux-4.9.28/arch
return err;
}
-diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x86/crypto/cast5_avx_glue.c
---- linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/crypto/cast5_avx_glue.c 2017-05-19 03:37:25.130174719 +0200
-@@ -59,7 +59,7 @@
+diff --git a/arch/x86/crypto/cast5_avx_glue.c b/arch/x86/crypto/cast5_avx_glue.c
+index 8648158f3916..d7699130ee36 100644
+--- a/arch/x86/crypto/cast5_avx_glue.c
++++ b/arch/x86/crypto/cast5_avx_glue.c
+@@ -59,7 +59,7 @@ static inline void cast5_fpu_end(bool fpu_enabled)
static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
bool enc)
{
@@ -1466,7 +1791,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = CAST5_BLOCK_SIZE;
unsigned int nbytes;
-@@ -75,7 +75,7 @@
+@@ -75,7 +75,7 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
u8 *wsrc = walk->src.virt.addr;
u8 *wdst = walk->dst.virt.addr;
@@ -1475,7 +1800,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
/* Process multi-block batch */
if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) {
-@@ -103,10 +103,9 @@
+@@ -103,10 +103,9 @@ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
} while (nbytes >= bsize);
done:
@@ -1487,7 +1812,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
return err;
}
-@@ -227,7 +226,7 @@
+@@ -227,7 +226,7 @@ static unsigned int __cbc_decrypt(struct blkcipher_desc *desc,
static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{
@@ -1496,7 +1821,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
struct blkcipher_walk walk;
int err;
-@@ -236,12 +235,11 @@
+@@ -236,12 +235,11 @@ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
while ((nbytes = walk.nbytes)) {
@@ -1511,7 +1836,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
return err;
}
-@@ -311,7 +309,7 @@
+@@ -311,7 +309,7 @@ static unsigned int __ctr_crypt(struct blkcipher_desc *desc,
static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
struct scatterlist *src, unsigned int nbytes)
{
@@ -1520,7 +1845,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
struct blkcipher_walk walk;
int err;
-@@ -320,13 +318,12 @@
+@@ -320,13 +318,12 @@ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) {
@@ -1536,10 +1861,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/cast5_avx_glue.c linux-4.9.28/arch/x
if (walk.nbytes) {
ctr_crypt_final(desc, &walk);
err = blkcipher_walk_done(desc, &walk, 0);
-diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/crypto/glue_helper.c
---- linux-4.9.28.orig/arch/x86/crypto/glue_helper.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/crypto/glue_helper.c 2017-05-19 03:37:25.130174719 +0200
-@@ -39,7 +39,7 @@
+diff --git a/arch/x86/crypto/glue_helper.c b/arch/x86/crypto/glue_helper.c
+index 6a85598931b5..3a506ce7ed93 100644
+--- a/arch/x86/crypto/glue_helper.c
++++ b/arch/x86/crypto/glue_helper.c
+@@ -39,7 +39,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
void *ctx = crypto_blkcipher_ctx(desc->tfm);
const unsigned int bsize = 128 / 8;
unsigned int nbytes, i, func_bytes;
@@ -1548,7 +1874,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
int err;
err = blkcipher_walk_virt(desc, walk);
-@@ -49,7 +49,7 @@
+@@ -49,7 +49,7 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
u8 *wdst = walk->dst.virt.addr;
fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1557,7 +1883,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
for (i = 0; i < gctx->num_funcs; i++) {
func_bytes = bsize * gctx->funcs[i].num_blocks;
-@@ -71,10 +71,10 @@
+@@ -71,10 +71,10 @@ static int __glue_ecb_crypt_128bit(const struct common_glue_ctx *gctx,
}
done:
@@ -1569,7 +1895,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
return err;
}
-@@ -194,7 +194,7 @@
+@@ -194,7 +194,7 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
struct scatterlist *src, unsigned int nbytes)
{
const unsigned int bsize = 128 / 8;
@@ -1578,7 +1904,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
struct blkcipher_walk walk;
int err;
-@@ -203,12 +203,12 @@
+@@ -203,12 +203,12 @@ int glue_cbc_decrypt_128bit(const struct common_glue_ctx *gctx,
while ((nbytes = walk.nbytes)) {
fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1593,7 +1919,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
return err;
}
EXPORT_SYMBOL_GPL(glue_cbc_decrypt_128bit);
-@@ -277,7 +277,7 @@
+@@ -277,7 +277,7 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
struct scatterlist *src, unsigned int nbytes)
{
const unsigned int bsize = 128 / 8;
@@ -1602,7 +1928,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
struct blkcipher_walk walk;
int err;
-@@ -286,13 +286,12 @@
+@@ -286,13 +286,12 @@ int glue_ctr_crypt_128bit(const struct common_glue_ctx *gctx,
while ((nbytes = walk.nbytes) >= bsize) {
fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1618,7 +1944,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
if (walk.nbytes) {
glue_ctr_crypt_final_128bit(
gctx->funcs[gctx->num_funcs - 1].fn_u.ctr, desc, &walk);
-@@ -347,7 +346,7 @@
+@@ -347,7 +346,7 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
void *tweak_ctx, void *crypt_ctx)
{
const unsigned int bsize = 128 / 8;
@@ -1627,7 +1953,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
struct blkcipher_walk walk;
int err;
-@@ -360,21 +359,21 @@
+@@ -360,21 +359,21 @@ int glue_xts_crypt_128bit(const struct common_glue_ctx *gctx,
/* set minimum length to bsize, for tweak_fn */
fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
@@ -1654,10 +1980,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/crypto/glue_helper.c linux-4.9.28/arch/x86/
return err;
}
EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
-diff -Nur linux-4.9.28.orig/arch/x86/entry/common.c linux-4.9.28/arch/x86/entry/common.c
---- linux-4.9.28.orig/arch/x86/entry/common.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/entry/common.c 2017-05-19 03:37:25.130174719 +0200
-@@ -129,7 +129,7 @@
+diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
+index bdd9cc59d20f..56d01a339ba4 100644
+--- a/arch/x86/entry/common.c
++++ b/arch/x86/entry/common.c
+@@ -129,7 +129,7 @@ static long syscall_trace_enter(struct pt_regs *regs)
#define EXIT_TO_USERMODE_LOOP_FLAGS \
(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
@@ -1666,7 +1993,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/entry/common.c linux-4.9.28/arch/x86/entry/
static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
{
-@@ -145,9 +145,16 @@
+@@ -145,9 +145,16 @@ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
/* We have work to do. */
local_irq_enable();
@@ -1684,10 +2011,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/entry/common.c linux-4.9.28/arch/x86/entry/
if (cached_flags & _TIF_UPROBE)
uprobe_notify_resume(regs);
-diff -Nur linux-4.9.28.orig/arch/x86/entry/entry_32.S linux-4.9.28/arch/x86/entry/entry_32.S
---- linux-4.9.28.orig/arch/x86/entry/entry_32.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/entry/entry_32.S 2017-05-19 03:37:25.130174719 +0200
-@@ -308,8 +308,25 @@
+diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S
+index edba8606b99a..4a3389535fc6 100644
+--- a/arch/x86/entry/entry_32.S
++++ b/arch/x86/entry/entry_32.S
+@@ -308,8 +308,25 @@ END(ret_from_exception)
ENTRY(resume_kernel)
DISABLE_INTERRUPTS(CLBR_ANY)
need_resched:
@@ -1713,10 +2041,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/entry/entry_32.S linux-4.9.28/arch/x86/entr
testl $X86_EFLAGS_IF, PT_EFLAGS(%esp) # interrupts off (exception path) ?
jz restore_all
call preempt_schedule_irq
-diff -Nur linux-4.9.28.orig/arch/x86/entry/entry_64.S linux-4.9.28/arch/x86/entry/entry_64.S
---- linux-4.9.28.orig/arch/x86/entry/entry_64.S 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/entry/entry_64.S 2017-05-19 03:37:25.130174719 +0200
-@@ -546,7 +546,23 @@
+diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
+index ef766a358b37..28401f826ab1 100644
+--- a/arch/x86/entry/entry_64.S
++++ b/arch/x86/entry/entry_64.S
+@@ -546,7 +546,23 @@ GLOBAL(retint_user)
bt $9, EFLAGS(%rsp) /* were interrupts off? */
jnc 1f
0: cmpl $0, PER_CPU_VAR(__preempt_count)
@@ -1740,7 +2069,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/entry/entry_64.S linux-4.9.28/arch/x86/entr
call preempt_schedule_irq
jmp 0b
1:
-@@ -894,6 +910,7 @@
+@@ -894,6 +910,7 @@ EXPORT_SYMBOL(native_load_gs_index)
jmp 2b
.previous
@@ -1748,7 +2077,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/entry/entry_64.S linux-4.9.28/arch/x86/entr
/* Call softirq on interrupt stack. Interrupts are off. */
ENTRY(do_softirq_own_stack)
pushq %rbp
-@@ -906,6 +923,7 @@
+@@ -906,6 +923,7 @@ ENTRY(do_softirq_own_stack)
decl PER_CPU_VAR(irq_count)
ret
END(do_softirq_own_stack)
@@ -1756,10 +2085,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/entry/entry_64.S linux-4.9.28/arch/x86/entr
#ifdef CONFIG_XEN
idtentry xen_hypervisor_callback xen_do_hypervisor_callback has_error_code=0
-diff -Nur linux-4.9.28.orig/arch/x86/include/asm/preempt.h linux-4.9.28/arch/x86/include/asm/preempt.h
---- linux-4.9.28.orig/arch/x86/include/asm/preempt.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/include/asm/preempt.h 2017-05-19 03:37:25.130174719 +0200
-@@ -79,17 +79,46 @@
+diff --git a/arch/x86/include/asm/preempt.h b/arch/x86/include/asm/preempt.h
+index 17f218645701..11bd1b7ee6eb 100644
+--- a/arch/x86/include/asm/preempt.h
++++ b/arch/x86/include/asm/preempt.h
+@@ -79,17 +79,46 @@ static __always_inline void __preempt_count_sub(int val)
* a decrement which hits zero means we have no preempt_count and should
* reschedule.
*/
@@ -1807,10 +2137,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/preempt.h linux-4.9.28/arch/x86
}
#ifdef CONFIG_PREEMPT
-diff -Nur linux-4.9.28.orig/arch/x86/include/asm/signal.h linux-4.9.28/arch/x86/include/asm/signal.h
---- linux-4.9.28.orig/arch/x86/include/asm/signal.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/include/asm/signal.h 2017-05-19 03:37:25.130174719 +0200
-@@ -27,6 +27,19 @@
+diff --git a/arch/x86/include/asm/signal.h b/arch/x86/include/asm/signal.h
+index 8af22be0fe61..d1328789b759 100644
+--- a/arch/x86/include/asm/signal.h
++++ b/arch/x86/include/asm/signal.h
+@@ -27,6 +27,19 @@ typedef struct {
#define SA_IA32_ABI 0x02000000u
#define SA_X32_ABI 0x01000000u
@@ -1830,9 +2161,10 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/signal.h linux-4.9.28/arch/x86/
#ifndef CONFIG_COMPAT
typedef sigset_t compat_sigset_t;
#endif
-diff -Nur linux-4.9.28.orig/arch/x86/include/asm/stackprotector.h linux-4.9.28/arch/x86/include/asm/stackprotector.h
---- linux-4.9.28.orig/arch/x86/include/asm/stackprotector.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/include/asm/stackprotector.h 2017-05-19 03:37:25.130174719 +0200
+diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h
+index 58505f01962f..02fa39652cd6 100644
+--- a/arch/x86/include/asm/stackprotector.h
++++ b/arch/x86/include/asm/stackprotector.h
@@ -59,7 +59,7 @@
*/
static __always_inline void boot_init_stack_canary(void)
@@ -1842,7 +2174,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/stackprotector.h linux-4.9.28/a
u64 tsc;
#ifdef CONFIG_X86_64
-@@ -70,8 +70,15 @@
+@@ -70,8 +70,15 @@ static __always_inline void boot_init_stack_canary(void)
* of randomness. The TSC only matters for very early init,
* there it already has some randomness on most systems. Later
* on during the bootup the random pool has true entropy too.
@@ -1858,10 +2190,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/stackprotector.h linux-4.9.28/a
tsc = rdtsc();
canary += tsc + (tsc << 32UL);
-diff -Nur linux-4.9.28.orig/arch/x86/include/asm/thread_info.h linux-4.9.28/arch/x86/include/asm/thread_info.h
---- linux-4.9.28.orig/arch/x86/include/asm/thread_info.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/include/asm/thread_info.h 2017-05-19 03:37:25.130174719 +0200
-@@ -54,11 +54,14 @@
+diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
+index ad6f5eb07a95..5ceb3a1c2b1a 100644
+--- a/arch/x86/include/asm/thread_info.h
++++ b/arch/x86/include/asm/thread_info.h
+@@ -54,11 +54,14 @@ struct task_struct;
struct thread_info {
unsigned long flags; /* low level flags */
@@ -1876,7 +2209,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/thread_info.h linux-4.9.28/arch
}
#define init_stack (init_thread_union.stack)
-@@ -67,6 +70,10 @@
+@@ -67,6 +70,10 @@ struct thread_info {
#include <asm/asm-offsets.h>
@@ -1887,7 +2220,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/thread_info.h linux-4.9.28/arch
#endif
/*
-@@ -85,6 +92,7 @@
+@@ -85,6 +92,7 @@ struct thread_info {
#define TIF_SYSCALL_EMU 6 /* syscall emulation active */
#define TIF_SYSCALL_AUDIT 7 /* syscall auditing active */
#define TIF_SECCOMP 8 /* secure computing */
@@ -1895,7 +2228,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/thread_info.h linux-4.9.28/arch
#define TIF_USER_RETURN_NOTIFY 11 /* notify kernel of userspace return */
#define TIF_UPROBE 12 /* breakpointed or singlestepping */
#define TIF_NOTSC 16 /* TSC is not accessible in userland */
-@@ -108,6 +116,7 @@
+@@ -108,6 +116,7 @@ struct thread_info {
#define _TIF_SYSCALL_EMU (1 << TIF_SYSCALL_EMU)
#define _TIF_SYSCALL_AUDIT (1 << TIF_SYSCALL_AUDIT)
#define _TIF_SECCOMP (1 << TIF_SECCOMP)
@@ -1903,7 +2236,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/thread_info.h linux-4.9.28/arch
#define _TIF_USER_RETURN_NOTIFY (1 << TIF_USER_RETURN_NOTIFY)
#define _TIF_UPROBE (1 << TIF_UPROBE)
#define _TIF_NOTSC (1 << TIF_NOTSC)
-@@ -143,6 +152,8 @@
+@@ -143,6 +152,8 @@ struct thread_info {
#define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
#define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
@@ -1912,10 +2245,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/thread_info.h linux-4.9.28/arch
#define STACK_WARN (THREAD_SIZE/8)
/*
-diff -Nur linux-4.9.28.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.9.28/arch/x86/include/asm/uv/uv_bau.h
---- linux-4.9.28.orig/arch/x86/include/asm/uv/uv_bau.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/include/asm/uv/uv_bau.h 2017-05-19 03:37:25.130174719 +0200
-@@ -624,9 +624,9 @@
+diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
+index 57ab86d94d64..35d25e27180f 100644
+--- a/arch/x86/include/asm/uv/uv_bau.h
++++ b/arch/x86/include/asm/uv/uv_bau.h
+@@ -624,9 +624,9 @@ struct bau_control {
cycles_t send_message;
cycles_t period_end;
cycles_t period_time;
@@ -1928,7 +2262,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.9.28/arch/x
/* tunables */
int max_concurr;
int max_concurr_const;
-@@ -815,15 +815,15 @@
+@@ -815,15 +815,15 @@ static inline int atom_asr(short i, struct atomic_short *v)
* to be lowered below the current 'v'. atomic_add_unless can only stop
* on equal.
*/
@@ -1948,43 +2282,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/include/asm/uv/uv_bau.h linux-4.9.28/arch/x
return 1;
}
-diff -Nur linux-4.9.28.orig/arch/x86/Kconfig linux-4.9.28/arch/x86/Kconfig
---- linux-4.9.28.orig/arch/x86/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/Kconfig 2017-05-19 03:37:25.130174719 +0200
-@@ -17,6 +17,7 @@
- ### Arch settings
- config X86
- def_bool y
-+ select HAVE_PREEMPT_LAZY
- select ACPI_LEGACY_TABLES_LOOKUP if ACPI
- select ACPI_SYSTEM_POWER_STATES_SUPPORT if ACPI
- select ANON_INODES
-@@ -232,8 +233,11 @@
- def_bool y
- depends on ISA_DMA_API
-
-+config RWSEM_GENERIC_SPINLOCK
-+ def_bool PREEMPT_RT_FULL
-+
- config RWSEM_XCHGADD_ALGORITHM
-- def_bool y
-+ def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
-
- config GENERIC_CALIBRATE_DELAY
- def_bool y
-@@ -897,7 +901,7 @@
- config MAXSMP
- bool "Enable Maximum number of SMP Processors and NUMA Nodes"
- depends on X86_64 && SMP && DEBUG_KERNEL
-- select CPUMASK_OFFSTACK
-+ select CPUMASK_OFFSTACK if !PREEMPT_RT_FULL
- ---help---
- Enable maximum number of CPUS and NUMA Nodes for this architecture.
- If unsure, say N.
-diff -Nur linux-4.9.28.orig/arch/x86/kernel/acpi/boot.c linux-4.9.28/arch/x86/kernel/acpi/boot.c
---- linux-4.9.28.orig/arch/x86/kernel/acpi/boot.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kernel/acpi/boot.c 2017-05-19 03:37:25.130174719 +0200
-@@ -87,7 +87,9 @@
+diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
+index 931ced8ca345..167975ac8af7 100644
+--- a/arch/x86/kernel/acpi/boot.c
++++ b/arch/x86/kernel/acpi/boot.c
+@@ -87,7 +87,9 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
* ->ioapic_mutex
* ->ioapic_lock
*/
@@ -1994,10 +2296,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/acpi/boot.c linux-4.9.28/arch/x86/ke
/* --------------------------------------------------------------------------
Boot-time Configuration
-diff -Nur linux-4.9.28.orig/arch/x86/kernel/apic/io_apic.c linux-4.9.28/arch/x86/kernel/apic/io_apic.c
---- linux-4.9.28.orig/arch/x86/kernel/apic/io_apic.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kernel/apic/io_apic.c 2017-05-19 03:37:25.130174719 +0200
-@@ -1712,7 +1712,8 @@
+diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
+index 7249f1500bcb..a79d5c224004 100644
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -1712,7 +1712,8 @@ static bool io_apic_level_ack_pending(struct mp_chip_data *data)
static inline bool ioapic_irqd_mask(struct irq_data *data)
{
/* If we are moving the irq we need to mask it */
@@ -2007,10 +2310,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/apic/io_apic.c linux-4.9.28/arch/x86
mask_ioapic_irq(data);
return true;
}
-diff -Nur linux-4.9.28.orig/arch/x86/kernel/asm-offsets.c linux-4.9.28/arch/x86/kernel/asm-offsets.c
---- linux-4.9.28.orig/arch/x86/kernel/asm-offsets.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kernel/asm-offsets.c 2017-05-19 03:37:25.130174719 +0200
-@@ -36,6 +36,7 @@
+diff --git a/arch/x86/kernel/asm-offsets.c b/arch/x86/kernel/asm-offsets.c
+index c62e015b126c..0cc71257fca6 100644
+--- a/arch/x86/kernel/asm-offsets.c
++++ b/arch/x86/kernel/asm-offsets.c
+@@ -36,6 +36,7 @@ void common(void) {
BLANK();
OFFSET(TASK_TI_flags, task_struct, thread_info.flags);
@@ -2018,15 +2322,16 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/asm-offsets.c linux-4.9.28/arch/x86/
OFFSET(TASK_addr_limit, task_struct, thread.addr_limit);
BLANK();
-@@ -91,4 +92,5 @@
+@@ -91,4 +92,5 @@ void common(void) {
BLANK();
DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
+ DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
}
-diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kernel/cpu/mcheck/mce.c 2017-05-19 03:37:25.130174719 +0200
+diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
+index 22cda29d654e..57c85e3af092 100644
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -41,6 +41,8 @@
#include <linux/debugfs.h>
#include <linux/irq_work.h>
@@ -2036,7 +2341,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
#include <linux/jump_label.h>
#include <asm/processor.h>
-@@ -1307,7 +1309,7 @@
+@@ -1307,7 +1309,7 @@ void mce_log_therm_throt_event(__u64 status)
static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
@@ -2045,7 +2350,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
static unsigned long mce_adjust_timer_default(unsigned long interval)
{
-@@ -1316,32 +1318,18 @@
+@@ -1316,32 +1318,18 @@ static unsigned long mce_adjust_timer_default(unsigned long interval)
static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
@@ -2084,7 +2389,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
iv = __this_cpu_read(mce_next_interval);
if (mce_available(this_cpu_ptr(&cpu_info))) {
-@@ -1364,7 +1352,7 @@
+@@ -1364,7 +1352,7 @@ static void mce_timer_fn(unsigned long data)
done:
__this_cpu_write(mce_next_interval, iv);
@@ -2093,7 +2398,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
}
/*
-@@ -1372,7 +1360,7 @@
+@@ -1372,7 +1360,7 @@ static void mce_timer_fn(unsigned long data)
*/
void mce_timer_kick(unsigned long interval)
{
@@ -2102,7 +2407,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
unsigned long iv = __this_cpu_read(mce_next_interval);
__restart_timer(t, interval);
-@@ -1387,7 +1375,7 @@
+@@ -1387,7 +1375,7 @@ static void mce_timer_delete_all(void)
int cpu;
for_each_online_cpu(cpu)
@@ -2111,7 +2416,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
}
static void mce_do_trigger(struct work_struct *work)
-@@ -1397,6 +1385,56 @@
+@@ -1397,6 +1385,56 @@ static void mce_do_trigger(struct work_struct *work)
static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
@@ -2168,7 +2473,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
/*
* Notify the user(s) about new machine check events.
* Can be called from interrupt context, but not from machine check/NMI
-@@ -1404,19 +1442,8 @@
+@@ -1404,19 +1442,8 @@ static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
*/
int mce_notify_irq(void)
{
@@ -2189,7 +2494,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
return 1;
}
return 0;
-@@ -1722,7 +1749,7 @@
+@@ -1722,7 +1749,7 @@ static void __mcheck_cpu_clear_vendor(struct cpuinfo_x86 *c)
}
}
@@ -2198,7 +2503,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
{
unsigned long iv = check_interval * HZ;
-@@ -1731,16 +1758,17 @@
+@@ -1731,16 +1758,17 @@ static void mce_start_timer(unsigned int cpu, struct timer_list *t)
per_cpu(mce_next_interval, cpu) = iv;
@@ -2220,7 +2525,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
mce_start_timer(cpu, t);
}
-@@ -2465,6 +2493,8 @@
+@@ -2465,6 +2493,8 @@ static void mce_disable_cpu(void *h)
if (!mce_available(raw_cpu_ptr(&cpu_info)))
return;
@@ -2229,7 +2534,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
if (!(action & CPU_TASKS_FROZEN))
cmci_clear();
-@@ -2487,6 +2517,7 @@
+@@ -2487,6 +2517,7 @@ static void mce_reenable_cpu(void *h)
if (b->init)
wrmsrl(msr_ops.ctl(i), b->ctl);
}
@@ -2237,7 +2542,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
}
/* Get notified when a cpu comes on/off. Be hotplug friendly. */
-@@ -2494,7 +2525,6 @@
+@@ -2494,7 +2525,6 @@ static int
mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
{
unsigned int cpu = (unsigned long)hcpu;
@@ -2245,7 +2550,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
switch (action & ~CPU_TASKS_FROZEN) {
case CPU_ONLINE:
-@@ -2514,11 +2544,9 @@
+@@ -2514,11 +2544,9 @@ mce_cpu_callback(struct notifier_block *nfb, unsigned long action, void *hcpu)
break;
case CPU_DOWN_PREPARE:
smp_call_function_single(cpu, mce_disable_cpu, &action, 1);
@@ -2257,7 +2562,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
break;
}
-@@ -2557,6 +2585,10 @@
+@@ -2557,6 +2585,10 @@ static __init int mcheck_init_device(void)
goto err_out;
}
@@ -2268,10 +2573,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/cpu/mcheck/mce.c linux-4.9.28/arch/x
if (!zalloc_cpumask_var(&mce_device_initialized, GFP_KERNEL)) {
err = -ENOMEM;
goto err_out;
-diff -Nur linux-4.9.28.orig/arch/x86/kernel/irq_32.c linux-4.9.28/arch/x86/kernel/irq_32.c
---- linux-4.9.28.orig/arch/x86/kernel/irq_32.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kernel/irq_32.c 2017-05-19 03:37:25.130174719 +0200
-@@ -127,6 +127,7 @@
+diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c
+index 1f38d9a4d9de..053bf3b2ef39 100644
+--- a/arch/x86/kernel/irq_32.c
++++ b/arch/x86/kernel/irq_32.c
+@@ -127,6 +127,7 @@ void irq_ctx_init(int cpu)
cpu, per_cpu(hardirq_stack, cpu), per_cpu(softirq_stack, cpu));
}
@@ -2279,7 +2585,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/irq_32.c linux-4.9.28/arch/x86/kerne
void do_softirq_own_stack(void)
{
struct irq_stack *irqstk;
-@@ -143,6 +144,7 @@
+@@ -143,6 +144,7 @@ void do_softirq_own_stack(void)
call_on_stack(__do_softirq, isp);
}
@@ -2287,9 +2593,10 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/irq_32.c linux-4.9.28/arch/x86/kerne
bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
{
-diff -Nur linux-4.9.28.orig/arch/x86/kernel/process_32.c linux-4.9.28/arch/x86/kernel/process_32.c
---- linux-4.9.28.orig/arch/x86/kernel/process_32.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kernel/process_32.c 2017-05-19 03:37:25.130174719 +0200
+diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
+index bd7be8efdc4c..b3b0a7f7b1ca 100644
+--- a/arch/x86/kernel/process_32.c
++++ b/arch/x86/kernel/process_32.c
@@ -35,6 +35,7 @@
#include <linux/uaccess.h>
#include <linux/io.h>
@@ -2298,7 +2605,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/process_32.c linux-4.9.28/arch/x86/k
#include <asm/pgtable.h>
#include <asm/ldt.h>
-@@ -195,6 +196,35 @@
+@@ -195,6 +196,35 @@ start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp)
}
EXPORT_SYMBOL_GPL(start_thread);
@@ -2334,7 +2641,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/process_32.c linux-4.9.28/arch/x86/k
/*
* switch_to(x,y) should switch tasks from x to y.
-@@ -271,6 +301,8 @@
+@@ -271,6 +301,8 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
__switch_to_xtra(prev_p, next_p, tss);
@@ -2343,10 +2650,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/kernel/process_32.c linux-4.9.28/arch/x86/k
/*
* Leave lazy mode, flushing any hypercalls made here.
* This must be done before restoring TLS segments so
-diff -Nur linux-4.9.28.orig/arch/x86/kvm/lapic.c linux-4.9.28/arch/x86/kvm/lapic.c
---- linux-4.9.28.orig/arch/x86/kvm/lapic.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kvm/lapic.c 2017-05-19 03:37:25.134174924 +0200
-@@ -1939,6 +1939,7 @@
+diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
+index 3f05c044720b..fe68afd37162 100644
+--- a/arch/x86/kvm/lapic.c
++++ b/arch/x86/kvm/lapic.c
+@@ -1939,6 +1939,7 @@ int kvm_create_lapic(struct kvm_vcpu *vcpu)
hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
HRTIMER_MODE_ABS_PINNED);
apic->lapic_timer.timer.function = apic_timer_fn;
@@ -2354,10 +2662,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/kvm/lapic.c linux-4.9.28/arch/x86/kvm/lapic
/*
* APIC is created enabled. This will prevent kvm_lapic_set_base from
-diff -Nur linux-4.9.28.orig/arch/x86/kvm/x86.c linux-4.9.28/arch/x86/kvm/x86.c
---- linux-4.9.28.orig/arch/x86/kvm/x86.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/kvm/x86.c 2017-05-19 03:37:25.134174924 +0200
-@@ -5933,6 +5933,13 @@
+diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
+index 81bba3c2137d..fcb84512e85d 100644
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -5958,6 +5958,13 @@ int kvm_arch_init(void *opaque)
goto out;
}
@@ -2371,10 +2680,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/kvm/x86.c linux-4.9.28/arch/x86/kvm/x86.c
r = kvm_mmu_module_init();
if (r)
goto out_free_percpu;
-diff -Nur linux-4.9.28.orig/arch/x86/mm/highmem_32.c linux-4.9.28/arch/x86/mm/highmem_32.c
---- linux-4.9.28.orig/arch/x86/mm/highmem_32.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/mm/highmem_32.c 2017-05-19 03:37:25.134174924 +0200
-@@ -32,10 +32,11 @@
+diff --git a/arch/x86/mm/highmem_32.c b/arch/x86/mm/highmem_32.c
+index 6d18b70ed5a9..f752724c22e8 100644
+--- a/arch/x86/mm/highmem_32.c
++++ b/arch/x86/mm/highmem_32.c
+@@ -32,10 +32,11 @@ EXPORT_SYMBOL(kunmap);
*/
void *kmap_atomic_prot(struct page *page, pgprot_t prot)
{
@@ -2387,7 +2697,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/highmem_32.c linux-4.9.28/arch/x86/mm/hi
pagefault_disable();
if (!PageHighMem(page))
-@@ -45,7 +46,10 @@
+@@ -45,7 +46,10 @@ void *kmap_atomic_prot(struct page *page, pgprot_t prot)
idx = type + KM_TYPE_NR*smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
BUG_ON(!pte_none(*(kmap_pte-idx)));
@@ -2399,7 +2709,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/highmem_32.c linux-4.9.28/arch/x86/mm/hi
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-@@ -88,6 +92,9 @@
+@@ -88,6 +92,9 @@ void __kunmap_atomic(void *kvaddr)
* is a bad idea also, in case the page changes cacheability
* attributes or becomes a protected page in a hypervisor.
*/
@@ -2409,7 +2719,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/highmem_32.c linux-4.9.28/arch/x86/mm/hi
kpte_clear_flush(kmap_pte-idx, vaddr);
kmap_atomic_idx_pop();
arch_flush_lazy_mmu_mode();
-@@ -100,7 +107,7 @@
+@@ -100,7 +107,7 @@ void __kunmap_atomic(void *kvaddr)
#endif
pagefault_enable();
@@ -2418,10 +2728,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/highmem_32.c linux-4.9.28/arch/x86/mm/hi
}
EXPORT_SYMBOL(__kunmap_atomic);
-diff -Nur linux-4.9.28.orig/arch/x86/mm/iomap_32.c linux-4.9.28/arch/x86/mm/iomap_32.c
---- linux-4.9.28.orig/arch/x86/mm/iomap_32.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/mm/iomap_32.c 2017-05-19 03:37:25.134174924 +0200
-@@ -56,6 +56,7 @@
+diff --git a/arch/x86/mm/iomap_32.c b/arch/x86/mm/iomap_32.c
+index ada98b39b8ad..585f6829653b 100644
+--- a/arch/x86/mm/iomap_32.c
++++ b/arch/x86/mm/iomap_32.c
+@@ -56,6 +56,7 @@ EXPORT_SYMBOL_GPL(iomap_free);
void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
{
@@ -2429,7 +2740,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/iomap_32.c linux-4.9.28/arch/x86/mm/ioma
unsigned long vaddr;
int idx, type;
-@@ -65,7 +66,12 @@
+@@ -65,7 +66,12 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, pgprot_t prot)
type = kmap_atomic_idx_push();
idx = type + KM_TYPE_NR * smp_processor_id();
vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -2443,7 +2754,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/iomap_32.c linux-4.9.28/arch/x86/mm/ioma
arch_flush_lazy_mmu_mode();
return (void *)vaddr;
-@@ -113,6 +119,9 @@
+@@ -113,6 +119,9 @@ iounmap_atomic(void __iomem *kvaddr)
* is a bad idea also, in case the page changes cacheability
* attributes or becomes a protected page in a hypervisor.
*/
@@ -2453,10 +2764,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/iomap_32.c linux-4.9.28/arch/x86/mm/ioma
kpte_clear_flush(kmap_pte-idx, vaddr);
kmap_atomic_idx_pop();
}
-diff -Nur linux-4.9.28.orig/arch/x86/mm/pageattr.c linux-4.9.28/arch/x86/mm/pageattr.c
---- linux-4.9.28.orig/arch/x86/mm/pageattr.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/mm/pageattr.c 2017-05-19 03:37:25.134174924 +0200
-@@ -214,7 +214,15 @@
+diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
+index e3353c97d086..01664968555c 100644
+--- a/arch/x86/mm/pageattr.c
++++ b/arch/x86/mm/pageattr.c
+@@ -214,7 +214,15 @@ static void cpa_flush_array(unsigned long *start, int numpages, int cache,
int in_flags, struct page **pages)
{
unsigned int i, level;
@@ -2472,10 +2784,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/mm/pageattr.c linux-4.9.28/arch/x86/mm/page
BUG_ON(irqs_disabled());
-diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/platform/uv/tlb_uv.c
---- linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/platform/uv/tlb_uv.c 2017-05-19 03:37:25.134174924 +0200
-@@ -748,9 +748,9 @@
+diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
+index 9e42842e924a..5398f97172f9 100644
+--- a/arch/x86/platform/uv/tlb_uv.c
++++ b/arch/x86/platform/uv/tlb_uv.c
+@@ -748,9 +748,9 @@ static void destination_plugged(struct bau_desc *bau_desc,
quiesce_local_uvhub(hmaster);
@@ -2487,7 +2800,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
end_uvhub_quiesce(hmaster);
-@@ -770,9 +770,9 @@
+@@ -770,9 +770,9 @@ static void destination_timeout(struct bau_desc *bau_desc,
quiesce_local_uvhub(hmaster);
@@ -2499,7 +2812,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
end_uvhub_quiesce(hmaster);
-@@ -793,7 +793,7 @@
+@@ -793,7 +793,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
cycles_t tm1;
hmaster = bcp->uvhub_master;
@@ -2508,7 +2821,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
if (!bcp->baudisabled) {
stat->s_bau_disabled++;
tm1 = get_cycles();
-@@ -806,7 +806,7 @@
+@@ -806,7 +806,7 @@ static void disable_for_period(struct bau_control *bcp, struct ptc_stats *stat)
}
}
}
@@ -2517,7 +2830,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
}
static void count_max_concurr(int stat, struct bau_control *bcp,
-@@ -869,7 +869,7 @@
+@@ -869,7 +869,7 @@ static void record_send_stats(cycles_t time1, cycles_t time2,
*/
static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
{
@@ -2526,7 +2839,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
atomic_t *v;
v = &hmaster->active_descriptor_count;
-@@ -1002,7 +1002,7 @@
+@@ -1002,7 +1002,7 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
struct bau_control *hmaster;
hmaster = bcp->uvhub_master;
@@ -2535,7 +2848,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) {
stat->s_bau_reenabled++;
for_each_present_cpu(tcpu) {
-@@ -1014,10 +1014,10 @@
+@@ -1014,10 +1014,10 @@ static int check_enable(struct bau_control *bcp, struct ptc_stats *stat)
tbcp->period_giveups = 0;
}
}
@@ -2548,7 +2861,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
return -1;
}
-@@ -1940,9 +1940,9 @@
+@@ -1940,9 +1940,9 @@ static void __init init_per_cpu_tunables(void)
bcp->cong_reps = congested_reps;
bcp->disabled_period = sec_2_cycles(disabled_period);
bcp->giveup_limit = giveup_limit;
@@ -2561,10 +2874,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/tlb_uv.c linux-4.9.28/arch/x86/
}
}
-diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86/platform/uv/uv_time.c
---- linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/arch/x86/platform/uv/uv_time.c 2017-05-19 03:37:25.134174924 +0200
-@@ -57,7 +57,7 @@
+diff --git a/arch/x86/platform/uv/uv_time.c b/arch/x86/platform/uv/uv_time.c
+index b333fc45f9ec..8b85916e6986 100644
+--- a/arch/x86/platform/uv/uv_time.c
++++ b/arch/x86/platform/uv/uv_time.c
+@@ -57,7 +57,7 @@ static DEFINE_PER_CPU(struct clock_event_device, cpu_ced);
/* There is one of these allocated per node */
struct uv_rtc_timer_head {
@@ -2573,7 +2887,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
/* next cpu waiting for timer, local node relative: */
int next_cpu;
/* number of cpus on this node: */
-@@ -177,7 +177,7 @@
+@@ -177,7 +177,7 @@ static __init int uv_rtc_allocate_timers(void)
uv_rtc_deallocate_timers();
return -ENOMEM;
}
@@ -2582,7 +2896,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
head->ncpus = uv_blade_nr_possible_cpus(bid);
head->next_cpu = -1;
blade_info[bid] = head;
-@@ -231,7 +231,7 @@
+@@ -231,7 +231,7 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
unsigned long flags;
int next_cpu;
@@ -2591,7 +2905,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
next_cpu = head->next_cpu;
*t = expires;
-@@ -243,12 +243,12 @@
+@@ -243,12 +243,12 @@ static int uv_rtc_set_timer(int cpu, u64 expires)
if (uv_setup_intr(cpu, expires)) {
*t = ULLONG_MAX;
uv_rtc_find_next_timer(head, pnode);
@@ -2606,7 +2920,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
return 0;
}
-@@ -267,7 +267,7 @@
+@@ -267,7 +267,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
unsigned long flags;
int rc = 0;
@@ -2615,7 +2929,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force)
rc = 1;
-@@ -279,7 +279,7 @@
+@@ -279,7 +279,7 @@ static int uv_rtc_unset_timer(int cpu, int force)
uv_rtc_find_next_timer(head, pnode);
}
@@ -2624,7 +2938,7 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
return rc;
}
-@@ -299,13 +299,18 @@
+@@ -299,13 +299,18 @@ static int uv_rtc_unset_timer(int cpu, int force)
static cycle_t uv_read_rtc(struct clocksource *cs)
{
unsigned long offset;
@@ -2644,10 +2958,11 @@ diff -Nur linux-4.9.28.orig/arch/x86/platform/uv/uv_time.c linux-4.9.28/arch/x86
}
/*
-diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
---- linux-4.9.28.orig/block/blk-core.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/block/blk-core.c 2017-05-19 03:37:25.134174924 +0200
-@@ -125,6 +125,9 @@
+diff --git a/block/blk-core.c b/block/blk-core.c
+index d1f2801ce836..6f945bb0fa1a 100644
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -125,6 +125,9 @@ void blk_rq_init(struct request_queue *q, struct request *rq)
INIT_LIST_HEAD(&rq->queuelist);
INIT_LIST_HEAD(&rq->timeout_list);
@@ -2657,7 +2972,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
rq->cpu = -1;
rq->q = q;
rq->__sector = (sector_t) -1;
-@@ -233,7 +236,7 @@
+@@ -233,7 +236,7 @@ EXPORT_SYMBOL(blk_start_queue_async);
**/
void blk_start_queue(struct request_queue *q)
{
@@ -2666,7 +2981,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
queue_flag_clear(QUEUE_FLAG_STOPPED, q);
__blk_run_queue(q);
-@@ -659,7 +662,7 @@
+@@ -659,7 +662,7 @@ int blk_queue_enter(struct request_queue *q, bool nowait)
if (nowait)
return -EBUSY;
@@ -2675,7 +2990,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
!atomic_read(&q->mq_freeze_depth) ||
blk_queue_dying(q));
if (blk_queue_dying(q))
-@@ -679,7 +682,7 @@
+@@ -679,7 +682,7 @@ static void blk_queue_usage_counter_release(struct percpu_ref *ref)
struct request_queue *q =
container_of(ref, struct request_queue, q_usage_counter);
@@ -2684,7 +2999,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
}
static void blk_rq_timed_out_timer(unsigned long data)
-@@ -748,7 +751,7 @@
+@@ -748,7 +751,7 @@ struct request_queue *blk_alloc_queue_node(gfp_t gfp_mask, int node_id)
q->bypass_depth = 1;
__set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
@@ -2693,7 +3008,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
/*
* Init percpu_ref in atomic mode so that it's faster to shutdown.
-@@ -3200,7 +3203,7 @@
+@@ -3200,7 +3203,7 @@ static void queue_unplugged(struct request_queue *q, unsigned int depth,
blk_run_queue_async(q);
else
__blk_run_queue(q);
@@ -2702,7 +3017,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
}
static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
-@@ -3248,7 +3251,6 @@
+@@ -3248,7 +3251,6 @@ EXPORT_SYMBOL(blk_check_plugged);
void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
{
struct request_queue *q;
@@ -2710,7 +3025,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
struct request *rq;
LIST_HEAD(list);
unsigned int depth;
-@@ -3268,11 +3270,6 @@
+@@ -3268,11 +3270,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
q = NULL;
depth = 0;
@@ -2722,7 +3037,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
while (!list_empty(&list)) {
rq = list_entry_rq(list.next);
list_del_init(&rq->queuelist);
-@@ -3285,7 +3282,7 @@
+@@ -3285,7 +3282,7 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
queue_unplugged(q, depth, from_schedule);
q = rq->q;
depth = 0;
@@ -2731,7 +3046,7 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
}
/*
-@@ -3312,8 +3309,6 @@
+@@ -3312,8 +3309,6 @@ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
*/
if (q)
queue_unplugged(q, depth, from_schedule);
@@ -2740,9 +3055,10 @@ diff -Nur linux-4.9.28.orig/block/blk-core.c linux-4.9.28/block/blk-core.c
}
void blk_finish_plug(struct blk_plug *plug)
-diff -Nur linux-4.9.28.orig/block/blk-ioc.c linux-4.9.28/block/blk-ioc.c
---- linux-4.9.28.orig/block/blk-ioc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/block/blk-ioc.c 2017-05-19 03:37:25.134174924 +0200
+diff --git a/block/blk-ioc.c b/block/blk-ioc.c
+index 381cb50a673c..dc8785233d94 100644
+--- a/block/blk-ioc.c
++++ b/block/blk-ioc.c
@@ -7,6 +7,7 @@
#include <linux/bio.h>
#include <linux/blkdev.h>
@@ -2751,7 +3067,7 @@ diff -Nur linux-4.9.28.orig/block/blk-ioc.c linux-4.9.28/block/blk-ioc.c
#include "blk.h"
-@@ -109,7 +110,7 @@
+@@ -109,7 +110,7 @@ static void ioc_release_fn(struct work_struct *work)
spin_unlock(q->queue_lock);
} else {
spin_unlock_irqrestore(&ioc->lock, flags);
@@ -2760,7 +3076,7 @@ diff -Nur linux-4.9.28.orig/block/blk-ioc.c linux-4.9.28/block/blk-ioc.c
spin_lock_irqsave_nested(&ioc->lock, flags, 1);
}
}
-@@ -187,7 +188,7 @@
+@@ -187,7 +188,7 @@ void put_io_context_active(struct io_context *ioc)
spin_unlock(icq->q->queue_lock);
} else {
spin_unlock_irqrestore(&ioc->lock, flags);
@@ -2769,10 +3085,11 @@ diff -Nur linux-4.9.28.orig/block/blk-ioc.c linux-4.9.28/block/blk-ioc.c
goto retry;
}
}
-diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
---- linux-4.9.28.orig/block/blk-mq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/block/blk-mq.c 2017-05-19 03:37:25.134174924 +0200
-@@ -72,7 +72,7 @@
+diff --git a/block/blk-mq.c b/block/blk-mq.c
+index 7b597ec4e9c5..48c9652a701c 100644
+--- a/block/blk-mq.c
++++ b/block/blk-mq.c
+@@ -72,7 +72,7 @@ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_start);
static void blk_mq_freeze_queue_wait(struct request_queue *q)
{
@@ -2781,7 +3098,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
}
/*
-@@ -110,7 +110,7 @@
+@@ -110,7 +110,7 @@ void blk_mq_unfreeze_queue(struct request_queue *q)
WARN_ON_ONCE(freeze_depth < 0);
if (!freeze_depth) {
percpu_ref_reinit(&q->q_usage_counter);
@@ -2790,7 +3107,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
}
}
EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
-@@ -129,7 +129,7 @@
+@@ -129,7 +129,7 @@ void blk_mq_wake_waiters(struct request_queue *q)
* dying, we need to ensure that processes currently waiting on
* the queue are notified as well.
*/
@@ -2799,7 +3116,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
}
bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
-@@ -177,6 +177,9 @@
+@@ -177,6 +177,9 @@ static void blk_mq_rq_ctx_init(struct request_queue *q, struct blk_mq_ctx *ctx,
rq->resid_len = 0;
rq->sense = NULL;
@@ -2809,7 +3126,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
INIT_LIST_HEAD(&rq->timeout_list);
rq->timeout = 0;
-@@ -345,6 +348,17 @@
+@@ -345,6 +348,17 @@ void blk_mq_end_request(struct request *rq, int error)
}
EXPORT_SYMBOL(blk_mq_end_request);
@@ -2827,7 +3144,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
static void __blk_mq_complete_request_remote(void *data)
{
struct request *rq = data;
-@@ -352,6 +366,8 @@
+@@ -352,6 +366,8 @@ static void __blk_mq_complete_request_remote(void *data)
rq->q->softirq_done_fn(rq);
}
@@ -2836,7 +3153,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
static void blk_mq_ipi_complete_request(struct request *rq)
{
struct blk_mq_ctx *ctx = rq->mq_ctx;
-@@ -363,19 +379,23 @@
+@@ -363,19 +379,23 @@ static void blk_mq_ipi_complete_request(struct request *rq)
return;
}
@@ -2862,7 +3179,7 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
}
static void __blk_mq_complete_request(struct request *rq)
-@@ -906,14 +926,14 @@
+@@ -906,14 +926,14 @@ void blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx, bool async)
return;
if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
@@ -2880,10 +3197,11 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.c linux-4.9.28/block/blk-mq.c
}
kblockd_schedule_work_on(blk_mq_hctx_next_cpu(hctx), &hctx->run_work);
-diff -Nur linux-4.9.28.orig/block/blk-mq.h linux-4.9.28/block/blk-mq.h
---- linux-4.9.28.orig/block/blk-mq.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/block/blk-mq.h 2017-05-19 03:37:25.134174924 +0200
-@@ -72,12 +72,12 @@
+diff --git a/block/blk-mq.h b/block/blk-mq.h
+index e5d25249028c..1e846b842eab 100644
+--- a/block/blk-mq.h
++++ b/block/blk-mq.h
+@@ -72,12 +72,12 @@ static inline struct blk_mq_ctx *__blk_mq_get_ctx(struct request_queue *q,
*/
static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
{
@@ -2898,10 +3216,11 @@ diff -Nur linux-4.9.28.orig/block/blk-mq.h linux-4.9.28/block/blk-mq.h
}
struct blk_mq_alloc_data {
-diff -Nur linux-4.9.28.orig/block/blk-softirq.c linux-4.9.28/block/blk-softirq.c
---- linux-4.9.28.orig/block/blk-softirq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/block/blk-softirq.c 2017-05-19 03:37:25.134174924 +0200
-@@ -51,6 +51,7 @@
+diff --git a/block/blk-softirq.c b/block/blk-softirq.c
+index 06cf9807f49a..c40342643ca0 100644
+--- a/block/blk-softirq.c
++++ b/block/blk-softirq.c
+@@ -51,6 +51,7 @@ static void trigger_softirq(void *data)
raise_softirq_irqoff(BLOCK_SOFTIRQ);
local_irq_restore(flags);
@@ -2909,7 +3228,7 @@ diff -Nur linux-4.9.28.orig/block/blk-softirq.c linux-4.9.28/block/blk-softirq.c
}
/*
-@@ -89,6 +90,7 @@
+@@ -89,6 +90,7 @@ static int blk_softirq_cpu_dead(unsigned int cpu)
this_cpu_ptr(&blk_cpu_done));
raise_softirq_irqoff(BLOCK_SOFTIRQ);
local_irq_enable();
@@ -2917,7 +3236,7 @@ diff -Nur linux-4.9.28.orig/block/blk-softirq.c linux-4.9.28/block/blk-softirq.c
return 0;
}
-@@ -141,6 +143,7 @@
+@@ -141,6 +143,7 @@ void __blk_complete_request(struct request *req)
goto do_local;
local_irq_restore(flags);
@@ -2925,10 +3244,11 @@ diff -Nur linux-4.9.28.orig/block/blk-softirq.c linux-4.9.28/block/blk-softirq.c
}
/**
-diff -Nur linux-4.9.28.orig/block/bounce.c linux-4.9.28/block/bounce.c
---- linux-4.9.28.orig/block/bounce.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/block/bounce.c 2017-05-19 03:37:25.134174924 +0200
-@@ -55,11 +55,11 @@
+diff --git a/block/bounce.c b/block/bounce.c
+index 1cb5dd3a5da1..2f1ec8a67cbe 100644
+--- a/block/bounce.c
++++ b/block/bounce.c
+@@ -55,11 +55,11 @@ static void bounce_copy_vec(struct bio_vec *to, unsigned char *vfrom)
unsigned long flags;
unsigned char *vto;
@@ -2942,10 +3262,11 @@ diff -Nur linux-4.9.28.orig/block/bounce.c linux-4.9.28/block/bounce.c
}
#else /* CONFIG_HIGHMEM */
-diff -Nur linux-4.9.28.orig/crypto/algapi.c linux-4.9.28/crypto/algapi.c
---- linux-4.9.28.orig/crypto/algapi.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/crypto/algapi.c 2017-05-19 03:37:25.134174924 +0200
-@@ -719,13 +719,13 @@
+diff --git a/crypto/algapi.c b/crypto/algapi.c
+index 1fad2a6b3bbb..ecb7315426a9 100644
+--- a/crypto/algapi.c
++++ b/crypto/algapi.c
+@@ -719,13 +719,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
int crypto_register_notifier(struct notifier_block *nb)
{
@@ -2961,10 +3282,11 @@ diff -Nur linux-4.9.28.orig/crypto/algapi.c linux-4.9.28/crypto/algapi.c
}
EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
-diff -Nur linux-4.9.28.orig/crypto/api.c linux-4.9.28/crypto/api.c
---- linux-4.9.28.orig/crypto/api.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/crypto/api.c 2017-05-19 03:37:25.134174924 +0200
-@@ -31,7 +31,7 @@
+diff --git a/crypto/api.c b/crypto/api.c
+index bbc147cb5dec..bc1a848f02ec 100644
+--- a/crypto/api.c
++++ b/crypto/api.c
+@@ -31,7 +31,7 @@ EXPORT_SYMBOL_GPL(crypto_alg_list);
DECLARE_RWSEM(crypto_alg_sem);
EXPORT_SYMBOL_GPL(crypto_alg_sem);
@@ -2973,7 +3295,7 @@ diff -Nur linux-4.9.28.orig/crypto/api.c linux-4.9.28/crypto/api.c
EXPORT_SYMBOL_GPL(crypto_chain);
static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
-@@ -236,10 +236,10 @@
+@@ -236,10 +236,10 @@ int crypto_probing_notify(unsigned long val, void *v)
{
int ok;
@@ -2986,10 +3308,11 @@ diff -Nur linux-4.9.28.orig/crypto/api.c linux-4.9.28/crypto/api.c
}
return ok;
-diff -Nur linux-4.9.28.orig/crypto/internal.h linux-4.9.28/crypto/internal.h
---- linux-4.9.28.orig/crypto/internal.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/crypto/internal.h 2017-05-19 03:37:25.138175108 +0200
-@@ -47,7 +47,7 @@
+diff --git a/crypto/internal.h b/crypto/internal.h
+index 7eefcdb00227..0ecc7f5a2f40 100644
+--- a/crypto/internal.h
++++ b/crypto/internal.h
+@@ -47,7 +47,7 @@ struct crypto_larval {
extern struct list_head crypto_alg_list;
extern struct rw_semaphore crypto_alg_sem;
@@ -2998,7 +3321,7 @@ diff -Nur linux-4.9.28.orig/crypto/internal.h linux-4.9.28/crypto/internal.h
#ifdef CONFIG_PROC_FS
void __init crypto_init_proc(void);
-@@ -146,7 +146,7 @@
+@@ -146,7 +146,7 @@ static inline int crypto_is_moribund(struct crypto_alg *alg)
static inline void crypto_notify(unsigned long val, void *v)
{
@@ -3007,223 +3330,11 @@ diff -Nur linux-4.9.28.orig/crypto/internal.h linux-4.9.28/crypto/internal.h
}
#endif /* _CRYPTO_INTERNAL_H */
-diff -Nur linux-4.9.28.orig/Documentation/sysrq.txt linux-4.9.28/Documentation/sysrq.txt
---- linux-4.9.28.orig/Documentation/sysrq.txt 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/Documentation/sysrq.txt 2017-05-19 03:37:25.118174016 +0200
-@@ -59,10 +59,17 @@
- On other - If you know of the key combos for other architectures, please
- let me know so I can add them to this section.
-
--On all - write a character to /proc/sysrq-trigger. e.g.:
--
-+On all - write a character to /proc/sysrq-trigger, e.g.:
- echo t > /proc/sysrq-trigger
-
-+On all - Enable network SysRq by writing a cookie to icmp_echo_sysrq, e.g.
-+ echo 0x01020304 >/proc/sys/net/ipv4/icmp_echo_sysrq
-+ Send an ICMP echo request with this pattern plus the particular
-+ SysRq command key. Example:
-+ # ping -c1 -s57 -p0102030468
-+ will trigger the SysRq-H (help) command.
-+
-+
- * What are the 'command' keys?
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- 'b' - Will immediately reboot the system without syncing or unmounting
-diff -Nur linux-4.9.28.orig/Documentation/trace/histograms.txt linux-4.9.28/Documentation/trace/histograms.txt
---- linux-4.9.28.orig/Documentation/trace/histograms.txt 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/Documentation/trace/histograms.txt 2017-05-19 03:37:25.118174016 +0200
-@@ -0,0 +1,186 @@
-+ Using the Linux Kernel Latency Histograms
-+
-+
-+This document gives a short explanation how to enable, configure and use
-+latency histograms. Latency histograms are primarily relevant in the
-+context of real-time enabled kernels (CONFIG_PREEMPT/CONFIG_PREEMPT_RT)
-+and are used in the quality management of the Linux real-time
-+capabilities.
-+
-+
-+* Purpose of latency histograms
-+
-+A latency histogram continuously accumulates the frequencies of latency
-+data. There are two types of histograms
-+- potential sources of latencies
-+- effective latencies
-+
-+
-+* Potential sources of latencies
-+
-+Potential sources of latencies are code segments where interrupts,
-+preemption or both are disabled (aka critical sections). To create
-+histograms of potential sources of latency, the kernel stores the time
-+stamp at the start of a critical section, determines the time elapsed
-+when the end of the section is reached, and increments the frequency
-+counter of that latency value - irrespective of whether any concurrently
-+running process is affected by latency or not.
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+ CONFIG_INTERRUPT_OFF_LATENCY
-+ CONFIG_PREEMPT_OFF_LATENCY
-+
-+
-+* Effective latencies
-+
-+Effective latencies are actually occuring during wakeup of a process. To
-+determine effective latencies, the kernel stores the time stamp when a
-+process is scheduled to be woken up, and determines the duration of the
-+wakeup time shortly before control is passed over to this process. Note
-+that the apparent latency in user space may be somewhat longer, since the
-+process may be interrupted after control is passed over to it but before
-+the execution in user space takes place. Simply measuring the interval
-+between enqueuing and wakeup may also not appropriate in cases when a
-+process is scheduled as a result of a timer expiration. The timer may have
-+missed its deadline, e.g. due to disabled interrupts, but this latency
-+would not be registered. Therefore, the offsets of missed timers are
-+recorded in a separate histogram. If both wakeup latency and missed timer
-+offsets are configured and enabled, a third histogram may be enabled that
-+records the overall latency as a sum of the timer latency, if any, and the
-+wakeup latency. This histogram is called "timerandwakeup".
-+- Configuration items (in the Kernel hacking/Tracers submenu)
-+ CONFIG_WAKEUP_LATENCY
-+ CONFIG_MISSED_TIMER_OFSETS
-+
-+
-+* Usage
-+
-+The interface to the administration of the latency histograms is located
-+in the debugfs file system. To mount it, either enter
-+
-+mount -t sysfs nodev /sys
-+mount -t debugfs nodev /sys/kernel/debug
-+
-+from shell command line level, or add
-+
-+nodev /sys sysfs defaults 0 0
-+nodev /sys/kernel/debug debugfs defaults 0 0
-+
-+to the file /etc/fstab. All latency histogram related files are then
-+available in the directory /sys/kernel/debug/tracing/latency_hist. A
-+particular histogram type is enabled by writing non-zero to the related
-+variable in the /sys/kernel/debug/tracing/latency_hist/enable directory.
-+Select "preemptirqsoff" for the histograms of potential sources of
-+latencies and "wakeup" for histograms of effective latencies etc. The
-+histogram data - one per CPU - are available in the files
-+
-+/sys/kernel/debug/tracing/latency_hist/preemptoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/irqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/preemptirqsoff/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/CPUx
-+/sys/kernel/debug/tracing/latency_hist/wakeup/sharedprio/CPUx
-+/sys/kernel/debug/tracing/latency_hist/missed_timer_offsets/CPUx
-+/sys/kernel/debug/tracing/latency_hist/timerandwakeup/CPUx
-+
-+The histograms are reset by writing non-zero to the file "reset" in a
-+particular latency directory. To reset all latency data, use
-+
-+#!/bin/sh
-+
-+TRACINGDIR=/sys/kernel/debug/tracing
-+HISTDIR=$TRACINGDIR/latency_hist
-+
-+if test -d $HISTDIR
-+then
-+ cd $HISTDIR
-+ for i in `find . | grep /reset$`
-+ do
-+ echo 1 >$i
-+ done
-+fi
-+
-+
-+* Data format
-+
-+Latency data are stored with a resolution of one microsecond. The
-+maximum latency is 10,240 microseconds. The data are only valid, if the
-+overflow register is empty. Every output line contains the latency in
-+microseconds in the first row and the number of samples in the second
-+row. To display only lines with a positive latency count, use, for
-+example,
-+
-+grep -v " 0$" /sys/kernel/debug/tracing/latency_hist/preemptoff/CPU0
-+
-+#Minimum latency: 0 microseconds.
-+#Average latency: 0 microseconds.
-+#Maximum latency: 25 microseconds.
-+#Total samples: 3104770694
-+#There are 0 samples greater or equal than 10240 microseconds
-+#usecs samples
-+ 0 2984486876
-+ 1 49843506
-+ 2 58219047
-+ 3 5348126
-+ 4 2187960
-+ 5 3388262
-+ 6 959289
-+ 7 208294
-+ 8 40420
-+ 9 4485
-+ 10 14918
-+ 11 18340
-+ 12 25052
-+ 13 19455
-+ 14 5602
-+ 15 969
-+ 16 47
-+ 17 18
-+ 18 14
-+ 19 1
-+ 20 3
-+ 21 2
-+ 22 5
-+ 23 2
-+ 25 1
-+
-+
-+* Wakeup latency of a selected process
-+
-+To only collect wakeup latency data of a particular process, write the
-+PID of the requested process to
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/pid
-+
-+PIDs are not considered, if this variable is set to 0.
-+
-+
-+* Details of the process with the highest wakeup latency so far
-+
-+Selected data of the process that suffered from the highest wakeup
-+latency that occurred in a particular CPU are available in the file
-+
-+/sys/kernel/debug/tracing/latency_hist/wakeup/max_latency-CPUx.
-+
-+In addition, other relevant system data at the time when the
-+latency occurred are given.
-+
-+The format of the data is (all in one line):
-+<PID> <Priority> <Latency> (<Timeroffset>) <Command> \
-+<- <PID> <Priority> <Command> <Timestamp>
-+
-+The value of <Timeroffset> is only relevant in the combined timer
-+and wakeup latency recording. In the wakeup recording, it is
-+always 0, in the missed_timer_offsets recording, it is the same
-+as <Latency>.
-+
-+When retrospectively searching for the origin of a latency and
-+tracing was not enabled, it may be helpful to know the name and
-+some basic data of the task that (finally) was switching to the
-+late real-tlme task. In addition to the victim's data, also the
-+data of the possible culprit are therefore displayed after the
-+"<-" symbol.
-+
-+Finally, the timestamp of the time when the latency occurred
-+in <seconds>.<microseconds> after the most recent system boot
-+is provided.
-+
-+These data are also reset when the wakeup histogram is reset.
-diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/acglobal.h linux-4.9.28/drivers/acpi/acpica/acglobal.h
---- linux-4.9.28.orig/drivers/acpi/acpica/acglobal.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/acpi/acpica/acglobal.h 2017-05-19 03:37:25.138175108 +0200
-@@ -116,7 +116,7 @@
+diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
+index 750fa824d42c..441edf51484a 100644
+--- a/drivers/acpi/acpica/acglobal.h
++++ b/drivers/acpi/acpica/acglobal.h
+@@ -116,7 +116,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pending);
* interrupt level
*/
ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock); /* For GPE data structs and registers */
@@ -3232,10 +3343,11 @@ diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/acglobal.h linux-4.9.28/drivers/
ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
/* Mutex for _OSI support */
-diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/hwregs.c linux-4.9.28/drivers/acpi/acpica/hwregs.c
---- linux-4.9.28.orig/drivers/acpi/acpica/hwregs.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/acpi/acpica/hwregs.c 2017-05-19 03:37:25.138175108 +0200
-@@ -363,14 +363,14 @@
+diff --git a/drivers/acpi/acpica/hwregs.c b/drivers/acpi/acpica/hwregs.c
+index 3b7fb99362b6..696bf8e62afb 100644
+--- a/drivers/acpi/acpica/hwregs.c
++++ b/drivers/acpi/acpica/hwregs.c
+@@ -363,14 +363,14 @@ acpi_status acpi_hw_clear_acpi_status(void)
ACPI_BITMASK_ALL_FIXED_STATUS,
ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
@@ -3252,10 +3364,11 @@ diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/hwregs.c linux-4.9.28/drivers/ac
if (ACPI_FAILURE(status)) {
goto exit;
-diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/hwxface.c linux-4.9.28/drivers/acpi/acpica/hwxface.c
---- linux-4.9.28.orig/drivers/acpi/acpica/hwxface.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/acpi/acpica/hwxface.c 2017-05-19 03:37:25.138175108 +0200
-@@ -373,7 +373,7 @@
+diff --git a/drivers/acpi/acpica/hwxface.c b/drivers/acpi/acpica/hwxface.c
+index 98c26ff39409..6e236f2ea791 100644
+--- a/drivers/acpi/acpica/hwxface.c
++++ b/drivers/acpi/acpica/hwxface.c
+@@ -373,7 +373,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
return_ACPI_STATUS(AE_BAD_PARAMETER);
}
@@ -3264,7 +3377,7 @@ diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/hwxface.c linux-4.9.28/drivers/a
/*
* At this point, we know that the parent register is one of the
-@@ -434,7 +434,7 @@
+@@ -434,7 +434,7 @@ acpi_status acpi_write_bit_register(u32 register_id, u32 value)
unlock_and_exit:
@@ -3273,10 +3386,11 @@ diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/hwxface.c linux-4.9.28/drivers/a
return_ACPI_STATUS(status);
}
-diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/utmutex.c linux-4.9.28/drivers/acpi/acpica/utmutex.c
---- linux-4.9.28.orig/drivers/acpi/acpica/utmutex.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/acpi/acpica/utmutex.c 2017-05-19 03:37:25.138175108 +0200
-@@ -88,7 +88,7 @@
+diff --git a/drivers/acpi/acpica/utmutex.c b/drivers/acpi/acpica/utmutex.c
+index 15073375bd00..357e7ca5a587 100644
+--- a/drivers/acpi/acpica/utmutex.c
++++ b/drivers/acpi/acpica/utmutex.c
+@@ -88,7 +88,7 @@ acpi_status acpi_ut_mutex_initialize(void)
return_ACPI_STATUS (status);
}
@@ -3285,7 +3399,7 @@ diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/utmutex.c linux-4.9.28/drivers/a
if (ACPI_FAILURE (status)) {
return_ACPI_STATUS (status);
}
-@@ -145,7 +145,7 @@
+@@ -145,7 +145,7 @@ void acpi_ut_mutex_terminate(void)
/* Delete the spinlocks */
acpi_os_delete_lock(acpi_gbl_gpe_lock);
@@ -3294,10 +3408,11 @@ diff -Nur linux-4.9.28.orig/drivers/acpi/acpica/utmutex.c linux-4.9.28/drivers/a
acpi_os_delete_lock(acpi_gbl_reference_count_lock);
/* Delete the reader/writer lock */
-diff -Nur linux-4.9.28.orig/drivers/ata/libata-sff.c linux-4.9.28/drivers/ata/libata-sff.c
---- linux-4.9.28.orig/drivers/ata/libata-sff.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ata/libata-sff.c 2017-05-19 03:37:25.138175108 +0200
-@@ -678,9 +678,9 @@
+diff --git a/drivers/ata/libata-sff.c b/drivers/ata/libata-sff.c
+index 051b6158d1b7..7ad293bef6ed 100644
+--- a/drivers/ata/libata-sff.c
++++ b/drivers/ata/libata-sff.c
+@@ -678,9 +678,9 @@ unsigned int ata_sff_data_xfer_noirq(struct ata_device *dev, unsigned char *buf,
unsigned long flags;
unsigned int consumed;
@@ -3309,7 +3424,7 @@ diff -Nur linux-4.9.28.orig/drivers/ata/libata-sff.c linux-4.9.28/drivers/ata/li
return consumed;
}
-@@ -719,7 +719,7 @@
+@@ -719,7 +719,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
unsigned long flags;
/* FIXME: use a bounce buffer */
@@ -3318,7 +3433,7 @@ diff -Nur linux-4.9.28.orig/drivers/ata/libata-sff.c linux-4.9.28/drivers/ata/li
buf = kmap_atomic(page);
/* do the actual data transfer */
-@@ -727,7 +727,7 @@
+@@ -727,7 +727,7 @@ static void ata_pio_sector(struct ata_queued_cmd *qc)
do_write);
kunmap_atomic(buf);
@@ -3327,7 +3442,7 @@ diff -Nur linux-4.9.28.orig/drivers/ata/libata-sff.c linux-4.9.28/drivers/ata/li
} else {
buf = page_address(page);
ap->ops->sff_data_xfer(qc->dev, buf + offset, qc->sect_size,
-@@ -864,7 +864,7 @@
+@@ -864,7 +864,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
unsigned long flags;
/* FIXME: use bounce buffer */
@@ -3336,7 +3451,7 @@ diff -Nur linux-4.9.28.orig/drivers/ata/libata-sff.c linux-4.9.28/drivers/ata/li
buf = kmap_atomic(page);
/* do the actual data transfer */
-@@ -872,7 +872,7 @@
+@@ -872,7 +872,7 @@ static int __atapi_pio_bytes(struct ata_queued_cmd *qc, unsigned int bytes)
count, rw);
kunmap_atomic(buf);
@@ -3345,10 +3460,11 @@ diff -Nur linux-4.9.28.orig/drivers/ata/libata-sff.c linux-4.9.28/drivers/ata/li
} else {
buf = page_address(page);
consumed = ap->ops->sff_data_xfer(dev, buf + offset,
-diff -Nur linux-4.9.28.orig/drivers/block/zram/zcomp.c linux-4.9.28/drivers/block/zram/zcomp.c
---- linux-4.9.28.orig/drivers/block/zram/zcomp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/block/zram/zcomp.c 2017-05-19 03:37:25.138175108 +0200
-@@ -118,12 +118,19 @@
+diff --git a/drivers/block/zram/zcomp.c b/drivers/block/zram/zcomp.c
+index 4b5cd3a7b2b6..fa8329ad79fd 100644
+--- a/drivers/block/zram/zcomp.c
++++ b/drivers/block/zram/zcomp.c
+@@ -118,12 +118,19 @@ ssize_t zcomp_available_show(const char *comp, char *buf)
struct zcomp_strm *zcomp_stream_get(struct zcomp *comp)
{
@@ -3370,7 +3486,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zcomp.c linux-4.9.28/drivers/bloc
}
int zcomp_compress(struct zcomp_strm *zstrm,
-@@ -174,6 +181,7 @@
+@@ -174,6 +181,7 @@ static int __zcomp_cpu_notifier(struct zcomp *comp,
pr_err("Can't allocate a compression stream\n");
return NOTIFY_BAD;
}
@@ -3378,10 +3494,11 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zcomp.c linux-4.9.28/drivers/bloc
*per_cpu_ptr(comp->stream, cpu) = zstrm;
break;
case CPU_DEAD:
-diff -Nur linux-4.9.28.orig/drivers/block/zram/zcomp.h linux-4.9.28/drivers/block/zram/zcomp.h
---- linux-4.9.28.orig/drivers/block/zram/zcomp.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/block/zram/zcomp.h 2017-05-19 03:37:25.138175108 +0200
-@@ -14,6 +14,7 @@
+diff --git a/drivers/block/zram/zcomp.h b/drivers/block/zram/zcomp.h
+index 478cac2ed465..f7a6efdc3285 100644
+--- a/drivers/block/zram/zcomp.h
++++ b/drivers/block/zram/zcomp.h
+@@ -14,6 +14,7 @@ struct zcomp_strm {
/* compression/decompression buffer */
void *buffer;
struct crypto_comp *tfm;
@@ -3389,10 +3506,11 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zcomp.h linux-4.9.28/drivers/bloc
};
/* dynamic per-device compression frontend */
-diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/block/zram/zram_drv.c
---- linux-4.9.28.orig/drivers/block/zram/zram_drv.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/block/zram/zram_drv.c 2017-05-19 03:37:25.138175108 +0200
-@@ -528,6 +528,8 @@
+diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
+index c9914d653968..2038d138f286 100644
+--- a/drivers/block/zram/zram_drv.c
++++ b/drivers/block/zram/zram_drv.c
+@@ -528,6 +528,8 @@ static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
goto out_error;
}
@@ -3401,7 +3519,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
return meta;
out_error:
-@@ -575,28 +577,28 @@
+@@ -575,28 +577,28 @@ static int zram_decompress_page(struct zram *zram, char *mem, u32 index)
struct zram_meta *meta = zram->meta;
unsigned long handle;
unsigned int size;
@@ -3436,7 +3554,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
/* Should NEVER happen. Return bio error if it does. */
if (unlikely(ret)) {
-@@ -616,14 +618,14 @@
+@@ -616,14 +618,14 @@ static int zram_bvec_read(struct zram *zram, struct bio_vec *bvec,
struct zram_meta *meta = zram->meta;
page = bvec->bv_page;
@@ -3454,7 +3572,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
if (is_partial_io(bvec))
/* Use a temporary buffer to decompress the page */
-@@ -700,10 +702,10 @@
+@@ -700,10 +702,10 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
if (user_mem)
kunmap_atomic(user_mem);
/* Free memory associated with this sector now. */
@@ -3467,7 +3585,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
atomic64_inc(&zram->stats.zero_pages);
ret = 0;
-@@ -794,12 +796,12 @@
+@@ -794,12 +796,12 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index,
* Free memory associated with this sector
* before overwriting unused sectors.
*/
@@ -3482,7 +3600,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
/* Update stats */
atomic64_add(clen, &zram->stats.compr_data_size);
-@@ -842,9 +844,9 @@
+@@ -842,9 +844,9 @@ static void zram_bio_discard(struct zram *zram, u32 index,
}
while (n >= PAGE_SIZE) {
@@ -3494,7 +3612,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
atomic64_inc(&zram->stats.notify_free);
index++;
n -= PAGE_SIZE;
-@@ -973,9 +975,9 @@
+@@ -973,9 +975,9 @@ static void zram_slot_free_notify(struct block_device *bdev,
zram = bdev->bd_disk->private_data;
meta = zram->meta;
@@ -3506,10 +3624,11 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.c linux-4.9.28/drivers/b
atomic64_inc(&zram->stats.notify_free);
}
-diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.h linux-4.9.28/drivers/block/zram/zram_drv.h
---- linux-4.9.28.orig/drivers/block/zram/zram_drv.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/block/zram/zram_drv.h 2017-05-19 03:37:25.138175108 +0200
-@@ -73,6 +73,9 @@
+diff --git a/drivers/block/zram/zram_drv.h b/drivers/block/zram/zram_drv.h
+index 74fcf10da374..fd4020c99b9e 100644
+--- a/drivers/block/zram/zram_drv.h
++++ b/drivers/block/zram/zram_drv.h
+@@ -73,6 +73,9 @@ enum zram_pageflags {
struct zram_table_entry {
unsigned long handle;
unsigned long value;
@@ -3519,7 +3638,7 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.h linux-4.9.28/drivers/b
};
struct zram_stats {
-@@ -120,4 +123,42 @@
+@@ -120,4 +123,42 @@ struct zram {
*/
bool claim; /* Protected by bdev->bd_mutex */
};
@@ -3562,9 +3681,10 @@ diff -Nur linux-4.9.28.orig/drivers/block/zram/zram_drv.h linux-4.9.28/drivers/b
+#endif /* CONFIG_PREEMPT_RT_BASE */
+
#endif
-diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/random.c
---- linux-4.9.28.orig/drivers/char/random.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/char/random.c 2017-05-19 03:37:25.138175108 +0200
+diff --git a/drivers/char/random.c b/drivers/char/random.c
+index 08d1dd58c0d2..25ee319dc8e3 100644
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
@@ -262,6 +262,7 @@
#include <linux/syscalls.h>
#include <linux/completion.h>
@@ -3573,7 +3693,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
#include <crypto/chacha20.h>
#include <asm/processor.h>
-@@ -1028,8 +1029,6 @@
+@@ -1028,8 +1029,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
} sample;
long delta, delta2, delta3;
@@ -3582,7 +3702,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
sample.jiffies = jiffies;
sample.cycles = random_get_entropy();
sample.num = num;
-@@ -1070,7 +1069,6 @@
+@@ -1070,7 +1069,6 @@ static void add_timer_randomness(struct timer_rand_state *state, unsigned num)
*/
credit_entropy_bits(r, min_t(int, fls(delta>>1), 11));
}
@@ -3590,7 +3710,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
}
void add_input_randomness(unsigned int type, unsigned int code,
-@@ -1123,28 +1121,27 @@
+@@ -1123,28 +1121,27 @@ static __u32 get_reg(struct fast_pool *f, struct pt_regs *regs)
return *(ptr + f->reg_idx++);
}
@@ -3624,7 +3744,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
fast_mix(fast_pool);
add_interrupt_bench(cycles);
-@@ -2056,6 +2053,7 @@
+@@ -2056,6 +2053,7 @@ struct batched_entropy {
* goal of being quite fast and not depleting entropy.
*/
static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_long);
@@ -3632,7 +3752,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
unsigned long get_random_long(void)
{
unsigned long ret;
-@@ -2064,13 +2062,13 @@
+@@ -2064,13 +2062,13 @@ unsigned long get_random_long(void)
if (arch_get_random_long(&ret))
return ret;
@@ -3648,7 +3768,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
return ret;
}
EXPORT_SYMBOL(get_random_long);
-@@ -2082,6 +2080,8 @@
+@@ -2082,6 +2080,8 @@ unsigned int get_random_int(void)
}
#else
static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_int);
@@ -3657,7 +3777,7 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
unsigned int get_random_int(void)
{
unsigned int ret;
-@@ -2090,13 +2090,13 @@
+@@ -2090,13 +2090,13 @@ unsigned int get_random_int(void)
if (arch_get_random_int(&ret))
return ret;
@@ -3673,9 +3793,10 @@ diff -Nur linux-4.9.28.orig/drivers/char/random.c linux-4.9.28/drivers/char/rand
return ret;
}
#endif
-diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/drivers/clocksource/tcb_clksrc.c
---- linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/clocksource/tcb_clksrc.c 2017-05-19 03:37:25.138175108 +0200
+diff --git a/drivers/clocksource/tcb_clksrc.c b/drivers/clocksource/tcb_clksrc.c
+index 4da2af9694a2..5b6f57f500b8 100644
+--- a/drivers/clocksource/tcb_clksrc.c
++++ b/drivers/clocksource/tcb_clksrc.c
@@ -23,8 +23,7 @@
* this 32 bit free-running counter. the second channel is not used.
*
@@ -3686,7 +3807,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
*
* A boot clocksource and clockevent source are also currently needed,
* unless the relevant platforms (ARM/AT91, AVR32/AT32) are changed so
-@@ -74,6 +73,8 @@
+@@ -74,6 +73,8 @@ static struct clocksource clksrc = {
struct tc_clkevt_device {
struct clock_event_device clkevt;
struct clk *clk;
@@ -3695,7 +3816,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
void __iomem *regs;
};
-@@ -82,15 +83,26 @@
+@@ -82,15 +83,26 @@ static struct tc_clkevt_device *to_tc_clkevt(struct clock_event_device *clkevt)
return container_of(clkevt, struct tc_clkevt_device, clkevt);
}
@@ -3729,7 +3850,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
static int tc_shutdown(struct clock_event_device *d)
{
struct tc_clkevt_device *tcd = to_tc_clkevt(d);
-@@ -98,8 +110,14 @@
+@@ -98,8 +110,14 @@ static int tc_shutdown(struct clock_event_device *d)
__raw_writel(0xff, regs + ATMEL_TC_REG(2, IDR));
__raw_writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
@@ -3745,7 +3866,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
return 0;
}
-@@ -112,9 +130,9 @@
+@@ -112,9 +130,9 @@ static int tc_set_oneshot(struct clock_event_device *d)
if (clockevent_state_oneshot(d) || clockevent_state_periodic(d))
tc_shutdown(d);
@@ -3757,7 +3878,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
__raw_writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE |
ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR));
__raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
-@@ -134,12 +152,12 @@
+@@ -134,12 +152,12 @@ static int tc_set_periodic(struct clock_event_device *d)
/* By not making the gentime core emulate periodic mode on top
* of oneshot, we get lower overhead and improved accuracy.
*/
@@ -3773,7 +3894,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
/* Enable clock and interrupts on RC compare */
__raw_writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
-@@ -166,9 +184,13 @@
+@@ -166,9 +184,13 @@ static struct tc_clkevt_device clkevt = {
.features = CLOCK_EVT_FEAT_PERIODIC |
CLOCK_EVT_FEAT_ONESHOT,
/* Should be lower than at91rm9200's system timer */
@@ -3788,7 +3909,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
.set_state_periodic = tc_set_periodic,
.set_state_oneshot = tc_set_oneshot,
},
-@@ -188,8 +210,9 @@
+@@ -188,8 +210,9 @@ static irqreturn_t ch2_irq(int irq, void *handle)
return IRQ_NONE;
}
@@ -3799,7 +3920,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
int ret;
struct clk *t2_clk = tc->clk[2];
int irq = tc->irq[2];
-@@ -210,7 +233,11 @@
+@@ -210,7 +233,11 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
clkevt.regs = tc->regs;
clkevt.clk = t2_clk;
@@ -3812,7 +3933,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
clkevt.clkevt.cpumask = cpumask_of(0);
-@@ -221,7 +248,7 @@
+@@ -221,7 +248,7 @@ static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
return ret;
}
@@ -3821,7 +3942,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
return ret;
}
-@@ -358,7 +385,11 @@
+@@ -358,7 +385,11 @@ static int __init tcb_clksrc_init(void)
goto err_disable_t1;
/* channel 2: periodic and oneshot timer support */
@@ -3833,10 +3954,11 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/tcb_clksrc.c linux-4.9.28/driver
if (ret)
goto err_unregister_clksrc;
-diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-pit.c linux-4.9.28/drivers/clocksource/timer-atmel-pit.c
---- linux-4.9.28.orig/drivers/clocksource/timer-atmel-pit.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/clocksource/timer-atmel-pit.c 2017-05-19 03:37:25.138175108 +0200
-@@ -46,6 +46,7 @@
+diff --git a/drivers/clocksource/timer-atmel-pit.c b/drivers/clocksource/timer-atmel-pit.c
+index 6555821bbdae..93288849b2bd 100644
+--- a/drivers/clocksource/timer-atmel-pit.c
++++ b/drivers/clocksource/timer-atmel-pit.c
+@@ -46,6 +46,7 @@ struct pit_data {
u32 cycle;
u32 cnt;
unsigned int irq;
@@ -3844,7 +3966,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-pit.c linux-4.9.28/d
struct clk *mck;
};
-@@ -96,15 +97,29 @@
+@@ -96,15 +97,29 @@ static int pit_clkevt_shutdown(struct clock_event_device *dev)
/* disable irq, leaving the clocksource active */
pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
@@ -3874,7 +3996,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-pit.c linux-4.9.28/d
/* update clocksource counter */
data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
-@@ -230,15 +245,6 @@
+@@ -230,15 +245,6 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node)
return ret;
}
@@ -3890,10 +4012,11 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-pit.c linux-4.9.28/d
/* Set up and register clockevents */
data->clkevt.name = "pit";
data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC;
-diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-st.c linux-4.9.28/drivers/clocksource/timer-atmel-st.c
---- linux-4.9.28.orig/drivers/clocksource/timer-atmel-st.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/clocksource/timer-atmel-st.c 2017-05-19 03:37:25.138175108 +0200
-@@ -115,18 +115,29 @@
+diff --git a/drivers/clocksource/timer-atmel-st.c b/drivers/clocksource/timer-atmel-st.c
+index e90ab5b63a90..9e124087c55f 100644
+--- a/drivers/clocksource/timer-atmel-st.c
++++ b/drivers/clocksource/timer-atmel-st.c
+@@ -115,18 +115,29 @@ static void clkdev32k_disable_and_flush_irq(void)
last_crtr = read_CRTR();
}
@@ -3923,7 +4046,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-st.c linux-4.9.28/dr
/*
* ALM for oneshot irqs, set by next_event()
* before 32 seconds have passed.
-@@ -139,8 +150,16 @@
+@@ -139,8 +150,16 @@ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
static int clkevt32k_set_periodic(struct clock_event_device *dev)
{
@@ -3940,7 +4063,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-st.c linux-4.9.28/dr
/* PIT for periodic irqs; fixed rate of 1/HZ */
irqmask = AT91_ST_PITS;
regmap_write(regmap_st, AT91_ST_PIMR, timer_latch);
-@@ -198,7 +217,7 @@
+@@ -198,7 +217,7 @@ static int __init atmel_st_timer_init(struct device_node *node)
{
struct clk *sclk;
unsigned int sclk_rate, val;
@@ -3949,7 +4072,7 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-st.c linux-4.9.28/dr
regmap_st = syscon_node_to_regmap(node);
if (IS_ERR(regmap_st)) {
-@@ -212,21 +231,12 @@
+@@ -212,21 +231,12 @@ static int __init atmel_st_timer_init(struct device_node *node)
regmap_read(regmap_st, AT91_ST_SR, &val);
/* Get the interrupts property */
@@ -3973,9 +4096,10 @@ diff -Nur linux-4.9.28.orig/drivers/clocksource/timer-atmel-st.c linux-4.9.28/dr
sclk = of_clk_get(node, 0);
if (IS_ERR(sclk)) {
pr_err("Unable to get slow clock\n");
-diff -Nur linux-4.9.28.orig/drivers/connector/cn_proc.c linux-4.9.28/drivers/connector/cn_proc.c
---- linux-4.9.28.orig/drivers/connector/cn_proc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/connector/cn_proc.c 2017-05-19 03:37:25.138175108 +0200
+diff --git a/drivers/connector/cn_proc.c b/drivers/connector/cn_proc.c
+index a782ce87715c..19d265948526 100644
+--- a/drivers/connector/cn_proc.c
++++ b/drivers/connector/cn_proc.c
@@ -32,6 +32,7 @@
#include <linux/pid_namespace.h>
@@ -3984,7 +4108,7 @@ diff -Nur linux-4.9.28.orig/drivers/connector/cn_proc.c linux-4.9.28/drivers/con
/*
* Size of a cn_msg followed by a proc_event structure. Since the
-@@ -54,10 +55,11 @@
+@@ -54,10 +55,11 @@ static struct cb_id cn_proc_event_id = { CN_IDX_PROC, CN_VAL_PROC };
/* proc_event_counts is used as the sequence number of the netlink message */
static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
@@ -3997,7 +4121,7 @@ diff -Nur linux-4.9.28.orig/drivers/connector/cn_proc.c linux-4.9.28/drivers/con
msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
((struct proc_event *)msg->data)->cpu = smp_processor_id();
-@@ -70,7 +72,7 @@
+@@ -70,7 +72,7 @@ static inline void send_msg(struct cn_msg *msg)
*/
cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
@@ -4006,10 +4130,11 @@ diff -Nur linux-4.9.28.orig/drivers/connector/cn_proc.c linux-4.9.28/drivers/con
}
void proc_fork_connector(struct task_struct *task)
-diff -Nur linux-4.9.28.orig/drivers/cpufreq/Kconfig.x86 linux-4.9.28/drivers/cpufreq/Kconfig.x86
---- linux-4.9.28.orig/drivers/cpufreq/Kconfig.x86 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/cpufreq/Kconfig.x86 2017-05-19 03:37:25.138175108 +0200
-@@ -124,7 +124,7 @@
+diff --git a/drivers/cpufreq/Kconfig.x86 b/drivers/cpufreq/Kconfig.x86
+index adbd1de1cea5..1fac5074f2cf 100644
+--- a/drivers/cpufreq/Kconfig.x86
++++ b/drivers/cpufreq/Kconfig.x86
+@@ -124,7 +124,7 @@ config X86_POWERNOW_K7_ACPI
config X86_POWERNOW_K8
tristate "AMD Opteron/Athlon64 PowerNow!"
@@ -4018,10 +4143,11 @@ diff -Nur linux-4.9.28.orig/drivers/cpufreq/Kconfig.x86 linux-4.9.28/drivers/cpu
help
This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
Support for K10 and newer processors is now in acpi-cpufreq.
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.9.28/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-4.9.28.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/i915/i915_gem_execbuffer.c 2017-05-19 03:37:25.138175108 +0200
-@@ -1489,7 +1489,9 @@
+diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+index 2117f172d7a2..96c15501b0c8 100644
+--- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
++++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+@@ -1489,7 +1489,9 @@ execbuf_submit(struct i915_execbuffer_params *params,
if (ret)
return ret;
@@ -4031,10 +4157,11 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-4.9
i915_gem_execbuffer_move_to_active(vmas, params->request);
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.9.28/drivers/gpu/drm/i915/i915_gem_shrinker.c
---- linux-4.9.28.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/i915/i915_gem_shrinker.c 2017-05-19 03:37:25.138175108 +0200
-@@ -40,7 +40,7 @@
+diff --git a/drivers/gpu/drm/i915/i915_gem_shrinker.c b/drivers/gpu/drm/i915/i915_gem_shrinker.c
+index 755d78832a66..97fb03dc4971 100644
+--- a/drivers/gpu/drm/i915/i915_gem_shrinker.c
++++ b/drivers/gpu/drm/i915/i915_gem_shrinker.c
+@@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
if (!mutex_is_locked(mutex))
return false;
@@ -4043,10 +4170,11 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_gem_shrinker.c linux-4.9.2
return mutex->owner == task;
#else
/* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.9.28/drivers/gpu/drm/i915/i915_irq.c
---- linux-4.9.28.orig/drivers/gpu/drm/i915/i915_irq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/i915/i915_irq.c 2017-05-19 03:37:25.142175268 +0200
-@@ -812,6 +812,7 @@
+diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
+index 02908e37c228..05c0480576e1 100644
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -812,6 +812,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4054,7 +4182,7 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.9.28/drivers
/* Get optional system timestamp before query. */
if (stime)
-@@ -863,6 +864,7 @@
+@@ -863,6 +864,7 @@ static int i915_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
*etime = ktime_get();
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4062,10 +4190,11 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/i915_irq.c linux-4.9.28/drivers
spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_display.c linux-4.9.28/drivers/gpu/drm/i915/intel_display.c
---- linux-4.9.28.orig/drivers/gpu/drm/i915/intel_display.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/i915/intel_display.c 2017-05-19 03:37:25.142175268 +0200
-@@ -12131,7 +12131,7 @@
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 5dc6082639db..c32458fb3be2 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -12131,7 +12131,7 @@ void intel_check_page_flip(struct drm_i915_private *dev_priv, int pipe)
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
struct intel_flip_work *work;
@@ -4074,9 +4203,10 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_display.c linux-4.9.28/dr
if (crtc == NULL)
return;
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.9.28/drivers/gpu/drm/i915/intel_sprite.c
---- linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/i915/intel_sprite.c 2017-05-19 03:37:25.142175268 +0200
+diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
+index dbed12c484c9..5c540b78e8b5 100644
+--- a/drivers/gpu/drm/i915/intel_sprite.c
++++ b/drivers/gpu/drm/i915/intel_sprite.c
@@ -35,6 +35,7 @@
#include <drm/drm_rect.h>
#include <drm/drm_atomic.h>
@@ -4085,7 +4215,7 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.9.28/dri
#include "intel_drv.h"
#include "intel_frontbuffer.h"
#include <drm/i915_drm.h>
-@@ -65,6 +66,8 @@
+@@ -65,6 +66,8 @@ int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
1000 * adjusted_mode->crtc_htotal);
}
@@ -4094,7 +4224,7 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.9.28/dri
/**
* intel_pipe_update_start() - start update of a set of display registers
* @crtc: the crtc of which the registers are going to be updated
-@@ -95,7 +98,7 @@
+@@ -95,7 +98,7 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
min = vblank_start - intel_usecs_to_scanlines(adjusted_mode, 100);
max = vblank_start - 1;
@@ -4103,7 +4233,7 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.9.28/dri
if (min <= 0 || max <= 0)
return;
-@@ -125,11 +128,11 @@
+@@ -125,11 +128,11 @@ void intel_pipe_update_start(struct intel_crtc *crtc)
break;
}
@@ -4117,7 +4247,7 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.9.28/dri
}
finish_wait(wq, &wait);
-@@ -181,7 +184,7 @@
+@@ -181,7 +184,7 @@ void intel_pipe_update_end(struct intel_crtc *crtc, struct intel_flip_work *work
crtc->base.state->event = NULL;
}
@@ -4126,10 +4256,11 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/i915/intel_sprite.c linux-4.9.28/dri
if (crtc->debug.start_vbl_count &&
crtc->debug.start_vbl_count != end_vbl_count) {
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/msm/msm_gem_shrinker.c linux-4.9.28/drivers/gpu/drm/msm/msm_gem_shrinker.c
---- linux-4.9.28.orig/drivers/gpu/drm/msm/msm_gem_shrinker.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/msm/msm_gem_shrinker.c 2017-05-19 03:37:25.142175268 +0200
-@@ -23,7 +23,7 @@
+diff --git a/drivers/gpu/drm/msm/msm_gem_shrinker.c b/drivers/gpu/drm/msm/msm_gem_shrinker.c
+index 192b2d3a79cb..d5372a207326 100644
+--- a/drivers/gpu/drm/msm/msm_gem_shrinker.c
++++ b/drivers/gpu/drm/msm/msm_gem_shrinker.c
+@@ -23,7 +23,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
if (!mutex_is_locked(mutex))
return false;
@@ -4138,10 +4269,11 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/msm/msm_gem_shrinker.c linux-4.9.28/
return mutex->owner == task;
#else
/* Since UP may be pre-empted, we cannot assume that we own the lock */
-diff -Nur linux-4.9.28.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.9.28/drivers/gpu/drm/radeon/radeon_display.c
---- linux-4.9.28.orig/drivers/gpu/drm/radeon/radeon_display.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/gpu/drm/radeon/radeon_display.c 2017-05-19 03:37:25.142175268 +0200
-@@ -1845,6 +1845,7 @@
+diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
+index cdb8cb568c15..b6d7fd964cbc 100644
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -1845,6 +1845,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
struct radeon_device *rdev = dev->dev_private;
/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4149,7 +4281,7 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.9.28
/* Get optional system timestamp before query. */
if (stime)
-@@ -1937,6 +1938,7 @@
+@@ -1937,6 +1938,7 @@ int radeon_get_crtc_scanoutpos(struct drm_device *dev, unsigned int pipe,
*etime = ktime_get();
/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
@@ -4157,10 +4289,11 @@ diff -Nur linux-4.9.28.orig/drivers/gpu/drm/radeon/radeon_display.c linux-4.9.28
/* Decode into vertical and horizontal scanout position. */
*vpos = position & 0x1fff;
-diff -Nur linux-4.9.28.orig/drivers/hv/vmbus_drv.c linux-4.9.28/drivers/hv/vmbus_drv.c
---- linux-4.9.28.orig/drivers/hv/vmbus_drv.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/hv/vmbus_drv.c 2017-05-19 03:37:25.142175268 +0200
-@@ -761,6 +761,8 @@
+diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c
+index 0276d2ef06ee..8868045eabde 100644
+--- a/drivers/hv/vmbus_drv.c
++++ b/drivers/hv/vmbus_drv.c
+@@ -761,6 +761,8 @@ static void vmbus_isr(void)
void *page_addr;
struct hv_message *msg;
union hv_synic_event_flags *event;
@@ -4169,7 +4302,7 @@ diff -Nur linux-4.9.28.orig/drivers/hv/vmbus_drv.c linux-4.9.28/drivers/hv/vmbus
bool handled = false;
page_addr = hv_context.synic_event_page[cpu];
-@@ -808,7 +810,7 @@
+@@ -808,7 +810,7 @@ static void vmbus_isr(void)
tasklet_schedule(hv_context.msg_dpc[cpu]);
}
@@ -4178,10 +4311,11 @@ diff -Nur linux-4.9.28.orig/drivers/hv/vmbus_drv.c linux-4.9.28/drivers/hv/vmbus
}
-diff -Nur linux-4.9.28.orig/drivers/ide/alim15x3.c linux-4.9.28/drivers/ide/alim15x3.c
---- linux-4.9.28.orig/drivers/ide/alim15x3.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/alim15x3.c 2017-05-19 03:37:25.142175268 +0200
-@@ -234,7 +234,7 @@
+diff --git a/drivers/ide/alim15x3.c b/drivers/ide/alim15x3.c
+index 36f76e28a0bf..394f142f90c7 100644
+--- a/drivers/ide/alim15x3.c
++++ b/drivers/ide/alim15x3.c
+@@ -234,7 +234,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
@@ -4190,7 +4324,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/alim15x3.c linux-4.9.28/drivers/ide/alim
if (m5229_revision < 0xC2) {
/*
-@@ -325,7 +325,7 @@
+@@ -325,7 +325,7 @@ static int init_chipset_ali15x3(struct pci_dev *dev)
}
pci_dev_put(north);
pci_dev_put(isa_dev);
@@ -4199,10 +4333,11 @@ diff -Nur linux-4.9.28.orig/drivers/ide/alim15x3.c linux-4.9.28/drivers/ide/alim
return 0;
}
-diff -Nur linux-4.9.28.orig/drivers/ide/hpt366.c linux-4.9.28/drivers/ide/hpt366.c
---- linux-4.9.28.orig/drivers/ide/hpt366.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/hpt366.c 2017-05-19 03:37:25.142175268 +0200
-@@ -1236,7 +1236,7 @@
+diff --git a/drivers/ide/hpt366.c b/drivers/ide/hpt366.c
+index 0ceae5cbd89a..c212e85d7f3e 100644
+--- a/drivers/ide/hpt366.c
++++ b/drivers/ide/hpt366.c
+@@ -1236,7 +1236,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
dma_old = inb(base + 2);
@@ -4211,7 +4346,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/hpt366.c linux-4.9.28/drivers/ide/hpt366
dma_new = dma_old;
pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma);
-@@ -1247,7 +1247,7 @@
+@@ -1247,7 +1247,7 @@ static int init_dma_hpt366(ide_hwif_t *hwif,
if (dma_new != dma_old)
outb(dma_new, base + 2);
@@ -4220,40 +4355,11 @@ diff -Nur linux-4.9.28.orig/drivers/ide/hpt366.c linux-4.9.28/drivers/ide/hpt366
printk(KERN_INFO " %s: BM-DMA at 0x%04lx-0x%04lx\n",
hwif->name, base, base + 7);
-diff -Nur linux-4.9.28.orig/drivers/ide/ide-io.c linux-4.9.28/drivers/ide/ide-io.c
---- linux-4.9.28.orig/drivers/ide/ide-io.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/ide-io.c 2017-05-19 03:37:25.146175423 +0200
-@@ -659,7 +659,7 @@
- /* disable_irq_nosync ?? */
- disable_irq(hwif->irq);
- /* local CPU only, as if we were handling an interrupt */
-- local_irq_disable();
-+ local_irq_disable_nort();
- if (hwif->polling) {
- startstop = handler(drive);
- } else if (drive_is_ready(drive)) {
-diff -Nur linux-4.9.28.orig/drivers/ide/ide-iops.c linux-4.9.28/drivers/ide/ide-iops.c
---- linux-4.9.28.orig/drivers/ide/ide-iops.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/ide-iops.c 2017-05-19 03:37:25.146175423 +0200
-@@ -129,12 +129,12 @@
- if ((stat & ATA_BUSY) == 0)
- break;
-
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- *rstat = stat;
- return -EBUSY;
- }
- }
-- local_irq_restore(flags);
-+ local_irq_restore_nort(flags);
- }
- /*
- * Allow status to settle, then read it again.
-diff -Nur linux-4.9.28.orig/drivers/ide/ide-io-std.c linux-4.9.28/drivers/ide/ide-io-std.c
---- linux-4.9.28.orig/drivers/ide/ide-io-std.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/ide-io-std.c 2017-05-19 03:37:25.142175268 +0200
-@@ -175,7 +175,7 @@
+diff --git a/drivers/ide/ide-io-std.c b/drivers/ide/ide-io-std.c
+index 19763977568c..4169433faab5 100644
+--- a/drivers/ide/ide-io-std.c
++++ b/drivers/ide/ide-io-std.c
+@@ -175,7 +175,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
unsigned long uninitialized_var(flags);
if ((io_32bit & 2) && !mmio) {
@@ -4262,7 +4368,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-io-std.c linux-4.9.28/drivers/ide/id
ata_vlb_sync(io_ports->nsect_addr);
}
-@@ -186,7 +186,7 @@
+@@ -186,7 +186,7 @@ void ide_input_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
insl(data_addr, buf, words);
if ((io_32bit & 2) && !mmio)
@@ -4271,7 +4377,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-io-std.c linux-4.9.28/drivers/ide/id
if (((len + 1) & 3) < 2)
return;
-@@ -219,7 +219,7 @@
+@@ -219,7 +219,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
unsigned long uninitialized_var(flags);
if ((io_32bit & 2) && !mmio) {
@@ -4280,7 +4386,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-io-std.c linux-4.9.28/drivers/ide/id
ata_vlb_sync(io_ports->nsect_addr);
}
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ void ide_output_data(ide_drive_t *drive, struct ide_cmd *cmd, void *buf,
outsl(data_addr, buf, words);
if ((io_32bit & 2) && !mmio)
@@ -4289,10 +4395,43 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-io-std.c linux-4.9.28/drivers/ide/id
if (((len + 1) & 3) < 2)
return;
-diff -Nur linux-4.9.28.orig/drivers/ide/ide-probe.c linux-4.9.28/drivers/ide/ide-probe.c
---- linux-4.9.28.orig/drivers/ide/ide-probe.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/ide-probe.c 2017-05-19 03:37:25.146175423 +0200
-@@ -196,10 +196,10 @@
+diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
+index 669ea1e45795..e12e43e62245 100644
+--- a/drivers/ide/ide-io.c
++++ b/drivers/ide/ide-io.c
+@@ -659,7 +659,7 @@ void ide_timer_expiry (unsigned long data)
+ /* disable_irq_nosync ?? */
+ disable_irq(hwif->irq);
+ /* local CPU only, as if we were handling an interrupt */
+- local_irq_disable();
++ local_irq_disable_nort();
+ if (hwif->polling) {
+ startstop = handler(drive);
+ } else if (drive_is_ready(drive)) {
+diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
+index 376f2dc410c5..f014dd1b73dc 100644
+--- a/drivers/ide/ide-iops.c
++++ b/drivers/ide/ide-iops.c
+@@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive, u8 good, u8 bad,
+ if ((stat & ATA_BUSY) == 0)
+ break;
+
+- local_irq_restore(flags);
++ local_irq_restore_nort(flags);
+ *rstat = stat;
+ return -EBUSY;
+ }
+ }
+- local_irq_restore(flags);
++ local_irq_restore_nort(flags);
+ }
+ /*
+ * Allow status to settle, then read it again.
+diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c
+index 0b63facd1d87..4ceba37afc0c 100644
+--- a/drivers/ide/ide-probe.c
++++ b/drivers/ide/ide-probe.c
+@@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *drive, u8 cmd, u16 *id)
int bswap = 1;
/* local CPU only; some systems need this */
@@ -4305,10 +4444,11 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-probe.c linux-4.9.28/drivers/ide/ide
drive->dev_flags |= IDE_DFLAG_ID_READ;
#ifdef DEBUG
-diff -Nur linux-4.9.28.orig/drivers/ide/ide-taskfile.c linux-4.9.28/drivers/ide/ide-taskfile.c
---- linux-4.9.28.orig/drivers/ide/ide-taskfile.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/ide/ide-taskfile.c 2017-05-19 03:37:25.146175423 +0200
-@@ -250,7 +250,7 @@
+diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
+index a716693417a3..be0568c722d6 100644
+--- a/drivers/ide/ide-taskfile.c
++++ b/drivers/ide/ide-taskfile.c
+@@ -250,7 +250,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
page_is_high = PageHighMem(page);
if (page_is_high)
@@ -4317,7 +4457,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-taskfile.c linux-4.9.28/drivers/ide/
buf = kmap_atomic(page) + offset;
-@@ -271,7 +271,7 @@
+@@ -271,7 +271,7 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
kunmap_atomic(buf);
if (page_is_high)
@@ -4326,7 +4466,7 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-taskfile.c linux-4.9.28/drivers/ide/
len -= nr_bytes;
}
-@@ -414,7 +414,7 @@
+@@ -414,7 +414,7 @@ static ide_startstop_t pre_task_out_intr(ide_drive_t *drive,
}
if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
@@ -4335,10 +4475,11 @@ diff -Nur linux-4.9.28.orig/drivers/ide/ide-taskfile.c linux-4.9.28/drivers/ide/
ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
-diff -Nur linux-4.9.28.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux-4.9.28/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
---- linux-4.9.28.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/infiniband/ulp/ipoib/ipoib_multicast.c 2017-05-19 03:37:25.146175423 +0200
-@@ -902,7 +902,7 @@
+diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+index fddff403d5d2..cca1bb4fbfe3 100644
+--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
++++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+@@ -902,7 +902,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
ipoib_dbg_mcast(priv, "restarting multicast task\n");
@@ -4347,7 +4488,7 @@ diff -Nur linux-4.9.28.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux
netif_addr_lock(dev);
spin_lock(&priv->lock);
-@@ -984,7 +984,7 @@
+@@ -984,7 +984,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
spin_unlock(&priv->lock);
netif_addr_unlock(dev);
@@ -4356,10 +4497,11 @@ diff -Nur linux-4.9.28.orig/drivers/infiniband/ulp/ipoib/ipoib_multicast.c linux
/*
* make sure the in-flight joins have finished before we attempt
-diff -Nur linux-4.9.28.orig/drivers/input/gameport/gameport.c linux-4.9.28/drivers/input/gameport/gameport.c
---- linux-4.9.28.orig/drivers/input/gameport/gameport.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/input/gameport/gameport.c 2017-05-19 03:37:25.146175423 +0200
-@@ -91,13 +91,13 @@
+diff --git a/drivers/input/gameport/gameport.c b/drivers/input/gameport/gameport.c
+index 4a2a9e370be7..e970d9afd179 100644
+--- a/drivers/input/gameport/gameport.c
++++ b/drivers/input/gameport/gameport.c
+@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct gameport *gameport)
tx = ~0;
for (i = 0; i < 50; i++) {
@@ -4375,7 +4517,7 @@ diff -Nur linux-4.9.28.orig/drivers/input/gameport/gameport.c linux-4.9.28/drive
udelay(i * 10);
t = (t2 - t1) - (t3 - t2);
if (t < tx)
-@@ -124,12 +124,12 @@
+@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(struct gameport *gameport)
tx = 1 << 30;
for(i = 0; i < 50; i++) {
@@ -4390,7 +4532,7 @@ diff -Nur linux-4.9.28.orig/drivers/input/gameport/gameport.c linux-4.9.28/drive
udelay(i * 10);
if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
}
-@@ -148,11 +148,11 @@
+@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(struct gameport *gameport)
tx = 1 << 30;
for(i = 0; i < 50; i++) {
@@ -4404,10 +4546,11 @@ diff -Nur linux-4.9.28.orig/drivers/input/gameport/gameport.c linux-4.9.28/drive
udelay(i * 10);
if (t2 - t1 < tx) tx = t2 - t1;
}
-diff -Nur linux-4.9.28.orig/drivers/iommu/amd_iommu.c linux-4.9.28/drivers/iommu/amd_iommu.c
---- linux-4.9.28.orig/drivers/iommu/amd_iommu.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/iommu/amd_iommu.c 2017-05-19 03:37:25.146175423 +0200
-@@ -1923,10 +1923,10 @@
+diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c
+index 11a13b5be73a..baaed0ac274b 100644
+--- a/drivers/iommu/amd_iommu.c
++++ b/drivers/iommu/amd_iommu.c
+@@ -1923,10 +1923,10 @@ static int __attach_device(struct iommu_dev_data *dev_data,
int ret;
/*
@@ -4421,7 +4564,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/amd_iommu.c linux-4.9.28/drivers/iommu
/* lock domain */
spin_lock(&domain->lock);
-@@ -2094,10 +2094,10 @@
+@@ -2094,10 +2094,10 @@ static void __detach_device(struct iommu_dev_data *dev_data)
struct protection_domain *domain;
/*
@@ -4435,10 +4578,11 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/amd_iommu.c linux-4.9.28/drivers/iommu
if (WARN_ON(!dev_data->domain))
return;
-diff -Nur linux-4.9.28.orig/drivers/iommu/intel-iommu.c linux-4.9.28/drivers/iommu/intel-iommu.c
---- linux-4.9.28.orig/drivers/iommu/intel-iommu.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/iommu/intel-iommu.c 2017-05-19 03:37:25.146175423 +0200
-@@ -479,7 +479,7 @@
+diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
+index 87fcbf71b85a..674c82b61f36 100644
+--- a/drivers/iommu/intel-iommu.c
++++ b/drivers/iommu/intel-iommu.c
+@@ -479,7 +479,7 @@ struct deferred_flush_data {
struct deferred_flush_table *tables;
};
@@ -4447,7 +4591,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/intel-iommu.c linux-4.9.28/drivers/iom
/* bitmap for indexing intel_iommus */
static int g_num_of_iommus;
-@@ -3716,10 +3716,8 @@
+@@ -3719,10 +3719,8 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
struct intel_iommu *iommu;
struct deferred_flush_entry *entry;
struct deferred_flush_data *flush_data;
@@ -4459,7 +4603,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/intel-iommu.c linux-4.9.28/drivers/iom
/* Flush all CPUs' entries to avoid deferring too much. If
* this becomes a bottleneck, can just flush us, and rely on
-@@ -3752,8 +3750,6 @@
+@@ -3755,8 +3753,6 @@ static void add_unmap(struct dmar_domain *dom, unsigned long iova_pfn,
}
flush_data->size++;
spin_unlock_irqrestore(&flush_data->lock, flags);
@@ -4468,9 +4612,10 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/intel-iommu.c linux-4.9.28/drivers/iom
}
static void intel_unmap(struct device *dev, dma_addr_t dev_addr, size_t size)
-diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova.c
---- linux-4.9.28.orig/drivers/iommu/iova.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/iommu/iova.c 2017-05-19 03:37:25.146175423 +0200
+diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c
+index e23001bfcfee..359d5d169ec0 100644
+--- a/drivers/iommu/iova.c
++++ b/drivers/iommu/iova.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/smp.h>
@@ -4479,7 +4624,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova
static bool iova_rcache_insert(struct iova_domain *iovad,
unsigned long pfn,
-@@ -420,10 +421,8 @@
+@@ -420,10 +421,8 @@ alloc_iova_fast(struct iova_domain *iovad, unsigned long size,
/* Try replenishing IOVAs by flushing rcache. */
flushed_rcache = true;
@@ -4490,7 +4635,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova
goto retry;
}
-@@ -751,7 +750,7 @@
+@@ -751,7 +750,7 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
bool can_insert = false;
unsigned long flags;
@@ -4499,7 +4644,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova
spin_lock_irqsave(&cpu_rcache->lock, flags);
if (!iova_magazine_full(cpu_rcache->loaded)) {
-@@ -781,7 +780,6 @@
+@@ -781,7 +780,6 @@ static bool __iova_rcache_insert(struct iova_domain *iovad,
iova_magazine_push(cpu_rcache->loaded, iova_pfn);
spin_unlock_irqrestore(&cpu_rcache->lock, flags);
@@ -4507,7 +4652,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova
if (mag_to_free) {
iova_magazine_free_pfns(mag_to_free, iovad);
-@@ -815,7 +813,7 @@
+@@ -815,7 +813,7 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
bool has_pfn = false;
unsigned long flags;
@@ -4516,7 +4661,7 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova
spin_lock_irqsave(&cpu_rcache->lock, flags);
if (!iova_magazine_empty(cpu_rcache->loaded)) {
-@@ -837,7 +835,6 @@
+@@ -837,7 +835,6 @@ static unsigned long __iova_rcache_get(struct iova_rcache *rcache,
iova_pfn = iova_magazine_pop(cpu_rcache->loaded, limit_pfn);
spin_unlock_irqrestore(&cpu_rcache->lock, flags);
@@ -4524,10 +4669,11 @@ diff -Nur linux-4.9.28.orig/drivers/iommu/iova.c linux-4.9.28/drivers/iommu/iova
return iova_pfn;
}
-diff -Nur linux-4.9.28.orig/drivers/leds/trigger/Kconfig linux-4.9.28/drivers/leds/trigger/Kconfig
---- linux-4.9.28.orig/drivers/leds/trigger/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/leds/trigger/Kconfig 2017-05-19 03:37:25.146175423 +0200
-@@ -69,7 +69,7 @@
+diff --git a/drivers/leds/trigger/Kconfig b/drivers/leds/trigger/Kconfig
+index 3f9ddb9fafa7..09da5b6b44a1 100644
+--- a/drivers/leds/trigger/Kconfig
++++ b/drivers/leds/trigger/Kconfig
+@@ -69,7 +69,7 @@ config LEDS_TRIGGER_BACKLIGHT
config LEDS_TRIGGER_CPU
bool "LED CPU Trigger"
@@ -4536,9 +4682,10 @@ diff -Nur linux-4.9.28.orig/drivers/leds/trigger/Kconfig linux-4.9.28/drivers/le
help
This allows LEDs to be controlled by active CPUs. This shows
the active CPUs across an array of LEDs so you can see which
-diff -Nur linux-4.9.28.orig/drivers/md/bcache/Kconfig linux-4.9.28/drivers/md/bcache/Kconfig
---- linux-4.9.28.orig/drivers/md/bcache/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/md/bcache/Kconfig 2017-05-19 03:37:25.146175423 +0200
+diff --git a/drivers/md/bcache/Kconfig b/drivers/md/bcache/Kconfig
+index 4d200883c505..98b64ed5cb81 100644
+--- a/drivers/md/bcache/Kconfig
++++ b/drivers/md/bcache/Kconfig
@@ -1,6 +1,7 @@
config BCACHE
@@ -4547,10 +4694,11 @@ diff -Nur linux-4.9.28.orig/drivers/md/bcache/Kconfig linux-4.9.28/drivers/md/bc
---help---
Allows a block device to be used as cache for other devices; uses
a btree for indexing and the layout is optimized for SSDs.
-diff -Nur linux-4.9.28.orig/drivers/md/dm-rq.c linux-4.9.28/drivers/md/dm-rq.c
---- linux-4.9.28.orig/drivers/md/dm-rq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/md/dm-rq.c 2017-05-19 03:37:25.146175423 +0200
-@@ -842,7 +842,7 @@
+diff --git a/drivers/md/dm-rq.c b/drivers/md/dm-rq.c
+index ba7c4c685db3..834ec328f217 100644
+--- a/drivers/md/dm-rq.c
++++ b/drivers/md/dm-rq.c
+@@ -842,7 +842,7 @@ static void dm_old_request_fn(struct request_queue *q)
/* Establish tio->ti before queuing work (map_tio_request) */
tio->ti = ti;
kthread_queue_work(&md->kworker, &tio->work);
@@ -4559,10 +4707,11 @@ diff -Nur linux-4.9.28.orig/drivers/md/dm-rq.c linux-4.9.28/drivers/md/dm-rq.c
}
}
-diff -Nur linux-4.9.28.orig/drivers/md/raid5.c linux-4.9.28/drivers/md/raid5.c
---- linux-4.9.28.orig/drivers/md/raid5.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/md/raid5.c 2017-05-19 03:37:25.146175423 +0200
-@@ -1928,8 +1928,9 @@
+diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
+index f34ad2be66a1..123469f7b560 100644
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -1928,8 +1928,9 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
struct raid5_percpu *percpu;
unsigned long cpu;
@@ -4573,7 +4722,7 @@ diff -Nur linux-4.9.28.orig/drivers/md/raid5.c linux-4.9.28/drivers/md/raid5.c
if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
ops_run_biofill(sh);
overlap_clear++;
-@@ -1985,7 +1986,8 @@
+@@ -1985,7 +1986,8 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request)
if (test_and_clear_bit(R5_Overlap, &dev->flags))
wake_up(&sh->raid_conf->wait_for_overlap);
}
@@ -4583,7 +4732,7 @@ diff -Nur linux-4.9.28.orig/drivers/md/raid5.c linux-4.9.28/drivers/md/raid5.c
}
static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp,
-@@ -6391,6 +6393,7 @@
+@@ -6393,6 +6395,7 @@ static int raid456_cpu_up_prepare(unsigned int cpu, struct hlist_node *node)
__func__, cpu);
return -ENOMEM;
}
@@ -4591,7 +4740,7 @@ diff -Nur linux-4.9.28.orig/drivers/md/raid5.c linux-4.9.28/drivers/md/raid5.c
return 0;
}
-@@ -6401,7 +6404,6 @@
+@@ -6403,7 +6406,6 @@ static int raid5_alloc_percpu(struct r5conf *conf)
conf->percpu = alloc_percpu(struct raid5_percpu);
if (!conf->percpu)
return -ENOMEM;
@@ -4599,10 +4748,11 @@ diff -Nur linux-4.9.28.orig/drivers/md/raid5.c linux-4.9.28/drivers/md/raid5.c
err = cpuhp_state_add_instance(CPUHP_MD_RAID5_PREPARE, &conf->node);
if (!err) {
conf->scribble_disks = max(conf->raid_disks,
-diff -Nur linux-4.9.28.orig/drivers/md/raid5.h linux-4.9.28/drivers/md/raid5.h
---- linux-4.9.28.orig/drivers/md/raid5.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/md/raid5.h 2017-05-19 03:37:25.150175574 +0200
-@@ -504,6 +504,7 @@
+diff --git a/drivers/md/raid5.h b/drivers/md/raid5.h
+index 57ec49f0839e..0739604990b7 100644
+--- a/drivers/md/raid5.h
++++ b/drivers/md/raid5.h
+@@ -504,6 +504,7 @@ struct r5conf {
int recovery_disabled;
/* per cpu variables */
struct raid5_percpu {
@@ -4610,10 +4760,11 @@ diff -Nur linux-4.9.28.orig/drivers/md/raid5.h linux-4.9.28/drivers/md/raid5.h
struct page *spare_page; /* Used when checking P/Q in raid6 */
struct flex_array *scribble; /* space for constructing buffer
* lists and performing address
-diff -Nur linux-4.9.28.orig/drivers/misc/Kconfig linux-4.9.28/drivers/misc/Kconfig
---- linux-4.9.28.orig/drivers/misc/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/misc/Kconfig 2017-05-19 03:37:25.150175574 +0200
-@@ -54,6 +54,7 @@
+diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
+index 64971baf11fa..215e91e36198 100644
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -54,6 +54,7 @@ config AD525X_DPOT_SPI
config ATMEL_TCLIB
bool "Atmel AT32/AT91 Timer/Counter Library"
depends on (AVR32 || ARCH_AT91)
@@ -4621,7 +4772,7 @@ diff -Nur linux-4.9.28.orig/drivers/misc/Kconfig linux-4.9.28/drivers/misc/Kconf
help
Select this if you want a library to allocate the Timer/Counter
blocks found on many Atmel processors. This facilitates using
-@@ -69,8 +70,7 @@
+@@ -69,8 +70,7 @@ config ATMEL_TCB_CLKSRC
are combined to make a single 32-bit timer.
When GENERIC_CLOCKEVENTS is defined, the third timer channel
@@ -4631,7 +4782,7 @@ diff -Nur linux-4.9.28.orig/drivers/misc/Kconfig linux-4.9.28/drivers/misc/Kconf
config ATMEL_TCB_CLKSRC_BLOCK
int
-@@ -84,6 +84,15 @@
+@@ -84,6 +84,15 @@ config ATMEL_TCB_CLKSRC_BLOCK
TC can be used for other purposes, such as PWM generation and
interval timing.
@@ -4647,10 +4798,11 @@ diff -Nur linux-4.9.28.orig/drivers/misc/Kconfig linux-4.9.28/drivers/misc/Kconf
config DUMMY_IRQ
tristate "Dummy IRQ handler"
default n
-diff -Nur linux-4.9.28.orig/drivers/mmc/host/mmci.c linux-4.9.28/drivers/mmc/host/mmci.c
---- linux-4.9.28.orig/drivers/mmc/host/mmci.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/mmc/host/mmci.c 2017-05-19 03:37:25.150175574 +0200
-@@ -1147,15 +1147,12 @@
+diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
+index df990bb8c873..1a162709a85e 100644
+--- a/drivers/mmc/host/mmci.c
++++ b/drivers/mmc/host/mmci.c
+@@ -1147,15 +1147,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
struct sg_mapping_iter *sg_miter = &host->sg_miter;
struct variant_data *variant = host->variant;
void __iomem *base = host->base;
@@ -4666,7 +4818,7 @@ diff -Nur linux-4.9.28.orig/drivers/mmc/host/mmci.c linux-4.9.28/drivers/mmc/hos
do {
unsigned int remain, len;
char *buffer;
-@@ -1195,8 +1192,6 @@
+@@ -1195,8 +1192,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)
sg_miter_stop(sg_miter);
@@ -4675,10 +4827,11 @@ diff -Nur linux-4.9.28.orig/drivers/mmc/host/mmci.c linux-4.9.28/drivers/mmc/hos
/*
* If we have less than the fifo 'half-full' threshold to transfer,
* trigger a PIO interrupt as soon as any data is available.
-diff -Nur linux-4.9.28.orig/drivers/net/ethernet/3com/3c59x.c linux-4.9.28/drivers/net/ethernet/3com/3c59x.c
---- linux-4.9.28.orig/drivers/net/ethernet/3com/3c59x.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/net/ethernet/3com/3c59x.c 2017-05-19 03:37:25.150175574 +0200
-@@ -842,9 +842,9 @@
+diff --git a/drivers/net/ethernet/3com/3c59x.c b/drivers/net/ethernet/3com/3c59x.c
+index 9133e7926da5..63afb921ed40 100644
+--- a/drivers/net/ethernet/3com/3c59x.c
++++ b/drivers/net/ethernet/3com/3c59x.c
+@@ -842,9 +842,9 @@ static void poll_vortex(struct net_device *dev)
{
struct vortex_private *vp = netdev_priv(dev);
unsigned long flags;
@@ -4690,7 +4843,7 @@ diff -Nur linux-4.9.28.orig/drivers/net/ethernet/3com/3c59x.c linux-4.9.28/drive
}
#endif
-@@ -1910,12 +1910,12 @@
+@@ -1910,12 +1910,12 @@ static void vortex_tx_timeout(struct net_device *dev)
* Block interrupts because vortex_interrupt does a bare spin_lock()
*/
unsigned long flags;
@@ -4705,10 +4858,11 @@ diff -Nur linux-4.9.28.orig/drivers/net/ethernet/3com/3c59x.c linux-4.9.28/drive
}
}
-diff -Nur linux-4.9.28.orig/drivers/net/ethernet/realtek/8139too.c linux-4.9.28/drivers/net/ethernet/realtek/8139too.c
---- linux-4.9.28.orig/drivers/net/ethernet/realtek/8139too.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/net/ethernet/realtek/8139too.c 2017-05-19 03:37:25.150175574 +0200
-@@ -2233,7 +2233,7 @@
+diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
+index da4c2d8a4173..1420dfb56bac 100644
+--- a/drivers/net/ethernet/realtek/8139too.c
++++ b/drivers/net/ethernet/realtek/8139too.c
+@@ -2233,7 +2233,7 @@ static void rtl8139_poll_controller(struct net_device *dev)
struct rtl8139_private *tp = netdev_priv(dev);
const int irq = tp->pci_dev->irq;
@@ -4717,10 +4871,11 @@ diff -Nur linux-4.9.28.orig/drivers/net/ethernet/realtek/8139too.c linux-4.9.28/
rtl8139_interrupt(irq, dev);
enable_irq(irq);
}
-diff -Nur linux-4.9.28.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c linux-4.9.28/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
---- linux-4.9.28.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/net/wireless/intersil/orinoco/orinoco_usb.c 2017-05-19 03:37:25.150175574 +0200
-@@ -697,7 +697,7 @@
+diff --git a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+index bca6935a94db..d7a35ee34d03 100644
+--- a/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
++++ b/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
+@@ -697,7 +697,7 @@ static void ezusb_req_ctx_wait(struct ezusb_priv *upriv,
while (!ctx->done.done && msecs--)
udelay(1000);
} else {
@@ -4729,10 +4884,11 @@ diff -Nur linux-4.9.28.orig/drivers/net/wireless/intersil/orinoco/orinoco_usb.c
ctx->done.done);
}
break;
-diff -Nur linux-4.9.28.orig/drivers/pci/access.c linux-4.9.28/drivers/pci/access.c
---- linux-4.9.28.orig/drivers/pci/access.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/pci/access.c 2017-05-19 03:37:25.150175574 +0200
-@@ -672,7 +672,7 @@
+diff --git a/drivers/pci/access.c b/drivers/pci/access.c
+index d11cdbb8fba3..223bbb9acb03 100644
+--- a/drivers/pci/access.c
++++ b/drivers/pci/access.c
+@@ -672,7 +672,7 @@ void pci_cfg_access_unlock(struct pci_dev *dev)
WARN_ON(!dev->block_cfg_access);
dev->block_cfg_access = 0;
@@ -4741,10 +4897,11 @@ diff -Nur linux-4.9.28.orig/drivers/pci/access.c linux-4.9.28/drivers/pci/access
raw_spin_unlock_irqrestore(&pci_lock, flags);
}
EXPORT_SYMBOL_GPL(pci_cfg_access_unlock);
-diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/drivers/pinctrl/qcom/pinctrl-msm.c
---- linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/pinctrl/qcom/pinctrl-msm.c 2017-05-19 03:37:25.150175574 +0200
-@@ -61,7 +61,7 @@
+diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
+index bedce3453dd3..faf038978650 100644
+--- a/drivers/pinctrl/qcom/pinctrl-msm.c
++++ b/drivers/pinctrl/qcom/pinctrl-msm.c
+@@ -61,7 +61,7 @@ struct msm_pinctrl {
struct notifier_block restart_nb;
int irq;
@@ -4753,7 +4910,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
DECLARE_BITMAP(dual_edge_irqs, MAX_NR_GPIO);
DECLARE_BITMAP(enabled_irqs, MAX_NR_GPIO);
-@@ -153,14 +153,14 @@
+@@ -153,14 +153,14 @@ static int msm_pinmux_set_mux(struct pinctrl_dev *pctldev,
if (WARN_ON(i == g->nfuncs))
return -EINVAL;
@@ -4770,7 +4927,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
return 0;
}
-@@ -323,14 +323,14 @@
+@@ -323,14 +323,14 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
break;
case PIN_CONFIG_OUTPUT:
/* set output value */
@@ -4787,7 +4944,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
/* enable output */
arg = 1;
-@@ -351,12 +351,12 @@
+@@ -351,12 +351,12 @@ static int msm_config_group_set(struct pinctrl_dev *pctldev,
return -EINVAL;
}
@@ -4802,7 +4959,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
}
return 0;
-@@ -384,13 +384,13 @@
+@@ -384,13 +384,13 @@ static int msm_gpio_direction_input(struct gpio_chip *chip, unsigned offset)
g = &pctrl->soc->groups[offset];
@@ -4818,7 +4975,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
return 0;
}
-@@ -404,7 +404,7 @@
+@@ -404,7 +404,7 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in
g = &pctrl->soc->groups[offset];
@@ -4827,7 +4984,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
val = readl(pctrl->regs + g->io_reg);
if (value)
-@@ -417,7 +417,7 @@
+@@ -417,7 +417,7 @@ static int msm_gpio_direction_output(struct gpio_chip *chip, unsigned offset, in
val |= BIT(g->oe_bit);
writel(val, pctrl->regs + g->ctl_reg);
@@ -4836,7 +4993,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
return 0;
}
-@@ -443,7 +443,7 @@
+@@ -443,7 +443,7 @@ static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
g = &pctrl->soc->groups[offset];
@@ -4845,7 +5002,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
val = readl(pctrl->regs + g->io_reg);
if (value)
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ static void msm_gpio_set(struct gpio_chip *chip, unsigned offset, int value)
val &= ~BIT(g->out_bit);
writel(val, pctrl->regs + g->io_reg);
@@ -4854,7 +5011,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
}
#ifdef CONFIG_DEBUG_FS
-@@ -571,7 +571,7 @@
+@@ -571,7 +571,7 @@ static void msm_gpio_irq_mask(struct irq_data *d)
g = &pctrl->soc->groups[d->hwirq];
@@ -4863,7 +5020,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
val = readl(pctrl->regs + g->intr_cfg_reg);
val &= ~BIT(g->intr_enable_bit);
-@@ -579,7 +579,7 @@
+@@ -579,7 +579,7 @@ static void msm_gpio_irq_mask(struct irq_data *d)
clear_bit(d->hwirq, pctrl->enabled_irqs);
@@ -4872,7 +5029,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
}
static void msm_gpio_irq_unmask(struct irq_data *d)
-@@ -592,7 +592,7 @@
+@@ -592,7 +592,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d)
g = &pctrl->soc->groups[d->hwirq];
@@ -4881,7 +5038,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
val = readl(pctrl->regs + g->intr_cfg_reg);
val |= BIT(g->intr_enable_bit);
-@@ -600,7 +600,7 @@
+@@ -600,7 +600,7 @@ static void msm_gpio_irq_unmask(struct irq_data *d)
set_bit(d->hwirq, pctrl->enabled_irqs);
@@ -4890,7 +5047,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
}
static void msm_gpio_irq_ack(struct irq_data *d)
-@@ -613,7 +613,7 @@
+@@ -613,7 +613,7 @@ static void msm_gpio_irq_ack(struct irq_data *d)
g = &pctrl->soc->groups[d->hwirq];
@@ -4899,7 +5056,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
val = readl(pctrl->regs + g->intr_status_reg);
if (g->intr_ack_high)
-@@ -625,7 +625,7 @@
+@@ -625,7 +625,7 @@ static void msm_gpio_irq_ack(struct irq_data *d)
if (test_bit(d->hwirq, pctrl->dual_edge_irqs))
msm_gpio_update_dual_edge_pos(pctrl, g, d);
@@ -4908,7 +5065,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
}
static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
-@@ -638,7 +638,7 @@
+@@ -638,7 +638,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
g = &pctrl->soc->groups[d->hwirq];
@@ -4917,7 +5074,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
/*
* For hw without possibility of detecting both edges
-@@ -712,7 +712,7 @@
+@@ -712,7 +712,7 @@ static int msm_gpio_irq_set_type(struct irq_data *d, unsigned int type)
if (test_bit(d->hwirq, pctrl->dual_edge_irqs))
msm_gpio_update_dual_edge_pos(pctrl, g, d);
@@ -4926,7 +5083,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
if (type & (IRQ_TYPE_LEVEL_LOW | IRQ_TYPE_LEVEL_HIGH))
irq_set_handler_locked(d, handle_level_irq);
-@@ -728,11 +728,11 @@
+@@ -728,11 +728,11 @@ static int msm_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
struct msm_pinctrl *pctrl = gpiochip_get_data(gc);
unsigned long flags;
@@ -4940,7 +5097,7 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
return 0;
}
-@@ -878,7 +878,7 @@
+@@ -878,7 +878,7 @@ int msm_pinctrl_probe(struct platform_device *pdev,
pctrl->soc = soc_data;
pctrl->chip = msm_gpio_template;
@@ -4949,10 +5106,11 @@ diff -Nur linux-4.9.28.orig/drivers/pinctrl/qcom/pinctrl-msm.c linux-4.9.28/driv
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
pctrl->regs = devm_ioremap_resource(&pdev->dev, res);
-diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe.c linux-4.9.28/drivers/scsi/fcoe/fcoe.c
---- linux-4.9.28.orig/drivers/scsi/fcoe/fcoe.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/scsi/fcoe/fcoe.c 2017-05-19 03:37:25.150175574 +0200
-@@ -1455,11 +1455,11 @@
+diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c
+index 9bd41a35a78a..8e2d436c2e3f 100644
+--- a/drivers/scsi/fcoe/fcoe.c
++++ b/drivers/scsi/fcoe/fcoe.c
+@@ -1455,11 +1455,11 @@ static int fcoe_rcv(struct sk_buff *skb, struct net_device *netdev,
static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)
{
struct fcoe_percpu_s *fps;
@@ -4967,7 +5125,7 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe.c linux-4.9.28/drivers/scsi/f
return rc;
}
-@@ -1646,11 +1646,11 @@
+@@ -1646,11 +1646,11 @@ static inline int fcoe_filter_frames(struct fc_lport *lport,
return 0;
}
@@ -4981,7 +5139,7 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe.c linux-4.9.28/drivers/scsi/f
return -EINVAL;
}
-@@ -1693,7 +1693,7 @@
+@@ -1693,7 +1693,7 @@ static void fcoe_recv_frame(struct sk_buff *skb)
*/
hp = (struct fcoe_hdr *) skb_network_header(skb);
@@ -4990,7 +5148,7 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe.c linux-4.9.28/drivers/scsi/f
if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
if (stats->ErrorFrames < 5)
printk(KERN_WARNING "fcoe: FCoE version "
-@@ -1725,13 +1725,13 @@
+@@ -1725,13 +1725,13 @@ static void fcoe_recv_frame(struct sk_buff *skb)
goto drop;
if (!fcoe_filter_frames(lport, fp)) {
@@ -5006,10 +5164,11 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe.c linux-4.9.28/drivers/scsi/f
kfree_skb(skb);
}
-diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.9.28/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-4.9.28.orig/drivers/scsi/fcoe/fcoe_ctlr.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/scsi/fcoe/fcoe_ctlr.c 2017-05-19 03:37:25.150175574 +0200
-@@ -834,7 +834,7 @@
+diff --git a/drivers/scsi/fcoe/fcoe_ctlr.c b/drivers/scsi/fcoe/fcoe_ctlr.c
+index dcf36537a767..1a1f2e46452c 100644
+--- a/drivers/scsi/fcoe/fcoe_ctlr.c
++++ b/drivers/scsi/fcoe/fcoe_ctlr.c
+@@ -834,7 +834,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
INIT_LIST_HEAD(&del_list);
@@ -5018,7 +5177,7 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.9.28/drivers/s
list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
-@@ -870,7 +870,7 @@
+@@ -870,7 +870,7 @@ static unsigned long fcoe_ctlr_age_fcfs(struct fcoe_ctlr *fip)
sel_time = fcf->time;
}
}
@@ -5027,10 +5186,11 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/fcoe/fcoe_ctlr.c linux-4.9.28/drivers/s
list_for_each_entry_safe(fcf, next, &del_list, list) {
/* Removes fcf from current list */
-diff -Nur linux-4.9.28.orig/drivers/scsi/libfc/fc_exch.c linux-4.9.28/drivers/scsi/libfc/fc_exch.c
---- linux-4.9.28.orig/drivers/scsi/libfc/fc_exch.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/scsi/libfc/fc_exch.c 2017-05-19 03:37:25.150175574 +0200
-@@ -814,10 +814,10 @@
+diff --git a/drivers/scsi/libfc/fc_exch.c b/drivers/scsi/libfc/fc_exch.c
+index 16ca31ad5ec0..c3987347e762 100644
+--- a/drivers/scsi/libfc/fc_exch.c
++++ b/drivers/scsi/libfc/fc_exch.c
+@@ -814,10 +814,10 @@ static struct fc_exch *fc_exch_em_alloc(struct fc_lport *lport,
}
memset(ep, 0, sizeof(*ep));
@@ -5043,10 +5203,11 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/libfc/fc_exch.c linux-4.9.28/drivers/sc
/* peek cache of free slot */
if (pool->left != FC_XID_UNKNOWN) {
-diff -Nur linux-4.9.28.orig/drivers/scsi/libsas/sas_ata.c linux-4.9.28/drivers/scsi/libsas/sas_ata.c
---- linux-4.9.28.orig/drivers/scsi/libsas/sas_ata.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/scsi/libsas/sas_ata.c 2017-05-19 03:37:25.150175574 +0200
-@@ -190,7 +190,7 @@
+diff --git a/drivers/scsi/libsas/sas_ata.c b/drivers/scsi/libsas/sas_ata.c
+index 87f5e694dbed..23c0a50fb6aa 100644
+--- a/drivers/scsi/libsas/sas_ata.c
++++ b/drivers/scsi/libsas/sas_ata.c
+@@ -190,7 +190,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
/* TODO: audit callers to ensure they are ready for qc_issue to
* unconditionally re-enable interrupts
*/
@@ -5055,7 +5216,7 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/libsas/sas_ata.c linux-4.9.28/drivers/s
spin_unlock(ap->lock);
/* If the device fell off, no sense in issuing commands */
-@@ -252,7 +252,7 @@
+@@ -252,7 +252,7 @@ static unsigned int sas_ata_qc_issue(struct ata_queued_cmd *qc)
out:
spin_lock(ap->lock);
@@ -5064,10 +5225,11 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/libsas/sas_ata.c linux-4.9.28/drivers/s
return ret;
}
-diff -Nur linux-4.9.28.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.9.28/drivers/scsi/qla2xxx/qla_inline.h
---- linux-4.9.28.orig/drivers/scsi/qla2xxx/qla_inline.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/scsi/qla2xxx/qla_inline.h 2017-05-19 03:37:25.150175574 +0200
-@@ -59,12 +59,12 @@
+diff --git a/drivers/scsi/qla2xxx/qla_inline.h b/drivers/scsi/qla2xxx/qla_inline.h
+index edc48f3b8230..ee5c6f9dfb6f 100644
+--- a/drivers/scsi/qla2xxx/qla_inline.h
++++ b/drivers/scsi/qla2xxx/qla_inline.h
+@@ -59,12 +59,12 @@ qla2x00_poll(struct rsp_que *rsp)
{
unsigned long flags;
struct qla_hw_data *ha = rsp->hw;
@@ -5082,10 +5244,11 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/qla2xxx/qla_inline.h linux-4.9.28/drive
}
static inline uint8_t *
-diff -Nur linux-4.9.28.orig/drivers/scsi/qla2xxx/qla_isr.c linux-4.9.28/drivers/scsi/qla2xxx/qla_isr.c
---- linux-4.9.28.orig/drivers/scsi/qla2xxx/qla_isr.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/scsi/qla2xxx/qla_isr.c 2017-05-19 03:37:25.154175725 +0200
-@@ -3125,7 +3125,11 @@
+diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c
+index 068c4e47fac9..a2090f640397 100644
+--- a/drivers/scsi/qla2xxx/qla_isr.c
++++ b/drivers/scsi/qla2xxx/qla_isr.c
+@@ -3125,7 +3125,11 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp)
* kref_put().
*/
kref_get(&qentry->irq_notify.kref);
@@ -5097,9 +5260,10 @@ diff -Nur linux-4.9.28.orig/drivers/scsi/qla2xxx/qla_isr.c linux-4.9.28/drivers/
}
/*
-diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/drivers/thermal/x86_pkg_temp_thermal.c
---- linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/thermal/x86_pkg_temp_thermal.c 2017-05-19 03:37:25.154175725 +0200
+diff --git a/drivers/thermal/x86_pkg_temp_thermal.c b/drivers/thermal/x86_pkg_temp_thermal.c
+index 95f4c1bcdb4c..0be934799bff 100644
+--- a/drivers/thermal/x86_pkg_temp_thermal.c
++++ b/drivers/thermal/x86_pkg_temp_thermal.c
@@ -29,6 +29,7 @@
#include <linux/pm.h>
#include <linux/thermal.h>
@@ -5108,7 +5272,7 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
#include <asm/cpu_device_id.h>
#include <asm/mce.h>
-@@ -353,7 +354,7 @@
+@@ -353,7 +354,7 @@ static void pkg_temp_thermal_threshold_work_fn(struct work_struct *work)
}
}
@@ -5117,7 +5281,7 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
{
unsigned long flags;
int cpu = smp_processor_id();
-@@ -370,7 +371,7 @@
+@@ -370,7 +371,7 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
pkg_work_scheduled[phy_id]) {
disable_pkg_thres_interrupt();
spin_unlock_irqrestore(&pkg_work_lock, flags);
@@ -5126,7 +5290,7 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
}
pkg_work_scheduled[phy_id] = 1;
spin_unlock_irqrestore(&pkg_work_lock, flags);
-@@ -379,9 +380,48 @@
+@@ -379,9 +380,48 @@ static int pkg_temp_thermal_platform_thermal_notify(__u64 msr_val)
schedule_delayed_work_on(cpu,
&per_cpu(pkg_temp_thermal_threshold_work, cpu),
msecs_to_jiffies(notify_delay_ms));
@@ -5175,7 +5339,7 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
static int find_siblings_cpu(int cpu)
{
int i;
-@@ -585,6 +625,9 @@
+@@ -585,6 +625,9 @@ static int __init pkg_temp_thermal_init(void)
if (!x86_match_cpu(pkg_temp_thermal_ids))
return -ENODEV;
@@ -5185,7 +5349,7 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
spin_lock_init(&pkg_work_lock);
platform_thermal_package_notify =
pkg_temp_thermal_platform_thermal_notify;
-@@ -609,7 +652,7 @@
+@@ -609,7 +652,7 @@ static int __init pkg_temp_thermal_init(void)
kfree(pkg_work_scheduled);
platform_thermal_package_notify = NULL;
platform_thermal_package_rate_control = NULL;
@@ -5194,7 +5358,7 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
return -ENODEV;
}
-@@ -634,6 +677,7 @@
+@@ -634,6 +677,7 @@ static void __exit pkg_temp_thermal_exit(void)
mutex_unlock(&phy_dev_list_mutex);
platform_thermal_package_notify = NULL;
platform_thermal_package_rate_control = NULL;
@@ -5202,10 +5366,11 @@ diff -Nur linux-4.9.28.orig/drivers/thermal/x86_pkg_temp_thermal.c linux-4.9.28/
for_each_online_cpu(i)
cancel_delayed_work_sync(
&per_cpu(pkg_temp_thermal_threshold_work, i));
-diff -Nur linux-4.9.28.orig/drivers/tty/serial/8250/8250_core.c linux-4.9.28/drivers/tty/serial/8250/8250_core.c
---- linux-4.9.28.orig/drivers/tty/serial/8250/8250_core.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/tty/serial/8250/8250_core.c 2017-05-19 03:37:25.154175725 +0200
-@@ -58,7 +58,16 @@
+diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
+index e8819aa20415..dd7f9bf45d6c 100644
+--- a/drivers/tty/serial/8250/8250_core.c
++++ b/drivers/tty/serial/8250/8250_core.c
+@@ -58,7 +58,16 @@ static struct uart_driver serial8250_reg;
static unsigned int skip_txen_test; /* force skip of txen test at init time */
@@ -5223,9 +5388,10 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/8250/8250_core.c linux-4.9.28/dri
#include <asm/serial.h>
/*
-diff -Nur linux-4.9.28.orig/drivers/tty/serial/8250/8250_port.c linux-4.9.28/drivers/tty/serial/8250/8250_port.c
---- linux-4.9.28.orig/drivers/tty/serial/8250/8250_port.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/tty/serial/8250/8250_port.c 2017-05-19 03:37:25.154175725 +0200
+diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
+index 080d5a59d0a7..eecc4f111473 100644
+--- a/drivers/tty/serial/8250/8250_port.c
++++ b/drivers/tty/serial/8250/8250_port.c
@@ -35,6 +35,7 @@
#include <linux/nmi.h>
#include <linux/mutex.h>
@@ -5234,7 +5400,7 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/8250/8250_port.c linux-4.9.28/dri
#include <linux/uaccess.h>
#include <linux/pm_runtime.h>
#include <linux/timer.h>
-@@ -3144,9 +3145,9 @@
+@@ -3144,9 +3145,9 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,
serial8250_rpm_get(up);
@@ -5246,10 +5412,11 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/8250/8250_port.c linux-4.9.28/dri
locked = spin_trylock_irqsave(&port->lock, flags);
else
spin_lock_irqsave(&port->lock, flags);
-diff -Nur linux-4.9.28.orig/drivers/tty/serial/amba-pl011.c linux-4.9.28/drivers/tty/serial/amba-pl011.c
---- linux-4.9.28.orig/drivers/tty/serial/amba-pl011.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/tty/serial/amba-pl011.c 2017-05-19 03:37:25.154175725 +0200
-@@ -2194,13 +2194,19 @@
+diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c
+index e2c33b9528d8..53af53c43e8c 100644
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -2194,13 +2194,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
clk_enable(uap->clk);
@@ -5272,7 +5439,7 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/amba-pl011.c linux-4.9.28/drivers
/*
* First save the CR then disable the interrupts
-@@ -2224,8 +2230,7 @@
+@@ -2224,8 +2230,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)
pl011_write(old_cr, uap, REG_CR);
if (locked)
@@ -5282,10 +5449,11 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/amba-pl011.c linux-4.9.28/drivers
clk_disable(uap->clk);
}
-diff -Nur linux-4.9.28.orig/drivers/tty/serial/omap-serial.c linux-4.9.28/drivers/tty/serial/omap-serial.c
---- linux-4.9.28.orig/drivers/tty/serial/omap-serial.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/tty/serial/omap-serial.c 2017-05-19 03:37:25.154175725 +0200
-@@ -1257,13 +1257,10 @@
+diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c
+index 44e5b5bf713b..400140d1dfff 100644
+--- a/drivers/tty/serial/omap-serial.c
++++ b/drivers/tty/serial/omap-serial.c
+@@ -1257,13 +1257,10 @@ serial_omap_console_write(struct console *co, const char *s,
pm_runtime_get_sync(up->dev);
@@ -5302,7 +5470,7 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/omap-serial.c linux-4.9.28/driver
/*
* First save the IER then disable the interrupts
-@@ -1292,8 +1289,7 @@
+@@ -1292,8 +1289,7 @@ serial_omap_console_write(struct console *co, const char *s,
pm_runtime_mark_last_busy(up->dev);
pm_runtime_put_autosuspend(up->dev);
if (locked)
@@ -5312,10 +5480,11 @@ diff -Nur linux-4.9.28.orig/drivers/tty/serial/omap-serial.c linux-4.9.28/driver
}
static int __init
-diff -Nur linux-4.9.28.orig/drivers/usb/core/hcd.c linux-4.9.28/drivers/usb/core/hcd.c
---- linux-4.9.28.orig/drivers/usb/core/hcd.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/usb/core/hcd.c 2017-05-19 03:37:25.154175725 +0200
-@@ -1764,9 +1764,9 @@
+diff --git a/drivers/usb/core/hcd.c b/drivers/usb/core/hcd.c
+index 3b9735abf2e0..73ba3239869e 100644
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1764,9 +1764,9 @@ static void __usb_hcd_giveback_urb(struct urb *urb)
* and no one may trigger the above deadlock situation when
* running complete() in tasklet.
*/
@@ -5327,10 +5496,11 @@ diff -Nur linux-4.9.28.orig/drivers/usb/core/hcd.c linux-4.9.28/drivers/usb/core
usb_anchor_resume_wakeups(anchor);
atomic_dec(&urb->use_count);
-diff -Nur linux-4.9.28.orig/drivers/usb/gadget/function/f_fs.c linux-4.9.28/drivers/usb/gadget/function/f_fs.c
---- linux-4.9.28.orig/drivers/usb/gadget/function/f_fs.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/usb/gadget/function/f_fs.c 2017-05-19 03:37:25.154175725 +0200
-@@ -1593,7 +1593,7 @@
+diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
+index 89081b834615..90b231b7ad0a 100644
+--- a/drivers/usb/gadget/function/f_fs.c
++++ b/drivers/usb/gadget/function/f_fs.c
+@@ -1593,7 +1593,7 @@ static void ffs_data_put(struct ffs_data *ffs)
pr_info("%s(): freeing\n", __func__);
ffs_data_clear(ffs);
BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
@@ -5339,10 +5509,11 @@ diff -Nur linux-4.9.28.orig/drivers/usb/gadget/function/f_fs.c linux-4.9.28/driv
kfree(ffs->dev_name);
kfree(ffs);
}
-diff -Nur linux-4.9.28.orig/drivers/usb/gadget/legacy/inode.c linux-4.9.28/drivers/usb/gadget/legacy/inode.c
---- linux-4.9.28.orig/drivers/usb/gadget/legacy/inode.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/drivers/usb/gadget/legacy/inode.c 2017-05-19 03:37:25.154175725 +0200
-@@ -346,7 +346,7 @@
+diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c
+index 1468d8f085a3..6aae3ae25c18 100644
+--- a/drivers/usb/gadget/legacy/inode.c
++++ b/drivers/usb/gadget/legacy/inode.c
+@@ -346,7 +346,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
spin_unlock_irq (&epdata->dev->lock);
if (likely (value == 0)) {
@@ -5351,7 +5522,7 @@ diff -Nur linux-4.9.28.orig/drivers/usb/gadget/legacy/inode.c linux-4.9.28/drive
if (value != 0) {
spin_lock_irq (&epdata->dev->lock);
if (likely (epdata->ep != NULL)) {
-@@ -355,7 +355,7 @@
+@@ -355,7 +355,7 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len)
usb_ep_dequeue (epdata->ep, epdata->req);
spin_unlock_irq (&epdata->dev->lock);
@@ -5360,9 +5531,10 @@ diff -Nur linux-4.9.28.orig/drivers/usb/gadget/legacy/inode.c linux-4.9.28/drive
if (epdata->status == -ECONNRESET)
epdata->status = -EINTR;
} else {
-diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
---- linux-4.9.28.orig/fs/aio.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/aio.c 2017-05-19 03:37:25.154175725 +0200
+diff --git a/fs/aio.c b/fs/aio.c
+index 428484f2f841..2b02e2eb2158 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
@@ -40,6 +40,7 @@
#include <linux/ramfs.h>
#include <linux/percpu-refcount.h>
@@ -5371,7 +5543,7 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
#include <asm/kmap_types.h>
#include <asm/uaccess.h>
-@@ -115,7 +116,7 @@
+@@ -115,7 +116,7 @@ struct kioctx {
struct page **ring_pages;
long nr_pages;
@@ -5380,7 +5552,7 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
/*
* signals when all in-flight requests are done
-@@ -258,6 +259,7 @@
+@@ -258,6 +259,7 @@ static int __init aio_setup(void)
.mount = aio_mount,
.kill_sb = kill_anon_super,
};
@@ -5388,7 +5560,7 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
aio_mnt = kern_mount(&aio_fs);
if (IS_ERR(aio_mnt))
panic("Failed to create aio fs mount.");
-@@ -581,9 +583,9 @@
+@@ -581,9 +583,9 @@ static int kiocb_cancel(struct aio_kiocb *kiocb)
return cancel(&kiocb->common);
}
@@ -5400,7 +5572,7 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
pr_debug("freeing %p\n", ctx);
-@@ -602,8 +604,8 @@
+@@ -602,8 +604,8 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
complete(&ctx->rq_wait->comp);
@@ -5411,7 +5583,7 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
}
/*
-@@ -611,9 +613,9 @@
+@@ -611,9 +613,9 @@ static void free_ioctx_reqs(struct percpu_ref *ref)
* and ctx->users has dropped to 0, so we know no more kiocbs can be submitted -
* now it's safe to cancel any that need to be.
*/
@@ -5423,7 +5595,7 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
struct aio_kiocb *req;
spin_lock_irq(&ctx->ctx_lock);
-@@ -632,6 +634,14 @@
+@@ -632,6 +634,14 @@ static void free_ioctx_users(struct percpu_ref *ref)
percpu_ref_put(&ctx->reqs);
}
@@ -5438,9 +5610,10 @@ diff -Nur linux-4.9.28.orig/fs/aio.c linux-4.9.28/fs/aio.c
static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
{
unsigned i, new_nr;
-diff -Nur linux-4.9.28.orig/fs/autofs4/autofs_i.h linux-4.9.28/fs/autofs4/autofs_i.h
---- linux-4.9.28.orig/fs/autofs4/autofs_i.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/autofs4/autofs_i.h 2017-05-19 03:37:25.154175725 +0200
+diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h
+index a1fba4285277..3796769b4cd1 100644
+--- a/fs/autofs4/autofs_i.h
++++ b/fs/autofs4/autofs_i.h
@@ -31,6 +31,7 @@
#include <linux/sched.h>
#include <linux/mount.h>
@@ -5449,10 +5622,11 @@ diff -Nur linux-4.9.28.orig/fs/autofs4/autofs_i.h linux-4.9.28/fs/autofs4/autofs
#include <asm/current.h>
#include <linux/uaccess.h>
-diff -Nur linux-4.9.28.orig/fs/autofs4/expire.c linux-4.9.28/fs/autofs4/expire.c
---- linux-4.9.28.orig/fs/autofs4/expire.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/autofs4/expire.c 2017-05-19 03:37:25.154175725 +0200
-@@ -148,7 +148,7 @@
+diff --git a/fs/autofs4/expire.c b/fs/autofs4/expire.c
+index d8e6d421c27f..2e689ab1306b 100644
+--- a/fs/autofs4/expire.c
++++ b/fs/autofs4/expire.c
+@@ -148,7 +148,7 @@ static struct dentry *get_next_positive_dentry(struct dentry *prev,
parent = p->d_parent;
if (!spin_trylock(&parent->d_lock)) {
spin_unlock(&p->d_lock);
@@ -5461,10 +5635,11 @@ diff -Nur linux-4.9.28.orig/fs/autofs4/expire.c linux-4.9.28/fs/autofs4/expire.c
goto relock;
}
spin_unlock(&p->d_lock);
-diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
---- linux-4.9.28.orig/fs/buffer.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/buffer.c 2017-05-19 03:37:25.158175874 +0200
-@@ -301,8 +301,7 @@
+diff --git a/fs/buffer.c b/fs/buffer.c
+index b205a629001d..5646afc022ba 100644
+--- a/fs/buffer.c
++++ b/fs/buffer.c
+@@ -301,8 +301,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
* decide that the page is now completely done.
*/
first = page_buffers(page);
@@ -5474,7 +5649,7 @@ diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
clear_buffer_async_read(bh);
unlock_buffer(bh);
tmp = bh;
-@@ -315,8 +314,7 @@
+@@ -315,8 +314,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
}
tmp = tmp->b_this_page;
} while (tmp != bh);
@@ -5484,7 +5659,7 @@ diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
/*
* If none of the buffers had errors and they are all
-@@ -328,9 +326,7 @@
+@@ -328,9 +326,7 @@ static void end_buffer_async_read(struct buffer_head *bh, int uptodate)
return;
still_busy:
@@ -5495,7 +5670,7 @@ diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
}
/*
-@@ -358,8 +354,7 @@
+@@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
}
first = page_buffers(page);
@@ -5505,7 +5680,7 @@ diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
clear_buffer_async_write(bh);
unlock_buffer(bh);
-@@ -371,15 +366,12 @@
+@@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffer_head *bh, int uptodate)
}
tmp = tmp->b_this_page;
}
@@ -5523,7 +5698,7 @@ diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
}
EXPORT_SYMBOL(end_buffer_async_write);
-@@ -3383,6 +3375,7 @@
+@@ -3383,6 +3375,7 @@ struct buffer_head *alloc_buffer_head(gfp_t gfp_flags)
struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags);
if (ret) {
INIT_LIST_HEAD(&ret->b_assoc_buffers);
@@ -5531,10 +5706,11 @@ diff -Nur linux-4.9.28.orig/fs/buffer.c linux-4.9.28/fs/buffer.c
preempt_disable();
__this_cpu_inc(bh_accounting.nr);
recalc_bh_state();
-diff -Nur linux-4.9.28.orig/fs/cifs/readdir.c linux-4.9.28/fs/cifs/readdir.c
---- linux-4.9.28.orig/fs/cifs/readdir.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/cifs/readdir.c 2017-05-19 03:37:25.158175874 +0200
-@@ -80,7 +80,7 @@
+diff --git a/fs/cifs/readdir.c b/fs/cifs/readdir.c
+index a27fc8791551..791aecb7c1ac 100644
+--- a/fs/cifs/readdir.c
++++ b/fs/cifs/readdir.c
+@@ -80,7 +80,7 @@ cifs_prime_dcache(struct dentry *parent, struct qstr *name,
struct inode *inode;
struct super_block *sb = parent->d_sb;
struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
@@ -5543,9 +5719,10 @@ diff -Nur linux-4.9.28.orig/fs/cifs/readdir.c linux-4.9.28/fs/cifs/readdir.c
cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
-diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
---- linux-4.9.28.orig/fs/dcache.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/dcache.c 2017-05-19 03:37:25.158175874 +0200
+diff --git a/fs/dcache.c b/fs/dcache.c
+index 4485a48f4091..691039a6a872 100644
+--- a/fs/dcache.c
++++ b/fs/dcache.c
@@ -19,6 +19,7 @@
#include <linux/mm.h>
#include <linux/fs.h>
@@ -5554,7 +5731,7 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
#include <linux/slab.h>
#include <linux/init.h>
#include <linux/hash.h>
-@@ -750,6 +751,8 @@
+@@ -750,6 +751,8 @@ static inline bool fast_dput(struct dentry *dentry)
*/
void dput(struct dentry *dentry)
{
@@ -5563,7 +5740,7 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
if (unlikely(!dentry))
return;
-@@ -788,9 +791,18 @@
+@@ -788,9 +791,18 @@ void dput(struct dentry *dentry)
return;
kill_it:
@@ -5585,7 +5762,7 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
goto repeat;
}
}
-@@ -2324,7 +2336,7 @@
+@@ -2324,7 +2336,7 @@ void d_delete(struct dentry * dentry)
if (dentry->d_lockref.count == 1) {
if (!spin_trylock(&inode->i_lock)) {
spin_unlock(&dentry->d_lock);
@@ -5594,7 +5771,7 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
goto again;
}
dentry->d_flags &= ~DCACHE_CANT_MOUNT;
-@@ -2384,21 +2396,24 @@
+@@ -2384,21 +2396,24 @@ static inline void end_dir_add(struct inode *dir, unsigned n)
static void d_wait_lookup(struct dentry *dentry)
{
@@ -5630,7 +5807,7 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
{
unsigned int hash = name->hash;
struct hlist_bl_head *b = in_lookup_hash(parent, hash);
-@@ -2507,7 +2522,7 @@
+@@ -2507,7 +2522,7 @@ void __d_lookup_done(struct dentry *dentry)
hlist_bl_lock(b);
dentry->d_flags &= ~DCACHE_PAR_LOOKUP;
__hlist_bl_del(&dentry->d_u.d_in_lookup_hash);
@@ -5639,7 +5816,7 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
dentry->d_wait = NULL;
hlist_bl_unlock(b);
INIT_HLIST_NODE(&dentry->d_u.d_alias);
-@@ -3604,6 +3619,11 @@
+@@ -3604,6 +3619,11 @@ EXPORT_SYMBOL(d_genocide);
void __init vfs_caches_init_early(void)
{
@@ -5651,10 +5828,11 @@ diff -Nur linux-4.9.28.orig/fs/dcache.c linux-4.9.28/fs/dcache.c
dcache_init_early();
inode_init_early();
}
-diff -Nur linux-4.9.28.orig/fs/eventpoll.c linux-4.9.28/fs/eventpoll.c
---- linux-4.9.28.orig/fs/eventpoll.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/eventpoll.c 2017-05-19 03:37:25.158175874 +0200
-@@ -510,12 +510,12 @@
+diff --git a/fs/eventpoll.c b/fs/eventpoll.c
+index 10db91218933..42af0a06f657 100644
+--- a/fs/eventpoll.c
++++ b/fs/eventpoll.c
+@@ -510,12 +510,12 @@ static int ep_poll_wakeup_proc(void *priv, void *cookie, int call_nests)
*/
static void ep_poll_safewake(wait_queue_head_t *wq)
{
@@ -5669,10 +5847,11 @@ diff -Nur linux-4.9.28.orig/fs/eventpoll.c linux-4.9.28/fs/eventpoll.c
}
static void ep_remove_wait_queue(struct eppoll_entry *pwq)
-diff -Nur linux-4.9.28.orig/fs/exec.c linux-4.9.28/fs/exec.c
---- linux-4.9.28.orig/fs/exec.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/exec.c 2017-05-19 03:37:25.158175874 +0200
-@@ -1017,12 +1017,14 @@
+diff --git a/fs/exec.c b/fs/exec.c
+index 67e86571685a..fe14cdd84016 100644
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -1017,12 +1017,14 @@ static int exec_mmap(struct mm_struct *mm)
}
}
task_lock(tsk);
@@ -5687,10 +5866,11 @@ diff -Nur linux-4.9.28.orig/fs/exec.c linux-4.9.28/fs/exec.c
task_unlock(tsk);
if (old_mm) {
up_read(&old_mm->mmap_sem);
-diff -Nur linux-4.9.28.orig/fs/fuse/dir.c linux-4.9.28/fs/fuse/dir.c
---- linux-4.9.28.orig/fs/fuse/dir.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/fuse/dir.c 2017-05-19 03:37:25.158175874 +0200
-@@ -1191,7 +1191,7 @@
+diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
+index 642c57b8de7b..8494b9308333 100644
+--- a/fs/fuse/dir.c
++++ b/fs/fuse/dir.c
+@@ -1191,7 +1191,7 @@ static int fuse_direntplus_link(struct file *file,
struct inode *dir = d_inode(parent);
struct fuse_conn *fc;
struct inode *inode;
@@ -5699,10 +5879,11 @@ diff -Nur linux-4.9.28.orig/fs/fuse/dir.c linux-4.9.28/fs/fuse/dir.c
if (!o->nodeid) {
/*
-diff -Nur linux-4.9.28.orig/fs/jbd2/checkpoint.c linux-4.9.28/fs/jbd2/checkpoint.c
---- linux-4.9.28.orig/fs/jbd2/checkpoint.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/jbd2/checkpoint.c 2017-05-19 03:37:25.158175874 +0200
-@@ -116,6 +116,8 @@
+diff --git a/fs/jbd2/checkpoint.c b/fs/jbd2/checkpoint.c
+index 684996c8a3a4..6e18a06aaabe 100644
+--- a/fs/jbd2/checkpoint.c
++++ b/fs/jbd2/checkpoint.c
+@@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t *journal)
nblocks = jbd2_space_needed(journal);
while (jbd2_log_space_left(journal) < nblocks) {
write_unlock(&journal->j_state_lock);
@@ -5711,10 +5892,11 @@ diff -Nur linux-4.9.28.orig/fs/jbd2/checkpoint.c linux-4.9.28/fs/jbd2/checkpoint
mutex_lock(&journal->j_checkpoint_mutex);
/*
-diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
---- linux-4.9.28.orig/fs/locks.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/locks.c 2017-05-19 03:37:25.158175874 +0200
-@@ -935,7 +935,7 @@
+diff --git a/fs/locks.c b/fs/locks.c
+index 22c5b4aa4961..269c6a44449a 100644
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -935,7 +935,7 @@ static int flock_lock_inode(struct inode *inode, struct file_lock *request)
return -ENOMEM;
}
@@ -5723,7 +5905,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
if (request->fl_flags & FL_ACCESS)
goto find_conflict;
-@@ -976,7 +976,7 @@
+@@ -976,7 +976,7 @@ static int flock_lock_inode(struct inode *inode, struct file_lock *request)
out:
spin_unlock(&ctx->flc_lock);
@@ -5732,7 +5914,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
if (new_fl)
locks_free_lock(new_fl);
locks_dispose_list(&dispose);
-@@ -1013,7 +1013,7 @@
+@@ -1013,7 +1013,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,
new_fl2 = locks_alloc_lock();
}
@@ -5741,7 +5923,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
/*
* New lock request. Walk all POSIX locks and look for conflicts. If
-@@ -1185,7 +1185,7 @@
+@@ -1185,7 +1185,7 @@ static int posix_lock_inode(struct inode *inode, struct file_lock *request,
}
out:
spin_unlock(&ctx->flc_lock);
@@ -5750,7 +5932,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
/*
* Free any unused locks.
*/
-@@ -1460,7 +1460,7 @@
+@@ -1460,7 +1460,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
return error;
}
@@ -5759,7 +5941,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
time_out_leases(inode, &dispose);
-@@ -1512,13 +1512,13 @@
+@@ -1512,13 +1512,13 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
locks_insert_block(fl, new_fl);
trace_break_lease_block(inode, new_fl);
spin_unlock(&ctx->flc_lock);
@@ -5775,7 +5957,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
trace_break_lease_unblock(inode, new_fl);
locks_delete_block(new_fl);
-@@ -1535,7 +1535,7 @@
+@@ -1535,7 +1535,7 @@ int __break_lease(struct inode *inode, unsigned int mode, unsigned int type)
}
out:
spin_unlock(&ctx->flc_lock);
@@ -5784,7 +5966,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
locks_dispose_list(&dispose);
locks_free_lock(new_fl);
return error;
-@@ -1609,7 +1609,7 @@
+@@ -1609,7 +1609,7 @@ int fcntl_getlease(struct file *filp)
ctx = smp_load_acquire(&inode->i_flctx);
if (ctx && !list_empty_careful(&ctx->flc_lease)) {
@@ -5793,7 +5975,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
time_out_leases(inode, &dispose);
list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
-@@ -1619,7 +1619,7 @@
+@@ -1619,7 +1619,7 @@ int fcntl_getlease(struct file *filp)
break;
}
spin_unlock(&ctx->flc_lock);
@@ -5802,7 +5984,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
locks_dispose_list(&dispose);
}
-@@ -1694,7 +1694,7 @@
+@@ -1694,7 +1694,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
return -EINVAL;
}
@@ -5811,7 +5993,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
time_out_leases(inode, &dispose);
error = check_conflicting_open(dentry, arg, lease->fl_flags);
-@@ -1765,7 +1765,7 @@
+@@ -1765,7 +1765,7 @@ generic_add_lease(struct file *filp, long arg, struct file_lock **flp, void **pr
lease->fl_lmops->lm_setup(lease, priv);
out:
spin_unlock(&ctx->flc_lock);
@@ -5820,7 +6002,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
locks_dispose_list(&dispose);
if (is_deleg)
inode_unlock(inode);
-@@ -1788,7 +1788,7 @@
+@@ -1788,7 +1788,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
return error;
}
@@ -5829,7 +6011,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
spin_lock(&ctx->flc_lock);
list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
if (fl->fl_file == filp &&
-@@ -1801,7 +1801,7 @@
+@@ -1801,7 +1801,7 @@ static int generic_delete_lease(struct file *filp, void *owner)
if (victim)
error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);
spin_unlock(&ctx->flc_lock);
@@ -5838,7 +6020,7 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
locks_dispose_list(&dispose);
return error;
}
-@@ -2532,13 +2532,13 @@
+@@ -2532,13 +2532,13 @@ locks_remove_lease(struct file *filp, struct file_lock_context *ctx)
if (list_empty(&ctx->flc_lease))
return;
@@ -5854,10 +6036,11 @@ diff -Nur linux-4.9.28.orig/fs/locks.c linux-4.9.28/fs/locks.c
locks_dispose_list(&dispose);
}
-diff -Nur linux-4.9.28.orig/fs/namei.c linux-4.9.28/fs/namei.c
---- linux-4.9.28.orig/fs/namei.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/namei.c 2017-05-19 03:37:25.158175874 +0200
-@@ -1626,7 +1626,7 @@
+diff --git a/fs/namei.c b/fs/namei.c
+index d5e5140c1045..150fbdd8e04c 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1626,7 +1626,7 @@ static struct dentry *lookup_slow(const struct qstr *name,
{
struct dentry *dentry = ERR_PTR(-ENOENT), *old;
struct inode *inode = dir->d_inode;
@@ -5866,7 +6049,7 @@ diff -Nur linux-4.9.28.orig/fs/namei.c linux-4.9.28/fs/namei.c
inode_lock_shared(inode);
/* Don't go there if it's already dead */
-@@ -3083,7 +3083,7 @@
+@@ -3083,7 +3083,7 @@ static int lookup_open(struct nameidata *nd, struct path *path,
struct dentry *dentry;
int error, create_error = 0;
umode_t mode = op->mode;
@@ -5875,9 +6058,10 @@ diff -Nur linux-4.9.28.orig/fs/namei.c linux-4.9.28/fs/namei.c
if (unlikely(IS_DEADDIR(dir_inode)))
return -ENOENT;
-diff -Nur linux-4.9.28.orig/fs/namespace.c linux-4.9.28/fs/namespace.c
---- linux-4.9.28.orig/fs/namespace.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/namespace.c 2017-05-19 03:37:25.158175874 +0200
+diff --git a/fs/namespace.c b/fs/namespace.c
+index 5e35057f07ac..843d274ba167 100644
+--- a/fs/namespace.c
++++ b/fs/namespace.c
@@ -14,6 +14,7 @@
#include <linux/mnt_namespace.h>
#include <linux/user_namespace.h>
@@ -5886,7 +6070,7 @@ diff -Nur linux-4.9.28.orig/fs/namespace.c linux-4.9.28/fs/namespace.c
#include <linux/security.h>
#include <linux/idr.h>
#include <linux/init.h> /* init_rootfs */
-@@ -356,8 +357,11 @@
+@@ -356,8 +357,11 @@ int __mnt_want_write(struct vfsmount *m)
* incremented count after it has set MNT_WRITE_HOLD.
*/
smp_mb();
@@ -5900,10 +6084,11 @@ diff -Nur linux-4.9.28.orig/fs/namespace.c linux-4.9.28/fs/namespace.c
/*
* After the slowpath clears MNT_WRITE_HOLD, mnt_is_readonly will
* be set to match its requirements. So we must not load that until
-diff -Nur linux-4.9.28.orig/fs/nfs/delegation.c linux-4.9.28/fs/nfs/delegation.c
---- linux-4.9.28.orig/fs/nfs/delegation.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/delegation.c 2017-05-19 03:37:25.158175874 +0200
-@@ -150,11 +150,11 @@
+diff --git a/fs/nfs/delegation.c b/fs/nfs/delegation.c
+index dff600ae0d74..d726d2e09353 100644
+--- a/fs/nfs/delegation.c
++++ b/fs/nfs/delegation.c
+@@ -150,11 +150,11 @@ static int nfs_delegation_claim_opens(struct inode *inode,
sp = state->owner;
/* Block nfs4_proc_unlck */
mutex_lock(&sp->so_delegreturn_mutex);
@@ -5917,10 +6102,11 @@ diff -Nur linux-4.9.28.orig/fs/nfs/delegation.c linux-4.9.28/fs/nfs/delegation.c
err = -EAGAIN;
mutex_unlock(&sp->so_delegreturn_mutex);
put_nfs_open_context(ctx);
-diff -Nur linux-4.9.28.orig/fs/nfs/dir.c linux-4.9.28/fs/nfs/dir.c
---- linux-4.9.28.orig/fs/nfs/dir.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/dir.c 2017-05-19 03:37:25.162176025 +0200
-@@ -485,7 +485,7 @@
+diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
+index 53e02b8bd9bd..a66e7d77cfbb 100644
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -485,7 +485,7 @@ static
void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
{
struct qstr filename = QSTR_INIT(entry->name, entry->len);
@@ -5929,7 +6115,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/dir.c linux-4.9.28/fs/nfs/dir.c
struct dentry *dentry;
struct dentry *alias;
struct inode *dir = d_inode(parent);
-@@ -1487,7 +1487,7 @@
+@@ -1487,7 +1487,7 @@ int nfs_atomic_open(struct inode *dir, struct dentry *dentry,
struct file *file, unsigned open_flags,
umode_t mode, int *opened)
{
@@ -5938,7 +6124,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/dir.c linux-4.9.28/fs/nfs/dir.c
struct nfs_open_context *ctx;
struct dentry *res;
struct iattr attr = { .ia_valid = ATTR_OPEN };
-@@ -1802,7 +1802,11 @@
+@@ -1802,7 +1802,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
trace_nfs_rmdir_enter(dir, dentry);
if (d_really_is_positive(dentry)) {
@@ -5950,7 +6136,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/dir.c linux-4.9.28/fs/nfs/dir.c
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
/* Ensure the VFS deletes this inode */
switch (error) {
-@@ -1812,7 +1816,11 @@
+@@ -1812,7 +1816,11 @@ int nfs_rmdir(struct inode *dir, struct dentry *dentry)
case -ENOENT:
nfs_dentry_handle_enoent(dentry);
}
@@ -5962,10 +6148,11 @@ diff -Nur linux-4.9.28.orig/fs/nfs/dir.c linux-4.9.28/fs/nfs/dir.c
} else
error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
trace_nfs_rmdir_exit(dir, dentry, error);
-diff -Nur linux-4.9.28.orig/fs/nfs/inode.c linux-4.9.28/fs/nfs/inode.c
---- linux-4.9.28.orig/fs/nfs/inode.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/inode.c 2017-05-19 03:37:25.162176025 +0200
-@@ -1957,7 +1957,11 @@
+diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
+index bf4ec5ecc97e..36cd5fc9192c 100644
+--- a/fs/nfs/inode.c
++++ b/fs/nfs/inode.c
+@@ -1957,7 +1957,11 @@ static void init_once(void *foo)
nfsi->nrequests = 0;
nfsi->commit_info.ncommit = 0;
atomic_set(&nfsi->commit_info.rpcs_out, 0);
@@ -5977,10 +6164,11 @@ diff -Nur linux-4.9.28.orig/fs/nfs/inode.c linux-4.9.28/fs/nfs/inode.c
nfs4_init_once(nfsi);
}
-diff -Nur linux-4.9.28.orig/fs/nfs/nfs4_fs.h linux-4.9.28/fs/nfs/nfs4_fs.h
---- linux-4.9.28.orig/fs/nfs/nfs4_fs.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/nfs4_fs.h 2017-05-19 03:37:25.162176025 +0200
-@@ -111,7 +111,7 @@
+diff --git a/fs/nfs/nfs4_fs.h b/fs/nfs/nfs4_fs.h
+index 1452177c822d..f43b01d54c59 100644
+--- a/fs/nfs/nfs4_fs.h
++++ b/fs/nfs/nfs4_fs.h
+@@ -111,7 +111,7 @@ struct nfs4_state_owner {
unsigned long so_flags;
struct list_head so_states;
struct nfs_seqid_counter so_seqid;
@@ -5989,10 +6177,11 @@ diff -Nur linux-4.9.28.orig/fs/nfs/nfs4_fs.h linux-4.9.28/fs/nfs/nfs4_fs.h
struct mutex so_delegreturn_mutex;
};
-diff -Nur linux-4.9.28.orig/fs/nfs/nfs4proc.c linux-4.9.28/fs/nfs/nfs4proc.c
---- linux-4.9.28.orig/fs/nfs/nfs4proc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/nfs4proc.c 2017-05-19 03:37:25.162176025 +0200
-@@ -2695,7 +2695,7 @@
+diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
+index fc9b04941739..7c9bc1c7efe7 100644
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -2697,7 +2697,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
unsigned int seq;
int ret;
@@ -6001,7 +6190,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/nfs4proc.c linux-4.9.28/fs/nfs/nfs4proc.c
ret = _nfs4_proc_open(opendata);
if (ret != 0)
-@@ -2733,7 +2733,7 @@
+@@ -2735,7 +2735,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata,
if (d_inode(dentry) == state->inode) {
nfs_inode_attach_open_context(ctx);
@@ -6010,10 +6199,11 @@ diff -Nur linux-4.9.28.orig/fs/nfs/nfs4proc.c linux-4.9.28/fs/nfs/nfs4proc.c
nfs4_schedule_stateid_recovery(server, state);
}
out:
-diff -Nur linux-4.9.28.orig/fs/nfs/nfs4state.c linux-4.9.28/fs/nfs/nfs4state.c
---- linux-4.9.28.orig/fs/nfs/nfs4state.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/nfs4state.c 2017-05-19 03:37:25.162176025 +0200
-@@ -488,7 +488,7 @@
+diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c
+index 0959c9661662..dabd834d7686 100644
+--- a/fs/nfs/nfs4state.c
++++ b/fs/nfs/nfs4state.c
+@@ -488,7 +488,7 @@ nfs4_alloc_state_owner(struct nfs_server *server,
nfs4_init_seqid_counter(&sp->so_seqid);
atomic_set(&sp->so_count, 1);
INIT_LIST_HEAD(&sp->so_lru);
@@ -6022,7 +6212,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/nfs4state.c linux-4.9.28/fs/nfs/nfs4state.c
mutex_init(&sp->so_delegreturn_mutex);
return sp;
}
-@@ -1497,8 +1497,12 @@
+@@ -1497,8 +1497,12 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
* recovering after a network partition or a reboot from a
* server that doesn't support a grace period.
*/
@@ -6036,7 +6226,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/nfs4state.c linux-4.9.28/fs/nfs/nfs4state.c
restart:
list_for_each_entry(state, &sp->so_states, open_states) {
if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
-@@ -1567,14 +1571,20 @@
+@@ -1567,14 +1571,20 @@ static int nfs4_reclaim_open_state(struct nfs4_state_owner *sp, const struct nfs
spin_lock(&sp->so_lock);
goto restart;
}
@@ -6061,9 +6251,10 @@ diff -Nur linux-4.9.28.orig/fs/nfs/nfs4state.c linux-4.9.28/fs/nfs/nfs4state.c
return status;
}
-diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
---- linux-4.9.28.orig/fs/nfs/unlink.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/nfs/unlink.c 2017-05-19 03:37:25.162176025 +0200
+diff --git a/fs/nfs/unlink.c b/fs/nfs/unlink.c
+index 191aa577dd1f..58990c8f52e0 100644
+--- a/fs/nfs/unlink.c
++++ b/fs/nfs/unlink.c
@@ -12,7 +12,7 @@
#include <linux/sunrpc/clnt.h>
#include <linux/nfs_fs.h>
@@ -6073,7 +6264,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
#include <linux/namei.h>
#include <linux/fsnotify.h>
-@@ -51,6 +51,29 @@
+@@ -51,6 +51,29 @@ static void nfs_async_unlink_done(struct rpc_task *task, void *calldata)
rpc_restart_call_prepare(task);
}
@@ -6103,7 +6294,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
/**
* nfs_async_unlink_release - Release the sillydelete data.
* @task: rpc_task of the sillydelete
-@@ -64,7 +87,7 @@
+@@ -64,7 +87,7 @@ static void nfs_async_unlink_release(void *calldata)
struct dentry *dentry = data->dentry;
struct super_block *sb = dentry->d_sb;
@@ -6112,7 +6303,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
d_lookup_done(dentry);
nfs_free_unlinkdata(data);
dput(dentry);
-@@ -117,10 +140,10 @@
+@@ -117,10 +140,10 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
struct inode *dir = d_inode(dentry->d_parent);
struct dentry *alias;
@@ -6125,7 +6316,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
return 0;
}
if (!d_in_lookup(alias)) {
-@@ -142,7 +165,7 @@
+@@ -142,7 +165,7 @@ static int nfs_call_unlink(struct dentry *dentry, struct nfs_unlinkdata *data)
ret = 0;
spin_unlock(&alias->d_lock);
dput(alias);
@@ -6134,7 +6325,7 @@ diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
/*
* If we'd displaced old cached devname, free it. At that
* point dentry is definitely not a root, so we won't need
-@@ -182,7 +205,7 @@
+@@ -182,7 +205,7 @@ nfs_async_unlink(struct dentry *dentry, const struct qstr *name)
goto out_free_name;
}
data->res.dir_attr = &data->dir_attr;
@@ -6143,10 +6334,11 @@ diff -Nur linux-4.9.28.orig/fs/nfs/unlink.c linux-4.9.28/fs/nfs/unlink.c
status = -EBUSY;
spin_lock(&dentry->d_lock);
-diff -Nur linux-4.9.28.orig/fs/ntfs/aops.c linux-4.9.28/fs/ntfs/aops.c
---- linux-4.9.28.orig/fs/ntfs/aops.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/ntfs/aops.c 2017-05-19 03:37:25.162176025 +0200
-@@ -92,13 +92,13 @@
+diff --git a/fs/ntfs/aops.c b/fs/ntfs/aops.c
+index fe251f187ff8..e89da4fb14c2 100644
+--- a/fs/ntfs/aops.c
++++ b/fs/ntfs/aops.c
+@@ -92,13 +92,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
ofs = 0;
if (file_ofs < init_size)
ofs = init_size - file_ofs;
@@ -6162,7 +6354,7 @@ diff -Nur linux-4.9.28.orig/fs/ntfs/aops.c linux-4.9.28/fs/ntfs/aops.c
}
} else {
clear_buffer_uptodate(bh);
-@@ -107,8 +107,7 @@
+@@ -107,8 +107,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
"0x%llx.", (unsigned long long)bh->b_blocknr);
}
first = page_buffers(page);
@@ -6172,7 +6364,7 @@ diff -Nur linux-4.9.28.orig/fs/ntfs/aops.c linux-4.9.28/fs/ntfs/aops.c
clear_buffer_async_read(bh);
unlock_buffer(bh);
tmp = bh;
-@@ -123,8 +122,7 @@
+@@ -123,8 +122,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
}
tmp = tmp->b_this_page;
} while (tmp != bh);
@@ -6182,7 +6374,7 @@ diff -Nur linux-4.9.28.orig/fs/ntfs/aops.c linux-4.9.28/fs/ntfs/aops.c
/*
* If none of the buffers had errors then we can set the page uptodate,
* but we first have to perform the post read mst fixups, if the
-@@ -145,13 +143,13 @@
+@@ -145,13 +143,13 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
recs = PAGE_SIZE / rec_size;
/* Should have been verified before we got here... */
BUG_ON(!recs);
@@ -6198,7 +6390,7 @@ diff -Nur linux-4.9.28.orig/fs/ntfs/aops.c linux-4.9.28/fs/ntfs/aops.c
flush_dcache_page(page);
if (likely(page_uptodate && !PageError(page)))
SetPageUptodate(page);
-@@ -159,9 +157,7 @@
+@@ -159,9 +157,7 @@ static void ntfs_end_buffer_async_read(struct buffer_head *bh, int uptodate)
unlock_page(page);
return;
still_busy:
@@ -6209,10 +6401,11 @@ diff -Nur linux-4.9.28.orig/fs/ntfs/aops.c linux-4.9.28/fs/ntfs/aops.c
}
/**
-diff -Nur linux-4.9.28.orig/fs/proc/base.c linux-4.9.28/fs/proc/base.c
---- linux-4.9.28.orig/fs/proc/base.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/proc/base.c 2017-05-19 03:37:25.162176025 +0200
-@@ -1834,7 +1834,7 @@
+diff --git a/fs/proc/base.c b/fs/proc/base.c
+index ca651ac00660..41d9dc789285 100644
+--- a/fs/proc/base.c
++++ b/fs/proc/base.c
+@@ -1834,7 +1834,7 @@ bool proc_fill_cache(struct file *file, struct dir_context *ctx,
child = d_hash_and_lookup(dir, &qname);
if (!child) {
@@ -6221,10 +6414,11 @@ diff -Nur linux-4.9.28.orig/fs/proc/base.c linux-4.9.28/fs/proc/base.c
child = d_alloc_parallel(dir, &qname, &wq);
if (IS_ERR(child))
goto end_instantiate;
-diff -Nur linux-4.9.28.orig/fs/proc/proc_sysctl.c linux-4.9.28/fs/proc/proc_sysctl.c
---- linux-4.9.28.orig/fs/proc/proc_sysctl.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/proc/proc_sysctl.c 2017-05-19 03:37:25.162176025 +0200
-@@ -632,7 +632,7 @@
+diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
+index d4e37acd4821..000cea46434a 100644
+--- a/fs/proc/proc_sysctl.c
++++ b/fs/proc/proc_sysctl.c
+@@ -632,7 +632,7 @@ static bool proc_sys_fill_cache(struct file *file,
child = d_lookup(dir, &qname);
if (!child) {
@@ -6233,10 +6427,11 @@ diff -Nur linux-4.9.28.orig/fs/proc/proc_sysctl.c linux-4.9.28/fs/proc/proc_sysc
child = d_alloc_parallel(dir, &qname, &wq);
if (IS_ERR(child))
return false;
-diff -Nur linux-4.9.28.orig/fs/timerfd.c linux-4.9.28/fs/timerfd.c
---- linux-4.9.28.orig/fs/timerfd.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/fs/timerfd.c 2017-05-19 03:37:25.162176025 +0200
-@@ -471,7 +471,10 @@
+diff --git a/fs/timerfd.c b/fs/timerfd.c
+index ab8dd1538381..5580853f57dd 100644
+--- a/fs/timerfd.c
++++ b/fs/timerfd.c
+@@ -471,7 +471,10 @@ static int do_timerfd_settime(int ufd, int flags,
break;
}
spin_unlock_irq(&ctx->wqh.lock);
@@ -6248,9 +6443,10 @@ diff -Nur linux-4.9.28.orig/fs/timerfd.c linux-4.9.28/fs/timerfd.c
}
/*
-diff -Nur linux-4.9.28.orig/include/acpi/platform/aclinux.h linux-4.9.28/include/acpi/platform/aclinux.h
---- linux-4.9.28.orig/include/acpi/platform/aclinux.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/acpi/platform/aclinux.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h
+index e861a24f06f2..b5c97d3059c7 100644
+--- a/include/acpi/platform/aclinux.h
++++ b/include/acpi/platform/aclinux.h
@@ -133,6 +133,7 @@
#define acpi_cache_t struct kmem_cache
@@ -6280,10 +6476,11 @@ diff -Nur linux-4.9.28.orig/include/acpi/platform/aclinux.h linux-4.9.28/include
/*
* OSL interfaces used by debugger/disassembler
*/
-diff -Nur linux-4.9.28.orig/include/asm-generic/bug.h linux-4.9.28/include/asm-generic/bug.h
---- linux-4.9.28.orig/include/asm-generic/bug.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/asm-generic/bug.h 2017-05-19 03:37:25.166176182 +0200
-@@ -215,6 +215,20 @@
+diff --git a/include/asm-generic/bug.h b/include/asm-generic/bug.h
+index 6f96247226a4..fa53a21263c2 100644
+--- a/include/asm-generic/bug.h
++++ b/include/asm-generic/bug.h
+@@ -215,6 +215,20 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
# define WARN_ON_SMP(x) ({0;})
#endif
@@ -6304,10 +6501,24 @@ diff -Nur linux-4.9.28.orig/include/asm-generic/bug.h linux-4.9.28/include/asm-g
#endif /* __ASSEMBLY__ */
#endif
-diff -Nur linux-4.9.28.orig/include/linux/blkdev.h linux-4.9.28/include/linux/blkdev.h
---- linux-4.9.28.orig/include/linux/blkdev.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/blkdev.h 2017-05-19 03:37:25.166176182 +0200
-@@ -89,6 +89,7 @@
+diff --git a/include/linux/blk-mq.h b/include/linux/blk-mq.h
+index 535ab2e13d2e..cfc246899473 100644
+--- a/include/linux/blk-mq.h
++++ b/include/linux/blk-mq.h
+@@ -209,7 +209,7 @@ static inline u16 blk_mq_unique_tag_to_tag(u32 unique_tag)
+ return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;
+ }
+
+-
++void __blk_mq_complete_request_remote_work(struct work_struct *work);
+ int blk_mq_request_started(struct request *rq);
+ void blk_mq_start_request(struct request *rq);
+ void blk_mq_end_request(struct request *rq, int error);
+diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
+index f6a816129856..ec7a4676f8a8 100644
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -89,6 +89,7 @@ struct request {
struct list_head queuelist;
union {
struct call_single_data csd;
@@ -6315,7 +6526,7 @@ diff -Nur linux-4.9.28.orig/include/linux/blkdev.h linux-4.9.28/include/linux/bl
u64 fifo_time;
};
-@@ -467,7 +468,7 @@
+@@ -467,7 +468,7 @@ struct request_queue {
struct throtl_data *td;
#endif
struct rcu_head rcu_head;
@@ -6324,21 +6535,10 @@ diff -Nur linux-4.9.28.orig/include/linux/blkdev.h linux-4.9.28/include/linux/bl
struct percpu_ref q_usage_counter;
struct list_head all_q_node;
-diff -Nur linux-4.9.28.orig/include/linux/blk-mq.h linux-4.9.28/include/linux/blk-mq.h
---- linux-4.9.28.orig/include/linux/blk-mq.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/blk-mq.h 2017-05-19 03:37:25.166176182 +0200
-@@ -209,7 +209,7 @@
- return unique_tag & BLK_MQ_UNIQUE_TAG_MASK;
- }
-
--
-+void __blk_mq_complete_request_remote_work(struct work_struct *work);
- int blk_mq_request_started(struct request *rq);
- void blk_mq_start_request(struct request *rq);
- void blk_mq_end_request(struct request *rq, int error);
-diff -Nur linux-4.9.28.orig/include/linux/bottom_half.h linux-4.9.28/include/linux/bottom_half.h
---- linux-4.9.28.orig/include/linux/bottom_half.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/bottom_half.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/bottom_half.h b/include/linux/bottom_half.h
+index 8fdcb783197d..d07dbeec7bc1 100644
+--- a/include/linux/bottom_half.h
++++ b/include/linux/bottom_half.h
@@ -3,6 +3,39 @@
#include <linux/preempt.h>
@@ -6379,17 +6579,18 @@ diff -Nur linux-4.9.28.orig/include/linux/bottom_half.h linux-4.9.28/include/lin
#ifdef CONFIG_TRACE_IRQFLAGS
extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
#else
-@@ -30,5 +63,6 @@
+@@ -30,5 +63,6 @@ static inline void local_bh_enable(void)
{
__local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET);
}
+#endif
#endif /* _LINUX_BH_H */
-diff -Nur linux-4.9.28.orig/include/linux/buffer_head.h linux-4.9.28/include/linux/buffer_head.h
---- linux-4.9.28.orig/include/linux/buffer_head.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/buffer_head.h 2017-05-19 03:37:25.166176182 +0200
-@@ -75,8 +75,50 @@
+diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
+index ebbacd14d450..be5e87f6360a 100644
+--- a/include/linux/buffer_head.h
++++ b/include/linux/buffer_head.h
+@@ -75,8 +75,50 @@ struct buffer_head {
struct address_space *b_assoc_map; /* mapping this buffer is
associated with */
atomic_t b_count; /* users using this buffer_head */
@@ -6440,9 +6641,10 @@ diff -Nur linux-4.9.28.orig/include/linux/buffer_head.h linux-4.9.28/include/lin
/*
* macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
* and buffer_foo() functions.
-diff -Nur linux-4.9.28.orig/include/linux/cgroup-defs.h linux-4.9.28/include/linux/cgroup-defs.h
---- linux-4.9.28.orig/include/linux/cgroup-defs.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/cgroup-defs.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/cgroup-defs.h b/include/linux/cgroup-defs.h
+index 5b17de62c962..56027cc01a56 100644
+--- a/include/linux/cgroup-defs.h
++++ b/include/linux/cgroup-defs.h
@@ -16,6 +16,7 @@
#include <linux/percpu-refcount.h>
#include <linux/percpu-rwsem.h>
@@ -6451,7 +6653,7 @@ diff -Nur linux-4.9.28.orig/include/linux/cgroup-defs.h linux-4.9.28/include/lin
#ifdef CONFIG_CGROUPS
-@@ -137,6 +138,7 @@
+@@ -137,6 +138,7 @@ struct cgroup_subsys_state {
/* percpu_ref killing and RCU release */
struct rcu_head rcu_head;
struct work_struct destroy_work;
@@ -6459,9 +6661,10 @@ diff -Nur linux-4.9.28.orig/include/linux/cgroup-defs.h linux-4.9.28/include/lin
};
/*
-diff -Nur linux-4.9.28.orig/include/linux/completion.h linux-4.9.28/include/linux/completion.h
---- linux-4.9.28.orig/include/linux/completion.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/completion.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/completion.h b/include/linux/completion.h
+index 5d5aaae3af43..3bca1590e29f 100644
+--- a/include/linux/completion.h
++++ b/include/linux/completion.h
@@ -7,8 +7,7 @@
* Atomic wait-for-completion handler data structures.
* See kernel/sched/completion.c for details.
@@ -6486,7 +6689,7 @@ diff -Nur linux-4.9.28.orig/include/linux/completion.h linux-4.9.28/include/linu
#define COMPLETION_INITIALIZER_ONSTACK(work) \
({ init_completion(&work); work; })
-@@ -73,7 +72,7 @@
+@@ -73,7 +72,7 @@ struct completion {
static inline void init_completion(struct completion *x)
{
x->done = 0;
@@ -6495,10 +6698,11 @@ diff -Nur linux-4.9.28.orig/include/linux/completion.h linux-4.9.28/include/linu
}
/**
-diff -Nur linux-4.9.28.orig/include/linux/cpu.h linux-4.9.28/include/linux/cpu.h
---- linux-4.9.28.orig/include/linux/cpu.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/cpu.h 2017-05-19 03:37:25.166176182 +0200
-@@ -182,6 +182,8 @@
+diff --git a/include/linux/cpu.h b/include/linux/cpu.h
+index e571128ad99a..5e52d28c20c1 100644
+--- a/include/linux/cpu.h
++++ b/include/linux/cpu.h
+@@ -182,6 +182,8 @@ extern void get_online_cpus(void);
extern void put_online_cpus(void);
extern void cpu_hotplug_disable(void);
extern void cpu_hotplug_enable(void);
@@ -6507,7 +6711,7 @@ diff -Nur linux-4.9.28.orig/include/linux/cpu.h linux-4.9.28/include/linux/cpu.h
#define hotcpu_notifier(fn, pri) cpu_notifier(fn, pri)
#define __hotcpu_notifier(fn, pri) __cpu_notifier(fn, pri)
#define register_hotcpu_notifier(nb) register_cpu_notifier(nb)
-@@ -199,6 +201,8 @@
+@@ -199,6 +201,8 @@ static inline void cpu_hotplug_done(void) {}
#define put_online_cpus() do { } while (0)
#define cpu_hotplug_disable() do { } while (0)
#define cpu_hotplug_enable() do { } while (0)
@@ -6516,9 +6720,10 @@ diff -Nur linux-4.9.28.orig/include/linux/cpu.h linux-4.9.28/include/linux/cpu.h
#define hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
#define __hotcpu_notifier(fn, pri) do { (void)(fn); } while (0)
/* These aren't inline functions due to a GCC bug. */
-diff -Nur linux-4.9.28.orig/include/linux/dcache.h linux-4.9.28/include/linux/dcache.h
---- linux-4.9.28.orig/include/linux/dcache.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/dcache.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/dcache.h b/include/linux/dcache.h
+index 5beed7b30561..61cab7ef458e 100644
+--- a/include/linux/dcache.h
++++ b/include/linux/dcache.h
@@ -11,6 +11,7 @@
#include <linux/rcupdate.h>
#include <linux/lockref.h>
@@ -6527,7 +6732,7 @@ diff -Nur linux-4.9.28.orig/include/linux/dcache.h linux-4.9.28/include/linux/dc
struct path;
struct vfsmount;
-@@ -100,7 +101,7 @@
+@@ -100,7 +101,7 @@ struct dentry {
union {
struct list_head d_lru; /* LRU list */
@@ -6536,7 +6741,7 @@ diff -Nur linux-4.9.28.orig/include/linux/dcache.h linux-4.9.28/include/linux/dc
};
struct list_head d_child; /* child of parent list */
struct list_head d_subdirs; /* our children */
-@@ -230,7 +231,7 @@
+@@ -230,7 +231,7 @@ extern void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op
extern struct dentry * d_alloc(struct dentry *, const struct qstr *);
extern struct dentry * d_alloc_pseudo(struct super_block *, const struct qstr *);
extern struct dentry * d_alloc_parallel(struct dentry *, const struct qstr *,
@@ -6545,10 +6750,11 @@ diff -Nur linux-4.9.28.orig/include/linux/dcache.h linux-4.9.28/include/linux/dc
extern struct dentry * d_splice_alias(struct inode *, struct dentry *);
extern struct dentry * d_add_ci(struct dentry *, struct inode *, struct qstr *);
extern struct dentry * d_exact_alias(struct dentry *, struct inode *);
-diff -Nur linux-4.9.28.orig/include/linux/delay.h linux-4.9.28/include/linux/delay.h
---- linux-4.9.28.orig/include/linux/delay.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/delay.h 2017-05-19 03:37:25.166176182 +0200
-@@ -52,4 +52,10 @@
+diff --git a/include/linux/delay.h b/include/linux/delay.h
+index a6ecb34cf547..37caab306336 100644
+--- a/include/linux/delay.h
++++ b/include/linux/delay.h
+@@ -52,4 +52,10 @@ static inline void ssleep(unsigned int seconds)
msleep(seconds * 1000);
}
@@ -6559,9 +6765,10 @@ diff -Nur linux-4.9.28.orig/include/linux/delay.h linux-4.9.28/include/linux/del
+#endif
+
#endif /* defined(_LINUX_DELAY_H) */
-diff -Nur linux-4.9.28.orig/include/linux/highmem.h linux-4.9.28/include/linux/highmem.h
---- linux-4.9.28.orig/include/linux/highmem.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/highmem.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/highmem.h b/include/linux/highmem.h
+index bb3f3297062a..a117a33ef72c 100644
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
@@ -7,6 +7,7 @@
#include <linux/mm.h>
#include <linux/uaccess.h>
@@ -6570,7 +6777,7 @@ diff -Nur linux-4.9.28.orig/include/linux/highmem.h linux-4.9.28/include/linux/h
#include <asm/cacheflush.h>
-@@ -65,7 +66,7 @@
+@@ -65,7 +66,7 @@ static inline void kunmap(struct page *page)
static inline void *kmap_atomic(struct page *page)
{
@@ -6579,7 +6786,7 @@ diff -Nur linux-4.9.28.orig/include/linux/highmem.h linux-4.9.28/include/linux/h
pagefault_disable();
return page_address(page);
}
-@@ -74,7 +75,7 @@
+@@ -74,7 +75,7 @@ static inline void *kmap_atomic(struct page *page)
static inline void __kunmap_atomic(void *addr)
{
pagefault_enable();
@@ -6588,7 +6795,7 @@ diff -Nur linux-4.9.28.orig/include/linux/highmem.h linux-4.9.28/include/linux/h
}
#define kmap_atomic_pfn(pfn) kmap_atomic(pfn_to_page(pfn))
-@@ -86,32 +87,51 @@
+@@ -86,32 +87,51 @@ static inline void __kunmap_atomic(void *addr)
#if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
@@ -6644,10 +6851,11 @@ diff -Nur linux-4.9.28.orig/include/linux/highmem.h linux-4.9.28/include/linux/h
#endif
}
-diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/hrtimer.h
---- linux-4.9.28.orig/include/linux/hrtimer.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/hrtimer.h 2017-05-19 03:37:25.166176182 +0200
-@@ -87,6 +87,9 @@
+diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
+index 5e00f80b1535..a34e10b55cde 100644
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -87,6 +87,9 @@ enum hrtimer_restart {
* @function: timer expiry callback function
* @base: pointer to the timer base (per cpu and per clock)
* @state: state information (See bit values above)
@@ -6657,7 +6865,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
* @is_rel: Set if the timer was armed relative
* @start_pid: timer statistics field to store the pid of the task which
* started the timer
-@@ -103,6 +106,11 @@
+@@ -103,6 +106,11 @@ struct hrtimer {
enum hrtimer_restart (*function)(struct hrtimer *);
struct hrtimer_clock_base *base;
u8 state;
@@ -6669,7 +6877,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
u8 is_rel;
#ifdef CONFIG_TIMER_STATS
int start_pid;
-@@ -123,11 +131,7 @@
+@@ -123,11 +131,7 @@ struct hrtimer_sleeper {
struct task_struct *task;
};
@@ -6681,7 +6889,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
/**
* struct hrtimer_clock_base - the timer base for a specific clock
-@@ -136,6 +140,7 @@
+@@ -136,6 +140,7 @@ struct hrtimer_sleeper {
* timer to a base on another cpu.
* @clockid: clock id for per_cpu support
* @active: red black tree root node for the active timers
@@ -6689,7 +6897,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
* @get_time: function to retrieve the current time of the clock
* @offset: offset of this clock to the monotonic base
*/
-@@ -144,6 +149,7 @@
+@@ -144,6 +149,7 @@ struct hrtimer_clock_base {
int index;
clockid_t clockid;
struct timerqueue_head active;
@@ -6697,7 +6905,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
ktime_t (*get_time)(void);
ktime_t offset;
} __attribute__((__aligned__(HRTIMER_CLOCK_BASE_ALIGN)));
-@@ -187,6 +193,7 @@
+@@ -187,6 +193,7 @@ struct hrtimer_cpu_base {
raw_spinlock_t lock;
seqcount_t seq;
struct hrtimer *running;
@@ -6705,7 +6913,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
unsigned int cpu;
unsigned int active_bases;
unsigned int clock_was_set_seq;
-@@ -203,6 +210,9 @@
+@@ -203,6 +210,9 @@ struct hrtimer_cpu_base {
unsigned int nr_hangs;
unsigned int max_hang_time;
#endif
@@ -6715,7 +6923,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
struct hrtimer_clock_base clock_base[HRTIMER_MAX_CLOCK_BASES];
} ____cacheline_aligned;
-@@ -412,6 +422,13 @@
+@@ -412,6 +422,13 @@ static inline void hrtimer_restart(struct hrtimer *timer)
hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
}
@@ -6729,7 +6937,7 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
/* Query timers: */
extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
-@@ -436,9 +453,15 @@
+@@ -436,9 +453,15 @@ static inline int hrtimer_is_queued(struct hrtimer *timer)
* Helper function to check, whether the timer is running the callback
* function
*/
@@ -6747,10 +6955,11 @@ diff -Nur linux-4.9.28.orig/include/linux/hrtimer.h linux-4.9.28/include/linux/h
}
/* Forward a hrtimer so it expires after now: */
-diff -Nur linux-4.9.28.orig/include/linux/idr.h linux-4.9.28/include/linux/idr.h
---- linux-4.9.28.orig/include/linux/idr.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/idr.h 2017-05-19 03:37:25.166176182 +0200
-@@ -95,10 +95,14 @@
+diff --git a/include/linux/idr.h b/include/linux/idr.h
+index 083d61e92706..5899796f50cb 100644
+--- a/include/linux/idr.h
++++ b/include/linux/idr.h
+@@ -95,10 +95,14 @@ bool idr_is_empty(struct idr *idp);
* Each idr_preload() should be matched with an invocation of this
* function. See idr_preload() for details.
*/
@@ -6765,10 +6974,11 @@ diff -Nur linux-4.9.28.orig/include/linux/idr.h linux-4.9.28/include/linux/idr.h
/**
* idr_find - return pointer for given id
-diff -Nur linux-4.9.28.orig/include/linux/init_task.h linux-4.9.28/include/linux/init_task.h
---- linux-4.9.28.orig/include/linux/init_task.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/init_task.h 2017-05-19 03:37:25.166176182 +0200
-@@ -150,6 +150,12 @@
+diff --git a/include/linux/init_task.h b/include/linux/init_task.h
+index 325f649d77ff..a56e263f5005 100644
+--- a/include/linux/init_task.h
++++ b/include/linux/init_task.h
+@@ -150,6 +150,12 @@ extern struct task_group root_task_group;
# define INIT_PERF_EVENTS(tsk)
#endif
@@ -6781,7 +6991,7 @@ diff -Nur linux-4.9.28.orig/include/linux/init_task.h linux-4.9.28/include/linux
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
# define INIT_VTIME(tsk) \
.vtime_seqcount = SEQCNT_ZERO(tsk.vtime_seqcount), \
-@@ -164,6 +170,7 @@
+@@ -164,6 +170,7 @@ extern struct task_group root_task_group;
#ifdef CONFIG_RT_MUTEXES
# define INIT_RT_MUTEXES(tsk) \
.pi_waiters = RB_ROOT, \
@@ -6789,7 +6999,7 @@ diff -Nur linux-4.9.28.orig/include/linux/init_task.h linux-4.9.28/include/linux
.pi_waiters_leftmost = NULL,
#else
# define INIT_RT_MUTEXES(tsk)
-@@ -250,6 +257,7 @@
+@@ -250,6 +257,7 @@ extern struct task_group root_task_group;
.cpu_timers = INIT_CPU_TIMERS(tsk.cpu_timers), \
.pi_lock = __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock), \
.timer_slack_ns = 50000, /* 50 usec default slack */ \
@@ -6797,9 +7007,10 @@ diff -Nur linux-4.9.28.orig/include/linux/init_task.h linux-4.9.28/include/linux
.pids = { \
[PIDTYPE_PID] = INIT_PID_LINK(PIDTYPE_PID), \
[PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID), \
-diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux/interrupt.h
---- linux-4.9.28.orig/include/linux/interrupt.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/interrupt.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h
+index 72f0721f75e7..480972ae47d3 100644
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
@@ -14,6 +14,7 @@
#include <linux/hrtimer.h>
#include <linux/kref.h>
@@ -6824,7 +7035,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
#define IRQF_TIMER (__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
-@@ -196,7 +199,7 @@
+@@ -196,7 +199,7 @@ extern void devm_free_irq(struct device *dev, unsigned int irq, void *dev_id);
#ifdef CONFIG_LOCKDEP
# define local_irq_enable_in_hardirq() do { } while (0)
#else
@@ -6833,7 +7044,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
#endif
extern void disable_irq_nosync(unsigned int irq);
-@@ -216,6 +219,7 @@
+@@ -216,6 +219,7 @@ extern void resume_device_irqs(void);
* struct irq_affinity_notify - context for notification of IRQ affinity changes
* @irq: Interrupt to which notification applies
* @kref: Reference count, for internal use
@@ -6841,7 +7052,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
* @work: Work item, for internal use
* @notify: Function to be called on change. This will be
* called in process context.
-@@ -227,7 +231,11 @@
+@@ -227,7 +231,11 @@ extern void resume_device_irqs(void);
struct irq_affinity_notify {
unsigned int irq;
struct kref kref;
@@ -6853,7 +7064,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
void (*release)(struct kref *ref);
};
-@@ -406,9 +414,13 @@
+@@ -406,9 +414,13 @@ extern int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
bool state);
#ifdef CONFIG_IRQ_FORCED_THREADING
@@ -6868,7 +7079,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
#endif
#ifndef __ARCH_SET_SOFTIRQ_PENDING
-@@ -465,9 +477,10 @@
+@@ -465,9 +477,10 @@ struct softirq_action
void (*action)(struct softirq_action *);
};
@@ -6880,7 +7091,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
#ifdef __ARCH_HAS_DO_SOFTIRQ
void do_softirq_own_stack(void);
#else
-@@ -476,13 +489,25 @@
+@@ -476,13 +489,25 @@ static inline void do_softirq_own_stack(void)
__do_softirq();
}
#endif
@@ -6906,7 +7117,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
-@@ -504,8 +529,9 @@
+@@ -504,8 +529,9 @@ static inline struct task_struct *this_cpu_ksoftirqd(void)
to be executed on some cpu at least once after this.
* If the tasklet is already scheduled, but its execution is still not
started, it will be executed only once.
@@ -6918,7 +7129,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
* Tasklet is strictly serialized wrt itself, but not
wrt another tasklets. If client needs some intertask synchronization,
he makes it with spinlocks.
-@@ -530,27 +556,36 @@
+@@ -530,27 +556,36 @@ struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data }
enum
{
TASKLET_STATE_SCHED, /* Tasklet is scheduled for execution */
@@ -6961,7 +7172,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
#define tasklet_unlock_wait(t) do { } while (0)
#define tasklet_unlock(t) do { } while (0)
#endif
-@@ -599,12 +634,7 @@
+@@ -599,12 +634,7 @@ static inline void tasklet_disable(struct tasklet_struct *t)
smp_mb();
}
@@ -6975,7 +7186,7 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
extern void tasklet_kill(struct tasklet_struct *t);
extern void tasklet_kill_immediate(struct tasklet_struct *t, unsigned int cpu);
extern void tasklet_init(struct tasklet_struct *t,
-@@ -635,6 +665,12 @@
+@@ -635,6 +665,12 @@ void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
tasklet_kill(&ttimer->tasklet);
}
@@ -6988,10 +7199,62 @@ diff -Nur linux-4.9.28.orig/include/linux/interrupt.h linux-4.9.28/include/linux
/*
* Autoprobing for irqs:
*
-diff -Nur linux-4.9.28.orig/include/linux/irqdesc.h linux-4.9.28/include/linux/irqdesc.h
---- linux-4.9.28.orig/include/linux/irqdesc.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/irqdesc.h 2017-05-19 03:37:25.166176182 +0200
-@@ -66,6 +66,7 @@
+diff --git a/include/linux/irq.h b/include/linux/irq.h
+index 39e3254e5769..8ebac94fbb9f 100644
+--- a/include/linux/irq.h
++++ b/include/linux/irq.h
+@@ -72,6 +72,7 @@ enum irqchip_irq_state;
+ * IRQ_IS_POLLED - Always polled by another interrupt. Exclude
+ * it from the spurious interrupt detection
+ * mechanism and from core side polling.
++ * IRQ_NO_SOFTIRQ_CALL - No softirq processing in the irq thread context (RT)
+ * IRQ_DISABLE_UNLAZY - Disable lazy irq disable
+ */
+ enum {
+@@ -99,13 +100,14 @@ enum {
+ IRQ_PER_CPU_DEVID = (1 << 17),
+ IRQ_IS_POLLED = (1 << 18),
+ IRQ_DISABLE_UNLAZY = (1 << 19),
++ IRQ_NO_SOFTIRQ_CALL = (1 << 20),
+ };
+
+ #define IRQF_MODIFY_MASK \
+ (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
+ IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
+ IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
+- IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY)
++ IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL)
+
+ #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
+
+diff --git a/include/linux/irq_work.h b/include/linux/irq_work.h
+index 47b9ebd4a74f..2543aab05daa 100644
+--- a/include/linux/irq_work.h
++++ b/include/linux/irq_work.h
+@@ -16,6 +16,7 @@
+ #define IRQ_WORK_BUSY 2UL
+ #define IRQ_WORK_FLAGS 3UL
+ #define IRQ_WORK_LAZY 4UL /* Doesn't want IPI, wait for tick */
++#define IRQ_WORK_HARD_IRQ 8UL /* Run hard IRQ context, even on RT */
+
+ struct irq_work {
+ unsigned long flags;
+@@ -51,4 +52,10 @@ static inline bool irq_work_needs_cpu(void) { return false; }
+ static inline void irq_work_run(void) { }
+ #endif
+
++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
++void irq_work_tick_soft(void);
++#else
++static inline void irq_work_tick_soft(void) { }
++#endif
++
+ #endif /* _LINUX_IRQ_WORK_H */
+diff --git a/include/linux/irqdesc.h b/include/linux/irqdesc.h
+index c9be57931b58..eeeb540971ae 100644
+--- a/include/linux/irqdesc.h
++++ b/include/linux/irqdesc.h
+@@ -66,6 +66,7 @@ struct irq_desc {
unsigned int irqs_unhandled;
atomic_t threads_handled;
int threads_handled_last;
@@ -6999,9 +7262,10 @@ diff -Nur linux-4.9.28.orig/include/linux/irqdesc.h linux-4.9.28/include/linux/i
raw_spinlock_t lock;
struct cpumask *percpu_enabled;
const struct cpumask *percpu_affinity;
-diff -Nur linux-4.9.28.orig/include/linux/irqflags.h linux-4.9.28/include/linux/irqflags.h
---- linux-4.9.28.orig/include/linux/irqflags.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/irqflags.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/irqflags.h b/include/linux/irqflags.h
+index 5dd1272d1ab2..9b77034f7c5e 100644
+--- a/include/linux/irqflags.h
++++ b/include/linux/irqflags.h
@@ -25,8 +25,6 @@
# define trace_softirqs_enabled(p) ((p)->softirqs_enabled)
# define trace_hardirq_enter() do { current->hardirq_context++; } while (0)
@@ -7052,59 +7316,11 @@ diff -Nur linux-4.9.28.orig/include/linux/irqflags.h linux-4.9.28/include/linux/
+#endif
+
#endif
-diff -Nur linux-4.9.28.orig/include/linux/irq.h linux-4.9.28/include/linux/irq.h
---- linux-4.9.28.orig/include/linux/irq.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/irq.h 2017-05-19 03:37:25.166176182 +0200
-@@ -72,6 +72,7 @@
- * IRQ_IS_POLLED - Always polled by another interrupt. Exclude
- * it from the spurious interrupt detection
- * mechanism and from core side polling.
-+ * IRQ_NO_SOFTIRQ_CALL - No softirq processing in the irq thread context (RT)
- * IRQ_DISABLE_UNLAZY - Disable lazy irq disable
- */
- enum {
-@@ -99,13 +100,14 @@
- IRQ_PER_CPU_DEVID = (1 << 17),
- IRQ_IS_POLLED = (1 << 18),
- IRQ_DISABLE_UNLAZY = (1 << 19),
-+ IRQ_NO_SOFTIRQ_CALL = (1 << 20),
- };
-
- #define IRQF_MODIFY_MASK \
- (IRQ_TYPE_SENSE_MASK | IRQ_NOPROBE | IRQ_NOREQUEST | \
- IRQ_NOAUTOEN | IRQ_MOVE_PCNTXT | IRQ_LEVEL | IRQ_NO_BALANCING | \
- IRQ_PER_CPU | IRQ_NESTED_THREAD | IRQ_NOTHREAD | IRQ_PER_CPU_DEVID | \
-- IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY)
-+ IRQ_IS_POLLED | IRQ_DISABLE_UNLAZY | IRQ_NO_SOFTIRQ_CALL)
-
- #define IRQ_NO_BALANCING_MASK (IRQ_PER_CPU | IRQ_NO_BALANCING)
-
-diff -Nur linux-4.9.28.orig/include/linux/irq_work.h linux-4.9.28/include/linux/irq_work.h
---- linux-4.9.28.orig/include/linux/irq_work.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/irq_work.h 2017-05-19 03:37:25.166176182 +0200
-@@ -16,6 +16,7 @@
- #define IRQ_WORK_BUSY 2UL
- #define IRQ_WORK_FLAGS 3UL
- #define IRQ_WORK_LAZY 4UL /* Doesn't want IPI, wait for tick */
-+#define IRQ_WORK_HARD_IRQ 8UL /* Run hard IRQ context, even on RT */
-
- struct irq_work {
- unsigned long flags;
-@@ -51,4 +52,10 @@
- static inline void irq_work_run(void) { }
- #endif
-
-+#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
-+void irq_work_tick_soft(void);
-+#else
-+static inline void irq_work_tick_soft(void) { }
-+#endif
-+
- #endif /* _LINUX_IRQ_WORK_H */
-diff -Nur linux-4.9.28.orig/include/linux/jbd2.h linux-4.9.28/include/linux/jbd2.h
---- linux-4.9.28.orig/include/linux/jbd2.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/jbd2.h 2017-05-19 03:37:25.166176182 +0200
-@@ -347,32 +347,56 @@
+diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h
+index dfaa1f4dcb0c..d57dd06544a1 100644
+--- a/include/linux/jbd2.h
++++ b/include/linux/jbd2.h
+@@ -347,32 +347,56 @@ static inline struct journal_head *bh2jh(struct buffer_head *bh)
static inline void jbd_lock_bh_state(struct buffer_head *bh)
{
@@ -7161,10 +7377,11 @@ diff -Nur linux-4.9.28.orig/include/linux/jbd2.h linux-4.9.28/include/linux/jbd2
}
#define J_ASSERT(assert) BUG_ON(!(assert))
-diff -Nur linux-4.9.28.orig/include/linux/kdb.h linux-4.9.28/include/linux/kdb.h
---- linux-4.9.28.orig/include/linux/kdb.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/kdb.h 2017-05-19 03:37:25.166176182 +0200
-@@ -167,6 +167,7 @@
+diff --git a/include/linux/kdb.h b/include/linux/kdb.h
+index 410decacff8f..0861bebfc188 100644
+--- a/include/linux/kdb.h
++++ b/include/linux/kdb.h
+@@ -167,6 +167,7 @@ extern __printf(2, 0) int vkdb_printf(enum kdb_msgsrc src, const char *fmt,
extern __printf(1, 2) int kdb_printf(const char *, ...);
typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
@@ -7172,7 +7389,7 @@ diff -Nur linux-4.9.28.orig/include/linux/kdb.h linux-4.9.28/include/linux/kdb.h
extern void kdb_init(int level);
/* Access to kdb specific polling devices */
-@@ -201,6 +202,7 @@
+@@ -201,6 +202,7 @@ extern int kdb_register_flags(char *, kdb_func_t, char *, char *,
extern int kdb_unregister(char *);
#else /* ! CONFIG_KGDB_KDB */
static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; }
@@ -7180,10 +7397,11 @@ diff -Nur linux-4.9.28.orig/include/linux/kdb.h linux-4.9.28/include/linux/kdb.h
static inline void kdb_init(int level) {}
static inline int kdb_register(char *cmd, kdb_func_t func, char *usage,
char *help, short minlen) { return 0; }
-diff -Nur linux-4.9.28.orig/include/linux/kernel.h linux-4.9.28/include/linux/kernel.h
---- linux-4.9.28.orig/include/linux/kernel.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/kernel.h 2017-05-19 03:37:25.166176182 +0200
-@@ -194,6 +194,9 @@
+diff --git a/include/linux/kernel.h b/include/linux/kernel.h
+index bc6ed52a39b9..7894d55e4998 100644
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -194,6 +194,9 @@ extern int _cond_resched(void);
*/
# define might_sleep() \
do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
@@ -7193,7 +7411,7 @@ diff -Nur linux-4.9.28.orig/include/linux/kernel.h linux-4.9.28/include/linux/ke
# define sched_annotate_sleep() (current->task_state_change = 0)
#else
static inline void ___might_sleep(const char *file, int line,
-@@ -201,6 +204,7 @@
+@@ -201,6 +204,7 @@ extern int _cond_resched(void);
static inline void __might_sleep(const char *file, int line,
int preempt_offset) { }
# define might_sleep() do { might_resched(); } while (0)
@@ -7201,7 +7419,7 @@ diff -Nur linux-4.9.28.orig/include/linux/kernel.h linux-4.9.28/include/linux/ke
# define sched_annotate_sleep() do { } while (0)
#endif
-@@ -488,6 +492,7 @@
+@@ -488,6 +492,7 @@ extern enum system_states {
SYSTEM_HALT,
SYSTEM_POWER_OFF,
SYSTEM_RESTART,
@@ -7209,9 +7427,10 @@ diff -Nur linux-4.9.28.orig/include/linux/kernel.h linux-4.9.28/include/linux/ke
} system_state;
#define TAINT_PROPRIETARY_MODULE 0
-diff -Nur linux-4.9.28.orig/include/linux/list_bl.h linux-4.9.28/include/linux/list_bl.h
---- linux-4.9.28.orig/include/linux/list_bl.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/list_bl.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/list_bl.h b/include/linux/list_bl.h
+index cb483305e1f5..4e5062316bb6 100644
+--- a/include/linux/list_bl.h
++++ b/include/linux/list_bl.h
@@ -2,6 +2,7 @@
#define _LINUX_LIST_BL_H
@@ -7247,7 +7466,7 @@ diff -Nur linux-4.9.28.orig/include/linux/list_bl.h linux-4.9.28/include/linux/l
static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h)
{
-@@ -118,12 +130,26 @@
+@@ -118,12 +130,26 @@ static inline void hlist_bl_del_init(struct hlist_bl_node *n)
static inline void hlist_bl_lock(struct hlist_bl_head *b)
{
@@ -7274,9 +7493,11 @@ diff -Nur linux-4.9.28.orig/include/linux/list_bl.h linux-4.9.28/include/linux/l
}
static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
-diff -Nur linux-4.9.28.orig/include/linux/locallock.h linux-4.9.28/include/linux/locallock.h
---- linux-4.9.28.orig/include/linux/locallock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/locallock.h 2017-05-19 03:37:25.166176182 +0200
+diff --git a/include/linux/locallock.h b/include/linux/locallock.h
+new file mode 100644
+index 000000000000..845c77f1a5ca
+--- /dev/null
++++ b/include/linux/locallock.h
@@ -0,0 +1,278 @@
+#ifndef _LINUX_LOCALLOCK_H
+#define _LINUX_LOCALLOCK_H
@@ -7556,9 +7777,10 @@ diff -Nur linux-4.9.28.orig/include/linux/locallock.h linux-4.9.28/include/linux
+#endif
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/mm_types.h linux-4.9.28/include/linux/mm_types.h
---- linux-4.9.28.orig/include/linux/mm_types.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/mm_types.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
+index 08d947fc4c59..705fb564a605 100644
+--- a/include/linux/mm_types.h
++++ b/include/linux/mm_types.h
@@ -11,6 +11,7 @@
#include <linux/completion.h>
#include <linux/cpumask.h>
@@ -7567,7 +7789,7 @@ diff -Nur linux-4.9.28.orig/include/linux/mm_types.h linux-4.9.28/include/linux/
#include <linux/page-flags-layout.h>
#include <linux/workqueue.h>
#include <asm/page.h>
-@@ -509,6 +510,9 @@
+@@ -509,6 +510,9 @@ struct mm_struct {
bool tlb_flush_pending;
#endif
struct uprobes_state uprobes_state;
@@ -7577,10 +7799,11 @@ diff -Nur linux-4.9.28.orig/include/linux/mm_types.h linux-4.9.28/include/linux/
#ifdef CONFIG_X86_INTEL_MPX
/* address of the bounds directory */
void __user *bd_addr;
-diff -Nur linux-4.9.28.orig/include/linux/module.h linux-4.9.28/include/linux/module.h
---- linux-4.9.28.orig/include/linux/module.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/module.h 2017-05-19 03:37:25.170176339 +0200
-@@ -496,6 +496,7 @@
+diff --git a/include/linux/module.h b/include/linux/module.h
+index 0c3207d26ac0..5944baaa3f28 100644
+--- a/include/linux/module.h
++++ b/include/linux/module.h
+@@ -496,6 +496,7 @@ static inline int module_is_live(struct module *mod)
struct module *__module_text_address(unsigned long addr);
struct module *__module_address(unsigned long addr);
bool is_module_address(unsigned long addr);
@@ -7588,21 +7811,22 @@ diff -Nur linux-4.9.28.orig/include/linux/module.h linux-4.9.28/include/linux/mo
bool is_module_percpu_address(unsigned long addr);
bool is_module_text_address(unsigned long addr);
-@@ -662,6 +663,11 @@
- {
+@@ -663,6 +664,11 @@ static inline bool is_module_percpu_address(unsigned long addr)
return false;
}
-+
+
+static inline bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
+{
+ return false;
+}
-
++
static inline bool is_module_text_address(unsigned long addr)
{
-diff -Nur linux-4.9.28.orig/include/linux/mutex.h linux-4.9.28/include/linux/mutex.h
---- linux-4.9.28.orig/include/linux/mutex.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/mutex.h 2017-05-19 03:37:25.170176339 +0200
+ return false;
+diff --git a/include/linux/mutex.h b/include/linux/mutex.h
+index 2cb7531e7d7a..b3fdfc820216 100644
+--- a/include/linux/mutex.h
++++ b/include/linux/mutex.h
@@ -19,6 +19,17 @@
#include <asm/processor.h>
#include <linux/osq_lock.h>
@@ -7621,7 +7845,7 @@ diff -Nur linux-4.9.28.orig/include/linux/mutex.h linux-4.9.28/include/linux/mut
/*
* Simple, straightforward mutexes with strict semantics:
*
-@@ -99,13 +110,6 @@
+@@ -99,13 +110,6 @@ do { \
static inline void mutex_destroy(struct mutex *lock) {}
#endif
@@ -7635,7 +7859,7 @@ diff -Nur linux-4.9.28.orig/include/linux/mutex.h linux-4.9.28/include/linux/mut
#define __MUTEX_INITIALIZER(lockname) \
{ .count = ATOMIC_INIT(1) \
, .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
-@@ -173,6 +177,8 @@
+@@ -173,6 +177,8 @@ extern int __must_check mutex_lock_killable(struct mutex *lock);
extern int mutex_trylock(struct mutex *lock);
extern void mutex_unlock(struct mutex *lock);
@@ -7644,9 +7868,11 @@ diff -Nur linux-4.9.28.orig/include/linux/mutex.h linux-4.9.28/include/linux/mut
extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
#endif /* __LINUX_MUTEX_H */
-diff -Nur linux-4.9.28.orig/include/linux/mutex_rt.h linux-4.9.28/include/linux/mutex_rt.h
---- linux-4.9.28.orig/include/linux/mutex_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/mutex_rt.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/mutex_rt.h b/include/linux/mutex_rt.h
+new file mode 100644
+index 000000000000..e0284edec655
+--- /dev/null
++++ b/include/linux/mutex_rt.h
@@ -0,0 +1,89 @@
+#ifndef __LINUX_MUTEX_RT_H
+#define __LINUX_MUTEX_RT_H
@@ -7737,10 +7963,11 @@ diff -Nur linux-4.9.28.orig/include/linux/mutex_rt.h linux-4.9.28/include/linux/
+} while (0)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/netdevice.h linux-4.9.28/include/linux/netdevice.h
---- linux-4.9.28.orig/include/linux/netdevice.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/netdevice.h 2017-05-19 03:37:25.170176339 +0200
-@@ -396,7 +396,19 @@
+diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
+index bb9b102c15cd..a5b12b8ad196 100644
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -396,7 +396,19 @@ typedef enum rx_handler_result rx_handler_result_t;
typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb);
void __napi_schedule(struct napi_struct *n);
@@ -7760,7 +7987,7 @@ diff -Nur linux-4.9.28.orig/include/linux/netdevice.h linux-4.9.28/include/linux
static inline bool napi_disable_pending(struct napi_struct *n)
{
-@@ -2463,14 +2475,53 @@
+@@ -2463,14 +2475,53 @@ void netdev_freemem(struct net_device *dev);
void synchronize_net(void);
int init_dummy_netdev(struct net_device *dev);
@@ -7815,7 +8042,7 @@ diff -Nur linux-4.9.28.orig/include/linux/netdevice.h linux-4.9.28/include/linux
struct net_device *dev_get_by_index(struct net *net, int ifindex);
struct net_device *__dev_get_by_index(struct net *net, int ifindex);
struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex);
-@@ -2855,6 +2906,7 @@
+@@ -2855,6 +2906,7 @@ struct softnet_data {
unsigned int dropped;
struct sk_buff_head input_pkt_queue;
struct napi_struct backlog;
@@ -7823,9 +8050,10 @@ diff -Nur linux-4.9.28.orig/include/linux/netdevice.h linux-4.9.28/include/linux
};
-diff -Nur linux-4.9.28.orig/include/linux/netfilter/x_tables.h linux-4.9.28/include/linux/netfilter/x_tables.h
---- linux-4.9.28.orig/include/linux/netfilter/x_tables.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/netfilter/x_tables.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/netfilter/x_tables.h b/include/linux/netfilter/x_tables.h
+index 2ad1a2b289b5..b4d10155af54 100644
+--- a/include/linux/netfilter/x_tables.h
++++ b/include/linux/netfilter/x_tables.h
@@ -4,6 +4,7 @@
#include <linux/netdevice.h>
@@ -7834,7 +8062,7 @@ diff -Nur linux-4.9.28.orig/include/linux/netfilter/x_tables.h linux-4.9.28/incl
#include <uapi/linux/netfilter/x_tables.h>
/* Test a struct->invflags and a boolean for inequality */
-@@ -300,6 +301,8 @@
+@@ -300,6 +301,8 @@ void xt_free_table_info(struct xt_table_info *info);
*/
DECLARE_PER_CPU(seqcount_t, xt_recseq);
@@ -7843,7 +8071,7 @@ diff -Nur linux-4.9.28.orig/include/linux/netfilter/x_tables.h linux-4.9.28/incl
/* xt_tee_enabled - true if x_tables needs to handle reentrancy
*
* Enabled if current ip(6)tables ruleset has at least one -j TEE rule.
-@@ -320,6 +323,9 @@
+@@ -320,6 +323,9 @@ static inline unsigned int xt_write_recseq_begin(void)
{
unsigned int addend;
@@ -7853,7 +8081,7 @@ diff -Nur linux-4.9.28.orig/include/linux/netfilter/x_tables.h linux-4.9.28/incl
/*
* Low order bit of sequence is set if we already
* called xt_write_recseq_begin().
-@@ -350,6 +356,7 @@
+@@ -350,6 +356,7 @@ static inline void xt_write_recseq_end(unsigned int addend)
/* this is kind of a write_seqcount_end(), but addend is 0 or 1 */
smp_wmb();
__this_cpu_add(xt_recseq.sequence, addend);
@@ -7861,10 +8089,11 @@ diff -Nur linux-4.9.28.orig/include/linux/netfilter/x_tables.h linux-4.9.28/incl
}
/*
-diff -Nur linux-4.9.28.orig/include/linux/nfs_fs.h linux-4.9.28/include/linux/nfs_fs.h
---- linux-4.9.28.orig/include/linux/nfs_fs.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/nfs_fs.h 2017-05-19 03:37:25.170176339 +0200
-@@ -165,7 +165,11 @@
+diff --git a/include/linux/nfs_fs.h b/include/linux/nfs_fs.h
+index 810124b33327..d54ca43d571f 100644
+--- a/include/linux/nfs_fs.h
++++ b/include/linux/nfs_fs.h
+@@ -165,7 +165,11 @@ struct nfs_inode {
/* Readers: in-flight sillydelete RPC calls */
/* Writers: rmdir */
@@ -7876,10 +8105,11 @@ diff -Nur linux-4.9.28.orig/include/linux/nfs_fs.h linux-4.9.28/include/linux/nf
#if IS_ENABLED(CONFIG_NFS_V4)
struct nfs4_cached_acl *nfs4_acl;
-diff -Nur linux-4.9.28.orig/include/linux/nfs_xdr.h linux-4.9.28/include/linux/nfs_xdr.h
---- linux-4.9.28.orig/include/linux/nfs_xdr.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/nfs_xdr.h 2017-05-19 03:37:25.170176339 +0200
-@@ -1490,7 +1490,7 @@
+diff --git a/include/linux/nfs_xdr.h b/include/linux/nfs_xdr.h
+index beb1e10f446e..ebaf2e7bfe29 100644
+--- a/include/linux/nfs_xdr.h
++++ b/include/linux/nfs_xdr.h
+@@ -1490,7 +1490,7 @@ struct nfs_unlinkdata {
struct nfs_removeargs args;
struct nfs_removeres res;
struct dentry *dentry;
@@ -7888,9 +8118,10 @@ diff -Nur linux-4.9.28.orig/include/linux/nfs_xdr.h linux-4.9.28/include/linux/n
struct rpc_cred *cred;
struct nfs_fattr dir_attr;
long timeout;
-diff -Nur linux-4.9.28.orig/include/linux/notifier.h linux-4.9.28/include/linux/notifier.h
---- linux-4.9.28.orig/include/linux/notifier.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/notifier.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/notifier.h b/include/linux/notifier.h
+index 4149868de4e6..babe5b9bcb91 100644
+--- a/include/linux/notifier.h
++++ b/include/linux/notifier.h
@@ -6,7 +6,7 @@
*
* Alan Cox <Alan.Cox@linux.org>
@@ -7911,7 +8142,7 @@ diff -Nur linux-4.9.28.orig/include/linux/notifier.h linux-4.9.28/include/linux/
*/
struct notifier_block;
-@@ -90,7 +88,7 @@
+@@ -90,7 +88,7 @@ struct srcu_notifier_head {
(name)->head = NULL; \
} while (0)
@@ -7920,7 +8151,7 @@ diff -Nur linux-4.9.28.orig/include/linux/notifier.h linux-4.9.28/include/linux/
extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
#define srcu_cleanup_notifier_head(name) \
cleanup_srcu_struct(&(name)->srcu);
-@@ -103,7 +101,13 @@
+@@ -103,7 +101,13 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
.head = NULL }
#define RAW_NOTIFIER_INIT(name) { \
.head = NULL }
@@ -7935,7 +8166,7 @@ diff -Nur linux-4.9.28.orig/include/linux/notifier.h linux-4.9.28/include/linux/
#define ATOMIC_NOTIFIER_HEAD(name) \
struct atomic_notifier_head name = \
-@@ -115,6 +119,18 @@
+@@ -115,6 +119,18 @@ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
struct raw_notifier_head name = \
RAW_NOTIFIER_INIT(name)
@@ -7954,7 +8185,7 @@ diff -Nur linux-4.9.28.orig/include/linux/notifier.h linux-4.9.28/include/linux/
#ifdef __KERNEL__
extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh,
-@@ -184,12 +200,12 @@
+@@ -184,12 +200,12 @@ static inline int notifier_to_errno(int ret)
/*
* Declared notifiers so far. I can imagine quite a few more chains
@@ -7970,56 +8201,10 @@ diff -Nur linux-4.9.28.orig/include/linux/notifier.h linux-4.9.28/include/linux/
/* CPU notfiers are defined in include/linux/cpu.h. */
/* netdevice notifiers are defined in include/linux/netdevice.h */
-diff -Nur linux-4.9.28.orig/include/linux/percpu.h linux-4.9.28/include/linux/percpu.h
---- linux-4.9.28.orig/include/linux/percpu.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/percpu.h 2017-05-19 03:37:25.170176339 +0200
-@@ -18,6 +18,35 @@
- #define PERCPU_MODULE_RESERVE 0
- #endif
-
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+
-+#define get_local_var(var) (*({ \
-+ migrate_disable(); \
-+ this_cpu_ptr(&var); }))
-+
-+#define put_local_var(var) do { \
-+ (void)&(var); \
-+ migrate_enable(); \
-+} while (0)
-+
-+# define get_local_ptr(var) ({ \
-+ migrate_disable(); \
-+ this_cpu_ptr(var); })
-+
-+# define put_local_ptr(var) do { \
-+ (void)(var); \
-+ migrate_enable(); \
-+} while (0)
-+
-+#else
-+
-+#define get_local_var(var) get_cpu_var(var)
-+#define put_local_var(var) put_cpu_var(var)
-+#define get_local_ptr(var) get_cpu_ptr(var)
-+#define put_local_ptr(var) put_cpu_ptr(var)
-+
-+#endif
-+
- /* minimum unit size, also is the maximum supported allocation size */
- #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
-
-@@ -110,6 +139,7 @@
- #endif
-
- extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
-+extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
- extern bool is_kernel_percpu_address(unsigned long addr);
-
- #if !defined(CONFIG_SMP) || !defined(CONFIG_HAVE_SETUP_PER_CPU_AREA)
-diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/linux/percpu-rwsem.h
---- linux-4.9.28.orig/include/linux/percpu-rwsem.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/percpu-rwsem.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/percpu-rwsem.h b/include/linux/percpu-rwsem.h
+index 5b2e6159b744..ea940f451606 100644
+--- a/include/linux/percpu-rwsem.h
++++ b/include/linux/percpu-rwsem.h
@@ -4,7 +4,7 @@
#include <linux/atomic.h>
#include <linux/rwsem.h>
@@ -8029,7 +8214,7 @@ diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/li
#include <linux/rcu_sync.h>
#include <linux/lockdep.h>
-@@ -12,7 +12,7 @@
+@@ -12,7 +12,7 @@ struct percpu_rw_semaphore {
struct rcu_sync rss;
unsigned int __percpu *read_count;
struct rw_semaphore rw_sem;
@@ -8038,7 +8223,7 @@ diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/li
int readers_block;
};
-@@ -22,13 +22,13 @@
+@@ -22,13 +22,13 @@ static struct percpu_rw_semaphore name = { \
.rss = __RCU_SYNC_INITIALIZER(name.rss, RCU_SCHED_SYNC), \
.read_count = &__percpu_rwsem_rc_##name, \
.rw_sem = __RWSEM_INITIALIZER(name.rw_sem), \
@@ -8054,7 +8239,7 @@ diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/li
{
might_sleep();
-@@ -46,16 +46,10 @@
+@@ -46,16 +46,10 @@ static inline void percpu_down_read_preempt_disable(struct percpu_rw_semaphore *
__this_cpu_inc(*sem->read_count);
if (unlikely(!rcu_sync_is_idle(&sem->rss)))
__percpu_down_read(sem, false); /* Unconditional memory barrier */
@@ -8072,7 +8257,7 @@ diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/li
preempt_enable();
}
-@@ -82,13 +76,9 @@
+@@ -82,13 +76,9 @@ static inline int percpu_down_read_trylock(struct percpu_rw_semaphore *sem)
return ret;
}
@@ -8088,7 +8273,7 @@ diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/li
/*
* Same as in percpu_down_read().
*/
-@@ -101,12 +91,6 @@
+@@ -101,12 +91,6 @@ static inline void percpu_up_read_preempt_enable(struct percpu_rw_semaphore *sem
rwsem_release(&sem->rw_sem.dep_map, 1, _RET_IP_);
}
@@ -8101,9 +8286,58 @@ diff -Nur linux-4.9.28.orig/include/linux/percpu-rwsem.h linux-4.9.28/include/li
extern void percpu_down_write(struct percpu_rw_semaphore *);
extern void percpu_up_write(struct percpu_rw_semaphore *);
-diff -Nur linux-4.9.28.orig/include/linux/pid.h linux-4.9.28/include/linux/pid.h
---- linux-4.9.28.orig/include/linux/pid.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/pid.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/percpu.h b/include/linux/percpu.h
+index 56939d3f6e53..b988bf40ad3e 100644
+--- a/include/linux/percpu.h
++++ b/include/linux/percpu.h
+@@ -18,6 +18,35 @@
+ #define PERCPU_MODULE_RESERVE 0
+ #endif
+
++#ifdef CONFIG_PREEMPT_RT_FULL
++
++#define get_local_var(var) (*({ \
++ migrate_disable(); \
++ this_cpu_ptr(&var); }))
++
++#define put_local_var(var) do { \
++ (void)&(var); \
++ migrate_enable(); \
++} while (0)
++
++# define get_local_ptr(var) ({ \
++ migrate_disable(); \
++ this_cpu_ptr(var); })
++
++# define put_local_ptr(var) do { \
++ (void)(var); \
++ migrate_enable(); \
++} while (0)
++
++#else
++
++#define get_local_var(var) get_cpu_var(var)
++#define put_local_var(var) put_cpu_var(var)
++#define get_local_ptr(var) get_cpu_ptr(var)
++#define put_local_ptr(var) put_cpu_ptr(var)
++
++#endif
++
+ /* minimum unit size, also is the maximum supported allocation size */
+ #define PCPU_MIN_UNIT_SIZE PFN_ALIGN(32 << 10)
+
+@@ -110,6 +139,7 @@ extern int __init pcpu_page_first_chunk(size_t reserved_size,
+ #endif
+
+ extern void __percpu *__alloc_reserved_percpu(size_t size, size_t align);
++extern bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr);
+ extern bool is_kernel_percpu_address(unsigned long addr);
+
+ #if !defined(CONFIG_SMP) || !defined(CONFIG_HAVE_SETUP_PER_CPU_AREA)
+diff --git a/include/linux/pid.h b/include/linux/pid.h
+index 23705a53abba..2cc64b779f03 100644
+--- a/include/linux/pid.h
++++ b/include/linux/pid.h
@@ -2,6 +2,7 @@
#define _LINUX_PID_H
@@ -8112,9 +8346,10 @@ diff -Nur linux-4.9.28.orig/include/linux/pid.h linux-4.9.28/include/linux/pid.h
enum pid_type
{
-diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/preempt.h
---- linux-4.9.28.orig/include/linux/preempt.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/preempt.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/preempt.h b/include/linux/preempt.h
+index 75e4e30677f1..1cfb1cb72354 100644
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
@@ -50,7 +50,11 @@
#define HARDIRQ_OFFSET (1UL << HARDIRQ_SHIFT)
#define NMI_OFFSET (1UL << NMI_SHIFT)
@@ -8165,7 +8400,7 @@ diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/p
/*
* The preempt_count offset needed for things like:
-@@ -140,6 +153,20 @@
+@@ -140,6 +153,20 @@ extern void preempt_count_sub(int val);
#define preempt_count_inc() preempt_count_add(1)
#define preempt_count_dec() preempt_count_sub(1)
@@ -8186,7 +8421,7 @@ diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/p
#ifdef CONFIG_PREEMPT_COUNT
#define preempt_disable() \
-@@ -148,13 +175,25 @@
+@@ -148,13 +175,25 @@ do { \
barrier(); \
} while (0)
@@ -8213,7 +8448,7 @@ diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/p
#define preemptible() (preempt_count() == 0 && !irqs_disabled())
-@@ -179,6 +218,13 @@
+@@ -179,6 +218,13 @@ do { \
__preempt_schedule(); \
} while (0)
@@ -8227,7 +8462,7 @@ diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/p
#else /* !CONFIG_PREEMPT */
#define preempt_enable() \
do { \
-@@ -224,6 +270,7 @@
+@@ -224,6 +270,7 @@ do { \
#define preempt_disable_notrace() barrier()
#define preempt_enable_no_resched_notrace() barrier()
#define preempt_enable_notrace() barrier()
@@ -8235,7 +8470,7 @@ diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/p
#define preemptible() 0
#endif /* CONFIG_PREEMPT_COUNT */
-@@ -244,10 +291,31 @@
+@@ -244,10 +291,31 @@ do { \
} while (0)
#define preempt_fold_need_resched() \
do { \
@@ -8268,10 +8503,11 @@ diff -Nur linux-4.9.28.orig/include/linux/preempt.h linux-4.9.28/include/linux/p
#ifdef CONFIG_PREEMPT_NOTIFIERS
struct preempt_notifier;
-diff -Nur linux-4.9.28.orig/include/linux/printk.h linux-4.9.28/include/linux/printk.h
---- linux-4.9.28.orig/include/linux/printk.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/printk.h 2017-05-19 03:37:25.170176339 +0200
-@@ -126,9 +126,11 @@
+diff --git a/include/linux/printk.h b/include/linux/printk.h
+index eac1af8502bb..37e647af0b0b 100644
+--- a/include/linux/printk.h
++++ b/include/linux/printk.h
+@@ -126,9 +126,11 @@ struct va_format {
#ifdef CONFIG_EARLY_PRINTK
extern asmlinkage __printf(1, 2)
void early_printk(const char *fmt, ...);
@@ -8283,10 +8519,11 @@ diff -Nur linux-4.9.28.orig/include/linux/printk.h linux-4.9.28/include/linux/pr
#endif
#ifdef CONFIG_PRINTK_NMI
-diff -Nur linux-4.9.28.orig/include/linux/radix-tree.h linux-4.9.28/include/linux/radix-tree.h
---- linux-4.9.28.orig/include/linux/radix-tree.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/radix-tree.h 2017-05-19 03:37:25.170176339 +0200
-@@ -292,6 +292,8 @@
+diff --git a/include/linux/radix-tree.h b/include/linux/radix-tree.h
+index af3581b8a451..277295039c8f 100644
+--- a/include/linux/radix-tree.h
++++ b/include/linux/radix-tree.h
+@@ -292,6 +292,8 @@ unsigned int radix_tree_gang_lookup_slot(struct radix_tree_root *root,
int radix_tree_preload(gfp_t gfp_mask);
int radix_tree_maybe_preload(gfp_t gfp_mask);
int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order);
@@ -8295,7 +8532,7 @@ diff -Nur linux-4.9.28.orig/include/linux/radix-tree.h linux-4.9.28/include/linu
void radix_tree_init(void);
void *radix_tree_tag_set(struct radix_tree_root *root,
unsigned long index, unsigned int tag);
-@@ -314,11 +316,6 @@
+@@ -314,11 +316,6 @@ unsigned long radix_tree_range_tag_if_tagged(struct radix_tree_root *root,
int radix_tree_tagged(struct radix_tree_root *root, unsigned int tag);
unsigned long radix_tree_locate_item(struct radix_tree_root *root, void *item);
@@ -8307,10 +8544,11 @@ diff -Nur linux-4.9.28.orig/include/linux/radix-tree.h linux-4.9.28/include/linu
/**
* struct radix_tree_iter - radix tree iterator state
*
-diff -Nur linux-4.9.28.orig/include/linux/random.h linux-4.9.28/include/linux/random.h
---- linux-4.9.28.orig/include/linux/random.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/random.h 2017-05-19 03:37:25.170176339 +0200
-@@ -31,7 +31,7 @@
+diff --git a/include/linux/random.h b/include/linux/random.h
+index 16ab429735a7..9d0fecb5b6c2 100644
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -31,7 +31,7 @@ static inline void add_latent_entropy(void) {}
extern void add_input_randomness(unsigned int type, unsigned int code,
unsigned int value) __latent_entropy;
@@ -8319,20 +8557,10 @@ diff -Nur linux-4.9.28.orig/include/linux/random.h linux-4.9.28/include/linux/ra
extern void get_random_bytes(void *buf, int nbytes);
extern int add_random_ready_callback(struct random_ready_callback *rdy);
-diff -Nur linux-4.9.28.orig/include/linux/rbtree_augmented.h linux-4.9.28/include/linux/rbtree_augmented.h
---- linux-4.9.28.orig/include/linux/rbtree_augmented.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rbtree_augmented.h 2017-05-19 03:37:25.170176339 +0200
-@@ -26,6 +26,7 @@
-
- #include <linux/compiler.h>
- #include <linux/rbtree.h>
-+#include <linux/rcupdate.h>
-
- /*
- * Please note - only struct rb_augment_callbacks and the prototypes for
-diff -Nur linux-4.9.28.orig/include/linux/rbtree.h linux-4.9.28/include/linux/rbtree.h
---- linux-4.9.28.orig/include/linux/rbtree.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rbtree.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
+index e585018498d5..25c64474fc27 100644
+--- a/include/linux/rbtree.h
++++ b/include/linux/rbtree.h
@@ -31,7 +31,7 @@
#include <linux/kernel.h>
@@ -8342,9 +8570,23 @@ diff -Nur linux-4.9.28.orig/include/linux/rbtree.h linux-4.9.28/include/linux/rb
struct rb_node {
unsigned long __rb_parent_color;
-diff -Nur linux-4.9.28.orig/include/linux/rcu_assign_pointer.h linux-4.9.28/include/linux/rcu_assign_pointer.h
---- linux-4.9.28.orig/include/linux/rcu_assign_pointer.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/rcu_assign_pointer.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rbtree_augmented.h b/include/linux/rbtree_augmented.h
+index d076183e49be..36bfb4dd57ae 100644
+--- a/include/linux/rbtree_augmented.h
++++ b/include/linux/rbtree_augmented.h
+@@ -26,6 +26,7 @@
+
+ #include <linux/compiler.h>
+ #include <linux/rbtree.h>
++#include <linux/rcupdate.h>
+
+ /*
+ * Please note - only struct rb_augment_callbacks and the prototypes for
+diff --git a/include/linux/rcu_assign_pointer.h b/include/linux/rcu_assign_pointer.h
+new file mode 100644
+index 000000000000..7066962a4379
+--- /dev/null
++++ b/include/linux/rcu_assign_pointer.h
@@ -0,0 +1,54 @@
+#ifndef __LINUX_RCU_ASSIGN_POINTER_H__
+#define __LINUX_RCU_ASSIGN_POINTER_H__
@@ -8400,9 +8642,10 @@ diff -Nur linux-4.9.28.orig/include/linux/rcu_assign_pointer.h linux-4.9.28/incl
+})
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/rcupdate.h
---- linux-4.9.28.orig/include/linux/rcupdate.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rcupdate.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rcupdate.h b/include/linux/rcupdate.h
+index 01f71e1d2e94..30cc001d0d5a 100644
+--- a/include/linux/rcupdate.h
++++ b/include/linux/rcupdate.h
@@ -46,6 +46,7 @@
#include <linux/compiler.h>
#include <linux/ktime.h>
@@ -8411,7 +8654,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
#include <asm/barrier.h>
-@@ -178,6 +179,9 @@
+@@ -178,6 +179,9 @@ void call_rcu(struct rcu_head *head,
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
@@ -8421,7 +8664,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
/**
* call_rcu_bh() - Queue an RCU for invocation after a quicker grace period.
* @head: structure to be used for queueing the RCU updates.
-@@ -201,6 +205,7 @@
+@@ -201,6 +205,7 @@ void call_rcu(struct rcu_head *head,
*/
void call_rcu_bh(struct rcu_head *head,
rcu_callback_t func);
@@ -8429,7 +8672,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
/**
* call_rcu_sched() - Queue an RCU for invocation after sched grace period.
-@@ -301,6 +306,11 @@
+@@ -301,6 +306,11 @@ void synchronize_rcu(void);
* types of kernel builds, the rcu_read_lock() nesting depth is unknowable.
*/
#define rcu_preempt_depth() (current->rcu_read_lock_nesting)
@@ -8441,7 +8684,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
#else /* #ifdef CONFIG_PREEMPT_RCU */
-@@ -326,6 +336,8 @@
+@@ -326,6 +336,8 @@ static inline int rcu_preempt_depth(void)
return 0;
}
@@ -8450,7 +8693,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
/* Internal to kernel */
-@@ -505,7 +517,14 @@
+@@ -505,7 +517,14 @@ extern struct lockdep_map rcu_callback_map;
int debug_lockdep_rcu_enabled(void);
int rcu_read_lock_held(void);
@@ -8465,7 +8708,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
/**
* rcu_read_lock_sched_held() - might we be in RCU-sched read-side critical section?
-@@ -626,54 +645,6 @@
+@@ -626,54 +645,6 @@ static inline void rcu_preempt_sleep_check(void)
})
/**
@@ -8520,7 +8763,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
* rcu_access_pointer() - fetch RCU pointer with no dereferencing
* @p: The pointer to read
*
-@@ -951,10 +922,14 @@
+@@ -951,10 +922,14 @@ static inline void rcu_read_unlock(void)
static inline void rcu_read_lock_bh(void)
{
local_bh_disable();
@@ -8535,7 +8778,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
}
/*
-@@ -964,10 +939,14 @@
+@@ -964,10 +939,14 @@ static inline void rcu_read_lock_bh(void)
*/
static inline void rcu_read_unlock_bh(void)
{
@@ -8550,10 +8793,11 @@ diff -Nur linux-4.9.28.orig/include/linux/rcupdate.h linux-4.9.28/include/linux/
local_bh_enable();
}
-diff -Nur linux-4.9.28.orig/include/linux/rcutree.h linux-4.9.28/include/linux/rcutree.h
---- linux-4.9.28.orig/include/linux/rcutree.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rcutree.h 2017-05-19 03:37:25.170176339 +0200
-@@ -44,7 +44,11 @@
+diff --git a/include/linux/rcutree.h b/include/linux/rcutree.h
+index 63a4e4cf40a5..08ab12df2863 100644
+--- a/include/linux/rcutree.h
++++ b/include/linux/rcutree.h
+@@ -44,7 +44,11 @@ static inline void rcu_virt_note_context_switch(int cpu)
rcu_note_context_switch();
}
@@ -8565,7 +8809,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcutree.h linux-4.9.28/include/linux/r
void synchronize_sched_expedited(void);
void synchronize_rcu_expedited(void);
-@@ -72,7 +76,11 @@
+@@ -72,7 +76,11 @@ static inline void synchronize_rcu_bh_expedited(void)
}
void rcu_barrier(void);
@@ -8577,7 +8821,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcutree.h linux-4.9.28/include/linux/r
void rcu_barrier_sched(void);
unsigned long get_state_synchronize_rcu(void);
void cond_synchronize_rcu(unsigned long oldstate);
-@@ -82,17 +90,14 @@
+@@ -82,17 +90,14 @@ void cond_synchronize_sched(unsigned long oldstate);
extern unsigned long rcutorture_testseq;
extern unsigned long rcutorture_vernum;
unsigned long rcu_batches_started(void);
@@ -8595,7 +8839,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rcutree.h linux-4.9.28/include/linux/r
void rcu_sched_force_quiescent_state(void);
void rcu_idle_enter(void);
-@@ -109,6 +114,16 @@
+@@ -109,6 +114,16 @@ extern int rcu_scheduler_active __read_mostly;
bool rcu_is_watching(void);
@@ -8612,9 +8856,10 @@ diff -Nur linux-4.9.28.orig/include/linux/rcutree.h linux-4.9.28/include/linux/r
void rcu_all_qs(void);
/* RCUtree hotplug events */
-diff -Nur linux-4.9.28.orig/include/linux/rtmutex.h linux-4.9.28/include/linux/rtmutex.h
---- linux-4.9.28.orig/include/linux/rtmutex.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rtmutex.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rtmutex.h b/include/linux/rtmutex.h
+index 1abba5ce2a2f..294a8b4875f1 100644
+--- a/include/linux/rtmutex.h
++++ b/include/linux/rtmutex.h
@@ -13,11 +13,15 @@
#define __LINUX_RT_MUTEX_H
@@ -8632,7 +8877,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rtmutex.h linux-4.9.28/include/linux/r
/**
* The rt_mutex structure
*
-@@ -31,8 +35,8 @@
+@@ -31,8 +35,8 @@ struct rt_mutex {
struct rb_root waiters;
struct rb_node *waiters_leftmost;
struct task_struct *owner;
@@ -8642,7 +8887,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rtmutex.h linux-4.9.28/include/linux/r
const char *name, *file;
int line;
void *magic;
-@@ -55,22 +59,33 @@
+@@ -55,22 +59,33 @@ struct hrtimer_sleeper;
# define rt_mutex_debug_check_no_locks_held(task) do { } while (0)
#endif
@@ -8681,7 +8926,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rtmutex.h linux-4.9.28/include/linux/r
#define DEFINE_RT_MUTEX(mutexname) \
struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)
-@@ -90,7 +105,9 @@
+@@ -90,7 +105,9 @@ extern void __rt_mutex_init(struct rt_mutex *lock, const char *name);
extern void rt_mutex_destroy(struct rt_mutex *lock);
extern void rt_mutex_lock(struct rt_mutex *lock);
@@ -8691,9 +8936,11 @@ diff -Nur linux-4.9.28.orig/include/linux/rtmutex.h linux-4.9.28/include/linux/r
extern int rt_mutex_timed_lock(struct rt_mutex *lock,
struct hrtimer_sleeper *timeout);
-diff -Nur linux-4.9.28.orig/include/linux/rwlock_rt.h linux-4.9.28/include/linux/rwlock_rt.h
---- linux-4.9.28.orig/include/linux/rwlock_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/rwlock_rt.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rwlock_rt.h b/include/linux/rwlock_rt.h
+new file mode 100644
+index 000000000000..49ed2d45d3be
+--- /dev/null
++++ b/include/linux/rwlock_rt.h
@@ -0,0 +1,99 @@
+#ifndef __LINUX_RWLOCK_RT_H
+#define __LINUX_RWLOCK_RT_H
@@ -8794,9 +9041,10 @@ diff -Nur linux-4.9.28.orig/include/linux/rwlock_rt.h linux-4.9.28/include/linux
+ } while (0)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/rwlock_types.h linux-4.9.28/include/linux/rwlock_types.h
---- linux-4.9.28.orig/include/linux/rwlock_types.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rwlock_types.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rwlock_types.h b/include/linux/rwlock_types.h
+index cc0072e93e36..5317cd957292 100644
+--- a/include/linux/rwlock_types.h
++++ b/include/linux/rwlock_types.h
@@ -1,6 +1,10 @@
#ifndef __LINUX_RWLOCK_TYPES_H
#define __LINUX_RWLOCK_TYPES_H
@@ -8808,9 +9056,11 @@ diff -Nur linux-4.9.28.orig/include/linux/rwlock_types.h linux-4.9.28/include/li
/*
* include/linux/rwlock_types.h - generic rwlock type definitions
* and initializers
-diff -Nur linux-4.9.28.orig/include/linux/rwlock_types_rt.h linux-4.9.28/include/linux/rwlock_types_rt.h
---- linux-4.9.28.orig/include/linux/rwlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/rwlock_types_rt.h 2017-05-19 03:37:25.170176339 +0200
+diff --git a/include/linux/rwlock_types_rt.h b/include/linux/rwlock_types_rt.h
+new file mode 100644
+index 000000000000..51b28d775fe1
+--- /dev/null
++++ b/include/linux/rwlock_types_rt.h
@@ -0,0 +1,33 @@
+#ifndef __LINUX_RWLOCK_TYPES_RT_H
+#define __LINUX_RWLOCK_TYPES_RT_H
@@ -8845,9 +9095,10 @@ diff -Nur linux-4.9.28.orig/include/linux/rwlock_types_rt.h linux-4.9.28/include
+ rwlock_t name = __RW_LOCK_UNLOCKED(name)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/rwsem.h linux-4.9.28/include/linux/rwsem.h
---- linux-4.9.28.orig/include/linux/rwsem.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/rwsem.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/rwsem.h b/include/linux/rwsem.h
+index dd1d14250340..aa2ac1f65c2d 100644
+--- a/include/linux/rwsem.h
++++ b/include/linux/rwsem.h
@@ -19,6 +19,10 @@
#include <linux/osq_lock.h>
#endif
@@ -8859,7 +9110,7 @@ diff -Nur linux-4.9.28.orig/include/linux/rwsem.h linux-4.9.28/include/linux/rws
struct rw_semaphore;
#ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
-@@ -106,6 +110,13 @@
+@@ -106,6 +110,13 @@ static inline int rwsem_is_contended(struct rw_semaphore *sem)
return !list_empty(&sem->wait_list);
}
@@ -8873,9 +9124,11 @@ diff -Nur linux-4.9.28.orig/include/linux/rwsem.h linux-4.9.28/include/linux/rws
/*
* lock for reading
*/
-diff -Nur linux-4.9.28.orig/include/linux/rwsem_rt.h linux-4.9.28/include/linux/rwsem_rt.h
---- linux-4.9.28.orig/include/linux/rwsem_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/rwsem_rt.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/rwsem_rt.h b/include/linux/rwsem_rt.h
+new file mode 100644
+index 000000000000..2ffbf093ae92
+--- /dev/null
++++ b/include/linux/rwsem_rt.h
@@ -0,0 +1,67 @@
+#ifndef _LINUX_RWSEM_RT_H
+#define _LINUX_RWSEM_RT_H
@@ -8944,49 +9197,11 @@ diff -Nur linux-4.9.28.orig/include/linux/rwsem_rt.h linux-4.9.28/include/linux/
+extern void __downgrade_write(struct rw_semaphore *sem);
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/sched/rt.h linux-4.9.28/include/linux/sched/rt.h
---- linux-4.9.28.orig/include/linux/sched/rt.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/sched/rt.h 2017-05-19 03:37:25.174176493 +0200
-@@ -16,27 +16,20 @@
- }
-
- #ifdef CONFIG_RT_MUTEXES
--extern int rt_mutex_getprio(struct task_struct *p);
--extern void rt_mutex_setprio(struct task_struct *p, int prio);
--extern int rt_mutex_get_effective_prio(struct task_struct *task, int newprio);
--extern struct task_struct *rt_mutex_get_top_task(struct task_struct *task);
-+/*
-+ * Must hold either p->pi_lock or task_rq(p)->lock.
-+ */
-+static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *p)
-+{
-+ return p->pi_top_task;
-+}
-+extern void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task);
- extern void rt_mutex_adjust_pi(struct task_struct *p);
- static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
- {
- return tsk->pi_blocked_on != NULL;
- }
- #else
--static inline int rt_mutex_getprio(struct task_struct *p)
--{
-- return p->normal_prio;
--}
--
--static inline int rt_mutex_get_effective_prio(struct task_struct *task,
-- int newprio)
--{
-- return newprio;
--}
--
- static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *task)
- {
- return NULL;
-diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sched.h
---- linux-4.9.28.orig/include/linux/sched.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/sched.h 2017-05-19 03:37:25.174176493 +0200
-@@ -26,6 +26,7 @@
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index f425eb3318ab..4d779486ad6b 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -26,6 +26,7 @@ struct sched_param {
#include <linux/nodemask.h>
#include <linux/mm_types.h>
#include <linux/preempt.h>
@@ -8994,7 +9209,14 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#include <asm/page.h>
#include <asm/ptrace.h>
-@@ -243,10 +244,7 @@
+@@ -236,17 +237,13 @@ extern char ___assert_task_state[1 - 2*!!(
+
+ /* Convenience macros for the sake of wake_up */
+ #define TASK_NORMAL (TASK_INTERRUPTIBLE | TASK_UNINTERRUPTIBLE)
+-#define TASK_ALL (TASK_NORMAL | __TASK_STOPPED | __TASK_TRACED)
+
+ /* get_task_state() */
+ #define TASK_REPORT (TASK_RUNNING | TASK_INTERRUPTIBLE | \
TASK_UNINTERRUPTIBLE | __TASK_STOPPED | \
__TASK_TRACED | EXIT_ZOMBIE | EXIT_DEAD)
@@ -9005,7 +9227,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#define task_contributes_to_load(task) \
((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
(task->flags & PF_FROZEN) == 0 && \
-@@ -312,6 +310,11 @@
+@@ -312,6 +309,11 @@ extern char ___assert_task_state[1 - 2*!!(
#endif
@@ -9017,7 +9239,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
/* Task command name length */
#define TASK_COMM_LEN 16
-@@ -1013,8 +1016,18 @@
+@@ -1013,8 +1015,18 @@ struct wake_q_head {
struct wake_q_head name = { WAKE_Q_TAIL, &name.first }
extern void wake_q_add(struct wake_q_head *head,
@@ -9038,7 +9260,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
/*
* sched-domains (multiprocessor balancing) declarations:
-@@ -1481,6 +1494,7 @@
+@@ -1481,6 +1493,7 @@ struct task_struct {
struct thread_info thread_info;
#endif
volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
@@ -9046,7 +9268,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
void *stack;
atomic_t usage;
unsigned int flags; /* per process flags, defined below */
-@@ -1520,6 +1534,12 @@
+@@ -1520,6 +1533,12 @@ struct task_struct {
#endif
unsigned int policy;
@@ -9059,7 +9281,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
int nr_cpus_allowed;
cpumask_t cpus_allowed;
-@@ -1658,6 +1678,9 @@
+@@ -1658,6 +1677,9 @@ struct task_struct {
struct task_cputime cputime_expires;
struct list_head cpu_timers[3];
@@ -9069,7 +9291,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
/* process credentials */
const struct cred __rcu *ptracer_cred; /* Tracer's credentials at attach */
-@@ -1689,10 +1712,15 @@
+@@ -1689,10 +1711,15 @@ struct task_struct {
/* signal handlers */
struct signal_struct *signal;
struct sighand_struct *sighand;
@@ -9085,7 +9307,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
unsigned long sas_ss_sp;
size_t sas_ss_size;
-@@ -1723,6 +1751,8 @@
+@@ -1723,6 +1750,8 @@ struct task_struct {
/* PI waiters blocked on a rt_mutex held by this task */
struct rb_root pi_waiters;
struct rb_node *pi_waiters_leftmost;
@@ -9094,7 +9316,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
/* Deadlock detection and priority inheritance handling */
struct rt_mutex_waiter *pi_blocked_on;
#endif
-@@ -1921,6 +1951,12 @@
+@@ -1921,6 +1950,12 @@ struct task_struct {
/* bitmask and counter of trace recursion */
unsigned long trace_recursion;
#endif /* CONFIG_TRACING */
@@ -9107,7 +9329,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#ifdef CONFIG_KCOV
/* Coverage collection mode enabled for this task (0 if disabled). */
enum kcov_mode kcov_mode;
-@@ -1946,9 +1982,23 @@
+@@ -1946,9 +1981,23 @@ struct task_struct {
unsigned int sequential_io;
unsigned int sequential_io_avg;
#endif
@@ -9131,7 +9353,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
int pagefault_disabled;
#ifdef CONFIG_MMU
struct task_struct *oom_reaper_list;
-@@ -1988,14 +2038,6 @@
+@@ -1988,14 +2037,6 @@ static inline struct vm_struct *task_stack_vm_area(const struct task_struct *t)
}
#endif
@@ -9146,7 +9368,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#define TNF_MIGRATED 0x01
#define TNF_NO_GROUP 0x02
#define TNF_SHARED 0x04
-@@ -2211,6 +2253,15 @@
+@@ -2211,6 +2252,15 @@ extern struct pid *cad_pid;
extern void free_task(struct task_struct *tsk);
#define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
@@ -9162,7 +9384,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
extern void __put_task_struct(struct task_struct *t);
static inline void put_task_struct(struct task_struct *t)
-@@ -2218,6 +2269,7 @@
+@@ -2218,6 +2268,7 @@ static inline void put_task_struct(struct task_struct *t)
if (atomic_dec_and_test(&t->usage))
__put_task_struct(t);
}
@@ -9170,7 +9392,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
struct task_struct *task_rcu_dereference(struct task_struct **ptask);
struct task_struct *try_get_task_struct(struct task_struct **ptask);
-@@ -2259,6 +2311,7 @@
+@@ -2259,6 +2310,7 @@ extern void thread_group_cputime_adjusted(struct task_struct *p, cputime_t *ut,
/*
* Per process flags
*/
@@ -9178,7 +9400,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#define PF_EXITING 0x00000004 /* getting shut down */
#define PF_EXITPIDONE 0x00000008 /* pi exit done on shut down */
#define PF_VCPU 0x00000010 /* I'm a virtual CPU */
-@@ -2427,6 +2480,10 @@
+@@ -2427,6 +2479,10 @@ extern void do_set_cpus_allowed(struct task_struct *p,
extern int set_cpus_allowed_ptr(struct task_struct *p,
const struct cpumask *new_mask);
@@ -9189,7 +9411,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#else
static inline void do_set_cpus_allowed(struct task_struct *p,
const struct cpumask *new_mask)
-@@ -2439,6 +2496,9 @@
+@@ -2439,6 +2495,9 @@ static inline int set_cpus_allowed_ptr(struct task_struct *p,
return -EINVAL;
return 0;
}
@@ -9199,7 +9421,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
#endif
#ifdef CONFIG_NO_HZ_COMMON
-@@ -2677,6 +2737,7 @@
+@@ -2677,6 +2736,7 @@ extern void xtime_update(unsigned long ticks);
extern int wake_up_state(struct task_struct *tsk, unsigned int state);
extern int wake_up_process(struct task_struct *tsk);
@@ -9207,7 +9429,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
extern void wake_up_new_task(struct task_struct *tsk);
#ifdef CONFIG_SMP
extern void kick_process(struct task_struct *tsk);
-@@ -2885,6 +2946,17 @@
+@@ -2885,6 +2945,17 @@ static inline void mmdrop(struct mm_struct *mm)
__mmdrop(mm);
}
@@ -9225,7 +9447,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
static inline void mmdrop_async_fn(struct work_struct *work)
{
struct mm_struct *mm = container_of(work, struct mm_struct, async_put_work);
-@@ -3277,6 +3349,43 @@
+@@ -3277,6 +3348,43 @@ static inline int test_tsk_need_resched(struct task_struct *tsk)
return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
}
@@ -9269,7 +9491,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
static inline int restart_syscall(void)
{
set_tsk_thread_flag(current, TIF_SIGPENDING);
-@@ -3308,6 +3417,51 @@
+@@ -3308,6 +3416,51 @@ static inline int signal_pending_state(long state, struct task_struct *p)
return (state & TASK_INTERRUPTIBLE) || __fatal_signal_pending(p);
}
@@ -9321,7 +9543,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
/*
* cond_resched() and cond_resched_lock(): latency reduction via
* explicit rescheduling in places that are safe. The return
-@@ -3333,12 +3487,16 @@
+@@ -3333,12 +3486,16 @@ extern int __cond_resched_lock(spinlock_t *lock);
__cond_resched_lock(lock); \
})
@@ -9338,7 +9560,7 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
static inline void cond_resched_rcu(void)
{
-@@ -3513,6 +3671,31 @@
+@@ -3513,6 +3670,31 @@ static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)
#endif /* CONFIG_SMP */
@@ -9370,10 +9592,51 @@ diff -Nur linux-4.9.28.orig/include/linux/sched.h linux-4.9.28/include/linux/sch
extern long sched_setaffinity(pid_t pid, const struct cpumask *new_mask);
extern long sched_getaffinity(pid_t pid, struct cpumask *mask);
-diff -Nur linux-4.9.28.orig/include/linux/seqlock.h linux-4.9.28/include/linux/seqlock.h
---- linux-4.9.28.orig/include/linux/seqlock.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/seqlock.h 2017-05-19 03:37:25.174176493 +0200
-@@ -220,20 +220,30 @@
+diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h
+index a30b172df6e1..db3e91f2bc03 100644
+--- a/include/linux/sched/rt.h
++++ b/include/linux/sched/rt.h
+@@ -16,27 +16,20 @@ static inline int rt_task(struct task_struct *p)
+ }
+
+ #ifdef CONFIG_RT_MUTEXES
+-extern int rt_mutex_getprio(struct task_struct *p);
+-extern void rt_mutex_setprio(struct task_struct *p, int prio);
+-extern int rt_mutex_get_effective_prio(struct task_struct *task, int newprio);
+-extern struct task_struct *rt_mutex_get_top_task(struct task_struct *task);
++/*
++ * Must hold either p->pi_lock or task_rq(p)->lock.
++ */
++static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *p)
++{
++ return p->pi_top_task;
++}
++extern void rt_mutex_setprio(struct task_struct *p, struct task_struct *pi_task);
+ extern void rt_mutex_adjust_pi(struct task_struct *p);
+ static inline bool tsk_is_pi_blocked(struct task_struct *tsk)
+ {
+ return tsk->pi_blocked_on != NULL;
+ }
+ #else
+-static inline int rt_mutex_getprio(struct task_struct *p)
+-{
+- return p->normal_prio;
+-}
+-
+-static inline int rt_mutex_get_effective_prio(struct task_struct *task,
+- int newprio)
+-{
+- return newprio;
+-}
+-
+ static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *task)
+ {
+ return NULL;
+diff --git a/include/linux/seqlock.h b/include/linux/seqlock.h
+index ead97654c4e9..3d7223ffdd3b 100644
+--- a/include/linux/seqlock.h
++++ b/include/linux/seqlock.h
+@@ -220,20 +220,30 @@ static inline int read_seqcount_retry(const seqcount_t *s, unsigned start)
return __read_seqcount_retry(s, start);
}
@@ -9408,7 +9671,7 @@ diff -Nur linux-4.9.28.orig/include/linux/seqlock.h linux-4.9.28/include/linux/s
/**
* raw_write_seqcount_barrier - do a seq write barrier
* @s: pointer to seqcount_t
-@@ -428,10 +438,32 @@
+@@ -428,10 +438,32 @@ typedef struct {
/*
* Read side functions for starting and finalizing a read side section.
*/
@@ -9441,7 +9704,7 @@ diff -Nur linux-4.9.28.orig/include/linux/seqlock.h linux-4.9.28/include/linux/s
static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
{
-@@ -446,36 +478,45 @@
+@@ -446,36 +478,45 @@ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
static inline void write_seqlock(seqlock_t *sl)
{
spin_lock(&sl->lock);
@@ -9493,7 +9756,7 @@ diff -Nur linux-4.9.28.orig/include/linux/seqlock.h linux-4.9.28/include/linux/s
spin_unlock_irq(&sl->lock);
}
-@@ -484,7 +525,7 @@
+@@ -484,7 +525,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
unsigned long flags;
spin_lock_irqsave(&sl->lock, flags);
@@ -9502,7 +9765,7 @@ diff -Nur linux-4.9.28.orig/include/linux/seqlock.h linux-4.9.28/include/linux/s
return flags;
}
-@@ -494,7 +535,7 @@
+@@ -494,7 +535,7 @@ static inline unsigned long __write_seqlock_irqsave(seqlock_t *sl)
static inline void
write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
{
@@ -9511,10 +9774,11 @@ diff -Nur linux-4.9.28.orig/include/linux/seqlock.h linux-4.9.28/include/linux/s
spin_unlock_irqrestore(&sl->lock, flags);
}
-diff -Nur linux-4.9.28.orig/include/linux/signal.h linux-4.9.28/include/linux/signal.h
---- linux-4.9.28.orig/include/linux/signal.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/signal.h 2017-05-19 03:37:25.174176493 +0200
-@@ -233,6 +233,7 @@
+diff --git a/include/linux/signal.h b/include/linux/signal.h
+index b63f63eaa39c..295540fdfc72 100644
+--- a/include/linux/signal.h
++++ b/include/linux/signal.h
+@@ -233,6 +233,7 @@ static inline void init_sigpending(struct sigpending *sig)
}
extern void flush_sigqueue(struct sigpending *queue);
@@ -9522,10 +9786,11 @@ diff -Nur linux-4.9.28.orig/include/linux/signal.h linux-4.9.28/include/linux/si
/* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
static inline int valid_signal(unsigned long sig)
-diff -Nur linux-4.9.28.orig/include/linux/skbuff.h linux-4.9.28/include/linux/skbuff.h
---- linux-4.9.28.orig/include/linux/skbuff.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/skbuff.h 2017-05-19 03:37:25.174176493 +0200
-@@ -284,6 +284,7 @@
+diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
+index 32810f279f8e..0db6e31161f6 100644
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -284,6 +284,7 @@ struct sk_buff_head {
__u32 qlen;
spinlock_t lock;
@@ -9533,7 +9798,7 @@ diff -Nur linux-4.9.28.orig/include/linux/skbuff.h linux-4.9.28/include/linux/sk
};
struct sk_buff;
-@@ -1573,6 +1574,12 @@
+@@ -1573,6 +1574,12 @@ static inline void skb_queue_head_init(struct sk_buff_head *list)
__skb_queue_head_init(list);
}
@@ -9546,10 +9811,11 @@ diff -Nur linux-4.9.28.orig/include/linux/skbuff.h linux-4.9.28/include/linux/sk
static inline void skb_queue_head_init_class(struct sk_buff_head *list,
struct lock_class_key *class)
{
-diff -Nur linux-4.9.28.orig/include/linux/smp.h linux-4.9.28/include/linux/smp.h
---- linux-4.9.28.orig/include/linux/smp.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/smp.h 2017-05-19 03:37:25.174176493 +0200
-@@ -120,6 +120,13 @@
+diff --git a/include/linux/smp.h b/include/linux/smp.h
+index 8e0cb7a0f836..891c533724f5 100644
+--- a/include/linux/smp.h
++++ b/include/linux/smp.h
+@@ -120,6 +120,13 @@ extern unsigned int setup_max_cpus;
extern void __init setup_nr_cpu_ids(void);
extern void __init smp_init(void);
@@ -9563,7 +9829,7 @@ diff -Nur linux-4.9.28.orig/include/linux/smp.h linux-4.9.28/include/linux/smp.h
#else /* !SMP */
static inline void smp_send_stop(void) { }
-@@ -158,6 +165,11 @@
+@@ -158,6 +165,11 @@ static inline void smp_init(void) { up_late_init(); }
static inline void smp_init(void) { }
#endif
@@ -9575,7 +9841,7 @@ diff -Nur linux-4.9.28.orig/include/linux/smp.h linux-4.9.28/include/linux/smp.h
#endif /* !SMP */
/*
-@@ -185,6 +197,9 @@
+@@ -185,6 +197,9 @@ static inline void smp_init(void) { }
#define get_cpu() ({ preempt_disable(); smp_processor_id(); })
#define put_cpu() preempt_enable()
@@ -9585,23 +9851,11 @@ diff -Nur linux-4.9.28.orig/include/linux/smp.h linux-4.9.28/include/linux/smp.h
/*
* Callback to arch code if there's nosmp or maxcpus=0 on the
* boot command line:
-diff -Nur linux-4.9.28.orig/include/linux/spinlock_api_smp.h linux-4.9.28/include/linux/spinlock_api_smp.h
---- linux-4.9.28.orig/include/linux/spinlock_api_smp.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/spinlock_api_smp.h 2017-05-19 03:37:25.174176493 +0200
-@@ -189,6 +189,8 @@
- return 0;
- }
-
--#include <linux/rwlock_api_smp.h>
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# include <linux/rwlock_api_smp.h>
-+#endif
-
- #endif /* __LINUX_SPINLOCK_API_SMP_H */
-diff -Nur linux-4.9.28.orig/include/linux/spinlock.h linux-4.9.28/include/linux/spinlock.h
---- linux-4.9.28.orig/include/linux/spinlock.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/spinlock.h 2017-05-19 03:37:25.174176493 +0200
-@@ -271,7 +271,11 @@
+diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h
+index 47dd0cebd204..b241cc044bd3 100644
+--- a/include/linux/spinlock.h
++++ b/include/linux/spinlock.h
+@@ -271,7 +271,11 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
#define raw_spin_can_lock(lock) (!raw_spin_is_locked(lock))
/* Include rwlock functions */
@@ -9614,7 +9868,7 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock.h linux-4.9.28/include/linux/
/*
* Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
-@@ -282,6 +286,10 @@
+@@ -282,6 +286,10 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock)
# include <linux/spinlock_api_up.h>
#endif
@@ -9625,16 +9879,32 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock.h linux-4.9.28/include/linux/
/*
* Map the spin_lock functions to the raw variants for PREEMPT_RT=n
*/
-@@ -416,4 +424,6 @@
+@@ -416,4 +424,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock);
#define atomic_dec_and_lock(atomic, lock) \
__cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
+#endif /* !PREEMPT_RT_FULL */
+
#endif /* __LINUX_SPINLOCK_H */
-diff -Nur linux-4.9.28.orig/include/linux/spinlock_rt.h linux-4.9.28/include/linux/spinlock_rt.h
---- linux-4.9.28.orig/include/linux/spinlock_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/spinlock_rt.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/spinlock_api_smp.h b/include/linux/spinlock_api_smp.h
+index 5344268e6e62..043263f30e81 100644
+--- a/include/linux/spinlock_api_smp.h
++++ b/include/linux/spinlock_api_smp.h
+@@ -189,6 +189,8 @@ static inline int __raw_spin_trylock_bh(raw_spinlock_t *lock)
+ return 0;
+ }
+
+-#include <linux/rwlock_api_smp.h>
++#ifndef CONFIG_PREEMPT_RT_FULL
++# include <linux/rwlock_api_smp.h>
++#endif
+
+ #endif /* __LINUX_SPINLOCK_API_SMP_H */
+diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h
+new file mode 100644
+index 000000000000..43ca841b913a
+--- /dev/null
++++ b/include/linux/spinlock_rt.h
@@ -0,0 +1,162 @@
+#ifndef __LINUX_SPINLOCK_RT_H
+#define __LINUX_SPINLOCK_RT_H
@@ -9798,19 +10068,28 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock_rt.h linux-4.9.28/include/lin
+ atomic_dec_and_spin_lock(atomic, lock)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/spinlock_types.h linux-4.9.28/include/linux/spinlock_types.h
---- linux-4.9.28.orig/include/linux/spinlock_types.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/spinlock_types.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/spinlock_types.h b/include/linux/spinlock_types.h
+index 73548eb13a5d..10bac715ea96 100644
+--- a/include/linux/spinlock_types.h
++++ b/include/linux/spinlock_types.h
@@ -9,80 +9,15 @@
* Released under the General Public License (GPL).
*/
-#if defined(CONFIG_SMP)
-# include <asm/spinlock_types.h>
--#else
++#include <linux/spinlock_types_raw.h>
++
++#ifndef CONFIG_PREEMPT_RT_FULL
++# include <linux/spinlock_types_nort.h>
++# include <linux/rwlock_types.h>
+ #else
-# include <linux/spinlock_types_up.h>
--#endif
--
++# include <linux/rtmutex.h>
++# include <linux/spinlock_types_rt.h>
++# include <linux/rwlock_types_rt.h>
+ #endif
+
-#include <linux/lockdep.h>
-
-typedef struct raw_spinlock {
@@ -9836,23 +10115,16 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock_types.h linux-4.9.28/include/
-#else
-# define SPIN_DEP_MAP_INIT(lockname)
-#endif
-+#include <linux/spinlock_types_raw.h>
-
+-
-#ifdef CONFIG_DEBUG_SPINLOCK
-# define SPIN_DEBUG_INIT(lockname) \
- .magic = SPINLOCK_MAGIC, \
- .owner_cpu = -1, \
- .owner = SPINLOCK_OWNER_INIT,
-+#ifndef CONFIG_PREEMPT_RT_FULL
-+# include <linux/spinlock_types_nort.h>
-+# include <linux/rwlock_types.h>
- #else
+-#else
-# define SPIN_DEBUG_INIT(lockname)
-+# include <linux/rtmutex.h>
-+# include <linux/spinlock_types_rt.h>
-+# include <linux/rwlock_types_rt.h>
- #endif
-
+-#endif
+-
-#define __RAW_SPIN_LOCK_INITIALIZER(lockname) \
- { \
- .raw_lock = __ARCH_SPIN_LOCK_UNLOCKED, \
@@ -9889,9 +10161,11 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock_types.h linux-4.9.28/include/
-#include <linux/rwlock_types.h>
-
#endif /* __LINUX_SPINLOCK_TYPES_H */
-diff -Nur linux-4.9.28.orig/include/linux/spinlock_types_nort.h linux-4.9.28/include/linux/spinlock_types_nort.h
---- linux-4.9.28.orig/include/linux/spinlock_types_nort.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/spinlock_types_nort.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/spinlock_types_nort.h b/include/linux/spinlock_types_nort.h
+new file mode 100644
+index 000000000000..f1dac1fb1d6a
+--- /dev/null
++++ b/include/linux/spinlock_types_nort.h
@@ -0,0 +1,33 @@
+#ifndef __LINUX_SPINLOCK_TYPES_NORT_H
+#define __LINUX_SPINLOCK_TYPES_NORT_H
@@ -9926,9 +10200,11 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock_types_nort.h linux-4.9.28/inc
+#define DEFINE_SPINLOCK(x) spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/spinlock_types_raw.h linux-4.9.28/include/linux/spinlock_types_raw.h
---- linux-4.9.28.orig/include/linux/spinlock_types_raw.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/spinlock_types_raw.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/spinlock_types_raw.h b/include/linux/spinlock_types_raw.h
+new file mode 100644
+index 000000000000..edffc4d53fc9
+--- /dev/null
++++ b/include/linux/spinlock_types_raw.h
@@ -0,0 +1,56 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
+#define __LINUX_SPINLOCK_TYPES_RAW_H
@@ -9986,9 +10262,11 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock_types_raw.h linux-4.9.28/incl
+#define DEFINE_RAW_SPINLOCK(x) raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/spinlock_types_rt.h linux-4.9.28/include/linux/spinlock_types_rt.h
---- linux-4.9.28.orig/include/linux/spinlock_types_rt.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/spinlock_types_rt.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/spinlock_types_rt.h b/include/linux/spinlock_types_rt.h
+new file mode 100644
+index 000000000000..3e3d8c5f7a9a
+--- /dev/null
++++ b/include/linux/spinlock_types_rt.h
@@ -0,0 +1,48 @@
+#ifndef __LINUX_SPINLOCK_TYPES_RT_H
+#define __LINUX_SPINLOCK_TYPES_RT_H
@@ -10038,10 +10316,11 @@ diff -Nur linux-4.9.28.orig/include/linux/spinlock_types_rt.h linux-4.9.28/inclu
+ spinlock_t name = __SPIN_LOCK_UNLOCKED(name)
+
+#endif
-diff -Nur linux-4.9.28.orig/include/linux/srcu.h linux-4.9.28/include/linux/srcu.h
---- linux-4.9.28.orig/include/linux/srcu.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/srcu.h 2017-05-19 03:37:25.174176493 +0200
-@@ -84,10 +84,10 @@
+diff --git a/include/linux/srcu.h b/include/linux/srcu.h
+index dc8eb63c6568..e793d3a257da 100644
+--- a/include/linux/srcu.h
++++ b/include/linux/srcu.h
+@@ -84,10 +84,10 @@ int init_srcu_struct(struct srcu_struct *sp);
void process_srcu(struct work_struct *work);
@@ -10054,7 +10333,7 @@ diff -Nur linux-4.9.28.orig/include/linux/srcu.h linux-4.9.28/include/linux/srcu
.queue_lock = __SPIN_LOCK_UNLOCKED(name.queue_lock), \
.running = false, \
.batch_queue = RCU_BATCH_INIT(name.batch_queue), \
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ void process_srcu(struct work_struct *work);
*/
#define __DEFINE_SRCU(name, is_static) \
static DEFINE_PER_CPU(struct srcu_struct_array, name##_srcu_array);\
@@ -10063,10 +10342,11 @@ diff -Nur linux-4.9.28.orig/include/linux/srcu.h linux-4.9.28/include/linux/srcu
#define DEFINE_SRCU(name) __DEFINE_SRCU(name, /* not static */)
#define DEFINE_STATIC_SRCU(name) __DEFINE_SRCU(name, static)
-diff -Nur linux-4.9.28.orig/include/linux/suspend.h linux-4.9.28/include/linux/suspend.h
---- linux-4.9.28.orig/include/linux/suspend.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/suspend.h 2017-05-19 03:37:25.174176493 +0200
-@@ -193,6 +193,12 @@
+diff --git a/include/linux/suspend.h b/include/linux/suspend.h
+index d9718378a8be..e81e6dc7dcb1 100644
+--- a/include/linux/suspend.h
++++ b/include/linux/suspend.h
+@@ -193,6 +193,12 @@ struct platform_freeze_ops {
void (*end)(void);
};
@@ -10079,10 +10359,11 @@ diff -Nur linux-4.9.28.orig/include/linux/suspend.h linux-4.9.28/include/linux/s
#ifdef CONFIG_SUSPEND
/**
* suspend_set_ops - set platform dependent suspend operations
-diff -Nur linux-4.9.28.orig/include/linux/swait.h linux-4.9.28/include/linux/swait.h
---- linux-4.9.28.orig/include/linux/swait.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/swait.h 2017-05-19 03:37:25.174176493 +0200
-@@ -87,6 +87,7 @@
+diff --git a/include/linux/swait.h b/include/linux/swait.h
+index c1f9c62a8a50..83f004a72320 100644
+--- a/include/linux/swait.h
++++ b/include/linux/swait.h
+@@ -87,6 +87,7 @@ static inline int swait_active(struct swait_queue_head *q)
extern void swake_up(struct swait_queue_head *q);
extern void swake_up_all(struct swait_queue_head *q);
extern void swake_up_locked(struct swait_queue_head *q);
@@ -10090,9 +10371,10 @@ diff -Nur linux-4.9.28.orig/include/linux/swait.h linux-4.9.28/include/linux/swa
extern void __prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait);
extern void prepare_to_swait(struct swait_queue_head *q, struct swait_queue *wait, int state);
-diff -Nur linux-4.9.28.orig/include/linux/swap.h linux-4.9.28/include/linux/swap.h
---- linux-4.9.28.orig/include/linux/swap.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/swap.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/swap.h b/include/linux/swap.h
+index 55ff5593c193..52bf5477dc92 100644
+--- a/include/linux/swap.h
++++ b/include/linux/swap.h
@@ -11,6 +11,7 @@
#include <linux/fs.h>
#include <linux/atomic.h>
@@ -10101,7 +10383,7 @@ diff -Nur linux-4.9.28.orig/include/linux/swap.h linux-4.9.28/include/linux/swap
#include <asm/page.h>
struct notifier_block;
-@@ -247,7 +248,8 @@
+@@ -247,7 +248,8 @@ struct swap_info_struct {
void *workingset_eviction(struct address_space *mapping, struct page *page);
bool workingset_refault(void *shadow);
void workingset_activation(struct page *page);
@@ -10111,7 +10393,7 @@ diff -Nur linux-4.9.28.orig/include/linux/swap.h linux-4.9.28/include/linux/swap
static inline unsigned int workingset_node_pages(struct radix_tree_node *node)
{
-@@ -292,6 +294,7 @@
+@@ -292,6 +294,7 @@ extern unsigned long nr_free_pagecache_pages(void);
/* linux/mm/swap.c */
@@ -10119,9 +10401,11 @@ diff -Nur linux-4.9.28.orig/include/linux/swap.h linux-4.9.28/include/linux/swap
extern void lru_cache_add(struct page *);
extern void lru_cache_add_anon(struct page *page);
extern void lru_cache_add_file(struct page *page);
-diff -Nur linux-4.9.28.orig/include/linux/swork.h linux-4.9.28/include/linux/swork.h
---- linux-4.9.28.orig/include/linux/swork.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/linux/swork.h 2017-05-19 03:37:25.174176493 +0200
+diff --git a/include/linux/swork.h b/include/linux/swork.h
+new file mode 100644
+index 000000000000..f175fa9a6016
+--- /dev/null
++++ b/include/linux/swork.h
@@ -0,0 +1,24 @@
+#ifndef _LINUX_SWORK_H
+#define _LINUX_SWORK_H
@@ -10147,10 +10431,11 @@ diff -Nur linux-4.9.28.orig/include/linux/swork.h linux-4.9.28/include/linux/swo
+void swork_put(void);
+
+#endif /* _LINUX_SWORK_H */
-diff -Nur linux-4.9.28.orig/include/linux/thread_info.h linux-4.9.28/include/linux/thread_info.h
---- linux-4.9.28.orig/include/linux/thread_info.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/thread_info.h 2017-05-19 03:37:25.174176493 +0200
-@@ -107,7 +107,17 @@
+diff --git a/include/linux/thread_info.h b/include/linux/thread_info.h
+index 2873baf5372a..eb1a108f17ca 100644
+--- a/include/linux/thread_info.h
++++ b/include/linux/thread_info.h
+@@ -107,7 +107,17 @@ static inline int test_ti_thread_flag(struct thread_info *ti, int flag)
#define test_thread_flag(flag) \
test_ti_thread_flag(current_thread_info(), flag)
@@ -10169,10 +10454,11 @@ diff -Nur linux-4.9.28.orig/include/linux/thread_info.h linux-4.9.28/include/lin
#ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
static inline int arch_within_stack_frames(const void * const stack,
-diff -Nur linux-4.9.28.orig/include/linux/timer.h linux-4.9.28/include/linux/timer.h
---- linux-4.9.28.orig/include/linux/timer.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/timer.h 2017-05-19 03:37:25.174176493 +0200
-@@ -241,7 +241,7 @@
+diff --git a/include/linux/timer.h b/include/linux/timer.h
+index 51d601f192d4..83cea629efe1 100644
+--- a/include/linux/timer.h
++++ b/include/linux/timer.h
+@@ -241,7 +241,7 @@ extern void add_timer(struct timer_list *timer);
extern int try_to_del_timer_sync(struct timer_list *timer);
@@ -10181,10 +10467,11 @@ diff -Nur linux-4.9.28.orig/include/linux/timer.h linux-4.9.28/include/linux/tim
extern int del_timer_sync(struct timer_list *timer);
#else
# define del_timer_sync(t) del_timer(t)
-diff -Nur linux-4.9.28.orig/include/linux/trace_events.h linux-4.9.28/include/linux/trace_events.h
---- linux-4.9.28.orig/include/linux/trace_events.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/trace_events.h 2017-05-19 03:37:25.174176493 +0200
-@@ -56,6 +56,9 @@
+diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h
+index be007610ceb0..15154b13a53b 100644
+--- a/include/linux/trace_events.h
++++ b/include/linux/trace_events.h
+@@ -56,6 +56,9 @@ struct trace_entry {
unsigned char flags;
unsigned char preempt_count;
int pid;
@@ -10194,10 +10481,11 @@ diff -Nur linux-4.9.28.orig/include/linux/trace_events.h linux-4.9.28/include/li
};
#define TRACE_EVENT_TYPE_MAX \
-diff -Nur linux-4.9.28.orig/include/linux/uaccess.h linux-4.9.28/include/linux/uaccess.h
---- linux-4.9.28.orig/include/linux/uaccess.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/uaccess.h 2017-05-19 03:37:25.178176648 +0200
-@@ -24,6 +24,7 @@
+diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h
+index f30c187ed785..83bf0f798426 100644
+--- a/include/linux/uaccess.h
++++ b/include/linux/uaccess.h
+@@ -24,6 +24,7 @@ static __always_inline void pagefault_disabled_dec(void)
*/
static inline void pagefault_disable(void)
{
@@ -10205,7 +10493,7 @@ diff -Nur linux-4.9.28.orig/include/linux/uaccess.h linux-4.9.28/include/linux/u
pagefault_disabled_inc();
/*
* make sure to have issued the store before a pagefault
-@@ -40,6 +41,7 @@
+@@ -40,6 +41,7 @@ static inline void pagefault_enable(void)
*/
barrier();
pagefault_disabled_dec();
@@ -10213,9 +10501,10 @@ diff -Nur linux-4.9.28.orig/include/linux/uaccess.h linux-4.9.28/include/linux/u
}
/*
-diff -Nur linux-4.9.28.orig/include/linux/uprobes.h linux-4.9.28/include/linux/uprobes.h
---- linux-4.9.28.orig/include/linux/uprobes.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/uprobes.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/linux/uprobes.h b/include/linux/uprobes.h
+index 4a29c75b146e..0a294e950df8 100644
+--- a/include/linux/uprobes.h
++++ b/include/linux/uprobes.h
@@ -27,6 +27,7 @@
#include <linux/errno.h>
#include <linux/rbtree.h>
@@ -10224,10 +10513,11 @@ diff -Nur linux-4.9.28.orig/include/linux/uprobes.h linux-4.9.28/include/linux/u
struct vm_area_struct;
struct mm_struct;
-diff -Nur linux-4.9.28.orig/include/linux/vmstat.h linux-4.9.28/include/linux/vmstat.h
---- linux-4.9.28.orig/include/linux/vmstat.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/vmstat.h 2017-05-19 03:37:25.178176648 +0200
-@@ -33,7 +33,9 @@
+diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
+index 613771909b6e..e28c5a43229d 100644
+--- a/include/linux/vmstat.h
++++ b/include/linux/vmstat.h
+@@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, vm_event_states);
*/
static inline void __count_vm_event(enum vm_event_item item)
{
@@ -10237,7 +10527,7 @@ diff -Nur linux-4.9.28.orig/include/linux/vmstat.h linux-4.9.28/include/linux/vm
}
static inline void count_vm_event(enum vm_event_item item)
-@@ -43,7 +45,9 @@
+@@ -43,7 +45,9 @@ static inline void count_vm_event(enum vm_event_item item)
static inline void __count_vm_events(enum vm_event_item item, long delta)
{
@@ -10247,9 +10537,10 @@ diff -Nur linux-4.9.28.orig/include/linux/vmstat.h linux-4.9.28/include/linux/vm
}
static inline void count_vm_events(enum vm_event_item item, long delta)
-diff -Nur linux-4.9.28.orig/include/linux/wait.h linux-4.9.28/include/linux/wait.h
---- linux-4.9.28.orig/include/linux/wait.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/linux/wait.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/linux/wait.h b/include/linux/wait.h
+index 2408e8d5c05c..db50d6609195 100644
+--- a/include/linux/wait.h
++++ b/include/linux/wait.h
@@ -8,6 +8,7 @@
#include <linux/spinlock.h>
#include <asm/current.h>
@@ -10258,10 +10549,11 @@ diff -Nur linux-4.9.28.orig/include/linux/wait.h linux-4.9.28/include/linux/wait
typedef struct __wait_queue wait_queue_t;
typedef int (*wait_queue_func_t)(wait_queue_t *wait, unsigned mode, int flags, void *key);
-diff -Nur linux-4.9.28.orig/include/net/dst.h linux-4.9.28/include/net/dst.h
---- linux-4.9.28.orig/include/net/dst.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/net/dst.h 2017-05-19 03:37:25.178176648 +0200
-@@ -446,7 +446,7 @@
+diff --git a/include/net/dst.h b/include/net/dst.h
+index 6835d224d47b..55a5a9698f14 100644
+--- a/include/net/dst.h
++++ b/include/net/dst.h
+@@ -446,7 +446,7 @@ static inline void dst_confirm(struct dst_entry *dst)
static inline int dst_neigh_output(struct dst_entry *dst, struct neighbour *n,
struct sk_buff *skb)
{
@@ -10270,9 +10562,10 @@ diff -Nur linux-4.9.28.orig/include/net/dst.h linux-4.9.28/include/net/dst.h
if (dst->pending_confirm) {
unsigned long now = jiffies;
-diff -Nur linux-4.9.28.orig/include/net/gen_stats.h linux-4.9.28/include/net/gen_stats.h
---- linux-4.9.28.orig/include/net/gen_stats.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/net/gen_stats.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/net/gen_stats.h b/include/net/gen_stats.h
+index 231e121cc7d9..d125222b979d 100644
+--- a/include/net/gen_stats.h
++++ b/include/net/gen_stats.h
@@ -5,6 +5,7 @@
#include <linux/socket.h>
#include <linux/rtnetlink.h>
@@ -10281,7 +10574,7 @@ diff -Nur linux-4.9.28.orig/include/net/gen_stats.h linux-4.9.28/include/net/gen
struct gnet_stats_basic_cpu {
struct gnet_stats_basic_packed bstats;
-@@ -33,11 +34,11 @@
+@@ -33,11 +34,11 @@ int gnet_stats_start_copy_compat(struct sk_buff *skb, int type,
spinlock_t *lock, struct gnet_dump *d,
int padattr);
@@ -10295,7 +10588,7 @@ diff -Nur linux-4.9.28.orig/include/net/gen_stats.h linux-4.9.28/include/net/gen
struct gnet_stats_basic_packed *bstats,
struct gnet_stats_basic_cpu __percpu *cpu,
struct gnet_stats_basic_packed *b);
-@@ -55,14 +56,14 @@
+@@ -55,14 +56,14 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
struct gnet_stats_basic_cpu __percpu *cpu_bstats,
struct gnet_stats_rate_est64 *rate_est,
spinlock_t *stats_lock,
@@ -10312,10 +10605,11 @@ diff -Nur linux-4.9.28.orig/include/net/gen_stats.h linux-4.9.28/include/net/gen
bool gen_estimator_active(const struct gnet_stats_basic_packed *bstats,
const struct gnet_stats_rate_est64 *rate_est);
#endif
-diff -Nur linux-4.9.28.orig/include/net/neighbour.h linux-4.9.28/include/net/neighbour.h
---- linux-4.9.28.orig/include/net/neighbour.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/net/neighbour.h 2017-05-19 03:37:25.178176648 +0200
-@@ -446,7 +446,7 @@
+diff --git a/include/net/neighbour.h b/include/net/neighbour.h
+index 8b683841e574..bf656008f6e7 100644
+--- a/include/net/neighbour.h
++++ b/include/net/neighbour.h
+@@ -446,7 +446,7 @@ static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
}
#endif
@@ -10324,7 +10618,7 @@ diff -Nur linux-4.9.28.orig/include/net/neighbour.h linux-4.9.28/include/net/nei
{
unsigned int seq;
int hh_len;
-@@ -501,7 +501,7 @@
+@@ -501,7 +501,7 @@ struct neighbour_cb {
#define NEIGH_CB(skb) ((struct neighbour_cb *)(skb)->cb)
@@ -10333,20 +10627,11 @@ diff -Nur linux-4.9.28.orig/include/net/neighbour.h linux-4.9.28/include/net/nei
const struct net_device *dev)
{
unsigned int seq;
-diff -Nur linux-4.9.28.orig/include/net/netns/ipv4.h linux-4.9.28/include/net/netns/ipv4.h
---- linux-4.9.28.orig/include/net/netns/ipv4.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/net/netns/ipv4.h 2017-05-19 03:37:25.178176648 +0200
-@@ -69,6 +69,7 @@
-
- int sysctl_icmp_echo_ignore_all;
- int sysctl_icmp_echo_ignore_broadcasts;
-+ int sysctl_icmp_echo_sysrq;
- int sysctl_icmp_ignore_bogus_error_responses;
- int sysctl_icmp_ratelimit;
- int sysctl_icmp_ratemask;
-diff -Nur linux-4.9.28.orig/include/net/net_seq_lock.h linux-4.9.28/include/net/net_seq_lock.h
---- linux-4.9.28.orig/include/net/net_seq_lock.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/net/net_seq_lock.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/net/net_seq_lock.h b/include/net/net_seq_lock.h
+new file mode 100644
+index 000000000000..a7034298a82a
+--- /dev/null
++++ b/include/net/net_seq_lock.h
@@ -0,0 +1,15 @@
+#ifndef __NET_NET_SEQ_LOCK_H__
+#define __NET_NET_SEQ_LOCK_H__
@@ -10363,9 +10648,22 @@ diff -Nur linux-4.9.28.orig/include/net/net_seq_lock.h linux-4.9.28/include/net/
+#endif
+
+#endif
-diff -Nur linux-4.9.28.orig/include/net/sch_generic.h linux-4.9.28/include/net/sch_generic.h
---- linux-4.9.28.orig/include/net/sch_generic.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/net/sch_generic.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/net/netns/ipv4.h b/include/net/netns/ipv4.h
+index 7adf4386ac8f..d3fd5c357268 100644
+--- a/include/net/netns/ipv4.h
++++ b/include/net/netns/ipv4.h
+@@ -69,6 +69,7 @@ struct netns_ipv4 {
+
+ int sysctl_icmp_echo_ignore_all;
+ int sysctl_icmp_echo_ignore_broadcasts;
++ int sysctl_icmp_echo_sysrq;
+ int sysctl_icmp_ignore_bogus_error_responses;
+ int sysctl_icmp_ratelimit;
+ int sysctl_icmp_ratemask;
+diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h
+index e6aa0a249672..b57736f2a8a3 100644
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
@@ -10,6 +10,7 @@
#include <linux/dynamic_queue_limits.h>
#include <net/gen_stats.h>
@@ -10374,7 +10672,7 @@ diff -Nur linux-4.9.28.orig/include/net/sch_generic.h linux-4.9.28/include/net/s
struct Qdisc_ops;
struct qdisc_walker;
-@@ -86,7 +87,7 @@
+@@ -86,7 +87,7 @@ struct Qdisc {
struct sk_buff *gso_skb ____cacheline_aligned_in_smp;
struct qdisc_skb_head q;
struct gnet_stats_basic_packed bstats;
@@ -10383,7 +10681,7 @@ diff -Nur linux-4.9.28.orig/include/net/sch_generic.h linux-4.9.28/include/net/s
struct gnet_stats_queue qstats;
unsigned long state;
struct Qdisc *next_sched;
-@@ -98,13 +99,22 @@
+@@ -98,13 +99,22 @@ struct Qdisc {
spinlock_t busylock ____cacheline_aligned_in_smp;
};
@@ -10407,7 +10705,7 @@ diff -Nur linux-4.9.28.orig/include/net/sch_generic.h linux-4.9.28/include/net/s
if (qdisc_is_running(qdisc))
return false;
/* Variant of write_seqcount_begin() telling lockdep a trylock
-@@ -113,11 +123,16 @@
+@@ -113,11 +123,16 @@ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
raw_write_seqcount_begin(&qdisc->running);
seqcount_acquire(&qdisc->running.dep_map, 0, 1, _RET_IP_);
return true;
@@ -10424,7 +10722,7 @@ diff -Nur linux-4.9.28.orig/include/net/sch_generic.h linux-4.9.28/include/net/s
}
static inline bool qdisc_may_bulk(const struct Qdisc *qdisc)
-@@ -308,7 +323,7 @@
+@@ -308,7 +323,7 @@ static inline spinlock_t *qdisc_root_sleeping_lock(const struct Qdisc *qdisc)
return qdisc_lock(root);
}
@@ -10433,9 +10731,11 @@ diff -Nur linux-4.9.28.orig/include/net/sch_generic.h linux-4.9.28/include/net/s
{
struct Qdisc *root = qdisc_root_sleeping(qdisc);
-diff -Nur linux-4.9.28.orig/include/trace/events/hist.h linux-4.9.28/include/trace/events/hist.h
---- linux-4.9.28.orig/include/trace/events/hist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/trace/events/hist.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/trace/events/hist.h b/include/trace/events/hist.h
+new file mode 100644
+index 000000000000..f7710de1b1f3
+--- /dev/null
++++ b/include/trace/events/hist.h
@@ -0,0 +1,73 @@
+#undef TRACE_SYSTEM
+#define TRACE_SYSTEM hist
@@ -10510,9 +10810,11 @@ diff -Nur linux-4.9.28.orig/include/trace/events/hist.h linux-4.9.28/include/tra
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
-diff -Nur linux-4.9.28.orig/include/trace/events/latency_hist.h linux-4.9.28/include/trace/events/latency_hist.h
---- linux-4.9.28.orig/include/trace/events/latency_hist.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/include/trace/events/latency_hist.h 2017-05-19 03:37:25.178176648 +0200
+diff --git a/include/trace/events/latency_hist.h b/include/trace/events/latency_hist.h
+new file mode 100644
+index 000000000000..d3f2fbd560b1
+--- /dev/null
++++ b/include/trace/events/latency_hist.h
@@ -0,0 +1,29 @@
+#ifndef _LATENCY_HIST_H
+#define _LATENCY_HIST_H
@@ -10543,10 +10845,11 @@ diff -Nur linux-4.9.28.orig/include/trace/events/latency_hist.h linux-4.9.28/inc
+}
+
+#endif /* _LATENCY_HIST_H */
-diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/trace/events/sched.h
---- linux-4.9.28.orig/include/trace/events/sched.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/include/trace/events/sched.h 2017-05-19 03:37:25.178176648 +0200
-@@ -70,7 +70,7 @@
+diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
+index 9b90c57517a9..516ae88cddf4 100644
+--- a/include/trace/events/sched.h
++++ b/include/trace/events/sched.h
+@@ -70,7 +70,7 @@ DECLARE_EVENT_CLASS(sched_wakeup_template,
TP_fast_assign(
memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
__entry->pid = p->pid;
@@ -10555,7 +10858,7 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
__entry->success = 1; /* rudiment, kill when possible */
__entry->target_cpu = task_cpu(p);
),
-@@ -147,6 +147,7 @@
+@@ -147,6 +147,7 @@ TRACE_EVENT(sched_switch,
memcpy(__entry->prev_comm, prev->comm, TASK_COMM_LEN);
__entry->next_pid = next->pid;
__entry->next_prio = next->prio;
@@ -10563,7 +10866,7 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
),
TP_printk("prev_comm=%s prev_pid=%d prev_prio=%d prev_state=%s%s ==> next_comm=%s next_pid=%d next_prio=%d",
-@@ -181,7 +182,7 @@
+@@ -181,7 +182,7 @@ TRACE_EVENT(sched_migrate_task,
TP_fast_assign(
memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
__entry->pid = p->pid;
@@ -10572,7 +10875,7 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
__entry->orig_cpu = task_cpu(p);
__entry->dest_cpu = dest_cpu;
),
-@@ -206,7 +207,7 @@
+@@ -206,7 +207,7 @@ DECLARE_EVENT_CLASS(sched_process_template,
TP_fast_assign(
memcpy(__entry->comm, p->comm, TASK_COMM_LEN);
__entry->pid = p->pid;
@@ -10581,7 +10884,7 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
),
TP_printk("comm=%s pid=%d prio=%d",
-@@ -253,7 +254,7 @@
+@@ -253,7 +254,7 @@ TRACE_EVENT(sched_process_wait,
TP_fast_assign(
memcpy(__entry->comm, current->comm, TASK_COMM_LEN);
__entry->pid = pid_nr(pid);
@@ -10590,7 +10893,7 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
),
TP_printk("comm=%s pid=%d prio=%d",
-@@ -413,9 +414,9 @@
+@@ -413,9 +414,9 @@ DEFINE_EVENT(sched_stat_runtime, sched_stat_runtime,
*/
TRACE_EVENT(sched_pi_setprio,
@@ -10602,7 +10905,7 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
TP_STRUCT__entry(
__array( char, comm, TASK_COMM_LEN )
-@@ -428,7 +429,8 @@
+@@ -428,7 +429,8 @@ TRACE_EVENT(sched_pi_setprio,
memcpy(__entry->comm, tsk->comm, TASK_COMM_LEN);
__entry->pid = tsk->pid;
__entry->oldprio = tsk->prio;
@@ -10612,10 +10915,11 @@ diff -Nur linux-4.9.28.orig/include/trace/events/sched.h linux-4.9.28/include/tr
),
TP_printk("comm=%s pid=%d oldprio=%d newprio=%d",
-diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
---- linux-4.9.28.orig/init/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/init/Kconfig 2017-05-19 03:37:25.178176648 +0200
-@@ -506,7 +506,7 @@
+diff --git a/init/Kconfig b/init/Kconfig
+index 34407f15e6d3..2ce33a32e65d 100644
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -506,7 +506,7 @@ config TINY_RCU
config RCU_EXPERT
bool "Make expert-level adjustments to RCU configuration"
@@ -10624,7 +10928,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
help
This option needs to be enabled if you wish to make
expert-level adjustments to RCU configuration. By default,
-@@ -623,7 +623,7 @@
+@@ -623,7 +623,7 @@ config RCU_FANOUT_LEAF
config RCU_FAST_NO_HZ
bool "Accelerate last non-dyntick-idle CPU's grace periods"
@@ -10633,7 +10937,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
default n
help
This option permits CPUs to enter dynticks-idle state even if
-@@ -650,7 +650,7 @@
+@@ -650,7 +650,7 @@ config TREE_RCU_TRACE
config RCU_BOOST
bool "Enable RCU priority boosting"
depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT
@@ -10642,7 +10946,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
help
This option boosts the priority of preempted RCU readers that
block the current preemptible RCU grace period for too long.
-@@ -781,19 +781,6 @@
+@@ -781,19 +781,6 @@ config RCU_NOCB_CPU_ALL
endchoice
@@ -10662,7 +10966,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
endmenu # "RCU Subsystem"
config BUILD_BIN2C
-@@ -1064,6 +1051,7 @@
+@@ -1064,6 +1051,7 @@ config CFS_BANDWIDTH
config RT_GROUP_SCHED
bool "Group scheduling for SCHED_RR/FIFO"
depends on CGROUP_SCHED
@@ -10670,7 +10974,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
default n
help
This feature lets you explicitly allocate real CPU bandwidth
-@@ -1772,6 +1760,7 @@
+@@ -1772,6 +1760,7 @@ choice
config SLAB
bool "SLAB"
@@ -10678,7 +10982,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
select HAVE_HARDENED_USERCOPY_ALLOCATOR
help
The regular slab allocator that is established and known to work
-@@ -1792,6 +1781,7 @@
+@@ -1792,6 +1781,7 @@ config SLUB
config SLOB
depends on EXPERT
bool "SLOB (Simple Allocator)"
@@ -10686,7 +10990,7 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
help
SLOB replaces the stock allocator with a drastically simpler
allocator. SLOB is generally more space efficient but
-@@ -1810,7 +1800,7 @@
+@@ -1810,7 +1800,7 @@ config SLAB_FREELIST_RANDOM
config SLUB_CPU_PARTIAL
default y
@@ -10695,10 +10999,21 @@ diff -Nur linux-4.9.28.orig/init/Kconfig linux-4.9.28/init/Kconfig
bool "SLUB per cpu partial cache"
help
Per cpu partial caches accellerate objects allocation and freeing
-diff -Nur linux-4.9.28.orig/init/main.c linux-4.9.28/init/main.c
---- linux-4.9.28.orig/init/main.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/init/main.c 2017-05-19 03:37:25.178176648 +0200
-@@ -507,6 +507,7 @@
+diff --git a/init/Makefile b/init/Makefile
+index c4fb45525d08..821190dfaa75 100644
+--- a/init/Makefile
++++ b/init/Makefile
+@@ -35,4 +35,4 @@ $(obj)/version.o: include/generated/compile.h
+ include/generated/compile.h: FORCE
+ @$($(quiet)chk_compile.h)
+ $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
+- "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
++ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
+diff --git a/init/main.c b/init/main.c
+index ae3996ae9bac..6470deef01c9 100644
+--- a/init/main.c
++++ b/init/main.c
+@@ -507,6 +507,7 @@ asmlinkage __visible void __init start_kernel(void)
setup_command_line(command_line);
setup_nr_cpu_ids();
setup_per_cpu_areas();
@@ -10706,19 +11021,11 @@ diff -Nur linux-4.9.28.orig/init/main.c linux-4.9.28/init/main.c
boot_cpu_state_init();
smp_prepare_boot_cpu(); /* arch-specific boot-cpu hooks */
-diff -Nur linux-4.9.28.orig/init/Makefile linux-4.9.28/init/Makefile
---- linux-4.9.28.orig/init/Makefile 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/init/Makefile 2017-05-19 03:37:25.178176648 +0200
-@@ -35,4 +35,4 @@
- include/generated/compile.h: FORCE
- @$($(quiet)chk_compile.h)
- $(Q)$(CONFIG_SHELL) $(srctree)/scripts/mkcompile_h $@ \
-- "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CC) $(KBUILD_CFLAGS)"
-+ "$(UTS_MACHINE)" "$(CONFIG_SMP)" "$(CONFIG_PREEMPT)" "$(CONFIG_PREEMPT_RT_FULL)" "$(CC) $(KBUILD_CFLAGS)"
-diff -Nur linux-4.9.28.orig/ipc/sem.c linux-4.9.28/ipc/sem.c
---- linux-4.9.28.orig/ipc/sem.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/ipc/sem.c 2017-05-19 03:37:25.178176648 +0200
-@@ -712,6 +712,13 @@
+diff --git a/ipc/sem.c b/ipc/sem.c
+index 10b94bc59d4a..b8360eaacc7a 100644
+--- a/ipc/sem.c
++++ b/ipc/sem.c
+@@ -712,6 +712,13 @@ static int perform_atomic_semop(struct sem_array *sma, struct sem_queue *q)
static void wake_up_sem_queue_prepare(struct list_head *pt,
struct sem_queue *q, int error)
{
@@ -10732,7 +11039,7 @@ diff -Nur linux-4.9.28.orig/ipc/sem.c linux-4.9.28/ipc/sem.c
if (list_empty(pt)) {
/*
* Hold preempt off so that we don't get preempted and have the
-@@ -723,6 +730,7 @@
+@@ -723,6 +730,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
q->pid = error;
list_add_tail(&q->list, pt);
@@ -10740,7 +11047,7 @@ diff -Nur linux-4.9.28.orig/ipc/sem.c linux-4.9.28/ipc/sem.c
}
/**
-@@ -736,6 +744,7 @@
+@@ -736,6 +744,7 @@ static void wake_up_sem_queue_prepare(struct list_head *pt,
*/
static void wake_up_sem_queue_do(struct list_head *pt)
{
@@ -10748,7 +11055,7 @@ diff -Nur linux-4.9.28.orig/ipc/sem.c linux-4.9.28/ipc/sem.c
struct sem_queue *q, *t;
int did_something;
-@@ -748,6 +757,7 @@
+@@ -748,6 +757,7 @@ static void wake_up_sem_queue_do(struct list_head *pt)
}
if (did_something)
preempt_enable();
@@ -10756,10 +11063,85 @@ diff -Nur linux-4.9.28.orig/ipc/sem.c linux-4.9.28/ipc/sem.c
}
static void unlink_queue(struct sem_array *sma, struct sem_queue *q)
-diff -Nur linux-4.9.28.orig/kernel/cgroup.c linux-4.9.28/kernel/cgroup.c
---- linux-4.9.28.orig/kernel/cgroup.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/cgroup.c 2017-05-19 03:37:25.178176648 +0200
-@@ -5041,10 +5041,10 @@
+diff --git a/kernel/Kconfig.locks b/kernel/Kconfig.locks
+index ebdb0043203a..b9e6aa7e5aa6 100644
+--- a/kernel/Kconfig.locks
++++ b/kernel/Kconfig.locks
+@@ -225,11 +225,11 @@ config ARCH_SUPPORTS_ATOMIC_RMW
+
+ config MUTEX_SPIN_ON_OWNER
+ def_bool y
+- depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW
++ depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
+
+ config RWSEM_SPIN_ON_OWNER
+ def_bool y
+- depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW
++ depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
+
+ config LOCK_SPIN_ON_OWNER
+ def_bool y
+diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
+index 3f9c97419f02..11dbe26a8279 100644
+--- a/kernel/Kconfig.preempt
++++ b/kernel/Kconfig.preempt
+@@ -1,3 +1,16 @@
++config PREEMPT
++ bool
++ select PREEMPT_COUNT
++
++config PREEMPT_RT_BASE
++ bool
++ select PREEMPT
++
++config HAVE_PREEMPT_LAZY
++ bool
++
++config PREEMPT_LAZY
++ def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL
+
+ choice
+ prompt "Preemption Model"
+@@ -33,9 +46,9 @@ config PREEMPT_VOLUNTARY
+
+ Select this if you are building a kernel for a desktop system.
+
+-config PREEMPT
++config PREEMPT__LL
+ bool "Preemptible Kernel (Low-Latency Desktop)"
+- select PREEMPT_COUNT
++ select PREEMPT
+ select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
+ help
+ This option reduces the latency of the kernel by making
+@@ -52,6 +65,22 @@ config PREEMPT
+ embedded system with latency requirements in the milliseconds
+ range.
+
++config PREEMPT_RTB
++ bool "Preemptible Kernel (Basic RT)"
++ select PREEMPT_RT_BASE
++ help
++ This option is basically the same as (Low-Latency Desktop) but
++ enables changes which are preliminary for the full preemptible
++ RT kernel.
++
++config PREEMPT_RT_FULL
++ bool "Fully Preemptible Kernel (RT)"
++ depends on IRQ_FORCED_THREADING
++ select PREEMPT_RT_BASE
++ select PREEMPT_RCU
++ help
++ All and everything
++
+ endchoice
+
+ config PREEMPT_COUNT
+diff --git a/kernel/cgroup.c b/kernel/cgroup.c
+index a3d2aad2443f..bb6b252648ff 100644
+--- a/kernel/cgroup.c
++++ b/kernel/cgroup.c
+@@ -5041,10 +5041,10 @@ static void css_free_rcu_fn(struct rcu_head *rcu_head)
queue_work(cgroup_destroy_wq, &css->destroy_work);
}
@@ -10772,7 +11154,7 @@ diff -Nur linux-4.9.28.orig/kernel/cgroup.c linux-4.9.28/kernel/cgroup.c
struct cgroup_subsys *ss = css->ss;
struct cgroup *cgrp = css->cgroup;
-@@ -5087,8 +5087,8 @@
+@@ -5087,8 +5087,8 @@ static void css_release(struct percpu_ref *ref)
struct cgroup_subsys_state *css =
container_of(ref, struct cgroup_subsys_state, refcnt);
@@ -10783,7 +11165,7 @@ diff -Nur linux-4.9.28.orig/kernel/cgroup.c linux-4.9.28/kernel/cgroup.c
}
static void init_and_link_css(struct cgroup_subsys_state *css,
-@@ -5740,6 +5740,7 @@
+@@ -5740,6 +5740,7 @@ static int __init cgroup_wq_init(void)
*/
cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
BUG_ON(!cgroup_destroy_wq);
@@ -10791,10 +11173,11 @@ diff -Nur linux-4.9.28.orig/kernel/cgroup.c linux-4.9.28/kernel/cgroup.c
/*
* Used to destroy pidlists and separate to serve as flush domain.
-diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
---- linux-4.9.28.orig/kernel/cpu.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/cpu.c 2017-05-19 03:37:25.182176801 +0200
-@@ -239,6 +239,289 @@
+diff --git a/kernel/cpu.c b/kernel/cpu.c
+index 99c6c568bc55..f1c64e563970 100644
+--- a/kernel/cpu.c
++++ b/kernel/cpu.c
+@@ -239,6 +239,289 @@ static struct {
#define cpuhp_lock_acquire() lock_map_acquire(&cpu_hotplug.dep_map)
#define cpuhp_lock_release() lock_map_release(&cpu_hotplug.dep_map)
@@ -11084,7 +11467,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
void get_online_cpus(void)
{
-@@ -789,10 +1072,14 @@
+@@ -789,10 +1072,14 @@ static int takedown_cpu(unsigned int cpu)
struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
int err;
@@ -11099,7 +11482,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
/*
* Prevent irq alloc/free while the dying cpu reorganizes the
* interrupt affinities.
-@@ -877,6 +1164,9 @@
+@@ -877,6 +1164,9 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
int prev_state, ret = 0;
bool hasdied = false;
@@ -11109,7 +11492,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
if (num_online_cpus() == 1)
return -EBUSY;
-@@ -884,7 +1174,34 @@
+@@ -884,7 +1174,34 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
if (!cpu_present(cpu))
return -EINVAL;
@@ -11144,7 +11527,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
cpuhp_tasks_frozen = tasks_frozen;
-@@ -923,10 +1240,15 @@
+@@ -923,10 +1240,15 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
out:
@@ -11160,7 +11543,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
return ret;
}
-@@ -1240,6 +1562,8 @@
+@@ -1240,6 +1562,8 @@ core_initcall(cpu_hotplug_pm_sync_init);
#endif /* CONFIG_PM_SLEEP_SMP */
@@ -11169,7 +11552,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
#endif /* CONFIG_SMP */
/* Boot processor state steps */
-@@ -1924,6 +2248,10 @@
+@@ -1924,6 +2248,10 @@ void __init boot_cpu_init(void)
set_cpu_active(cpu, true);
set_cpu_present(cpu, true);
set_cpu_possible(cpu, true);
@@ -11180,10 +11563,11 @@ diff -Nur linux-4.9.28.orig/kernel/cpu.c linux-4.9.28/kernel/cpu.c
}
/*
-diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
---- linux-4.9.28.orig/kernel/cpuset.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/cpuset.c 2017-05-19 03:37:25.182176801 +0200
-@@ -284,7 +284,7 @@
+diff --git a/kernel/cpuset.c b/kernel/cpuset.c
+index 29f815d2ef7e..341b17f24f95 100644
+--- a/kernel/cpuset.c
++++ b/kernel/cpuset.c
+@@ -284,7 +284,7 @@ static struct cpuset top_cpuset = {
*/
static DEFINE_MUTEX(cpuset_mutex);
@@ -11192,7 +11576,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
static struct workqueue_struct *cpuset_migrate_mm_wq;
-@@ -907,9 +907,9 @@
+@@ -907,9 +907,9 @@ static void update_cpumasks_hier(struct cpuset *cs, struct cpumask *new_cpus)
continue;
rcu_read_unlock();
@@ -11204,7 +11588,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
WARN_ON(!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) &&
!cpumask_equal(cp->cpus_allowed, cp->effective_cpus));
-@@ -974,9 +974,9 @@
+@@ -974,9 +974,9 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs,
if (retval < 0)
return retval;
@@ -11216,7 +11600,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
/* use trialcs->cpus_allowed as a temp variable */
update_cpumasks_hier(cs, trialcs->cpus_allowed);
-@@ -1176,9 +1176,9 @@
+@@ -1176,9 +1176,9 @@ static void update_nodemasks_hier(struct cpuset *cs, nodemask_t *new_mems)
continue;
rcu_read_unlock();
@@ -11228,7 +11612,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
WARN_ON(!cgroup_subsys_on_dfl(cpuset_cgrp_subsys) &&
!nodes_equal(cp->mems_allowed, cp->effective_mems));
-@@ -1246,9 +1246,9 @@
+@@ -1246,9 +1246,9 @@ static int update_nodemask(struct cpuset *cs, struct cpuset *trialcs,
if (retval < 0)
goto done;
@@ -11240,7 +11624,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
/* use trialcs->mems_allowed as a temp variable */
update_nodemasks_hier(cs, &trialcs->mems_allowed);
-@@ -1339,9 +1339,9 @@
+@@ -1339,9 +1339,9 @@ static int update_flag(cpuset_flagbits_t bit, struct cpuset *cs,
spread_flag_changed = ((is_spread_slab(cs) != is_spread_slab(trialcs))
|| (is_spread_page(cs) != is_spread_page(trialcs)));
@@ -11252,7 +11636,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed)
rebuild_sched_domains_locked();
-@@ -1756,7 +1756,7 @@
+@@ -1756,7 +1756,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
cpuset_filetype_t type = seq_cft(sf)->private;
int ret = 0;
@@ -11261,7 +11645,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
switch (type) {
case FILE_CPULIST:
-@@ -1775,7 +1775,7 @@
+@@ -1775,7 +1775,7 @@ static int cpuset_common_seq_show(struct seq_file *sf, void *v)
ret = -EINVAL;
}
@@ -11270,7 +11654,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
return ret;
}
-@@ -1989,12 +1989,12 @@
+@@ -1989,12 +1989,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
cpuset_inc();
@@ -11285,7 +11669,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
if (!test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags))
goto out_unlock;
-@@ -2021,12 +2021,12 @@
+@@ -2021,12 +2021,12 @@ static int cpuset_css_online(struct cgroup_subsys_state *css)
}
rcu_read_unlock();
@@ -11300,7 +11684,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
out_unlock:
mutex_unlock(&cpuset_mutex);
return 0;
-@@ -2065,7 +2065,7 @@
+@@ -2065,7 +2065,7 @@ static void cpuset_css_free(struct cgroup_subsys_state *css)
static void cpuset_bind(struct cgroup_subsys_state *root_css)
{
mutex_lock(&cpuset_mutex);
@@ -11309,7 +11693,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
if (cgroup_subsys_on_dfl(cpuset_cgrp_subsys)) {
cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask);
-@@ -2076,7 +2076,7 @@
+@@ -2076,7 +2076,7 @@ static void cpuset_bind(struct cgroup_subsys_state *root_css)
top_cpuset.mems_allowed = top_cpuset.effective_mems;
}
@@ -11318,7 +11702,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
mutex_unlock(&cpuset_mutex);
}
-@@ -2177,12 +2177,12 @@
+@@ -2177,12 +2177,12 @@ hotplug_update_tasks_legacy(struct cpuset *cs,
{
bool is_empty;
@@ -11333,7 +11717,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
/*
* Don't call update_tasks_cpumask() if the cpuset becomes empty,
-@@ -2219,10 +2219,10 @@
+@@ -2219,10 +2219,10 @@ hotplug_update_tasks(struct cpuset *cs,
if (nodes_empty(*new_mems))
*new_mems = parent_cs(cs)->effective_mems;
@@ -11346,7 +11730,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
if (cpus_updated)
update_tasks_cpumask(cs);
-@@ -2308,21 +2308,21 @@
+@@ -2308,21 +2308,21 @@ static void cpuset_hotplug_workfn(struct work_struct *work)
/* synchronize cpus_allowed to cpu_active_mask */
if (cpus_updated) {
@@ -11372,7 +11756,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
update_tasks_nodemask(&top_cpuset);
}
-@@ -2420,11 +2420,11 @@
+@@ -2420,11 +2420,11 @@ void cpuset_cpus_allowed(struct task_struct *tsk, struct cpumask *pmask)
{
unsigned long flags;
@@ -11386,7 +11770,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
}
void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
-@@ -2472,11 +2472,11 @@
+@@ -2472,11 +2472,11 @@ nodemask_t cpuset_mems_allowed(struct task_struct *tsk)
nodemask_t mask;
unsigned long flags;
@@ -11400,7 +11784,7 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
return mask;
}
-@@ -2568,14 +2568,14 @@
+@@ -2568,14 +2568,14 @@ bool __cpuset_node_allowed(int node, gfp_t gfp_mask)
return true;
/* Not hardwall and node outside mems_allowed: scan up cpusets */
@@ -11417,10 +11801,11 @@ diff -Nur linux-4.9.28.orig/kernel/cpuset.c linux-4.9.28/kernel/cpuset.c
return allowed;
}
-diff -Nur linux-4.9.28.orig/kernel/debug/kdb/kdb_io.c linux-4.9.28/kernel/debug/kdb/kdb_io.c
---- linux-4.9.28.orig/kernel/debug/kdb/kdb_io.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/debug/kdb/kdb_io.c 2017-05-19 03:37:25.182176801 +0200
-@@ -554,7 +554,6 @@
+diff --git a/kernel/debug/kdb/kdb_io.c b/kernel/debug/kdb/kdb_io.c
+index fc1ef736253c..83c666537a7a 100644
+--- a/kernel/debug/kdb/kdb_io.c
++++ b/kernel/debug/kdb/kdb_io.c
+@@ -554,7 +554,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
int linecount;
int colcount;
int logging, saved_loglevel = 0;
@@ -11428,7 +11813,7 @@ diff -Nur linux-4.9.28.orig/kernel/debug/kdb/kdb_io.c linux-4.9.28/kernel/debug/
int got_printf_lock = 0;
int retlen = 0;
int fnd, len;
-@@ -565,8 +564,6 @@
+@@ -565,8 +564,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
unsigned long uninitialized_var(flags);
preempt_disable();
@@ -11437,7 +11822,7 @@ diff -Nur linux-4.9.28.orig/kernel/debug/kdb/kdb_io.c linux-4.9.28/kernel/debug/
/* Serialize kdb_printf if multiple cpus try to write at once.
* But if any cpu goes recursive in kdb, just print the output,
-@@ -855,7 +852,6 @@
+@@ -855,7 +852,6 @@ int vkdb_printf(enum kdb_msgsrc src, const char *fmt, va_list ap)
} else {
__release(kdb_printf_lock);
}
@@ -11445,7 +11830,7 @@ diff -Nur linux-4.9.28.orig/kernel/debug/kdb/kdb_io.c linux-4.9.28/kernel/debug/
preempt_enable();
return retlen;
}
-@@ -865,9 +861,11 @@
+@@ -865,9 +861,11 @@ int kdb_printf(const char *fmt, ...)
va_list ap;
int r;
@@ -11457,10 +11842,11 @@ diff -Nur linux-4.9.28.orig/kernel/debug/kdb/kdb_io.c linux-4.9.28/kernel/debug/
return r;
}
-diff -Nur linux-4.9.28.orig/kernel/events/core.c linux-4.9.28/kernel/events/core.c
---- linux-4.9.28.orig/kernel/events/core.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/events/core.c 2017-05-19 03:37:25.182176801 +0200
-@@ -1050,6 +1050,7 @@
+diff --git a/kernel/events/core.c b/kernel/events/core.c
+index 07c0dc806dfc..baf1a2867d74 100644
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -1050,6 +1050,7 @@ static void __perf_mux_hrtimer_init(struct perf_cpu_context *cpuctx, int cpu)
raw_spin_lock_init(&cpuctx->hrtimer_lock);
hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
timer->function = perf_mux_hrtimer_handler;
@@ -11468,7 +11854,7 @@ diff -Nur linux-4.9.28.orig/kernel/events/core.c linux-4.9.28/kernel/events/core
}
static int perf_mux_hrtimer_restart(struct perf_cpu_context *cpuctx)
-@@ -8363,6 +8364,7 @@
+@@ -8363,6 +8364,7 @@ static void perf_swevent_init_hrtimer(struct perf_event *event)
hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hwc->hrtimer.function = perf_swevent_hrtimer;
@@ -11476,10 +11862,11 @@ diff -Nur linux-4.9.28.orig/kernel/events/core.c linux-4.9.28/kernel/events/core
/*
* Since hrtimers have a fixed rate, we can do a static freq->period
-diff -Nur linux-4.9.28.orig/kernel/exit.c linux-4.9.28/kernel/exit.c
---- linux-4.9.28.orig/kernel/exit.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/exit.c 2017-05-19 03:37:25.182176801 +0200
-@@ -143,7 +143,7 @@
+diff --git a/kernel/exit.c b/kernel/exit.c
+index 3076f3089919..fb2ebcf3ca7c 100644
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -143,7 +143,7 @@ static void __exit_signal(struct task_struct *tsk)
* Do this under ->siglock, we can race with another thread
* doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
*/
@@ -11488,9 +11875,10 @@ diff -Nur linux-4.9.28.orig/kernel/exit.c linux-4.9.28/kernel/exit.c
tsk->sighand = NULL;
spin_unlock(&sighand->siglock);
-diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
---- linux-4.9.28.orig/kernel/fork.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/fork.c 2017-05-19 03:37:25.182176801 +0200
+diff --git a/kernel/fork.c b/kernel/fork.c
+index 59faac4de181..0edb0f3c1db8 100644
+--- a/kernel/fork.c
++++ b/kernel/fork.c
@@ -76,6 +76,7 @@
#include <linux/compiler.h>
#include <linux/sysctl.h>
@@ -11499,7 +11887,7 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
-@@ -376,13 +377,24 @@
+@@ -376,13 +377,24 @@ static inline void put_signal_struct(struct signal_struct *sig)
if (atomic_dec_and_test(&sig->sigcnt))
free_signal_struct(sig);
}
@@ -11525,7 +11913,7 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
cgroup_free(tsk);
task_numa_free(tsk);
security_task_free(tsk);
-@@ -393,7 +405,18 @@
+@@ -393,7 +405,18 @@ void __put_task_struct(struct task_struct *tsk)
if (!profile_handoff_task(tsk))
free_task(tsk);
}
@@ -11544,7 +11932,7 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
void __init __weak arch_task_cache_init(void) { }
-@@ -852,6 +875,19 @@
+@@ -852,6 +875,19 @@ void __mmdrop(struct mm_struct *mm)
}
EXPORT_SYMBOL_GPL(__mmdrop);
@@ -11564,7 +11952,7 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
static inline void __mmput(struct mm_struct *mm)
{
VM_BUG_ON(atomic_read(&mm->mm_users));
-@@ -1417,6 +1453,7 @@
+@@ -1417,6 +1453,7 @@ static void rt_mutex_init_task(struct task_struct *p)
#ifdef CONFIG_RT_MUTEXES
p->pi_waiters = RB_ROOT;
p->pi_waiters_leftmost = NULL;
@@ -11572,7 +11960,7 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
p->pi_blocked_on = NULL;
#endif
}
-@@ -1426,6 +1463,9 @@
+@@ -1426,6 +1463,9 @@ static void rt_mutex_init_task(struct task_struct *p)
*/
static void posix_cpu_timers_init(struct task_struct *tsk)
{
@@ -11582,7 +11970,7 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
tsk->cputime_expires.prof_exp = 0;
tsk->cputime_expires.virt_exp = 0;
tsk->cputime_expires.sched_exp = 0;
-@@ -1552,6 +1592,7 @@
+@@ -1552,6 +1592,7 @@ static __latent_entropy struct task_struct *copy_process(
spin_lock_init(&p->alloc_lock);
init_sigpending(&p->pending);
@@ -11590,10 +11978,11 @@ diff -Nur linux-4.9.28.orig/kernel/fork.c linux-4.9.28/kernel/fork.c
p->utime = p->stime = p->gtime = 0;
p->utimescaled = p->stimescaled = 0;
-diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
---- linux-4.9.28.orig/kernel/futex.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/futex.c 2017-05-19 03:37:25.182176801 +0200
-@@ -800,7 +800,7 @@
+diff --git a/kernel/futex.c b/kernel/futex.c
+index 4c6b6e697b73..d9bab63efccb 100644
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -800,7 +800,7 @@ static int refill_pi_state_cache(void)
return 0;
}
@@ -11602,7 +11991,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
{
struct futex_pi_state *pi_state = current->pi_state_cache;
-@@ -810,6 +810,11 @@
+@@ -810,6 +810,11 @@ static struct futex_pi_state * alloc_pi_state(void)
return pi_state;
}
@@ -11614,7 +12003,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/*
* Drops a reference to the pi_state object and frees or caches it
* when the last reference is gone.
-@@ -854,7 +859,7 @@
+@@ -854,7 +859,7 @@ static void put_pi_state(struct futex_pi_state *pi_state)
* Look up the task based on what TID userspace gave us.
* We dont trust it.
*/
@@ -11623,7 +12012,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
{
struct task_struct *p;
-@@ -904,7 +909,9 @@
+@@ -904,7 +909,9 @@ void exit_pi_state_list(struct task_struct *curr)
* task still owns the PI-state:
*/
if (head->next != next) {
@@ -11633,7 +12022,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
continue;
}
-@@ -914,10 +921,12 @@
+@@ -914,10 +921,12 @@ void exit_pi_state_list(struct task_struct *curr)
pi_state->owner = NULL;
raw_spin_unlock_irq(&curr->pi_lock);
@@ -11648,7 +12037,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
raw_spin_lock_irq(&curr->pi_lock);
}
raw_spin_unlock_irq(&curr->pi_lock);
-@@ -971,6 +980,39 @@
+@@ -971,6 +980,39 @@ void exit_pi_state_list(struct task_struct *curr)
*
* [10] There is no transient state which leaves owner and user space
* TID out of sync.
@@ -11688,7 +12077,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
*/
/*
-@@ -978,10 +1020,13 @@
+@@ -978,10 +1020,13 @@ void exit_pi_state_list(struct task_struct *curr)
* the pi_state against the user space value. If correct, attach to
* it.
*/
@@ -11703,7 +12092,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/*
* Userspace might have messed up non-PI and PI futexes [3]
-@@ -989,9 +1034,39 @@
+@@ -989,9 +1034,39 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
if (unlikely(!pi_state))
return -EINVAL;
@@ -11743,7 +12132,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
* Handle the owner died case:
*/
if (uval & FUTEX_OWNER_DIED) {
-@@ -1006,11 +1081,11 @@
+@@ -1006,11 +1081,11 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
* is not 0. Inconsistent state. [5]
*/
if (pid)
@@ -11757,7 +12146,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
/*
-@@ -1022,14 +1097,14 @@
+@@ -1022,14 +1097,14 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
* Take a ref on the state and return success. [6]
*/
if (!pid)
@@ -11774,7 +12163,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
/*
-@@ -1038,11 +1113,29 @@
+@@ -1038,11 +1113,29 @@ static int attach_to_pi_state(u32 uval, struct futex_pi_state *pi_state,
* user space TID. [9/10]
*/
if (pid != task_pid_vnr(pi_state->owner))
@@ -11807,7 +12196,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
/*
-@@ -1093,6 +1186,9 @@
+@@ -1093,6 +1186,9 @@ static int attach_to_pi_owner(u32 uval, union futex_key *key,
/*
* No existing pi state. First waiter. [2]
@@ -11817,7 +12206,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
*/
pi_state = alloc_pi_state();
-@@ -1117,17 +1213,18 @@
+@@ -1117,17 +1213,18 @@ static int attach_to_pi_owner(u32 uval, union futex_key *key,
return 0;
}
@@ -11840,7 +12229,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/*
* We are the first waiter - try to look up the owner based on
-@@ -1146,7 +1243,7 @@
+@@ -1146,7 +1243,7 @@ static int lock_pi_update_atomic(u32 __user *uaddr, u32 uval, u32 newval)
if (unlikely(cmpxchg_futex_value_locked(&curval, uaddr, uval, newval)))
return -EFAULT;
@@ -11849,7 +12238,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
return curval != uval ? -EAGAIN : 0;
}
-@@ -1174,7 +1271,7 @@
+@@ -1174,7 +1271,7 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb,
struct task_struct *task, int set_waiters)
{
u32 uval, newval, vpid = task_pid_vnr(task);
@@ -11858,7 +12247,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
int ret;
/*
-@@ -1200,9 +1297,9 @@
+@@ -1200,9 +1297,9 @@ static int futex_lock_pi_atomic(u32 __user *uaddr, struct futex_hash_bucket *hb,
* Lookup existing state first. If it exists, try to attach to
* its pi_state.
*/
@@ -11871,7 +12260,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/*
* No waiter and user TID is 0. We are here because the
-@@ -1283,50 +1380,45 @@
+@@ -1283,50 +1380,45 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)
wake_q_add(wake_q, p);
__unqueue_futex(q);
/*
@@ -11950,7 +12339,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
*/
newval = FUTEX_WAITERS | task_pid_vnr(new_owner);
-@@ -1335,6 +1427,7 @@
+@@ -1335,6 +1427,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval)) {
ret = -EFAULT;
@@ -11958,7 +12347,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
} else if (curval != uval) {
/*
* If a unconditional UNLOCK_PI operation (user space did not
-@@ -1347,10 +1440,14 @@
+@@ -1347,10 +1440,14 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
else
ret = -EINVAL;
}
@@ -11977,7 +12366,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
raw_spin_lock(&pi_state->owner->pi_lock);
WARN_ON(list_empty(&pi_state->list));
-@@ -1363,22 +1460,15 @@
+@@ -1363,22 +1460,15 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this,
pi_state->owner = new_owner;
raw_spin_unlock(&new_owner->pi_lock);
@@ -12006,7 +12395,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
/*
-@@ -1824,7 +1914,7 @@
+@@ -1824,7 +1914,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
* If that call succeeds then we have pi_state and an
* initial refcount on it.
*/
@@ -12015,7 +12404,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
switch (ret) {
-@@ -1907,7 +1997,7 @@
+@@ -1907,7 +1997,7 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
* refcount on the pi_state and store the pointer in
* the futex_q object of the waiter.
*/
@@ -12024,7 +12413,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
this->pi_state = pi_state;
ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex,
this->rt_waiter,
-@@ -1924,6 +2014,16 @@
+@@ -1924,6 +2014,16 @@ static int futex_requeue(u32 __user *uaddr1, unsigned int flags,
requeue_pi_wake_futex(this, &key2, hb2);
drop_count++;
continue;
@@ -12041,7 +12430,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
} else if (ret) {
/*
* rt_mutex_start_proxy_lock() detected a
-@@ -2007,20 +2107,7 @@
+@@ -2007,20 +2107,7 @@ queue_unlock(struct futex_hash_bucket *hb)
hb_waiters_dec(hb);
}
@@ -12063,7 +12452,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
{
int prio;
-@@ -2037,6 +2124,24 @@
+@@ -2037,6 +2124,24 @@ static inline void queue_me(struct futex_q *q, struct futex_hash_bucket *hb)
plist_node_init(&q->list, prio);
plist_add(&q->list, &hb->chain);
q->task = current;
@@ -12088,7 +12477,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
spin_unlock(&hb->lock);
}
-@@ -2123,10 +2228,13 @@
+@@ -2123,10 +2228,13 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
{
u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;
struct futex_pi_state *pi_state = q->pi_state;
@@ -12103,7 +12492,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/* Owner died? */
if (!pi_state->owner)
newtid |= FUTEX_OWNER_DIED;
-@@ -2134,7 +2242,8 @@
+@@ -2134,7 +2242,8 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
/*
* We are here either because we stole the rtmutex from the
* previous highest priority waiter or we are the highest priority
@@ -12113,7 +12502,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
* We have to replace the newowner TID in the user space variable.
* This must be atomic as we have to preserve the owner died bit here.
*
-@@ -2142,17 +2251,16 @@
+@@ -2142,17 +2251,16 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
* because we can fault here. Imagine swapped out pages or a fork
* that marked all the anonymous memory readonly for cow.
*
@@ -12136,7 +12525,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
newval = (uval & FUTEX_OWNER_DIED) | newtid;
if (cmpxchg_futex_value_locked(&curval, uaddr, uval, newval))
-@@ -2167,47 +2275,60 @@
+@@ -2167,47 +2275,60 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
* itself.
*/
if (pi_state->owner != NULL) {
@@ -12212,7 +12601,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
static long futex_wait_restart(struct restart_block *restart);
-@@ -2229,13 +2350,16 @@
+@@ -2229,13 +2350,16 @@ static long futex_wait_restart(struct restart_block *restart);
*/
static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked)
{
@@ -12230,7 +12619,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
*/
if (q->pi_state->owner != current)
ret = fixup_pi_state_owner(uaddr, q, current);
-@@ -2243,43 +2367,15 @@
+@@ -2243,43 +2367,15 @@ static int fixup_owner(u32 __user *uaddr, struct futex_q *q, int locked)
}
/*
@@ -12276,7 +12665,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
out:
return ret ? ret : locked;
-@@ -2503,6 +2599,8 @@
+@@ -2503,6 +2599,8 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
ktime_t *time, int trylock)
{
struct hrtimer_sleeper timeout, *to = NULL;
@@ -12285,7 +12674,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
struct futex_hash_bucket *hb;
struct futex_q q = futex_q_init;
int res, ret;
-@@ -2555,25 +2653,77 @@
+@@ -2555,25 +2653,77 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
}
}
@@ -12372,7 +12761,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
* Fixup the pi_state owner and possibly acquire the lock if we
* haven't already.
*/
-@@ -2589,12 +2739,19 @@
+@@ -2589,12 +2739,19 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
* If fixup_owner() faulted and was unable to handle the fault, unlock
* it and return the fault to userspace.
*/
@@ -12394,7 +12783,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
goto out_put_key;
out_unlock_put_key:
-@@ -2603,8 +2760,10 @@
+@@ -2603,8 +2760,10 @@ static int futex_lock_pi(u32 __user *uaddr, unsigned int flags,
out_put_key:
put_futex_key(&q.key);
out:
@@ -12406,7 +12795,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
return ret != -EINTR ? ret : -ERESTARTNOINTR;
uaddr_faulted:
-@@ -2631,7 +2790,7 @@
+@@ -2631,7 +2790,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
u32 uninitialized_var(curval), uval, vpid = task_pid_vnr(current);
union futex_key key = FUTEX_KEY_INIT;
struct futex_hash_bucket *hb;
@@ -12415,7 +12804,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
int ret;
retry:
-@@ -2655,12 +2814,48 @@
+@@ -2655,12 +2814,48 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
* all and we at least want to know if user space fiddled
* with the futex value instead of blindly unlocking.
*/
@@ -12469,7 +12858,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
*/
if (!ret)
goto out_putkey;
-@@ -2675,7 +2870,6 @@
+@@ -2675,7 +2870,6 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
* setting the FUTEX_WAITERS bit. Try again.
*/
if (ret == -EAGAIN) {
@@ -12477,7 +12866,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
put_futex_key(&key);
goto retry;
}
-@@ -2683,7 +2877,7 @@
+@@ -2683,7 +2877,7 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
* wake_futex_pi has detected invalid state. Tell user
* space.
*/
@@ -12486,7 +12875,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
/*
-@@ -2693,8 +2887,10 @@
+@@ -2693,8 +2887,10 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
* preserve the WAITERS bit not the OWNER_DIED one. We are the
* owner.
*/
@@ -12498,7 +12887,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/*
* If uval has changed, let user space handle it.
-@@ -2708,7 +2904,6 @@
+@@ -2708,7 +2904,6 @@ static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
return ret;
pi_faulted:
@@ -12506,7 +12895,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
put_futex_key(&key);
ret = fault_in_user_writeable(uaddr);
-@@ -2812,8 +3007,9 @@
+@@ -2812,8 +3007,9 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
u32 __user *uaddr2)
{
struct hrtimer_sleeper timeout, *to = NULL;
@@ -12517,7 +12906,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
union futex_key key2 = FUTEX_KEY_INIT;
struct futex_q q = futex_q_init;
int res, ret;
-@@ -2838,10 +3034,7 @@
+@@ -2838,10 +3034,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
* The waiter is allocated on our stack, manipulated by the requeue
* code while we sleep on uaddr.
*/
@@ -12529,7 +12918,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
if (unlikely(ret != 0))
-@@ -2872,20 +3065,55 @@
+@@ -2872,20 +3065,55 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
/* Queue the futex_q, drop the hb lock, wait for wakeup. */
futex_wait_queue_me(hb, &q, to);
@@ -12596,7 +12985,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/* Check if the requeue code acquired the second futex for us. */
if (!q.rt_waiter) {
-@@ -2894,16 +3122,19 @@
+@@ -2894,16 +3122,19 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
* did a lock-steal - fix up the PI-state in that case.
*/
if (q.pi_state && (q.pi_state->owner != current)) {
@@ -12620,7 +13009,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
}
} else {
struct rt_mutex *pi_mutex;
-@@ -2915,10 +3146,14 @@
+@@ -2915,10 +3146,14 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
*/
WARN_ON(!q.pi_state);
pi_mutex = &q.pi_state->pi_mutex;
@@ -12638,7 +13027,7 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
/*
* Fixup the pi_state owner and possibly acquire the lock if we
* haven't already.
-@@ -2936,13 +3171,20 @@
+@@ -2936,13 +3171,20 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
* the fault, unlock the rt_mutex and return the fault to
* userspace.
*/
@@ -12661,10 +13050,11 @@ diff -Nur linux-4.9.28.orig/kernel/futex.c linux-4.9.28/kernel/futex.c
if (ret == -EINTR) {
/*
* We've already been requeued, but cannot restart by calling
-diff -Nur linux-4.9.28.orig/kernel/irq/handle.c linux-4.9.28/kernel/irq/handle.c
---- linux-4.9.28.orig/kernel/irq/handle.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/irq/handle.c 2017-05-19 03:37:25.186176955 +0200
-@@ -181,10 +181,16 @@
+diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
+index d3f24905852c..f87aa8fdcc51 100644
+--- a/kernel/irq/handle.c
++++ b/kernel/irq/handle.c
+@@ -181,10 +181,16 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc)
{
irqreturn_t retval;
unsigned int flags = 0;
@@ -12682,9 +13072,10 @@ diff -Nur linux-4.9.28.orig/kernel/irq/handle.c linux-4.9.28/kernel/irq/handle.c
if (!noirqdebug)
note_interrupt(desc, retval);
-diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
---- linux-4.9.28.orig/kernel/irq/manage.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/irq/manage.c 2017-05-19 03:37:25.186176955 +0200
+diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
+index 6b669593e7eb..e357bf6c59d5 100644
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
@@ -22,6 +22,7 @@
#include "internals.h"
@@ -12693,7 +13084,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
__read_mostly bool force_irqthreads;
static int __init setup_forced_irqthreads(char *arg)
-@@ -30,6 +31,7 @@
+@@ -30,6 +31,7 @@ static int __init setup_forced_irqthreads(char *arg)
return 0;
}
early_param("threadirqs", setup_forced_irqthreads);
@@ -12701,7 +13092,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
#endif
static void __synchronize_hardirq(struct irq_desc *desc)
-@@ -233,7 +235,12 @@
+@@ -233,7 +235,12 @@ int irq_set_affinity_locked(struct irq_data *data, const struct cpumask *mask,
if (desc->affinity_notify) {
kref_get(&desc->affinity_notify->kref);
@@ -12714,7 +13105,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
}
irqd_set(data, IRQD_AFFINITY_SET);
-@@ -271,10 +278,8 @@
+@@ -271,10 +278,8 @@ int irq_set_affinity_hint(unsigned int irq, const struct cpumask *m)
}
EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
@@ -12726,7 +13117,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
struct irq_desc *desc = irq_to_desc(notify->irq);
cpumask_var_t cpumask;
unsigned long flags;
-@@ -296,6 +301,35 @@
+@@ -296,6 +301,35 @@ static void irq_affinity_notify(struct work_struct *work)
kref_put(&notify->kref, notify->release);
}
@@ -12762,7 +13153,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
/**
* irq_set_affinity_notifier - control notification of IRQ affinity changes
* @irq: Interrupt for which to enable/disable notification
-@@ -324,7 +358,12 @@
+@@ -324,7 +358,12 @@ irq_set_affinity_notifier(unsigned int irq, struct irq_affinity_notify *notify)
if (notify) {
notify->irq = irq;
kref_init(&notify->kref);
@@ -12775,7 +13166,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
}
raw_spin_lock_irqsave(&desc->lock, flags);
-@@ -879,7 +918,15 @@
+@@ -879,7 +918,15 @@ irq_forced_thread_fn(struct irq_desc *desc, struct irqaction *action)
local_bh_disable();
ret = action->thread_fn(action->irq, action->dev_id);
irq_finalize_oneshot(desc, action);
@@ -12792,7 +13183,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
return ret;
}
-@@ -976,6 +1023,12 @@
+@@ -976,6 +1023,12 @@ static int irq_thread(void *data)
if (action_ret == IRQ_WAKE_THREAD)
irq_wake_secondary(desc, action);
@@ -12805,7 +13196,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
wake_threads_waitq(desc);
}
-@@ -1336,6 +1389,9 @@
+@@ -1336,6 +1389,9 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new)
irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
}
@@ -12815,7 +13206,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
/* Set default affinity mask once everything is setup */
setup_affinity(desc, mask);
-@@ -2061,7 +2117,7 @@
+@@ -2061,7 +2117,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state);
* This call sets the internal irqchip state of an interrupt,
* depending on the value of @which.
*
@@ -12824,10 +13215,11 @@ diff -Nur linux-4.9.28.orig/kernel/irq/manage.c linux-4.9.28/kernel/irq/manage.c
* interrupt controller has per-cpu registers.
*/
int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
-diff -Nur linux-4.9.28.orig/kernel/irq/settings.h linux-4.9.28/kernel/irq/settings.h
---- linux-4.9.28.orig/kernel/irq/settings.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/irq/settings.h 2017-05-19 03:37:25.186176955 +0200
-@@ -16,6 +16,7 @@
+diff --git a/kernel/irq/settings.h b/kernel/irq/settings.h
+index 320579d89091..2df2d4445b1e 100644
+--- a/kernel/irq/settings.h
++++ b/kernel/irq/settings.h
+@@ -16,6 +16,7 @@ enum {
_IRQ_PER_CPU_DEVID = IRQ_PER_CPU_DEVID,
_IRQ_IS_POLLED = IRQ_IS_POLLED,
_IRQ_DISABLE_UNLAZY = IRQ_DISABLE_UNLAZY,
@@ -12835,7 +13227,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/settings.h linux-4.9.28/kernel/irq/settin
_IRQF_MODIFY_MASK = IRQF_MODIFY_MASK,
};
-@@ -30,6 +31,7 @@
+@@ -30,6 +31,7 @@ enum {
#define IRQ_PER_CPU_DEVID GOT_YOU_MORON
#define IRQ_IS_POLLED GOT_YOU_MORON
#define IRQ_DISABLE_UNLAZY GOT_YOU_MORON
@@ -12843,7 +13235,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/settings.h linux-4.9.28/kernel/irq/settin
#undef IRQF_MODIFY_MASK
#define IRQF_MODIFY_MASK GOT_YOU_MORON
-@@ -40,6 +42,16 @@
+@@ -40,6 +42,16 @@ irq_settings_clr_and_set(struct irq_desc *desc, u32 clr, u32 set)
desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK);
}
@@ -12860,10 +13252,11 @@ diff -Nur linux-4.9.28.orig/kernel/irq/settings.h linux-4.9.28/kernel/irq/settin
static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
{
return desc->status_use_accessors & _IRQ_PER_CPU;
-diff -Nur linux-4.9.28.orig/kernel/irq/spurious.c linux-4.9.28/kernel/irq/spurious.c
---- linux-4.9.28.orig/kernel/irq/spurious.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/irq/spurious.c 2017-05-19 03:37:25.186176955 +0200
-@@ -442,6 +442,10 @@
+diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c
+index 5707f97a3e6a..73f38dc7a7fb 100644
+--- a/kernel/irq/spurious.c
++++ b/kernel/irq/spurious.c
+@@ -442,6 +442,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable irq lockup detection when true");
static int __init irqfixup_setup(char *str)
{
@@ -12874,7 +13267,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq/spurious.c linux-4.9.28/kernel/irq/spurio
irqfixup = 1;
printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
printk(KERN_WARNING "This may impact system performance.\n");
-@@ -454,6 +458,10 @@
+@@ -454,6 +458,10 @@ module_param(irqfixup, int, 0644);
static int __init irqpoll_setup(char *str)
{
@@ -12885,9 +13278,10 @@ diff -Nur linux-4.9.28.orig/kernel/irq/spurious.c linux-4.9.28/kernel/irq/spurio
irqfixup = 2;
printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
"enabled\n");
-diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
---- linux-4.9.28.orig/kernel/irq_work.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/irq_work.c 2017-05-19 03:37:25.186176955 +0200
+diff --git a/kernel/irq_work.c b/kernel/irq_work.c
+index bcf107ce0854..2899ba0d23d1 100644
+--- a/kernel/irq_work.c
++++ b/kernel/irq_work.c
@@ -17,6 +17,7 @@
#include <linux/cpu.h>
#include <linux/notifier.h>
@@ -12896,7 +13290,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
#include <asm/processor.h>
-@@ -65,6 +66,8 @@
+@@ -65,6 +66,8 @@ void __weak arch_irq_work_raise(void)
*/
bool irq_work_queue_on(struct irq_work *work, int cpu)
{
@@ -12905,7 +13299,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
/* All work should have been flushed before going offline */
WARN_ON_ONCE(cpu_is_offline(cpu));
-@@ -75,7 +78,12 @@
+@@ -75,7 +78,12 @@ bool irq_work_queue_on(struct irq_work *work, int cpu)
if (!irq_work_claim(work))
return false;
@@ -12919,7 +13313,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
arch_send_call_function_single_ipi(cpu);
return true;
-@@ -86,6 +94,9 @@
+@@ -86,6 +94,9 @@ EXPORT_SYMBOL_GPL(irq_work_queue_on);
/* Enqueue the irq work @work on the current CPU */
bool irq_work_queue(struct irq_work *work)
{
@@ -12929,7 +13323,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
/* Only queue if not already pending */
if (!irq_work_claim(work))
return false;
-@@ -93,13 +104,15 @@
+@@ -93,13 +104,15 @@ bool irq_work_queue(struct irq_work *work)
/* Queue the entry and raise the IPI if needed. */
preempt_disable();
@@ -12952,7 +13346,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
arch_irq_work_raise();
}
-@@ -116,9 +129,8 @@
+@@ -116,9 +129,8 @@ bool irq_work_needs_cpu(void)
raised = this_cpu_ptr(&raised_list);
lazy = this_cpu_ptr(&lazy_list);
@@ -12964,7 +13358,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
/* All work should have been flushed before going offline */
WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
-@@ -132,7 +144,7 @@
+@@ -132,7 +144,7 @@ static void irq_work_run_list(struct llist_head *list)
struct irq_work *work;
struct llist_node *llnode;
@@ -12973,7 +13367,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
if (llist_empty(list))
return;
-@@ -169,7 +181,16 @@
+@@ -169,7 +181,16 @@ static void irq_work_run_list(struct llist_head *list)
void irq_work_run(void)
{
irq_work_run_list(this_cpu_ptr(&raised_list));
@@ -12991,7 +13385,7 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
}
EXPORT_SYMBOL_GPL(irq_work_run);
-@@ -179,8 +200,17 @@
+@@ -179,8 +200,17 @@ void irq_work_tick(void)
if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
irq_work_run_list(raised);
@@ -13009,82 +13403,11 @@ diff -Nur linux-4.9.28.orig/kernel/irq_work.c linux-4.9.28/kernel/irq_work.c
/*
* Synchronize against the irq_work @entry, ensures the entry is not
-diff -Nur linux-4.9.28.orig/kernel/Kconfig.locks linux-4.9.28/kernel/Kconfig.locks
---- linux-4.9.28.orig/kernel/Kconfig.locks 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/Kconfig.locks 2017-05-19 03:37:25.178176648 +0200
-@@ -225,11 +225,11 @@
-
- config MUTEX_SPIN_ON_OWNER
- def_bool y
-- depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW
-+ depends on SMP && !DEBUG_MUTEXES && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
-
- config RWSEM_SPIN_ON_OWNER
- def_bool y
-- depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW
-+ depends on SMP && RWSEM_XCHGADD_ALGORITHM && ARCH_SUPPORTS_ATOMIC_RMW && !PREEMPT_RT_FULL
-
- config LOCK_SPIN_ON_OWNER
- def_bool y
-diff -Nur linux-4.9.28.orig/kernel/Kconfig.preempt linux-4.9.28/kernel/Kconfig.preempt
---- linux-4.9.28.orig/kernel/Kconfig.preempt 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/Kconfig.preempt 2017-05-19 03:37:25.178176648 +0200
-@@ -1,3 +1,16 @@
-+config PREEMPT
-+ bool
-+ select PREEMPT_COUNT
-+
-+config PREEMPT_RT_BASE
-+ bool
-+ select PREEMPT
-+
-+config HAVE_PREEMPT_LAZY
-+ bool
-+
-+config PREEMPT_LAZY
-+ def_bool y if HAVE_PREEMPT_LAZY && PREEMPT_RT_FULL
-
- choice
- prompt "Preemption Model"
-@@ -33,9 +46,9 @@
-
- Select this if you are building a kernel for a desktop system.
-
--config PREEMPT
-+config PREEMPT__LL
- bool "Preemptible Kernel (Low-Latency Desktop)"
-- select PREEMPT_COUNT
-+ select PREEMPT
- select UNINLINE_SPIN_UNLOCK if !ARCH_INLINE_SPIN_UNLOCK
- help
- This option reduces the latency of the kernel by making
-@@ -52,6 +65,22 @@
- embedded system with latency requirements in the milliseconds
- range.
-
-+config PREEMPT_RTB
-+ bool "Preemptible Kernel (Basic RT)"
-+ select PREEMPT_RT_BASE
-+ help
-+ This option is basically the same as (Low-Latency Desktop) but
-+ enables changes which are preliminary for the full preemptible
-+ RT kernel.
-+
-+config PREEMPT_RT_FULL
-+ bool "Fully Preemptible Kernel (RT)"
-+ depends on IRQ_FORCED_THREADING
-+ select PREEMPT_RT_BASE
-+ select PREEMPT_RCU
-+ help
-+ All and everything
-+
- endchoice
-
- config PREEMPT_COUNT
-diff -Nur linux-4.9.28.orig/kernel/ksysfs.c linux-4.9.28/kernel/ksysfs.c
---- linux-4.9.28.orig/kernel/ksysfs.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/ksysfs.c 2017-05-19 03:37:25.186176955 +0200
-@@ -136,6 +136,15 @@
+diff --git a/kernel/ksysfs.c b/kernel/ksysfs.c
+index ee1bc1bb8feb..ddef07958840 100644
+--- a/kernel/ksysfs.c
++++ b/kernel/ksysfs.c
+@@ -136,6 +136,15 @@ KERNEL_ATTR_RO(vmcoreinfo);
#endif /* CONFIG_KEXEC_CORE */
@@ -13100,7 +13423,7 @@ diff -Nur linux-4.9.28.orig/kernel/ksysfs.c linux-4.9.28/kernel/ksysfs.c
/* whether file capabilities are enabled */
static ssize_t fscaps_show(struct kobject *kobj,
struct kobj_attribute *attr, char *buf)
-@@ -225,6 +234,9 @@
+@@ -225,6 +234,9 @@ static struct attribute * kernel_attrs[] = {
&rcu_expedited_attr.attr,
&rcu_normal_attr.attr,
#endif
@@ -13110,10 +13433,47 @@ diff -Nur linux-4.9.28.orig/kernel/ksysfs.c linux-4.9.28/kernel/ksysfs.c
NULL
};
-diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking/lockdep.c
---- linux-4.9.28.orig/kernel/locking/lockdep.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/lockdep.c 2017-05-19 03:37:25.186176955 +0200
-@@ -658,6 +658,7 @@
+diff --git a/kernel/locking/Makefile b/kernel/locking/Makefile
+index 6f88e352cd4f..6ff9e8011dd0 100644
+--- a/kernel/locking/Makefile
++++ b/kernel/locking/Makefile
+@@ -2,7 +2,7 @@
+ # and is generally not a function of system call inputs.
+ KCOV_INSTRUMENT := n
+
+-obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
++obj-y += semaphore.o percpu-rwsem.o
+
+ ifdef CONFIG_FUNCTION_TRACER
+ CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE)
+@@ -11,7 +11,11 @@ CFLAGS_REMOVE_mutex-debug.o = $(CC_FLAGS_FTRACE)
+ CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
+ endif
+
++ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
++obj-y += mutex.o
+ obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
++endif
++obj-y += rwsem.o
+ obj-$(CONFIG_LOCKDEP) += lockdep.o
+ ifeq ($(CONFIG_PROC_FS),y)
+ obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
+@@ -24,7 +28,10 @@ obj-$(CONFIG_RT_MUTEXES) += rtmutex.o
+ obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
+ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
+ obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
++ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
+ obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
+ obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
++endif
++obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o rwsem-rt.o
+ obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
+ obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
+diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
+index 4d7ffc0a0d00..3d157b3128eb 100644
+--- a/kernel/locking/lockdep.c
++++ b/kernel/locking/lockdep.c
+@@ -658,6 +658,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
struct lockdep_subclass_key *key;
struct hlist_head *hash_head;
struct lock_class *class;
@@ -13121,18 +13481,17 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
if (unlikely(subclass >= MAX_LOCKDEP_SUBCLASSES)) {
debug_locks_off();
-@@ -671,10 +672,23 @@
+@@ -671,10 +672,23 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
/*
* Static locks do not have their class-keys yet - for them the key
- * is the lock object itself:
-- */
-- if (unlikely(!lock->key))
-- lock->key = (void *)lock;
+ * is the lock object itself. If the lock is in the per cpu area,
+ * the canonical address of the lock (per cpu offset removed) is
+ * used.
-+ */
+ */
+- if (unlikely(!lock->key))
+- lock->key = (void *)lock;
+ if (unlikely(!lock->key)) {
+ unsigned long can_addr, addr = (unsigned long)lock;
+
@@ -13149,7 +13508,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
/*
* NOTE: the class-key must be unique. For dynamic locks, a static
-@@ -706,7 +720,7 @@
+@@ -706,7 +720,7 @@ look_up_lock_class(struct lockdep_map *lock, unsigned int subclass)
}
}
@@ -13158,7 +13517,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
}
/*
-@@ -724,19 +738,18 @@
+@@ -724,19 +738,18 @@ register_lock_class(struct lockdep_map *lock, unsigned int subclass, int force)
DEBUG_LOCKS_WARN_ON(!irqs_disabled());
class = look_up_lock_class(lock, subclass);
@@ -13181,7 +13540,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
return NULL;
}
-@@ -3410,7 +3423,7 @@
+@@ -3410,7 +3423,7 @@ static int match_held_lock(struct held_lock *hlock, struct lockdep_map *lock)
* Clearly if the lock hasn't been acquired _ever_, we're not
* holding it either, so report failure.
*/
@@ -13190,7 +13549,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
return 0;
/*
-@@ -3689,6 +3702,7 @@
+@@ -3689,6 +3702,7 @@ static void check_flags(unsigned long flags)
}
}
@@ -13198,7 +13557,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
/*
* We dont accurately track softirq state in e.g.
* hardirq contexts (such as on 4KSTACKS), so only
-@@ -3703,6 +3717,7 @@
+@@ -3703,6 +3717,7 @@ static void check_flags(unsigned long flags)
DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
}
}
@@ -13206,7 +13565,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
if (!debug_locks)
print_irqtrace_events(current);
-@@ -4159,7 +4174,7 @@
+@@ -4159,7 +4174,7 @@ void lockdep_reset_lock(struct lockdep_map *lock)
* If the class exists we look it up and zap it:
*/
class = look_up_lock_class(lock, j);
@@ -13215,9 +13574,10 @@ diff -Nur linux-4.9.28.orig/kernel/locking/lockdep.c linux-4.9.28/kernel/locking
zap_class(class);
}
/*
-diff -Nur linux-4.9.28.orig/kernel/locking/locktorture.c linux-4.9.28/kernel/locking/locktorture.c
---- linux-4.9.28.orig/kernel/locking/locktorture.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/locktorture.c 2017-05-19 03:37:25.186176955 +0200
+diff --git a/kernel/locking/locktorture.c b/kernel/locking/locktorture.c
+index f8c5af52a131..788068773e61 100644
+--- a/kernel/locking/locktorture.c
++++ b/kernel/locking/locktorture.c
@@ -26,7 +26,6 @@
#include <linux/kthread.h>
#include <linux/sched/rt.h>
@@ -13226,45 +13586,11 @@ diff -Nur linux-4.9.28.orig/kernel/locking/locktorture.c linux-4.9.28/kernel/loc
#include <linux/mutex.h>
#include <linux/rwsem.h>
#include <linux/smp.h>
-diff -Nur linux-4.9.28.orig/kernel/locking/Makefile linux-4.9.28/kernel/locking/Makefile
---- linux-4.9.28.orig/kernel/locking/Makefile 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/Makefile 2017-05-19 03:37:25.186176955 +0200
-@@ -2,7 +2,7 @@
- # and is generally not a function of system call inputs.
- KCOV_INSTRUMENT := n
-
--obj-y += mutex.o semaphore.o rwsem.o percpu-rwsem.o
-+obj-y += semaphore.o percpu-rwsem.o
-
- ifdef CONFIG_FUNCTION_TRACER
- CFLAGS_REMOVE_lockdep.o = $(CC_FLAGS_FTRACE)
-@@ -11,7 +11,11 @@
- CFLAGS_REMOVE_rtmutex-debug.o = $(CC_FLAGS_FTRACE)
- endif
-
-+ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
-+obj-y += mutex.o
- obj-$(CONFIG_DEBUG_MUTEXES) += mutex-debug.o
-+endif
-+obj-y += rwsem.o
- obj-$(CONFIG_LOCKDEP) += lockdep.o
- ifeq ($(CONFIG_PROC_FS),y)
- obj-$(CONFIG_LOCKDEP) += lockdep_proc.o
-@@ -24,7 +28,10 @@
- obj-$(CONFIG_DEBUG_RT_MUTEXES) += rtmutex-debug.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock.o
- obj-$(CONFIG_DEBUG_SPINLOCK) += spinlock_debug.o
-+ifneq ($(CONFIG_PREEMPT_RT_FULL),y)
- obj-$(CONFIG_RWSEM_GENERIC_SPINLOCK) += rwsem-spinlock.o
- obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += rwsem-xadd.o
-+endif
-+obj-$(CONFIG_PREEMPT_RT_FULL) += rt.o rwsem-rt.o
- obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
- obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
-diff -Nur linux-4.9.28.orig/kernel/locking/percpu-rwsem.c linux-4.9.28/kernel/locking/percpu-rwsem.c
---- linux-4.9.28.orig/kernel/locking/percpu-rwsem.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/percpu-rwsem.c 2017-05-19 03:37:25.186176955 +0200
-@@ -18,7 +18,7 @@
+diff --git a/kernel/locking/percpu-rwsem.c b/kernel/locking/percpu-rwsem.c
+index ce182599cf2e..2ad3a1e8344c 100644
+--- a/kernel/locking/percpu-rwsem.c
++++ b/kernel/locking/percpu-rwsem.c
+@@ -18,7 +18,7 @@ int __percpu_init_rwsem(struct percpu_rw_semaphore *sem,
/* ->rw_sem represents the whole percpu_rw_semaphore for lockdep */
rcu_sync_init(&sem->rss, RCU_SCHED_SYNC);
__init_rwsem(&sem->rw_sem, name, rwsem_key);
@@ -13273,7 +13599,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/percpu-rwsem.c linux-4.9.28/kernel/lo
sem->readers_block = 0;
return 0;
}
-@@ -103,7 +103,7 @@
+@@ -103,7 +103,7 @@ void __percpu_up_read(struct percpu_rw_semaphore *sem)
__this_cpu_dec(*sem->read_count);
/* Prod writer to recheck readers_active */
@@ -13282,7 +13608,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/percpu-rwsem.c linux-4.9.28/kernel/lo
}
EXPORT_SYMBOL_GPL(__percpu_up_read);
-@@ -160,7 +160,7 @@
+@@ -160,7 +160,7 @@ void percpu_down_write(struct percpu_rw_semaphore *sem)
*/
/* Wait for all now active readers to complete. */
@@ -13291,9 +13617,11 @@ diff -Nur linux-4.9.28.orig/kernel/locking/percpu-rwsem.c linux-4.9.28/kernel/lo
}
EXPORT_SYMBOL_GPL(percpu_down_write);
-diff -Nur linux-4.9.28.orig/kernel/locking/rt.c linux-4.9.28/kernel/locking/rt.c
---- linux-4.9.28.orig/kernel/locking/rt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/kernel/locking/rt.c 2017-05-19 03:37:25.186176955 +0200
+diff --git a/kernel/locking/rt.c b/kernel/locking/rt.c
+new file mode 100644
+index 000000000000..6284e3b15091
+--- /dev/null
++++ b/kernel/locking/rt.c
@@ -0,0 +1,331 @@
+/*
+ * kernel/rt.c
@@ -13626,9 +13954,41 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rt.c linux-4.9.28/kernel/locking/rt.c
+ return 1;
+}
+EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
-diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking/rtmutex.c
---- linux-4.9.28.orig/kernel/locking/rtmutex.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/rtmutex.c 2017-05-19 03:37:25.186176955 +0200
+diff --git a/kernel/locking/rtmutex-debug.c b/kernel/locking/rtmutex-debug.c
+index 62b6cee8ea7f..0613c4b1d059 100644
+--- a/kernel/locking/rtmutex-debug.c
++++ b/kernel/locking/rtmutex-debug.c
+@@ -173,12 +173,3 @@ void debug_rt_mutex_init(struct rt_mutex *lock, const char *name)
+ lock->name = name;
+ }
+
+-void
+-rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task)
+-{
+-}
+-
+-void rt_mutex_deadlock_account_unlock(struct task_struct *task)
+-{
+-}
+-
+diff --git a/kernel/locking/rtmutex-debug.h b/kernel/locking/rtmutex-debug.h
+index d0519c3432b6..b585af9a1b50 100644
+--- a/kernel/locking/rtmutex-debug.h
++++ b/kernel/locking/rtmutex-debug.h
+@@ -9,9 +9,6 @@
+ * This file contains macros used solely by rtmutex.c. Debug version.
+ */
+
+-extern void
+-rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);
+-extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
+ extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
+ extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
+ extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);
+diff --git a/kernel/locking/rtmutex.c b/kernel/locking/rtmutex.c
+index 2c49d76f96c3..218f1d26afe7 100644
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
@@ -7,6 +7,11 @@
* Copyright (C) 2005-2006 Timesys Corp., Thomas Gleixner <tglx@timesys.com>
* Copyright (C) 2005 Kihon Technologies Inc., Steven Rostedt
@@ -13649,7 +14009,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
#include "rtmutex_common.h"
-@@ -133,6 +139,12 @@
+@@ -133,6 +139,12 @@ static void fixup_rt_mutex_waiters(struct rt_mutex *lock)
WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
}
@@ -13662,7 +14022,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* We can speed up the acquire/release, if there's no debugging state to be
* set up.
-@@ -222,12 +234,25 @@
+@@ -222,12 +234,25 @@ static inline bool unlock_rt_mutex_safe(struct rt_mutex *lock,
}
#endif
@@ -13691,7 +14051,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* If both waiters have dl_prio(), we check the deadlines of the
-@@ -236,12 +261,30 @@
+@@ -236,12 +261,30 @@ rt_mutex_waiter_less(struct rt_mutex_waiter *left,
* then right waiter has a dl_prio() too.
*/
if (dl_prio(left->prio))
@@ -13724,7 +14084,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
static void
rt_mutex_enqueue(struct rt_mutex *lock, struct rt_mutex_waiter *waiter)
{
-@@ -253,7 +296,7 @@
+@@ -253,7 +296,7 @@ rt_mutex_enqueue(struct rt_mutex *lock, struct rt_mutex_waiter *waiter)
while (*link) {
parent = *link;
entry = rb_entry(parent, struct rt_mutex_waiter, tree_entry);
@@ -13733,7 +14093,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
link = &parent->rb_left;
} else {
link = &parent->rb_right;
-@@ -292,7 +335,7 @@
+@@ -292,7 +335,7 @@ rt_mutex_enqueue_pi(struct task_struct *task, struct rt_mutex_waiter *waiter)
while (*link) {
parent = *link;
entry = rb_entry(parent, struct rt_mutex_waiter, pi_tree_entry);
@@ -13742,7 +14102,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
link = &parent->rb_left;
} else {
link = &parent->rb_right;
-@@ -320,72 +363,16 @@
+@@ -320,72 +363,16 @@ rt_mutex_dequeue_pi(struct task_struct *task, struct rt_mutex_waiter *waiter)
RB_CLEAR_NODE(&waiter->pi_tree_entry);
}
@@ -13753,19 +14113,24 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
- * the waiter is not allowed to do priority boosting
- */
-int rt_mutex_getprio(struct task_struct *task)
--{
++static void rt_mutex_adjust_prio(struct task_struct *p)
+ {
- if (likely(!task_has_pi_waiters(task)))
- return task->normal_prio;
--
++ struct task_struct *pi_task = NULL;
+
- return min(task_top_pi_waiter(task)->prio,
- task->normal_prio);
-}
--
++ lockdep_assert_held(&p->pi_lock);
+
-struct task_struct *rt_mutex_get_top_task(struct task_struct *task)
-{
- if (likely(!task_has_pi_waiters(task)))
- return NULL;
--
++ if (task_has_pi_waiters(p))
++ pi_task = task_top_pi_waiter(p)->task;
+
- return task_top_pi_waiter(task)->task;
-}
-
@@ -13789,16 +14154,13 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
- * This can be both boosting and unboosting. task->pi_lock must be held.
- */
-static void __rt_mutex_adjust_prio(struct task_struct *task)
-+static void rt_mutex_adjust_prio(struct task_struct *p)
- {
+-{
- int prio = rt_mutex_getprio(task);
-+ struct task_struct *pi_task = NULL;
-
+-
- if (task->prio != prio || dl_prio(prio))
- rt_mutex_setprio(task, prio);
-}
-+ lockdep_assert_held(&p->pi_lock);
-
+-
-/*
- * Adjust task priority (undo boosting). Called from the exit path of
- * rt_mutex_slowunlock() and rt_mutex_slowlock().
@@ -13811,9 +14173,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
-void rt_mutex_adjust_prio(struct task_struct *task)
-{
- unsigned long flags;
-+ if (task_has_pi_waiters(p))
-+ pi_task = task_top_pi_waiter(p)->task;
-
+-
- raw_spin_lock_irqsave(&task->pi_lock, flags);
- __rt_mutex_adjust_prio(task);
- raw_spin_unlock_irqrestore(&task->pi_lock, flags);
@@ -13821,7 +14181,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/*
-@@ -414,6 +401,14 @@
+@@ -414,6 +401,14 @@ static bool rt_mutex_cond_detect_deadlock(struct rt_mutex_waiter *waiter,
return debug_rt_mutex_detect_deadlock(waiter, chwalk);
}
@@ -13836,7 +14196,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* Max number of times we'll walk the boosting chain:
*/
-@@ -421,7 +416,8 @@
+@@ -421,7 +416,8 @@ int max_lock_depth = 1024;
static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
{
@@ -13846,7 +14206,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/*
-@@ -557,7 +553,7 @@
+@@ -557,7 +553,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
* reached or the state of the chain has changed while we
* dropped the locks.
*/
@@ -13855,7 +14215,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
goto out_unlock_pi;
/*
-@@ -608,7 +604,7 @@
+@@ -608,7 +604,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
* enabled we continue, but stop the requeueing in the chain
* walk.
*/
@@ -13864,7 +14224,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
if (!detect_deadlock)
goto out_unlock_pi;
else
-@@ -704,7 +700,26 @@
+@@ -704,7 +700,26 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
/* [7] Requeue the waiter in the lock waiter tree. */
rt_mutex_dequeue(lock, waiter);
@@ -13891,7 +14251,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
rt_mutex_enqueue(lock, waiter);
/* [8] Release the task */
-@@ -719,13 +734,16 @@
+@@ -719,13 +734,16 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
* follow here. This is the end of the chain we are walking.
*/
if (!rt_mutex_owner(lock)) {
@@ -13910,7 +14270,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
raw_spin_unlock_irq(&lock->wait_lock);
return 0;
}
-@@ -745,7 +763,7 @@
+@@ -745,7 +763,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
*/
rt_mutex_dequeue_pi(task, prerequeue_top_waiter);
rt_mutex_enqueue_pi(task, waiter);
@@ -13919,7 +14279,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
} else if (prerequeue_top_waiter == waiter) {
/*
-@@ -761,7 +779,7 @@
+@@ -761,7 +779,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
rt_mutex_dequeue_pi(task, waiter);
waiter = rt_mutex_top_waiter(lock);
rt_mutex_enqueue_pi(task, waiter);
@@ -13928,7 +14288,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
} else {
/*
* Nothing changed. No need to do any priority
-@@ -818,6 +836,7 @@
+@@ -818,6 +836,7 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
return ret;
}
@@ -13936,7 +14296,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* Try to take an rt-mutex
*
-@@ -828,9 +847,12 @@
+@@ -828,9 +847,12 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
* @waiter: The waiter that is queued to the lock's wait tree if the
* callsite called task_blocked_on_lock(), otherwise NULL
*/
@@ -13951,7 +14311,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* Before testing whether we can acquire @lock, we set the
* RT_MUTEX_HAS_WAITERS bit in @lock->owner. This forces all
-@@ -866,8 +888,10 @@
+@@ -866,8 +888,10 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
* If waiter is not the highest priority waiter of
* @lock, give up.
*/
@@ -13963,7 +14323,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* We can acquire the lock. Remove the waiter from the
-@@ -885,14 +909,26 @@
+@@ -885,14 +909,26 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
* not need to be dequeued.
*/
if (rt_mutex_has_waiters(lock)) {
@@ -13992,7 +14352,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* The current top waiter stays enqueued. We
* don't have to change anything in the lock
-@@ -936,180 +972,592 @@
+@@ -936,11 +972,384 @@ static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
*/
rt_mutex_set_owner(lock, task);
@@ -14002,58 +14362,25 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
+#ifdef CONFIG_PREEMPT_RT_FULL
- /*
-- * Task blocks on lock.
-- *
-- * Prepare waiter and propagate pi chain
-- *
-- * This must be called with lock->wait_lock held and interrupts disabled
++/*
+ * preemptible spin_lock functions:
- */
--static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
-- struct rt_mutex_waiter *waiter,
-- struct task_struct *task,
-- enum rtmutex_chainwalk chwalk)
++ */
+static inline void rt_spin_lock_fastlock(struct rt_mutex *lock,
+ void (*slowfn)(struct rt_mutex *lock,
+ bool mg_off),
+ bool do_mig_dis)
- {
-- struct task_struct *owner = rt_mutex_owner(lock);
-- struct rt_mutex_waiter *top_waiter = waiter;
-- struct rt_mutex *next_lock;
-- int chain_walk = 0, res;
++{
+ might_sleep_no_state_check();
-
-- /*
-- * Early deadlock detection. We really don't want the task to
-- * enqueue on itself just to untangle the mess later. It's not
-- * only an optimization. We drop the locks, so another waiter
-- * can come in before the chain walk detects the deadlock. So
-- * the other will detect the deadlock and return -EDEADLOCK,
-- * which is wrong, as the other waiter is not in a deadlock
-- * situation.
-- */
-- if (owner == task)
-- return -EDEADLK;
++
+ if (do_mig_dis)
+ migrate_disable();
-
-- raw_spin_lock(&task->pi_lock);
-- __rt_mutex_adjust_prio(task);
-- waiter->task = task;
-- waiter->lock = lock;
-- waiter->prio = task->prio;
++
+ if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
+ return;
+ else
+ slowfn(lock, do_mig_dis);
+}
-
-- /* Get the top priority waiter on the lock */
-- if (rt_mutex_has_waiters(lock))
-- top_waiter = rt_mutex_top_waiter(lock);
-- rt_mutex_enqueue(lock, waiter);
++
+static inline void rt_spin_lock_fastunlock(struct rt_mutex *lock,
+ void (*slowfn)(struct rt_mutex *lock))
+{
@@ -14071,8 +14398,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ struct task_struct *owner)
+{
+ int res = 0;
-
-- task->pi_blocked_on = waiter;
++
+ rcu_read_lock();
+ for (;;) {
+ if (owner != rt_mutex_owner(lock))
@@ -14098,8 +14424,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ return 1;
+}
+#endif
-
-- raw_spin_unlock(&task->pi_lock);
++
+static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+ struct rt_mutex_waiter *waiter,
+ struct task_struct *task,
@@ -14118,85 +14443,44 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ struct rt_mutex_waiter waiter, *top_waiter;
+ unsigned long flags;
+ int ret;
-
-- if (!owner)
-- return 0;
++
+ rt_mutex_init_waiter(&waiter, true);
-
-- raw_spin_lock(&owner->pi_lock);
-- if (waiter == rt_mutex_top_waiter(lock)) {
-- rt_mutex_dequeue_pi(owner, top_waiter);
-- rt_mutex_enqueue_pi(owner, waiter);
++
+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-
-- __rt_mutex_adjust_prio(owner);
-- if (owner->pi_blocked_on)
-- chain_walk = 1;
-- } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
-- chain_walk = 1;
++
+ if (__try_to_take_rt_mutex(lock, self, NULL, STEAL_LATERAL)) {
+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
+ return;
- }
-
-- /* Store the lock on which owner is blocked or NULL */
-- next_lock = task_blocked_on_lock(owner);
++ }
++
+ BUG_ON(rt_mutex_owner(lock) == self);
-
-- raw_spin_unlock(&owner->pi_lock);
- /*
-- * Even if full deadlock detection is on, if the owner is not
-- * blocked itself, we can avoid finding this out in the chain
-- * walk.
++
++ /*
+ * We save whatever state the task is in and we'll restore it
+ * after acquiring the lock taking real wakeups into account
+ * as well. We are serialized via pi_lock against wakeups. See
+ * try_to_wake_up().
- */
-- if (!chain_walk || !next_lock)
-- return 0;
++ */
+ raw_spin_lock(&self->pi_lock);
+ self->saved_state = self->state;
+ __set_current_state_no_track(TASK_UNINTERRUPTIBLE);
+ raw_spin_unlock(&self->pi_lock);
-
-- /*
-- * The owner can't disappear while holding a lock,
-- * so the owner struct is protected by wait_lock.
-- * Gets dropped in rt_mutex_adjust_prio_chain()!
-- */
-- get_task_struct(owner);
++
+ ret = task_blocks_on_rt_mutex(lock, &waiter, self, RT_MUTEX_MIN_CHAINWALK);
+ BUG_ON(ret);
-
-- raw_spin_unlock_irq(&lock->wait_lock);
++
+ for (;;) {
+ /* Try to acquire the lock again. */
+ if (__try_to_take_rt_mutex(lock, self, &waiter, STEAL_LATERAL))
+ break;
-
-- res = rt_mutex_adjust_prio_chain(owner, chwalk, lock,
-- next_lock, waiter, task);
++
+ top_waiter = rt_mutex_top_waiter(lock);
+ lock_owner = rt_mutex_owner(lock);
-
-- raw_spin_lock_irq(&lock->wait_lock);
++
+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-
-- return res;
--}
++
+ debug_rt_mutex_print_deadlock(&waiter);
-
--/*
-- * Remove the top waiter from the current tasks pi waiter tree and
-- * queue it up.
-- *
-- * Called with lock->wait_lock held and interrupts disabled.
-- */
--static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
-- struct rt_mutex *lock)
--{
-- struct rt_mutex_waiter *waiter;
++
+ if (top_waiter != &waiter || adaptive_wait(lock, lock_owner)) {
+ if (mg_off)
+ migrate_enable();
@@ -14204,23 +14488,15 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ if (mg_off)
+ migrate_disable();
+ }
-
-- raw_spin_lock(&current->pi_lock);
++
+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-
-- waiter = rt_mutex_top_waiter(lock);
++
+ raw_spin_lock(&self->pi_lock);
+ __set_current_state_no_track(TASK_UNINTERRUPTIBLE);
+ raw_spin_unlock(&self->pi_lock);
+ }
-
- /*
-- * Remove it from current->pi_waiters. We do not adjust a
-- * possible priority boost right now. We execute wakeup in the
-- * boosted mode and go back to normal after releasing
-- * lock->wait_lock.
-- */
-- rt_mutex_dequeue_pi(current, waiter);
++
++ /*
+ * Restore the task state to current->saved_state. We set it
+ * to the original state above and the try_to_wake_up() code
+ * has possibly updated it when a real (non-rtmutex) wakeup
@@ -14231,103 +14507,68 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ __set_current_state_no_track(self->saved_state);
+ self->saved_state = TASK_RUNNING;
+ raw_spin_unlock(&self->pi_lock);
-
- /*
-- * As we are waking up the top waiter, and the waiter stays
-- * queued on the lock until it gets the lock, this lock
-- * obviously has waiters. Just set the bit here and this has
-- * the added benefit of forcing all new tasks into the
-- * slow path making sure no task of lower priority than
-- * the top waiter can steal this lock.
++
++ /*
+ * try_to_take_rt_mutex() sets the waiter bit
+ * unconditionally. We might have to fix that up:
- */
-- lock->owner = (void *) RT_MUTEX_HAS_WAITERS;
++ */
+ fixup_rt_mutex_waiters(lock);
-
-- raw_spin_unlock(&current->pi_lock);
++
+ BUG_ON(rt_mutex_has_waiters(lock) && &waiter == rt_mutex_top_waiter(lock));
+ BUG_ON(!RB_EMPTY_NODE(&waiter.tree_entry));
+
+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-
-- wake_q_add(wake_q, waiter->task);
++
+ debug_rt_mutex_free_waiter(&waiter);
- }
-
++}
++
+static bool __sched __rt_mutex_unlock_common(struct rt_mutex *lock,
+ struct wake_q_head *wake_q,
+ struct wake_q_head *wq_sleeper);
- /*
-- * Remove a waiter from a lock and give up
-- *
-- * Must be called with lock->wait_lock held and interrupts disabled. I must
-- * have just failed to try_to_take_rt_mutex().
++/*
+ * Slow path to release a rt_mutex spin_lock style
- */
--static void remove_waiter(struct rt_mutex *lock,
-- struct rt_mutex_waiter *waiter)
++ */
+static void noinline __sched rt_spin_lock_slowunlock(struct rt_mutex *lock)
- {
-- bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
-- struct task_struct *owner = rt_mutex_owner(lock);
-- struct rt_mutex *next_lock;
++{
+ unsigned long flags;
+ WAKE_Q(wake_q);
+ WAKE_Q(wake_sleeper_q);
+ bool postunlock;
-
-- raw_spin_lock(&current->pi_lock);
-- rt_mutex_dequeue(lock, waiter);
-- current->pi_blocked_on = NULL;
-- raw_spin_unlock(&current->pi_lock);
++
+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
+ postunlock = __rt_mutex_unlock_common(lock, &wake_q, &wake_sleeper_q);
+ raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-
-- /*
-- * Only update priority if the waiter was the highest priority
-- * waiter of the lock and there is an owner to update.
-- */
-- if (!owner || !is_top_waiter)
-- return;
++
+ if (postunlock)
+ rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
+}
-
-- raw_spin_lock(&owner->pi_lock);
++
+void __lockfunc rt_spin_lock__no_mg(spinlock_t *lock)
+{
+ rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, false);
+ spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+}
+EXPORT_SYMBOL(rt_spin_lock__no_mg);
-
-- rt_mutex_dequeue_pi(owner, waiter);
++
+void __lockfunc rt_spin_lock(spinlock_t *lock)
+{
+ rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock, true);
+ spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+}
+EXPORT_SYMBOL(rt_spin_lock);
-
-- if (rt_mutex_has_waiters(lock))
-- rt_mutex_enqueue_pi(owner, rt_mutex_top_waiter(lock));
++
+void __lockfunc __rt_spin_lock(struct rt_mutex *lock)
+{
+ rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock, true);
+}
+EXPORT_SYMBOL(__rt_spin_lock);
-
-- __rt_mutex_adjust_prio(owner);
++
+void __lockfunc __rt_spin_lock__no_mg(struct rt_mutex *lock)
+{
+ rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock, false);
+}
+EXPORT_SYMBOL(__rt_spin_lock__no_mg);
-
-- /* Store the lock on which owner is blocked or NULL */
-- next_lock = task_blocked_on_lock(owner);
++
+#ifdef CONFIG_DEBUG_LOCK_ALLOC
+void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass)
+{
@@ -14336,8 +14577,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+}
+EXPORT_SYMBOL(rt_spin_lock_nested);
+#endif
-
-- raw_spin_unlock(&owner->pi_lock);
++
+void __lockfunc rt_spin_unlock__no_mg(spinlock_t *lock)
+{
+ /* NOTE: we always pass in '1' for nested, for simplicity */
@@ -14345,11 +14585,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock);
+}
+EXPORT_SYMBOL(rt_spin_unlock__no_mg);
-
-- /*
-- * Don't walk the chain, if the owner task is not blocked
-- * itself.
-- */
++
+void __lockfunc rt_spin_unlock(spinlock_t *lock)
+{
+ /* NOTE: we always pass in '1' for nested, for simplicity */
@@ -14500,38 +14736,23 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ return __try_to_take_rt_mutex(lock, task, waiter, STEAL_NORMAL);
+}
+
-+/*
-+ * Task blocks on lock.
-+ *
-+ * Prepare waiter and propagate pi chain
-+ *
-+ * This must be called with lock->wait_lock held and interrupts disabled
-+ */
-+static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
-+ struct rt_mutex_waiter *waiter,
-+ struct task_struct *task,
-+ enum rtmutex_chainwalk chwalk)
-+{
-+ struct task_struct *owner = rt_mutex_owner(lock);
-+ struct rt_mutex_waiter *top_waiter = waiter;
-+ struct rt_mutex *next_lock;
-+ int chain_walk = 0, res;
-+
+ /*
+ * Task blocks on lock.
+ *
+@@ -958,6 +1367,8 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+ struct rt_mutex *next_lock;
+ int chain_walk = 0, res;
+
+ lockdep_assert_held(&lock->wait_lock);
+
-+ /*
-+ * Early deadlock detection. We really don't want the task to
-+ * enqueue on itself just to untangle the mess later. It's not
-+ * only an optimization. We drop the locks, so another waiter
-+ * can come in before the chain walk detects the deadlock. So
-+ * the other will detect the deadlock and return -EDEADLOCK,
-+ * which is wrong, as the other waiter is not in a deadlock
-+ * situation.
-+ */
-+ if (owner == task)
-+ return -EDEADLK;
-+
-+ raw_spin_lock(&task->pi_lock);
+ /*
+ * Early deadlock detection. We really don't want the task to
+ * enqueue on itself just to untangle the mess later. It's not
+@@ -971,10 +1382,28 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+ return -EDEADLK;
+
+ raw_spin_lock(&task->pi_lock);
+- __rt_mutex_adjust_prio(task);
+
+ /*
+ * In the case of futex requeue PI, this will be a proxy
@@ -14550,100 +14771,55 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on));
+
+ rt_mutex_adjust_prio(task);
-+ waiter->task = task;
-+ waiter->lock = lock;
-+ waiter->prio = task->prio;
+ waiter->task = task;
+ waiter->lock = lock;
+ waiter->prio = task->prio;
+ waiter->deadline = task->dl.deadline;
-+
-+ /* Get the top priority waiter on the lock */
-+ if (rt_mutex_has_waiters(lock))
-+ top_waiter = rt_mutex_top_waiter(lock);
-+ rt_mutex_enqueue(lock, waiter);
-+
-+ task->pi_blocked_on = waiter;
-+
-+ raw_spin_unlock(&task->pi_lock);
-+
-+ if (!owner)
-+ return 0;
-+
-+ raw_spin_lock(&owner->pi_lock);
-+ if (waiter == rt_mutex_top_waiter(lock)) {
-+ rt_mutex_dequeue_pi(owner, top_waiter);
-+ rt_mutex_enqueue_pi(owner, waiter);
-+
+
+ /* Get the top priority waiter on the lock */
+ if (rt_mutex_has_waiters(lock))
+@@ -993,8 +1422,8 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+ rt_mutex_dequeue_pi(owner, top_waiter);
+ rt_mutex_enqueue_pi(owner, waiter);
+
+- __rt_mutex_adjust_prio(owner);
+- if (owner->pi_blocked_on)
+ rt_mutex_adjust_prio(owner);
+ if (rt_mutex_real_waiter(owner->pi_blocked_on))
-+ chain_walk = 1;
-+ } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
-+ chain_walk = 1;
-+ }
-+
-+ /* Store the lock on which owner is blocked or NULL */
-+ next_lock = task_blocked_on_lock(owner);
-+
-+ raw_spin_unlock(&owner->pi_lock);
-+ /*
-+ * Even if full deadlock detection is on, if the owner is not
-+ * blocked itself, we can avoid finding this out in the chain
-+ * walk.
-+ */
-+ if (!chain_walk || !next_lock)
-+ return 0;
-+
-+ /*
-+ * The owner can't disappear while holding a lock,
-+ * so the owner struct is protected by wait_lock.
-+ * Gets dropped in rt_mutex_adjust_prio_chain()!
-+ */
-+ get_task_struct(owner);
-+
-+ raw_spin_unlock_irq(&lock->wait_lock);
-+
-+ res = rt_mutex_adjust_prio_chain(owner, chwalk, lock,
-+ next_lock, waiter, task);
-+
-+ raw_spin_lock_irq(&lock->wait_lock);
-+
-+ return res;
-+}
-+
-+/*
-+ * Remove the top waiter from the current tasks pi waiter tree and
-+ * queue it up.
-+ *
-+ * Called with lock->wait_lock held and interrupts disabled.
-+ */
-+static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
+ chain_walk = 1;
+ } else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
+ chain_walk = 1;
+@@ -1036,6 +1465,7 @@ static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
+ * Called with lock->wait_lock held and interrupts disabled.
+ */
+ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
+ struct wake_q_head *wake_sleeper_q,
-+ struct rt_mutex *lock)
-+{
-+ struct rt_mutex_waiter *waiter;
-+
-+ raw_spin_lock(&current->pi_lock);
-+
-+ waiter = rt_mutex_top_waiter(lock);
-+
-+ /*
+ struct rt_mutex *lock)
+ {
+ struct rt_mutex_waiter *waiter;
+@@ -1045,12 +1475,14 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
+ waiter = rt_mutex_top_waiter(lock);
+
+ /*
+- * Remove it from current->pi_waiters. We do not adjust a
+- * possible priority boost right now. We execute wakeup in the
+- * boosted mode and go back to normal after releasing
+- * lock->wait_lock.
+ * Remove it from current->pi_waiters and deboost.
+ *
+ * We must in fact deboost here in order to ensure we call
+ * rt_mutex_setprio() to update p->pi_top_task before the
+ * task unblocks.
-+ */
-+ rt_mutex_dequeue_pi(current, waiter);
+ */
+ rt_mutex_dequeue_pi(current, waiter);
+ rt_mutex_adjust_prio(current);
-+
-+ /*
-+ * As we are waking up the top waiter, and the waiter stays
-+ * queued on the lock until it gets the lock, this lock
-+ * obviously has waiters. Just set the bit here and this has
-+ * the added benefit of forcing all new tasks into the
-+ * slow path making sure no task of lower priority than
-+ * the top waiter can steal this lock.
-+ */
-+ lock->owner = (void *) RT_MUTEX_HAS_WAITERS;
-+
+
+ /*
+ * As we are waking up the top waiter, and the waiter stays
+@@ -1062,9 +1494,22 @@ static void mark_wakeup_next_waiter(struct wake_q_head *wake_q,
+ */
+ lock->owner = (void *) RT_MUTEX_HAS_WAITERS;
+
+ /*
+ * We deboosted before waking the top waiter task such that we don't
+ * run two tasks with the 'same' priority (and ensure the
@@ -14659,59 +14835,38 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ wake_q_add(wake_sleeper_q, waiter->task);
+ else
+ wake_q_add(wake_q, waiter->task);
-+ raw_spin_unlock(&current->pi_lock);
-+}
-+
-+/*
-+ * Remove a waiter from a lock and give up
-+ *
-+ * Must be called with lock->wait_lock held and interrupts disabled. I must
-+ * have just failed to try_to_take_rt_mutex().
-+ */
-+static void remove_waiter(struct rt_mutex *lock,
-+ struct rt_mutex_waiter *waiter)
-+{
-+ bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
-+ struct task_struct *owner = rt_mutex_owner(lock);
+ raw_spin_unlock(&current->pi_lock);
+-
+- wake_q_add(wake_q, waiter->task);
+ }
+
+ /*
+@@ -1078,7 +1523,9 @@ static void remove_waiter(struct rt_mutex *lock,
+ {
+ bool is_top_waiter = (waiter == rt_mutex_top_waiter(lock));
+ struct task_struct *owner = rt_mutex_owner(lock);
+- struct rt_mutex *next_lock;
+ struct rt_mutex *next_lock = NULL;
+
+ lockdep_assert_held(&lock->wait_lock);
-+
-+ raw_spin_lock(&current->pi_lock);
-+ rt_mutex_dequeue(lock, waiter);
-+ current->pi_blocked_on = NULL;
-+ raw_spin_unlock(&current->pi_lock);
-+
-+ /*
-+ * Only update priority if the waiter was the highest priority
-+ * waiter of the lock and there is an owner to update.
-+ */
-+ if (!owner || !is_top_waiter)
-+ return;
-+
-+ raw_spin_lock(&owner->pi_lock);
-+
-+ rt_mutex_dequeue_pi(owner, waiter);
-+
-+ if (rt_mutex_has_waiters(lock))
-+ rt_mutex_enqueue_pi(owner, rt_mutex_top_waiter(lock));
-+
+
+ raw_spin_lock(&current->pi_lock);
+ rt_mutex_dequeue(lock, waiter);
+@@ -1099,10 +1546,11 @@ static void remove_waiter(struct rt_mutex *lock,
+ if (rt_mutex_has_waiters(lock))
+ rt_mutex_enqueue_pi(owner, rt_mutex_top_waiter(lock));
+
+- __rt_mutex_adjust_prio(owner);
+ rt_mutex_adjust_prio(owner);
-+
-+ /* Store the lock on which owner is blocked or NULL */
+
+ /* Store the lock on which owner is blocked or NULL */
+- next_lock = task_blocked_on_lock(owner);
+ if (rt_mutex_real_waiter(owner->pi_blocked_on))
+ next_lock = task_blocked_on_lock(owner);
-+
-+ raw_spin_unlock(&owner->pi_lock);
-+
-+ /*
-+ * Don't walk the chain, if the owner task is not blocked
-+ * itself.
-+ */
- if (!next_lock)
- return;
-@@ -1138,21 +1586,30 @@
+ raw_spin_unlock(&owner->pi_lock);
+
+@@ -1138,21 +1586,30 @@ void rt_mutex_adjust_pi(struct task_struct *task)
raw_spin_lock_irqsave(&task->pi_lock, flags);
waiter = task->pi_blocked_on;
@@ -14745,7 +14900,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/**
* __rt_mutex_slowlock() - Perform the wait-wake-try-to-take loop
* @lock: the rt_mutex to take
-@@ -1166,7 +1623,8 @@
+@@ -1166,7 +1623,8 @@ void rt_mutex_adjust_pi(struct task_struct *task)
static int __sched
__rt_mutex_slowlock(struct rt_mutex *lock, int state,
struct hrtimer_sleeper *timeout,
@@ -14755,7 +14910,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
{
int ret = 0;
-@@ -1175,16 +1633,17 @@
+@@ -1175,16 +1633,17 @@ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
if (try_to_take_rt_mutex(lock, current, waiter))
break;
@@ -14783,36 +14938,10 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
if (ret)
break;
}
-@@ -1199,59 +1658,118 @@
- set_current_state(state);
+@@ -1223,21 +1682,148 @@ static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
}
+ }
-- __set_current_state(TASK_RUNNING);
-- return ret;
-+ __set_current_state(TASK_RUNNING);
-+ return ret;
-+}
-+
-+static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
-+ struct rt_mutex_waiter *w)
-+{
-+ /*
-+ * If the result is not -EDEADLOCK or the caller requested
-+ * deadlock detection, nothing to do here.
-+ */
-+ if (res != -EDEADLOCK || detect_deadlock)
-+ return;
-+
-+ /*
-+ * Yell lowdly and stop the task right here.
-+ */
-+ rt_mutex_print_deadlock(w);
-+ while (1) {
-+ set_current_state(TASK_INTERRUPTIBLE);
-+ schedule();
-+ }
-+}
-+
+static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww,
+ struct ww_acquire_ctx *ww_ctx)
+{
@@ -14851,78 +14980,44 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ DEBUG_LOCKS_WARN_ON(ww_ctx->ww_class != ww->ww_class);
+#endif
+ ww_ctx->acquired++;
- }
-
--static void rt_mutex_handle_deadlock(int res, int detect_deadlock,
-- struct rt_mutex_waiter *w)
++}
++
+#ifdef CONFIG_PREEMPT_RT_FULL
+static void ww_mutex_account_lock(struct rt_mutex *lock,
+ struct ww_acquire_ctx *ww_ctx)
- {
++{
+ struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock);
+ struct rt_mutex_waiter *waiter, *n;
+
- /*
-- * If the result is not -EDEADLOCK or the caller requested
-- * deadlock detection, nothing to do here.
++ /*
+ * This branch gets optimized out for the common case,
+ * and is only important for ww_mutex_lock.
- */
-- if (res != -EDEADLOCK || detect_deadlock)
-- return;
++ */
+ ww_mutex_lock_acquired(ww, ww_ctx);
+ ww->ctx = ww_ctx;
-
- /*
-- * Yell lowdly and stop the task right here.
++
++ /*
+ * Give any possible sleeping processes the chance to wake up,
+ * so they can recheck if they have to back off.
- */
-- rt_mutex_print_deadlock(w);
-- while (1) {
-- set_current_state(TASK_INTERRUPTIBLE);
-- schedule();
++ */
+ rbtree_postorder_for_each_entry_safe(waiter, n, &lock->waiters,
+ tree_entry) {
+ /* XXX debug rt mutex waiter wakeup */
+
+ BUG_ON(waiter->lock != lock);
+ rt_mutex_wake_waiter(waiter);
- }
- }
-
--/*
-- * Slow path lock function:
-- */
--static int __sched
--rt_mutex_slowlock(struct rt_mutex *lock, int state,
-- struct hrtimer_sleeper *timeout,
-- enum rtmutex_chainwalk chwalk)
--{
-- struct rt_mutex_waiter waiter;
-- unsigned long flags;
-- int ret = 0;
++ }
++}
++
+#else
-
-- debug_rt_mutex_init_waiter(&waiter);
-- RB_CLEAR_NODE(&waiter.pi_tree_entry);
-- RB_CLEAR_NODE(&waiter.tree_entry);
++
+static void ww_mutex_account_lock(struct rt_mutex *lock,
+ struct ww_acquire_ctx *ww_ctx)
+{
+ BUG();
+}
+#endif
-
-- /*
-- * Technically we could use raw_spin_[un]lock_irq() here, but this can
-- * be called in early boot if the cmpxchg() fast path is disabled
-- * (debug, no architecture support). In this case we will acquire the
-- * rtmutex with lock->wait_lock held. But we cannot unconditionally
-- * enable interrupts in that early boot case. So we need to use the
-- * irqsave/restore variants.
-- */
-- raw_spin_lock_irqsave(&lock->wait_lock, flags);
++
+int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
+ struct hrtimer_sleeper *timeout,
+ enum rtmutex_chainwalk chwalk,
@@ -14930,26 +15025,24 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ struct rt_mutex_waiter *waiter)
+{
+ int ret;
-
- /* Try to acquire the lock again: */
- if (try_to_take_rt_mutex(lock, current, NULL)) {
-- raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
++
++ /* Try to acquire the lock again: */
++ if (try_to_take_rt_mutex(lock, current, NULL)) {
+ if (ww_ctx)
+ ww_mutex_account_lock(lock, ww_ctx);
- return 0;
- }
-
-@@ -1261,17 +1779,27 @@
- if (unlikely(timeout))
- hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
-
-- ret = task_blocks_on_rt_mutex(lock, &waiter, current, chwalk);
++ return 0;
++ }
++
++ set_current_state(state);
++
++ /* Setup the timer, when timeout != NULL */
++ if (unlikely(timeout))
++ hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
++
+ ret = task_blocks_on_rt_mutex(lock, waiter, current, chwalk);
-
-- if (likely(!ret))
++
+ if (likely(!ret)) {
- /* sleep on the mutex */
-- ret = __rt_mutex_slowlock(lock, state, timeout, &waiter);
++ /* sleep on the mutex */
+ ret = __rt_mutex_slowlock(lock, state, timeout, waiter,
+ ww_ctx);
+ } else if (ww_ctx) {
@@ -14957,59 +15050,87 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ ret = __mutex_lock_check_stamp(lock, ww_ctx);
+ BUG_ON(!ret);
+ }
-
- if (unlikely(ret)) {
- __set_current_state(TASK_RUNNING);
- if (rt_mutex_has_waiters(lock))
-- remove_waiter(lock, &waiter);
-- rt_mutex_handle_deadlock(ret, chwalk, &waiter);
++
++ if (unlikely(ret)) {
++ __set_current_state(TASK_RUNNING);
++ if (rt_mutex_has_waiters(lock))
+ remove_waiter(lock, waiter);
+ /* ww_mutex want to report EDEADLK/EALREADY, let them */
+ if (!ww_ctx)
+ rt_mutex_handle_deadlock(ret, chwalk, waiter);
+ } else if (ww_ctx) {
+ ww_mutex_account_lock(lock, ww_ctx);
- }
-
- /*
-@@ -1279,6 +1807,36 @@
- * unconditionally. We might have to fix that up.
- */
- fixup_rt_mutex_waiters(lock);
++ }
++
++ /*
++ * try_to_take_rt_mutex() sets the waiter bit
++ * unconditionally. We might have to fix that up.
++ */
++ fixup_rt_mutex_waiters(lock);
+ return ret;
+}
+
-+/*
-+ * Slow path lock function:
-+ */
-+static int __sched
-+rt_mutex_slowlock(struct rt_mutex *lock, int state,
-+ struct hrtimer_sleeper *timeout,
+ /*
+ * Slow path lock function:
+ */
+ static int __sched
+ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+ struct hrtimer_sleeper *timeout,
+- enum rtmutex_chainwalk chwalk)
+ enum rtmutex_chainwalk chwalk,
+ struct ww_acquire_ctx *ww_ctx)
-+{
-+ struct rt_mutex_waiter waiter;
-+ unsigned long flags;
-+ int ret = 0;
-+
+ {
+ struct rt_mutex_waiter waiter;
+ unsigned long flags;
+ int ret = 0;
+
+- debug_rt_mutex_init_waiter(&waiter);
+- RB_CLEAR_NODE(&waiter.pi_tree_entry);
+- RB_CLEAR_NODE(&waiter.tree_entry);
+ rt_mutex_init_waiter(&waiter, false);
-+
-+ /*
-+ * Technically we could use raw_spin_[un]lock_irq() here, but this can
-+ * be called in early boot if the cmpxchg() fast path is disabled
-+ * (debug, no architecture support). In this case we will acquire the
-+ * rtmutex with lock->wait_lock held. But we cannot unconditionally
-+ * enable interrupts in that early boot case. So we need to use the
-+ * irqsave/restore variants.
-+ */
-+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
-+
+
+ /*
+ * Technically we could use raw_spin_[un]lock_irq() here, but this can
+@@ -1249,36 +1835,8 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+ */
+ raw_spin_lock_irqsave(&lock->wait_lock, flags);
+
+- /* Try to acquire the lock again: */
+- if (try_to_take_rt_mutex(lock, current, NULL)) {
+- raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
+- return 0;
+- }
+-
+- set_current_state(state);
+-
+- /* Setup the timer, when timeout != NULL */
+- if (unlikely(timeout))
+- hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
+-
+- ret = task_blocks_on_rt_mutex(lock, &waiter, current, chwalk);
+-
+- if (likely(!ret))
+- /* sleep on the mutex */
+- ret = __rt_mutex_slowlock(lock, state, timeout, &waiter);
+-
+- if (unlikely(ret)) {
+- __set_current_state(TASK_RUNNING);
+- if (rt_mutex_has_waiters(lock))
+- remove_waiter(lock, &waiter);
+- rt_mutex_handle_deadlock(ret, chwalk, &waiter);
+- }
+-
+- /*
+- * try_to_take_rt_mutex() sets the waiter bit
+- * unconditionally. We might have to fix that up.
+- */
+- fixup_rt_mutex_waiters(lock);
+ ret = rt_mutex_slowlock_locked(lock, state, timeout, chwalk, ww_ctx,
+ &waiter);
raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
-@@ -1328,10 +1886,12 @@
+@@ -1328,10 +1886,12 @@ static inline int rt_mutex_slowtrylock(struct rt_mutex *lock)
/*
* Slow path to release a rt-mutex.
@@ -15024,7 +15145,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
{
unsigned long flags;
-@@ -1340,8 +1900,6 @@
+@@ -1340,8 +1900,6 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
debug_rt_mutex_unlock(lock);
@@ -15033,7 +15154,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/*
* We must be careful here if the fast path is enabled. If we
* have no waiters queued we cannot set owner to NULL here
-@@ -1387,12 +1945,10 @@
+@@ -1387,12 +1945,10 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
*
* Queue the next waiter for wakeup once we release the wait_lock.
*/
@@ -15048,7 +15169,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/*
-@@ -1403,63 +1959,85 @@
+@@ -1403,63 +1959,85 @@ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
*/
static inline int
rt_mutex_fastlock(struct rt_mutex *lock, int state,
@@ -15157,7 +15278,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/**
-@@ -1469,15 +2047,13 @@
+@@ -1469,15 +2047,13 @@ rt_mutex_fastunlock(struct rt_mutex *lock,
*/
void __sched rt_mutex_lock(struct rt_mutex *lock)
{
@@ -15175,7 +15296,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
* @lock: the rt_mutex to be locked
*
* Returns:
-@@ -1486,23 +2062,32 @@
+@@ -1486,23 +2062,32 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock);
*/
int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
{
@@ -15219,7 +15340,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/**
-@@ -1525,6 +2110,7 @@
+@@ -1525,6 +2110,7 @@ rt_mutex_timed_lock(struct rt_mutex *lock, struct hrtimer_sleeper *timeout)
return rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
RT_MUTEX_MIN_CHAINWALK,
@@ -15227,7 +15348,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
rt_mutex_slowlock);
}
EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
-@@ -1542,7 +2128,11 @@
+@@ -1542,7 +2128,11 @@ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
*/
int __sched rt_mutex_trylock(struct rt_mutex *lock)
{
@@ -15239,14 +15360,26 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
return 0;
return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
-@@ -1560,21 +2150,53 @@
+@@ -1560,21 +2150,53 @@ void __sched rt_mutex_unlock(struct rt_mutex *lock)
}
EXPORT_SYMBOL_GPL(rt_mutex_unlock);
+-/**
+- * rt_mutex_futex_unlock - Futex variant of rt_mutex_unlock
+- * @lock: the rt_mutex to be unlocked
+- *
+- * Returns: true/false indicating whether priority adjustment is
+- * required or not.
+- */
+-bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
+- struct wake_q_head *wqh)
+static bool __sched __rt_mutex_unlock_common(struct rt_mutex *lock,
+ struct wake_q_head *wake_q,
+ struct wake_q_head *wq_sleeper)
-+{
+ {
+- if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
+- rt_mutex_deadlock_account_unlock(current);
+- return false;
+ lockdep_assert_held(&lock->wait_lock);
+
+ debug_rt_mutex_unlock(lock);
@@ -15254,7 +15387,8 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ if (!rt_mutex_has_waiters(lock)) {
+ lock->owner = NULL;
+ return false; /* done */
-+ }
+ }
+- return rt_mutex_slowunlock(lock, wqh);
+
+ /*
+ * We've already deboosted, mark_wakeup_next_waiter() will
@@ -15267,26 +15401,14 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ return true; /* call postunlock() */
+}
+
- /**
-- * rt_mutex_futex_unlock - Futex variant of rt_mutex_unlock
-- * @lock: the rt_mutex to be unlocked
-- *
-- * Returns: true/false indicating whether priority adjustment is
-- * required or not.
++/**
+ * Futex variant, that since futex variants do not use the fast-path, can be
+ * simple and will not need to retry.
- */
--bool __sched rt_mutex_futex_unlock(struct rt_mutex *lock,
-- struct wake_q_head *wqh)
++ */
+bool __sched __rt_mutex_futex_unlock(struct rt_mutex *lock,
+ struct wake_q_head *wake_q,
+ struct wake_q_head *wq_sleeper)
- {
-- if (likely(rt_mutex_cmpxchg_release(lock, current, NULL))) {
-- rt_mutex_deadlock_account_unlock(current);
-- return false;
-- }
-- return rt_mutex_slowunlock(lock, wqh);
++{
+ return __rt_mutex_unlock_common(lock, wake_q, wq_sleeper);
+}
+
@@ -15305,7 +15427,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/**
-@@ -1607,13 +2229,12 @@
+@@ -1607,13 +2229,12 @@ EXPORT_SYMBOL_GPL(rt_mutex_destroy);
void __rt_mutex_init(struct rt_mutex *lock, const char *name)
{
lock->owner = NULL;
@@ -15320,7 +15442,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
/**
* rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
-@@ -1628,10 +2249,9 @@
+@@ -1628,10 +2249,9 @@ EXPORT_SYMBOL_GPL(__rt_mutex_init);
void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
struct task_struct *proxy_owner)
{
@@ -15332,38 +15454,22 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
}
/**
-@@ -1647,34 +2267,45 @@
+@@ -1647,7 +2267,66 @@ void rt_mutex_proxy_unlock(struct rt_mutex *lock,
{
debug_rt_mutex_proxy_unlock(lock);
rt_mutex_set_owner(lock, NULL);
- rt_mutex_deadlock_account_unlock(proxy_owner);
- }
-
--/**
-- * rt_mutex_start_proxy_lock() - Start lock acquisition for another task
-- * @lock: the rt_mutex to take
-- * @waiter: the pre-initialized rt_mutex_waiter
-- * @task: the task to prepare
-- *
-- * Returns:
-- * 0 - task blocked on lock
-- * 1 - acquired the lock for task, caller should wake it up
-- * <0 - error
-- *
-- * Special API call for FUTEX_REQUEUE_PI support.
-- */
--int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
++}
++
+int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
- struct rt_mutex_waiter *waiter,
- struct task_struct *task)
- {
- int ret;
-
-- raw_spin_lock_irq(&lock->wait_lock);
++ struct rt_mutex_waiter *waiter,
++ struct task_struct *task)
++{
++ int ret;
++
+ if (try_to_take_rt_mutex(lock, task, NULL))
+ return 1;
-
-- if (try_to_take_rt_mutex(lock, task, NULL)) {
++
+#ifdef CONFIG_PREEMPT_RT_FULL
+ /*
+ * In PREEMPT_RT there's an added race.
@@ -15386,62 +15492,72 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ raw_spin_lock(&task->pi_lock);
+ if (task->pi_blocked_on) {
+ raw_spin_unlock(&task->pi_lock);
- raw_spin_unlock_irq(&lock->wait_lock);
-- return 1;
++ raw_spin_unlock_irq(&lock->wait_lock);
+ return -EAGAIN;
- }
++ }
+ task->pi_blocked_on = PI_REQUEUE_INPROGRESS;
+ raw_spin_unlock(&task->pi_lock);
+#endif
++
++ /* We enforce deadlock detection for futexes */
++ ret = task_blocks_on_rt_mutex(lock, waiter, task,
++ RT_MUTEX_FULL_CHAINWALK);
++
++ if (ret && !rt_mutex_owner(lock)) {
++ /*
++ * Reset the return value. We might have
++ * returned with -EDEADLK and the owner
++ * released the lock while we were walking the
++ * pi chain. Let the waiter sort it out.
++ */
++ ret = 0;
++ }
++
++ if (ret && rt_mutex_has_waiters(lock))
++ remove_waiter(lock, waiter);
++
++ debug_rt_mutex_print_deadlock(waiter);
++
++ return ret;
+ }
- /* We enforce deadlock detection for futexes */
- ret = task_blocks_on_rt_mutex(lock, waiter, task,
-@@ -1690,17 +2321,41 @@
- ret = 0;
- }
+ /**
+@@ -1670,33 +2349,9 @@ int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+ int ret;
+ raw_spin_lock_irq(&lock->wait_lock);
+-
+- if (try_to_take_rt_mutex(lock, task, NULL)) {
+- raw_spin_unlock_irq(&lock->wait_lock);
+- return 1;
+- }
+-
+- /* We enforce deadlock detection for futexes */
+- ret = task_blocks_on_rt_mutex(lock, waiter, task,
+- RT_MUTEX_FULL_CHAINWALK);
+-
+- if (ret && !rt_mutex_owner(lock)) {
+- /*
+- * Reset the return value. We might have
+- * returned with -EDEADLK and the owner
+- * released the lock while we were walking the
+- * pi chain. Let the waiter sort it out.
+- */
+- ret = 0;
+- }
+-
- if (unlikely(ret))
-+ if (ret && rt_mutex_has_waiters(lock))
- remove_waiter(lock, waiter);
-
-- raw_spin_unlock_irq(&lock->wait_lock);
+- remove_waiter(lock, waiter);
-
- debug_rt_mutex_print_deadlock(waiter);
++ ret = __rt_mutex_start_proxy_lock(lock, waiter, task);
+ raw_spin_unlock_irq(&lock->wait_lock);
+- debug_rt_mutex_print_deadlock(waiter);
+-
return ret;
}
- /**
-+ * rt_mutex_start_proxy_lock() - Start lock acquisition for another task
-+ * @lock: the rt_mutex to take
-+ * @waiter: the pre-initialized rt_mutex_waiter
-+ * @task: the task to prepare
-+ *
-+ * Returns:
-+ * 0 - task blocked on lock
-+ * 1 - acquired the lock for task, caller should wake it up
-+ * <0 - error
-+ *
-+ * Special API call for FUTEX_REQUEUE_PI support.
-+ */
-+int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
-+ struct rt_mutex_waiter *waiter,
-+ struct task_struct *task)
-+{
-+ int ret;
-+
-+ raw_spin_lock_irq(&lock->wait_lock);
-+ ret = __rt_mutex_start_proxy_lock(lock, waiter, task);
-+ raw_spin_unlock_irq(&lock->wait_lock);
-+
-+ return ret;
-+}
-+
-+/**
- * rt_mutex_next_owner - return the next owner of the lock
- *
- * @lock: the rt lock query
-@@ -1721,24 +2376,27 @@
+@@ -1721,36 +2376,106 @@ struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock)
}
/**
@@ -15473,13 +15589,20 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
int ret;
raw_spin_lock_irq(&lock->wait_lock);
-@@ -1746,10 +2404,65 @@
- set_current_state(TASK_INTERRUPTIBLE);
-
+-
+- set_current_state(TASK_INTERRUPTIBLE);
+-
/* sleep on the mutex */
- ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter);
++ set_current_state(TASK_INTERRUPTIBLE);
+ ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter, NULL);
-+
++ /*
++ * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might
++ * have to fix that up.
++ */
++ fixup_rt_mutex_waiters(lock);
+
+- if (unlikely(ret))
+ /*
+ * RT has a problem here when the wait got interrupted by a timeout
+ * or a signal. task->pi_blocked_on is still set. The task must
@@ -15497,7 +15620,6 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ tsk->pi_blocked_on = NULL;
+ raw_spin_unlock(&tsk->pi_lock);
+ }
-+
+ raw_spin_unlock_irq(&lock->wait_lock);
+
+ return ret;
@@ -15526,22 +15648,33 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ struct rt_mutex_waiter *waiter)
+{
+ bool cleanup = false;
-
-- if (unlikely(ret))
++
+ raw_spin_lock_irq(&lock->wait_lock);
+ /*
++ * Do an unconditional try-lock, this deals with the lock stealing
++ * state where __rt_mutex_futex_unlock() -> mark_wakeup_next_waiter()
++ * sets a NULL owner.
++ *
++ * We're not interested in the return value, because the subsequent
++ * test on rt_mutex_owner() will infer that. If the trylock succeeded,
++ * we will own the lock and it will have removed the waiter. If we
++ * failed the trylock, we're still not owner and we need to remove
++ * ourselves.
++ */
++ try_to_take_rt_mutex(lock, current, waiter);
++ /*
+ * Unless we're the owner; we're still enqueued on the wait_list.
+ * So check if we became owner, if not, take us off the wait_list.
+ */
+ if (rt_mutex_owner(lock) != current) {
remove_waiter(lock, waiter);
-+ fixup_rt_mutex_waiters(lock);
+-
+ cleanup = true;
+ }
-
/*
* try_to_take_rt_mutex() sets the waiter bit unconditionally. We might
-@@ -1759,5 +2472,91 @@
+ * have to fix that up.
+@@ -1759,5 +2484,91 @@ int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
raw_spin_unlock_irq(&lock->wait_lock);
@@ -15589,8 +15722,8 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ else if (!ret && ww_ctx->acquired > 1)
+ return ww_mutex_deadlock_injection(lock, ww_ctx);
+
-+ return ret;
-+}
+ return ret;
+ }
+EXPORT_SYMBOL_GPL(__ww_mutex_lock_interruptible);
+
+int __sched
@@ -15607,8 +15740,8 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+ else if (!ret && ww_ctx->acquired > 1)
+ return ww_mutex_deadlock_injection(lock, ww_ctx);
+
- return ret;
- }
++ return ret;
++}
+EXPORT_SYMBOL_GPL(__ww_mutex_lock);
+
+void __sched ww_mutex_unlock(struct ww_mutex *lock)
@@ -15633,10 +15766,24 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.c linux-4.9.28/kernel/locking
+}
+EXPORT_SYMBOL(ww_mutex_unlock);
+#endif
-diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex_common.h linux-4.9.28/kernel/locking/rtmutex_common.h
---- linux-4.9.28.orig/kernel/locking/rtmutex_common.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/rtmutex_common.h 2017-05-19 03:37:25.186176955 +0200
-@@ -27,12 +27,14 @@
+diff --git a/kernel/locking/rtmutex.h b/kernel/locking/rtmutex.h
+index c4060584c407..6607802efa8b 100644
+--- a/kernel/locking/rtmutex.h
++++ b/kernel/locking/rtmutex.h
+@@ -11,8 +11,6 @@
+ */
+
+ #define rt_mutex_deadlock_check(l) (0)
+-#define rt_mutex_deadlock_account_lock(m, t) do { } while (0)
+-#define rt_mutex_deadlock_account_unlock(l) do { } while (0)
+ #define debug_rt_mutex_init_waiter(w) do { } while (0)
+ #define debug_rt_mutex_free_waiter(w) do { } while (0)
+ #define debug_rt_mutex_lock(l) do { } while (0)
+diff --git a/kernel/locking/rtmutex_common.h b/kernel/locking/rtmutex_common.h
+index e317e1cbb3eb..64d89d780059 100644
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -27,12 +27,14 @@ struct rt_mutex_waiter {
struct rb_node pi_tree_entry;
struct task_struct *task;
struct rt_mutex *lock;
@@ -15651,7 +15798,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex_common.h linux-4.9.28/kernel/
};
/*
-@@ -98,21 +100,45 @@
+@@ -98,21 +100,45 @@ enum rtmutex_chainwalk {
/*
* PI-futex support (proxy locking functions, etc.):
*/
@@ -15704,50 +15851,11 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex_common.h linux-4.9.28/kernel/
#ifdef CONFIG_DEBUG_RT_MUTEXES
# include "rtmutex-debug.h"
-diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex-debug.c linux-4.9.28/kernel/locking/rtmutex-debug.c
---- linux-4.9.28.orig/kernel/locking/rtmutex-debug.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/rtmutex-debug.c 2017-05-19 03:37:25.186176955 +0200
-@@ -173,12 +173,3 @@
- lock->name = name;
- }
-
--void
--rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task)
--{
--}
--
--void rt_mutex_deadlock_account_unlock(struct task_struct *task)
--{
--}
--
-diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex-debug.h linux-4.9.28/kernel/locking/rtmutex-debug.h
---- linux-4.9.28.orig/kernel/locking/rtmutex-debug.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/rtmutex-debug.h 2017-05-19 03:37:25.186176955 +0200
-@@ -9,9 +9,6 @@
- * This file contains macros used solely by rtmutex.c. Debug version.
- */
-
--extern void
--rt_mutex_deadlock_account_lock(struct rt_mutex *lock, struct task_struct *task);
--extern void rt_mutex_deadlock_account_unlock(struct task_struct *task);
- extern void debug_rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
- extern void debug_rt_mutex_free_waiter(struct rt_mutex_waiter *waiter);
- extern void debug_rt_mutex_init(struct rt_mutex *lock, const char *name);
-diff -Nur linux-4.9.28.orig/kernel/locking/rtmutex.h linux-4.9.28/kernel/locking/rtmutex.h
---- linux-4.9.28.orig/kernel/locking/rtmutex.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/rtmutex.h 2017-05-19 03:37:25.186176955 +0200
-@@ -11,8 +11,6 @@
- */
-
- #define rt_mutex_deadlock_check(l) (0)
--#define rt_mutex_deadlock_account_lock(m, t) do { } while (0)
--#define rt_mutex_deadlock_account_unlock(l) do { } while (0)
- #define debug_rt_mutex_init_waiter(w) do { } while (0)
- #define debug_rt_mutex_free_waiter(w) do { } while (0)
- #define debug_rt_mutex_lock(l) do { } while (0)
-diff -Nur linux-4.9.28.orig/kernel/locking/rwsem-rt.c linux-4.9.28/kernel/locking/rwsem-rt.c
---- linux-4.9.28.orig/kernel/locking/rwsem-rt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/kernel/locking/rwsem-rt.c 2017-05-19 03:37:25.186176955 +0200
+diff --git a/kernel/locking/rwsem-rt.c b/kernel/locking/rwsem-rt.c
+new file mode 100644
+index 000000000000..4a708ffcded6
+--- /dev/null
++++ b/kernel/locking/rwsem-rt.c
@@ -0,0 +1,268 @@
+/*
+ */
@@ -16017,10 +16125,11 @@ diff -Nur linux-4.9.28.orig/kernel/locking/rwsem-rt.c linux-4.9.28/kernel/lockin
+ /* Release it and account current as reader */
+ __up_write_unlock(sem, WRITER_BIAS - 1, flags);
+}
-diff -Nur linux-4.9.28.orig/kernel/locking/spinlock.c linux-4.9.28/kernel/locking/spinlock.c
---- linux-4.9.28.orig/kernel/locking/spinlock.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/spinlock.c 2017-05-19 03:37:25.186176955 +0200
-@@ -124,8 +124,11 @@
+diff --git a/kernel/locking/spinlock.c b/kernel/locking/spinlock.c
+index db3ccb1dd614..909779647bd1 100644
+--- a/kernel/locking/spinlock.c
++++ b/kernel/locking/spinlock.c
+@@ -124,8 +124,11 @@ void __lockfunc __raw_##op##_lock_bh(locktype##_t *lock) \
* __[spin|read|write]_lock_bh()
*/
BUILD_LOCK_OPS(spin, raw_spinlock);
@@ -16032,7 +16141,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/spinlock.c linux-4.9.28/kernel/lockin
#endif
-@@ -209,6 +212,8 @@
+@@ -209,6 +212,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_spinlock_t *lock)
EXPORT_SYMBOL(_raw_spin_unlock_bh);
#endif
@@ -16041,7 +16150,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/spinlock.c linux-4.9.28/kernel/lockin
#ifndef CONFIG_INLINE_READ_TRYLOCK
int __lockfunc _raw_read_trylock(rwlock_t *lock)
{
-@@ -353,6 +358,8 @@
+@@ -353,6 +358,8 @@ void __lockfunc _raw_write_unlock_bh(rwlock_t *lock)
EXPORT_SYMBOL(_raw_write_unlock_bh);
#endif
@@ -16050,10 +16159,11 @@ diff -Nur linux-4.9.28.orig/kernel/locking/spinlock.c linux-4.9.28/kernel/lockin
#ifdef CONFIG_DEBUG_LOCK_ALLOC
void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
-diff -Nur linux-4.9.28.orig/kernel/locking/spinlock_debug.c linux-4.9.28/kernel/locking/spinlock_debug.c
---- linux-4.9.28.orig/kernel/locking/spinlock_debug.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/locking/spinlock_debug.c 2017-05-19 03:37:25.190177110 +0200
-@@ -31,6 +31,7 @@
+diff --git a/kernel/locking/spinlock_debug.c b/kernel/locking/spinlock_debug.c
+index 0374a596cffa..94970338d518 100644
+--- a/kernel/locking/spinlock_debug.c
++++ b/kernel/locking/spinlock_debug.c
+@@ -31,6 +31,7 @@ void __raw_spin_lock_init(raw_spinlock_t *lock, const char *name,
EXPORT_SYMBOL(__raw_spin_lock_init);
@@ -16061,7 +16171,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/spinlock_debug.c linux-4.9.28/kernel/
void __rwlock_init(rwlock_t *lock, const char *name,
struct lock_class_key *key)
{
-@@ -48,6 +49,7 @@
+@@ -48,6 +49,7 @@ void __rwlock_init(rwlock_t *lock, const char *name,
}
EXPORT_SYMBOL(__rwlock_init);
@@ -16069,7 +16179,7 @@ diff -Nur linux-4.9.28.orig/kernel/locking/spinlock_debug.c linux-4.9.28/kernel/
static void spin_dump(raw_spinlock_t *lock, const char *msg)
{
-@@ -159,6 +161,7 @@
+@@ -159,6 +161,7 @@ void do_raw_spin_unlock(raw_spinlock_t *lock)
arch_spin_unlock(&lock->raw_lock);
}
@@ -16077,16 +16187,17 @@ diff -Nur linux-4.9.28.orig/kernel/locking/spinlock_debug.c linux-4.9.28/kernel/
static void rwlock_bug(rwlock_t *lock, const char *msg)
{
if (!debug_locks_off())
-@@ -300,3 +303,5 @@
+@@ -300,3 +303,5 @@ void do_raw_write_unlock(rwlock_t *lock)
debug_write_unlock(lock);
arch_write_unlock(&lock->raw_lock);
}
+
+#endif
-diff -Nur linux-4.9.28.orig/kernel/module.c linux-4.9.28/kernel/module.c
---- linux-4.9.28.orig/kernel/module.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/module.c 2017-05-19 03:37:25.190177110 +0200
-@@ -660,16 +660,7 @@
+diff --git a/kernel/module.c b/kernel/module.c
+index 0e54d5bf0097..f27764fbfa24 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -660,16 +660,7 @@ static void percpu_modcopy(struct module *mod,
memcpy(per_cpu_ptr(mod->percpu, cpu), from, size);
}
@@ -16104,7 +16215,7 @@ diff -Nur linux-4.9.28.orig/kernel/module.c linux-4.9.28/kernel/module.c
{
struct module *mod;
unsigned int cpu;
-@@ -683,9 +674,15 @@
+@@ -683,9 +674,15 @@ bool is_module_percpu_address(unsigned long addr)
continue;
for_each_possible_cpu(cpu) {
void *start = per_cpu_ptr(mod->percpu, cpu);
@@ -16122,7 +16233,7 @@ diff -Nur linux-4.9.28.orig/kernel/module.c linux-4.9.28/kernel/module.c
preempt_enable();
return true;
}
-@@ -696,6 +693,20 @@
+@@ -696,6 +693,20 @@ bool is_module_percpu_address(unsigned long addr)
return false;
}
@@ -16143,22 +16254,23 @@ diff -Nur linux-4.9.28.orig/kernel/module.c linux-4.9.28/kernel/module.c
#else /* ... !CONFIG_SMP */
static inline void __percpu *mod_percpu(struct module *mod)
-@@ -726,6 +737,11 @@
- {
+@@ -727,6 +738,11 @@ bool is_module_percpu_address(unsigned long addr)
return false;
}
-+
+
+bool __is_module_percpu_address(unsigned long addr, unsigned long *can_addr)
+{
+ return false;
+}
-
++
#endif /* CONFIG_SMP */
-diff -Nur linux-4.9.28.orig/kernel/panic.c linux-4.9.28/kernel/panic.c
---- linux-4.9.28.orig/kernel/panic.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/panic.c 2017-05-19 03:37:25.190177110 +0200
-@@ -482,9 +482,11 @@
+ #define MODINFO_ATTR(field) \
+diff --git a/kernel/panic.c b/kernel/panic.c
+index e6480e20379e..7e9c1918a94e 100644
+--- a/kernel/panic.c
++++ b/kernel/panic.c
+@@ -482,9 +482,11 @@ static u64 oops_id;
static int init_oops_id(void)
{
@@ -16170,10 +16282,11 @@ diff -Nur linux-4.9.28.orig/kernel/panic.c linux-4.9.28/kernel/panic.c
oops_id++;
return 0;
-diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/hibernate.c
---- linux-4.9.28.orig/kernel/power/hibernate.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/power/hibernate.c 2017-05-19 03:37:25.190177110 +0200
-@@ -286,6 +286,8 @@
+diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c
+index b26dbc48c75b..968255f27a33 100644
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -286,6 +286,8 @@ static int create_image(int platform_mode)
local_irq_disable();
@@ -16182,7 +16295,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
error = syscore_suspend();
if (error) {
printk(KERN_ERR "PM: Some system devices failed to power down, "
-@@ -317,6 +319,7 @@
+@@ -317,6 +319,7 @@ static int create_image(int platform_mode)
syscore_resume();
Enable_irqs:
@@ -16190,7 +16303,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
local_irq_enable();
Enable_cpus:
-@@ -446,6 +449,7 @@
+@@ -446,6 +449,7 @@ static int resume_target_kernel(bool platform_mode)
goto Enable_cpus;
local_irq_disable();
@@ -16198,7 +16311,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
error = syscore_suspend();
if (error)
-@@ -479,6 +483,7 @@
+@@ -479,6 +483,7 @@ static int resume_target_kernel(bool platform_mode)
syscore_resume();
Enable_irqs:
@@ -16206,7 +16319,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
local_irq_enable();
Enable_cpus:
-@@ -564,6 +569,7 @@
+@@ -564,6 +569,7 @@ int hibernation_platform_enter(void)
goto Enable_cpus;
local_irq_disable();
@@ -16214,7 +16327,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
syscore_suspend();
if (pm_wakeup_pending()) {
error = -EAGAIN;
-@@ -576,6 +582,7 @@
+@@ -576,6 +582,7 @@ int hibernation_platform_enter(void)
Power_up:
syscore_resume();
@@ -16222,7 +16335,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
local_irq_enable();
Enable_cpus:
-@@ -676,6 +683,10 @@
+@@ -676,6 +683,10 @@ static int load_image_and_restore(void)
return error;
}
@@ -16233,7 +16346,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
/**
* hibernate - Carry out system hibernation, including saving the image.
*/
-@@ -689,6 +700,8 @@
+@@ -689,6 +700,8 @@ int hibernate(void)
return -EPERM;
}
@@ -16242,7 +16355,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
lock_system_sleep();
/* The snapshot device should not be opened while we're running */
if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
-@@ -766,6 +779,7 @@
+@@ -766,6 +779,7 @@ int hibernate(void)
atomic_inc(&snapshot_device_available);
Unlock:
unlock_system_sleep();
@@ -16250,10 +16363,11 @@ diff -Nur linux-4.9.28.orig/kernel/power/hibernate.c linux-4.9.28/kernel/power/h
return error;
}
-diff -Nur linux-4.9.28.orig/kernel/power/suspend.c linux-4.9.28/kernel/power/suspend.c
---- linux-4.9.28.orig/kernel/power/suspend.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/power/suspend.c 2017-05-19 03:37:25.190177110 +0200
-@@ -369,6 +369,8 @@
+diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
+index 6ccb08f57fcb..c8cbb5ed2fe3 100644
+--- a/kernel/power/suspend.c
++++ b/kernel/power/suspend.c
+@@ -369,6 +369,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
arch_suspend_disable_irqs();
BUG_ON(!irqs_disabled());
@@ -16262,7 +16376,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/suspend.c linux-4.9.28/kernel/power/sus
error = syscore_suspend();
if (!error) {
*wakeup = pm_wakeup_pending();
-@@ -385,6 +387,8 @@
+@@ -385,6 +387,8 @@ static int suspend_enter(suspend_state_t state, bool *wakeup)
syscore_resume();
}
@@ -16271,7 +16385,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/suspend.c linux-4.9.28/kernel/power/sus
arch_suspend_enable_irqs();
BUG_ON(irqs_disabled());
-@@ -527,6 +531,8 @@
+@@ -527,6 +531,8 @@ static int enter_state(suspend_state_t state)
return error;
}
@@ -16280,7 +16394,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/suspend.c linux-4.9.28/kernel/power/sus
/**
* pm_suspend - Externally visible function for suspending the system.
* @state: System sleep state to enter.
-@@ -541,6 +547,8 @@
+@@ -541,6 +547,8 @@ int pm_suspend(suspend_state_t state)
if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
return -EINVAL;
@@ -16289,7 +16403,7 @@ diff -Nur linux-4.9.28.orig/kernel/power/suspend.c linux-4.9.28/kernel/power/sus
error = enter_state(state);
if (error) {
suspend_stats.fail++;
-@@ -548,6 +556,7 @@
+@@ -548,6 +556,7 @@ int pm_suspend(suspend_state_t state)
} else {
suspend_stats.success++;
}
@@ -16297,10 +16411,11 @@ diff -Nur linux-4.9.28.orig/kernel/power/suspend.c linux-4.9.28/kernel/power/sus
return error;
}
EXPORT_SYMBOL(pm_suspend);
-diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/printk.c
---- linux-4.9.28.orig/kernel/printk/printk.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/printk/printk.c 2017-05-19 03:37:25.190177110 +0200
-@@ -351,6 +351,65 @@
+diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
+index 9c5b231684d0..cf15bdb6855b 100644
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -351,6 +351,65 @@ __packed __aligned(4)
*/
DEFINE_RAW_SPINLOCK(logbuf_lock);
@@ -16366,7 +16481,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
#ifdef CONFIG_PRINTK
DECLARE_WAIT_QUEUE_HEAD(log_wait);
/* the next printk record to read by syslog(READ) or /proc/kmsg */
-@@ -1337,6 +1396,7 @@
+@@ -1337,6 +1396,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
{
char *text;
int len = 0;
@@ -16374,7 +16489,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
if (!text)
-@@ -1348,6 +1408,14 @@
+@@ -1348,6 +1408,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
u64 seq;
u32 idx;
enum log_flags prev;
@@ -16389,7 +16504,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
/*
* Find first record that fits, including all following records,
-@@ -1363,6 +1431,14 @@
+@@ -1363,6 +1431,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
prev = msg->flags;
idx = log_next(idx);
seq++;
@@ -16404,7 +16519,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
}
/* move first record forward until length fits into the buffer */
-@@ -1376,6 +1452,14 @@
+@@ -1376,6 +1452,14 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
prev = msg->flags;
idx = log_next(idx);
seq++;
@@ -16419,7 +16534,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
}
/* last message fitting into this dump */
-@@ -1416,6 +1500,7 @@
+@@ -1416,6 +1500,7 @@ static int syslog_print_all(char __user *buf, int size, bool clear)
clear_seq = log_next_seq;
clear_idx = log_next_idx;
}
@@ -16427,7 +16542,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
raw_spin_unlock_irq(&logbuf_lock);
kfree(text);
-@@ -1569,6 +1654,12 @@
+@@ -1569,6 +1654,12 @@ static void call_console_drivers(int level,
if (!console_drivers)
return;
@@ -16440,7 +16555,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
for_each_console(con) {
if (exclusive_console && con != exclusive_console)
continue;
-@@ -1584,6 +1675,7 @@
+@@ -1584,6 +1675,7 @@ static void call_console_drivers(int level,
else
con->write(con, text, len);
}
@@ -16448,7 +16563,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
}
/*
-@@ -1781,6 +1873,13 @@
+@@ -1781,6 +1873,13 @@ asmlinkage int vprintk_emit(int facility, int level,
/* cpu currently holding logbuf_lock in this function */
static unsigned int logbuf_cpu = UINT_MAX;
@@ -16462,7 +16577,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
if (level == LOGLEVEL_SCHED) {
level = LOGLEVEL_DEFAULT;
in_sched = true;
-@@ -1885,13 +1984,23 @@
+@@ -1885,13 +1984,23 @@ asmlinkage int vprintk_emit(int facility, int level,
/* If called from the scheduler, we can not call up(). */
if (!in_sched) {
@@ -16487,7 +16602,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
console_unlock();
lockdep_on();
}
-@@ -2014,26 +2123,6 @@
+@@ -2014,26 +2123,6 @@ DEFINE_PER_CPU(printk_func_t, printk_func);
#endif /* CONFIG_PRINTK */
@@ -16514,7 +16629,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
static int __add_preferred_console(char *name, int idx, char *options,
char *brl_options)
{
-@@ -2303,11 +2392,16 @@
+@@ -2303,11 +2392,16 @@ static void console_cont_flush(char *text, size_t size)
goto out;
len = cont_print_text(text, size);
@@ -16531,7 +16646,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
return;
out:
raw_spin_unlock_irqrestore(&logbuf_lock, flags);
-@@ -2431,13 +2525,17 @@
+@@ -2431,13 +2525,17 @@ void console_unlock(void)
console_idx = log_next(console_idx);
console_seq++;
console_prev = msg->flags;
@@ -16550,7 +16665,7 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
if (do_cond_resched)
cond_resched();
}
-@@ -2489,6 +2587,11 @@
+@@ -2489,6 +2587,11 @@ void console_unblank(void)
{
struct console *c;
@@ -16562,10 +16677,11 @@ diff -Nur linux-4.9.28.orig/kernel/printk/printk.c linux-4.9.28/kernel/printk/pr
/*
* console_unblank can no longer be called in interrupt context unless
* oops_in_progress is set to 1..
-diff -Nur linux-4.9.28.orig/kernel/ptrace.c linux-4.9.28/kernel/ptrace.c
---- linux-4.9.28.orig/kernel/ptrace.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/ptrace.c 2017-05-19 03:37:25.190177110 +0200
-@@ -166,7 +166,14 @@
+diff --git a/kernel/ptrace.c b/kernel/ptrace.c
+index a5caecef88be..61e7c5e2183c 100644
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -166,7 +166,14 @@ static bool ptrace_freeze_traced(struct task_struct *task)
spin_lock_irq(&task->sighand->siglock);
if (task_is_traced(task) && !__fatal_signal_pending(task)) {
@@ -16581,10 +16697,11 @@ diff -Nur linux-4.9.28.orig/kernel/ptrace.c linux-4.9.28/kernel/ptrace.c
ret = true;
}
spin_unlock_irq(&task->sighand->siglock);
-diff -Nur linux-4.9.28.orig/kernel/rcu/rcutorture.c linux-4.9.28/kernel/rcu/rcutorture.c
---- linux-4.9.28.orig/kernel/rcu/rcutorture.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/rcu/rcutorture.c 2017-05-19 03:37:25.190177110 +0200
-@@ -404,6 +404,7 @@
+diff --git a/kernel/rcu/rcutorture.c b/kernel/rcu/rcutorture.c
+index bf08fee53dc7..eeb8ce4ad7b6 100644
+--- a/kernel/rcu/rcutorture.c
++++ b/kernel/rcu/rcutorture.c
+@@ -404,6 +404,7 @@ static struct rcu_torture_ops rcu_ops = {
.name = "rcu"
};
@@ -16592,7 +16709,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/rcutorture.c linux-4.9.28/kernel/rcu/rcut
/*
* Definitions for rcu_bh torture testing.
*/
-@@ -443,6 +444,12 @@
+@@ -443,6 +444,12 @@ static struct rcu_torture_ops rcu_bh_ops = {
.name = "rcu_bh"
};
@@ -16605,9 +16722,10 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/rcutorture.c linux-4.9.28/kernel/rcu/rcut
/*
* Don't even think about trying any of these in real life!!!
* The names includes "busted", and they really means it!
-diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
---- linux-4.9.28.orig/kernel/rcu/tree.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/rcu/tree.c 2017-05-19 03:37:25.190177110 +0200
+diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
+index 10f62c6f48e7..dbee19478f09 100644
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
@@ -55,6 +55,11 @@
#include <linux/random.h>
#include <linux/trace_events.h>
@@ -16620,7 +16738,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
#include "tree.h"
#include "rcu.h"
-@@ -260,6 +265,19 @@
+@@ -260,6 +265,19 @@ void rcu_sched_qs(void)
this_cpu_ptr(&rcu_sched_data), true);
}
@@ -16640,7 +16758,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
void rcu_bh_qs(void)
{
if (__this_cpu_read(rcu_bh_data.cpu_no_qs.s)) {
-@@ -269,6 +287,7 @@
+@@ -269,6 +287,7 @@ void rcu_bh_qs(void)
__this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false);
}
}
@@ -16648,7 +16766,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
static DEFINE_PER_CPU(int, rcu_sched_qs_mask);
-@@ -449,11 +468,13 @@
+@@ -449,11 +468,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sched);
/*
* Return the number of RCU BH batches started thus far for debug & stats.
*/
@@ -16662,7 +16780,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Return the number of RCU batches completed thus far for debug & stats.
-@@ -473,6 +494,7 @@
+@@ -473,6 +494,7 @@ unsigned long rcu_batches_completed_sched(void)
}
EXPORT_SYMBOL_GPL(rcu_batches_completed_sched);
@@ -16670,7 +16788,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Return the number of RCU BH batches completed thus far for debug & stats.
*/
-@@ -481,6 +503,7 @@
+@@ -481,6 +503,7 @@ unsigned long rcu_batches_completed_bh(void)
return rcu_bh_state.completed;
}
EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
@@ -16678,7 +16796,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Return the number of RCU expedited batches completed thus far for
-@@ -504,6 +527,7 @@
+@@ -504,6 +527,7 @@ unsigned long rcu_exp_batches_completed_sched(void)
}
EXPORT_SYMBOL_GPL(rcu_exp_batches_completed_sched);
@@ -16686,7 +16804,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Force a quiescent state.
*/
-@@ -522,6 +546,13 @@
+@@ -522,6 +546,13 @@ void rcu_bh_force_quiescent_state(void)
}
EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
@@ -16700,7 +16818,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Force a quiescent state for RCU-sched.
*/
-@@ -572,9 +603,11 @@
+@@ -572,9 +603,11 @@ void rcutorture_get_gp_data(enum rcutorture_type test_type, int *flags,
case RCU_FLAVOR:
rsp = rcu_state_p;
break;
@@ -16712,7 +16830,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
case RCU_SCHED_FLAVOR:
rsp = &rcu_sched_state;
break;
-@@ -3016,18 +3049,17 @@
+@@ -3016,18 +3049,17 @@ __rcu_process_callbacks(struct rcu_state *rsp)
/*
* Do RCU core processing for the current CPU.
*/
@@ -16733,15 +16851,18 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Schedule RCU callback invocation. If the specified type of RCU
* does not support RCU priority boosting, just do a direct call,
-@@ -3039,18 +3071,105 @@
+@@ -3039,19 +3071,106 @@ static void invoke_rcu_callbacks(struct rcu_state *rsp, struct rcu_data *rdp)
{
if (unlikely(!READ_ONCE(rcu_scheduler_fully_active)))
return;
- if (likely(!rsp->boost)) {
- rcu_do_batch(rsp, rdp);
+- return;
+- }
+- invoke_rcu_callbacks_kthread();
+ rcu_do_batch(rsp, rdp);
-+}
-+
+ }
+
+static void rcu_wake_cond(struct task_struct *t, int status)
+{
+ /*
@@ -16755,21 +16876,23 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
+/*
+ * Wake up this CPU's rcuc kthread to do RCU core processing.
+ */
-+static void invoke_rcu_core(void)
-+{
+ static void invoke_rcu_core(void)
+ {
+- if (cpu_online(smp_processor_id()))
+- raise_softirq(RCU_SOFTIRQ);
+ unsigned long flags;
+ struct task_struct *t;
+
+ if (!cpu_online(smp_processor_id()))
- return;
++ return;
+ local_irq_save(flags);
+ __this_cpu_write(rcu_cpu_has_work, 1);
+ t = __this_cpu_read(rcu_cpu_kthread_task);
+ if (t != NULL && current != t)
+ rcu_wake_cond(t, __this_cpu_read(rcu_cpu_kthread_status));
+ local_irq_restore(flags);
-+}
-+
+ }
+
+static void rcu_cpu_kthread_park(unsigned int cpu)
+{
+ per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
@@ -16808,16 +16931,14 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
+ *statusp = RCU_KTHREAD_WAITING;
+ return;
+ }
- }
-- invoke_rcu_callbacks_kthread();
++ }
+ *statusp = RCU_KTHREAD_YIELDING;
+ trace_rcu_utilization(TPS("Start CPU kthread@rcu_yield"));
+ schedule_timeout_interruptible(2);
+ trace_rcu_utilization(TPS("End CPU kthread@rcu_yield"));
+ *statusp = RCU_KTHREAD_WAITING;
- }
-
--static void invoke_rcu_core(void)
++}
++
+static struct smp_hotplug_thread rcu_cpu_thread_spec = {
+ .store = &rcu_cpu_kthread_task,
+ .thread_should_run = rcu_cpu_kthread_should_run,
@@ -16831,21 +16952,20 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
+ * Spawn per-CPU RCU core processing kthreads.
+ */
+static int __init rcu_spawn_core_kthreads(void)
- {
-- if (cpu_online(smp_processor_id()))
-- raise_softirq(RCU_SOFTIRQ);
++{
+ int cpu;
+
+ for_each_possible_cpu(cpu)
+ per_cpu(rcu_cpu_has_work, cpu) = 0;
+ BUG_ON(smpboot_register_percpu_thread(&rcu_cpu_thread_spec));
+ return 0;
- }
++}
+early_initcall(rcu_spawn_core_kthreads);
-
++
/*
* Handle any core-RCU processing required by a call_rcu() invocation.
-@@ -3195,6 +3314,7 @@
+ */
+@@ -3195,6 +3314,7 @@ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func)
}
EXPORT_SYMBOL_GPL(call_rcu_sched);
@@ -16853,7 +16973,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Queue an RCU callback for invocation after a quicker grace period.
*/
-@@ -3203,6 +3323,7 @@
+@@ -3203,6 +3323,7 @@ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func)
__call_rcu(head, func, &rcu_bh_state, -1, 0);
}
EXPORT_SYMBOL_GPL(call_rcu_bh);
@@ -16861,7 +16981,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* Queue an RCU callback for lazy invocation after a grace period.
-@@ -3294,6 +3415,7 @@
+@@ -3294,6 +3415,7 @@ void synchronize_sched(void)
}
EXPORT_SYMBOL_GPL(synchronize_sched);
@@ -16869,7 +16989,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/**
* synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
*
-@@ -3320,6 +3442,7 @@
+@@ -3320,6 +3442,7 @@ void synchronize_rcu_bh(void)
wait_rcu_gp(call_rcu_bh);
}
EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
@@ -16877,7 +16997,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/**
* get_state_synchronize_rcu - Snapshot current RCU state
-@@ -3698,6 +3821,7 @@
+@@ -3698,6 +3821,7 @@ static void _rcu_barrier(struct rcu_state *rsp)
mutex_unlock(&rsp->barrier_mutex);
}
@@ -16885,7 +17005,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/**
* rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
*/
-@@ -3706,6 +3830,7 @@
+@@ -3706,6 +3830,7 @@ void rcu_barrier_bh(void)
_rcu_barrier(&rcu_bh_state);
}
EXPORT_SYMBOL_GPL(rcu_barrier_bh);
@@ -16893,7 +17013,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/**
* rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
-@@ -4227,12 +4352,13 @@
+@@ -4227,12 +4352,13 @@ void __init rcu_init(void)
rcu_bootup_announce();
rcu_init_geometry();
@@ -16908,10 +17028,11 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.c linux-4.9.28/kernel/rcu/tree.c
/*
* We don't need protection against CPU-hotplug here because
-diff -Nur linux-4.9.28.orig/kernel/rcu/tree.h linux-4.9.28/kernel/rcu/tree.h
---- linux-4.9.28.orig/kernel/rcu/tree.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/rcu/tree.h 2017-05-19 03:37:25.190177110 +0200
-@@ -588,18 +588,18 @@
+diff --git a/kernel/rcu/tree.h b/kernel/rcu/tree.h
+index e99a5234d9ed..958ac107062c 100644
+--- a/kernel/rcu/tree.h
++++ b/kernel/rcu/tree.h
+@@ -588,18 +588,18 @@ extern struct list_head rcu_struct_flavors;
*/
extern struct rcu_state rcu_sched_state;
@@ -16932,7 +17053,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.h linux-4.9.28/kernel/rcu/tree.h
#ifndef RCU_TREE_NONCORE
-@@ -619,10 +619,9 @@
+@@ -619,10 +619,9 @@ void call_rcu(struct rcu_head *head, rcu_callback_t func);
static void __init __rcu_init_preempt(void);
static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags);
static void rcu_preempt_boost_start_gp(struct rcu_node *rnp);
@@ -16944,9 +17065,10 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree.h linux-4.9.28/kernel/rcu/tree.h
static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
struct rcu_node *rnp);
#endif /* #ifdef CONFIG_RCU_BOOST */
-diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tree_plugin.h
---- linux-4.9.28.orig/kernel/rcu/tree_plugin.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/rcu/tree_plugin.h 2017-05-19 03:37:25.190177110 +0200
+diff --git a/kernel/rcu/tree_plugin.h b/kernel/rcu/tree_plugin.h
+index 56583e764ebf..7c656f8e192f 100644
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
@@ -24,25 +24,10 @@
* Paul E. McKenney <paulmck@linux.vnet.ibm.com>
*/
@@ -16973,7 +17095,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
#else /* #ifdef CONFIG_RCU_BOOST */
/*
-@@ -55,6 +40,14 @@
+@@ -55,6 +40,14 @@ DEFINE_PER_CPU(char, rcu_cpu_has_work);
#endif /* #else #ifdef CONFIG_RCU_BOOST */
@@ -16988,7 +17110,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
#ifdef CONFIG_RCU_NOCB_CPU
static cpumask_var_t rcu_nocb_mask; /* CPUs to have callbacks offloaded. */
static bool have_rcu_nocb_mask; /* Was rcu_nocb_mask allocated? */
-@@ -426,7 +419,7 @@
+@@ -426,7 +419,7 @@ void rcu_read_unlock_special(struct task_struct *t)
}
/* Hardware IRQ handlers cannot block, complain if they get here. */
@@ -16997,7 +17119,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
lockdep_rcu_suspicious(__FILE__, __LINE__,
"rcu_read_unlock() from irq or softirq with blocking in critical section!!!\n");
pr_alert("->rcu_read_unlock_special: %#x (b: %d, enq: %d nq: %d)\n",
-@@ -632,15 +625,6 @@
+@@ -632,15 +625,6 @@ static void rcu_preempt_check_callbacks(void)
t->rcu_read_unlock_special.b.need_qs = true;
}
@@ -17013,7 +17135,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Queue a preemptible-RCU callback for invocation after a grace period.
*/
-@@ -829,6 +813,19 @@
+@@ -829,6 +813,19 @@ void exit_rcu(void)
#endif /* #else #ifdef CONFIG_PREEMPT_RCU */
@@ -17033,7 +17155,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
#ifdef CONFIG_RCU_BOOST
#include "../locking/rtmutex_common.h"
-@@ -860,16 +857,6 @@
+@@ -860,16 +857,6 @@ static void rcu_initiate_boost_trace(struct rcu_node *rnp)
#endif /* #else #ifdef CONFIG_RCU_TRACE */
@@ -17050,7 +17172,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Carry out RCU priority boosting on the task indicated by ->exp_tasks
* or ->boost_tasks, advancing the pointer to the next task in the
-@@ -1013,23 +1000,6 @@
+@@ -1013,23 +1000,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
}
/*
@@ -17074,7 +17196,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
* Is the current CPU running the RCU-callbacks kthread?
* Caller must have preemption disabled.
*/
-@@ -1083,67 +1053,6 @@
+@@ -1083,67 +1053,6 @@ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
return 0;
}
@@ -17142,7 +17264,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Set the per-rcu_node kthread's affinity to cover all CPUs that are
* served by the rcu_node in question. The CPU hotplug lock is still
-@@ -1174,26 +1083,12 @@
+@@ -1174,26 +1083,12 @@ static void rcu_boost_kthread_setaffinity(struct rcu_node *rnp, int outgoingcpu)
free_cpumask_var(cm);
}
@@ -17169,7 +17291,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
rcu_for_each_leaf_node(rcu_state_p, rnp)
(void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp);
}
-@@ -1216,11 +1111,6 @@
+@@ -1216,11 +1111,6 @@ static void rcu_initiate_boost(struct rcu_node *rnp, unsigned long flags)
raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
}
@@ -17181,7 +17303,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
static bool rcu_is_callbacks_kthread(void)
{
return false;
-@@ -1244,7 +1134,7 @@
+@@ -1244,7 +1134,7 @@ static void rcu_prepare_kthreads(int cpu)
#endif /* #else #ifdef CONFIG_RCU_BOOST */
@@ -17190,7 +17312,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Check to see if any future RCU-related work will need to be done
-@@ -1261,7 +1151,9 @@
+@@ -1261,7 +1151,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
return IS_ENABLED(CONFIG_RCU_NOCB_CPU_ALL)
? 0 : rcu_cpu_has_callbacks(NULL);
}
@@ -17200,7 +17322,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
* after it.
-@@ -1357,6 +1249,8 @@
+@@ -1357,6 +1249,8 @@ static bool __maybe_unused rcu_try_advance_all_cbs(void)
return cbs_ready;
}
@@ -17209,7 +17331,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Allow the CPU to enter dyntick-idle mode unless it has callbacks ready
* to invoke. If the CPU has callbacks, try to advance them. Tell the
-@@ -1402,6 +1296,7 @@
+@@ -1402,6 +1296,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nextevt)
*nextevt = basemono + dj * TICK_NSEC;
return 0;
}
@@ -17217,9 +17339,10 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/tree_plugin.h linux-4.9.28/kernel/rcu/tre
/*
* Prepare a CPU for idle from an RCU perspective. The first major task
-diff -Nur linux-4.9.28.orig/kernel/rcu/update.c linux-4.9.28/kernel/rcu/update.c
---- linux-4.9.28.orig/kernel/rcu/update.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/rcu/update.c 2017-05-19 03:37:25.190177110 +0200
+diff --git a/kernel/rcu/update.c b/kernel/rcu/update.c
+index 4f6db7e6a117..ee02e1e1b3e5 100644
+--- a/kernel/rcu/update.c
++++ b/kernel/rcu/update.c
@@ -62,7 +62,7 @@
#ifndef CONFIG_TINY_RCU
module_param(rcu_expedited, int, 0);
@@ -17229,7 +17352,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/update.c linux-4.9.28/kernel/rcu/update.c
module_param(rcu_normal_after_boot, int, 0);
#endif /* #ifndef CONFIG_TINY_RCU */
-@@ -132,8 +132,7 @@
+@@ -132,8 +132,7 @@ bool rcu_gp_is_normal(void)
}
EXPORT_SYMBOL_GPL(rcu_gp_is_normal);
@@ -17239,7 +17362,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/update.c linux-4.9.28/kernel/rcu/update.c
/*
* Should normal grace-period primitives be expedited? Intended for
-@@ -182,8 +181,7 @@
+@@ -182,8 +181,7 @@ EXPORT_SYMBOL_GPL(rcu_unexpedite_gp);
*/
void rcu_end_inkernel_boot(void)
{
@@ -17249,7 +17372,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/update.c linux-4.9.28/kernel/rcu/update.c
if (rcu_normal_after_boot)
WRITE_ONCE(rcu_normal, 1);
}
-@@ -298,6 +296,7 @@
+@@ -298,6 +296,7 @@ int rcu_read_lock_held(void)
}
EXPORT_SYMBOL_GPL(rcu_read_lock_held);
@@ -17257,7 +17380,7 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/update.c linux-4.9.28/kernel/rcu/update.c
/**
* rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section?
*
-@@ -324,6 +323,7 @@
+@@ -324,6 +323,7 @@ int rcu_read_lock_bh_held(void)
return in_softirq() || irqs_disabled();
}
EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
@@ -17265,10 +17388,24 @@ diff -Nur linux-4.9.28.orig/kernel/rcu/update.c linux-4.9.28/kernel/rcu/update.c
#endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
-diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/completion.c
---- linux-4.9.28.orig/kernel/sched/completion.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/completion.c 2017-05-19 03:37:25.194177264 +0200
-@@ -30,10 +30,10 @@
+diff --git a/kernel/sched/Makefile b/kernel/sched/Makefile
+index 5e59b832ae2b..7337a7f60e3f 100644
+--- a/kernel/sched/Makefile
++++ b/kernel/sched/Makefile
+@@ -17,7 +17,7 @@ endif
+
+ obj-y += core.o loadavg.o clock.o cputime.o
+ obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
+-obj-y += wait.o swait.o completion.o idle.o
++obj-y += wait.o swait.o swork.o completion.o idle.o
+ obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
+ obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
+ obj-$(CONFIG_SCHEDSTATS) += stats.o
+diff --git a/kernel/sched/completion.c b/kernel/sched/completion.c
+index 8d0f35debf35..b62cf6400fe0 100644
+--- a/kernel/sched/completion.c
++++ b/kernel/sched/completion.c
+@@ -30,10 +30,10 @@ void complete(struct completion *x)
{
unsigned long flags;
@@ -17282,7 +17419,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/
}
EXPORT_SYMBOL(complete);
-@@ -50,10 +50,10 @@
+@@ -50,10 +50,10 @@ void complete_all(struct completion *x)
{
unsigned long flags;
@@ -17296,7 +17433,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/
}
EXPORT_SYMBOL(complete_all);
-@@ -62,20 +62,20 @@
+@@ -62,20 +62,20 @@ do_wait_for_common(struct completion *x,
long (*action)(long), long timeout, int state)
{
if (!x->done) {
@@ -17322,7 +17459,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/
if (!x->done)
return timeout;
}
-@@ -89,9 +89,9 @@
+@@ -89,9 +89,9 @@ __wait_for_common(struct completion *x,
{
might_sleep();
@@ -17334,7 +17471,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/
return timeout;
}
-@@ -277,12 +277,12 @@
+@@ -277,12 +277,12 @@ bool try_wait_for_completion(struct completion *x)
if (!READ_ONCE(x->done))
return 0;
@@ -17349,7 +17486,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/
return ret;
}
EXPORT_SYMBOL(try_wait_for_completion);
-@@ -311,7 +311,7 @@
+@@ -311,7 +311,7 @@ bool completion_done(struct completion *x)
* after it's acquired the lock.
*/
smp_rmb();
@@ -17358,10 +17495,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/completion.c linux-4.9.28/kernel/sched/
return true;
}
EXPORT_SYMBOL(completion_done);
-diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
---- linux-4.9.28.orig/kernel/sched/core.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/core.c 2017-05-19 03:37:25.194177264 +0200
-@@ -129,7 +129,11 @@
+diff --git a/kernel/sched/core.c b/kernel/sched/core.c
+index 154fd689fe02..10e832da70b6 100644
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -129,7 +129,11 @@ const_debug unsigned int sysctl_sched_features =
* Number of tasks to iterate in a single balance run.
* Limited because this is done with IRQs disabled.
*/
@@ -17373,7 +17511,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* period over which we average the RT time consumption, measured
-@@ -345,6 +349,7 @@
+@@ -345,6 +349,7 @@ static void init_rq_hrtick(struct rq *rq)
hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
rq->hrtick_timer.function = hrtick;
@@ -17381,7 +17519,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
}
#else /* CONFIG_SCHED_HRTICK */
static inline void hrtick_clear(struct rq *rq)
-@@ -449,7 +454,7 @@
+@@ -449,7 +454,7 @@ void wake_q_add(struct wake_q_head *head, struct task_struct *task)
head->lastp = &node->next;
}
@@ -17390,7 +17528,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
{
struct wake_q_node *node = head->first;
-@@ -466,7 +471,10 @@
+@@ -466,7 +471,10 @@ void wake_up_q(struct wake_q_head *head)
* wake_up_process() implies a wmb() to pair with the queueing
* in wake_q_add() so as not to miss wakeups.
*/
@@ -17402,7 +17540,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
put_task_struct(task);
}
}
-@@ -502,6 +510,38 @@
+@@ -502,6 +510,38 @@ void resched_curr(struct rq *rq)
trace_sched_wake_idle_without_ipi(cpu);
}
@@ -17441,7 +17579,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
void resched_cpu(int cpu)
{
struct rq *rq = cpu_rq(cpu);
-@@ -525,11 +565,14 @@
+@@ -525,11 +565,14 @@ void resched_cpu(int cpu)
*/
int get_nohz_timer_target(void)
{
@@ -17458,7 +17596,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
rcu_read_lock();
for_each_domain(cpu, sd) {
-@@ -548,6 +591,8 @@
+@@ -548,6 +591,8 @@ int get_nohz_timer_target(void)
cpu = housekeeping_any_cpu();
unlock:
rcu_read_unlock();
@@ -17467,7 +17605,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
return cpu;
}
/*
-@@ -1100,6 +1145,11 @@
+@@ -1100,6 +1145,11 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
lockdep_assert_held(&p->pi_lock);
@@ -17479,7 +17617,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
queued = task_on_rq_queued(p);
running = task_current(rq, p);
-@@ -1122,6 +1172,84 @@
+@@ -1122,6 +1172,84 @@ void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
set_curr_task(rq, p);
}
@@ -17564,7 +17702,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* Change a given task's CPU affinity. Migrate the thread to a
* proper CPU and schedule it away if the CPU it's executing on
-@@ -1179,7 +1307,7 @@
+@@ -1179,7 +1307,7 @@ static int __set_cpus_allowed_ptr(struct task_struct *p,
}
/* Can the task run on the task's current CPU? If so, we're done */
@@ -17573,7 +17711,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
goto out;
dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);
-@@ -1366,6 +1494,18 @@
+@@ -1366,6 +1494,18 @@ int migrate_swap(struct task_struct *cur, struct task_struct *p)
return ret;
}
@@ -17592,7 +17730,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* wait_task_inactive - wait for a thread to unschedule.
*
-@@ -1410,7 +1550,7 @@
+@@ -1410,7 +1550,7 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
* is actually now running somewhere else!
*/
while (task_running(rq, p)) {
@@ -17601,7 +17739,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
return 0;
cpu_relax();
}
-@@ -1425,7 +1565,8 @@
+@@ -1425,7 +1565,8 @@ unsigned long wait_task_inactive(struct task_struct *p, long match_state)
running = task_running(rq, p);
queued = task_on_rq_queued(p);
ncsw = 0;
@@ -17611,7 +17749,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
task_rq_unlock(rq, p, &rf);
-@@ -1680,10 +1821,6 @@
+@@ -1680,10 +1821,6 @@ static inline void ttwu_activate(struct rq *rq, struct task_struct *p, int en_fl
{
activate_task(rq, p, en_flags);
p->on_rq = TASK_ON_RQ_QUEUED;
@@ -17622,7 +17760,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
}
/*
-@@ -2018,8 +2155,27 @@
+@@ -2018,8 +2155,27 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
*/
smp_mb__before_spinlock();
raw_spin_lock_irqsave(&p->pi_lock, flags);
@@ -17651,7 +17789,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
trace_sched_waking(p);
-@@ -2102,53 +2258,6 @@
+@@ -2102,53 +2258,6 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)
}
/**
@@ -17705,7 +17843,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
* wake_up_process - Wake up a specific process
* @p: The process to be woken up.
*
-@@ -2166,6 +2275,18 @@
+@@ -2166,6 +2275,18 @@ int wake_up_process(struct task_struct *p)
}
EXPORT_SYMBOL(wake_up_process);
@@ -17718,13 +17856,13 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
+ */
+int wake_up_lock_sleeper(struct task_struct *p)
+{
-+ return try_to_wake_up(p, TASK_ALL, WF_LOCK_SLEEPER);
++ return try_to_wake_up(p, TASK_UNINTERRUPTIBLE, WF_LOCK_SLEEPER);
+}
+
int wake_up_state(struct task_struct *p, unsigned int state)
{
return try_to_wake_up(p, state, 0);
-@@ -2442,6 +2563,9 @@
+@@ -2442,6 +2563,9 @@ int sched_fork(unsigned long clone_flags, struct task_struct *p)
p->on_cpu = 0;
#endif
init_task_preempt_count(p);
@@ -17734,7 +17872,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
#ifdef CONFIG_SMP
plist_node_init(&p->pushable_tasks, MAX_PRIO);
RB_CLEAR_NODE(&p->pushable_dl_tasks);
-@@ -2770,21 +2894,16 @@
+@@ -2770,21 +2894,16 @@ static struct rq *finish_task_switch(struct task_struct *prev)
finish_arch_post_lock_switch();
fire_sched_in_preempt_notifiers(current);
@@ -17761,7 +17899,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
put_task_struct(prev);
}
-@@ -3252,6 +3371,77 @@
+@@ -3252,6 +3371,77 @@ static inline void schedule_debug(struct task_struct *prev)
schedstat_inc(this_rq()->sched_count);
}
@@ -17839,7 +17977,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* Pick up the highest-prio task:
*/
-@@ -3368,19 +3558,6 @@
+@@ -3368,19 +3558,6 @@ static void __sched notrace __schedule(bool preempt)
} else {
deactivate_task(rq, prev, DEQUEUE_SLEEP);
prev->on_rq = 0;
@@ -17859,7 +17997,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
}
switch_count = &prev->nvcsw;
}
-@@ -3390,6 +3567,7 @@
+@@ -3390,6 +3567,7 @@ static void __sched notrace __schedule(bool preempt)
next = pick_next_task(rq, prev, cookie);
clear_tsk_need_resched(prev);
@@ -17867,7 +18005,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
clear_preempt_need_resched();
rq->clock_skip_update = 0;
-@@ -3437,9 +3615,20 @@
+@@ -3437,9 +3615,20 @@ void __noreturn do_task_dead(void)
static inline void sched_submit_work(struct task_struct *tsk)
{
@@ -17889,7 +18027,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
* If we are going to sleep and we have plugged IO queued,
* make sure to submit it to avoid deadlocks.
*/
-@@ -3447,6 +3636,12 @@
+@@ -3447,6 +3636,12 @@ static inline void sched_submit_work(struct task_struct *tsk)
blk_schedule_flush_plug(tsk);
}
@@ -17902,7 +18040,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
asmlinkage __visible void __sched schedule(void)
{
struct task_struct *tsk = current;
-@@ -3457,6 +3652,7 @@
+@@ -3457,6 +3652,7 @@ asmlinkage __visible void __sched schedule(void)
__schedule(false);
sched_preempt_enable_no_resched();
} while (need_resched());
@@ -17910,7 +18048,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
}
EXPORT_SYMBOL(schedule);
-@@ -3520,6 +3716,30 @@
+@@ -3520,6 +3716,30 @@ static void __sched notrace preempt_schedule_common(void)
} while (need_resched());
}
@@ -17941,7 +18079,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
#ifdef CONFIG_PREEMPT
/*
* this is the entry point to schedule() from in-kernel preemption
-@@ -3534,7 +3754,8 @@
+@@ -3534,7 +3754,8 @@ asmlinkage __visible void __sched notrace preempt_schedule(void)
*/
if (likely(!preemptible()))
return;
@@ -17951,7 +18089,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
preempt_schedule_common();
}
NOKPROBE_SYMBOL(preempt_schedule);
-@@ -3561,6 +3782,9 @@
+@@ -3561,6 +3782,9 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
if (likely(!preemptible()))
return;
@@ -17961,7 +18099,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
do {
/*
* Because the function tracer can trace preempt_count_sub()
-@@ -3583,7 +3807,16 @@
+@@ -3583,7 +3807,16 @@ asmlinkage __visible void __sched notrace preempt_schedule_notrace(void)
* an infinite recursion.
*/
prev_ctx = exception_enter();
@@ -17978,7 +18116,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
exception_exit(prev_ctx);
preempt_latency_stop(1);
-@@ -3629,10 +3862,25 @@
+@@ -3629,10 +3862,25 @@ EXPORT_SYMBOL(default_wake_function);
#ifdef CONFIG_RT_MUTEXES
@@ -18006,7 +18144,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
*
* This function changes the 'effective' priority of a task. It does
* not touch ->normal_prio like __setscheduler().
-@@ -3640,16 +3888,40 @@
+@@ -3640,16 +3888,40 @@ EXPORT_SYMBOL(default_wake_function);
* Used by the rt_mutex code to implement priority inheritance
* logic. Call site only calls if the priority of the task changed.
*/
@@ -18050,7 +18188,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* Idle task boosting is a nono in general. There is one
-@@ -3669,7 +3941,7 @@
+@@ -3669,7 +3941,7 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
goto out_unlock;
}
@@ -18059,7 +18197,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
oldprio = p->prio;
if (oldprio == prio)
-@@ -3693,7 +3965,6 @@
+@@ -3693,7 +3965,6 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
* running task
*/
if (dl_prio(prio)) {
@@ -18067,7 +18205,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
if (!dl_prio(p->normal_prio) ||
(pi_task && dl_entity_preempt(&pi_task->dl, &p->dl))) {
p->dl.dl_boosted = 1;
-@@ -3730,6 +4001,11 @@
+@@ -3730,6 +4001,11 @@ void rt_mutex_setprio(struct task_struct *p, int prio)
balance_callback(rq);
preempt_enable();
}
@@ -18079,7 +18217,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
#endif
void set_user_nice(struct task_struct *p, long nice)
-@@ -3974,10 +4250,9 @@
+@@ -3974,10 +4250,9 @@ static void __setscheduler(struct rq *rq, struct task_struct *p,
* Keep a potential priority boosting if called from
* sched_setscheduler().
*/
@@ -18092,7 +18230,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
if (dl_prio(p->prio))
p->sched_class = &dl_sched_class;
-@@ -4264,7 +4539,7 @@
+@@ -4264,7 +4539,7 @@ static int __sched_setscheduler(struct task_struct *p,
* the runqueue. This will be done when the task deboost
* itself.
*/
@@ -18101,7 +18239,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
if (new_effective_prio == oldprio)
queue_flags &= ~DEQUEUE_MOVE;
}
-@@ -4939,6 +5214,7 @@
+@@ -4939,6 +5214,7 @@ int __cond_resched_lock(spinlock_t *lock)
}
EXPORT_SYMBOL(__cond_resched_lock);
@@ -18109,7 +18247,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
int __sched __cond_resched_softirq(void)
{
BUG_ON(!in_softirq());
-@@ -4952,6 +5228,7 @@
+@@ -4952,6 +5228,7 @@ int __sched __cond_resched_softirq(void)
return 0;
}
EXPORT_SYMBOL(__cond_resched_softirq);
@@ -18117,7 +18255,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/**
* yield - yield the current processor to other threads.
-@@ -5315,7 +5592,9 @@
+@@ -5315,7 +5592,9 @@ void init_idle(struct task_struct *idle, int cpu)
/* Set the preempt count _outside_ the spinlocks! */
init_idle_preempt_count(idle, cpu);
@@ -18128,7 +18266,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* The idle tasks have their own, simple scheduling class:
*/
-@@ -5458,6 +5737,8 @@
+@@ -5458,6 +5737,8 @@ void sched_setnuma(struct task_struct *p, int nid)
#endif /* CONFIG_NUMA_BALANCING */
#ifdef CONFIG_HOTPLUG_CPU
@@ -18137,7 +18275,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
/*
* Ensures that the idle task is using init_mm right before its cpu goes
* offline.
-@@ -5472,7 +5753,12 @@
+@@ -5472,7 +5753,12 @@ void idle_task_exit(void)
switch_mm_irqs_off(mm, &init_mm, current);
finish_arch_post_lock_switch();
}
@@ -18151,7 +18289,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
}
/*
-@@ -7418,6 +7704,10 @@
+@@ -7418,6 +7704,10 @@ int sched_cpu_dying(unsigned int cpu)
update_max_interval();
nohz_balance_exit_idle(cpu);
hrtick_clear(rq);
@@ -18162,7 +18300,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
return 0;
}
#endif
-@@ -7698,7 +7988,7 @@
+@@ -7698,7 +7988,7 @@ void __init sched_init(void)
#ifdef CONFIG_DEBUG_ATOMIC_SLEEP
static inline int preempt_count_equals(int preempt_offset)
{
@@ -18171,10 +18309,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/core.c linux-4.9.28/kernel/sched/core.c
return (nested == preempt_offset);
}
-diff -Nur linux-4.9.28.orig/kernel/sched/deadline.c linux-4.9.28/kernel/sched/deadline.c
---- linux-4.9.28.orig/kernel/sched/deadline.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/deadline.c 2017-05-19 03:37:25.194177264 +0200
-@@ -687,6 +687,7 @@
+diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c
+index c95c5122b105..e00accf92a4b 100644
+--- a/kernel/sched/deadline.c
++++ b/kernel/sched/deadline.c
+@@ -687,6 +687,7 @@ void init_dl_task_timer(struct sched_dl_entity *dl_se)
hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
timer->function = dl_task_timer;
@@ -18182,10 +18321,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/deadline.c linux-4.9.28/kernel/sched/de
}
static
-diff -Nur linux-4.9.28.orig/kernel/sched/debug.c linux-4.9.28/kernel/sched/debug.c
---- linux-4.9.28.orig/kernel/sched/debug.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/debug.c 2017-05-19 03:37:25.194177264 +0200
-@@ -558,6 +558,9 @@
+diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
+index fa178b62ea79..935224123441 100644
+--- a/kernel/sched/debug.c
++++ b/kernel/sched/debug.c
+@@ -558,6 +558,9 @@ void print_rt_rq(struct seq_file *m, int cpu, struct rt_rq *rt_rq)
P(rt_throttled);
PN(rt_time);
PN(rt_runtime);
@@ -18195,7 +18335,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/debug.c linux-4.9.28/kernel/sched/debug
#undef PN
#undef P
-@@ -953,6 +956,10 @@
+@@ -953,6 +956,10 @@ void proc_sched_show_task(struct task_struct *p, struct seq_file *m)
#endif
P(policy);
P(prio);
@@ -18206,10 +18346,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/debug.c linux-4.9.28/kernel/sched/debug
#undef PN_SCHEDSTAT
#undef PN
#undef __PN
-diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
---- linux-4.9.28.orig/kernel/sched/fair.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/fair.c 2017-05-19 03:37:25.194177264 +0200
-@@ -3518,7 +3518,7 @@
+diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c
+index c242944f5cbd..4aeb2e2e41bc 100644
+--- a/kernel/sched/fair.c
++++ b/kernel/sched/fair.c
+@@ -3518,7 +3518,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
ideal_runtime = sched_slice(cfs_rq, curr);
delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
if (delta_exec > ideal_runtime) {
@@ -18218,7 +18359,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
/*
* The current task ran long enough, ensure it doesn't get
* re-elected due to buddy favours.
-@@ -3542,7 +3542,7 @@
+@@ -3542,7 +3542,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr)
return;
if (delta > ideal_runtime)
@@ -18227,7 +18368,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
}
static void
-@@ -3684,7 +3684,7 @@
+@@ -3684,7 +3684,7 @@ entity_tick(struct cfs_rq *cfs_rq, struct sched_entity *curr, int queued)
* validating it and just reschedule.
*/
if (queued) {
@@ -18236,7 +18377,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
return;
}
/*
-@@ -3866,7 +3866,7 @@
+@@ -3866,7 +3866,7 @@ static void __account_cfs_rq_runtime(struct cfs_rq *cfs_rq, u64 delta_exec)
* hierarchy can be throttled
*/
if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
@@ -18245,7 +18386,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
}
static __always_inline
-@@ -4494,7 +4494,7 @@
+@@ -4494,7 +4494,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p)
if (delta < 0) {
if (rq->curr == p)
@@ -18254,7 +18395,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
return;
}
hrtick_start(rq, delta);
-@@ -5905,7 +5905,7 @@
+@@ -5905,7 +5905,7 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
return;
preempt:
@@ -18263,7 +18404,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
/*
* Only set the backward buddy when the current task is still
* on the rq. This can happen when a wakeup gets interleaved
-@@ -8631,7 +8631,7 @@
+@@ -8631,7 +8631,7 @@ static void task_fork_fair(struct task_struct *p)
* 'current' within the tree based on its new key value.
*/
swap(curr->vruntime, se->vruntime);
@@ -18272,7 +18413,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
}
se->vruntime -= cfs_rq->min_vruntime;
-@@ -8655,7 +8655,7 @@
+@@ -8655,7 +8655,7 @@ prio_changed_fair(struct rq *rq, struct task_struct *p, int oldprio)
*/
if (rq->curr == p) {
if (p->prio > oldprio)
@@ -18281,10 +18422,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/fair.c linux-4.9.28/kernel/sched/fair.c
} else
check_preempt_curr(rq, p, 0);
}
-diff -Nur linux-4.9.28.orig/kernel/sched/features.h linux-4.9.28/kernel/sched/features.h
---- linux-4.9.28.orig/kernel/sched/features.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/features.h 2017-05-19 03:37:25.194177264 +0200
-@@ -45,11 +45,19 @@
+diff --git a/kernel/sched/features.h b/kernel/sched/features.h
+index 69631fa46c2f..6d28fcd08872 100644
+--- a/kernel/sched/features.h
++++ b/kernel/sched/features.h
+@@ -45,11 +45,19 @@ SCHED_FEAT(LB_BIAS, true)
*/
SCHED_FEAT(NONTASK_CAPACITY, true)
@@ -18304,22 +18446,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/features.h linux-4.9.28/kernel/sched/fe
#ifdef HAVE_RT_PUSH_IPI
/*
-diff -Nur linux-4.9.28.orig/kernel/sched/Makefile linux-4.9.28/kernel/sched/Makefile
---- linux-4.9.28.orig/kernel/sched/Makefile 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/Makefile 2017-05-19 03:37:25.194177264 +0200
-@@ -17,7 +17,7 @@
-
- obj-y += core.o loadavg.o clock.o cputime.o
- obj-y += idle_task.o fair.o rt.o deadline.o stop_task.o
--obj-y += wait.o swait.o completion.o idle.o
-+obj-y += wait.o swait.o swork.o completion.o idle.o
- obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o
- obj-$(CONFIG_SCHED_AUTOGROUP) += auto_group.o
- obj-$(CONFIG_SCHEDSTATS) += stats.o
-diff -Nur linux-4.9.28.orig/kernel/sched/rt.c linux-4.9.28/kernel/sched/rt.c
---- linux-4.9.28.orig/kernel/sched/rt.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/rt.c 2017-05-19 03:37:25.194177264 +0200
-@@ -47,6 +47,7 @@
+diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c
+index f139f22ce30d..b0691f4e7d49 100644
+--- a/kernel/sched/rt.c
++++ b/kernel/sched/rt.c
+@@ -47,6 +47,7 @@ void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime)
hrtimer_init(&rt_b->rt_period_timer,
CLOCK_MONOTONIC, HRTIMER_MODE_REL);
@@ -18327,7 +18458,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/rt.c linux-4.9.28/kernel/sched/rt.c
rt_b->rt_period_timer.function = sched_rt_period_timer;
}
-@@ -101,6 +102,7 @@
+@@ -101,6 +102,7 @@ void init_rt_rq(struct rt_rq *rt_rq)
rt_rq->push_cpu = nr_cpu_ids;
raw_spin_lock_init(&rt_rq->push_lock);
init_irq_work(&rt_rq->push_work, push_irq_work_func);
@@ -18335,10 +18466,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/rt.c linux-4.9.28/kernel/sched/rt.c
#endif
#endif /* CONFIG_SMP */
/* We start is dequeued state, because no RT tasks are queued */
-diff -Nur linux-4.9.28.orig/kernel/sched/sched.h linux-4.9.28/kernel/sched/sched.h
---- linux-4.9.28.orig/kernel/sched/sched.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/sched.h 2017-05-19 03:37:25.194177264 +0200
-@@ -1163,6 +1163,7 @@
+diff --git a/kernel/sched/sched.h b/kernel/sched/sched.h
+index 055f935d4421..19324ac27026 100644
+--- a/kernel/sched/sched.h
++++ b/kernel/sched/sched.h
+@@ -1163,6 +1163,7 @@ static inline void finish_lock_switch(struct rq *rq, struct task_struct *prev)
#define WF_SYNC 0x01 /* waker goes to sleep after wakeup */
#define WF_FORK 0x02 /* child wakeup after fork */
#define WF_MIGRATED 0x4 /* internal use, task got migrated */
@@ -18346,7 +18478,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/sched.h linux-4.9.28/kernel/sched/sched
/*
* To aid in avoiding the subversion of "niceness" due to uneven distribution
-@@ -1346,6 +1347,15 @@
+@@ -1346,6 +1347,15 @@ extern void init_sched_fair_class(void);
extern void resched_curr(struct rq *rq);
extern void resched_cpu(int cpu);
@@ -18362,9 +18494,10 @@ diff -Nur linux-4.9.28.orig/kernel/sched/sched.h linux-4.9.28/kernel/sched/sched
extern struct rt_bandwidth def_rt_bandwidth;
extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
-diff -Nur linux-4.9.28.orig/kernel/sched/swait.c linux-4.9.28/kernel/sched/swait.c
---- linux-4.9.28.orig/kernel/sched/swait.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/sched/swait.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/sched/swait.c b/kernel/sched/swait.c
+index 82f0dff90030..ef027ff3250a 100644
+--- a/kernel/sched/swait.c
++++ b/kernel/sched/swait.c
@@ -1,5 +1,6 @@
#include <linux/sched.h>
#include <linux/swait.h>
@@ -18372,7 +18505,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/swait.c linux-4.9.28/kernel/sched/swait
void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
struct lock_class_key *key)
-@@ -29,6 +30,25 @@
+@@ -29,6 +30,25 @@ void swake_up_locked(struct swait_queue_head *q)
}
EXPORT_SYMBOL(swake_up_locked);
@@ -18398,7 +18531,7 @@ diff -Nur linux-4.9.28.orig/kernel/sched/swait.c linux-4.9.28/kernel/sched/swait
void swake_up(struct swait_queue_head *q)
{
unsigned long flags;
-@@ -54,6 +74,7 @@
+@@ -54,6 +74,7 @@ void swake_up_all(struct swait_queue_head *q)
if (!swait_active(q))
return;
@@ -18406,9 +18539,11 @@ diff -Nur linux-4.9.28.orig/kernel/sched/swait.c linux-4.9.28/kernel/sched/swait
raw_spin_lock_irq(&q->lock);
list_splice_init(&q->task_list, &tmp);
while (!list_empty(&tmp)) {
-diff -Nur linux-4.9.28.orig/kernel/sched/swork.c linux-4.9.28/kernel/sched/swork.c
---- linux-4.9.28.orig/kernel/sched/swork.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/kernel/sched/swork.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/sched/swork.c b/kernel/sched/swork.c
+new file mode 100644
+index 000000000000..1950f40ca725
+--- /dev/null
++++ b/kernel/sched/swork.c
@@ -0,0 +1,173 @@
+/*
+ * Copyright (C) 2014 BMW Car IT GmbH, Daniel Wagner daniel.wagner@bmw-carit.de
@@ -18583,9 +18718,10 @@ diff -Nur linux-4.9.28.orig/kernel/sched/swork.c linux-4.9.28/kernel/sched/swork
+ mutex_unlock(&worker_mutex);
+}
+EXPORT_SYMBOL_GPL(swork_put);
-diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
---- linux-4.9.28.orig/kernel/signal.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/signal.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/signal.c b/kernel/signal.c
+index 0b1415720a15..c884647951f7 100644
+--- a/kernel/signal.c
++++ b/kernel/signal.c
@@ -14,6 +14,7 @@
#include <linux/export.h>
#include <linux/init.h>
@@ -18594,7 +18730,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
#include <linux/fs.h>
#include <linux/tty.h>
#include <linux/binfmts.h>
-@@ -352,13 +353,30 @@
+@@ -352,13 +353,30 @@ static bool task_participate_group_stop(struct task_struct *task)
return false;
}
@@ -18626,7 +18762,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
{
struct sigqueue *q = NULL;
struct user_struct *user;
-@@ -375,7 +393,10 @@
+@@ -375,7 +393,10 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
if (override_rlimit ||
atomic_read(&user->sigpending) <=
task_rlimit(t, RLIMIT_SIGPENDING)) {
@@ -18638,7 +18774,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
} else {
print_dropped_signal(sig);
}
-@@ -392,6 +413,13 @@
+@@ -392,6 +413,13 @@ __sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimi
return q;
}
@@ -18652,7 +18788,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
static void __sigqueue_free(struct sigqueue *q)
{
if (q->flags & SIGQUEUE_PREALLOC)
-@@ -401,6 +429,21 @@
+@@ -401,6 +429,21 @@ static void __sigqueue_free(struct sigqueue *q)
kmem_cache_free(sigqueue_cachep, q);
}
@@ -18674,7 +18810,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
void flush_sigqueue(struct sigpending *queue)
{
struct sigqueue *q;
-@@ -414,6 +457,21 @@
+@@ -414,6 +457,21 @@ void flush_sigqueue(struct sigpending *queue)
}
/*
@@ -18696,7 +18832,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
* Flush all pending signals for this kthread.
*/
void flush_signals(struct task_struct *t)
-@@ -525,7 +583,7 @@
+@@ -525,7 +583,7 @@ static void collect_signal(int sig, struct sigpending *list, siginfo_t *info)
still_pending:
list_del_init(&first->list);
copy_siginfo(info, &first->info);
@@ -18705,7 +18841,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
} else {
/*
* Ok, it wasn't in the queue. This must be
-@@ -560,6 +618,8 @@
+@@ -560,6 +618,8 @@ int dequeue_signal(struct task_struct *tsk, sigset_t *mask, siginfo_t *info)
{
int signr;
@@ -18714,7 +18850,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
/* We only dequeue private signals from ourselves, we don't let
* signalfd steal them
*/
-@@ -1156,8 +1216,8 @@
+@@ -1156,8 +1216,8 @@ int do_send_sig_info(int sig, struct siginfo *info, struct task_struct *p,
* We don't want to have recursive SIGSEGV's etc, for example,
* that is why we also clear SIGNAL_UNKILLABLE.
*/
@@ -18725,7 +18861,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
{
unsigned long int flags;
int ret, blocked, ignored;
-@@ -1182,6 +1242,39 @@
+@@ -1182,6 +1242,39 @@ force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
return ret;
}
@@ -18765,7 +18901,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
/*
* Nuke all other threads in the group.
*/
-@@ -1216,12 +1309,12 @@
+@@ -1216,12 +1309,12 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
* Disable interrupts early to avoid deadlocks.
* See rcu_read_unlock() comment header for details.
*/
@@ -18780,7 +18916,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
break;
}
/*
-@@ -1242,7 +1335,7 @@
+@@ -1242,7 +1335,7 @@ struct sighand_struct *__lock_task_sighand(struct task_struct *tsk,
}
spin_unlock(&sighand->siglock);
rcu_read_unlock();
@@ -18789,7 +18925,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
}
return sighand;
-@@ -1485,7 +1578,8 @@
+@@ -1485,7 +1578,8 @@ EXPORT_SYMBOL(kill_pid);
*/
struct sigqueue *sigqueue_alloc(void)
{
@@ -18799,7 +18935,7 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
if (q)
q->flags |= SIGQUEUE_PREALLOC;
-@@ -1846,15 +1940,7 @@
+@@ -1846,15 +1940,7 @@ static void ptrace_stop(int exit_code, int why, int clear_code, siginfo_t *info)
if (gstop_done && ptrace_reparented(current))
do_notify_parent_cldstop(current, false, why);
@@ -18815,9 +18951,10 @@ diff -Nur linux-4.9.28.orig/kernel/signal.c linux-4.9.28/kernel/signal.c
freezable_schedule();
} else {
/*
-diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
---- linux-4.9.28.orig/kernel/softirq.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/softirq.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/softirq.c b/kernel/softirq.c
+index 744fa611cae0..819bd7cf5ad0 100644
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
@@ -21,10 +21,12 @@
#include <linux/freezer.h>
#include <linux/kthread.h>
@@ -18831,7 +18968,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
#include <linux/irq.h>
#define CREATE_TRACE_POINTS
-@@ -56,12 +58,108 @@
+@@ -56,12 +58,108 @@ EXPORT_SYMBOL(irq_stat);
static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -18940,7 +19077,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
/*
* we cannot loop indefinitely here to avoid userspace starvation,
* but we also don't want to introduce a worst case 1/HZ latency
-@@ -77,6 +175,38 @@
+@@ -77,6 +175,38 @@ static void wakeup_softirqd(void)
wake_up_process(tsk);
}
@@ -18979,7 +19116,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
/*
* If ksoftirqd is scheduled, we do not want to process pending softirqs
* right now. Let ksoftirqd handle this at its own rate, to get fairness.
-@@ -88,6 +218,47 @@
+@@ -88,6 +218,47 @@ static bool ksoftirqd_running(void)
return tsk && (tsk->state == TASK_RUNNING);
}
@@ -19027,7 +19164,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
/*
* preempt_count and SOFTIRQ_OFFSET usage:
* - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving
-@@ -243,10 +414,8 @@
+@@ -243,10 +414,8 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
unsigned long end = jiffies + MAX_SOFTIRQ_TIME;
unsigned long old_flags = current->flags;
int max_restart = MAX_SOFTIRQ_RESTART;
@@ -19038,7 +19175,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
/*
* Mask out PF_MEMALLOC s current task context is borrowed for the
-@@ -265,36 +434,7 @@
+@@ -265,36 +434,7 @@ asmlinkage __visible void __softirq_entry __do_softirq(void)
/* Reset the pending bitmask before enabling irqs */
set_softirq_pending(0);
@@ -19076,7 +19213,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
pending = local_softirq_pending();
if (pending) {
-@@ -331,6 +471,309 @@
+@@ -331,6 +471,309 @@ asmlinkage __visible void do_softirq(void)
}
/*
@@ -19386,7 +19523,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
* Enter an interrupt context.
*/
void irq_enter(void)
-@@ -341,9 +784,9 @@
+@@ -341,9 +784,9 @@ void irq_enter(void)
* Prevent raise_softirq from needlessly waking up ksoftirqd
* here, as softirq will be serviced on return from interrupt.
*/
@@ -19398,7 +19535,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
}
__irq_enter();
-@@ -351,6 +794,7 @@
+@@ -351,6 +794,7 @@ void irq_enter(void)
static inline void invoke_softirq(void)
{
@@ -19406,7 +19543,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
if (ksoftirqd_running())
return;
-@@ -373,6 +817,18 @@
+@@ -373,6 +817,18 @@ static inline void invoke_softirq(void)
} else {
wakeup_softirqd();
}
@@ -19425,7 +19562,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
}
static inline void tick_irq_exit(void)
-@@ -409,26 +865,6 @@
+@@ -409,26 +865,6 @@ void irq_exit(void)
trace_hardirq_exit(); /* must be last! */
}
@@ -19452,7 +19589,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
void raise_softirq(unsigned int nr)
{
unsigned long flags;
-@@ -438,12 +874,6 @@
+@@ -438,12 +874,6 @@ void raise_softirq(unsigned int nr)
local_irq_restore(flags);
}
@@ -19465,7 +19602,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
void open_softirq(int nr, void (*action)(struct softirq_action *))
{
softirq_vec[nr].action = action;
-@@ -460,15 +890,45 @@
+@@ -460,15 +890,45 @@ struct tasklet_head {
static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
@@ -19515,7 +19652,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
local_irq_restore(flags);
}
EXPORT_SYMBOL(__tasklet_schedule);
-@@ -478,10 +938,7 @@
+@@ -478,10 +938,7 @@ void __tasklet_hi_schedule(struct tasklet_struct *t)
unsigned long flags;
local_irq_save(flags);
@@ -19527,7 +19664,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
local_irq_restore(flags);
}
EXPORT_SYMBOL(__tasklet_hi_schedule);
-@@ -490,82 +947,122 @@
+@@ -490,82 +947,122 @@ void __tasklet_hi_schedule_first(struct tasklet_struct *t)
{
BUG_ON(!irqs_disabled());
@@ -19668,7 +19805,8 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
list = __this_cpu_read(tasklet_hi_vec.head);
__this_cpu_write(tasklet_hi_vec.head, NULL);
__this_cpu_write(tasklet_hi_vec.tail, this_cpu_ptr(&tasklet_hi_vec.head));
-- local_irq_enable();
++
+ local_irq_enable();
- while (list) {
- struct tasklet_struct *t = list;
@@ -19686,8 +19824,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
- }
- tasklet_unlock(t);
- }
-+ local_irq_enable();
-
+-
- local_irq_disable();
- t->next = NULL;
- *__this_cpu_read(tasklet_hi_vec.tail) = t;
@@ -19699,7 +19836,7 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
}
void tasklet_init(struct tasklet_struct *t,
-@@ -586,7 +1083,7 @@
+@@ -586,7 +1083,7 @@ void tasklet_kill(struct tasklet_struct *t)
while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
do {
@@ -19708,13 +19845,28 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
} while (test_bit(TASKLET_STATE_SCHED, &t->state));
}
tasklet_unlock_wait(t);
-@@ -660,25 +1157,26 @@
+@@ -660,25 +1157,26 @@ void __init softirq_init(void)
open_softirq(HI_SOFTIRQ, tasklet_hi_action);
}
--static int ksoftirqd_should_run(unsigned int cpu)
+#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
+void tasklet_unlock_wait(struct tasklet_struct *t)
++{
++ while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
++ /*
++ * Hack for now to avoid this busy-loop:
++ */
++#ifdef CONFIG_PREEMPT_RT_FULL
++ msleep(1);
++#else
++ barrier();
++#endif
++ }
++}
++EXPORT_SYMBOL(tasklet_unlock_wait);
++#endif
++
+ static int ksoftirqd_should_run(unsigned int cpu)
{
- return local_softirq_pending();
-}
@@ -19723,34 +19875,21 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
-{
- local_irq_disable();
- if (local_softirq_pending()) {
-+ while (test_bit(TASKLET_STATE_RUN, &(t)->state)) {
- /*
+- /*
- * We can safely run softirq on inline stack, as we are not deep
- * in the task stack here.
-+ * Hack for now to avoid this busy-loop:
- */
+- */
- __do_softirq();
- local_irq_enable();
- cond_resched_rcu_qs();
- return;
-+#ifdef CONFIG_PREEMPT_RT_FULL
-+ msleep(1);
-+#else
-+ barrier();
-+#endif
- }
+- }
- local_irq_enable();
-+}
-+EXPORT_SYMBOL(tasklet_unlock_wait);
-+#endif
-+
-+static int ksoftirqd_should_run(unsigned int cpu)
-+{
+ return ksoftirqd_softirq_pending();
}
#ifdef CONFIG_HOTPLUG_CPU
-@@ -745,17 +1243,31 @@
+@@ -745,17 +1243,31 @@ static int takeover_tasklets(unsigned int cpu)
static struct smp_hotplug_thread softirq_threads = {
.store = &ksoftirqd,
@@ -19783,10 +19922,11 @@ diff -Nur linux-4.9.28.orig/kernel/softirq.c linux-4.9.28/kernel/softirq.c
return 0;
}
early_initcall(spawn_ksoftirqd);
-diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machine.c
---- linux-4.9.28.orig/kernel/stop_machine.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/stop_machine.c 2017-05-19 03:37:25.198177419 +0200
-@@ -36,7 +36,7 @@
+diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
+index ec9ab2f01489..8b89dbedeaff 100644
+--- a/kernel/stop_machine.c
++++ b/kernel/stop_machine.c
+@@ -36,7 +36,7 @@ struct cpu_stop_done {
struct cpu_stopper {
struct task_struct *thread;
@@ -19795,7 +19935,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
bool enabled; /* is this stopper enabled? */
struct list_head works; /* list of pending works */
-@@ -78,14 +78,14 @@
+@@ -78,14 +78,14 @@ static bool cpu_stop_queue_work(unsigned int cpu, struct cpu_stop_work *work)
unsigned long flags;
bool enabled;
@@ -19812,7 +19952,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
return enabled;
}
-@@ -231,8 +231,8 @@
+@@ -231,8 +231,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
struct cpu_stopper *stopper2 = per_cpu_ptr(&cpu_stopper, cpu2);
int err;
retry:
@@ -19823,7 +19963,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
err = -ENOENT;
if (!stopper1->enabled || !stopper2->enabled)
-@@ -255,8 +255,8 @@
+@@ -255,8 +255,8 @@ static int cpu_stop_queue_two_works(int cpu1, struct cpu_stop_work *work1,
__cpu_stop_queue_work(stopper1, work1);
__cpu_stop_queue_work(stopper2, work2);
unlock:
@@ -19834,7 +19974,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
if (unlikely(err == -EDEADLK)) {
while (stop_cpus_in_progress)
-@@ -448,9 +448,9 @@
+@@ -448,9 +448,9 @@ static int cpu_stop_should_run(unsigned int cpu)
unsigned long flags;
int run;
@@ -19846,7 +19986,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
return run;
}
-@@ -461,13 +461,13 @@
+@@ -461,13 +461,13 @@ static void cpu_stopper_thread(unsigned int cpu)
repeat:
work = NULL;
@@ -19862,7 +20002,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
if (work) {
cpu_stop_fn_t fn = work->fn;
-@@ -475,6 +475,8 @@
+@@ -475,6 +475,8 @@ static void cpu_stopper_thread(unsigned int cpu)
struct cpu_stop_done *done = work->done;
int ret;
@@ -19871,7 +20011,7 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
/* cpu stop callbacks must not sleep, make in_atomic() == T */
preempt_count_inc();
ret = fn(arg);
-@@ -541,7 +543,7 @@
+@@ -541,7 +543,7 @@ static int __init cpu_stop_init(void)
for_each_possible_cpu(cpu) {
struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
@@ -19880,9 +20020,10 @@ diff -Nur linux-4.9.28.orig/kernel/stop_machine.c linux-4.9.28/kernel/stop_machi
INIT_LIST_HEAD(&stopper->works);
}
-diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtimer.c
---- linux-4.9.28.orig/kernel/time/hrtimer.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/hrtimer.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c
+index bb5ec425dfe0..8338b14ed3a3 100644
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
@@ -53,6 +53,7 @@
#include <asm/uaccess.h>
@@ -19891,7 +20032,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
#include "tick-internal.h"
-@@ -695,6 +696,29 @@
+@@ -695,6 +696,29 @@ static void hrtimer_switch_to_hres(void)
retrigger_next_event(NULL);
}
@@ -19921,7 +20062,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
static void clock_was_set_work(struct work_struct *work)
{
clock_was_set();
-@@ -710,6 +734,7 @@
+@@ -710,6 +734,7 @@ void clock_was_set_delayed(void)
{
schedule_work(&hrtimer_work);
}
@@ -19929,7 +20070,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
#else
-@@ -719,11 +744,8 @@
+@@ -719,11 +744,8 @@ static inline int hrtimer_is_hres_enabled(void) { return 0; }
static inline void hrtimer_switch_to_hres(void) { }
static inline void
hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
@@ -19943,7 +20084,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
static inline void retrigger_next_event(void *arg) { }
-@@ -855,6 +877,32 @@
+@@ -855,6 +877,32 @@ u64 hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval)
}
EXPORT_SYMBOL_GPL(hrtimer_forward);
@@ -19976,7 +20117,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
/*
* enqueue_hrtimer - internal function to (re)start a timer
*
-@@ -896,6 +944,11 @@
+@@ -896,6 +944,11 @@ static void __remove_hrtimer(struct hrtimer *timer,
if (!(state & HRTIMER_STATE_ENQUEUED))
return;
@@ -19988,7 +20129,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
if (!timerqueue_del(&base->active, &timer->node))
cpu_base->active_bases &= ~(1 << base->index);
-@@ -991,7 +1044,16 @@
+@@ -991,7 +1044,16 @@ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
timer_stats_hrtimer_set_start_info(timer);
@@ -20005,7 +20146,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
leftmost = enqueue_hrtimer(timer, new_base);
if (!leftmost)
goto unlock;
-@@ -1063,7 +1125,7 @@
+@@ -1063,7 +1125,7 @@ int hrtimer_cancel(struct hrtimer *timer)
if (ret >= 0)
return ret;
@@ -20014,7 +20155,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
}
}
EXPORT_SYMBOL_GPL(hrtimer_cancel);
-@@ -1127,6 +1189,7 @@
+@@ -1127,6 +1189,7 @@ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
base = hrtimer_clockid_to_base(clock_id);
timer->base = &cpu_base->clock_base[base];
@@ -20022,7 +20163,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
timerqueue_init(&timer->node);
#ifdef CONFIG_TIMER_STATS
-@@ -1167,6 +1230,7 @@
+@@ -1167,6 +1230,7 @@ bool hrtimer_active(const struct hrtimer *timer)
seq = raw_read_seqcount_begin(&cpu_base->seq);
if (timer->state != HRTIMER_STATE_INACTIVE ||
@@ -20030,7 +20171,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
cpu_base->running == timer)
return true;
-@@ -1265,10 +1329,112 @@
+@@ -1265,10 +1329,112 @@ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
cpu_base->running = NULL;
}
@@ -20143,7 +20284,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
for (; active; base++, active >>= 1) {
struct timerqueue_node *node;
-@@ -1284,6 +1450,15 @@
+@@ -1284,6 +1450,15 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
timer = container_of(node, struct hrtimer, node);
@@ -20159,7 +20300,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
/*
* The immediate goal for using the softexpires is
* minimizing wakeups, not running timers at the
-@@ -1299,9 +1474,14 @@
+@@ -1299,9 +1474,14 @@ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
if (basenow.tv64 < hrtimer_get_softexpires_tv64(timer))
break;
@@ -20175,7 +20316,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
}
#ifdef CONFIG_HIGH_RES_TIMERS
-@@ -1464,16 +1644,18 @@
+@@ -1464,16 +1644,18 @@ static enum hrtimer_restart hrtimer_wakeup(struct hrtimer *timer)
void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
{
sl->timer.function = hrtimer_wakeup;
@@ -20196,7 +20337,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
hrtimer_start_expires(&t->timer, mode);
if (likely(t->task))
-@@ -1515,7 +1697,8 @@
+@@ -1515,7 +1697,8 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
HRTIMER_MODE_ABS);
hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
@@ -20206,7 +20347,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
goto out;
rmtp = restart->nanosleep.rmtp;
-@@ -1532,8 +1715,10 @@
+@@ -1532,8 +1715,10 @@ long __sched hrtimer_nanosleep_restart(struct restart_block *restart)
return ret;
}
@@ -20219,7 +20360,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
{
struct restart_block *restart;
struct hrtimer_sleeper t;
-@@ -1546,7 +1731,7 @@
+@@ -1546,7 +1731,7 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
hrtimer_init_on_stack(&t.timer, clockid, mode);
hrtimer_set_expires_range_ns(&t.timer, timespec_to_ktime(*rqtp), slack);
@@ -20228,7 +20369,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
goto out;
/* Absolute timers do not update the rmtp value and restart: */
-@@ -1573,6 +1758,12 @@
+@@ -1573,6 +1758,12 @@ long hrtimer_nanosleep(struct timespec *rqtp, struct timespec __user *rmtp,
return ret;
}
@@ -20241,7 +20382,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
struct timespec __user *, rmtp)
{
-@@ -1587,6 +1778,26 @@
+@@ -1587,6 +1778,26 @@ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
return hrtimer_nanosleep(&tu, rmtp, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
}
@@ -20268,7 +20409,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
/*
* Functions related to boot-time initialization:
*/
-@@ -1598,10 +1809,14 @@
+@@ -1598,10 +1809,14 @@ int hrtimers_prepare_cpu(unsigned int cpu)
for (i = 0; i < HRTIMER_MAX_CLOCK_BASES; i++) {
cpu_base->clock_base[i].cpu_base = cpu_base;
timerqueue_init_head(&cpu_base->clock_base[i].active);
@@ -20283,7 +20424,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
return 0;
}
-@@ -1671,9 +1886,26 @@
+@@ -1671,9 +1886,26 @@ int hrtimers_dead_cpu(unsigned int scpu)
#endif /* CONFIG_HOTPLUG_CPU */
@@ -20310,10 +20451,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/hrtimer.c linux-4.9.28/kernel/time/hrtim
}
/**
-diff -Nur linux-4.9.28.orig/kernel/time/itimer.c linux-4.9.28/kernel/time/itimer.c
---- linux-4.9.28.orig/kernel/time/itimer.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/itimer.c 2017-05-19 03:37:25.198177419 +0200
-@@ -213,6 +213,7 @@
+diff --git a/kernel/time/itimer.c b/kernel/time/itimer.c
+index 1d5c7204ddc9..184de6751180 100644
+--- a/kernel/time/itimer.c
++++ b/kernel/time/itimer.c
+@@ -213,6 +213,7 @@ int do_setitimer(int which, struct itimerval *value, struct itimerval *ovalue)
/* We are sharing ->siglock with it_real_fn() */
if (hrtimer_try_to_cancel(timer) < 0) {
spin_unlock_irq(&tsk->sighand->siglock);
@@ -20321,10 +20463,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/itimer.c linux-4.9.28/kernel/time/itimer
goto again;
}
expires = timeval_to_ktime(value->it_value);
-diff -Nur linux-4.9.28.orig/kernel/time/jiffies.c linux-4.9.28/kernel/time/jiffies.c
---- linux-4.9.28.orig/kernel/time/jiffies.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/jiffies.c 2017-05-19 03:37:25.198177419 +0200
-@@ -74,7 +74,8 @@
+diff --git a/kernel/time/jiffies.c b/kernel/time/jiffies.c
+index 555e21f7b966..a5d6435fabbb 100644
+--- a/kernel/time/jiffies.c
++++ b/kernel/time/jiffies.c
+@@ -74,7 +74,8 @@ static struct clocksource clocksource_jiffies = {
.max_cycles = 10,
};
@@ -20334,7 +20477,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/jiffies.c linux-4.9.28/kernel/time/jiffi
#if (BITS_PER_LONG < 64)
u64 get_jiffies_64(void)
-@@ -83,9 +84,9 @@
+@@ -83,9 +84,9 @@ u64 get_jiffies_64(void)
u64 ret;
do {
@@ -20346,9 +20489,10 @@ diff -Nur linux-4.9.28.orig/kernel/time/jiffies.c linux-4.9.28/kernel/time/jiffi
return ret;
}
EXPORT_SYMBOL(get_jiffies_64);
-diff -Nur linux-4.9.28.orig/kernel/time/ntp.c linux-4.9.28/kernel/time/ntp.c
---- linux-4.9.28.orig/kernel/time/ntp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/ntp.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
+index 6df8927c58a5..05b7391bf9bd 100644
+--- a/kernel/time/ntp.c
++++ b/kernel/time/ntp.c
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/rtc.h>
@@ -20357,7 +20501,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/ntp.c linux-4.9.28/kernel/time/ntp.c
#include "ntp_internal.h"
#include "timekeeping_internal.h"
-@@ -568,10 +569,35 @@
+@@ -568,10 +569,35 @@ static void sync_cmos_clock(struct work_struct *work)
&sync_cmos_work, timespec64_to_jiffies(&next));
}
@@ -20393,9 +20537,10 @@ diff -Nur linux-4.9.28.orig/kernel/time/ntp.c linux-4.9.28/kernel/time/ntp.c
#else
void ntp_notify_cmos_timer(void) { }
-diff -Nur linux-4.9.28.orig/kernel/time/posix-cpu-timers.c linux-4.9.28/kernel/time/posix-cpu-timers.c
---- linux-4.9.28.orig/kernel/time/posix-cpu-timers.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/posix-cpu-timers.c 2017-05-19 03:37:25.198177419 +0200
+diff --git a/kernel/time/posix-cpu-timers.c b/kernel/time/posix-cpu-timers.c
+index 39008d78927a..633f4eaca9e7 100644
+--- a/kernel/time/posix-cpu-timers.c
++++ b/kernel/time/posix-cpu-timers.c
@@ -3,6 +3,7 @@
*/
@@ -20404,7 +20549,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-cpu-timers.c linux-4.9.28/kernel/t
#include <linux/posix-timers.h>
#include <linux/errno.h>
#include <linux/math64.h>
-@@ -620,7 +621,7 @@
+@@ -620,7 +621,7 @@ static int posix_cpu_timer_set(struct k_itimer *timer, int timer_flags,
/*
* Disarm any old timer after extracting its expiry time.
*/
@@ -20413,7 +20558,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-cpu-timers.c linux-4.9.28/kernel/t
ret = 0;
old_incr = timer->it.cpu.incr;
-@@ -1064,7 +1065,7 @@
+@@ -1064,7 +1065,7 @@ void posix_cpu_timer_schedule(struct k_itimer *timer)
/*
* Now re-arm for the new expiry time.
*/
@@ -20422,7 +20567,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-cpu-timers.c linux-4.9.28/kernel/t
arm_timer(timer);
unlock_task_sighand(p, &flags);
-@@ -1153,13 +1154,13 @@
+@@ -1153,13 +1154,13 @@ static inline int fastpath_timer_check(struct task_struct *tsk)
* already updated our counts. We need to check if any timers fire now.
* Interrupts are disabled.
*/
@@ -20438,7 +20583,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-cpu-timers.c linux-4.9.28/kernel/t
/*
* The fast path checks that there are no expired thread or thread
-@@ -1213,6 +1214,190 @@
+@@ -1213,6 +1214,190 @@ void run_posix_cpu_timers(struct task_struct *tsk)
}
}
@@ -20629,10 +20774,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-cpu-timers.c linux-4.9.28/kernel/t
/*
* Set one of the process-wide special case CPU timers or RLIMIT_CPU.
* The tsk->sighand->siglock must be held by the caller.
-diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/posix-timers.c
---- linux-4.9.28.orig/kernel/time/posix-timers.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/posix-timers.c 2017-05-19 03:37:25.198177419 +0200
-@@ -506,6 +506,7 @@
+diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c
+index f2826c35e918..464a98155a0e 100644
+--- a/kernel/time/posix-timers.c
++++ b/kernel/time/posix-timers.c
+@@ -506,6 +506,7 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
static struct pid *good_sigevent(sigevent_t * event)
{
struct task_struct *rtn = current->group_leader;
@@ -20640,7 +20786,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/
if ((event->sigev_notify & SIGEV_THREAD_ID ) &&
(!(rtn = find_task_by_vpid(event->sigev_notify_thread_id)) ||
-@@ -514,7 +515,8 @@
+@@ -514,7 +515,8 @@ static struct pid *good_sigevent(sigevent_t * event)
return NULL;
if (((event->sigev_notify & ~SIGEV_THREAD_ID) != SIGEV_NONE) &&
@@ -20650,7 +20796,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/
return NULL;
return task_pid(rtn);
-@@ -826,6 +828,20 @@
+@@ -826,6 +828,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_t, timer_id)
return overrun;
}
@@ -20671,7 +20817,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/
/* Set a POSIX.1b interval timer. */
/* timr->it_lock is taken. */
static int
-@@ -903,6 +919,7 @@
+@@ -903,6 +919,7 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
if (!timr)
return -EINVAL;
@@ -20679,7 +20825,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/
kc = clockid_to_kclock(timr->it_clock);
if (WARN_ON_ONCE(!kc || !kc->timer_set))
error = -EINVAL;
-@@ -911,9 +928,12 @@
+@@ -911,9 +928,12 @@ SYSCALL_DEFINE4(timer_settime, timer_t, timer_id, int, flags,
unlock_timer(timr, flag);
if (error == TIMER_RETRY) {
@@ -20692,7 +20838,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/
if (old_setting && !error &&
copy_to_user(old_setting, &old_spec, sizeof (old_spec)))
-@@ -951,10 +971,15 @@
+@@ -951,10 +971,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, timer_id)
if (!timer)
return -EINVAL;
@@ -20708,39 +20854,42 @@ diff -Nur linux-4.9.28.orig/kernel/time/posix-timers.c linux-4.9.28/kernel/time/
spin_lock(&current->sighand->siglock);
list_del(&timer->list);
-@@ -980,8 +1005,18 @@
+@@ -980,8 +1005,18 @@ static void itimer_delete(struct k_itimer *timer)
retry_delete:
spin_lock_irqsave(&timer->it_lock, flags);
+- if (timer_delete_hook(timer) == TIMER_RETRY) {
+ /* On RT we can race with a deletion */
+ if (!timer->it_signal) {
-+ unlock_timer(timer, flags);
+ unlock_timer(timer, flags);
+ return;
+ }
+
- if (timer_delete_hook(timer) == TIMER_RETRY) {
++ if (timer_delete_hook(timer) == TIMER_RETRY) {
+ rcu_read_lock();
- unlock_timer(timer, flags);
++ unlock_timer(timer, flags);
+ timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
+ timer);
+ rcu_read_unlock();
goto retry_delete;
}
list_del(&timer->list);
-diff -Nur linux-4.9.28.orig/kernel/time/tick-broadcast-hrtimer.c linux-4.9.28/kernel/time/tick-broadcast-hrtimer.c
---- linux-4.9.28.orig/kernel/time/tick-broadcast-hrtimer.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/tick-broadcast-hrtimer.c 2017-05-19 03:37:25.198177419 +0200
-@@ -107,5 +107,6 @@
+diff --git a/kernel/time/tick-broadcast-hrtimer.c b/kernel/time/tick-broadcast-hrtimer.c
+index 690b797f522e..fe8ba1619879 100644
+--- a/kernel/time/tick-broadcast-hrtimer.c
++++ b/kernel/time/tick-broadcast-hrtimer.c
+@@ -107,5 +107,6 @@ void tick_setup_hrtimer_broadcast(void)
{
hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
bctimer.function = bc_handler;
+ bctimer.irqsafe = true;
clockevents_register_device(&ce_broadcast_hrtimer);
}
-diff -Nur linux-4.9.28.orig/kernel/time/tick-common.c linux-4.9.28/kernel/time/tick-common.c
---- linux-4.9.28.orig/kernel/time/tick-common.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/tick-common.c 2017-05-19 03:37:25.198177419 +0200
-@@ -79,13 +79,15 @@
+diff --git a/kernel/time/tick-common.c b/kernel/time/tick-common.c
+index 4fcd99e12aa0..5a47f2e98faf 100644
+--- a/kernel/time/tick-common.c
++++ b/kernel/time/tick-common.c
+@@ -79,13 +79,15 @@ int tick_is_oneshot_available(void)
static void tick_periodic(int cpu)
{
if (tick_do_timer_cpu == cpu) {
@@ -20758,7 +20907,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-common.c linux-4.9.28/kernel/time/t
update_wall_time();
}
-@@ -157,9 +159,9 @@
+@@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_event_device *dev, int broadcast)
ktime_t next;
do {
@@ -20770,10 +20919,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-common.c linux-4.9.28/kernel/time/t
clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
-diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/tick-sched.c
---- linux-4.9.28.orig/kernel/time/tick-sched.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/tick-sched.c 2017-05-19 03:37:25.198177419 +0200
-@@ -62,7 +62,8 @@
+diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
+index 3bcb61b52f6c..66d85482a96e 100644
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -62,7 +62,8 @@ static void tick_do_update_jiffies64(ktime_t now)
return;
/* Reevaluate with jiffies_lock held */
@@ -20783,7 +20933,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
delta = ktime_sub(now, last_jiffies_update);
if (delta.tv64 >= tick_period.tv64) {
-@@ -85,10 +86,12 @@
+@@ -85,10 +86,12 @@ static void tick_do_update_jiffies64(ktime_t now)
/* Keep the tick_next_period variable up to date */
tick_next_period = ktime_add(last_jiffies_update, tick_period);
} else {
@@ -20798,7 +20948,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
update_wall_time();
}
-@@ -99,12 +102,14 @@
+@@ -99,12 +102,14 @@ static ktime_t tick_init_jiffy_update(void)
{
ktime_t period;
@@ -20815,7 +20965,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
return period;
}
-@@ -215,6 +220,7 @@
+@@ -215,6 +220,7 @@ static void nohz_full_kick_func(struct irq_work *work)
static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = {
.func = nohz_full_kick_func,
@@ -20823,7 +20973,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
};
/*
-@@ -673,10 +679,10 @@
+@@ -673,10 +679,10 @@ static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts,
/* Read jiffies and the time when jiffies were updated last */
do {
@@ -20836,7 +20986,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
ts->last_jiffies = basejiff;
if (rcu_needs_cpu(basemono, &next_rcu) ||
-@@ -877,14 +883,7 @@
+@@ -877,14 +883,7 @@ static bool can_stop_idle_tick(int cpu, struct tick_sched *ts)
return false;
if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
@@ -20852,7 +21002,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
return false;
}
-@@ -1193,6 +1192,7 @@
+@@ -1193,6 +1192,7 @@ void tick_setup_sched_timer(void)
* Emulate tick processing via per-CPU hrtimers:
*/
hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
@@ -20860,10 +21010,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/tick-sched.c linux-4.9.28/kernel/time/ti
ts->sched_timer.function = tick_sched_timer;
/* Get the next period (per-CPU) */
-diff -Nur linux-4.9.28.orig/kernel/time/timekeeping.c linux-4.9.28/kernel/time/timekeeping.c
---- linux-4.9.28.orig/kernel/time/timekeeping.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/timekeeping.c 2017-05-19 03:37:25.198177419 +0200
-@@ -2328,8 +2328,10 @@
+diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c
+index 46e312e9be38..fa75cf5d9253 100644
+--- a/kernel/time/timekeeping.c
++++ b/kernel/time/timekeeping.c
+@@ -2328,8 +2328,10 @@ EXPORT_SYMBOL(hardpps);
*/
void xtime_update(unsigned long ticks)
{
@@ -20876,10 +21027,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/timekeeping.c linux-4.9.28/kernel/time/t
+ raw_spin_unlock(&jiffies_lock);
update_wall_time();
}
-diff -Nur linux-4.9.28.orig/kernel/time/timekeeping.h linux-4.9.28/kernel/time/timekeeping.h
---- linux-4.9.28.orig/kernel/time/timekeeping.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/timekeeping.h 2017-05-19 03:37:25.202177573 +0200
-@@ -19,7 +19,8 @@
+diff --git a/kernel/time/timekeeping.h b/kernel/time/timekeeping.h
+index 704f595ce83f..763a3e5121ff 100644
+--- a/kernel/time/timekeeping.h
++++ b/kernel/time/timekeeping.h
+@@ -19,7 +19,8 @@ extern void timekeeping_resume(void);
extern void do_timer(unsigned long ticks);
extern void update_wall_time(void);
@@ -20889,10 +21041,11 @@ diff -Nur linux-4.9.28.orig/kernel/time/timekeeping.h linux-4.9.28/kernel/time/t
#define CS_NAME_LEN 32
-diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
---- linux-4.9.28.orig/kernel/time/timer.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/time/timer.c 2017-05-19 03:37:25.202177573 +0200
-@@ -193,8 +193,11 @@
+diff --git a/kernel/time/timer.c b/kernel/time/timer.c
+index c611c47de884..08a5ab762495 100644
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -193,8 +193,11 @@ EXPORT_SYMBOL(jiffies_64);
#endif
struct timer_base {
@@ -20905,16 +21058,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
unsigned long clk;
unsigned long next_expiry;
unsigned int cpu;
-@@ -203,6 +206,8 @@
- bool is_idle;
- DECLARE_BITMAP(pending_map, WHEEL_SIZE);
- struct hlist_head vectors[WHEEL_SIZE];
-+ struct hlist_head expired_lists[LVL_DEPTH];
-+ int expired_count;
- } ____cacheline_aligned;
-
- static DEFINE_PER_CPU(struct timer_base, timer_bases[NR_BASES]);
-@@ -948,10 +953,10 @@
+@@ -948,10 +951,10 @@ static struct timer_base *lock_timer_base(struct timer_list *timer,
if (!(tf & TIMER_MIGRATING)) {
base = get_timer_base(tf);
@@ -20927,7 +21071,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
}
cpu_relax();
}
-@@ -1023,9 +1028,9 @@
+@@ -1023,9 +1026,9 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
/* See the comment in lock_timer_base() */
timer->flags |= TIMER_MIGRATING;
@@ -20939,7 +21083,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
WRITE_ONCE(timer->flags,
(timer->flags & ~TIMER_BASEMASK) | base->cpu);
}
-@@ -1050,7 +1055,7 @@
+@@ -1050,7 +1053,7 @@ __mod_timer(struct timer_list *timer, unsigned long expires, bool pending_only)
}
out_unlock:
@@ -20948,7 +21092,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
return ret;
}
-@@ -1144,19 +1149,46 @@
+@@ -1144,19 +1147,46 @@ void add_timer_on(struct timer_list *timer, int cpu)
if (base != new_base) {
timer->flags |= TIMER_MIGRATING;
@@ -20998,7 +21142,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
/**
* del_timer - deactive a timer.
* @timer: the timer to be deactivated
-@@ -1180,7 +1212,7 @@
+@@ -1180,7 +1210,7 @@ int del_timer(struct timer_list *timer)
if (timer_pending(timer)) {
base = lock_timer_base(timer, &flags);
ret = detach_if_pending(timer, base, true);
@@ -21007,7 +21151,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
}
return ret;
-@@ -1208,13 +1240,13 @@
+@@ -1208,13 +1238,13 @@ int try_to_del_timer_sync(struct timer_list *timer)
timer_stats_timer_clear_start_info(timer);
ret = detach_if_pending(timer, base, true);
}
@@ -21023,7 +21167,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
/**
* del_timer_sync - deactivate a timer and wait for the handler to finish.
* @timer: the timer to be deactivated
-@@ -1274,7 +1306,7 @@
+@@ -1274,7 +1304,7 @@ int del_timer_sync(struct timer_list *timer)
int ret = try_to_del_timer_sync(timer);
if (ret >= 0)
return ret;
@@ -21032,17 +21176,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
}
}
EXPORT_SYMBOL(del_timer_sync);
-@@ -1323,7 +1355,8 @@
- }
- }
-
--static void expire_timers(struct timer_base *base, struct hlist_head *head)
-+static inline void __expire_timers(struct timer_base *base,
-+ struct hlist_head *head)
- {
- while (!hlist_empty(head)) {
- struct timer_list *timer;
-@@ -1339,33 +1372,53 @@
+@@ -1339,14 +1369,17 @@ static void expire_timers(struct timer_base *base, struct hlist_head *head)
fn = timer->function;
data = timer->data;
@@ -21065,56 +21199,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
}
}
}
-
--static int __collect_expired_timers(struct timer_base *base,
-- struct hlist_head *heads)
-+static void expire_timers(struct timer_base *base)
-+{
-+ struct hlist_head *head;
-+
-+ while (base->expired_count--) {
-+ head = base->expired_lists + base->expired_count;
-+ __expire_timers(base, head);
-+ }
-+ base->expired_count = 0;
-+}
-+
-+static void __collect_expired_timers(struct timer_base *base)
- {
- unsigned long clk = base->clk;
- struct hlist_head *vec;
-- int i, levels = 0;
-+ int i;
- unsigned int idx;
-
-+ /*
-+ * expire_timers() must be called at least once before we can
-+ * collect more timers
-+ */
-+ if (WARN_ON(base->expired_count))
-+ return;
-+
- for (i = 0; i < LVL_DEPTH; i++) {
- idx = (clk & LVL_MASK) + i * LVL_SIZE;
-
- if (__test_and_clear_bit(idx, base->pending_map)) {
- vec = base->vectors + idx;
-- hlist_move_list(vec, heads++);
-- levels++;
-+ hlist_move_list(vec,
-+ &base->expired_lists[base->expired_count++]);
- }
- /* Is it time to look at the next level? */
- if (clk & LVL_CLK_MASK)
-@@ -1373,7 +1426,6 @@
- /* Shift clock for the next level granularity */
- clk >>= LVL_CLK_SHIFT;
- }
-- return levels;
- }
-
- #ifdef CONFIG_NO_HZ_COMMON
-@@ -1515,7 +1567,7 @@
+@@ -1515,7 +1548,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
if (cpu_is_offline(smp_processor_id()))
return expires;
@@ -21123,7 +21208,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
nextevt = __next_timer_interrupt(base);
is_max_delta = (nextevt == base->clk + NEXT_TIMER_MAX_DELTA);
base->next_expiry = nextevt;
-@@ -1543,7 +1595,7 @@
+@@ -1543,7 +1576,7 @@ u64 get_next_timer_interrupt(unsigned long basej, u64 basem)
if ((expires - basem) > TICK_NSEC)
base->is_idle = true;
}
@@ -21132,72 +21217,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
return cmp_next_hrtimer_event(basem, expires);
}
-@@ -1566,8 +1618,7 @@
- base->is_idle = false;
- }
-
--static int collect_expired_timers(struct timer_base *base,
-- struct hlist_head *heads)
-+static void collect_expired_timers(struct timer_base *base)
- {
- /*
- * NOHZ optimization. After a long idle sleep we need to forward the
-@@ -1584,20 +1635,49 @@
- if (time_after(next, jiffies)) {
- /* The call site will increment clock! */
- base->clk = jiffies - 1;
-- return 0;
-+ return;
- }
- base->clk = next;
- }
-- return __collect_expired_timers(base, heads);
-+ __collect_expired_timers(base);
- }
- #else
--static inline int collect_expired_timers(struct timer_base *base,
-- struct hlist_head *heads)
-+static inline void collect_expired_timers(struct timer_base *base)
- {
-- return __collect_expired_timers(base, heads);
-+ __collect_expired_timers(base);
- }
- #endif
-
-+static int find_expired_timers(struct timer_base *base)
-+{
-+ const unsigned long int end_clk = jiffies;
-+
-+ while (!base->expired_count && time_after_eq(end_clk, base->clk)) {
-+ collect_expired_timers(base);
-+ base->clk++;
-+ }
-+
-+ return base->expired_count;
-+}
-+
-+/* Called from CPU tick routine to quickly collect expired timers */
-+static int tick_find_expired(struct timer_base *base)
-+{
-+ int count;
-+
-+ raw_spin_lock(&base->lock);
-+
-+ if (unlikely(time_after(jiffies, base->clk + HZ))) {
-+ /* defer to ktimersoftd; don't spend too long in irq context */
-+ count = -1;
-+ } else
-+ count = find_expired_timers(base);
-+
-+ raw_spin_unlock(&base->lock);
-+
-+ return count;
-+}
-+
- /*
- * Called from the timer interrupt handler to charge one tick to the current
- * process. user_tick is 1 if the tick is user time, 0 for system.
-@@ -1608,13 +1688,13 @@
+@@ -1608,13 +1641,13 @@ void update_process_times(int user_tick)
/* Note: this timer irq context must be accounted for as well. */
account_process_tick(p, user_tick);
@@ -21213,29 +21233,19 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
run_posix_cpu_timers(p);
}
-@@ -1624,24 +1704,13 @@
- */
- static inline void __run_timers(struct timer_base *base)
- {
-- struct hlist_head heads[LVL_DEPTH];
-- int levels;
--
-- if (!time_after_eq(jiffies, base->clk))
-- return;
-+ raw_spin_lock_irq(&base->lock);
+@@ -1630,7 +1663,7 @@ static inline void __run_timers(struct timer_base *base)
+ if (!time_after_eq(jiffies, base->clk))
+ return;
- spin_lock_irq(&base->lock);
-+ while (find_expired_timers(base))
-+ expire_timers(base);
++ raw_spin_lock_irq(&base->lock);
-- while (time_after_eq(jiffies, base->clk)) {
--
-- levels = collect_expired_timers(base, heads);
-- base->clk++;
--
-- while (levels--)
-- expire_timers(base, heads + levels);
-- }
+ while (time_after_eq(jiffies, base->clk)) {
+
+@@ -1640,8 +1673,8 @@ static inline void __run_timers(struct timer_base *base)
+ while (levels--)
+ expire_timers(base, heads + levels);
+ }
- base->running_timer = NULL;
- spin_unlock_irq(&base->lock);
+ raw_spin_unlock_irq(&base->lock);
@@ -21243,7 +21253,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
}
/*
-@@ -1651,6 +1720,8 @@
+@@ -1651,6 +1684,8 @@ static __latent_entropy void run_timer_softirq(struct softirq_action *h)
{
struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
@@ -21252,22 +21262,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
__run_timers(base);
if (IS_ENABLED(CONFIG_NO_HZ_COMMON) && base->nohz_active)
__run_timers(this_cpu_ptr(&timer_bases[BASE_DEF]));
-@@ -1665,12 +1736,12 @@
-
- hrtimer_run_queues();
- /* Raise the softirq only if required. */
-- if (time_before(jiffies, base->clk)) {
-+ if (time_before(jiffies, base->clk) || !tick_find_expired(base)) {
- if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active)
- return;
- /* CPU is awake, so check the deferrable base. */
- base++;
-- if (time_before(jiffies, base->clk))
-+ if (time_before(jiffies, base->clk) || !tick_find_expired(base))
- return;
- }
- raise_softirq(TIMER_SOFTIRQ);
-@@ -1836,16 +1907,17 @@
+@@ -1836,16 +1871,16 @@ int timers_dead_cpu(unsigned int cpu)
* The caller is globally serialized and nobody else
* takes two locks at once, deadlock is not possible.
*/
@@ -21277,7 +21272,6 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
+ raw_spin_lock_nested(&old_base->lock, SINGLE_DEPTH_NESTING);
BUG_ON(old_base->running_timer);
-+ BUG_ON(old_base->expired_count);
for (i = 0; i < WHEEL_SIZE; i++)
migrate_timer_list(new_base, old_base->vectors + i);
@@ -21289,7 +21283,7 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
put_cpu_ptr(&timer_bases);
}
return 0;
-@@ -1861,8 +1933,12 @@
+@@ -1861,8 +1896,11 @@ static void __init init_timer_cpu(int cpu)
for (i = 0; i < NR_BASES; i++) {
base = per_cpu_ptr(&timer_bases[i], cpu);
base->cpu = cpu;
@@ -21299,14 +21293,14 @@ diff -Nur linux-4.9.28.orig/kernel/time/timer.c linux-4.9.28/kernel/time/timer.c
+#ifdef CONFIG_PREEMPT_RT_FULL
+ init_swait_queue_head(&base->wait_for_running_timer);
+#endif
-+ base->expired_count = 0;
}
}
-diff -Nur linux-4.9.28.orig/kernel/trace/Kconfig linux-4.9.28/kernel/trace/Kconfig
---- linux-4.9.28.orig/kernel/trace/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/Kconfig 2017-05-19 03:37:25.202177573 +0200
-@@ -182,6 +182,24 @@
+diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
+index 2a96b063d659..812e37237eb8 100644
+--- a/kernel/trace/Kconfig
++++ b/kernel/trace/Kconfig
+@@ -182,6 +182,24 @@ config IRQSOFF_TRACER
enabled. This option and the preempt-off timing option can be
used together or separately.)
@@ -21331,7 +21325,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/Kconfig linux-4.9.28/kernel/trace/Kconf
config PREEMPT_TRACER
bool "Preemption-off Latency Tracer"
default n
-@@ -206,6 +224,24 @@
+@@ -206,6 +224,24 @@ config PREEMPT_TRACER
enabled. This option and the irqs-off timing option can be
used together or separately.)
@@ -21356,7 +21350,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/Kconfig linux-4.9.28/kernel/trace/Kconf
config SCHED_TRACER
bool "Scheduling Latency Tracer"
select GENERIC_TRACER
-@@ -251,6 +287,74 @@
+@@ -251,6 +287,74 @@ config HWLAT_TRACER
file. Every time a latency is greater than tracing_thresh, it will
be recorded into the ring buffer.
@@ -21431,9 +21425,26 @@ diff -Nur linux-4.9.28.orig/kernel/trace/Kconfig linux-4.9.28/kernel/trace/Kconf
config ENABLE_DEFAULT_TRACERS
bool "Trace process context switches and events"
depends on !GENERIC_TRACER
-diff -Nur linux-4.9.28.orig/kernel/trace/latency_hist.c linux-4.9.28/kernel/trace/latency_hist.c
---- linux-4.9.28.orig/kernel/trace/latency_hist.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-4.9.28/kernel/trace/latency_hist.c 2017-05-19 03:37:25.202177573 +0200
+diff --git a/kernel/trace/Makefile b/kernel/trace/Makefile
+index e57980845549..83af000b783c 100644
+--- a/kernel/trace/Makefile
++++ b/kernel/trace/Makefile
+@@ -38,6 +38,10 @@ obj-$(CONFIG_IRQSOFF_TRACER) += trace_irqsoff.o
+ obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
+ obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o
+ obj-$(CONFIG_HWLAT_TRACER) += trace_hwlat.o
++obj-$(CONFIG_INTERRUPT_OFF_HIST) += latency_hist.o
++obj-$(CONFIG_PREEMPT_OFF_HIST) += latency_hist.o
++obj-$(CONFIG_WAKEUP_LATENCY_HIST) += latency_hist.o
++obj-$(CONFIG_MISSED_TIMER_OFFSETS_HIST) += latency_hist.o
+ obj-$(CONFIG_NOP_TRACER) += trace_nop.o
+ obj-$(CONFIG_STACK_TRACER) += trace_stack.o
+ obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
+diff --git a/kernel/trace/latency_hist.c b/kernel/trace/latency_hist.c
+new file mode 100644
+index 000000000000..7f6ee70dea41
+--- /dev/null
++++ b/kernel/trace/latency_hist.c
@@ -0,0 +1,1178 @@
+/*
+ * kernel/trace/latency_hist.c
@@ -22613,24 +22624,11 @@ diff -Nur linux-4.9.28.orig/kernel/trace/latency_hist.c linux-4.9.28/kernel/trac
+}
+
+device_initcall(latency_hist_init);
-diff -Nur linux-4.9.28.orig/kernel/trace/Makefile linux-4.9.28/kernel/trace/Makefile
---- linux-4.9.28.orig/kernel/trace/Makefile 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/Makefile 2017-05-19 03:37:25.202177573 +0200
-@@ -38,6 +38,10 @@
- obj-$(CONFIG_PREEMPT_TRACER) += trace_irqsoff.o
- obj-$(CONFIG_SCHED_TRACER) += trace_sched_wakeup.o
- obj-$(CONFIG_HWLAT_TRACER) += trace_hwlat.o
-+obj-$(CONFIG_INTERRUPT_OFF_HIST) += latency_hist.o
-+obj-$(CONFIG_PREEMPT_OFF_HIST) += latency_hist.o
-+obj-$(CONFIG_WAKEUP_LATENCY_HIST) += latency_hist.o
-+obj-$(CONFIG_MISSED_TIMER_OFFSETS_HIST) += latency_hist.o
- obj-$(CONFIG_NOP_TRACER) += trace_nop.o
- obj-$(CONFIG_STACK_TRACER) += trace_stack.o
- obj-$(CONFIG_MMIOTRACE) += trace_mmiotrace.o
-diff -Nur linux-4.9.28.orig/kernel/trace/trace.c linux-4.9.28/kernel/trace/trace.c
---- linux-4.9.28.orig/kernel/trace/trace.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/trace.c 2017-05-19 03:37:25.202177573 +0200
-@@ -1897,6 +1897,7 @@
+diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
+index 83c60f9013cb..6fb207964a84 100644
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -1897,6 +1897,7 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
struct task_struct *tsk = current;
entry->preempt_count = pc & 0xff;
@@ -22638,7 +22636,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace.c linux-4.9.28/kernel/trace/trace
entry->pid = (tsk) ? tsk->pid : 0;
entry->flags =
#ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
-@@ -1907,8 +1908,11 @@
+@@ -1907,8 +1908,11 @@ tracing_generic_entry_update(struct trace_entry *entry, unsigned long flags,
((pc & NMI_MASK ) ? TRACE_FLAG_NMI : 0) |
((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
((pc & SOFTIRQ_MASK) ? TRACE_FLAG_SOFTIRQ : 0) |
@@ -22651,7 +22649,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace.c linux-4.9.28/kernel/trace/trace
}
EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
-@@ -2892,14 +2896,17 @@
+@@ -2892,14 +2896,17 @@ get_total_entries(struct trace_buffer *buf,
static void print_lat_help_header(struct seq_file *m)
{
@@ -22677,7 +22675,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace.c linux-4.9.28/kernel/trace/trace
}
static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
-@@ -2925,11 +2932,14 @@
+@@ -2925,11 +2932,14 @@ static void print_func_help_header_irq(struct trace_buffer *buf, struct seq_file
print_event_info(buf, m);
seq_puts(m, "# _-----=> irqs-off\n"
"# / _----=> need-resched\n"
@@ -22697,22 +22695,11 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace.c linux-4.9.28/kernel/trace/trace
}
void
-diff -Nur linux-4.9.28.orig/kernel/trace/trace_events.c linux-4.9.28/kernel/trace/trace_events.c
---- linux-4.9.28.orig/kernel/trace/trace_events.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/trace_events.c 2017-05-19 03:37:25.202177573 +0200
-@@ -187,6 +187,8 @@
- __common_field(unsigned char, flags);
- __common_field(unsigned char, preempt_count);
- __common_field(int, pid);
-+ __common_field(unsigned short, migrate_disable);
-+ __common_field(unsigned short, padding);
-
- return ret;
- }
-diff -Nur linux-4.9.28.orig/kernel/trace/trace.h linux-4.9.28/kernel/trace/trace.h
---- linux-4.9.28.orig/kernel/trace/trace.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/trace.h 2017-05-19 03:37:25.202177573 +0200
-@@ -124,6 +124,7 @@
+diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
+index b0d8576c27ae..702b9376b278 100644
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -124,6 +124,7 @@ struct kretprobe_trace_entry_head {
* NEED_RESCHED - reschedule is requested
* HARDIRQ - inside an interrupt handler
* SOFTIRQ - inside a softirq handler
@@ -22720,7 +22707,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace.h linux-4.9.28/kernel/trace/trace
*/
enum trace_flag_type {
TRACE_FLAG_IRQS_OFF = 0x01,
-@@ -133,6 +134,7 @@
+@@ -133,6 +134,7 @@ enum trace_flag_type {
TRACE_FLAG_SOFTIRQ = 0x10,
TRACE_FLAG_PREEMPT_RESCHED = 0x20,
TRACE_FLAG_NMI = 0x40,
@@ -22728,9 +22715,23 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace.h linux-4.9.28/kernel/trace/trace
};
#define TRACE_BUF_SIZE 1024
-diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/trace/trace_irqsoff.c
---- linux-4.9.28.orig/kernel/trace/trace_irqsoff.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/trace_irqsoff.c 2017-05-19 03:37:25.202177573 +0200
+diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
+index 03c0a48c3ac4..0b85d516b491 100644
+--- a/kernel/trace/trace_events.c
++++ b/kernel/trace/trace_events.c
+@@ -187,6 +187,8 @@ static int trace_define_common_fields(void)
+ __common_field(unsigned char, flags);
+ __common_field(unsigned char, preempt_count);
+ __common_field(int, pid);
++ __common_field(unsigned short, migrate_disable);
++ __common_field(unsigned short, padding);
+
+ return ret;
+ }
+diff --git a/kernel/trace/trace_irqsoff.c b/kernel/trace/trace_irqsoff.c
+index 03cdff84d026..940bd10b4406 100644
+--- a/kernel/trace/trace_irqsoff.c
++++ b/kernel/trace/trace_irqsoff.c
@@ -13,6 +13,7 @@
#include <linux/uaccess.h>
#include <linux/module.h>
@@ -22739,7 +22740,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
#include "trace.h"
-@@ -424,11 +425,13 @@
+@@ -424,11 +425,13 @@ void start_critical_timings(void)
{
if (preempt_trace() || irq_trace())
start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
@@ -22753,7 +22754,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
if (preempt_trace() || irq_trace())
stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
}
-@@ -438,6 +441,7 @@
+@@ -438,6 +441,7 @@ EXPORT_SYMBOL_GPL(stop_critical_timings);
#ifdef CONFIG_PROVE_LOCKING
void time_hardirqs_on(unsigned long a0, unsigned long a1)
{
@@ -22761,7 +22762,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
if (!preempt_trace() && irq_trace())
stop_critical_timing(a0, a1);
}
-@@ -446,6 +450,7 @@
+@@ -446,6 +450,7 @@ void time_hardirqs_off(unsigned long a0, unsigned long a1)
{
if (!preempt_trace() && irq_trace())
start_critical_timing(a0, a1);
@@ -22769,7 +22770,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
}
#else /* !CONFIG_PROVE_LOCKING */
-@@ -471,6 +476,7 @@
+@@ -471,6 +476,7 @@ inline void print_irqtrace_events(struct task_struct *curr)
*/
void trace_hardirqs_on(void)
{
@@ -22777,7 +22778,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
if (!preempt_trace() && irq_trace())
stop_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
}
-@@ -480,11 +486,13 @@
+@@ -480,11 +486,13 @@ void trace_hardirqs_off(void)
{
if (!preempt_trace() && irq_trace())
start_critical_timing(CALLER_ADDR0, CALLER_ADDR1);
@@ -22791,7 +22792,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
if (!preempt_trace() && irq_trace())
stop_critical_timing(CALLER_ADDR0, caller_addr);
}
-@@ -494,6 +502,7 @@
+@@ -494,6 +502,7 @@ __visible void trace_hardirqs_off_caller(unsigned long caller_addr)
{
if (!preempt_trace() && irq_trace())
start_critical_timing(CALLER_ADDR0, caller_addr);
@@ -22799,7 +22800,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
}
EXPORT_SYMBOL(trace_hardirqs_off_caller);
-@@ -503,12 +512,14 @@
+@@ -503,12 +512,14 @@ EXPORT_SYMBOL(trace_hardirqs_off_caller);
#ifdef CONFIG_PREEMPT_TRACER
void trace_preempt_on(unsigned long a0, unsigned long a1)
{
@@ -22814,10 +22815,11 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_irqsoff.c linux-4.9.28/kernel/tra
if (preempt_trace() && !irq_trace())
start_critical_timing(a0, a1);
}
-diff -Nur linux-4.9.28.orig/kernel/trace/trace_output.c linux-4.9.28/kernel/trace/trace_output.c
---- linux-4.9.28.orig/kernel/trace/trace_output.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/trace/trace_output.c 2017-05-19 03:37:25.202177573 +0200
-@@ -386,6 +386,7 @@
+diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
+index 3fc20422c166..65a6dde71a7d 100644
+--- a/kernel/trace/trace_output.c
++++ b/kernel/trace/trace_output.c
+@@ -386,6 +386,7 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
{
char hardsoft_irq;
char need_resched;
@@ -22825,7 +22827,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_output.c linux-4.9.28/kernel/trac
char irqs_off;
int hardirq;
int softirq;
-@@ -416,6 +417,9 @@
+@@ -416,6 +417,9 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
break;
}
@@ -22835,7 +22837,7 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_output.c linux-4.9.28/kernel/trac
hardsoft_irq =
(nmi && hardirq) ? 'Z' :
nmi ? 'z' :
-@@ -424,14 +428,25 @@
+@@ -424,14 +428,25 @@ int trace_print_lat_fmt(struct trace_seq *s, struct trace_entry *entry)
softirq ? 's' :
'.' ;
@@ -22863,10 +22865,11 @@ diff -Nur linux-4.9.28.orig/kernel/trace/trace_output.c linux-4.9.28/kernel/trac
return !trace_seq_has_overflowed(s);
}
-diff -Nur linux-4.9.28.orig/kernel/user.c linux-4.9.28/kernel/user.c
---- linux-4.9.28.orig/kernel/user.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/user.c 2017-05-19 03:37:25.202177573 +0200
-@@ -161,11 +161,11 @@
+diff --git a/kernel/user.c b/kernel/user.c
+index b069ccbfb0b0..1a2e88e98b5e 100644
+--- a/kernel/user.c
++++ b/kernel/user.c
+@@ -161,11 +161,11 @@ void free_uid(struct user_struct *up)
if (!up)
return;
@@ -22880,10 +22883,11 @@ diff -Nur linux-4.9.28.orig/kernel/user.c linux-4.9.28/kernel/user.c
}
struct user_struct *alloc_uid(kuid_t uid)
-diff -Nur linux-4.9.28.orig/kernel/watchdog.c linux-4.9.28/kernel/watchdog.c
---- linux-4.9.28.orig/kernel/watchdog.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/watchdog.c 2017-05-19 03:37:25.202177573 +0200
-@@ -315,6 +315,8 @@
+diff --git a/kernel/watchdog.c b/kernel/watchdog.c
+index 6d1020c03d41..70c6a2f79f7e 100644
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -315,6 +315,8 @@ static int is_softlockup(unsigned long touch_ts)
#ifdef CONFIG_HARDLOCKUP_DETECTOR
@@ -22892,7 +22896,7 @@ diff -Nur linux-4.9.28.orig/kernel/watchdog.c linux-4.9.28/kernel/watchdog.c
static struct perf_event_attr wd_hw_attr = {
.type = PERF_TYPE_HARDWARE,
.config = PERF_COUNT_HW_CPU_CYCLES,
-@@ -348,6 +350,13 @@
+@@ -348,6 +350,13 @@ static void watchdog_overflow_callback(struct perf_event *event,
/* only print hardlockups once */
if (__this_cpu_read(hard_watchdog_warn) == true)
return;
@@ -22906,7 +22910,7 @@ diff -Nur linux-4.9.28.orig/kernel/watchdog.c linux-4.9.28/kernel/watchdog.c
pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
print_modules();
-@@ -365,6 +374,7 @@
+@@ -365,6 +374,7 @@ static void watchdog_overflow_callback(struct perf_event *event,
!test_and_set_bit(0, &hardlockup_allcpu_dumped))
trigger_allbutself_cpu_backtrace();
@@ -22914,7 +22918,7 @@ diff -Nur linux-4.9.28.orig/kernel/watchdog.c linux-4.9.28/kernel/watchdog.c
if (hardlockup_panic)
nmi_panic(regs, "Hard LOCKUP");
-@@ -512,6 +522,7 @@
+@@ -512,6 +522,7 @@ static void watchdog_enable(unsigned int cpu)
/* kick off the timer for the hardlockup detector */
hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
hrtimer->function = watchdog_timer_fn;
@@ -22922,9 +22926,10 @@ diff -Nur linux-4.9.28.orig/kernel/watchdog.c linux-4.9.28/kernel/watchdog.c
/* Enable the perf event */
watchdog_nmi_enable(cpu);
-diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
---- linux-4.9.28.orig/kernel/workqueue.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/workqueue.c 2017-05-19 03:37:25.206177727 +0200
+diff --git a/kernel/workqueue.c b/kernel/workqueue.c
+index 479d840db286..24eba6620a45 100644
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
@@ -48,6 +48,8 @@
#include <linux/nodemask.h>
#include <linux/moduleparam.h>
@@ -22934,7 +22939,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
#include "workqueue_internal.h"
-@@ -121,11 +123,16 @@
+@@ -121,11 +123,16 @@ enum {
* cpu or grabbing pool->lock is enough for read access. If
* POOL_DISASSOCIATED is set, it's identical to L.
*
@@ -22952,7 +22957,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
*
* PW: wq_pool_mutex and wq->mutex protected for writes. Either for reads.
*
-@@ -134,7 +141,7 @@
+@@ -134,7 +141,7 @@ enum {
*
* WQ: wq->mutex protected.
*
@@ -22961,7 +22966,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
*
* MD: wq_mayday_lock protected.
*/
-@@ -185,7 +192,7 @@
+@@ -185,7 +192,7 @@ struct worker_pool {
atomic_t nr_running ____cacheline_aligned_in_smp;
/*
@@ -22970,7 +22975,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
* from get_work_pool().
*/
struct rcu_head rcu;
-@@ -214,7 +221,7 @@
+@@ -214,7 +221,7 @@ struct pool_workqueue {
/*
* Release of unbound pwq is punted to system_wq. See put_pwq()
* and pwq_unbound_release_workfn() for details. pool_workqueue
@@ -22979,7 +22984,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
* determined without grabbing wq->mutex.
*/
struct work_struct unbound_release_work;
-@@ -348,6 +355,8 @@
+@@ -348,6 +355,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient_wq);
struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly;
EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq);
@@ -22988,7 +22993,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
static int worker_thread(void *__worker);
static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
-@@ -355,20 +364,20 @@
+@@ -355,20 +364,20 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
#include <trace/events/workqueue.h>
#define assert_rcu_or_pool_mutex() \
@@ -23015,7 +23020,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
#define for_each_cpu_worker_pool(pool, cpu) \
for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0]; \
-@@ -380,7 +389,7 @@
+@@ -380,7 +389,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
* @pool: iteration cursor
* @pi: integer used for iteration
*
@@ -23024,7 +23029,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
* locked. If the pool needs to be used beyond the locking in effect, the
* caller is responsible for guaranteeing that the pool stays online.
*
-@@ -412,7 +421,7 @@
+@@ -412,7 +421,7 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
* @pwq: iteration cursor
* @wq: the target workqueue
*
@@ -23033,7 +23038,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
* If the pwq needs to be used beyond the locking in effect, the caller is
* responsible for guaranteeing that the pwq stays online.
*
-@@ -424,6 +433,31 @@
+@@ -424,6 +433,31 @@ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
if (({ assert_rcu_or_wq_mutex(wq); false; })) { } \
else
@@ -23065,7 +23070,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
#ifdef CONFIG_DEBUG_OBJECTS_WORK
static struct debug_obj_descr work_debug_descr;
-@@ -548,7 +582,7 @@
+@@ -548,7 +582,7 @@ static int worker_pool_assign_id(struct worker_pool *pool)
* @wq: the target workqueue
* @node: the node ID
*
@@ -23074,7 +23079,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
* read locked.
* If the pwq needs to be used beyond the locking in effect, the caller is
* responsible for guaranteeing that the pwq stays online.
-@@ -692,8 +726,8 @@
+@@ -692,8 +726,8 @@ static struct pool_workqueue *get_work_pwq(struct work_struct *work)
* @work: the work item of interest
*
* Pools are created and destroyed under wq_pool_mutex, and allows read
@@ -23085,7 +23090,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
*
* All fields of the returned pool are accessible as long as the above
* mentioned locking is in effect. If the returned pool needs to be used
-@@ -830,50 +864,45 @@
+@@ -830,50 +864,45 @@ static struct worker *first_idle_worker(struct worker_pool *pool)
*/
static void wake_up_worker(struct worker_pool *pool)
{
@@ -23107,10 +23112,10 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
+ * wq_worker_running - a worker is running again
* @task: task waking up
- * @cpu: CPU @task is waking up to
-- *
+ *
- * This function is called during try_to_wake_up() when a worker is
- * being awoken.
- *
+- *
- * CONTEXT:
- * spin_lock_irq(rq->lock)
+ * This function is called when a worker returns from schedule()
@@ -23154,7 +23159,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
struct worker_pool *pool;
/*
-@@ -882,29 +911,26 @@
+@@ -882,29 +911,26 @@ struct task_struct *wq_worker_sleeping(struct task_struct *task)
* checking NOT_RUNNING.
*/
if (worker->flags & WORKER_NOT_RUNNING)
@@ -23194,7 +23199,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
/**
-@@ -1098,12 +1124,14 @@
+@@ -1098,12 +1124,14 @@ static void put_pwq_unlocked(struct pool_workqueue *pwq)
{
if (pwq) {
/*
@@ -23212,7 +23217,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
}
-@@ -1207,7 +1235,7 @@
+@@ -1207,7 +1235,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
struct worker_pool *pool;
struct pool_workqueue *pwq;
@@ -23221,7 +23226,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
/* try to steal the timer if it exists */
if (is_dwork) {
-@@ -1226,6 +1254,7 @@
+@@ -1226,6 +1254,7 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work)))
return 0;
@@ -23229,7 +23234,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
/*
* The queueing is in progress, or it is already queued. Try to
* steal it from ->worklist without clearing WORK_STRUCT_PENDING.
-@@ -1264,14 +1293,16 @@
+@@ -1264,14 +1293,16 @@ static int try_to_grab_pending(struct work_struct *work, bool is_dwork,
set_work_pool_and_keep_pending(work, pool->id);
spin_unlock(&pool->lock);
@@ -23248,7 +23253,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return -EAGAIN;
}
-@@ -1373,7 +1404,7 @@
+@@ -1373,7 +1404,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
* queued or lose PENDING. Grabbing PENDING and queueing should
* happen with IRQ disabled.
*/
@@ -23257,7 +23262,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
debug_work_activate(work);
-@@ -1381,6 +1412,7 @@
+@@ -1381,6 +1412,7 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
if (unlikely(wq->flags & __WQ_DRAINING) &&
WARN_ON_ONCE(!is_chained_work(wq)))
return;
@@ -23265,7 +23270,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
retry:
if (req_cpu == WORK_CPU_UNBOUND)
cpu = wq_select_unbound_cpu(raw_smp_processor_id());
-@@ -1437,10 +1469,8 @@
+@@ -1437,10 +1469,8 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
/* pwq determined, queue */
trace_workqueue_queue_work(req_cpu, pwq, work);
@@ -23278,7 +23283,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
pwq->nr_in_flight[pwq->work_color]++;
work_flags = work_color_to_flags(pwq->work_color);
-@@ -1458,7 +1488,9 @@
+@@ -1458,7 +1488,9 @@ static void __queue_work(int cpu, struct workqueue_struct *wq,
insert_work(pwq, work, worklist, work_flags);
@@ -23288,7 +23293,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
/**
-@@ -1478,14 +1510,14 @@
+@@ -1478,14 +1510,14 @@ bool queue_work_on(int cpu, struct workqueue_struct *wq,
bool ret = false;
unsigned long flags;
@@ -23305,7 +23310,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return ret;
}
EXPORT_SYMBOL(queue_work_on);
-@@ -1552,14 +1584,14 @@
+@@ -1552,14 +1584,14 @@ bool queue_delayed_work_on(int cpu, struct workqueue_struct *wq,
unsigned long flags;
/* read the comment in __queue_work() */
@@ -23322,7 +23327,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return ret;
}
EXPORT_SYMBOL(queue_delayed_work_on);
-@@ -1594,7 +1626,7 @@
+@@ -1594,7 +1626,7 @@ bool mod_delayed_work_on(int cpu, struct workqueue_struct *wq,
if (likely(ret >= 0)) {
__queue_delayed_work(cpu, wq, dwork, delay);
@@ -23331,7 +23336,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
/* -ENOENT from try_to_grab_pending() becomes %true */
-@@ -1627,7 +1659,9 @@
+@@ -1627,7 +1659,9 @@ static void worker_enter_idle(struct worker *worker)
worker->last_active = jiffies;
/* idle_list is LIFO */
@@ -23341,7 +23346,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
if (too_many_workers(pool) && !timer_pending(&pool->idle_timer))
mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
-@@ -1660,7 +1694,9 @@
+@@ -1660,7 +1694,9 @@ static void worker_leave_idle(struct worker *worker)
return;
worker_clr_flags(worker, WORKER_IDLE);
pool->nr_idle--;
@@ -23351,7 +23356,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
static struct worker *alloc_worker(int node)
-@@ -1826,7 +1862,9 @@
+@@ -1826,7 +1862,9 @@ static void destroy_worker(struct worker *worker)
pool->nr_workers--;
pool->nr_idle--;
@@ -23361,7 +23366,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
worker->flags |= WORKER_DIE;
wake_up_process(worker->task);
}
-@@ -2785,14 +2823,14 @@
+@@ -2785,14 +2823,14 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
might_sleep();
@@ -23379,7 +23384,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
/* see the comment in try_to_grab_pending() with the same code */
pwq = get_work_pwq(work);
if (pwq) {
-@@ -2821,10 +2859,11 @@
+@@ -2821,10 +2859,11 @@ static bool start_flush_work(struct work_struct *work, struct wq_barrier *barr)
else
lock_map_acquire_read(&pwq->wq->lockdep_map);
lock_map_release(&pwq->wq->lockdep_map);
@@ -23392,7 +23397,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return false;
}
-@@ -2911,7 +2950,7 @@
+@@ -2911,7 +2950,7 @@ static bool __cancel_work_timer(struct work_struct *work, bool is_dwork)
/* tell other tasks trying to grab @work to back off */
mark_work_canceling(work);
@@ -23401,7 +23406,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
flush_work(work);
clear_work_data(work);
-@@ -2966,10 +3005,10 @@
+@@ -2966,10 +3005,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
*/
bool flush_delayed_work(struct delayed_work *dwork)
{
@@ -23414,7 +23419,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return flush_work(&dwork->work);
}
EXPORT_SYMBOL(flush_delayed_work);
-@@ -2987,7 +3026,7 @@
+@@ -2987,7 +3026,7 @@ static bool __cancel_work(struct work_struct *work, bool is_dwork)
return false;
set_work_pool_and_clear_pending(work, get_work_pool_id(work));
@@ -23423,7 +23428,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return ret;
}
-@@ -3245,7 +3284,7 @@
+@@ -3245,7 +3284,7 @@ static void rcu_free_pool(struct rcu_head *rcu)
* put_unbound_pool - put a worker_pool
* @pool: worker_pool to put
*
@@ -23432,7 +23437,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
* safe manner. get_unbound_pool() calls this function on its failure path
* and this function should be able to release pools which went through,
* successfully or not, init_worker_pool().
-@@ -3299,8 +3338,8 @@
+@@ -3299,8 +3338,8 @@ static void put_unbound_pool(struct worker_pool *pool)
del_timer_sync(&pool->idle_timer);
del_timer_sync(&pool->mayday_timer);
@@ -23443,7 +23448,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
/**
-@@ -3407,14 +3446,14 @@
+@@ -3407,14 +3446,14 @@ static void pwq_unbound_release_workfn(struct work_struct *work)
put_unbound_pool(pool);
mutex_unlock(&wq_pool_mutex);
@@ -23460,7 +23465,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
/**
-@@ -4064,7 +4103,7 @@
+@@ -4064,7 +4103,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
* The base ref is never dropped on per-cpu pwqs. Directly
* schedule RCU free.
*/
@@ -23469,7 +23474,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
} else {
/*
* We're the sole accessor of @wq at this point. Directly
-@@ -4157,7 +4196,8 @@
+@@ -4157,7 +4196,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
struct pool_workqueue *pwq;
bool ret;
@@ -23479,7 +23484,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
if (cpu == WORK_CPU_UNBOUND)
cpu = smp_processor_id();
-@@ -4168,7 +4208,8 @@
+@@ -4168,7 +4208,8 @@ bool workqueue_congested(int cpu, struct workqueue_struct *wq)
pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu));
ret = !list_empty(&pwq->delayed_works);
@@ -23489,7 +23494,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return ret;
}
-@@ -4194,15 +4235,15 @@
+@@ -4194,15 +4235,15 @@ unsigned int work_busy(struct work_struct *work)
if (work_pending(work))
ret |= WORK_BUSY_PENDING;
@@ -23509,7 +23514,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return ret;
}
-@@ -4391,7 +4432,7 @@
+@@ -4391,7 +4432,7 @@ void show_workqueue_state(void)
unsigned long flags;
int pi;
@@ -23518,7 +23523,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
pr_info("Showing busy workqueues and worker pools:\n");
-@@ -4444,7 +4485,7 @@
+@@ -4444,7 +4485,7 @@ void show_workqueue_state(void)
spin_unlock_irqrestore(&pool->lock, flags);
}
@@ -23527,7 +23532,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
/*
-@@ -4782,16 +4823,16 @@
+@@ -4782,16 +4823,16 @@ bool freeze_workqueues_busy(void)
* nr_active is monotonically decreasing. It's safe
* to peek without lock.
*/
@@ -23547,7 +23552,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
}
out_unlock:
mutex_unlock(&wq_pool_mutex);
-@@ -4981,7 +5022,8 @@
+@@ -4981,7 +5022,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
const char *delim = "";
int node, written = 0;
@@ -23557,7 +23562,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
for_each_node(node) {
written += scnprintf(buf + written, PAGE_SIZE - written,
"%s%d:%d", delim, node,
-@@ -4989,7 +5031,8 @@
+@@ -4989,7 +5031,8 @@ static ssize_t wq_pool_ids_show(struct device *dev,
delim = " ";
}
written += scnprintf(buf + written, PAGE_SIZE - written, "\n");
@@ -23567,10 +23572,11 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue.c linux-4.9.28/kernel/workqueue.c
return written;
}
-diff -Nur linux-4.9.28.orig/kernel/workqueue_internal.h linux-4.9.28/kernel/workqueue_internal.h
---- linux-4.9.28.orig/kernel/workqueue_internal.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/kernel/workqueue_internal.h 2017-05-19 03:37:25.206177727 +0200
-@@ -43,6 +43,7 @@
+diff --git a/kernel/workqueue_internal.h b/kernel/workqueue_internal.h
+index 8635417c587b..f000c4d6917e 100644
+--- a/kernel/workqueue_internal.h
++++ b/kernel/workqueue_internal.h
+@@ -43,6 +43,7 @@ struct worker {
unsigned long last_active; /* L: last active timestamp */
unsigned int flags; /* X: flags */
int id; /* I: worker id */
@@ -23578,7 +23584,7 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue_internal.h linux-4.9.28/kernel/work
/*
* Opaque string set with work_set_desc(). Printed out with task
-@@ -68,7 +69,7 @@
+@@ -68,7 +69,7 @@ static inline struct worker *current_wq_worker(void)
* Scheduler hooks for concurrency managed workqueue. Only to be used from
* sched/core.c and workqueue.c.
*/
@@ -23588,10 +23594,23 @@ diff -Nur linux-4.9.28.orig/kernel/workqueue_internal.h linux-4.9.28/kernel/work
+void wq_worker_sleeping(struct task_struct *task);
#endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
-diff -Nur linux-4.9.28.orig/lib/debugobjects.c linux-4.9.28/lib/debugobjects.c
---- linux-4.9.28.orig/lib/debugobjects.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/debugobjects.c 2017-05-19 03:37:25.206177727 +0200
-@@ -308,7 +308,10 @@
+diff --git a/lib/Kconfig b/lib/Kconfig
+index 260a80e313b9..b06becb3f477 100644
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -400,6 +400,7 @@ config CHECK_SIGNATURE
+
+ config CPUMASK_OFFSTACK
+ bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
++ depends on !PREEMPT_RT_FULL
+ help
+ Use dynamic allocation for cpumask_var_t, instead of putting
+ them on the stack. This is a bit more expensive, but avoids
+diff --git a/lib/debugobjects.c b/lib/debugobjects.c
+index 056052dc8e91..d8494e126de8 100644
+--- a/lib/debugobjects.c
++++ b/lib/debugobjects.c
+@@ -308,7 +308,10 @@ __debug_object_init(void *addr, struct debug_obj_descr *descr, int onstack)
struct debug_obj *obj;
unsigned long flags;
@@ -23603,9 +23622,10 @@ diff -Nur linux-4.9.28.orig/lib/debugobjects.c linux-4.9.28/lib/debugobjects.c
db = get_bucket((unsigned long) addr);
-diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
---- linux-4.9.28.orig/lib/idr.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/idr.c 2017-05-19 03:37:25.206177727 +0200
+diff --git a/lib/idr.c b/lib/idr.c
+index 6098336df267..9decbe914595 100644
+--- a/lib/idr.c
++++ b/lib/idr.c
@@ -30,6 +30,7 @@
#include <linux/idr.h>
#include <linux/spinlock.h>
@@ -23614,7 +23634,7 @@ diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
#define MAX_IDR_SHIFT (sizeof(int) * 8 - 1)
#define MAX_IDR_BIT (1U << MAX_IDR_SHIFT)
-@@ -45,6 +46,37 @@
+@@ -45,6 +46,37 @@ static DEFINE_PER_CPU(struct idr_layer *, idr_preload_head);
static DEFINE_PER_CPU(int, idr_preload_cnt);
static DEFINE_SPINLOCK(simple_ida_lock);
@@ -23652,7 +23672,7 @@ diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
/* the maximum ID which can be allocated given idr->layers */
static int idr_max(int layers)
{
-@@ -115,14 +147,14 @@
+@@ -115,14 +147,14 @@ static struct idr_layer *idr_layer_alloc(gfp_t gfp_mask, struct idr *layer_idr)
* context. See idr_preload() for details.
*/
if (!in_interrupt()) {
@@ -23669,7 +23689,7 @@ diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
if (new)
return new;
}
-@@ -366,7 +398,6 @@
+@@ -366,7 +398,6 @@ static void idr_fill_slot(struct idr *idr, void *ptr, int id,
idr_mark_full(pa, id);
}
@@ -23677,7 +23697,7 @@ diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
/**
* idr_preload - preload for idr_alloc()
* @gfp_mask: allocation mask to use for preloading
-@@ -401,7 +432,7 @@
+@@ -401,7 +432,7 @@ void idr_preload(gfp_t gfp_mask)
WARN_ON_ONCE(in_interrupt());
might_sleep_if(gfpflags_allow_blocking(gfp_mask));
@@ -23686,7 +23706,7 @@ diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
/*
* idr_alloc() is likely to succeed w/o full idr_layer buffer and
-@@ -413,9 +444,9 @@
+@@ -413,9 +444,9 @@ void idr_preload(gfp_t gfp_mask)
while (__this_cpu_read(idr_preload_cnt) < MAX_IDR_FREE) {
struct idr_layer *new;
@@ -23698,10 +23718,11 @@ diff -Nur linux-4.9.28.orig/lib/idr.c linux-4.9.28/lib/idr.c
if (!new)
break;
-diff -Nur linux-4.9.28.orig/lib/irq_poll.c linux-4.9.28/lib/irq_poll.c
---- linux-4.9.28.orig/lib/irq_poll.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/irq_poll.c 2017-05-19 03:37:25.206177727 +0200
-@@ -36,6 +36,7 @@
+diff --git a/lib/irq_poll.c b/lib/irq_poll.c
+index 1d6565e81030..b23a79761df7 100644
+--- a/lib/irq_poll.c
++++ b/lib/irq_poll.c
+@@ -36,6 +36,7 @@ void irq_poll_sched(struct irq_poll *iop)
list_add_tail(&iop->list, this_cpu_ptr(&blk_cpu_iopoll));
__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
local_irq_restore(flags);
@@ -23709,7 +23730,7 @@ diff -Nur linux-4.9.28.orig/lib/irq_poll.c linux-4.9.28/lib/irq_poll.c
}
EXPORT_SYMBOL(irq_poll_sched);
-@@ -71,6 +72,7 @@
+@@ -71,6 +72,7 @@ void irq_poll_complete(struct irq_poll *iop)
local_irq_save(flags);
__irq_poll_complete(iop);
local_irq_restore(flags);
@@ -23717,7 +23738,7 @@ diff -Nur linux-4.9.28.orig/lib/irq_poll.c linux-4.9.28/lib/irq_poll.c
}
EXPORT_SYMBOL(irq_poll_complete);
-@@ -95,6 +97,7 @@
+@@ -95,6 +97,7 @@ static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
}
local_irq_enable();
@@ -23725,7 +23746,7 @@ diff -Nur linux-4.9.28.orig/lib/irq_poll.c linux-4.9.28/lib/irq_poll.c
/* Even though interrupts have been re-enabled, this
* access is safe because interrupts can only add new
-@@ -132,6 +135,7 @@
+@@ -132,6 +135,7 @@ static void __latent_entropy irq_poll_softirq(struct softirq_action *h)
__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
local_irq_enable();
@@ -23733,7 +23754,7 @@ diff -Nur linux-4.9.28.orig/lib/irq_poll.c linux-4.9.28/lib/irq_poll.c
}
/**
-@@ -195,6 +199,7 @@
+@@ -195,6 +199,7 @@ static int irq_poll_cpu_dead(unsigned int cpu)
this_cpu_ptr(&blk_cpu_iopoll));
__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
local_irq_enable();
@@ -23741,21 +23762,11 @@ diff -Nur linux-4.9.28.orig/lib/irq_poll.c linux-4.9.28/lib/irq_poll.c
return 0;
}
-diff -Nur linux-4.9.28.orig/lib/Kconfig linux-4.9.28/lib/Kconfig
---- linux-4.9.28.orig/lib/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/Kconfig 2017-05-19 03:37:25.206177727 +0200
-@@ -400,6 +400,7 @@
-
- config CPUMASK_OFFSTACK
- bool "Force CPU masks off stack" if DEBUG_PER_CPU_MAPS
-+ depends on !PREEMPT_RT_FULL
- help
- Use dynamic allocation for cpumask_var_t, instead of putting
- them on the stack. This is a bit more expensive, but avoids
-diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-selftest.c
---- linux-4.9.28.orig/lib/locking-selftest.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/locking-selftest.c 2017-05-19 03:37:25.206177727 +0200
-@@ -590,6 +590,8 @@
+diff --git a/lib/locking-selftest.c b/lib/locking-selftest.c
+index f3a217ea0388..4611b156ef79 100644
+--- a/lib/locking-selftest.c
++++ b/lib/locking-selftest.c
+@@ -590,6 +590,8 @@ GENERATE_TESTCASE(init_held_rsem)
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
@@ -23764,7 +23775,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
#include "locking-selftest-rlock-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock)
-@@ -605,9 +607,12 @@
+@@ -605,9 +607,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_rlock)
#include "locking-selftest-wlock-softirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock)
@@ -23777,7 +23788,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
/*
* Enabling hardirqs with a softirq-safe lock held:
*/
-@@ -640,6 +645,8 @@
+@@ -640,6 +645,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
#undef E1
#undef E2
@@ -23786,7 +23797,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
/*
* Enabling irqs with an irq-safe lock held:
*/
-@@ -663,6 +670,8 @@
+@@ -663,6 +670,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A_rlock)
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin)
@@ -23795,7 +23806,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
#include "locking-selftest-rlock-hardirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock)
-@@ -678,6 +687,8 @@
+@@ -678,6 +687,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_rlock)
#include "locking-selftest-wlock-softirq.h"
GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
@@ -23804,7 +23815,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
#undef E1
#undef E2
-@@ -709,6 +720,8 @@
+@@ -709,6 +720,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin)
@@ -23813,7 +23824,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
#include "locking-selftest-rlock-hardirq.h"
GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock)
-@@ -724,6 +737,8 @@
+@@ -724,6 +737,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_rlock)
#include "locking-selftest-wlock-softirq.h"
GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
@@ -23822,7 +23833,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
#undef E1
#undef E2
#undef E3
-@@ -757,6 +772,8 @@
+@@ -757,6 +772,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
#include "locking-selftest-spin-hardirq.h"
GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin)
@@ -23831,7 +23842,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
#include "locking-selftest-rlock-hardirq.h"
GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock)
-@@ -772,10 +789,14 @@
+@@ -772,10 +789,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_rlock)
#include "locking-selftest-wlock-softirq.h"
GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock)
@@ -23846,7 +23857,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
/*
* read-lock / write-lock irq inversion.
*
-@@ -838,6 +859,10 @@
+@@ -838,6 +859,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inversion_soft_wlock)
#undef E2
#undef E3
@@ -23857,7 +23868,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
/*
* read-lock / write-lock recursion that is actually safe.
*/
-@@ -876,6 +901,8 @@
+@@ -876,6 +901,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_recursion_soft)
#undef E2
#undef E3
@@ -23866,7 +23877,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
/*
* read-lock / write-lock recursion that is unsafe.
*/
-@@ -1858,6 +1885,7 @@
+@@ -1858,6 +1885,7 @@ void locking_selftest(void)
printk(" --------------------------------------------------------------------------\n");
@@ -23874,7 +23885,7 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
/*
* irq-context testcases:
*/
-@@ -1870,6 +1898,28 @@
+@@ -1870,6 +1898,28 @@ void locking_selftest(void)
DO_TESTCASE_6x2("irq read-recursion", irq_read_recursion);
// DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2);
@@ -23903,9 +23914,10 @@ diff -Nur linux-4.9.28.orig/lib/locking-selftest.c linux-4.9.28/lib/locking-self
ww_tests();
-diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
---- linux-4.9.28.orig/lib/percpu_ida.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/percpu_ida.c 2017-05-19 03:37:25.206177727 +0200
+diff --git a/lib/percpu_ida.c b/lib/percpu_ida.c
+index 6d40944960de..822a2c027e72 100644
+--- a/lib/percpu_ida.c
++++ b/lib/percpu_ida.c
@@ -26,6 +26,9 @@
#include <linux/string.h>
#include <linux/spinlock.h>
@@ -23916,7 +23928,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
struct percpu_ida_cpu {
/*
-@@ -148,13 +151,13 @@
+@@ -148,13 +151,13 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
unsigned long flags;
int tag;
@@ -23932,7 +23944,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
return tag;
}
-@@ -173,6 +176,7 @@
+@@ -173,6 +176,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
if (!tags->nr_free)
alloc_global_tags(pool, tags);
@@ -23940,7 +23952,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
if (!tags->nr_free)
steal_tags(pool, tags);
-@@ -184,7 +188,7 @@
+@@ -184,7 +188,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
}
spin_unlock(&pool->lock);
@@ -23949,7 +23961,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
if (tag >= 0 || state == TASK_RUNNING)
break;
-@@ -196,7 +200,7 @@
+@@ -196,7 +200,7 @@ int percpu_ida_alloc(struct percpu_ida *pool, int state)
schedule();
@@ -23958,7 +23970,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
tags = this_cpu_ptr(pool->tag_cpu);
}
if (state != TASK_RUNNING)
-@@ -221,7 +225,7 @@
+@@ -221,7 +225,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
BUG_ON(tag >= pool->nr_tags);
@@ -23967,7 +23979,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
tags = this_cpu_ptr(pool->tag_cpu);
spin_lock(&tags->lock);
-@@ -253,7 +257,7 @@
+@@ -253,7 +257,7 @@ void percpu_ida_free(struct percpu_ida *pool, unsigned tag)
spin_unlock(&pool->lock);
}
@@ -23976,7 +23988,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
}
EXPORT_SYMBOL_GPL(percpu_ida_free);
-@@ -345,7 +349,7 @@
+@@ -345,7 +349,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
struct percpu_ida_cpu *remote;
unsigned cpu, i, err = 0;
@@ -23985,7 +23997,7 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
for_each_possible_cpu(cpu) {
remote = per_cpu_ptr(pool->tag_cpu, cpu);
spin_lock(&remote->lock);
-@@ -367,7 +371,7 @@
+@@ -367,7 +371,7 @@ int percpu_ida_for_each_free(struct percpu_ida *pool, percpu_ida_cb fn,
}
spin_unlock(&pool->lock);
out:
@@ -23994,9 +24006,10 @@ diff -Nur linux-4.9.28.orig/lib/percpu_ida.c linux-4.9.28/lib/percpu_ida.c
return err;
}
EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
-diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
---- linux-4.9.28.orig/lib/radix-tree.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/radix-tree.c 2017-05-19 03:37:25.206177727 +0200
+diff --git a/lib/radix-tree.c b/lib/radix-tree.c
+index 8e6d552c40dd..741da5a77fd5 100644
+--- a/lib/radix-tree.c
++++ b/lib/radix-tree.c
@@ -36,7 +36,7 @@
#include <linux/bitops.h>
#include <linux/rcupdate.h>
@@ -24006,7 +24019,7 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
/* Number of nodes in fully populated tree of given height */
static unsigned long height_to_maxnodes[RADIX_TREE_MAX_PATH + 1] __read_mostly;
-@@ -68,6 +68,7 @@
+@@ -68,6 +68,7 @@ struct radix_tree_preload {
struct radix_tree_node *nodes;
};
static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
@@ -24014,7 +24027,7 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
static inline void *node_to_entry(void *ptr)
{
-@@ -290,13 +291,14 @@
+@@ -290,13 +291,14 @@ radix_tree_node_alloc(struct radix_tree_root *root)
* succeed in getting a node here (and never reach
* kmem_cache_alloc)
*/
@@ -24030,7 +24043,7 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
/*
* Update the allocation stack trace as this is more useful
* for debugging.
-@@ -357,14 +359,14 @@
+@@ -357,14 +359,14 @@ static int __radix_tree_preload(gfp_t gfp_mask, int nr)
*/
gfp_mask &= ~__GFP_ACCOUNT;
@@ -24048,7 +24061,7 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
rtp = this_cpu_ptr(&radix_tree_preloads);
if (rtp->nr < nr) {
node->private_data = rtp->nodes;
-@@ -406,7 +408,7 @@
+@@ -406,7 +408,7 @@ int radix_tree_maybe_preload(gfp_t gfp_mask)
if (gfpflags_allow_blocking(gfp_mask))
return __radix_tree_preload(gfp_mask, RADIX_TREE_PRELOAD_SIZE);
/* Preloading doesn't help anything with this gfp mask, skip it */
@@ -24057,7 +24070,7 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
return 0;
}
EXPORT_SYMBOL(radix_tree_maybe_preload);
-@@ -422,7 +424,7 @@
+@@ -422,7 +424,7 @@ int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
/* Preloading doesn't help anything with this gfp mask, skip it */
if (!gfpflags_allow_blocking(gfp_mask)) {
@@ -24066,7 +24079,7 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
return 0;
}
-@@ -456,6 +458,12 @@
+@@ -456,6 +458,12 @@ int radix_tree_maybe_preload_order(gfp_t gfp_mask, int order)
return __radix_tree_preload(gfp_mask, nr_nodes);
}
@@ -24079,10 +24092,11 @@ diff -Nur linux-4.9.28.orig/lib/radix-tree.c linux-4.9.28/lib/radix-tree.c
/*
* The maximum index which can be stored in a radix tree
*/
-diff -Nur linux-4.9.28.orig/lib/scatterlist.c linux-4.9.28/lib/scatterlist.c
---- linux-4.9.28.orig/lib/scatterlist.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/scatterlist.c 2017-05-19 03:37:25.206177727 +0200
-@@ -620,7 +620,7 @@
+diff --git a/lib/scatterlist.c b/lib/scatterlist.c
+index 004fc70fc56a..ccc46992a517 100644
+--- a/lib/scatterlist.c
++++ b/lib/scatterlist.c
+@@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_iter *miter)
flush_kernel_dcache_page(miter->page);
if (miter->__flags & SG_MITER_ATOMIC) {
@@ -24091,7 +24105,7 @@ diff -Nur linux-4.9.28.orig/lib/scatterlist.c linux-4.9.28/lib/scatterlist.c
kunmap_atomic(miter->addr);
} else
kunmap(miter->page);
-@@ -664,7 +664,7 @@
+@@ -664,7 +664,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
if (!sg_miter_skip(&miter, skip))
return false;
@@ -24100,7 +24114,7 @@ diff -Nur linux-4.9.28.orig/lib/scatterlist.c linux-4.9.28/lib/scatterlist.c
while (sg_miter_next(&miter) && offset < buflen) {
unsigned int len;
-@@ -681,7 +681,7 @@
+@@ -681,7 +681,7 @@ size_t sg_copy_buffer(struct scatterlist *sgl, unsigned int nents, void *buf,
sg_miter_stop(&miter);
@@ -24109,10 +24123,11 @@ diff -Nur linux-4.9.28.orig/lib/scatterlist.c linux-4.9.28/lib/scatterlist.c
return offset;
}
EXPORT_SYMBOL(sg_copy_buffer);
-diff -Nur linux-4.9.28.orig/lib/smp_processor_id.c linux-4.9.28/lib/smp_processor_id.c
---- linux-4.9.28.orig/lib/smp_processor_id.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/lib/smp_processor_id.c 2017-05-19 03:37:25.206177727 +0200
-@@ -39,8 +39,9 @@
+diff --git a/lib/smp_processor_id.c b/lib/smp_processor_id.c
+index 1afec32de6f2..11fa431046a8 100644
+--- a/lib/smp_processor_id.c
++++ b/lib/smp_processor_id.c
+@@ -39,8 +39,9 @@ notrace static unsigned int check_preemption_disabled(const char *what1,
if (!printk_ratelimit())
goto out_enable;
@@ -24124,37 +24139,24 @@ diff -Nur linux-4.9.28.orig/lib/smp_processor_id.c linux-4.9.28/lib/smp_processo
print_symbol("caller is %s\n", (long)__builtin_return_address(0));
dump_stack();
-diff -Nur linux-4.9.28.orig/MAINTAINERS linux-4.9.28/MAINTAINERS
---- linux-4.9.28.orig/MAINTAINERS 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/MAINTAINERS 2017-05-19 03:37:25.122174217 +0200
-@@ -5196,6 +5196,23 @@
- F: include/uapi/linux/fuse.h
- F: Documentation/filesystems/fuse.txt
+diff --git a/mm/Kconfig b/mm/Kconfig
+index 86e3e0e74d20..77e5862a1ed2 100644
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -410,7 +410,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
-+FUTEX SUBSYSTEM
-+M: Thomas Gleixner <tglx@linutronix.de>
-+M: Ingo Molnar <mingo@redhat.com>
-+R: Peter Zijlstra <peterz@infradead.org>
-+R: Darren Hart <dvhart@infradead.org>
-+L: linux-kernel@vger.kernel.org
-+T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git locking/core
-+S: Maintained
-+F: kernel/futex.c
-+F: kernel/futex_compat.c
-+F: include/asm-generic/futex.h
-+F: include/linux/futex.h
-+F: include/uapi/linux/futex.h
-+F: tools/testing/selftests/futex/
-+F: tools/perf/bench/futex*
-+F: Documentation/*futex*
-+
- FUTURE DOMAIN TMC-16x0 SCSI DRIVER (16-bit)
- M: Rik Faith <faith@cs.unc.edu>
- L: linux-scsi@vger.kernel.org
-diff -Nur linux-4.9.28.orig/mm/backing-dev.c linux-4.9.28/mm/backing-dev.c
---- linux-4.9.28.orig/mm/backing-dev.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/backing-dev.c 2017-05-19 03:37:25.206177727 +0200
-@@ -457,9 +457,9 @@
+ config TRANSPARENT_HUGEPAGE
+ bool "Transparent Hugepage Support"
+- depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
++ depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
+ select COMPACTION
+ select RADIX_TREE_MULTIORDER
+ help
+diff --git a/mm/backing-dev.c b/mm/backing-dev.c
+index 6ff2d7744223..b5a91dd53b5f 100644
+--- a/mm/backing-dev.c
++++ b/mm/backing-dev.c
+@@ -457,9 +457,9 @@ void wb_congested_put(struct bdi_writeback_congested *congested)
{
unsigned long flags;
@@ -24166,10 +24168,11 @@ diff -Nur linux-4.9.28.orig/mm/backing-dev.c linux-4.9.28/mm/backing-dev.c
return;
}
-diff -Nur linux-4.9.28.orig/mm/compaction.c linux-4.9.28/mm/compaction.c
---- linux-4.9.28.orig/mm/compaction.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/compaction.c 2017-05-19 03:37:25.206177727 +0200
-@@ -1593,10 +1593,12 @@
+diff --git a/mm/compaction.c b/mm/compaction.c
+index 70e6bec46dc2..6678ed58b7c6 100644
+--- a/mm/compaction.c
++++ b/mm/compaction.c
+@@ -1593,10 +1593,12 @@ static enum compact_result compact_zone(struct zone *zone, struct compact_contro
block_start_pfn(cc->migrate_pfn, cc->order);
if (cc->last_migrated_pfn < current_block_start) {
@@ -24184,10 +24187,11 @@ diff -Nur linux-4.9.28.orig/mm/compaction.c linux-4.9.28/mm/compaction.c
/* No more flushing until we migrate again */
cc->last_migrated_pfn = 0;
}
-diff -Nur linux-4.9.28.orig/mm/filemap.c linux-4.9.28/mm/filemap.c
---- linux-4.9.28.orig/mm/filemap.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/filemap.c 2017-05-19 03:37:25.210177882 +0200
-@@ -159,9 +159,12 @@
+diff --git a/mm/filemap.c b/mm/filemap.c
+index edfb90e3830c..a8d2c7a73d54 100644
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -159,9 +159,12 @@ static int page_cache_tree_insert(struct address_space *mapping,
* node->private_list is protected by
* mapping->tree_lock.
*/
@@ -24202,7 +24206,7 @@ diff -Nur linux-4.9.28.orig/mm/filemap.c linux-4.9.28/mm/filemap.c
}
return 0;
}
-@@ -217,8 +220,10 @@
+@@ -217,8 +220,10 @@ static void page_cache_tree_delete(struct address_space *mapping,
if (!dax_mapping(mapping) && !workingset_node_pages(node) &&
list_empty(&node->private_list)) {
node->private_data = mapping;
@@ -24215,9 +24219,10 @@ diff -Nur linux-4.9.28.orig/mm/filemap.c linux-4.9.28/mm/filemap.c
}
}
-diff -Nur linux-4.9.28.orig/mm/highmem.c linux-4.9.28/mm/highmem.c
---- linux-4.9.28.orig/mm/highmem.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/highmem.c 2017-05-19 03:37:25.210177882 +0200
+diff --git a/mm/highmem.c b/mm/highmem.c
+index 50b4ca6787f0..77518a3b35a1 100644
+--- a/mm/highmem.c
++++ b/mm/highmem.c
@@ -29,10 +29,11 @@
#include <linux/kgdb.h>
#include <asm/tlbflush.h>
@@ -24231,7 +24236,7 @@ diff -Nur linux-4.9.28.orig/mm/highmem.c linux-4.9.28/mm/highmem.c
/*
* Virtual_count is not a pure "count".
-@@ -107,8 +108,9 @@
+@@ -107,8 +108,9 @@ static inline wait_queue_head_t *get_pkmap_wait_queue_head(unsigned int color)
unsigned long totalhigh_pages __read_mostly;
EXPORT_SYMBOL(totalhigh_pages);
@@ -24242,21 +24247,10 @@ diff -Nur linux-4.9.28.orig/mm/highmem.c linux-4.9.28/mm/highmem.c
unsigned int nr_free_highpages (void)
{
-diff -Nur linux-4.9.28.orig/mm/Kconfig linux-4.9.28/mm/Kconfig
---- linux-4.9.28.orig/mm/Kconfig 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/Kconfig 2017-05-19 03:37:25.206177727 +0200
-@@ -410,7 +410,7 @@
-
- config TRANSPARENT_HUGEPAGE
- bool "Transparent Hugepage Support"
-- depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE
-+ depends on HAVE_ARCH_TRANSPARENT_HUGEPAGE && !PREEMPT_RT_FULL
- select COMPACTION
- select RADIX_TREE_MULTIORDER
- help
-diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
---- linux-4.9.28.orig/mm/memcontrol.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/memcontrol.c 2017-05-19 03:37:25.210177882 +0200
+diff --git a/mm/memcontrol.c b/mm/memcontrol.c
+index 47559cc0cdcc..1f2ebc924916 100644
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
@@ -67,6 +67,7 @@
#include <net/sock.h>
#include <net/ip.h>
@@ -24265,7 +24259,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
#include <asm/uaccess.h>
-@@ -92,6 +93,8 @@
+@@ -92,6 +93,8 @@ int do_swap_account __read_mostly;
#define do_swap_account 0
#endif
@@ -24274,7 +24268,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
/* Whether legacy memory+swap accounting is active */
static bool do_memsw_account(void)
{
-@@ -1692,6 +1695,7 @@
+@@ -1692,6 +1695,7 @@ struct memcg_stock_pcp {
#define FLUSHING_CACHED_CHARGE 0
};
static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
@@ -24282,7 +24276,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
static DEFINE_MUTEX(percpu_charge_mutex);
/**
-@@ -1714,7 +1718,7 @@
+@@ -1714,7 +1718,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
if (nr_pages > CHARGE_BATCH)
return ret;
@@ -24291,7 +24285,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
stock = this_cpu_ptr(&memcg_stock);
if (memcg == stock->cached && stock->nr_pages >= nr_pages) {
-@@ -1722,7 +1726,7 @@
+@@ -1722,7 +1726,7 @@ static bool consume_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
ret = true;
}
@@ -24300,7 +24294,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
return ret;
}
-@@ -1749,13 +1753,13 @@
+@@ -1749,13 +1753,13 @@ static void drain_local_stock(struct work_struct *dummy)
struct memcg_stock_pcp *stock;
unsigned long flags;
@@ -24316,7 +24310,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
}
/*
-@@ -1767,7 +1771,7 @@
+@@ -1767,7 +1771,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
struct memcg_stock_pcp *stock;
unsigned long flags;
@@ -24325,7 +24319,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
stock = this_cpu_ptr(&memcg_stock);
if (stock->cached != memcg) { /* reset if necessary */
-@@ -1776,7 +1780,7 @@
+@@ -1776,7 +1780,7 @@ static void refill_stock(struct mem_cgroup *memcg, unsigned int nr_pages)
}
stock->nr_pages += nr_pages;
@@ -24334,7 +24328,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
}
/*
-@@ -1792,7 +1796,7 @@
+@@ -1792,7 +1796,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
return;
/* Notify other cpus that system-wide "drain" is running */
get_online_cpus();
@@ -24343,7 +24337,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
for_each_online_cpu(cpu) {
struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
struct mem_cgroup *memcg;
-@@ -1809,7 +1813,7 @@
+@@ -1809,7 +1813,7 @@ static void drain_all_stock(struct mem_cgroup *root_memcg)
schedule_work_on(cpu, &stock->work);
}
}
@@ -24352,7 +24346,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
put_online_cpus();
mutex_unlock(&percpu_charge_mutex);
}
-@@ -4555,12 +4559,12 @@
+@@ -4555,12 +4559,12 @@ static int mem_cgroup_move_account(struct page *page,
ret = 0;
@@ -24367,7 +24361,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
out_unlock:
unlock_page(page);
out:
-@@ -5435,10 +5439,10 @@
+@@ -5435,10 +5439,10 @@ void mem_cgroup_commit_charge(struct page *page, struct mem_cgroup *memcg,
commit_charge(page, memcg, lrucare);
@@ -24380,7 +24374,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
if (do_memsw_account() && PageSwapCache(page)) {
swp_entry_t entry = { .val = page_private(page) };
-@@ -5494,14 +5498,14 @@
+@@ -5494,14 +5498,14 @@ static void uncharge_batch(struct mem_cgroup *memcg, unsigned long pgpgout,
memcg_oom_recover(memcg);
}
@@ -24397,7 +24391,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
if (!mem_cgroup_is_root(memcg))
css_put_many(&memcg->css, nr_pages);
-@@ -5656,10 +5660,10 @@
+@@ -5656,10 +5660,10 @@ void mem_cgroup_migrate(struct page *oldpage, struct page *newpage)
commit_charge(newpage, memcg, false);
@@ -24410,7 +24404,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
}
DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
-@@ -5850,6 +5854,7 @@
+@@ -5850,6 +5854,7 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
{
struct mem_cgroup *memcg, *swap_memcg;
unsigned short oldid;
@@ -24418,7 +24412,7 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
VM_BUG_ON_PAGE(PageLRU(page), page);
VM_BUG_ON_PAGE(page_count(page), page);
-@@ -5890,12 +5895,16 @@
+@@ -5890,12 +5895,16 @@ void mem_cgroup_swapout(struct page *page, swp_entry_t entry)
* important here to have the interrupts disabled because it is the
* only synchronisation we have for udpating the per-CPU variables.
*/
@@ -24435,10 +24429,11 @@ diff -Nur linux-4.9.28.orig/mm/memcontrol.c linux-4.9.28/mm/memcontrol.c
}
/*
-diff -Nur linux-4.9.28.orig/mm/mmu_context.c linux-4.9.28/mm/mmu_context.c
---- linux-4.9.28.orig/mm/mmu_context.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/mmu_context.c 2017-05-19 03:37:25.210177882 +0200
-@@ -23,6 +23,7 @@
+diff --git a/mm/mmu_context.c b/mm/mmu_context.c
+index 6f4d27c5bb32..5cd25c745a8f 100644
+--- a/mm/mmu_context.c
++++ b/mm/mmu_context.c
+@@ -23,6 +23,7 @@ void use_mm(struct mm_struct *mm)
struct task_struct *tsk = current;
task_lock(tsk);
@@ -24446,7 +24441,7 @@ diff -Nur linux-4.9.28.orig/mm/mmu_context.c linux-4.9.28/mm/mmu_context.c
active_mm = tsk->active_mm;
if (active_mm != mm) {
atomic_inc(&mm->mm_count);
-@@ -30,6 +31,7 @@
+@@ -30,6 +31,7 @@ void use_mm(struct mm_struct *mm)
}
tsk->mm = mm;
switch_mm(active_mm, mm, tsk);
@@ -24454,9 +24449,10 @@ diff -Nur linux-4.9.28.orig/mm/mmu_context.c linux-4.9.28/mm/mmu_context.c
task_unlock(tsk);
#ifdef finish_arch_post_lock_switch
finish_arch_post_lock_switch();
-diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
---- linux-4.9.28.orig/mm/page_alloc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/page_alloc.c 2017-05-19 03:37:25.210177882 +0200
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 5b06fb385dd7..86457a2fca20 100644
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
@@ -61,6 +61,7 @@
#include <linux/page_ext.h>
#include <linux/hugetlb.h>
@@ -24465,7 +24461,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
#include <linux/page_owner.h>
#include <linux/kthread.h>
#include <linux/memcontrol.h>
-@@ -281,6 +282,18 @@
+@@ -281,6 +282,18 @@ EXPORT_SYMBOL(nr_node_ids);
EXPORT_SYMBOL(nr_online_nodes);
#endif
@@ -24484,7 +24480,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
int page_group_by_mobility_disabled __read_mostly;
#ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
-@@ -1072,7 +1085,7 @@
+@@ -1072,7 +1085,7 @@ static bool bulkfree_pcp_prepare(struct page *page)
#endif /* CONFIG_DEBUG_VM */
/*
@@ -24493,7 +24489,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
* Assumes all pages on list are in same zone, and of same order.
* count is the number of pages to free.
*
-@@ -1083,19 +1096,58 @@
+@@ -1083,19 +1096,58 @@ static bool bulkfree_pcp_prepare(struct page *page)
* pinned" detection logic.
*/
static void free_pcppages_bulk(struct zone *zone, int count,
@@ -24556,7 +24552,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
while (count) {
struct page *page;
struct list_head *list;
-@@ -1111,7 +1163,7 @@
+@@ -1111,7 +1163,7 @@ static void free_pcppages_bulk(struct zone *zone, int count,
batch_free++;
if (++migratetype == MIGRATE_PCPTYPES)
migratetype = 0;
@@ -24565,7 +24561,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
} while (list_empty(list));
/* This is the only non-empty list. Free them all. */
-@@ -1119,27 +1171,12 @@
+@@ -1119,27 +1171,12 @@ static void free_pcppages_bulk(struct zone *zone, int count,
batch_free = count;
do {
@@ -24594,7 +24590,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
static void free_one_page(struct zone *zone,
-@@ -1148,7 +1185,9 @@
+@@ -1148,7 +1185,9 @@ static void free_one_page(struct zone *zone,
int migratetype)
{
unsigned long nr_scanned;
@@ -24605,7 +24601,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
nr_scanned = node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED);
if (nr_scanned)
__mod_node_page_state(zone->zone_pgdat, NR_PAGES_SCANNED, -nr_scanned);
-@@ -1158,7 +1197,7 @@
+@@ -1158,7 +1197,7 @@ static void free_one_page(struct zone *zone,
migratetype = get_pfnblock_migratetype(page, pfn);
}
__free_one_page(page, pfn, zone, order, migratetype);
@@ -24614,7 +24610,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
static void __meminit __init_single_page(struct page *page, unsigned long pfn,
-@@ -1244,10 +1283,10 @@
+@@ -1244,10 +1283,10 @@ static void __free_pages_ok(struct page *page, unsigned int order)
return;
migratetype = get_pfnblock_migratetype(page, pfn);
@@ -24627,7 +24623,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
static void __init __free_pages_boot_core(struct page *page, unsigned int order)
-@@ -2246,16 +2285,18 @@
+@@ -2246,16 +2285,18 @@ static int rmqueue_bulk(struct zone *zone, unsigned int order,
void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
{
unsigned long flags;
@@ -24649,7 +24645,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
#endif
-@@ -2271,16 +2312,21 @@
+@@ -2271,16 +2312,21 @@ static void drain_pages_zone(unsigned int cpu, struct zone *zone)
unsigned long flags;
struct per_cpu_pageset *pset;
struct per_cpu_pages *pcp;
@@ -24675,7 +24671,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
/*
-@@ -2366,8 +2412,17 @@
+@@ -2366,8 +2412,17 @@ void drain_all_pages(struct zone *zone)
else
cpumask_clear_cpu(cpu, &cpus_with_pcps);
}
@@ -24693,7 +24689,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
#ifdef CONFIG_HIBERNATION
-@@ -2427,7 +2482,7 @@
+@@ -2427,7 +2482,7 @@ void free_hot_cold_page(struct page *page, bool cold)
migratetype = get_pfnblock_migratetype(page, pfn);
set_pcppage_migratetype(page, migratetype);
@@ -24702,7 +24698,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
__count_vm_event(PGFREE);
/*
-@@ -2453,12 +2508,17 @@
+@@ -2453,12 +2508,17 @@ void free_hot_cold_page(struct page *page, bool cold)
pcp->count++;
if (pcp->count >= pcp->high) {
unsigned long batch = READ_ONCE(pcp->batch);
@@ -24722,7 +24718,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
/*
-@@ -2600,7 +2660,7 @@
+@@ -2600,7 +2660,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
struct per_cpu_pages *pcp;
struct list_head *list;
@@ -24731,7 +24727,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
do {
pcp = &this_cpu_ptr(zone->pageset)->pcp;
list = &pcp->lists[migratetype];
-@@ -2627,7 +2687,7 @@
+@@ -2627,7 +2687,7 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
* allocate greater than order-1 page units with __GFP_NOFAIL.
*/
WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
@@ -24740,7 +24736,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
do {
page = NULL;
-@@ -2639,22 +2699,24 @@
+@@ -2639,22 +2699,24 @@ struct page *buffered_rmqueue(struct zone *preferred_zone,
if (!page)
page = __rmqueue(zone, order, migratetype);
} while (page && check_new_pages(page, order));
@@ -24769,7 +24765,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
return NULL;
}
-@@ -6531,7 +6593,9 @@
+@@ -6532,7 +6594,9 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
int cpu = (unsigned long)hcpu;
if (action == CPU_DEAD || action == CPU_DEAD_FROZEN) {
@@ -24779,7 +24775,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
drain_pages(cpu);
/*
-@@ -6557,6 +6621,7 @@
+@@ -6558,6 +6622,7 @@ static int page_alloc_cpu_notify(struct notifier_block *self,
void __init page_alloc_init(void)
{
hotcpu_notifier(page_alloc_cpu_notify, 0);
@@ -24787,7 +24783,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
/*
-@@ -7385,7 +7450,7 @@
+@@ -7386,7 +7451,7 @@ void zone_pcp_reset(struct zone *zone)
struct per_cpu_pageset *pset;
/* avoid races with drain_pages() */
@@ -24796,7 +24792,7 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
if (zone->pageset != &boot_pageset) {
for_each_online_cpu(cpu) {
pset = per_cpu_ptr(zone->pageset, cpu);
-@@ -7394,7 +7459,7 @@
+@@ -7395,7 +7460,7 @@ void zone_pcp_reset(struct zone *zone)
free_percpu(zone->pageset);
zone->pageset = &boot_pageset;
}
@@ -24805,75 +24801,69 @@ diff -Nur linux-4.9.28.orig/mm/page_alloc.c linux-4.9.28/mm/page_alloc.c
}
#ifdef CONFIG_MEMORY_HOTREMOVE
-diff -Nur linux-4.9.28.orig/mm/percpu.c linux-4.9.28/mm/percpu.c
---- linux-4.9.28.orig/mm/percpu.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/percpu.c 2017-05-19 03:37:25.210177882 +0200
-@@ -1283,18 +1283,7 @@
+diff --git a/mm/percpu.c b/mm/percpu.c
+index f014cebbf405..4e739fcf91bf 100644
+--- a/mm/percpu.c
++++ b/mm/percpu.c
+@@ -1283,6 +1283,31 @@ void free_percpu(void __percpu *ptr)
}
EXPORT_SYMBOL_GPL(free_percpu);
--/**
-- * is_kernel_percpu_address - test whether address is from static percpu area
-- * @addr: address to test
-- *
-- * Test whether @addr belongs to in-kernel static percpu area. Module
-- * static percpu areas are not considered. For those, use
-- * is_module_percpu_address().
-- *
-- * RETURNS:
-- * %true if @addr is from in-kernel static percpu area, %false otherwise.
-- */
--bool is_kernel_percpu_address(unsigned long addr)
+bool __is_kernel_percpu_address(unsigned long addr, unsigned long *can_addr)
- {
- #ifdef CONFIG_SMP
- const size_t static_size = __per_cpu_end - __per_cpu_start;
-@@ -1303,16 +1292,39 @@
-
- for_each_possible_cpu(cpu) {
- void *start = per_cpu_ptr(base, cpu);
++{
++#ifdef CONFIG_SMP
++ const size_t static_size = __per_cpu_end - __per_cpu_start;
++ void __percpu *base = __addr_to_pcpu_ptr(pcpu_base_addr);
++ unsigned int cpu;
++
++ for_each_possible_cpu(cpu) {
++ void *start = per_cpu_ptr(base, cpu);
+ void *va = (void *)addr;
-
-- if ((void *)addr >= start && (void *)addr < start + static_size)
++
+ if (va >= start && va < start + static_size) {
+ if (can_addr) {
+ *can_addr = (unsigned long) (va - start);
+ *can_addr += (unsigned long)
+ per_cpu_ptr(base, get_boot_cpu_id());
+ }
- return true;
-- }
++ return true;
+ }
+ }
- #endif
- /* on UP, can't distinguish from other static vars, always false */
- return false;
++#endif
++ /* on UP, can't distinguish from other static vars, always false */
++ return false;
++}
++
+ /**
+ * is_kernel_percpu_address - test whether address is from static percpu area
+ * @addr: address to test
+@@ -1296,20 +1321,7 @@ EXPORT_SYMBOL_GPL(free_percpu);
+ */
+ bool is_kernel_percpu_address(unsigned long addr)
+ {
+-#ifdef CONFIG_SMP
+- const size_t static_size = __per_cpu_end - __per_cpu_start;
+- void __percpu *base = __addr_to_pcpu_ptr(pcpu_base_addr);
+- unsigned int cpu;
+-
+- for_each_possible_cpu(cpu) {
+- void *start = per_cpu_ptr(base, cpu);
+-
+- if ((void *)addr >= start && (void *)addr < start + static_size)
+- return true;
+- }
+-#endif
+- /* on UP, can't distinguish from other static vars, always false */
+- return false;
++ return __is_kernel_percpu_address(addr, NULL);
}
/**
-+ * is_kernel_percpu_address - test whether address is from static percpu area
-+ * @addr: address to test
-+ *
-+ * Test whether @addr belongs to in-kernel static percpu area. Module
-+ * static percpu areas are not considered. For those, use
-+ * is_module_percpu_address().
-+ *
-+ * RETURNS:
-+ * %true if @addr is from in-kernel static percpu area, %false otherwise.
-+ */
-+bool is_kernel_percpu_address(unsigned long addr)
-+{
-+ return __is_kernel_percpu_address(addr, NULL);
-+}
-+
-+/**
- * per_cpu_ptr_to_phys - convert translated percpu address to physical address
- * @addr: the address to be converted to physical address
- *
-diff -Nur linux-4.9.28.orig/mm/slab.h linux-4.9.28/mm/slab.h
---- linux-4.9.28.orig/mm/slab.h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/slab.h 2017-05-19 03:37:25.210177882 +0200
-@@ -426,7 +426,11 @@
+diff --git a/mm/slab.h b/mm/slab.h
+index ceb7d70cdb76..dfd281e43fbe 100644
+--- a/mm/slab.h
++++ b/mm/slab.h
+@@ -426,7 +426,11 @@ static inline void slab_post_alloc_hook(struct kmem_cache *s, gfp_t flags,
* The slab lists for all objects.
*/
struct kmem_cache_node {
@@ -24885,10 +24875,11 @@ diff -Nur linux-4.9.28.orig/mm/slab.h linux-4.9.28/mm/slab.h
#ifdef CONFIG_SLAB
struct list_head slabs_partial; /* partial list first, better asm code */
-diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
---- linux-4.9.28.orig/mm/slub.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/slub.c 2017-05-19 03:37:25.210177882 +0200
-@@ -1141,7 +1141,7 @@
+diff --git a/mm/slub.c b/mm/slub.c
+index 58c7526f8de2..6d72b7f87129 100644
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -1141,7 +1141,7 @@ static noinline int free_debug_processing(
unsigned long uninitialized_var(flags);
int ret = 0;
@@ -24897,7 +24888,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
slab_lock(page);
if (s->flags & SLAB_CONSISTENCY_CHECKS) {
-@@ -1176,7 +1176,7 @@
+@@ -1176,7 +1176,7 @@ static noinline int free_debug_processing(
bulk_cnt, cnt);
slab_unlock(page);
@@ -24906,7 +24897,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
if (!ret)
slab_fix(s, "Object at 0x%p not freed", object);
return ret;
-@@ -1304,6 +1304,12 @@
+@@ -1304,6 +1304,12 @@ static inline void dec_slabs_node(struct kmem_cache *s, int node,
#endif /* CONFIG_SLUB_DEBUG */
@@ -24919,7 +24910,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
/*
* Hooks for other subsystems that check memory allocations. In a typical
* production configuration these hooks all should produce no code at all.
-@@ -1527,10 +1533,17 @@
+@@ -1527,10 +1533,17 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
void *start, *p;
int idx, order;
bool shuffle;
@@ -24937,7 +24928,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
local_irq_enable();
flags |= s->allocflags;
-@@ -1605,7 +1618,7 @@
+@@ -1605,7 +1618,7 @@ static struct page *allocate_slab(struct kmem_cache *s, gfp_t flags, int node)
page->frozen = 1;
out:
@@ -24946,7 +24937,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
local_irq_disable();
if (!page)
return NULL;
-@@ -1664,6 +1677,16 @@
+@@ -1664,6 +1677,16 @@ static void __free_slab(struct kmem_cache *s, struct page *page)
__free_pages(page, order);
}
@@ -24963,7 +24954,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
#define need_reserve_slab_rcu \
(sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head))
-@@ -1695,6 +1718,12 @@
+@@ -1695,6 +1718,12 @@ static void free_slab(struct kmem_cache *s, struct page *page)
}
call_rcu(head, rcu_free_slab);
@@ -24976,7 +24967,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
} else
__free_slab(s, page);
}
-@@ -1802,7 +1831,7 @@
+@@ -1802,7 +1831,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
if (!n || !n->nr_partial)
return NULL;
@@ -24985,7 +24976,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
list_for_each_entry_safe(page, page2, &n->partial, lru) {
void *t;
-@@ -1827,7 +1856,7 @@
+@@ -1827,7 +1856,7 @@ static void *get_partial_node(struct kmem_cache *s, struct kmem_cache_node *n,
break;
}
@@ -24994,7 +24985,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
return object;
}
-@@ -2073,7 +2102,7 @@
+@@ -2073,7 +2102,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
* that acquire_slab() will see a slab page that
* is frozen
*/
@@ -25003,7 +24994,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
} else {
m = M_FULL;
-@@ -2084,7 +2113,7 @@
+@@ -2084,7 +2113,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
* slabs from diagnostic functions will not see
* any frozen slabs.
*/
@@ -25012,7 +25003,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
}
-@@ -2119,7 +2148,7 @@
+@@ -2119,7 +2148,7 @@ static void deactivate_slab(struct kmem_cache *s, struct page *page,
goto redo;
if (lock)
@@ -25021,7 +25012,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
if (m == M_FREE) {
stat(s, DEACTIVATE_EMPTY);
-@@ -2151,10 +2180,10 @@
+@@ -2151,10 +2180,10 @@ static void unfreeze_partials(struct kmem_cache *s,
n2 = get_node(s, page_to_nid(page));
if (n != n2) {
if (n)
@@ -25034,7 +25025,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
do {
-@@ -2183,7 +2212,7 @@
+@@ -2183,7 +2212,7 @@ static void unfreeze_partials(struct kmem_cache *s,
}
if (n)
@@ -25043,7 +25034,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
while (discard_page) {
page = discard_page;
-@@ -2222,14 +2251,21 @@
+@@ -2222,14 +2251,21 @@ static void put_cpu_partial(struct kmem_cache *s, struct page *page, int drain)
pobjects = oldpage->pobjects;
pages = oldpage->pages;
if (drain && pobjects > s->cpu_partial) {
@@ -25065,7 +25056,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
oldpage = NULL;
pobjects = 0;
pages = 0;
-@@ -2301,7 +2337,22 @@
+@@ -2301,7 +2337,22 @@ static bool has_cpu_slab(int cpu, void *info)
static void flush_all(struct kmem_cache *s)
{
@@ -25088,7 +25079,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
/*
-@@ -2356,10 +2407,10 @@
+@@ -2356,10 +2407,10 @@ static unsigned long count_partial(struct kmem_cache_node *n,
unsigned long x = 0;
struct page *page;
@@ -25101,7 +25092,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
return x;
}
#endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */
-@@ -2497,8 +2548,10 @@
+@@ -2497,8 +2548,10 @@ static inline void *get_freelist(struct kmem_cache *s, struct page *page)
* already disabled (which is the case for bulk allocation).
*/
static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
@@ -25113,7 +25104,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
void *freelist;
struct page *page;
-@@ -2558,6 +2611,13 @@
+@@ -2558,6 +2611,13 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
VM_BUG_ON(!c->page->frozen);
c->freelist = get_freepointer(s, freelist);
c->tid = next_tid(c->tid);
@@ -25127,7 +25118,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
return freelist;
new_slab:
-@@ -2589,7 +2649,7 @@
+@@ -2589,7 +2649,7 @@ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
deactivate_slab(s, page, get_freepointer(s, freelist));
c->page = NULL;
c->freelist = NULL;
@@ -25136,7 +25127,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
/*
-@@ -2601,6 +2661,7 @@
+@@ -2601,6 +2661,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
{
void *p;
unsigned long flags;
@@ -25144,7 +25135,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
local_irq_save(flags);
#ifdef CONFIG_PREEMPT
-@@ -2612,8 +2673,9 @@
+@@ -2612,8 +2673,9 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
c = this_cpu_ptr(s->cpu_slab);
#endif
@@ -25155,7 +25146,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
return p;
}
-@@ -2799,7 +2861,7 @@
+@@ -2799,7 +2861,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
do {
if (unlikely(n)) {
@@ -25164,7 +25155,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
n = NULL;
}
prior = page->freelist;
-@@ -2831,7 +2893,7 @@
+@@ -2831,7 +2893,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
* Otherwise the list_lock will synchronize with
* other processors updating the list of slabs.
*/
@@ -25173,7 +25164,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
}
-@@ -2873,7 +2935,7 @@
+@@ -2873,7 +2935,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
add_partial(n, page, DEACTIVATE_TO_TAIL);
stat(s, FREE_ADD_PARTIAL);
}
@@ -25182,7 +25173,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
return;
slab_empty:
-@@ -2888,7 +2950,7 @@
+@@ -2888,7 +2950,7 @@ static void __slab_free(struct kmem_cache *s, struct page *page,
remove_full(s, n, page);
}
@@ -25191,7 +25182,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
stat(s, FREE_SLAB);
discard_slab(s, page);
}
-@@ -3093,6 +3155,7 @@
+@@ -3093,6 +3155,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
void **p)
{
struct kmem_cache_cpu *c;
@@ -25199,7 +25190,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
int i;
/* memcg and kmem_cache debug support */
-@@ -3116,7 +3179,7 @@
+@@ -3116,7 +3179,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
* of re-populating per CPU c->freelist
*/
p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
@@ -25208,7 +25199,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
if (unlikely(!p[i]))
goto error;
-@@ -3128,6 +3191,7 @@
+@@ -3128,6 +3191,7 @@ int kmem_cache_alloc_bulk(struct kmem_cache *s, gfp_t flags, size_t size,
}
c->tid = next_tid(c->tid);
local_irq_enable();
@@ -25216,7 +25207,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
/* Clear memory outside IRQ disabled fastpath loop */
if (unlikely(flags & __GFP_ZERO)) {
-@@ -3275,7 +3339,7 @@
+@@ -3275,7 +3339,7 @@ static void
init_kmem_cache_node(struct kmem_cache_node *n)
{
n->nr_partial = 0;
@@ -25225,7 +25216,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
INIT_LIST_HEAD(&n->partial);
#ifdef CONFIG_SLUB_DEBUG
atomic_long_set(&n->nr_slabs, 0);
-@@ -3619,6 +3683,10 @@
+@@ -3619,6 +3683,10 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
const char *text)
{
#ifdef CONFIG_SLUB_DEBUG
@@ -25236,7 +25227,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
void *addr = page_address(page);
void *p;
unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
-@@ -3639,6 +3707,7 @@
+@@ -3639,6 +3707,7 @@ static void list_slab_objects(struct kmem_cache *s, struct page *page,
slab_unlock(page);
kfree(map);
#endif
@@ -25244,7 +25235,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
/*
-@@ -3652,7 +3721,7 @@
+@@ -3652,7 +3721,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
struct page *page, *h;
BUG_ON(irqs_disabled());
@@ -25253,7 +25244,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
list_for_each_entry_safe(page, h, &n->partial, lru) {
if (!page->inuse) {
remove_partial(n, page);
-@@ -3662,7 +3731,7 @@
+@@ -3662,7 +3731,7 @@ static void free_partial(struct kmem_cache *s, struct kmem_cache_node *n)
"Objects remaining in %s on __kmem_cache_shutdown()");
}
}
@@ -25262,7 +25253,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
list_for_each_entry_safe(page, h, &discard, lru)
discard_slab(s, page);
-@@ -3905,7 +3974,7 @@
+@@ -3905,7 +3974,7 @@ int __kmem_cache_shrink(struct kmem_cache *s)
for (i = 0; i < SHRINK_PROMOTE_MAX; i++)
INIT_LIST_HEAD(promote + i);
@@ -25271,7 +25262,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
/*
* Build lists of slabs to discard or promote.
-@@ -3936,7 +4005,7 @@
+@@ -3936,7 +4005,7 @@ int __kmem_cache_shrink(struct kmem_cache *s)
for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--)
list_splice(promote + i, &n->partial);
@@ -25280,7 +25271,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
/* Release empty slabs */
list_for_each_entry_safe(page, t, &discard, lru)
-@@ -4112,6 +4181,12 @@
+@@ -4112,6 +4181,12 @@ void __init kmem_cache_init(void)
{
static __initdata struct kmem_cache boot_kmem_cache,
boot_kmem_cache_node;
@@ -25293,7 +25284,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
if (debug_guardpage_minorder())
slub_max_order = 0;
-@@ -4320,7 +4395,7 @@
+@@ -4320,7 +4395,7 @@ static int validate_slab_node(struct kmem_cache *s,
struct page *page;
unsigned long flags;
@@ -25302,7 +25293,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
list_for_each_entry(page, &n->partial, lru) {
validate_slab_slab(s, page, map);
-@@ -4342,7 +4417,7 @@
+@@ -4342,7 +4417,7 @@ static int validate_slab_node(struct kmem_cache *s,
s->name, count, atomic_long_read(&n->nr_slabs));
out:
@@ -25311,7 +25302,7 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
return count;
}
-@@ -4530,12 +4605,12 @@
+@@ -4530,12 +4605,12 @@ static int list_locations(struct kmem_cache *s, char *buf,
if (!atomic_long_read(&n->nr_slabs))
continue;
@@ -25326,9 +25317,10 @@ diff -Nur linux-4.9.28.orig/mm/slub.c linux-4.9.28/mm/slub.c
}
for (i = 0; i < t.count; i++) {
-diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
---- linux-4.9.28.orig/mm/swap.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/swap.c 2017-05-19 03:37:25.210177882 +0200
+diff --git a/mm/swap.c b/mm/swap.c
+index 4dcf852e1e6d..69c3a5b24060 100644
+--- a/mm/swap.c
++++ b/mm/swap.c
@@ -32,6 +32,7 @@
#include <linux/memcontrol.h>
#include <linux/gfp.h>
@@ -25337,7 +25329,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
#include <linux/hugetlb.h>
#include <linux/page_idle.h>
-@@ -50,6 +51,8 @@
+@@ -50,6 +51,8 @@ static DEFINE_PER_CPU(struct pagevec, lru_deactivate_pvecs);
#ifdef CONFIG_SMP
static DEFINE_PER_CPU(struct pagevec, activate_page_pvecs);
#endif
@@ -25346,7 +25338,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
/*
* This path almost never happens for VM activity - pages are normally
-@@ -240,11 +243,11 @@
+@@ -240,11 +243,11 @@ void rotate_reclaimable_page(struct page *page)
unsigned long flags;
get_page(page);
@@ -25360,7 +25352,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
}
}
-@@ -294,12 +297,13 @@
+@@ -294,12 +297,13 @@ void activate_page(struct page *page)
{
page = compound_head(page);
if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
@@ -25376,7 +25368,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
}
}
-@@ -326,7 +330,7 @@
+@@ -326,7 +330,7 @@ void activate_page(struct page *page)
static void __lru_cache_activate_page(struct page *page)
{
@@ -25385,7 +25377,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
int i;
/*
-@@ -348,7 +352,7 @@
+@@ -348,7 +352,7 @@ static void __lru_cache_activate_page(struct page *page)
}
}
@@ -25394,7 +25386,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
}
/*
-@@ -390,12 +394,12 @@
+@@ -390,12 +394,12 @@ EXPORT_SYMBOL(mark_page_accessed);
static void __lru_cache_add(struct page *page)
{
@@ -25409,7 +25401,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
}
/**
-@@ -593,9 +597,15 @@
+@@ -593,9 +597,15 @@ void lru_add_drain_cpu(int cpu)
unsigned long flags;
/* No harm done if a racing interrupt already did this */
@@ -25427,7 +25419,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
}
pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
-@@ -627,11 +637,12 @@
+@@ -627,11 +637,12 @@ void deactivate_file_page(struct page *page)
return;
if (likely(get_page_unless_zero(page))) {
@@ -25442,7 +25434,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
}
}
-@@ -646,27 +657,31 @@
+@@ -646,27 +657,31 @@ void deactivate_file_page(struct page *page)
void deactivate_page(struct page *page)
{
if (PageLRU(page) && PageActive(page) && !PageUnevictable(page)) {
@@ -25481,7 +25473,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
/*
* lru_add_drain_wq is used to do lru_add_drain_all() from a WQ_MEM_RECLAIM
-@@ -686,6 +701,22 @@
+@@ -686,6 +701,22 @@ static int __init lru_init(void)
}
early_initcall(lru_init);
@@ -25504,7 +25496,7 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
void lru_add_drain_all(void)
{
static DEFINE_MUTEX(lock);
-@@ -697,21 +728,18 @@
+@@ -697,21 +728,18 @@ void lru_add_drain_all(void)
cpumask_clear(&has_work);
for_each_online_cpu(cpu) {
@@ -25530,10 +25522,11 @@ diff -Nur linux-4.9.28.orig/mm/swap.c linux-4.9.28/mm/swap.c
put_online_cpus();
mutex_unlock(&lock);
-diff -Nur linux-4.9.28.orig/mm/truncate.c linux-4.9.28/mm/truncate.c
---- linux-4.9.28.orig/mm/truncate.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/truncate.c 2017-05-19 03:37:25.214178037 +0200
-@@ -62,9 +62,12 @@
+diff --git a/mm/truncate.c b/mm/truncate.c
+index 8d8c62d89e6d..5bf1bd25d077 100644
+--- a/mm/truncate.c
++++ b/mm/truncate.c
+@@ -62,9 +62,12 @@ static void clear_exceptional_entry(struct address_space *mapping,
* protected by mapping->tree_lock.
*/
if (!workingset_node_shadows(node) &&
@@ -25548,10 +25541,11 @@ diff -Nur linux-4.9.28.orig/mm/truncate.c linux-4.9.28/mm/truncate.c
__radix_tree_delete_node(&mapping->page_tree, node);
unlock:
spin_unlock_irq(&mapping->tree_lock);
-diff -Nur linux-4.9.28.orig/mm/vmalloc.c linux-4.9.28/mm/vmalloc.c
---- linux-4.9.28.orig/mm/vmalloc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/vmalloc.c 2017-05-19 03:37:25.214178037 +0200
-@@ -845,7 +845,7 @@
+diff --git a/mm/vmalloc.c b/mm/vmalloc.c
+index f2481cb4e6b2..db4de08fa97c 100644
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -845,7 +845,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
struct vmap_block *vb;
struct vmap_area *va;
unsigned long vb_idx;
@@ -25560,7 +25554,7 @@ diff -Nur linux-4.9.28.orig/mm/vmalloc.c linux-4.9.28/mm/vmalloc.c
void *vaddr;
node = numa_node_id();
-@@ -888,11 +888,12 @@
+@@ -888,11 +888,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
BUG_ON(err);
radix_tree_preload_end();
@@ -25575,7 +25569,7 @@ diff -Nur linux-4.9.28.orig/mm/vmalloc.c linux-4.9.28/mm/vmalloc.c
return vaddr;
}
-@@ -961,6 +962,7 @@
+@@ -961,6 +962,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
struct vmap_block *vb;
void *vaddr = NULL;
unsigned int order;
@@ -25583,7 +25577,7 @@ diff -Nur linux-4.9.28.orig/mm/vmalloc.c linux-4.9.28/mm/vmalloc.c
BUG_ON(offset_in_page(size));
BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
-@@ -975,7 +977,8 @@
+@@ -975,7 +977,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
order = get_order(size);
rcu_read_lock();
@@ -25593,7 +25587,7 @@ diff -Nur linux-4.9.28.orig/mm/vmalloc.c linux-4.9.28/mm/vmalloc.c
list_for_each_entry_rcu(vb, &vbq->free, free_list) {
unsigned long pages_off;
-@@ -998,7 +1001,7 @@
+@@ -998,7 +1001,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
break;
}
@@ -25602,10 +25596,11 @@ diff -Nur linux-4.9.28.orig/mm/vmalloc.c linux-4.9.28/mm/vmalloc.c
rcu_read_unlock();
/* Allocate new block if nothing was found */
-diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
---- linux-4.9.28.orig/mm/vmstat.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/vmstat.c 2017-05-19 03:37:25.214178037 +0200
-@@ -245,6 +245,7 @@
+diff --git a/mm/vmstat.c b/mm/vmstat.c
+index 604f26a4f696..312006d2db50 100644
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -245,6 +245,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
long x;
long t;
@@ -25613,7 +25608,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
x = delta + __this_cpu_read(*p);
t = __this_cpu_read(pcp->stat_threshold);
-@@ -254,6 +255,7 @@
+@@ -254,6 +255,7 @@ void __mod_zone_page_state(struct zone *zone, enum zone_stat_item item,
x = 0;
}
__this_cpu_write(*p, x);
@@ -25621,7 +25616,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
}
EXPORT_SYMBOL(__mod_zone_page_state);
-@@ -265,6 +267,7 @@
+@@ -265,6 +267,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
long x;
long t;
@@ -25629,7 +25624,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
x = delta + __this_cpu_read(*p);
t = __this_cpu_read(pcp->stat_threshold);
-@@ -274,6 +277,7 @@
+@@ -274,6 +277,7 @@ void __mod_node_page_state(struct pglist_data *pgdat, enum node_stat_item item,
x = 0;
}
__this_cpu_write(*p, x);
@@ -25637,7 +25632,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
}
EXPORT_SYMBOL(__mod_node_page_state);
-@@ -306,6 +310,7 @@
+@@ -306,6 +310,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
s8 __percpu *p = pcp->vm_stat_diff + item;
s8 v, t;
@@ -25645,7 +25640,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
v = __this_cpu_inc_return(*p);
t = __this_cpu_read(pcp->stat_threshold);
if (unlikely(v > t)) {
-@@ -314,6 +319,7 @@
+@@ -314,6 +319,7 @@ void __inc_zone_state(struct zone *zone, enum zone_stat_item item)
zone_page_state_add(v + overstep, zone, item);
__this_cpu_write(*p, -overstep);
}
@@ -25653,7 +25648,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
}
void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
-@@ -322,6 +328,7 @@
+@@ -322,6 +328,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
s8 __percpu *p = pcp->vm_node_stat_diff + item;
s8 v, t;
@@ -25661,7 +25656,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
v = __this_cpu_inc_return(*p);
t = __this_cpu_read(pcp->stat_threshold);
if (unlikely(v > t)) {
-@@ -330,6 +337,7 @@
+@@ -330,6 +337,7 @@ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
node_page_state_add(v + overstep, pgdat, item);
__this_cpu_write(*p, -overstep);
}
@@ -25669,7 +25664,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
}
void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
-@@ -350,6 +358,7 @@
+@@ -350,6 +358,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
s8 __percpu *p = pcp->vm_stat_diff + item;
s8 v, t;
@@ -25677,7 +25672,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
v = __this_cpu_dec_return(*p);
t = __this_cpu_read(pcp->stat_threshold);
if (unlikely(v < - t)) {
-@@ -358,6 +367,7 @@
+@@ -358,6 +367,7 @@ void __dec_zone_state(struct zone *zone, enum zone_stat_item item)
zone_page_state_add(v - overstep, zone, item);
__this_cpu_write(*p, overstep);
}
@@ -25685,7 +25680,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
}
void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
-@@ -366,6 +376,7 @@
+@@ -366,6 +376,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
s8 __percpu *p = pcp->vm_node_stat_diff + item;
s8 v, t;
@@ -25693,7 +25688,7 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
v = __this_cpu_dec_return(*p);
t = __this_cpu_read(pcp->stat_threshold);
if (unlikely(v < - t)) {
-@@ -374,6 +385,7 @@
+@@ -374,6 +385,7 @@ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
node_page_state_add(v - overstep, pgdat, item);
__this_cpu_write(*p, overstep);
}
@@ -25701,10 +25696,11 @@ diff -Nur linux-4.9.28.orig/mm/vmstat.c linux-4.9.28/mm/vmstat.c
}
void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
-diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
---- linux-4.9.28.orig/mm/workingset.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/workingset.c 2017-05-19 03:37:25.214178037 +0200
-@@ -334,7 +334,8 @@
+diff --git a/mm/workingset.c b/mm/workingset.c
+index 4c4f05655e6e..b97b1e87b54c 100644
+--- a/mm/workingset.c
++++ b/mm/workingset.c
+@@ -334,7 +334,8 @@ void workingset_activation(struct page *page)
* point where they would still be useful.
*/
@@ -25714,7 +25710,7 @@ diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
static unsigned long count_shadow_nodes(struct shrinker *shrinker,
struct shrink_control *sc)
-@@ -344,9 +345,9 @@
+@@ -344,9 +345,9 @@ static unsigned long count_shadow_nodes(struct shrinker *shrinker,
unsigned long pages;
/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
@@ -25727,7 +25723,7 @@ diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
if (sc->memcg) {
pages = mem_cgroup_node_nr_lru_pages(sc->memcg, sc->nid,
-@@ -438,9 +439,9 @@
+@@ -438,9 +439,9 @@ static enum lru_status shadow_lru_isolate(struct list_head *item,
spin_unlock(&mapping->tree_lock);
ret = LRU_REMOVED_RETRY;
out:
@@ -25739,7 +25735,7 @@ diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
spin_lock(lru_lock);
return ret;
}
-@@ -451,10 +452,10 @@
+@@ -451,10 +452,10 @@ static unsigned long scan_shadow_nodes(struct shrinker *shrinker,
unsigned long ret;
/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
@@ -25753,7 +25749,7 @@ diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
return ret;
}
-@@ -492,7 +493,7 @@
+@@ -492,7 +493,7 @@ static int __init workingset_init(void)
pr_info("workingset: timestamp_bits=%d max_order=%d bucket_order=%u\n",
timestamp_bits, max_order, bucket_order);
@@ -25762,7 +25758,7 @@ diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
if (ret)
goto err;
ret = register_shrinker(&workingset_shadow_shrinker);
-@@ -500,7 +501,7 @@
+@@ -500,7 +501,7 @@ static int __init workingset_init(void)
goto err_list_lru;
return 0;
err_list_lru:
@@ -25771,9 +25767,10 @@ diff -Nur linux-4.9.28.orig/mm/workingset.c linux-4.9.28/mm/workingset.c
err:
return ret;
}
-diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
---- linux-4.9.28.orig/mm/zsmalloc.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/mm/zsmalloc.c 2017-05-19 03:37:25.214178037 +0200
+diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
+index 1689bb58e0d1..e52a8cb6aa5a 100644
+--- a/mm/zsmalloc.c
++++ b/mm/zsmalloc.c
@@ -53,6 +53,7 @@
#include <linux/mount.h>
#include <linux/migrate.h>
@@ -25806,7 +25803,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
/*
* Object location (<PFN>, <obj_idx>) is encoded as
* as single (unsigned long) handle value.
-@@ -327,7 +341,7 @@
+@@ -327,7 +341,7 @@ static void SetZsPageMovable(struct zs_pool *pool, struct zspage *zspage) {}
static int create_cache(struct zs_pool *pool)
{
@@ -25815,7 +25812,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
0, 0, NULL);
if (!pool->handle_cachep)
return 1;
-@@ -351,10 +365,27 @@
+@@ -351,10 +365,27 @@ static void destroy_cache(struct zs_pool *pool)
static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp)
{
@@ -25845,7 +25842,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
{
kmem_cache_free(pool->handle_cachep, (void *)handle);
-@@ -373,12 +404,18 @@
+@@ -373,12 +404,18 @@ static void cache_free_zspage(struct zs_pool *pool, struct zspage *zspage)
static void record_obj(unsigned long handle, unsigned long obj)
{
@@ -25864,7 +25861,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
}
/* zpool driver */
-@@ -467,6 +504,7 @@
+@@ -467,6 +504,7 @@ MODULE_ALIAS("zpool-zsmalloc");
/* per-cpu VM mapping areas for zspage accesses that cross page boundaries */
static DEFINE_PER_CPU(struct mapping_area, zs_map_area);
@@ -25872,7 +25869,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
static bool is_zspage_isolated(struct zspage *zspage)
{
-@@ -902,7 +940,13 @@
+@@ -902,7 +940,13 @@ static unsigned long location_to_obj(struct page *page, unsigned int obj_idx)
static unsigned long handle_to_obj(unsigned long handle)
{
@@ -25886,7 +25883,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
}
static unsigned long obj_to_head(struct page *page, void *obj)
-@@ -916,22 +960,46 @@
+@@ -916,22 +960,46 @@ static unsigned long obj_to_head(struct page *page, void *obj)
static inline int testpin_tag(unsigned long handle)
{
@@ -25933,7 +25930,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
}
static void reset_page(struct page *page)
-@@ -1423,7 +1491,7 @@
+@@ -1423,7 +1491,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
class = pool->size_class[class_idx];
off = (class->size * obj_idx) & ~PAGE_MASK;
@@ -25942,7 +25939,7 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
area->vm_mm = mm;
if (off + class->size <= PAGE_SIZE) {
/* this object is contained entirely within a page */
-@@ -1477,7 +1545,7 @@
+@@ -1477,7 +1545,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
__zs_unmap_object(area, pages, off, class->size);
}
@@ -25951,10 +25948,11 @@ diff -Nur linux-4.9.28.orig/mm/zsmalloc.c linux-4.9.28/mm/zsmalloc.c
migrate_read_unlock(zspage);
unpin_tag(handle);
-diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
---- linux-4.9.28.orig/net/core/dev.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/core/dev.c 2017-05-19 03:37:25.214178037 +0200
-@@ -190,6 +190,7 @@
+diff --git a/net/core/dev.c b/net/core/dev.c
+index 2e04fd188081..3ba60ef8c79e 100644
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -190,6 +190,7 @@ static unsigned int napi_gen_id = NR_CPUS;
static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
static seqcount_t devnet_rename_seq;
@@ -25962,7 +25960,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
static inline void dev_base_seq_inc(struct net *net)
{
-@@ -211,14 +212,14 @@
+@@ -211,14 +212,14 @@ static inline struct hlist_head *dev_index_hash(struct net *net, int ifindex)
static inline void rps_lock(struct softnet_data *sd)
{
#ifdef CONFIG_RPS
@@ -25979,7 +25977,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
#endif
}
-@@ -888,7 +889,8 @@
+@@ -888,7 +889,8 @@ int netdev_get_name(struct net *net, char *name, int ifindex)
strcpy(name, dev->name);
rcu_read_unlock();
if (read_seqcount_retry(&devnet_rename_seq, seq)) {
@@ -25989,7 +25987,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
goto retry;
}
-@@ -1157,20 +1159,17 @@
+@@ -1157,20 +1159,17 @@ int dev_change_name(struct net_device *dev, const char *newname)
if (dev->flags & IFF_UP)
return -EBUSY;
@@ -26016,7 +26014,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
if (oldname[0] && !strchr(oldname, '%'))
netdev_info(dev, "renamed from %s\n", oldname);
-@@ -1183,11 +1182,12 @@
+@@ -1183,11 +1182,12 @@ int dev_change_name(struct net_device *dev, const char *newname)
if (ret) {
memcpy(dev->name, oldname, IFNAMSIZ);
dev->name_assign_type = old_assign_type;
@@ -26032,7 +26030,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
netdev_adjacent_rename_links(dev, oldname);
-@@ -1208,7 +1208,8 @@
+@@ -1208,7 +1208,8 @@ int dev_change_name(struct net_device *dev, const char *newname)
/* err >= 0 after dev_alloc_name() or stores the first errno */
if (err >= 0) {
err = ret;
@@ -26042,7 +26040,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
memcpy(dev->name, oldname, IFNAMSIZ);
memcpy(oldname, newname, IFNAMSIZ);
dev->name_assign_type = old_assign_type;
-@@ -1221,6 +1222,11 @@
+@@ -1221,6 +1222,11 @@ int dev_change_name(struct net_device *dev, const char *newname)
}
return err;
@@ -26054,7 +26052,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
}
/**
-@@ -2285,6 +2291,7 @@
+@@ -2285,6 +2291,7 @@ static void __netif_reschedule(struct Qdisc *q)
sd->output_queue_tailp = &q->next_sched;
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_restore(flags);
@@ -26062,7 +26060,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
}
void __netif_schedule(struct Qdisc *q)
-@@ -2366,6 +2373,7 @@
+@@ -2366,6 +2373,7 @@ void __dev_kfree_skb_irq(struct sk_buff *skb, enum skb_free_reason reason)
__this_cpu_write(softnet_data.completion_queue, skb);
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_restore(flags);
@@ -26070,7 +26068,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
}
EXPORT_SYMBOL(__dev_kfree_skb_irq);
-@@ -3100,7 +3108,11 @@
+@@ -3100,7 +3108,11 @@ static inline int __dev_xmit_skb(struct sk_buff *skb, struct Qdisc *q,
* This permits qdisc->running owner to get the lock more
* often and dequeue packets faster.
*/
@@ -26082,7 +26080,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
if (unlikely(contended))
spin_lock(&q->busylock);
-@@ -3163,8 +3175,10 @@
+@@ -3163,8 +3175,10 @@ static void skb_update_prio(struct sk_buff *skb)
#define skb_update_prio(skb)
#endif
@@ -26093,7 +26091,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
/**
* dev_loopback_xmit - loop back @skb
-@@ -3398,8 +3412,7 @@
+@@ -3398,8 +3412,7 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
int cpu = smp_processor_id(); /* ok because BHs are off */
if (txq->xmit_lock_owner != cpu) {
@@ -26103,7 +26101,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
goto recursion_alert;
skb = validate_xmit_skb(skb, dev);
-@@ -3409,9 +3422,9 @@
+@@ -3409,9 +3422,9 @@ static int __dev_queue_xmit(struct sk_buff *skb, void *accel_priv)
HARD_TX_LOCK(dev, txq, cpu);
if (!netif_xmit_stopped(txq)) {
@@ -26115,7 +26113,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
if (dev_xmit_complete(rc)) {
HARD_TX_UNLOCK(dev, txq);
goto out;
-@@ -3785,6 +3798,7 @@
+@@ -3785,6 +3798,7 @@ static int enqueue_to_backlog(struct sk_buff *skb, int cpu,
rps_unlock(sd);
local_irq_restore(flags);
@@ -26123,7 +26121,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
atomic_long_inc(&skb->dev->rx_dropped);
kfree_skb(skb);
-@@ -3803,7 +3817,7 @@
+@@ -3803,7 +3817,7 @@ static int netif_rx_internal(struct sk_buff *skb)
struct rps_dev_flow voidflow, *rflow = &voidflow;
int cpu;
@@ -26132,7 +26130,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
rcu_read_lock();
cpu = get_rps_cpu(skb->dev, skb, &rflow);
-@@ -3813,13 +3827,13 @@
+@@ -3813,13 +3827,13 @@ static int netif_rx_internal(struct sk_buff *skb)
ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
rcu_read_unlock();
@@ -26149,7 +26147,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
}
return ret;
}
-@@ -3853,11 +3867,9 @@
+@@ -3853,11 +3867,9 @@ int netif_rx_ni(struct sk_buff *skb)
trace_netif_rx_ni_entry(skb);
@@ -26163,7 +26161,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
return err;
}
-@@ -4336,7 +4348,7 @@
+@@ -4336,7 +4348,7 @@ static void flush_backlog(struct work_struct *work)
skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
if (skb->dev->reg_state == NETREG_UNREGISTERING) {
__skb_unlink(skb, &sd->input_pkt_queue);
@@ -26172,7 +26170,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
input_queue_head_incr(sd);
}
}
-@@ -4346,11 +4358,14 @@
+@@ -4346,11 +4358,14 @@ static void flush_backlog(struct work_struct *work)
skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
if (skb->dev->reg_state == NETREG_UNREGISTERING) {
__skb_unlink(skb, &sd->process_queue);
@@ -26188,7 +26186,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
}
static void flush_all_backlogs(void)
-@@ -4831,6 +4846,7 @@
+@@ -4831,6 +4846,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
sd->rps_ipi_list = NULL;
local_irq_enable();
@@ -26196,7 +26194,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
/* Send pending IPI's to kick RPS processing on remote cpus. */
while (remsd) {
-@@ -4844,6 +4860,7 @@
+@@ -4844,6 +4860,7 @@ static void net_rps_action_and_irq_enable(struct softnet_data *sd)
} else
#endif
local_irq_enable();
@@ -26204,7 +26202,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
}
static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
-@@ -4873,7 +4890,9 @@
+@@ -4873,7 +4890,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
while (again) {
struct sk_buff *skb;
@@ -26214,7 +26212,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
rcu_read_lock();
__netif_receive_skb(skb);
rcu_read_unlock();
-@@ -4881,9 +4900,9 @@
+@@ -4881,9 +4900,9 @@ static int process_backlog(struct napi_struct *napi, int quota)
if (++work >= quota)
return work;
@@ -26225,7 +26223,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
rps_lock(sd);
if (skb_queue_empty(&sd->input_pkt_queue)) {
/*
-@@ -4921,9 +4940,11 @@
+@@ -4921,9 +4940,11 @@ void __napi_schedule(struct napi_struct *n)
local_irq_save(flags);
____napi_schedule(this_cpu_ptr(&softnet_data), n);
local_irq_restore(flags);
@@ -26237,7 +26235,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
/**
* __napi_schedule_irqoff - schedule for receive
* @n: entry to schedule
-@@ -4935,6 +4956,7 @@
+@@ -4935,6 +4956,7 @@ void __napi_schedule_irqoff(struct napi_struct *n)
____napi_schedule(this_cpu_ptr(&softnet_data), n);
}
EXPORT_SYMBOL(__napi_schedule_irqoff);
@@ -26245,7 +26243,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
void __napi_complete(struct napi_struct *n)
{
-@@ -5224,13 +5246,21 @@
+@@ -5224,13 +5246,21 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
struct softnet_data *sd = this_cpu_ptr(&softnet_data);
unsigned long time_limit = jiffies + 2;
int budget = netdev_budget;
@@ -26267,7 +26265,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
for (;;) {
struct napi_struct *n;
-@@ -5261,7 +5291,7 @@
+@@ -5261,7 +5291,7 @@ static __latent_entropy void net_rx_action(struct softirq_action *h)
list_splice_tail(&repoll, &list);
list_splice(&list, &sd->poll_list);
if (!list_empty(&sd->poll_list))
@@ -26276,7 +26274,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
net_rps_action_and_irq_enable(sd);
}
-@@ -8022,16 +8052,20 @@
+@@ -8022,16 +8052,20 @@ static int dev_cpu_callback(struct notifier_block *nfb,
raise_softirq_irqoff(NET_TX_SOFTIRQ);
local_irq_enable();
@@ -26298,7 +26296,7 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
return NOTIFY_OK;
}
-@@ -8336,8 +8370,9 @@
+@@ -8336,8 +8370,9 @@ static int __init net_dev_init(void)
INIT_WORK(flush, flush_backlog);
@@ -26310,10 +26308,11 @@ diff -Nur linux-4.9.28.orig/net/core/dev.c linux-4.9.28/net/core/dev.c
INIT_LIST_HEAD(&sd->poll_list);
sd->output_queue_tailp = &sd->output_queue;
#ifdef CONFIG_RPS
-diff -Nur linux-4.9.28.orig/net/core/filter.c linux-4.9.28/net/core/filter.c
---- linux-4.9.28.orig/net/core/filter.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/core/filter.c 2017-05-19 03:37:25.214178037 +0200
-@@ -1645,7 +1645,7 @@
+diff --git a/net/core/filter.c b/net/core/filter.c
+index b391209838ef..b86e9681a88e 100644
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -1645,7 +1645,7 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
{
int ret;
@@ -26322,7 +26321,7 @@ diff -Nur linux-4.9.28.orig/net/core/filter.c linux-4.9.28/net/core/filter.c
net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");
kfree_skb(skb);
return -ENETDOWN;
-@@ -1653,9 +1653,9 @@
+@@ -1653,9 +1653,9 @@ static inline int __bpf_tx_skb(struct net_device *dev, struct sk_buff *skb)
skb->dev = dev;
@@ -26334,10 +26333,11 @@ diff -Nur linux-4.9.28.orig/net/core/filter.c linux-4.9.28/net/core/filter.c
return ret;
}
-diff -Nur linux-4.9.28.orig/net/core/gen_estimator.c linux-4.9.28/net/core/gen_estimator.c
---- linux-4.9.28.orig/net/core/gen_estimator.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/core/gen_estimator.c 2017-05-19 03:37:25.214178037 +0200
-@@ -84,7 +84,7 @@
+diff --git a/net/core/gen_estimator.c b/net/core/gen_estimator.c
+index cad8e791f28e..2a9364fe62a5 100644
+--- a/net/core/gen_estimator.c
++++ b/net/core/gen_estimator.c
+@@ -84,7 +84,7 @@ struct gen_estimator
struct gnet_stats_basic_packed *bstats;
struct gnet_stats_rate_est64 *rate_est;
spinlock_t *stats_lock;
@@ -26346,7 +26346,7 @@ diff -Nur linux-4.9.28.orig/net/core/gen_estimator.c linux-4.9.28/net/core/gen_e
int ewma_log;
u32 last_packets;
unsigned long avpps;
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ int gen_new_estimator(struct gnet_stats_basic_packed *bstats,
struct gnet_stats_basic_cpu __percpu *cpu_bstats,
struct gnet_stats_rate_est64 *rate_est,
spinlock_t *stats_lock,
@@ -26355,7 +26355,7 @@ diff -Nur linux-4.9.28.orig/net/core/gen_estimator.c linux-4.9.28/net/core/gen_e
struct nlattr *opt)
{
struct gen_estimator *est;
-@@ -309,7 +309,7 @@
+@@ -309,7 +309,7 @@ int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
struct gnet_stats_basic_cpu __percpu *cpu_bstats,
struct gnet_stats_rate_est64 *rate_est,
spinlock_t *stats_lock,
@@ -26364,10 +26364,11 @@ diff -Nur linux-4.9.28.orig/net/core/gen_estimator.c linux-4.9.28/net/core/gen_e
{
gen_kill_estimator(bstats, rate_est);
return gen_new_estimator(bstats, cpu_bstats, rate_est, stats_lock, running, opt);
-diff -Nur linux-4.9.28.orig/net/core/gen_stats.c linux-4.9.28/net/core/gen_stats.c
---- linux-4.9.28.orig/net/core/gen_stats.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/core/gen_stats.c 2017-05-19 03:37:25.214178037 +0200
-@@ -130,7 +130,7 @@
+diff --git a/net/core/gen_stats.c b/net/core/gen_stats.c
+index 508e051304fb..bc3b17b78c94 100644
+--- a/net/core/gen_stats.c
++++ b/net/core/gen_stats.c
+@@ -130,7 +130,7 @@ __gnet_stats_copy_basic_cpu(struct gnet_stats_basic_packed *bstats,
}
void
@@ -26376,7 +26377,7 @@ diff -Nur linux-4.9.28.orig/net/core/gen_stats.c linux-4.9.28/net/core/gen_stats
struct gnet_stats_basic_packed *bstats,
struct gnet_stats_basic_cpu __percpu *cpu,
struct gnet_stats_basic_packed *b)
-@@ -143,10 +143,10 @@
+@@ -143,10 +143,10 @@ __gnet_stats_copy_basic(const seqcount_t *running,
}
do {
if (running)
@@ -26389,7 +26390,7 @@ diff -Nur linux-4.9.28.orig/net/core/gen_stats.c linux-4.9.28/net/core/gen_stats
}
EXPORT_SYMBOL(__gnet_stats_copy_basic);
-@@ -164,7 +164,7 @@
+@@ -164,7 +164,7 @@ EXPORT_SYMBOL(__gnet_stats_copy_basic);
* if the room in the socket buffer was not sufficient.
*/
int
@@ -26398,9 +26399,10 @@ diff -Nur linux-4.9.28.orig/net/core/gen_stats.c linux-4.9.28/net/core/gen_stats
struct gnet_dump *d,
struct gnet_stats_basic_cpu __percpu *cpu,
struct gnet_stats_basic_packed *b)
-diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
---- linux-4.9.28.orig/net/core/skbuff.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/core/skbuff.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/core/skbuff.c b/net/core/skbuff.c
+index fe008f1bd930..9fa6bea3dd3f 100644
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
@@ -64,6 +64,7 @@
#include <linux/errqueue.h>
#include <linux/prefetch.h>
@@ -26409,7 +26411,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
#include <net/protocol.h>
#include <net/dst.h>
-@@ -360,6 +361,8 @@
+@@ -360,6 +361,8 @@ struct napi_alloc_cache {
static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache);
static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache);
@@ -26418,7 +26420,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
{
-@@ -367,10 +370,10 @@
+@@ -367,10 +370,10 @@ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
unsigned long flags;
void *data;
@@ -26431,7 +26433,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
return data;
}
-@@ -389,9 +392,13 @@
+@@ -389,9 +392,13 @@ EXPORT_SYMBOL(netdev_alloc_frag);
static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
{
@@ -26447,7 +26449,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
}
void *napi_alloc_frag(unsigned int fragsz)
-@@ -438,13 +445,13 @@
+@@ -438,13 +445,13 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len,
if (sk_memalloc_socks())
gfp_mask |= __GFP_MEMALLOC;
@@ -26463,7 +26465,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
if (unlikely(!data))
return NULL;
-@@ -485,9 +492,10 @@
+@@ -485,9 +492,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
gfp_t gfp_mask)
{
@@ -26475,7 +26477,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
len += NET_SKB_PAD + NET_IP_ALIGN;
-@@ -505,7 +513,10 @@
+@@ -505,7 +513,10 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
if (sk_memalloc_socks())
gfp_mask |= __GFP_MEMALLOC;
@@ -26486,7 +26488,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
if (unlikely(!data))
return NULL;
-@@ -516,7 +527,7 @@
+@@ -516,7 +527,7 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
}
/* use OR instead of assignment to avoid clearing of bits in mask */
@@ -26495,7 +26497,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
skb->pfmemalloc = 1;
skb->head_frag = 1;
-@@ -760,23 +771,26 @@
+@@ -760,23 +771,26 @@ EXPORT_SYMBOL(consume_skb);
void __kfree_skb_flush(void)
{
@@ -26524,7 +26526,7 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
/* record skb to CPU local list */
nc->skb_cache[nc->skb_count++] = skb;
-@@ -791,6 +805,7 @@
+@@ -791,6 +805,7 @@ static inline void _kfree_skb_defer(struct sk_buff *skb)
nc->skb_cache);
nc->skb_count = 0;
}
@@ -26532,10 +26534,11 @@ diff -Nur linux-4.9.28.orig/net/core/skbuff.c linux-4.9.28/net/core/skbuff.c
}
void __kfree_skb_defer(struct sk_buff *skb)
{
-diff -Nur linux-4.9.28.orig/net/core/sock.c linux-4.9.28/net/core/sock.c
---- linux-4.9.28.orig/net/core/sock.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/core/sock.c 2017-05-19 03:37:25.218178191 +0200
-@@ -2499,12 +2499,11 @@
+diff --git a/net/core/sock.c b/net/core/sock.c
+index 470a2043b846..2b09a5a33d8d 100644
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2499,12 +2499,11 @@ void lock_sock_nested(struct sock *sk, int subclass)
if (sk->sk_lock.owned)
__lock_sock(sk);
sk->sk_lock.owned = 1;
@@ -26549,9 +26552,10 @@ diff -Nur linux-4.9.28.orig/net/core/sock.c linux-4.9.28/net/core/sock.c
}
EXPORT_SYMBOL(lock_sock_nested);
-diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
---- linux-4.9.28.orig/net/ipv4/icmp.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/ipv4/icmp.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
+index 48734ee6293f..e6864ff11352 100644
+--- a/net/ipv4/icmp.c
++++ b/net/ipv4/icmp.c
@@ -69,6 +69,7 @@
#include <linux/jiffies.h>
#include <linux/kernel.h>
@@ -26568,7 +26572,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
#include <net/snmp.h>
#include <net/ip.h>
#include <net/route.h>
-@@ -204,6 +206,8 @@
+@@ -204,6 +206,8 @@ static const struct icmp_control icmp_pointers[NR_ICMP_TYPES+1];
*
* On SMP we have one ICMP socket per-cpu.
*/
@@ -26577,7 +26581,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
static struct sock *icmp_sk(struct net *net)
{
return *this_cpu_ptr(net->ipv4.icmp_sk);
-@@ -215,12 +219,14 @@
+@@ -215,12 +219,14 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
local_bh_disable();
@@ -26592,7 +26596,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
local_bh_enable();
return NULL;
}
-@@ -230,6 +236,7 @@
+@@ -230,6 +236,7 @@ static inline struct sock *icmp_xmit_lock(struct net *net)
static inline void icmp_xmit_unlock(struct sock *sk)
{
spin_unlock_bh(&sk->sk_lock.slock);
@@ -26600,7 +26604,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
}
int sysctl_icmp_msgs_per_sec __read_mostly = 1000;
-@@ -358,6 +365,7 @@
+@@ -358,6 +365,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
struct sock *sk;
struct sk_buff *skb;
@@ -26608,7 +26612,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
sk = icmp_sk(dev_net((*rt)->dst.dev));
if (ip_append_data(sk, fl4, icmp_glue_bits, icmp_param,
icmp_param->data_len+icmp_param->head_len,
-@@ -380,6 +388,7 @@
+@@ -380,6 +388,7 @@ static void icmp_push_reply(struct icmp_bxm *icmp_param,
skb->ip_summed = CHECKSUM_NONE;
ip_push_pending_frames(sk, fl4);
}
@@ -26616,7 +26620,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
}
/*
-@@ -891,6 +900,30 @@
+@@ -891,6 +900,30 @@ static bool icmp_redirect(struct sk_buff *skb)
}
/*
@@ -26647,7 +26651,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
* Handle ICMP_ECHO ("ping") requests.
*
* RFC 1122: 3.2.2.6 MUST have an echo server that answers ICMP echo
-@@ -917,6 +950,11 @@
+@@ -917,6 +950,11 @@ static bool icmp_echo(struct sk_buff *skb)
icmp_param.data_len = skb->len;
icmp_param.head_len = sizeof(struct icmphdr);
icmp_reply(&icmp_param, skb);
@@ -26659,10 +26663,11 @@ diff -Nur linux-4.9.28.orig/net/ipv4/icmp.c linux-4.9.28/net/ipv4/icmp.c
}
/* should there be an ICMP stat for ignored echos? */
return true;
-diff -Nur linux-4.9.28.orig/net/ipv4/sysctl_net_ipv4.c linux-4.9.28/net/ipv4/sysctl_net_ipv4.c
---- linux-4.9.28.orig/net/ipv4/sysctl_net_ipv4.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/ipv4/sysctl_net_ipv4.c 2017-05-19 03:37:25.218178191 +0200
-@@ -681,6 +681,13 @@
+diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c
+index 80bc36b25de2..215b90adfb05 100644
+--- a/net/ipv4/sysctl_net_ipv4.c
++++ b/net/ipv4/sysctl_net_ipv4.c
+@@ -681,6 +681,13 @@ static struct ctl_table ipv4_net_table[] = {
.proc_handler = proc_dointvec
},
{
@@ -26676,9 +26681,10 @@ diff -Nur linux-4.9.28.orig/net/ipv4/sysctl_net_ipv4.c linux-4.9.28/net/ipv4/sys
.procname = "icmp_ignore_bogus_error_responses",
.data = &init_net.ipv4.sysctl_icmp_ignore_bogus_error_responses,
.maxlen = sizeof(int),
-diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
---- linux-4.9.28.orig/net/ipv4/tcp_ipv4.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/ipv4/tcp_ipv4.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
+index 6988566dc72f..672fffcde28c 100644
+--- a/net/ipv4/tcp_ipv4.c
++++ b/net/ipv4/tcp_ipv4.c
@@ -62,6 +62,7 @@
#include <linux/init.h>
#include <linux/times.h>
@@ -26687,7 +26693,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
#include <net/net_namespace.h>
#include <net/icmp.h>
-@@ -568,6 +569,7 @@
+@@ -568,6 +569,7 @@ void tcp_v4_send_check(struct sock *sk, struct sk_buff *skb)
}
EXPORT_SYMBOL(tcp_v4_send_check);
@@ -26695,7 +26701,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
/*
* This routine will send an RST to the other tcp.
*
-@@ -695,6 +697,8 @@
+@@ -695,6 +697,8 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
offsetof(struct inet_timewait_sock, tw_bound_dev_if));
arg.tos = ip_hdr(skb)->tos;
@@ -26704,7 +26710,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
local_bh_disable();
ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
skb, &TCP_SKB_CB(skb)->header.h4.opt,
-@@ -704,6 +708,7 @@
+@@ -704,6 +708,7 @@ static void tcp_v4_send_reset(const struct sock *sk, struct sk_buff *skb)
__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
__TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
local_bh_enable();
@@ -26712,7 +26718,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
#ifdef CONFIG_TCP_MD5SIG
out:
-@@ -779,6 +784,7 @@
+@@ -779,6 +784,7 @@ static void tcp_v4_send_ack(struct net *net,
if (oif)
arg.bound_dev_if = oif;
arg.tos = tos;
@@ -26720,7 +26726,7 @@ diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
local_bh_disable();
ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
skb, &TCP_SKB_CB(skb)->header.h4.opt,
-@@ -787,6 +793,7 @@
+@@ -787,6 +793,7 @@ static void tcp_v4_send_ack(struct net *net,
__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
local_bh_enable();
@@ -26728,10 +26734,11 @@ diff -Nur linux-4.9.28.orig/net/ipv4/tcp_ipv4.c linux-4.9.28/net/ipv4/tcp_ipv4.c
}
static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
-diff -Nur linux-4.9.28.orig/net/mac80211/rx.c linux-4.9.28/net/mac80211/rx.c
---- linux-4.9.28.orig/net/mac80211/rx.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/mac80211/rx.c 2017-05-19 03:37:25.218178191 +0200
-@@ -4230,7 +4230,7 @@
+diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
+index acaaf616da71..09020dbcc089 100644
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -4230,7 +4230,7 @@ void ieee80211_rx_napi(struct ieee80211_hw *hw, struct ieee80211_sta *pubsta,
struct ieee80211_supported_band *sband;
struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
@@ -26740,9 +26747,10 @@ diff -Nur linux-4.9.28.orig/net/mac80211/rx.c linux-4.9.28/net/mac80211/rx.c
if (WARN_ON(status->band >= NUM_NL80211_BANDS))
goto drop;
-diff -Nur linux-4.9.28.orig/net/netfilter/core.c linux-4.9.28/net/netfilter/core.c
---- linux-4.9.28.orig/net/netfilter/core.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/netfilter/core.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/netfilter/core.c b/net/netfilter/core.c
+index 004af030ef1a..b64f751bda45 100644
+--- a/net/netfilter/core.c
++++ b/net/netfilter/core.c
@@ -22,12 +22,18 @@
#include <linux/proc_fs.h>
#include <linux/mutex.h>
@@ -26762,9 +26770,10 @@ diff -Nur linux-4.9.28.orig/net/netfilter/core.c linux-4.9.28/net/netfilter/core
static DEFINE_MUTEX(afinfo_mutex);
const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
-diff -Nur linux-4.9.28.orig/net/packet/af_packet.c linux-4.9.28/net/packet/af_packet.c
---- linux-4.9.28.orig/net/packet/af_packet.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/packet/af_packet.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
+index cb76ff3088e9..3f42c5b1af55 100644
+--- a/net/packet/af_packet.c
++++ b/net/packet/af_packet.c
@@ -63,6 +63,7 @@
#include <linux/if_packet.h>
#include <linux/wireless.h>
@@ -26773,7 +26782,7 @@ diff -Nur linux-4.9.28.orig/net/packet/af_packet.c linux-4.9.28/net/packet/af_pa
#include <linux/kmod.h>
#include <linux/slab.h>
#include <linux/vmalloc.h>
-@@ -694,7 +695,7 @@
+@@ -694,7 +695,7 @@ static void prb_retire_rx_blk_timer_expired(unsigned long data)
if (BLOCK_NUM_PKTS(pbd)) {
while (atomic_read(&pkc->blk_fill_in_prog)) {
/* Waiting for skb_copy_bits to finish... */
@@ -26782,7 +26791,7 @@ diff -Nur linux-4.9.28.orig/net/packet/af_packet.c linux-4.9.28/net/packet/af_pa
}
}
-@@ -956,7 +957,7 @@
+@@ -956,7 +957,7 @@ static void prb_retire_current_block(struct tpacket_kbdq_core *pkc,
if (!(status & TP_STATUS_BLK_TMO)) {
while (atomic_read(&pkc->blk_fill_in_prog)) {
/* Waiting for skb_copy_bits to finish... */
@@ -26791,9 +26800,10 @@ diff -Nur linux-4.9.28.orig/net/packet/af_packet.c linux-4.9.28/net/packet/af_pa
}
}
prb_close_block(pkc, pbd, po, status);
-diff -Nur linux-4.9.28.orig/net/rds/ib_rdma.c linux-4.9.28/net/rds/ib_rdma.c
---- linux-4.9.28.orig/net/rds/ib_rdma.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/rds/ib_rdma.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/rds/ib_rdma.c b/net/rds/ib_rdma.c
+index 977f69886c00..f3e7a36b0396 100644
+--- a/net/rds/ib_rdma.c
++++ b/net/rds/ib_rdma.c
@@ -34,6 +34,7 @@
#include <linux/slab.h>
#include <linux/rculist.h>
@@ -26802,7 +26812,7 @@ diff -Nur linux-4.9.28.orig/net/rds/ib_rdma.c linux-4.9.28/net/rds/ib_rdma.c
#include "rds_single_path.h"
#include "ib_mr.h"
-@@ -210,7 +211,7 @@
+@@ -210,7 +211,7 @@ static inline void wait_clean_list_grace(void)
for_each_online_cpu(cpu) {
flag = &per_cpu(clean_list_grace, cpu);
while (test_bit(CLEAN_LIST_BUSY_BIT, flag))
@@ -26811,9 +26821,10 @@ diff -Nur linux-4.9.28.orig/net/rds/ib_rdma.c linux-4.9.28/net/rds/ib_rdma.c
}
}
-diff -Nur linux-4.9.28.orig/net/rxrpc/security.c linux-4.9.28/net/rxrpc/security.c
---- linux-4.9.28.orig/net/rxrpc/security.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/rxrpc/security.c 2017-05-19 03:37:25.218178191 +0200
+diff --git a/net/rxrpc/security.c b/net/rxrpc/security.c
+index 7d921e56e715..13df56a738e5 100644
+--- a/net/rxrpc/security.c
++++ b/net/rxrpc/security.c
@@ -19,9 +19,6 @@
#include <keys/rxrpc-type.h>
#include "ar-internal.h"
@@ -26824,10 +26835,11 @@ diff -Nur linux-4.9.28.orig/net/rxrpc/security.c linux-4.9.28/net/rxrpc/security
static const struct rxrpc_security *rxrpc_security_types[] = {
[RXRPC_SECURITY_NONE] = &rxrpc_no_security,
#ifdef CONFIG_RXKAD
-diff -Nur linux-4.9.28.orig/net/sched/sch_api.c linux-4.9.28/net/sched/sch_api.c
---- linux-4.9.28.orig/net/sched/sch_api.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/sched/sch_api.c 2017-05-19 03:37:25.218178191 +0200
-@@ -981,7 +981,7 @@
+diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c
+index 206dc24add3a..00ea9bde5bb3 100644
+--- a/net/sched/sch_api.c
++++ b/net/sched/sch_api.c
+@@ -981,7 +981,7 @@ static struct Qdisc *qdisc_create(struct net_device *dev,
rcu_assign_pointer(sch->stab, stab);
}
if (tca[TCA_RATE]) {
@@ -26836,10 +26848,11 @@ diff -Nur linux-4.9.28.orig/net/sched/sch_api.c linux-4.9.28/net/sched/sch_api.c
err = -EOPNOTSUPP;
if (sch->flags & TCQ_F_MQROOT)
-diff -Nur linux-4.9.28.orig/net/sched/sch_generic.c linux-4.9.28/net/sched/sch_generic.c
---- linux-4.9.28.orig/net/sched/sch_generic.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/sched/sch_generic.c 2017-05-19 03:37:25.218178191 +0200
-@@ -425,7 +425,11 @@
+diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c
+index 6cfb6e9038c2..20727e1347de 100644
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -425,7 +425,11 @@ struct Qdisc noop_qdisc = {
.ops = &noop_qdisc_ops,
.q.lock = __SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
.dev_queue = &noop_netdev_queue,
@@ -26851,7 +26864,7 @@ diff -Nur linux-4.9.28.orig/net/sched/sch_generic.c linux-4.9.28/net/sched/sch_g
.busylock = __SPIN_LOCK_UNLOCKED(noop_qdisc.busylock),
};
EXPORT_SYMBOL(noop_qdisc);
-@@ -624,9 +628,17 @@
+@@ -624,9 +628,17 @@ struct Qdisc *qdisc_alloc(struct netdev_queue *dev_queue,
lockdep_set_class(&sch->busylock,
dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
@@ -26869,7 +26882,7 @@ diff -Nur linux-4.9.28.orig/net/sched/sch_generic.c linux-4.9.28/net/sched/sch_g
sch->ops = ops;
sch->enqueue = ops->enqueue;
-@@ -925,7 +937,7 @@
+@@ -925,7 +937,7 @@ void dev_deactivate_many(struct list_head *head)
/* Wait for outstanding qdisc_run calls. */
list_for_each_entry(dev, head, close_list)
while (some_qdisc_is_busy(dev))
@@ -26878,10 +26891,11 @@ diff -Nur linux-4.9.28.orig/net/sched/sch_generic.c linux-4.9.28/net/sched/sch_g
}
void dev_deactivate(struct net_device *dev)
-diff -Nur linux-4.9.28.orig/net/sunrpc/svc_xprt.c linux-4.9.28/net/sunrpc/svc_xprt.c
---- linux-4.9.28.orig/net/sunrpc/svc_xprt.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/net/sunrpc/svc_xprt.c 2017-05-19 03:37:25.218178191 +0200
-@@ -396,7 +396,7 @@
+diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
+index 9c9db55a0c1e..e6583b018a72 100644
+--- a/net/sunrpc/svc_xprt.c
++++ b/net/sunrpc/svc_xprt.c
+@@ -396,7 +396,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
goto out;
}
@@ -26890,7 +26904,7 @@ diff -Nur linux-4.9.28.orig/net/sunrpc/svc_xprt.c linux-4.9.28/net/sunrpc/svc_xp
pool = svc_pool_for_cpu(xprt->xpt_server, cpu);
atomic_long_inc(&pool->sp_stats.packets);
-@@ -432,7 +432,7 @@
+@@ -432,7 +432,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
atomic_long_inc(&pool->sp_stats.threads_woken);
wake_up_process(rqstp->rq_task);
@@ -26899,7 +26913,7 @@ diff -Nur linux-4.9.28.orig/net/sunrpc/svc_xprt.c linux-4.9.28/net/sunrpc/svc_xp
goto out;
}
rcu_read_unlock();
-@@ -453,7 +453,7 @@
+@@ -453,7 +453,7 @@ void svc_xprt_do_enqueue(struct svc_xprt *xprt)
goto redo_search;
}
rqstp = NULL;
@@ -26908,10 +26922,11 @@ diff -Nur linux-4.9.28.orig/net/sunrpc/svc_xprt.c linux-4.9.28/net/sunrpc/svc_xp
out:
trace_svc_xprt_do_enqueue(xprt, rqstp);
}
-diff -Nur linux-4.9.28.orig/scripts/mkcompile_h linux-4.9.28/scripts/mkcompile_h
---- linux-4.9.28.orig/scripts/mkcompile_h 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/scripts/mkcompile_h 2017-05-19 03:37:25.218178191 +0200
-@@ -4,7 +4,8 @@
+diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
+index 6fdc97ef6023..523e0420d7f0 100755
+--- a/scripts/mkcompile_h
++++ b/scripts/mkcompile_h
+@@ -4,7 +4,8 @@ TARGET=$1
ARCH=$2
SMP=$3
PREEMPT=$4
@@ -26921,7 +26936,7 @@ diff -Nur linux-4.9.28.orig/scripts/mkcompile_h linux-4.9.28/scripts/mkcompile_h
vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
-@@ -57,6 +58,7 @@
+@@ -57,6 +58,7 @@ UTS_VERSION="#$VERSION"
CONFIG_FLAGS=""
if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
@@ -26929,10 +26944,11 @@ diff -Nur linux-4.9.28.orig/scripts/mkcompile_h linux-4.9.28/scripts/mkcompile_h
UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
# Truncate to maximum length
-diff -Nur linux-4.9.28.orig/sound/core/pcm_native.c linux-4.9.28/sound/core/pcm_native.c
---- linux-4.9.28.orig/sound/core/pcm_native.c 2017-05-14 14:00:37.000000000 +0200
-+++ linux-4.9.28/sound/core/pcm_native.c 2017-05-19 03:37:25.222178345 +0200
-@@ -135,7 +135,7 @@
+diff --git a/sound/core/pcm_native.c b/sound/core/pcm_native.c
+index 9d33c1e85c79..3d307bda86f9 100644
+--- a/sound/core/pcm_native.c
++++ b/sound/core/pcm_native.c
+@@ -135,7 +135,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock);
void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
{
if (!substream->pcm->nonatomic)
@@ -26941,7 +26957,7 @@ diff -Nur linux-4.9.28.orig/sound/core/pcm_native.c linux-4.9.28/sound/core/pcm_
snd_pcm_stream_lock(substream);
}
EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq);
-@@ -150,7 +150,7 @@
+@@ -150,7 +150,7 @@ void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream)
{
snd_pcm_stream_unlock(substream);
if (!substream->pcm->nonatomic)
@@ -26950,7 +26966,7 @@ diff -Nur linux-4.9.28.orig/sound/core/pcm_native.c linux-4.9.28/sound/core/pcm_
}
EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq);
-@@ -158,7 +158,7 @@
+@@ -158,7 +158,7 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream)
{
unsigned long flags = 0;
if (!substream->pcm->nonatomic)
@@ -26959,7 +26975,7 @@ diff -Nur linux-4.9.28.orig/sound/core/pcm_native.c linux-4.9.28/sound/core/pcm_
snd_pcm_stream_lock(substream);
return flags;
}
-@@ -176,7 +176,7 @@
+@@ -176,7 +176,7 @@ void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,
{
snd_pcm_stream_unlock(substream);
if (!substream->pcm->nonatomic)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 21:52:24 +0000