From 0e5d447f07cce0001c2c0c10b2330d6db145b934 Mon Sep 17 00:00:00 2001
From: Tiejun Chen <tiejunc@vmware.com>
Date: Thu, 11 Jan 2018 09:19:01 -0800
Subject: [PATCH] Support Preempt-RT Linux kernel

In order to get such a preempt-rt Linux kerne, we grab -rt patch via
https://www.kernel.org/pub/linux/kernel/projects/rt/. So far we just enable it
over 4.14.x.

Signed-off-by: Tiejun Chen <tiejun.china@gmail.com>
---
 kernel/Dockerfile                             |   30 +-
 kernel/Makefile                               |  132 +-
 kernel/config-4.14.x-aarch64-rt               |   20 +
 kernel/config-4.14.x-x86_64-rt                |   22 +
 ...kdep-false-positive-boost_mtx-compla.patch |   49 +
 .../0002-brd-remove-unused-brd_mutex.patch    |   26 +
 ...c-keys-for-migrate_enable-nohz_activ.patch |  272 ++
 ...imer-Correct-blantanly-wrong-comment.patch |   36 +
 ...erneldoc-for-struct-hrtimer_cpu_base.patch |   42 +
 ...clock-argument-in-schedule_hrtimeout.patch |   80 +
 ...mer-Fix-hrtimer-function-description.patch |   60 +
 ...OSIX-compliance-relative-CLOCK_REALT.patch |   40 +
 ...07-hrtimer-Cleanup-hrtimer_mode-enum.patch |   45 +
 ...Take-all-clock-bases-and-modes-into-.patch |   55 +
 ...Print-hrtimer-mode-in-hrtimer_start-.patch |  113 +
 ...r-Switch-for-loop-to-_ffs-evaluation.patch |   84 +
 ...-running-timer-in-hrtimer_clock_base.patch |  191 +
 ...Make-room-in-struct-hrtimer_cpu_base.patch |   33 +
 ...-Reduce-conditional-code-hres_active.patch |  149 +
 ...sor-functions-instead-of-direct-acce.patch |   35 +
 ...e-remote-enqueue-check-unconditional.patch |  136 +
 ...imer_cpu_base.next_timer-handling-un.patch |   97 +
 ...ake-hrtimer_reprogramm-unconditional.patch |  186 +
 ...imer_force_reprogramm-unconditionall.patch |  105 +
 ...mer-Unify-handling-of-hrtimer-remove.patch |   88 +
 ...mer-Unify-handling-of-remote-enqueue.patch |  148 +
 ...ote-enqueue-decision-less-restrictiv.patch |   31 +
 ...base-argument-from-hrtimer_reprogram.patch |   49 +
 ...hrtimer-Split-hrtimer_start_range_ns.patch |   75 +
 ...timer-Split-__hrtimer_get_next_event.patch |   52 +
 ...save-irqrestore-around-__run_hrtimer.patch |  144 +
 ...k-bases-and-hrtimer-mode-for-soft-ir.patch |  108 +
 ...handling-of-hard-and-softirq-based-h.patch |  116 +
 ...t-support-for-softirq-based-hrtimers.patch |  498 +++
 ...ement-SOFT-HARD-clock-base-selection.patch |   55 +
 ...hrtimer_tasklet-with-softirq-based-h.patch |  315 ++
 ...eplace-hrtimer-tasklet-with-softirq-.patch |  135 +
 ...hrtimer-tasklet-with-softirq-hrtimer.patch |  132 +
 ...-0033-softirq-Remove-tasklet_hrtimer.patch |  109 +
 ...Replace-tasklet-with-softirq-hrtimer.patch |   99 +
 ...Replace-tasklet-with-softirq-hrtimer.patch |   96 +
 ...Replace-tasklet-with-softirq-hrtimer.patch |  132 +
 .../0039-at91_dont_enable_disable_clock.patch |   91 +
 ...function-called-from-invalid-context.patch |   93 +
 ...ndle-non-enqueued-waiters-gracefully.patch |   32 +
 ...tree-include-rcu.h-because-we-use-it.patch |   35 +
 ...rxrpc-remove-unused-static-variables.patch |   26 +
 ...fd-syscon-atmel-smc-include-string.h.patch |   22 +
 .../0045-sched-swait-include-wait.h.patch     |   35 +
 ...-replace-seqcount_t-with-a-seqlock_t.patch |  127 +
 ...recursive-locking-in-hci_send_to_cha.patch |   70 +
 ...aw_cpu_ptr-instead-of-get_cpu_ptr-fo.patch |   42 +
 ...udio-don-t-inclide-rwlock.h-directly.patch |   30 +
 ...9pfs-don-t-inclide-rwlock.h-directly.patch |   28 +
 ...ish-Enable-earlycon-only-if-built-in.patch |   65 +
 ...drm-i915-properly-init-lockdep-class.patch |   31 +
 ...ent-return-values-of-timerqueue_add-.patch |   39 +
 ...arc64-use-generic-rwsem-spinlocks-rt.patch |   27 +
 ...el-SRCU-provide-a-static-initializer.patch |  155 +
 ...vide-a-pointer-to-the-valid-CPU-mask.patch |  763 ++++
 .../0057-add_migrate_disable.patch            |  251 ++
 ...the-order-of-trace_types_lock-and-ev.patch |  191 +
 ...ite-trace_recursive_-un-lock-to-be-s.patch |  118 +
 ...ve-lookups-from-tracing_map-hitcount.patch |   30 +
 ...g-Increase-tracing-map-KEYS_MAX-size.patch |   28 +
 ...ake-traceprobe-parsing-code-reusable.patch |  321 ++
 ...acing-Clean-up-hist_field_flags-enum.patch |   47 +
 ...tracing-Add-hist_field_name-accessor.patch |  178 +
 .../0065-0008-tracing-Reimplement-log2.patch  |  118 +
 ...t-trigger-Documentation-to-histogram.patch | 3145 +++++++++++++++++
 ...-Add-Documentation-for-log2-modifier.patch |   27 +
 ...pport-to-detect-and-avoid-duplicates.patch |  118 +
 ...-Remove-code-which-merges-duplicates.patch |  192 +
 ...interface-for-setting-absolute-time-.patch |  132 +
 ...fine-the-unimplemented-RINGBUF_TYPE_.patch |  322 ++
 ...racing-Add-timestamp_mode-trace-file.patch |  137 +
 ...nt-triggers-access-to-ring_buffer_ev.patch |  302 ++
 ...-buffer-event-param-to-hist-field-fu.patch |  143 +
 ...-out-hist-trigger-assignment-parsing.patch |  112 +
 ...g-Add-hist-trigger-timestamp-support.patch |  246 ++
 ...element-variable-support-to-tracing_.patch |  224 ++
 ...g-Add-hist_data-member-to-hist_field.patch |   82 +
 ...s-modifier-for-hist-trigger-timestam.patch |  157 +
 ...dd-variable-support-to-hist-triggers.patch |  782 ++++
 ...for-variables-in-named-trigger-compa.patch |   45 +
 ...25-tracing-Move-get_hist_field_flags.patch |   77 +
 ...le-expression-support-to-hist-trigge.patch |  627 ++++
 ...ralize-per-element-hist-trigger-data.patch |  158 +
 ...cing_map_elt-to-hist_field-accessor-.patch |  225 ++
 ...29-tracing-Add-hist_field-type-field.patch |  117 +
 ...able-reference-handling-to-hist-trig.patch |  955 +++++
 ...tracing-Add-hist-trigger-action-hook.patch |  215 ++
 ...ing-Add-support-for-synthetic-events.patch | 1041 ++++++
 ...cing-Add-support-for-field-variables.patch |  666 ++++
 ...-onmatch-hist-trigger-action-support.patch |  687 ++++
 ...dd-onmax-hist-trigger-action-support.patch |  486 +++
 ...itespace-to-surround-hist-trigger-fi.patch |   75 +
 ...cing-Add-cpu-field-for-hist-triggers.patch |  114 +
 ...-trigger-support-for-variable-refere.patch |  164 +
 ...-error-error-facility-for-hist-trigg.patch |  502 +++
 ...ter-event-hist-trigger-Documentation.patch |  405 +++
 ...ng-Make-tracing_set_clock-non-static.patch |   43 +
 ...-a-clock-attribute-for-hist-triggers.patch |  137 +
 ...g-back-context-level-recursive-check.patch |  127 +
 ...duplicate-results-in-mapping-context.patch |   36 +
 ...nesting-for-adding-events-within-eve.patch |  119 +
 ...ring-buffer-nesting-to-allow-synthet.patch |   54 +
 ...r-event-blurb-to-HIST_TRIGGERS-confi.patch |   33 +
 ...-Add-inter-event-hist-triggers-testc.patch |  442 +++
 ...k-shorten-interrupt-disabled-regions.patch |   96 +
 .../0107-timekeeping-split-jiffies-lock.patch |  156 +
 ...-for-preempt-off-in-preempt_schedule.patch |   46 +
 ...9-signal-revert-ptrace-preempt-magic.patch |   31 +
 .../0110-arm-convert-boot-lock-to-raw.patch   |  407 +++
 ...probe-replace-patch_lock-to-raw-lock.patch |   69 +
 .../0112-posix-timers-no-broadcast.patch      |   33 +
 ...t-tasks-to-cache-one-sigqueue-struct.patch |  199 ++
 ...andom-reduce-preempt-disabled-region.patch |   32 +
 ...ove-irq-handler-when-clock-is-unused.patch |  144 +
 ...ers-timer-atmel-pit-fix-double-free_.patch |   45 +
 ...source-tclib-allow-higher-clockrates.patch |  157 +
 ...-drivers-net-8139-disable-irq-nosync.patch |   25 +
 ...-suspend-prevernt-might-sleep-splats.patch |  106 +
 .../0120-net-prevent-abba-deadlock.patch      |  111 +
 ...activate_many-use-msleep-1-instead-o.patch |   57 +
 .../0122-net_disable_NET_RX_BUSY_POLL.patch   |   28 +
 .../0123-x86-io-apic-migra-no-unmask.patch    |   27 +
 ...124-rcu-segcblist-include-rcupdate.h.patch |   22 +
 .../patches-4.14.x-rt/0125-printk-kill.patch  |  163 +
 ...27-boot-param-to-help-with-debugging.patch |   31 +
 .../0127-rt-preempt-base-config.patch         |   53 +
 ...128-kconfig-disable-a-few-options-rt.patch |   33 +
 .../0129-kconfig-preempt-rt-full.patch        |   58 +
 .../0130-bug-rt-dependend-variants.patch      |   36 +
 .../0131-iommu-amd--Use-WARN_ON_NORT.patch    |   46 +
 ...0132-local-irq-rt-depending-variants.patch |   52 +
 .../0133-preempt-nort-rt-variants.patch       |   47 +
 ...-migrate_disable-enable-in-different.patch |   58 +
 .../0135-rt-local-irq-lock.patch              |  330 ++
 ...136-ata-disable-interrupts-if-non-rt.patch |   28 +
 ...0137-ide-use-nort-local-irq-variants.patch |  169 +
 ...-infiniband-mellanox-ib-use-nort-irq.patch |   40 +
 ...139-inpt-gameport-use-local-irq-nort.patch |   60 +
 .../0140-user-use-local-irq-nort.patch        |   29 +
 .../0141-usb-use-_nort-in-giveback.patch      |   57 +
 ...-scatterlist-dont-disable-irqs-on-RT.patch |   23 +
 ...-not-protect-workingset_shadow_nodes.patch |  183 +
 .../0144-signal-fix-up-rcu-wreckage.patch     |   38 +
 .../0145-oleg-signal-rt-fix.patch             |  142 +
 ...ignal-delay-calling-signals-on-32bit.patch |   42 +
 .../0147-net-wireless-warn-nort.patch         |   23 +
 ...8-fs-replace-bh_uptodate_lock-for-rt.patch |  207 ++
 .../0149-fs-jbd-replace-bh_state-lock.patch   |   96 +
 ..._bl.h-make-list-head-locking-RT-safe.patch |  114 +
 ...-list_bl-fixup-bogus-lockdep-warning.patch |   97 +
 .../0152-genirq-disable-irqpoll-on-rt.patch   |   37 +
 .../0153-genirq-force-threading.patch         |   48 +
 ...rivers-net-vortex-fix-locking-issues.patch |   48 +
 .../0155-delayacct-use-raw_spinlocks.patch    |   86 +
 ...page_alloc-rt-friendly-per-cpu-pages.patch |  214 ++
 ...e_alloc-reduce-lock-sections-further.patch |  197 ++
 ...158-mm-convert-swap-to-percpu-locked.patch |  191 +
 ...m-perform-lru_add_drain_all-remotely.patch |  102 +
 .../0160-mm-make-vmstat-rt-aware.patch        |  136 +
 ...l-arm-coredump-fails-for-cpu-3e-3d-4.patch |   68 +
 .../0162-mm-bounce-local-irq-save-nort.patch  |   27 +
 .../0163-mm-disable-sloub-rt.patch            |   31 +
 .../0164-mm-enable-slub.patch                 |  473 +++
 ...ssible-memory-leak-in-kmem_cache_all.patch |   25 +
 .../0166-slub-enable-irqs-for-no-wait.patch   |   47 +
 .../0167-slub-disable-SLUB_CPU_PARTIAL.patch  |   47 +
 ...e-alloc-use-local-lock-on-target-cpu.patch |   27 +
 ...n-t-call-schedule_work_on-in-preempt.patch |   68 +
 ...170-mm-memcontrol-do_not_disable_irq.patch |  116 +
 ...on-t-disable-IRQs-in-wb_congested_pu.patch |   41 +
 ...oc_copy_with_get_cpu_var_and_locking.patch |  196 +
 .../0173-radix-tree-use-local-locks.patch     |  165 +
 .../0174-panic-disable-random-on-rt.patch     |   26 +
 ...5-timers-prepare-for-full-preemption.patch |  166 +
 ...-waking-softirqs-from-the-jiffy-tick.patch |   75 +
 ...vent-erroneous-tick-stop-invocations.patch |   53 +
 ...178-x86-kvm-require-const-tsc-for-rt.patch |   30 +
 .../0179-wait.h-include-atomic.h.patch        |   32 +
 ...mple-Simple-work-queue-implemenation.patch |  231 ++
 ...81-completion-use-simple-wait-queues.patch |  352 ++
 .../0182-fs-aio-simple-simple-work.patch      |  106 +
 ...voke-the-affinity-callback-via-a-wor.patch |  121 +
 ...id-schedule_work-with-interrupts-dis.patch |   52 +
 ...ate-hrtimer_init-hrtimer_init_sleepe.patch |  246 ++
 ...186-hrtimers-prepare-full-preemption.patch |  212 ++
 ...-by-default-into-the-softirq-context.patch |  212 ++
 ...-schedule_work-call-to-helper-thread.patch |   91 +
 .../0189-timer-fd-avoid-live-lock.patch       |   30 +
 ...timers-thread-posix-cpu-timers-on-rt.patch |  274 ++
 .../0191-sched-delay-put-task.patch           |   85 +
 .../0192-sched-limit-nr-migrate.patch         |   26 +
 .../0193-sched-mmdrop-delayed.patch           |  127 +
 ...e-stack-kprobe-clean-up-to-__put_tas.patch |   60 +
 .../0195-sched-rt-mutex-wakeup.patch          |   94 +
 ...sk-state-corruption-by-spurious-lock.patch |   77 +
 .../0197-sched-Remove-TASK_ALL.patch          |   29 +
 ...might-sleep-do-not-account-rcu-depth.patch |   47 +
 .../0199-cond-resched-softirq-rt.patch        |   52 +
 .../0200-cond-resched-lock-rt-tweak.patch     |   26 +
 .../0201-sched-disable-ttwu-queue.patch       |   31 +
 ...2-sched-disable-rt-group-sched-on-rt.patch |   28 +
 ...twu-ensure-success-return-is-correct.patch |   34 +
 ...Only-wake-up-idle-workers-if-not-blo.patch |   37 +
 ...ease-the-nr-of-migratory-tasks-when-.patch |  154 +
 ...nvert-stop_machine_run-to-PREEMPT_RT.patch |   34 +
 .../0207-stop-machine-raw-lock.patch          |  115 +
 .../0208-hotplug-light-get-online-cpus.patch  |   90 +
 .../0209-ftrace-migrate-disable-tracing.patch |   73 +
 ...-lockdep-no-softirq-accounting-on-rt.patch |   74 +
 .../0211-lockdep-disable-self-test.patch      |   28 +
 .../0212-mutex-no-spin-on-rt.patch            |   28 +
 ...-from-going-into-infinite-spin-in-rt.patch |  391 ++
 .../0214-softirq-preempt-fix-3-re.patch       |  168 +
 ...oftirq-disable-softirq-stacks-for-rt.patch |  156 +
 .../0216-softirq-split-locks.patch            |  832 +++++
 ...7-kernel-softirq-unlock-with-irqs-on.patch |   27 +
 ...irq-processing-in-irq-thread-context.patch |  146 +
 ...plit-timer-softirqs-out-of-ksoftirqd.patch |  207 ++
 ...irq-wake-the-timer-softirq-if-needed.patch |   79 +
 .../0221-rtmutex-trylock-is-okay-on-RT.patch  |   27 +
 ...-nfs-turn-rmdir_sem-into-a-semaphore.patch |  138 +
 .../0223-rtmutex-futex-prepare-rt.patch       |  244 ++
 .../0224-futex-requeue-pi-fix.patch           |  113 +
 ...mutex-don-t-drop-the-wait_lock-twice.patch |   29 +
 ...k-unlock-symetry-versus-pi_lock-and-.patch |   42 +
 .../0227-pid.h-include-atomic.h.patch         |   36 +
 ...arm-include-definition-for-cpumask_t.patch |   24 +
 ...ure-Do-NOT-include-rwlock.h-directly.patch |   26 +
 .../0230-rtmutex-lock-killable.patch          |   51 +
 ...0231-rtmutex-Make-lock_killable-work.patch |   44 +
 .../0232-spinlock-types-separate-raw.patch    |  210 ++
 .../0233-rtmutex-avoid-include-hell.patch     |   23 +
 .../0234-rtmutex_dont_include_rcu.patch       |  158 +
 ...tex-Provide-rt_mutex_slowlock_locked.patch |  131 +
 ...ockdep-less-version-of-rt_mutex-s-lo.patch |  150 +
 ...tex-add-sleeping-lock-implementation.patch | 1196 +++++++
 ...utex-implementation-based-on-rtmutex.patch |  372 ++
 ...wsem-implementation-based-on-rtmutex.patch |  391 ++
 ...lock-implementation-based-on-rtmutex.patch |  568 +++
 .../0241-rtmutex-wire-up-RT-s-locking.patch   |  248 ++
 ...utex-add-ww_mutex-addon-for-mutex-rt.patch |  422 +++
 ...-fix-deadlock-in-device-mapper-block.patch |   73 +
 ...re-init-the-wait_lock-in-rt_mutex_in.patch |   32 +
 ...ace-fix-ptrace-vs-tasklist_lock-race.patch |  155 +
 ...kip-that-warning-but-only-on-sleepin.patch |   35 +
 ...eck-for-__LINUX_SPINLOCK_TYPES_H-on-.patch |  227 ++
 .../0248-peter_zijlstra-frob-rcu.patch        |  166 +
 ...merge-rcu-bh-into-rcu-preempt-for-rt.patch |  357 ++
 ...ce-rcu-bh-qs-where-safe-from-softirq.patch |  108 +
 ...s-disable-irq-while-calling-rcu_pree.patch |   48 +
 .../0252-drivers-tty-fix-omap-lock-crap.patch |   42 +
 ...rivers-tty-pl011-irq-disable-madness.patch |   47 +
 .../0254-rt-serial-warn-fix.patch             |   37 +
 ...0-don-t-take-the-trylock-during-oops.patch |   28 +
 .../0256-peterz-percpu-rwsem-rt.patch         |  218 ++
 .../0257-fs-namespace-preemption-fix.patch    |   30 +
 .../0258-mm-protect-activate-switch-mm.patch  |   71 +
 .../0259-fs-block-rt-support.patch            |   22 +
 ...260-fs-ntfs-disable-interrupt-non-rt.patch |   75 +
 ...ull-your-plug-when-waiting-for-space.patch |   31 +
 ...ull-your-plug-when-waiting-for-space.patch |   25 +
 ...-back-explicit-INIT_HLIST_BL_HEAD-in.patch |   51 +
 ...e-preemption-on-i_dir_seq-s-write-si.patch |  118 +
 .../0265-x86-mce-timer-hrtimer.patch          |  167 +
 ...-mce-use-swait-queue-for-mce-wakeups.patch |  125 +
 .../0267-x86-stackprot-no-random-on-rt.patch  |   45 +
 .../0268-x86-use-gen-rwsem-spinlocks-rt.patch |   28 +
 .../0269-x86-UV-raw_spinlock-conversion.patch |  219 ++
 ...rmal-Defer-thermal-wakups-to-threads.patch |  129 +
 .../0271-epoll-use-get-cpu-light.patch        |   30 +
 .../0272-mm-vmalloc-use-get-cpu-light.patch   |   65 +
 .../0273-block-mq-use-cpu_light.patch         |   29 +
 .../0274-block-mq-drop-preempt-disable.patch  |   51 +
 ...k-mq-don-t-complete-requests-via-IPI.patch |  106 +
 ...76-md-raid5-percpu-handling-rt-aware.patch |   69 +
 ...7-md-raid5-do-not-disable-interrupts.patch |   54 +
 .../0278-rt-introduce-cpu-chill.patch         |  128 +
 ...-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch |  102 +
 .../0280-block-blk-mq-use-swait.patch         |  122 +
 .../0281-block-use-cpu-chill.patch            |   45 +
 ...cache-use-cpu-chill-in-trylock-loops.patch |  107 +
 .../0283-net-use-cpu-chill.patch              |   62 +
 ...use-swait_queue-instead-of-waitqueue.patch |  214 ++
 .../0285-workqueue-use-rcu.patch              |  353 ++
 .../0286-workqueue-use-locallock.patch        |  158 +
 ...rk-around-irqsafe-timer-optimization.patch |  132 +
 ...288-workqueue-distangle-from-rq-lock.patch |  272 ++
 .../0289-percpu_ida-use-locklocks.patch       |  101 +
 .../0290-debugobjects-rt.patch                |   25 +
 .../0291-jump-label-rt.patch                  |   35 +
 .../0292-seqlock-prevent-rt-starvation.patch  |  187 +
 ...vc_xprt_do_enqueue-use-get_cpu_light.patch |   62 +
 .../0294-skbufhead-raw-lock.patch             |  157 +
 ...tplug-drain-input_pkt_queue-lockless.patch |   46 +
 ...recursion-to-per-task-variable-on-RT.patch |  150 +
 ...y-to-delegate-processing-a-softirq-t.patch |   78 +
 ...ake-qdisc-s-busylock-in-__dev_xmit_s.patch |   34 +
 ...Qdisc-use-a-seqlock-instead-seqcount.patch |  272 ++
 ...-missing-serialization-in-ip_send_un.patch |   92 +
 ...he-tcp_sk_lock-lock-with-BH-disabled.patch |   67 +
 .../0302-net-add-a-lock-around-icmp_sk.patch  |   65 +
 .../0303-net-use-trylock-in-icmp_sk.patch     |   73 +
 ...schedule_irqoff-disable-interrupts-o.patch |   68 +
 ...-push_most_work_into_softirq_context.patch |  184 +
 ...rk-Move-irq-safe-work-to-irq-context.patch |   77 +
 ...pcm_stream_lock-irqs_disabled-splats.patch |   69 +
 .../0308-printk-rt-aware.patch                |   70 +
 ...n-t-try-to-print-from-IRQ-NMI-region.patch |   41 +
 ...intk-drop-the-logbuf_lock-more-often.patch |   76 +
 .../0311-power-use-generic-rwsem-on-rt.patch  |   26 +
 ...ble-in-kernel-MPIC-emulation-for-PRE.patch |   37 +
 ...ce-init.c-adapt-to-completions-using.patch |   31 +
 ...-tclib-default-to-tclib-timer-for-rt.patch |   32 +
 .../0315-arm-unwind-use_raw_lock.patch        |   83 +
 ...n-translation-section-permission-fau.patch |   85 +
 ...-irq_set_irqchip_state-documentation.patch |   25 +
 ...wngrade-preempt_disable-d-region-to-.patch |   51 +
 ...arm64-xen--Make-XEN-depend-on-non-rt.patch |   23 +
 .../0320-kgb-serial-hackaround.patch          |   76 +
 .../0321-sysfs-realtime-entry.patch           |   47 +
 .../0322-power-disable-highmem-on-rt.patch    |   22 +
 .../0323-mips-disable-highmem-on-rt.patch     |   22 +
 .../0324-mm-rt-kmap-atomic-scheduling.patch   |  288 ++
 ...--rt--Fix-generic-kmap_atomic-for-RT.patch |   40 +
 ...highmem-add-a-already-used-pte-check.patch |   22 +
 .../0327-arm-highmem-flush-tlb-on-unmap.patch |   27 +
 .../0328-arm-enable-highmem-for-rt.patch      |  173 +
 .../0329-scsi-fcoe-rt-aware.patch             |  105 +
 ...t-t-disable-interrupts-in-qc_issue-h.patch |   78 +
 ...ypto-reduce-preempt-disabled-regions.patch |  111 +
 ...-preempt-disabled-regions-more-algos.patch |  241 ++
 ...ypto-limit-more-FPU-enabled-sections.patch |  476 +++
 ...0334-arm-disable-NEON-in-kernel-mode.patch |  127 +
 .../0335-dm-make-rt-aware.patch               |   26 +
 ...acpi_gbl_hardware-lock-back-to-a-raw.patch |  173 +
 .../0337-cpumask-disable-offstack-on-rt.patch |   67 +
 .../0338-random-make-it-work-on-rt.patch      |  132 +
 ...dom-avoid-preempt_disable-ed-section.patch |   74 +
 ...om-don-t-print-that-the-init-is-done.patch |  166 +
 ...1-cpu-hotplug--Implement-CPU-pinning.patch |  110 +
 ...duct-tape-RT-rwlock-usage-for-non-RT.patch |   95 +
 ...function-called-from-invalid-context.patch |   47 +
 ...ove-preemption-disabling-in-netif_rx.patch |   66 +
 ...al-irq-disable-alloc-atomic-headache.patch |   58 +
 ...-users-of-napi_alloc_cache-against-r.patch |  112 +
 ...ble-xt-write-recseq-begin-rt-fallout.patch |   75 +
 ...8-net-make-devnet_rename_seq-a-mutex.patch |  106 +
 .../0349-peterz-srcu-crypto-chain.patch       |  182 +
 ...ardirq-context-test-for-raw-spinlock.patch |   56 +
 ...-fix-warnings-due-to-missing-PREEMPT.patch |  141 +
 ...-use-cpu_online-instead-custom-check.patch |   99 +
 ...it-call_srcu-use-under-raw-spinlocks.patch |  402 +++
 ...place-local_irqsave-with-a-locallock.patch |   70 +
 ...355-rcu-disable-rcu-fast-no-hz-on-rt.patch |   24 +
 ...nate-softirq-processing-from-rcutree.patch |  428 +++
 ...357-rcu-make-RCU_BOOST-default-on-RT.patch |   34 +
 ..._normal_after_boot-by-default-for-RT.patch |   29 +
 .../0359-preempt-lazy-support.patch           |  623 ++++
 ...60-ftrace-Fix-trace-header-alignment.patch |   45 +
 .../0361-x86-preempt-lazy.patch               |  222 ++
 .../0362-arm-preempt-lazy-support.patch       |  151 +
 .../0363-powerpc-preempt-lazy-support.patch   |  173 +
 ...-arch-arm64-Add-lazy-preempt-support.patch |  118 +
 ...ds-trigger-disable-CPU-trigger-on-RT.patch |   35 +
 .../0366-mmci-remove-bogus-irq-save.patch     |   39 +
 ...rop-K8-s-driver-from-beeing-selected.patch |   32 +
 ...c-Protect-send_msg-with-a-local-lock.patch |   67 +
 ...am-Replace-bit-spinlocks-with-rtmute.patch |   76 +
 ...-t-disable-preemption-in-zcomp_strea.patch |   96 +
 ...-zcomp_stream_get-smp_processor_id-u.patch |   37 +
 ...72-tpm_tis-fix-stall-after-iowrite-s.patch |   77 +
 ...ec-Don-t-use-completion-s-wait-queue.patch |  108 +
 ...disableenable_rt()_where_recommended.patch |   51 +
 ...rq()_in_intel_pipe_update_startend().patch |  112 +
 ...roups-use-simple-wait-in-css_release.patch |   86 +
 ...heduling-while-atomic-in-cgroup-code.patch |  104 +
 ...l-Prevent-scheduling-while-atomic-in.patch |  100 +
 ...vert-callback_lock-to-raw_spinlock_t.patch |  286 ++
 ...80-move_sched_delayed_work_to_helper.patch |   72 +
 .../0381-md-disable-bcache.patch              |   31 +
 ...-a-locallock-instead-preempt_disable.patch |   83 +
 ...383-workqueue-prevent-deadlock-stall.patch |  200 ++
 .../patches-4.14.x-rt/0384-localversion.patch |   13 +
 388 files changed, 52652 insertions(+), 69 deletions(-)
 create mode 100644 kernel/config-4.14.x-aarch64-rt
 create mode 100644 kernel/config-4.14.x-x86_64-rt
 create mode 100644 kernel/patches-4.14.x-rt/0001-rcu-Suppress-lockdep-false-positive-boost_mtx-compla.patch
 create mode 100644 kernel/patches-4.14.x-rt/0002-brd-remove-unused-brd_mutex.patch
 create mode 100644 kernel/patches-4.14.x-rt/0003-0001-timers-Use-static-keys-for-migrate_enable-nohz_activ.patch
 create mode 100644 kernel/patches-4.14.x-rt/0004-0002-hrtimer-Correct-blantanly-wrong-comment.patch
 create mode 100644 kernel/patches-4.14.x-rt/0005-0003-hrtimer-Fix-kerneldoc-for-struct-hrtimer_cpu_base.patch
 create mode 100644 kernel/patches-4.14.x-rt/0006-0004-hrtimer-Cleanup-clock-argument-in-schedule_hrtimeout.patch
 create mode 100644 kernel/patches-4.14.x-rt/0007-0005-hrtimer-Fix-hrtimer-function-description.patch
 create mode 100644 kernel/patches-4.14.x-rt/0008-0006-hrtimer-Ensure-POSIX-compliance-relative-CLOCK_REALT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0009-0007-hrtimer-Cleanup-hrtimer_mode-enum.patch
 create mode 100644 kernel/patches-4.14.x-rt/0010-0008-tracing-hrtimer-Take-all-clock-bases-and-modes-into-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0011-0009-tracing-hrtimer-Print-hrtimer-mode-in-hrtimer_start-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0012-0010-hrtimer-Switch-for-loop-to-_ffs-evaluation.patch
 create mode 100644 kernel/patches-4.14.x-rt/0013-0011-hrtimer-Store-running-timer-in-hrtimer_clock_base.patch
 create mode 100644 kernel/patches-4.14.x-rt/0014-0012-hrtimer-Make-room-in-struct-hrtimer_cpu_base.patch
 create mode 100644 kernel/patches-4.14.x-rt/0015-0013-hrtimer-Reduce-conditional-code-hres_active.patch
 create mode 100644 kernel/patches-4.14.x-rt/0016-0014-hrtimer-Use-accesor-functions-instead-of-direct-acce.patch
 create mode 100644 kernel/patches-4.14.x-rt/0017-0015-hrtimer-Make-the-remote-enqueue-check-unconditional.patch
 create mode 100644 kernel/patches-4.14.x-rt/0018-0016-hrtimer-Make-hrtimer_cpu_base.next_timer-handling-un.patch
 create mode 100644 kernel/patches-4.14.x-rt/0019-0017-hrtimer-Make-hrtimer_reprogramm-unconditional.patch
 create mode 100644 kernel/patches-4.14.x-rt/0020-0018-hrtimer-Make-hrtimer_force_reprogramm-unconditionall.patch
 create mode 100644 kernel/patches-4.14.x-rt/0021-0019-hrtimer-Unify-handling-of-hrtimer-remove.patch
 create mode 100644 kernel/patches-4.14.x-rt/0022-0020-hrtimer-Unify-handling-of-remote-enqueue.patch
 create mode 100644 kernel/patches-4.14.x-rt/0023-0021-hrtimer-Make-remote-enqueue-decision-less-restrictiv.patch
 create mode 100644 kernel/patches-4.14.x-rt/0024-0022-hrtimer-Remove-base-argument-from-hrtimer_reprogram.patch
 create mode 100644 kernel/patches-4.14.x-rt/0025-0023-hrtimer-Split-hrtimer_start_range_ns.patch
 create mode 100644 kernel/patches-4.14.x-rt/0026-0024-hrtimer-Split-__hrtimer_get_next_event.patch
 create mode 100644 kernel/patches-4.14.x-rt/0027-0025-hrtimer-Use-irqsave-irqrestore-around-__run_hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0028-0026-hrtimer-Add-clock-bases-and-hrtimer-mode-for-soft-ir.patch
 create mode 100644 kernel/patches-4.14.x-rt/0029-0027-hrtimer-Prepare-handling-of-hard-and-softirq-based-h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0030-0028-hrtimer-Implement-support-for-softirq-based-hrtimers.patch
 create mode 100644 kernel/patches-4.14.x-rt/0031-0029-hrtimer-Implement-SOFT-HARD-clock-base-selection.patch
 create mode 100644 kernel/patches-4.14.x-rt/0032-0030-can-bcm-Replace-hrtimer_tasklet-with-softirq-based-h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0033-0031-mac80211_hwsim-Replace-hrtimer-tasklet-with-softirq-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0034-0032-xfrm-Replace-hrtimer-tasklet-with-softirq-hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0035-0033-softirq-Remove-tasklet_hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0036-0034-ALSA-dummy-Replace-tasklet-with-softirq-hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0037-0035-usb-gadget-NCM-Replace-tasklet-with-softirq-hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0038-0036-net-mvpp2-Replace-tasklet-with-softirq-hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0039-at91_dont_enable_disable_clock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0040-rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0041-rtmutex--Handle-non-enqueued-waiters-gracefully.patch
 create mode 100644 kernel/patches-4.14.x-rt/0042-rbtree-include-rcu.h-because-we-use-it.patch
 create mode 100644 kernel/patches-4.14.x-rt/0043-rxrpc-remove-unused-static-variables.patch
 create mode 100644 kernel/patches-4.14.x-rt/0044-mfd-syscon-atmel-smc-include-string.h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0045-sched-swait-include-wait.h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0046-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
 create mode 100644 kernel/patches-4.14.x-rt/0047-Bluetooth-avoid-recursive-locking-in-hci_send_to_cha.patch
 create mode 100644 kernel/patches-4.14.x-rt/0048-iommu-iova-Use-raw_cpu_ptr-instead-of-get_cpu_ptr-fo.patch
 create mode 100644 kernel/patches-4.14.x-rt/0049-greybus-audio-don-t-inclide-rwlock.h-directly.patch
 create mode 100644 kernel/patches-4.14.x-rt/0050-xen-9pfs-don-t-inclide-rwlock.h-directly.patch
 create mode 100644 kernel/patches-4.14.x-rt/0051-tty-goldfish-Enable-earlycon-only-if-built-in.patch
 create mode 100644 kernel/patches-4.14.x-rt/0052-drm-i915-properly-init-lockdep-class.patch
 create mode 100644 kernel/patches-4.14.x-rt/0053-timerqueue-Document-return-values-of-timerqueue_add-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0054-sparc64-use-generic-rwsem-spinlocks-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0055-kernel-SRCU-provide-a-static-initializer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0056-kernel-sched-Provide-a-pointer-to-the-valid-CPU-mask.patch
 create mode 100644 kernel/patches-4.14.x-rt/0057-add_migrate_disable.patch
 create mode 100644 kernel/patches-4.14.x-rt/0058-0001-tracing-Reverse-the-order-of-trace_types_lock-and-ev.patch
 create mode 100644 kernel/patches-4.14.x-rt/0059-0002-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch
 create mode 100644 kernel/patches-4.14.x-rt/0060-0003-tracing-Remove-lookups-from-tracing_map-hitcount.patch
 create mode 100644 kernel/patches-4.14.x-rt/0061-0004-tracing-Increase-tracing-map-KEYS_MAX-size.patch
 create mode 100644 kernel/patches-4.14.x-rt/0062-0005-tracing-Make-traceprobe-parsing-code-reusable.patch
 create mode 100644 kernel/patches-4.14.x-rt/0063-0006-tracing-Clean-up-hist_field_flags-enum.patch
 create mode 100644 kernel/patches-4.14.x-rt/0064-0007-tracing-Add-hist_field_name-accessor.patch
 create mode 100644 kernel/patches-4.14.x-rt/0065-0008-tracing-Reimplement-log2.patch
 create mode 100644 kernel/patches-4.14.x-rt/0066-0009-tracing-Move-hist-trigger-Documentation-to-histogram.patch
 create mode 100644 kernel/patches-4.14.x-rt/0067-0010-tracing-Add-Documentation-for-log2-modifier.patch
 create mode 100644 kernel/patches-4.14.x-rt/0068-0011-tracing-Add-support-to-detect-and-avoid-duplicates.patch
 create mode 100644 kernel/patches-4.14.x-rt/0069-0012-tracing-Remove-code-which-merges-duplicates.patch
 create mode 100644 kernel/patches-4.14.x-rt/0070-0013-ring-buffer-Add-interface-for-setting-absolute-time-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0071-0014-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch
 create mode 100644 kernel/patches-4.14.x-rt/0072-0015-tracing-Add-timestamp_mode-trace-file.patch
 create mode 100644 kernel/patches-4.14.x-rt/0073-0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch
 create mode 100644 kernel/patches-4.14.x-rt/0074-0017-tracing-Add-ring-buffer-event-param-to-hist-field-fu.patch
 create mode 100644 kernel/patches-4.14.x-rt/0075-0018-tracing-Break-out-hist-trigger-assignment-parsing.patch
 create mode 100644 kernel/patches-4.14.x-rt/0076-0019-tracing-Add-hist-trigger-timestamp-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0077-0020-tracing-Add-per-element-variable-support-to-tracing_.patch
 create mode 100644 kernel/patches-4.14.x-rt/0078-0021-tracing-Add-hist_data-member-to-hist_field.patch
 create mode 100644 kernel/patches-4.14.x-rt/0079-0022-tracing-Add-usecs-modifier-for-hist-trigger-timestam.patch
 create mode 100644 kernel/patches-4.14.x-rt/0080-0023-tracing-Add-variable-support-to-hist-triggers.patch
 create mode 100644 kernel/patches-4.14.x-rt/0081-0024-tracing-Account-for-variables-in-named-trigger-compa.patch
 create mode 100644 kernel/patches-4.14.x-rt/0082-0025-tracing-Move-get_hist_field_flags.patch
 create mode 100644 kernel/patches-4.14.x-rt/0083-0026-tracing-Add-simple-expression-support-to-hist-trigge.patch
 create mode 100644 kernel/patches-4.14.x-rt/0084-0027-tracing-Generalize-per-element-hist-trigger-data.patch
 create mode 100644 kernel/patches-4.14.x-rt/0085-0028-tracing-Pass-tracing_map_elt-to-hist_field-accessor-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0086-0029-tracing-Add-hist_field-type-field.patch
 create mode 100644 kernel/patches-4.14.x-rt/0087-0030-tracing-Add-variable-reference-handling-to-hist-trig.patch
 create mode 100644 kernel/patches-4.14.x-rt/0088-0031-tracing-Add-hist-trigger-action-hook.patch
 create mode 100644 kernel/patches-4.14.x-rt/0089-0032-tracing-Add-support-for-synthetic-events.patch
 create mode 100644 kernel/patches-4.14.x-rt/0090-0033-tracing-Add-support-for-field-variables.patch
 create mode 100644 kernel/patches-4.14.x-rt/0091-0034-tracing-Add-onmatch-hist-trigger-action-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0092-0035-tracing-Add-onmax-hist-trigger-action-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0093-0036-tracing-Allow-whitespace-to-surround-hist-trigger-fi.patch
 create mode 100644 kernel/patches-4.14.x-rt/0094-0037-tracing-Add-cpu-field-for-hist-triggers.patch
 create mode 100644 kernel/patches-4.14.x-rt/0095-0038-tracing-Add-hist-trigger-support-for-variable-refere.patch
 create mode 100644 kernel/patches-4.14.x-rt/0096-0039-tracing-Add-last-error-error-facility-for-hist-trigg.patch
 create mode 100644 kernel/patches-4.14.x-rt/0097-0040-tracing-Add-inter-event-hist-trigger-Documentation.patch
 create mode 100644 kernel/patches-4.14.x-rt/0098-0041-tracing-Make-tracing_set_clock-non-static.patch
 create mode 100644 kernel/patches-4.14.x-rt/0099-0042-tracing-Add-a-clock-attribute-for-hist-triggers.patch
 create mode 100644 kernel/patches-4.14.x-rt/0100-0043-ring-buffer-Bring-back-context-level-recursive-check.patch
 create mode 100644 kernel/patches-4.14.x-rt/0101-0044-ring-buffer-Fix-duplicate-results-in-mapping-context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0102-0045-ring-buffer-Add-nesting-for-adding-events-within-eve.patch
 create mode 100644 kernel/patches-4.14.x-rt/0103-0046-tracing-Use-the-ring-buffer-nesting-to-allow-synthet.patch
 create mode 100644 kernel/patches-4.14.x-rt/0104-0047-tracing-Add-inter-event-blurb-to-HIST_TRIGGERS-confi.patch
 create mode 100644 kernel/patches-4.14.x-rt/0105-0048-selftests-ftrace-Add-inter-event-hist-triggers-testc.patch
 create mode 100644 kernel/patches-4.14.x-rt/0106-block-shorten-interrupt-disabled-regions.patch
 create mode 100644 kernel/patches-4.14.x-rt/0107-timekeeping-split-jiffies-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0108-tracing-account-for-preempt-off-in-preempt_schedule.patch
 create mode 100644 kernel/patches-4.14.x-rt/0109-signal-revert-ptrace-preempt-magic.patch
 create mode 100644 kernel/patches-4.14.x-rt/0110-arm-convert-boot-lock-to-raw.patch
 create mode 100644 kernel/patches-4.14.x-rt/0111-arm-kprobe-replace-patch_lock-to-raw-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0112-posix-timers-no-broadcast.patch
 create mode 100644 kernel/patches-4.14.x-rt/0113-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch
 create mode 100644 kernel/patches-4.14.x-rt/0114-drivers-random-reduce-preempt-disabled-region.patch
 create mode 100644 kernel/patches-4.14.x-rt/0115-arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch
 create mode 100644 kernel/patches-4.14.x-rt/0116-clockevents-drivers-timer-atmel-pit-fix-double-free_.patch
 create mode 100644 kernel/patches-4.14.x-rt/0117-clocksource-tclib-allow-higher-clockrates.patch
 create mode 100644 kernel/patches-4.14.x-rt/0118-drivers-net-8139-disable-irq-nosync.patch
 create mode 100644 kernel/patches-4.14.x-rt/0119-suspend-prevernt-might-sleep-splats.patch
 create mode 100644 kernel/patches-4.14.x-rt/0120-net-prevent-abba-deadlock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0121-net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch
 create mode 100644 kernel/patches-4.14.x-rt/0122-net_disable_NET_RX_BUSY_POLL.patch
 create mode 100644 kernel/patches-4.14.x-rt/0123-x86-io-apic-migra-no-unmask.patch
 create mode 100644 kernel/patches-4.14.x-rt/0124-rcu-segcblist-include-rcupdate.h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0125-printk-kill.patch
 create mode 100644 kernel/patches-4.14.x-rt/0126-printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch
 create mode 100644 kernel/patches-4.14.x-rt/0127-rt-preempt-base-config.patch
 create mode 100644 kernel/patches-4.14.x-rt/0128-kconfig-disable-a-few-options-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0129-kconfig-preempt-rt-full.patch
 create mode 100644 kernel/patches-4.14.x-rt/0130-bug-rt-dependend-variants.patch
 create mode 100644 kernel/patches-4.14.x-rt/0131-iommu-amd--Use-WARN_ON_NORT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0132-local-irq-rt-depending-variants.patch
 create mode 100644 kernel/patches-4.14.x-rt/0133-preempt-nort-rt-variants.patch
 create mode 100644 kernel/patches-4.14.x-rt/0134-futex-workaround-migrate_disable-enable-in-different.patch
 create mode 100644 kernel/patches-4.14.x-rt/0135-rt-local-irq-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0136-ata-disable-interrupts-if-non-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0137-ide-use-nort-local-irq-variants.patch
 create mode 100644 kernel/patches-4.14.x-rt/0138-infiniband-mellanox-ib-use-nort-irq.patch
 create mode 100644 kernel/patches-4.14.x-rt/0139-inpt-gameport-use-local-irq-nort.patch
 create mode 100644 kernel/patches-4.14.x-rt/0140-user-use-local-irq-nort.patch
 create mode 100644 kernel/patches-4.14.x-rt/0141-usb-use-_nort-in-giveback.patch
 create mode 100644 kernel/patches-4.14.x-rt/0142-mm-scatterlist-dont-disable-irqs-on-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0143-mm-workingset-do-not-protect-workingset_shadow_nodes.patch
 create mode 100644 kernel/patches-4.14.x-rt/0144-signal-fix-up-rcu-wreckage.patch
 create mode 100644 kernel/patches-4.14.x-rt/0145-oleg-signal-rt-fix.patch
 create mode 100644 kernel/patches-4.14.x-rt/0146-x86-signal-delay-calling-signals-on-32bit.patch
 create mode 100644 kernel/patches-4.14.x-rt/0147-net-wireless-warn-nort.patch
 create mode 100644 kernel/patches-4.14.x-rt/0148-fs-replace-bh_uptodate_lock-for-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0149-fs-jbd-replace-bh_state-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0150-list_bl.h-make-list-head-locking-RT-safe.patch
 create mode 100644 kernel/patches-4.14.x-rt/0151-list_bl-fixup-bogus-lockdep-warning.patch
 create mode 100644 kernel/patches-4.14.x-rt/0152-genirq-disable-irqpoll-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0153-genirq-force-threading.patch
 create mode 100644 kernel/patches-4.14.x-rt/0154-drivers-net-vortex-fix-locking-issues.patch
 create mode 100644 kernel/patches-4.14.x-rt/0155-delayacct-use-raw_spinlocks.patch
 create mode 100644 kernel/patches-4.14.x-rt/0156-mm-page_alloc-rt-friendly-per-cpu-pages.patch
 create mode 100644 kernel/patches-4.14.x-rt/0157-mm-page_alloc-reduce-lock-sections-further.patch
 create mode 100644 kernel/patches-4.14.x-rt/0158-mm-convert-swap-to-percpu-locked.patch
 create mode 100644 kernel/patches-4.14.x-rt/0159-mm-perform-lru_add_drain_all-remotely.patch
 create mode 100644 kernel/patches-4.14.x-rt/0160-mm-make-vmstat-rt-aware.patch
 create mode 100644 kernel/patches-4.14.x-rt/0161-re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch
 create mode 100644 kernel/patches-4.14.x-rt/0162-mm-bounce-local-irq-save-nort.patch
 create mode 100644 kernel/patches-4.14.x-rt/0163-mm-disable-sloub-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0164-mm-enable-slub.patch
 create mode 100644 kernel/patches-4.14.x-rt/0165-mm-slub-close-possible-memory-leak-in-kmem_cache_all.patch
 create mode 100644 kernel/patches-4.14.x-rt/0166-slub-enable-irqs-for-no-wait.patch
 create mode 100644 kernel/patches-4.14.x-rt/0167-slub-disable-SLUB_CPU_PARTIAL.patch
 create mode 100644 kernel/patches-4.14.x-rt/0168-mm-page-alloc-use-local-lock-on-target-cpu.patch
 create mode 100644 kernel/patches-4.14.x-rt/0169-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0170-mm-memcontrol-do_not_disable_irq.patch
 create mode 100644 kernel/patches-4.14.x-rt/0171-mm-backing-dev-don-t-disable-IRQs-in-wb_congested_pu.patch
 create mode 100644 kernel/patches-4.14.x-rt/0172-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch
 create mode 100644 kernel/patches-4.14.x-rt/0173-radix-tree-use-local-locks.patch
 create mode 100644 kernel/patches-4.14.x-rt/0174-panic-disable-random-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0175-timers-prepare-for-full-preemption.patch
 create mode 100644 kernel/patches-4.14.x-rt/0176-timer-delay-waking-softirqs-from-the-jiffy-tick.patch
 create mode 100644 kernel/patches-4.14.x-rt/0177-nohz-Prevent-erroneous-tick-stop-invocations.patch
 create mode 100644 kernel/patches-4.14.x-rt/0178-x86-kvm-require-const-tsc-for-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0179-wait.h-include-atomic.h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0180-work-simple-Simple-work-queue-implemenation.patch
 create mode 100644 kernel/patches-4.14.x-rt/0181-completion-use-simple-wait-queues.patch
 create mode 100644 kernel/patches-4.14.x-rt/0182-fs-aio-simple-simple-work.patch
 create mode 100644 kernel/patches-4.14.x-rt/0183-genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch
 create mode 100644 kernel/patches-4.14.x-rt/0184-time-hrtimer-avoid-schedule_work-with-interrupts-dis.patch
 create mode 100644 kernel/patches-4.14.x-rt/0185-hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
 create mode 100644 kernel/patches-4.14.x-rt/0186-hrtimers-prepare-full-preemption.patch
 create mode 100644 kernel/patches-4.14.x-rt/0187-hrtimer-by-timers-by-default-into-the-softirq-context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0188-hrtimer-Move-schedule_work-call-to-helper-thread.patch
 create mode 100644 kernel/patches-4.14.x-rt/0189-timer-fd-avoid-live-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0190-posix-timers-thread-posix-cpu-timers-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0191-sched-delay-put-task.patch
 create mode 100644 kernel/patches-4.14.x-rt/0192-sched-limit-nr-migrate.patch
 create mode 100644 kernel/patches-4.14.x-rt/0193-sched-mmdrop-delayed.patch
 create mode 100644 kernel/patches-4.14.x-rt/0194-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch
 create mode 100644 kernel/patches-4.14.x-rt/0195-sched-rt-mutex-wakeup.patch
 create mode 100644 kernel/patches-4.14.x-rt/0196-sched-Prevent-task-state-corruption-by-spurious-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0197-sched-Remove-TASK_ALL.patch
 create mode 100644 kernel/patches-4.14.x-rt/0198-sched-might-sleep-do-not-account-rcu-depth.patch
 create mode 100644 kernel/patches-4.14.x-rt/0199-cond-resched-softirq-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0200-cond-resched-lock-rt-tweak.patch
 create mode 100644 kernel/patches-4.14.x-rt/0201-sched-disable-ttwu-queue.patch
 create mode 100644 kernel/patches-4.14.x-rt/0202-sched-disable-rt-group-sched-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0203-sched-ttwu-ensure-success-return-is-correct.patch
 create mode 100644 kernel/patches-4.14.x-rt/0204-sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch
 create mode 100644 kernel/patches-4.14.x-rt/0205-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0206-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0207-stop-machine-raw-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0208-hotplug-light-get-online-cpus.patch
 create mode 100644 kernel/patches-4.14.x-rt/0209-ftrace-migrate-disable-tracing.patch
 create mode 100644 kernel/patches-4.14.x-rt/0210-lockdep-no-softirq-accounting-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0211-lockdep-disable-self-test.patch
 create mode 100644 kernel/patches-4.14.x-rt/0212-mutex-no-spin-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0213-tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0214-softirq-preempt-fix-3-re.patch
 create mode 100644 kernel/patches-4.14.x-rt/0215-softirq-disable-softirq-stacks-for-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0216-softirq-split-locks.patch
 create mode 100644 kernel/patches-4.14.x-rt/0217-kernel-softirq-unlock-with-irqs-on.patch
 create mode 100644 kernel/patches-4.14.x-rt/0218-irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0219-softirq-split-timer-softirqs-out-of-ksoftirqd.patch
 create mode 100644 kernel/patches-4.14.x-rt/0220-softirq-wake-the-timer-softirq-if-needed.patch
 create mode 100644 kernel/patches-4.14.x-rt/0221-rtmutex-trylock-is-okay-on-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0222-fs-nfs-turn-rmdir_sem-into-a-semaphore.patch
 create mode 100644 kernel/patches-4.14.x-rt/0223-rtmutex-futex-prepare-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0224-futex-requeue-pi-fix.patch
 create mode 100644 kernel/patches-4.14.x-rt/0225-locking-rtmutex-don-t-drop-the-wait_lock-twice.patch
 create mode 100644 kernel/patches-4.14.x-rt/0226-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0227-pid.h-include-atomic.h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0228-arm-include-definition-for-cpumask_t.patch
 create mode 100644 kernel/patches-4.14.x-rt/0229-locking-locktorture-Do-NOT-include-rwlock.h-directly.patch
 create mode 100644 kernel/patches-4.14.x-rt/0230-rtmutex-lock-killable.patch
 create mode 100644 kernel/patches-4.14.x-rt/0231-rtmutex-Make-lock_killable-work.patch
 create mode 100644 kernel/patches-4.14.x-rt/0232-spinlock-types-separate-raw.patch
 create mode 100644 kernel/patches-4.14.x-rt/0233-rtmutex-avoid-include-hell.patch
 create mode 100644 kernel/patches-4.14.x-rt/0234-rtmutex_dont_include_rcu.patch
 create mode 100644 kernel/patches-4.14.x-rt/0235-rtmutex-Provide-rt_mutex_slowlock_locked.patch
 create mode 100644 kernel/patches-4.14.x-rt/0236-rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch
 create mode 100644 kernel/patches-4.14.x-rt/0237-rtmutex-add-sleeping-lock-implementation.patch
 create mode 100644 kernel/patches-4.14.x-rt/0238-rtmutex-add-mutex-implementation-based-on-rtmutex.patch
 create mode 100644 kernel/patches-4.14.x-rt/0239-rtmutex-add-rwsem-implementation-based-on-rtmutex.patch
 create mode 100644 kernel/patches-4.14.x-rt/0240-rtmutex-add-rwlock-implementation-based-on-rtmutex.patch
 create mode 100644 kernel/patches-4.14.x-rt/0241-rtmutex-wire-up-RT-s-locking.patch
 create mode 100644 kernel/patches-4.14.x-rt/0242-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0243-locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
 create mode 100644 kernel/patches-4.14.x-rt/0244-locking-rtmutex-re-init-the-wait_lock-in-rt_mutex_in.patch
 create mode 100644 kernel/patches-4.14.x-rt/0245-ptrace-fix-ptrace-vs-tasklist_lock-race.patch
 create mode 100644 kernel/patches-4.14.x-rt/0246-RCU-we-need-to-skip-that-warning-but-only-on-sleepin.patch
 create mode 100644 kernel/patches-4.14.x-rt/0247-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0248-peter_zijlstra-frob-rcu.patch
 create mode 100644 kernel/patches-4.14.x-rt/0249-rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0250-patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
 create mode 100644 kernel/patches-4.14.x-rt/0251-rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch
 create mode 100644 kernel/patches-4.14.x-rt/0252-drivers-tty-fix-omap-lock-crap.patch
 create mode 100644 kernel/patches-4.14.x-rt/0253-drivers-tty-pl011-irq-disable-madness.patch
 create mode 100644 kernel/patches-4.14.x-rt/0254-rt-serial-warn-fix.patch
 create mode 100644 kernel/patches-4.14.x-rt/0255-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
 create mode 100644 kernel/patches-4.14.x-rt/0256-peterz-percpu-rwsem-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0257-fs-namespace-preemption-fix.patch
 create mode 100644 kernel/patches-4.14.x-rt/0258-mm-protect-activate-switch-mm.patch
 create mode 100644 kernel/patches-4.14.x-rt/0259-fs-block-rt-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0260-fs-ntfs-disable-interrupt-non-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0261-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
 create mode 100644 kernel/patches-4.14.x-rt/0262-Revert-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
 create mode 100644 kernel/patches-4.14.x-rt/0263-fs-dcache-bringt-back-explicit-INIT_HLIST_BL_HEAD-in.patch
 create mode 100644 kernel/patches-4.14.x-rt/0264-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch
 create mode 100644 kernel/patches-4.14.x-rt/0265-x86-mce-timer-hrtimer.patch
 create mode 100644 kernel/patches-4.14.x-rt/0266-x86-mce-use-swait-queue-for-mce-wakeups.patch
 create mode 100644 kernel/patches-4.14.x-rt/0267-x86-stackprot-no-random-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0268-x86-use-gen-rwsem-spinlocks-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0269-x86-UV-raw_spinlock-conversion.patch
 create mode 100644 kernel/patches-4.14.x-rt/0270-thermal-Defer-thermal-wakups-to-threads.patch
 create mode 100644 kernel/patches-4.14.x-rt/0271-epoll-use-get-cpu-light.patch
 create mode 100644 kernel/patches-4.14.x-rt/0272-mm-vmalloc-use-get-cpu-light.patch
 create mode 100644 kernel/patches-4.14.x-rt/0273-block-mq-use-cpu_light.patch
 create mode 100644 kernel/patches-4.14.x-rt/0274-block-mq-drop-preempt-disable.patch
 create mode 100644 kernel/patches-4.14.x-rt/0275-block-mq-don-t-complete-requests-via-IPI.patch
 create mode 100644 kernel/patches-4.14.x-rt/0276-md-raid5-percpu-handling-rt-aware.patch
 create mode 100644 kernel/patches-4.14.x-rt/0277-md-raid5-do-not-disable-interrupts.patch
 create mode 100644 kernel/patches-4.14.x-rt/0278-rt-introduce-cpu-chill.patch
 create mode 100644 kernel/patches-4.14.x-rt/0279-cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
 create mode 100644 kernel/patches-4.14.x-rt/0280-block-blk-mq-use-swait.patch
 create mode 100644 kernel/patches-4.14.x-rt/0281-block-use-cpu-chill.patch
 create mode 100644 kernel/patches-4.14.x-rt/0282-fs-dcache-use-cpu-chill-in-trylock-loops.patch
 create mode 100644 kernel/patches-4.14.x-rt/0283-net-use-cpu-chill.patch
 create mode 100644 kernel/patches-4.14.x-rt/0284-fs-dcache-use-swait_queue-instead-of-waitqueue.patch
 create mode 100644 kernel/patches-4.14.x-rt/0285-workqueue-use-rcu.patch
 create mode 100644 kernel/patches-4.14.x-rt/0286-workqueue-use-locallock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0287-work-queue-work-around-irqsafe-timer-optimization.patch
 create mode 100644 kernel/patches-4.14.x-rt/0288-workqueue-distangle-from-rq-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0289-percpu_ida-use-locklocks.patch
 create mode 100644 kernel/patches-4.14.x-rt/0290-debugobjects-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0291-jump-label-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0292-seqlock-prevent-rt-starvation.patch
 create mode 100644 kernel/patches-4.14.x-rt/0293-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch
 create mode 100644 kernel/patches-4.14.x-rt/0294-skbufhead-raw-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0295-net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch
 create mode 100644 kernel/patches-4.14.x-rt/0296-net-move-xmit_recursion-to-per-task-variable-on-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0297-net-provide-a-way-to-delegate-processing-a-softirq-t.patch
 create mode 100644 kernel/patches-4.14.x-rt/0298-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch
 create mode 100644 kernel/patches-4.14.x-rt/0299-net-Qdisc-use-a-seqlock-instead-seqcount.patch
 create mode 100644 kernel/patches-4.14.x-rt/0300-net-add-back-the-missing-serialization-in-ip_send_un.patch
 create mode 100644 kernel/patches-4.14.x-rt/0301-net-take-the-tcp_sk_lock-lock-with-BH-disabled.patch
 create mode 100644 kernel/patches-4.14.x-rt/0302-net-add-a-lock-around-icmp_sk.patch
 create mode 100644 kernel/patches-4.14.x-rt/0303-net-use-trylock-in-icmp_sk.patch
 create mode 100644 kernel/patches-4.14.x-rt/0304-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
 create mode 100644 kernel/patches-4.14.x-rt/0305-irqwork-push_most_work_into_softirq_context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0306-irqwork-Move-irq-safe-work-to-irq-context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0307-snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch
 create mode 100644 kernel/patches-4.14.x-rt/0308-printk-rt-aware.patch
 create mode 100644 kernel/patches-4.14.x-rt/0309-kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch
 create mode 100644 kernel/patches-4.14.x-rt/0310-HACK-printk-drop-the-logbuf_lock-more-often.patch
 create mode 100644 kernel/patches-4.14.x-rt/0311-power-use-generic-rwsem-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0312-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch
 create mode 100644 kernel/patches-4.14.x-rt/0313-powerpc-ps3-device-init.c-adapt-to-completions-using.patch
 create mode 100644 kernel/patches-4.14.x-rt/0314-arm-at91-tclib-default-to-tclib-timer-for-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0315-arm-unwind-use_raw_lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0316-ARM-enable-irq-in-translation-section-permission-fau.patch
 create mode 100644 kernel/patches-4.14.x-rt/0317-genirq-update-irq_set_irqchip_state-documentation.patch
 create mode 100644 kernel/patches-4.14.x-rt/0318-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch
 create mode 100644 kernel/patches-4.14.x-rt/0319-arm64-xen--Make-XEN-depend-on-non-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0320-kgb-serial-hackaround.patch
 create mode 100644 kernel/patches-4.14.x-rt/0321-sysfs-realtime-entry.patch
 create mode 100644 kernel/patches-4.14.x-rt/0322-power-disable-highmem-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0323-mips-disable-highmem-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0324-mm-rt-kmap-atomic-scheduling.patch
 create mode 100644 kernel/patches-4.14.x-rt/0325-mm--rt--Fix-generic-kmap_atomic-for-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0326-x86-highmem-add-a-already-used-pte-check.patch
 create mode 100644 kernel/patches-4.14.x-rt/0327-arm-highmem-flush-tlb-on-unmap.patch
 create mode 100644 kernel/patches-4.14.x-rt/0328-arm-enable-highmem-for-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0329-scsi-fcoe-rt-aware.patch
 create mode 100644 kernel/patches-4.14.x-rt/0330-sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch
 create mode 100644 kernel/patches-4.14.x-rt/0331-x86-crypto-reduce-preempt-disabled-regions.patch
 create mode 100644 kernel/patches-4.14.x-rt/0332-crypto-Reduce-preempt-disabled-regions-more-algos.patch
 create mode 100644 kernel/patches-4.14.x-rt/0333-crypto-limit-more-FPU-enabled-sections.patch
 create mode 100644 kernel/patches-4.14.x-rt/0334-arm-disable-NEON-in-kernel-mode.patch
 create mode 100644 kernel/patches-4.14.x-rt/0335-dm-make-rt-aware.patch
 create mode 100644 kernel/patches-4.14.x-rt/0336-acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch
 create mode 100644 kernel/patches-4.14.x-rt/0337-cpumask-disable-offstack-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0338-random-make-it-work-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0339-random-avoid-preempt_disable-ed-section.patch
 create mode 100644 kernel/patches-4.14.x-rt/0340-char-random-don-t-print-that-the-init-is-done.patch
 create mode 100644 kernel/patches-4.14.x-rt/0341-cpu-hotplug--Implement-CPU-pinning.patch
 create mode 100644 kernel/patches-4.14.x-rt/0342-hotplug-duct-tape-RT-rwlock-usage-for-non-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0343-scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch
 create mode 100644 kernel/patches-4.14.x-rt/0344-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch
 create mode 100644 kernel/patches-4.14.x-rt/0345-net-another-local-irq-disable-alloc-atomic-headache.patch
 create mode 100644 kernel/patches-4.14.x-rt/0346-net-core-protect-users-of-napi_alloc_cache-against-r.patch
 create mode 100644 kernel/patches-4.14.x-rt/0347-net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch
 create mode 100644 kernel/patches-4.14.x-rt/0348-net-make-devnet_rename_seq-a-mutex.patch
 create mode 100644 kernel/patches-4.14.x-rt/0349-peterz-srcu-crypto-chain.patch
 create mode 100644 kernel/patches-4.14.x-rt/0350-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0351-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0352-srcu-use-cpu_online-instead-custom-check.patch
 create mode 100644 kernel/patches-4.14.x-rt/0353-srcu-Prohibit-call_srcu-use-under-raw-spinlocks.patch
 create mode 100644 kernel/patches-4.14.x-rt/0354-srcu-replace-local_irqsave-with-a-locallock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0355-rcu-disable-rcu-fast-no-hz-on-rt.patch
 create mode 100644 kernel/patches-4.14.x-rt/0356-rcu-Eliminate-softirq-processing-from-rcutree.patch
 create mode 100644 kernel/patches-4.14.x-rt/0357-rcu-make-RCU_BOOST-default-on-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0358-rcu-enable-rcu_normal_after_boot-by-default-for-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0359-preempt-lazy-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0360-ftrace-Fix-trace-header-alignment.patch
 create mode 100644 kernel/patches-4.14.x-rt/0361-x86-preempt-lazy.patch
 create mode 100644 kernel/patches-4.14.x-rt/0362-arm-preempt-lazy-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0363-powerpc-preempt-lazy-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0364-arch-arm64-Add-lazy-preempt-support.patch
 create mode 100644 kernel/patches-4.14.x-rt/0365-leds-trigger-disable-CPU-trigger-on-RT.patch
 create mode 100644 kernel/patches-4.14.x-rt/0366-mmci-remove-bogus-irq-save.patch
 create mode 100644 kernel/patches-4.14.x-rt/0367-cpufreq-drop-K8-s-driver-from-beeing-selected.patch
 create mode 100644 kernel/patches-4.14.x-rt/0368-connector-cn_proc-Protect-send_msg-with-a-local-lock.patch
 create mode 100644 kernel/patches-4.14.x-rt/0369-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch
 create mode 100644 kernel/patches-4.14.x-rt/0370-drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch
 create mode 100644 kernel/patches-4.14.x-rt/0371-drivers-zram-fix-zcomp_stream_get-smp_processor_id-u.patch
 create mode 100644 kernel/patches-4.14.x-rt/0372-tpm_tis-fix-stall-after-iowrite-s.patch
 create mode 100644 kernel/patches-4.14.x-rt/0373-pci-switchtec-Don-t-use-completion-s-wait-queue.patch
 create mode 100644 kernel/patches-4.14.x-rt/0374-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch
 create mode 100644 kernel/patches-4.14.x-rt/0375-drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch
 create mode 100644 kernel/patches-4.14.x-rt/0376-cgroups-use-simple-wait-in-css_release.patch
 create mode 100644 kernel/patches-4.14.x-rt/0377-cgroups-scheduling-while-atomic-in-cgroup-code.patch
 create mode 100644 kernel/patches-4.14.x-rt/0378-Revert-memcontrol-Prevent-scheduling-while-atomic-in.patch
 create mode 100644 kernel/patches-4.14.x-rt/0379-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch
 create mode 100644 kernel/patches-4.14.x-rt/0380-move_sched_delayed_work_to_helper.patch
 create mode 100644 kernel/patches-4.14.x-rt/0381-md-disable-bcache.patch
 create mode 100644 kernel/patches-4.14.x-rt/0382-apparmor-use-a-locallock-instead-preempt_disable.patch
 create mode 100644 kernel/patches-4.14.x-rt/0383-workqueue-prevent-deadlock-stall.patch
 create mode 100644 kernel/patches-4.14.x-rt/0384-localversion.patch

diff --git a/kernel/Dockerfile b/kernel/Dockerfile
index 73225e549..28e159a99 100644
--- a/kernel/Dockerfile
+++ b/kernel/Dockerfile
@@ -35,6 +35,7 @@ RUN [ $(uname -m) == x86_64 ] && apk add libunwind-dev || true
 ARG KERNEL_VERSION
 ARG KERNEL_SERIES
 ARG EXTRA
+ARG DEBUG
 
 ENV KERNEL_SOURCE=https://www.kernel.org/pub/linux/kernel/v4.x/linux-${KERNEL_VERSION}.tar.xz
 ENV KERNEL_SHA256_SUMS=https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
@@ -62,8 +63,18 @@ RUN curl -fsSLO ${KERNEL_SHA256_SUMS} && \
     gpg2 --verify linux-${KERNEL_VERSION}.tar.sign linux-${KERNEL_VERSION}.tar && \
     cat linux-${KERNEL_VERSION}.tar | tar --absolute-names -x && mv /linux-${KERNEL_VERSION} /linux
 
-# Apply local patches if present
 WORKDIR /linux
+# Apply local specific patches if present
+RUN set -e && \
+    if [ -n "${EXTRA}" ] && [ -d /patches-${KERNEL_SERIES}${EXTRA} ]; then \
+	echo "Patching ${EXTRA} kernel"; \
+	for patch in /patches-${KERNEL_SERIES}${EXTRA}/*.patch; do \
+            echo "Applying $patch"; \
+            patch -t -F0 -N -u -p1 < "$patch"; \
+	done; \
+    fi
+
+# Apply local common patches if present
 RUN set -e && \
     if [ -d /patches-${KERNEL_SERIES} ]; then \
         for patch in /patches-${KERNEL_SERIES}/*.patch; do \
@@ -82,16 +93,17 @@ RUN case $(uname -m) in \
         ;; \
     esac  && \
     cp /config-${KERNEL_SERIES}-$(uname -m) ${KERNEL_DEF_CONF}; \
-    if [ -n "${EXTRA}" ]; then \
-        sed -i "s/CONFIG_LOCALVERSION=\"-linuxkit\"/CONFIG_LOCALVERSION=\"-linuxkit${EXTRA}\"/" ${KERNEL_DEF_CONF}; \
-        if [ "${EXTRA}" = "-dbg" ]; then \
-            sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' ${KERNEL_DEF_CONF}; \
-        fi && \
-        cat /config${EXTRA} >> ${KERNEL_DEF_CONF}; \
+    if [ -n "${EXTRA}" ] && [ -f "/config-${KERNEL_SERIES}-$(uname -m)${EXTRA}" ]; then \
+        cat /config-${KERNEL_SERIES}-$(uname -m)${EXTRA} >> ${KERNEL_DEF_CONF}; \
+    fi; \
+    sed -i "s/CONFIG_LOCALVERSION=\"-linuxkit\"/CONFIG_LOCALVERSION=\"-linuxkit${EXTRA}${DEBUG}\"/" ${KERNEL_DEF_CONF}; \
+    if [ -n "${DEBUG}" ]; then \
+        sed -i 's/CONFIG_PANIC_ON_OOPS=y/# CONFIG_PANIC_ON_OOPS is not set/' ${KERNEL_DEF_CONF}; \
+        cat /config${DEBUG} >> ${KERNEL_DEF_CONF}; \
     fi && \
     make defconfig && \
     make oldconfig && \
-    if [ -z "${EXTRA}" ]; then diff .config ${KERNEL_DEF_CONF}; fi
+    if [ -z "${EXTRA}" ] && [ -z "${DEBUG}" ]; then diff .config ${KERNEL_DEF_CONF}; fi
 
 RUN mkdir /out
 
@@ -106,7 +118,7 @@ RUN make -j "$(getconf _NPROCESSORS_ONLN)" KCFLAGS="-fno-pie" && \
         ;; \
     esac && \
     cp System.map /out && \
-    ([ "${EXTRA}" = "-dbg" ] && cp vmlinux /out || true)
+    ([ -n "${DEBUG}" ] && cp vmlinux /out || true)
 
 # WireGuard
 RUN curl -sSL -o /wireguard.tar.xz "${WIREGUARD_URL}" && \
diff --git a/kernel/Makefile b/kernel/Makefile
index aef79d4fb..cf3b5784f 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -23,6 +23,11 @@ IMAGE_ZFS:=zfs-kmod
 # - append $(EXTRA) to the CONFIG_LOCALVERSION of your kernel
 EXTRA?=
 
+# You can enable debug options for the Makefile. This will:
+# - append a config-dbg to the kernel config for your kernel/arch
+# - append -dbg to the CONFIG_LOCALVERSION of your kernel
+DEBUG?=
+
 ifeq ($(HASH),)
 HASH_COMMIT?=HEAD # Setting this is only really useful with the show-tag target
 HASH?=$(shell git ls-tree --full-tree $(HASH_COMMIT) -- $(CURDIR) | awk '{print $$3}')
@@ -79,107 +84,112 @@ sources:
 # Arguments:
 # $1: Full kernel version, e.g., 4.9.22
 # $2: Kernel "series", e.g., 4.9.x
-# $3: Build a debug kernel (used as suffix for image)
+# $3: Build a specific kernel like -rt: Preempt-RT (used as suffix for image)
 # This defines targets like:
 # build_4.9.x and  push_4.9.x and adds them as dependencies
 # to the global targets
-# Set $3 to "-dbg", to build debug kernels. This defines targets like
+# Set $3 to "-rt", to build Preempt-RT kernels. This defines targets like
+# build_4.14.x-rt and adds "-rt" to the hub image name.
+# Set $4 to "-dbg", to build debug kernels. This defines targets like
 # build_4.9.x-dbg and adds "-dbg" to the hub image name.
+# Set $3 to "-rt" and $4 to "-dbg" to build debug Preempt-RT kernel.
 define kernel
 
-ifeq ($(3),)
+ifeq ($(4),)
 sources/linux-$(1).tar.xz: Makefile | sources
 	curl -fsSLo sources/linux-$(1).tar.xz https://www.kernel.org/pub/linux/kernel/v4.x/linux-$(1).tar.xz 
 KERNEL_VERSIONS+=$(1)
 endif
 
-build_$(2)$(3): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard config-$(2)*) config-dbg | sources
-	docker pull $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) || \
+build_$(2)$(3)$(4): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard config-$(2)*) config-dbg | sources
+	docker pull $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
 		docker build \
 			--build-arg KERNEL_VERSION=$(1) \
 			--build-arg KERNEL_SERIES=$(2) \
 			--build-arg EXTRA=$(3) \
+			--build-arg DEBUG=$(4) \
 			$(LABELS) \
-			--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) .
+			--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) .
 
-forcebuild_$(2)$(3): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard config-$(2)*) config-dbg | sources
+forcebuild_$(2)$(3)$(4): Dockerfile Makefile $(wildcard patches-$(2)/*) $(wildcard config-$(2)*) config-dbg | sources
 	docker build \
 		--build-arg KERNEL_VERSION=$(1) \
 		--build-arg KERNEL_SERIES=$(2) \
 		--build-arg EXTRA=$(3) \
+		--build-arg DEBUG=$(4) \
 		$(LABELS) \
-		--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) .
+		--no-cache -t $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) .
 
-push_$(2)$(3): build_$(2)$(3)
+push_$(2)$(3)$(4): build_$(2)$(3)$(4)
 	@if [ x"$(DIRTY)" !=  x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi
-	docker pull $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) || \
-		(docker push $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) && \
-		 docker tag $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(1)$(3)$(SUFFIX) && \
-		 docker push $(ORG)/$(IMAGE):$(1)$(3)$(SUFFIX) && \
-		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
-		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3) $(DOCKER_CONTENT_TRUST))
+	docker pull $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
+		(docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \
+		 docker tag $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \
+		 docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \
+		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
+		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST))
 
-forcepush_$(2)$(3): forcebuild_$(2)$(3)
+forcepush_$(2)$(3)$(4): forcebuild_$(2)$(3)$(4)
 	@if [ x"$(DIRTY)" !=  x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi
-	docker push $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) && \
-	 docker tag $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(1)$(3)$(SUFFIX) && \
-	 docker push $(ORG)/$(IMAGE):$(1)$(3)$(SUFFIX) && \
-	 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
-	 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3) $(DOCKER_CONTENT_TRUST)
+	docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \
+	 docker tag $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \
+	 docker push $(ORG)/$(IMAGE):$(1)$(3)$(4)$(SUFFIX) && \
+	 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
+	 $(PUSH_MANIFEST) $(ORG)/$(IMAGE):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST)
 
-show-tag_$(2)$(3):
-	@echo $(ORG)/$(IMAGE):$(1)$(3)-$(TAG)
+show-tag_$(2)$(3)$(4):
+	@echo $(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)
 
-build: build_$(2)$(3)
-forcebuild: forcebuild_$(2)$(3)
-push: push_$(2)$(3)
-forcepush: forcepush_$(2)$(3)
-show-tags: show-tag_$(2)$(3)
+build: build_$(2)$(3)$(4)
+forcebuild: forcebuild_$(2)$(3)$(4)
+push: push_$(2)$(3)$(4)
+forcepush: forcepush_$(2)$(3)$(4)
+show-tags: show-tag_$(2)$(3)$(4)
 fetch: sources/linux-$(1).tar.xz
 
 # 'docker build' with the FROM image supplied as --build-arg
 # *and* with DOCKER_CONTENT_TRUST=1 currently does not work
 # (https://github.com/moby/moby/issues/34199). So, we pull the image
-# with DCT as part of the dependency on build_$(2)$(3) and then build 
+# with DCT as part of the dependency on build_$(2)$(3)$(4) and then build
 # with DOCKER_CONTENT_TRUST explicitly set to 0
 
 ifneq ($(2), 4.4.x)
 # perf does not build out of the box for 4.4.x and 4.4.x is not that relevant anymore to work on a fix
-build_perf_$(2)$(3): build_$(2)$(3)
-	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) || \
+build_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
+	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
 		 DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \
-			--build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) \
-			--no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) .
+			--build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) \
+			--no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) .
 
-forcebuild_perf_$(2)$(3): build_$(2)$(3)
+forcebuild_perf_$(2)$(3)$(4): build_$(2)$(3)$(4)
 	 DOCKER_CONTENT_TRUST=0 docker build -f Dockerfile.perf \
-		--build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)-$(TAG)$(SUFFIX) \
-		--no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) .
+		--build-arg IMAGE=$(ORG)/$(IMAGE):$(1)$(3)$(4)-$(TAG)$(SUFFIX) \
+		--no-cache --network=none $(LABEL) -t $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) .
 
-push_perf_$(2)$(3): build_perf_$(2)$(3)
+push_perf_$(2)$(3)$(4): build_perf_$(2)$(3)$(4)
 	@if [ x"$(DIRTY)" != x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi
-	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) || \
-		(docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) && \
-		 docker tag $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(SUFFIX) && \
-		 docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(SUFFIX) && \
-		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
-		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3) $(DOCKER_CONTENT_TRUST))
+	docker pull $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) || \
+		(docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \
+		 docker tag $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \
+		 docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \
+		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
+		 $(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST))
 
-forcepush_perf_$(2)$(3): forcebuild_perf_$(2)$(3)
+forcepush_perf_$(2)$(3)$(4): forcebuild_perf_$(2)$(3)$(4)
 	@if [ x"$(DIRTY)" != x ]; then echo "Your repository is not clean. Will not push image"; exit 1; fi
-	docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) && \
-	docker tag $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(SUFFIX) && \
-	docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(SUFFIX) && \
-	$(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
-	$(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3) $(DOCKER_CONTENT_TRUST)
+	docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) && \
+	docker tag $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG)$(SUFFIX) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \
+	docker push $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)$(SUFFIX) && \
+	$(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4)-$(TAG) $(DOCKER_CONTENT_TRUST) && \
+	$(PUSH_MANIFEST) $(ORG)/$(IMAGE_PERF):$(1)$(3)$(4) $(DOCKER_CONTENT_TRUST)
 
-build: build_perf_$(2)$(3)
-forcebuild: forcebuild_perf_$(2)$(3)
-push: push_perf_$(2)$(3)
-forcepush: forcepush_perf_$(2)$(3)
+build: build_perf_$(2)$(3)$(4)
+forcebuild: forcebuild_perf_$(2)$(3)$(4)
+push: push_perf_$(2)$(3)$(4)
+forcepush: forcepush_perf_$(2)$(3)$(4)
 endif
 
-ifneq ($(3), -dbg)
+ifeq ($(4),)
 # ZFS does not compile against -dbg kernels because CONFIG_DEBUG_LOCK_ALLOC
 # is incompatible with CDDL, apparently (this is ./configure check)
 build_zfs_$(2)$(3): build_$(2)$(3)
@@ -204,12 +214,14 @@ endef
 # Build Targets
 # Debug targets only for latest stable and LTS stable
 #
-$(eval $(call kernel,4.15.3,4.15.x,$(EXTRA)))
-$(eval $(call kernel,4.14.19,4.14.x,$(EXTRA)))
-$(eval $(call kernel,4.14.19,4.14.x,-dbg))
-$(eval $(call kernel,4.9.81,4.9.x,$(EXTRA)))
-$(eval $(call kernel,4.9.81,4.9.x,-dbg))
-$(eval $(call kernel,4.4.115,4.4.x,$(EXTRA)))
+$(eval $(call kernel,4.15.3,4.15.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.19,4.14.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.14.19,4.14.x,,-dbg))
+$(eval $(call kernel,4.14.18,4.14.x,-rt,))
+$(eval $(call kernel,4.14.18,4.14.x,-rt,-dbg))
+$(eval $(call kernel,4.9.81,4.9.x,$(EXTRA),$(DEBUG)))
+$(eval $(call kernel,4.9.81,4.9.x,,-dbg))
+$(eval $(call kernel,4.4.115,4.4.x,$(EXTRA),$(DEBUG)))
 
 # Target for kernel config
 kconfig: | sources
diff --git a/kernel/config-4.14.x-aarch64-rt b/kernel/config-4.14.x-aarch64-rt
new file mode 100644
index 000000000..59ef068ac
--- /dev/null
+++ b/kernel/config-4.14.x-aarch64-rt
@@ -0,0 +1,20 @@
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
+CONFIG_SLUB=y
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_BASE=y
+CONFIG_HAVE_PREEMPT_LAZY=y
+CONFIG_PREEMPT_LAZY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT__LL is not set
+# CONFIG_PREEMPT_RTB is not set
+CONFIG_PREEMPT_RT_FULL=y
+CONFIG_PREEMPT_COUNT=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_DEBUG_PREEMPT=y
+# CONFIG_PREEMPT_TRACER is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
diff --git a/kernel/config-4.14.x-x86_64-rt b/kernel/config-4.14.x-x86_64-rt
new file mode 100644
index 000000000..3c833eb4b
--- /dev/null
+++ b/kernel/config-4.14.x-x86_64-rt
@@ -0,0 +1,22 @@
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+# CONFIG_RWSEM_XCHGADD_ALGORITHM is not set
+CONFIG_PREEMPT_RCU=y
+CONFIG_TASKS_RCU=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
+CONFIG_SLUB=y
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_PREEMPT=y
+CONFIG_PREEMPT_RT_BASE=y
+CONFIG_HAVE_PREEMPT_LAZY=y
+CONFIG_PREEMPT_LAZY=y
+# CONFIG_PREEMPT_VOLUNTARY is not set
+# CONFIG_PREEMPT__LL is not set
+# CONFIG_PREEMPT_RTB is not set
+CONFIG_PREEMPT_RT_FULL=y
+CONFIG_PREEMPT_COUNT=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_DEBUG_PREEMPT=y
+# CONFIG_PREEMPT_TRACER is not set
diff --git a/kernel/patches-4.14.x-rt/0001-rcu-Suppress-lockdep-false-positive-boost_mtx-compla.patch b/kernel/patches-4.14.x-rt/0001-rcu-Suppress-lockdep-false-positive-boost_mtx-compla.patch
new file mode 100644
index 000000000..9c3d3c52a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0001-rcu-Suppress-lockdep-false-positive-boost_mtx-compla.patch
@@ -0,0 +1,49 @@
+From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+Date: Tue, 19 Sep 2017 15:36:42 -0700
+Subject: [PATCH] rcu: Suppress lockdep false-positive ->boost_mtx complaints
+
+Upstream commit bcda31a2659497df39d6bedfbdf17498b4f4ac89
+
+RCU priority boosting uses rt_mutex_init_proxy_locked() to initialize an
+rt_mutex structure in locked state held by some other task.  When that
+other task releases it, lockdep complains (quite accurately, but a bit
+uselessly) that the other task never acquired it.  This complaint can
+suppress other, more helpful, lockdep complaints, and in any case it is
+a false positive.
+
+This commit therefore switches from rt_mutex_unlock() to
+rt_mutex_futex_unlock(), thereby avoiding the lockdep annotations.
+Of course, if lockdep ever learns about rt_mutex_init_proxy_locked(),
+addtional adjustments will be required.
+
+Suggested-by: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/tree_plugin.h |    5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
+@@ -31,11 +31,10 @@
+ #include <linux/smpboot.h>
+ #include <uapi/linux/sched/types.h>
+ #include "../time/tick-internal.h"
++#include "../locking/rtmutex_common.h"
+ 
+ #ifdef CONFIG_RCU_BOOST
+ 
+-#include "../locking/rtmutex_common.h"
+-
+ /*
+  * Control variables for per-CPU and per-rcu_node kthreads.  These
+  * handle all flavors of RCU.
+@@ -530,7 +529,7 @@ void rcu_read_unlock_special(struct task
+ 
+ 		/* Unboost if we were boosted. */
+ 		if (IS_ENABLED(CONFIG_RCU_BOOST) && drop_boost_mutex)
+-			rt_mutex_unlock(&rnp->boost_mtx);
++			rt_mutex_futex_unlock(&rnp->boost_mtx);
+ 
+ 		/*
+ 		 * If this was the last task on the expedited lists,
diff --git a/kernel/patches-4.14.x-rt/0002-brd-remove-unused-brd_mutex.patch b/kernel/patches-4.14.x-rt/0002-brd-remove-unused-brd_mutex.patch
new file mode 100644
index 000000000..ff9f7053b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0002-brd-remove-unused-brd_mutex.patch
@@ -0,0 +1,26 @@
+From: Mikulas Patocka <mpatocka@redhat.com>
+Date: Fri, 10 Nov 2017 12:29:34 -0500
+Subject: [PATCH] brd: remove unused brd_mutex
+
+Upstream commit 15f7b41f70ddcca3b555bd0fdc7c8da7466b517e
+
+Remove unused mutex brd_mutex. It is unused since the commit ff26956875c2
+("brd: remove support for BLKFLSBUF").
+
+Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/block/brd.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/block/brd.c
++++ b/drivers/block/brd.c
+@@ -60,7 +60,6 @@ struct brd_device {
+ /*
+  * Look up and return a brd's page for a given sector.
+  */
+-static DEFINE_MUTEX(brd_mutex);
+ static struct page *brd_lookup_page(struct brd_device *brd, sector_t sector)
+ {
+ 	pgoff_t idx;
diff --git a/kernel/patches-4.14.x-rt/0003-0001-timers-Use-static-keys-for-migrate_enable-nohz_activ.patch b/kernel/patches-4.14.x-rt/0003-0001-timers-Use-static-keys-for-migrate_enable-nohz_activ.patch
new file mode 100644
index 000000000..7d81ed798
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0003-0001-timers-Use-static-keys-for-migrate_enable-nohz_activ.patch
@@ -0,0 +1,272 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:50 +0100
+Subject: [PATCH 01/29] timers: Use static keys for migrate_enable/nohz_active
+
+The members migrate_enable and nohz_active in the timer/hrtimer per CPU
+bases have been introduced to avoid accessing global variables for these
+decisions.
+
+Still that results in a (cache hot) load and conditional branch, which can
+be avoided by using static keys.
+
+Implement it with static keys and optimize for the most critical case of
+high performance networking which tends to disable the timer migration
+functionality.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h     |    4 --
+ kernel/time/hrtimer.c       |   17 ++-------
+ kernel/time/tick-internal.h |   19 ++++++----
+ kernel/time/tick-sched.c    |    2 -
+ kernel/time/timer.c         |   83 ++++++++++++++++++++++----------------------
+ 5 files changed, 61 insertions(+), 64 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -153,8 +153,6 @@ enum  hrtimer_base_type {
+  * @cpu:		cpu number
+  * @active_bases:	Bitfield to mark bases with active timers
+  * @clock_was_set_seq:	Sequence counter of clock was set events
+- * @migration_enabled:	The migration of hrtimers to other cpus is enabled
+- * @nohz_active:	The nohz functionality is enabled
+  * @expires_next:	absolute time of the next event which was scheduled
+  *			via clock_set_next_event()
+  * @next_timer:		Pointer to the first expiring timer
+@@ -178,8 +176,6 @@ struct hrtimer_cpu_base {
+ 	unsigned int			cpu;
+ 	unsigned int			active_bases;
+ 	unsigned int			clock_was_set_seq;
+-	bool				migration_enabled;
+-	bool				nohz_active;
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 	unsigned int			in_hrtirq	: 1,
+ 					hres_active	: 1,
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -178,23 +178,16 @@ hrtimer_check_target(struct hrtimer *tim
+ #endif
+ }
+ 
+-#ifdef CONFIG_NO_HZ_COMMON
+-static inline
+-struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base,
+-					 int pinned)
+-{
+-	if (pinned || !base->migration_enabled)
+-		return base;
+-	return &per_cpu(hrtimer_bases, get_nohz_timer_target());
+-}
+-#else
+ static inline
+ struct hrtimer_cpu_base *get_target_base(struct hrtimer_cpu_base *base,
+ 					 int pinned)
+ {
++#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
++	if (static_branch_unlikely(&timers_migration_enabled) && !pinned)
++		return &per_cpu(hrtimer_bases, get_nohz_timer_target());
++#endif
+ 	return base;
+ }
+-#endif
+ 
+ /*
+  * We switch the timer base to a power-optimized selected CPU target,
+@@ -973,7 +966,7 @@ void hrtimer_start_range_ns(struct hrtim
+ 		 * Kick to reschedule the next tick to handle the new timer
+ 		 * on dynticks target.
+ 		 */
+-		if (new_base->cpu_base->nohz_active)
++		if (is_timers_nohz_active())
+ 			wake_up_nohz_cpu(new_base->cpu_base->cpu);
+ 	} else {
+ 		hrtimer_reprogram(timer, new_base);
+--- a/kernel/time/tick-internal.h
++++ b/kernel/time/tick-internal.h
+@@ -150,14 +150,19 @@ static inline void tick_nohz_init(void)
+ 
+ #ifdef CONFIG_NO_HZ_COMMON
+ extern unsigned long tick_nohz_active;
+-#else
++extern void timers_update_nohz(void);
++extern struct static_key_false timers_nohz_active;
++static inline bool is_timers_nohz_active(void)
++{
++	return static_branch_unlikely(&timers_nohz_active);
++}
++# ifdef CONFIG_SMP
++extern struct static_key_false timers_migration_enabled;
++# endif
++#else /* CONFIG_NO_HZ_COMMON */
++static inline void timers_update_nohz(void) { }
+ #define tick_nohz_active (0)
+-#endif
+-
+-#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
+-extern void timers_update_migration(bool update_nohz);
+-#else
+-static inline void timers_update_migration(bool update_nohz) { }
++static inline bool is_timers_nohz_active(void) { return false; }
+ #endif
+ 
+ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -1131,7 +1131,7 @@ static inline void tick_nohz_activate(st
+ 	ts->nohz_mode = mode;
+ 	/* One update is enough */
+ 	if (!test_and_set_bit(0, &tick_nohz_active))
+-		timers_update_migration(true);
++		timers_update_nohz();
+ }
+ 
+ /**
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -200,8 +200,6 @@ struct timer_base {
+ 	unsigned long		clk;
+ 	unsigned long		next_expiry;
+ 	unsigned int		cpu;
+-	bool			migration_enabled;
+-	bool			nohz_active;
+ 	bool			is_idle;
+ 	bool			must_forward_clk;
+ 	DECLARE_BITMAP(pending_map, WHEEL_SIZE);
+@@ -210,45 +208,59 @@ struct timer_base {
+ 
+ static DEFINE_PER_CPU(struct timer_base, timer_bases[NR_BASES]);
+ 
+-#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
++#ifdef CONFIG_NO_HZ_COMMON
++
++DEFINE_STATIC_KEY_FALSE(timers_nohz_active);
++static DEFINE_MUTEX(timer_keys_mutex);
++
++static void timer_update_keys(struct work_struct *work);
++static DECLARE_WORK(timer_update_work, timer_update_keys);
++
++#ifdef CONFIG_SMP
+ unsigned int sysctl_timer_migration = 1;
+ 
+-void timers_update_migration(bool update_nohz)
++DEFINE_STATIC_KEY_FALSE(timers_migration_enabled);
++
++static void timers_update_migration(void)
+ {
+ 	bool on = sysctl_timer_migration && tick_nohz_active;
+-	unsigned int cpu;
+ 
+-	/* Avoid the loop, if nothing to update */
+-	if (this_cpu_read(timer_bases[BASE_STD].migration_enabled) == on)
+-		return;
++	if (on)
++		static_branch_enable(&timers_migration_enabled);
++	else
++		static_branch_disable(&timers_migration_enabled);
++}
++#else
++static inline void timers_update_migration(void) { }
++#endif /* !CONFIG_SMP */
+ 
+-	for_each_possible_cpu(cpu) {
+-		per_cpu(timer_bases[BASE_STD].migration_enabled, cpu) = on;
+-		per_cpu(timer_bases[BASE_DEF].migration_enabled, cpu) = on;
+-		per_cpu(hrtimer_bases.migration_enabled, cpu) = on;
+-		if (!update_nohz)
+-			continue;
+-		per_cpu(timer_bases[BASE_STD].nohz_active, cpu) = true;
+-		per_cpu(timer_bases[BASE_DEF].nohz_active, cpu) = true;
+-		per_cpu(hrtimer_bases.nohz_active, cpu) = true;
+-	}
++static void timer_update_keys(struct work_struct *work)
++{
++	mutex_lock(&timer_keys_mutex);
++	timers_update_migration();
++	static_branch_enable(&timers_nohz_active);
++	mutex_unlock(&timer_keys_mutex);
++}
++
++void timers_update_nohz(void)
++{
++	schedule_work(&timer_update_work);
+ }
+ 
+ int timer_migration_handler(struct ctl_table *table, int write,
+ 			    void __user *buffer, size_t *lenp,
+ 			    loff_t *ppos)
+ {
+-	static DEFINE_MUTEX(mutex);
+ 	int ret;
+ 
+-	mutex_lock(&mutex);
++	mutex_lock(&timer_keys_mutex);
+ 	ret = proc_dointvec_minmax(table, write, buffer, lenp, ppos);
+ 	if (!ret && write)
+-		timers_update_migration(false);
+-	mutex_unlock(&mutex);
++		timers_update_migration();
++	mutex_unlock(&timer_keys_mutex);
+ 	return ret;
+ }
+-#endif
++#endif /* NO_HZ_COMMON */
+ 
+ static unsigned long round_jiffies_common(unsigned long j, int cpu,
+ 		bool force_up)
+@@ -534,7 +546,7 @@ static void
+ static void
+ trigger_dyntick_cpu(struct timer_base *base, struct timer_list *timer)
+ {
+-	if (!IS_ENABLED(CONFIG_NO_HZ_COMMON) || !base->nohz_active)
++	if (!is_timers_nohz_active())
+ 		return;
+ 
+ 	/*
+@@ -840,21 +852,20 @@ static inline struct timer_base *get_tim
+ 	return get_timer_cpu_base(tflags, tflags & TIMER_CPUMASK);
+ }
+ 
+-#ifdef CONFIG_NO_HZ_COMMON
+ static inline struct timer_base *
+ get_target_base(struct timer_base *base, unsigned tflags)
+ {
+-#ifdef CONFIG_SMP
+-	if ((tflags & TIMER_PINNED) || !base->migration_enabled)
+-		return get_timer_this_cpu_base(tflags);
+-	return get_timer_cpu_base(tflags, get_nohz_timer_target());
+-#else
+-	return get_timer_this_cpu_base(tflags);
++#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ_COMMON)
++	if (static_branch_unlikely(&timers_migration_enabled) &&
++	    !(tflags & TIMER_PINNED))
++		return get_timer_cpu_base(tflags, get_nohz_timer_target());
+ #endif
++	return get_timer_this_cpu_base(tflags);
+ }
+ 
+ static inline void forward_timer_base(struct timer_base *base)
+ {
++#ifdef CONFIG_NO_HZ_COMMON
+ 	unsigned long jnow;
+ 
+ 	/*
+@@ -878,16 +889,8 @@ static inline void forward_timer_base(st
+ 		base->clk = jnow;
+ 	else
+ 		base->clk = base->next_expiry;
+-}
+-#else
+-static inline struct timer_base *
+-get_target_base(struct timer_base *base, unsigned tflags)
+-{
+-	return get_timer_this_cpu_base(tflags);
+-}
+-
+-static inline void forward_timer_base(struct timer_base *base) { }
+ #endif
++}
+ 
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0004-0002-hrtimer-Correct-blantanly-wrong-comment.patch b/kernel/patches-4.14.x-rt/0004-0002-hrtimer-Correct-blantanly-wrong-comment.patch
new file mode 100644
index 000000000..651a4c4e7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0004-0002-hrtimer-Correct-blantanly-wrong-comment.patch
@@ -0,0 +1,36 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:51 +0100
+Subject: [PATCH 02/29] hrtimer: Correct blantanly wrong comment
+
+The protection of a hrtimer which runs its callback against migration to a
+different CPU has nothing to do with hard interrupt context.
+
+The protection against migration of a hrtimer running the expiry callback
+is the pointer in the cpu_base which holds a pointer to the currently
+running timer. This pointer is evaluated in the code which potentially
+switches the timer base and makes sure it's kept on the CPU on which the
+callback is running.
+
+Reported-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1199,9 +1199,9 @@ static void __run_hrtimer(struct hrtimer
+ 		timer->is_rel = false;
+ 
+ 	/*
+-	 * Because we run timers from hardirq context, there is no chance
+-	 * they get migrated to another cpu, therefore its safe to unlock
+-	 * the timer base.
++	 * The timer is marked as running in the cpu base, so it is
++	 * protected against migration to a different CPU even if the lock
++	 * is dropped.
+ 	 */
+ 	raw_spin_unlock(&cpu_base->lock);
+ 	trace_hrtimer_expire_entry(timer, now);
diff --git a/kernel/patches-4.14.x-rt/0005-0003-hrtimer-Fix-kerneldoc-for-struct-hrtimer_cpu_base.patch b/kernel/patches-4.14.x-rt/0005-0003-hrtimer-Fix-kerneldoc-for-struct-hrtimer_cpu_base.patch
new file mode 100644
index 000000000..aa3840f43
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0005-0003-hrtimer-Fix-kerneldoc-for-struct-hrtimer_cpu_base.patch
@@ -0,0 +1,42 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:52 +0100
+Subject: [PATCH 03/29] hrtimer: Fix kerneldoc for struct hrtimer_cpu_base
+
+The sequence '/**' marks the start of a struct description. Add the
+missing second asterisk. While at it adapt the ordering of the struct
+members to the struct definition and document the purpose of
+expires_next more precisely.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -144,7 +144,7 @@ enum  hrtimer_base_type {
+ 	HRTIMER_MAX_CLOCK_BASES,
+ };
+ 
+-/*
++/**
+  * struct hrtimer_cpu_base - the per cpu clock bases
+  * @lock:		lock protecting the base and associated clock bases
+  *			and timers
+@@ -153,12 +153,12 @@ enum  hrtimer_base_type {
+  * @cpu:		cpu number
+  * @active_bases:	Bitfield to mark bases with active timers
+  * @clock_was_set_seq:	Sequence counter of clock was set events
+- * @expires_next:	absolute time of the next event which was scheduled
+- *			via clock_set_next_event()
+- * @next_timer:		Pointer to the first expiring timer
+  * @in_hrtirq:		hrtimer_interrupt() is currently executing
+  * @hres_active:	State of high resolution mode
+  * @hang_detected:	The last hrtimer interrupt detected a hang
++ * @expires_next:	absolute time of the next event, is required for remote
++ *			hrtimer enqueue
++ * @next_timer:		Pointer to the first expiring timer
+  * @nr_events:		Total number of hrtimer interrupt events
+  * @nr_retries:		Total number of hrtimer interrupt retries
+  * @nr_hangs:		Total number of hrtimer interrupt hangs
diff --git a/kernel/patches-4.14.x-rt/0006-0004-hrtimer-Cleanup-clock-argument-in-schedule_hrtimeout.patch b/kernel/patches-4.14.x-rt/0006-0004-hrtimer-Cleanup-clock-argument-in-schedule_hrtimeout.patch
new file mode 100644
index 000000000..5434649f9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0006-0004-hrtimer-Cleanup-clock-argument-in-schedule_hrtimeout.patch
@@ -0,0 +1,80 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:53 +0100
+Subject: [PATCH 04/29] hrtimer: Cleanup clock argument in
+ schedule_hrtimeout_range_clock()
+
+schedule_hrtimeout_range_clock() uses an integer for the clock id
+instead of the predefined type "clockid_t". The ID of the clock is
+indicated in hrtimer code as clock_id. Therefore change the name of
+the variable as well to make it consistent.
+
+While at it, clean up the description for the function parameters clock_id
+and mode. The clock modes and the clock ids are not restricted as the
+comment suggests. Fix the mode description as well for the callers of
+schedule_hrtimeout_range_clock().
+
+No functional change.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    2 +-
+ kernel/time/hrtimer.c   |   12 ++++++------
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -462,7 +462,7 @@ extern int schedule_hrtimeout_range(ktim
+ extern int schedule_hrtimeout_range_clock(ktime_t *expires,
+ 					  u64 delta,
+ 					  const enum hrtimer_mode mode,
+-					  int clock);
++					  clockid_t clock_id);
+ extern int schedule_hrtimeout(ktime_t *expires, const enum hrtimer_mode mode);
+ 
+ /* Soft interrupt function to run the hrtimer queues: */
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1667,12 +1667,12 @@ void __init hrtimers_init(void)
+  * schedule_hrtimeout_range_clock - sleep until timeout
+  * @expires:	timeout value (ktime_t)
+  * @delta:	slack in expires timeout (ktime_t)
+- * @mode:	timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL
+- * @clock:	timer clock, CLOCK_MONOTONIC or CLOCK_REALTIME
++ * @mode:	timer mode
++ * @clock_id:	timer clock to be used
+  */
+ int __sched
+ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,
+-			       const enum hrtimer_mode mode, int clock)
++			       const enum hrtimer_mode mode, clockid_t clock_id)
+ {
+ 	struct hrtimer_sleeper t;
+ 
+@@ -1693,7 +1693,7 @@ schedule_hrtimeout_range_clock(ktime_t *
+ 		return -EINTR;
+ 	}
+ 
+-	hrtimer_init_on_stack(&t.timer, clock, mode);
++	hrtimer_init_on_stack(&t.timer, clock_id, mode);
+ 	hrtimer_set_expires_range_ns(&t.timer, *expires, delta);
+ 
+ 	hrtimer_init_sleeper(&t, current);
+@@ -1715,7 +1715,7 @@ schedule_hrtimeout_range_clock(ktime_t *
+  * schedule_hrtimeout_range - sleep until timeout
+  * @expires:	timeout value (ktime_t)
+  * @delta:	slack in expires timeout (ktime_t)
+- * @mode:	timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL
++ * @mode:	timer mode
+  *
+  * Make the current task sleep until the given expiry time has
+  * elapsed. The routine will return immediately unless
+@@ -1754,7 +1754,7 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_ran
+ /**
+  * schedule_hrtimeout - sleep until timeout
+  * @expires:	timeout value (ktime_t)
+- * @mode:	timer mode, HRTIMER_MODE_ABS or HRTIMER_MODE_REL
++ * @mode:	timer mode
+  *
+  * Make the current task sleep until the given expiry time has
+  * elapsed. The routine will return immediately unless
diff --git a/kernel/patches-4.14.x-rt/0007-0005-hrtimer-Fix-hrtimer-function-description.patch b/kernel/patches-4.14.x-rt/0007-0005-hrtimer-Fix-hrtimer-function-description.patch
new file mode 100644
index 000000000..adf8f66d2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0007-0005-hrtimer-Fix-hrtimer-function-description.patch
@@ -0,0 +1,60 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:54 +0100
+Subject: [PATCH 05/29] hrtimer: Fix hrtimer function description
+
+The hrtimer_start[_range_ns]() starts a timer reliable on this CPU only
+when HRTIMER_MODE_PINNED is set. Furthermore the HRTIMER_MODE_PINNED mode
+is not considered, when a hrtimer is initialized.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    6 +++---
+ kernel/time/hrtimer.c   |    9 +++++----
+ 2 files changed, 8 insertions(+), 7 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -361,11 +361,11 @@ extern void hrtimer_start_range_ns(struc
+ 				   u64 range_ns, const enum hrtimer_mode mode);
+ 
+ /**
+- * hrtimer_start - (re)start an hrtimer on the current CPU
++ * hrtimer_start - (re)start an hrtimer
+  * @timer:	the timer to be added
+  * @tim:	expiry time
+- * @mode:	expiry mode: absolute (HRTIMER_MODE_ABS) or
+- *		relative (HRTIMER_MODE_REL)
++ * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
++ *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
+  */
+ static inline void hrtimer_start(struct hrtimer *timer, ktime_t tim,
+ 				 const enum hrtimer_mode mode)
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -928,12 +928,12 @@ static inline ktime_t hrtimer_update_low
+ }
+ 
+ /**
+- * hrtimer_start_range_ns - (re)start an hrtimer on the current CPU
++ * hrtimer_start_range_ns - (re)start an hrtimer
+  * @timer:	the timer to be added
+  * @tim:	expiry time
+  * @delta_ns:	"slack" range for the timer
+- * @mode:	expiry mode: absolute (HRTIMER_MODE_ABS) or
+- *		relative (HRTIMER_MODE_REL)
++ * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
++ *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
+  */
+ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+ 			    u64 delta_ns, const enum hrtimer_mode mode)
+@@ -1111,7 +1111,8 @@ static void __hrtimer_init(struct hrtime
+  * hrtimer_init - initialize a timer to the given clock
+  * @timer:	the timer to be initialized
+  * @clock_id:	the clock to be used
+- * @mode:	timer mode abs/rel
++ * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
++ *		relative (HRTIMER_MODE_REL); pinned is not considered here!
+  */
+ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
+ 		  enum hrtimer_mode mode)
diff --git a/kernel/patches-4.14.x-rt/0008-0006-hrtimer-Ensure-POSIX-compliance-relative-CLOCK_REALT.patch b/kernel/patches-4.14.x-rt/0008-0006-hrtimer-Ensure-POSIX-compliance-relative-CLOCK_REALT.patch
new file mode 100644
index 000000000..39a29ecf2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0008-0006-hrtimer-Ensure-POSIX-compliance-relative-CLOCK_REALT.patch
@@ -0,0 +1,40 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:55 +0100
+Subject: [PATCH 06/29] hrtimer: Ensure POSIX compliance (relative
+ CLOCK_REALTIME hrtimers)
+
+POSIX specification defines, that relative CLOCK_REALTIME timers are not
+affected by clock modifications. Those timers have to use CLOCK_MONOTONIC
+to ensure POSIX compliance.
+
+The introduction of the additional mode HRTIMER_MODE_PINNED broke this
+requirement for pinned timers. There is no user space visible impact
+because user space timers are not using the pinned mode, but for
+consistency reasons this needs to be fixed.
+
+Check whether the mode has the HRTIMER_MODE_REL bit set instead of
+comparing with HRTIMER_MODE_ABS.
+
+Fixes: 597d0275736d ("timers: Framework for identifying pinned timers")
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1099,7 +1099,12 @@ static void __hrtimer_init(struct hrtime
+ 
+ 	cpu_base = raw_cpu_ptr(&hrtimer_bases);
+ 
+-	if (clock_id == CLOCK_REALTIME && mode != HRTIMER_MODE_ABS)
++	/*
++	 * Posix magic: Relative CLOCK_REALTIME timers are not affected by
++	 * clock modifications, so they needs to become CLOCK_MONOTONIC to
++	 * ensure Posix compliance.
++	 */
++	if (clock_id == CLOCK_REALTIME && mode & HRTIMER_MODE_REL)
+ 		clock_id = CLOCK_MONOTONIC;
+ 
+ 	base = hrtimer_clockid_to_base(clock_id);
diff --git a/kernel/patches-4.14.x-rt/0009-0007-hrtimer-Cleanup-hrtimer_mode-enum.patch b/kernel/patches-4.14.x-rt/0009-0007-hrtimer-Cleanup-hrtimer_mode-enum.patch
new file mode 100644
index 000000000..47307862f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0009-0007-hrtimer-Cleanup-hrtimer_mode-enum.patch
@@ -0,0 +1,45 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:56 +0100
+Subject: [PATCH 07/29] hrtimer: Cleanup hrtimer_mode enum
+
+It's not obvious that the HRTIMER_MODE variants are bit combinations
+because all modes are hard coded constants.
+
+Change it so the bit meanings are clear and use the symbols for creating
+modes which combine bits.
+
+While at it get rid of the ugly tail comments.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |   16 +++++++++++-----
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -28,13 +28,19 @@ struct hrtimer_cpu_base;
+ 
+ /*
+  * Mode arguments of xxx_hrtimer functions:
++ *
++ * HRTIMER_MODE_ABS		- Time value is absolute
++ * HRTIMER_MODE_REL		- Time value is relative to now
++ * HRTIMER_MODE_PINNED		- Timer is bound to CPU (is only considered
++ *				  when starting the timer)
+  */
+ enum hrtimer_mode {
+-	HRTIMER_MODE_ABS = 0x0,		/* Time value is absolute */
+-	HRTIMER_MODE_REL = 0x1,		/* Time value is relative to now */
+-	HRTIMER_MODE_PINNED = 0x02,	/* Timer is bound to CPU */
+-	HRTIMER_MODE_ABS_PINNED = 0x02,
+-	HRTIMER_MODE_REL_PINNED = 0x03,
++	HRTIMER_MODE_ABS	= 0x00,
++	HRTIMER_MODE_REL	= 0x01,
++	HRTIMER_MODE_PINNED	= 0x02,
++
++	HRTIMER_MODE_ABS_PINNED = HRTIMER_MODE_ABS | HRTIMER_MODE_PINNED,
++	HRTIMER_MODE_REL_PINNED = HRTIMER_MODE_REL | HRTIMER_MODE_PINNED,
+ };
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0010-0008-tracing-hrtimer-Take-all-clock-bases-and-modes-into-.patch b/kernel/patches-4.14.x-rt/0010-0008-tracing-hrtimer-Take-all-clock-bases-and-modes-into-.patch
new file mode 100644
index 000000000..17ed746cd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0010-0008-tracing-hrtimer-Take-all-clock-bases-and-modes-into-.patch
@@ -0,0 +1,55 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:57 +0100
+Subject: [PATCH 08/29] tracing/hrtimer: Take all clock bases and modes into
+ account
+
+So far only CLOCK_MONOTONIC and CLOCK_REALTIME were taken into account as
+well as HRTIMER_MODE_ABS/REL in hrtimer_init tracepoint. The query for
+detecting timer mode ABS or REL is not valid, since the introduction of
+HRTIMER_MODE_PINNED.
+
+HRTIMER_MODE_PINNED is not evaluated in hrtimer_init() call. But for the
+sake of completeness print all given modes.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/trace/events/timer.h |   20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+--- a/include/trace/events/timer.h
++++ b/include/trace/events/timer.h
+@@ -136,6 +136,20 @@ DEFINE_EVENT(timer_class, timer_cancel,
+ 	TP_ARGS(timer)
+ );
+ 
++#define decode_clockid(type)						\
++	__print_symbolic(type,						\
++		{ CLOCK_REALTIME,	"CLOCK_REALTIME"	},	\
++		{ CLOCK_MONOTONIC,	"CLOCK_MONOTONIC"	},	\
++		{ CLOCK_BOOTTIME,	"CLOCK_BOOTTIME"	},	\
++		{ CLOCK_TAI,		"CLOCK_TAI"		})
++
++#define decode_hrtimer_mode(mode)					\
++	__print_symbolic(mode,						\
++		{ HRTIMER_MODE_ABS,		"ABS"		},	\
++		{ HRTIMER_MODE_REL,		"REL"		},	\
++		{ HRTIMER_MODE_ABS_PINNED,	"ABS|PINNED"	},	\
++		{ HRTIMER_MODE_REL_PINNED,	"REL|PINNED"	})
++
+ /**
+  * hrtimer_init - called when the hrtimer is initialized
+  * @hrtimer:	pointer to struct hrtimer
+@@ -162,10 +176,8 @@ TRACE_EVENT(hrtimer_init,
+ 	),
+ 
+ 	TP_printk("hrtimer=%p clockid=%s mode=%s", __entry->hrtimer,
+-		  __entry->clockid == CLOCK_REALTIME ?
+-			"CLOCK_REALTIME" : "CLOCK_MONOTONIC",
+-		  __entry->mode == HRTIMER_MODE_ABS ?
+-			"HRTIMER_MODE_ABS" : "HRTIMER_MODE_REL")
++		  decode_clockid(__entry->clockid),
++		  decode_hrtimer_mode(__entry->mode))
+ );
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0011-0009-tracing-hrtimer-Print-hrtimer-mode-in-hrtimer_start-.patch b/kernel/patches-4.14.x-rt/0011-0009-tracing-hrtimer-Print-hrtimer-mode-in-hrtimer_start-.patch
new file mode 100644
index 000000000..9e377f545
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0011-0009-tracing-hrtimer-Print-hrtimer-mode-in-hrtimer_start-.patch
@@ -0,0 +1,113 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:58 +0100
+Subject: [PATCH 09/29] tracing/hrtimer: Print hrtimer mode in hrtimer_start
+ tracepoint
+
+The hrtimer_start tracepoint lacks the mode information. The mode is
+important because consecutive starts can switch from ABS to REL or from
+PINNED to non PINNED.
+
+Add the mode information.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/trace/events/timer.h |   13 ++++++++-----
+ kernel/time/hrtimer.c        |   16 +++++++++-------
+ 2 files changed, 17 insertions(+), 12 deletions(-)
+
+--- a/include/trace/events/timer.h
++++ b/include/trace/events/timer.h
+@@ -186,15 +186,16 @@ TRACE_EVENT(hrtimer_init,
+  */
+ TRACE_EVENT(hrtimer_start,
+ 
+-	TP_PROTO(struct hrtimer *hrtimer),
++	TP_PROTO(struct hrtimer *hrtimer, enum hrtimer_mode mode),
+ 
+-	TP_ARGS(hrtimer),
++	TP_ARGS(hrtimer, mode),
+ 
+ 	TP_STRUCT__entry(
+ 		__field( void *,	hrtimer		)
+ 		__field( void *,	function	)
+ 		__field( s64,		expires		)
+ 		__field( s64,		softexpires	)
++		__field( enum hrtimer_mode,	mode	)
+ 	),
+ 
+ 	TP_fast_assign(
+@@ -202,12 +203,14 @@ TRACE_EVENT(hrtimer_start,
+ 		__entry->function	= hrtimer->function;
+ 		__entry->expires	= hrtimer_get_expires(hrtimer);
+ 		__entry->softexpires	= hrtimer_get_softexpires(hrtimer);
++		__entry->mode		= mode;
+ 	),
+ 
+-	TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu",
+-		  __entry->hrtimer, __entry->function,
++	TP_printk("hrtimer=%p function=%pf expires=%llu softexpires=%llu "
++		  "mode=%s", __entry->hrtimer, __entry->function,
+ 		  (unsigned long long) __entry->expires,
+-		  (unsigned long long) __entry->softexpires)
++		  (unsigned long long) __entry->softexpires,
++		  decode_hrtimer_mode(__entry->mode))
+ );
+ 
+ /**
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -435,10 +435,11 @@ debug_init(struct hrtimer *timer, clocki
+ 	trace_hrtimer_init(timer, clockid, mode);
+ }
+ 
+-static inline void debug_activate(struct hrtimer *timer)
++static inline void debug_activate(struct hrtimer *timer,
++				  enum hrtimer_mode mode)
+ {
+ 	debug_hrtimer_activate(timer);
+-	trace_hrtimer_start(timer);
++	trace_hrtimer_start(timer, mode);
+ }
+ 
+ static inline void debug_deactivate(struct hrtimer *timer)
+@@ -832,9 +833,10 @@ EXPORT_SYMBOL_GPL(hrtimer_forward);
+  * Returns 1 when the new timer is the leftmost timer in the tree.
+  */
+ static int enqueue_hrtimer(struct hrtimer *timer,
+-			   struct hrtimer_clock_base *base)
++			   struct hrtimer_clock_base *base,
++			   enum hrtimer_mode mode)
+ {
+-	debug_activate(timer);
++	debug_activate(timer, mode);
+ 
+ 	base->cpu_base->active_bases |= 1 << base->index;
+ 
+@@ -957,7 +959,7 @@ void hrtimer_start_range_ns(struct hrtim
+ 	/* Switch the timer base, if necessary: */
+ 	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
+ 
+-	leftmost = enqueue_hrtimer(timer, new_base);
++	leftmost = enqueue_hrtimer(timer, new_base, mode);
+ 	if (!leftmost)
+ 		goto unlock;
+ 
+@@ -1226,7 +1228,7 @@ static void __run_hrtimer(struct hrtimer
+ 	 */
+ 	if (restart != HRTIMER_NORESTART &&
+ 	    !(timer->state & HRTIMER_STATE_ENQUEUED))
+-		enqueue_hrtimer(timer, base);
++		enqueue_hrtimer(timer, base, HRTIMER_MODE_ABS);
+ 
+ 	/*
+ 	 * Separate the ->running assignment from the ->state assignment.
+@@ -1626,7 +1628,7 @@ static void migrate_hrtimer_list(struct
+ 		 * sort out already expired timers and reprogram the
+ 		 * event device.
+ 		 */
+-		enqueue_hrtimer(timer, new_base);
++		enqueue_hrtimer(timer, new_base, HRTIMER_MODE_ABS);
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0012-0010-hrtimer-Switch-for-loop-to-_ffs-evaluation.patch b/kernel/patches-4.14.x-rt/0012-0010-hrtimer-Switch-for-loop-to-_ffs-evaluation.patch
new file mode 100644
index 000000000..f8c3427f9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0012-0010-hrtimer-Switch-for-loop-to-_ffs-evaluation.patch
@@ -0,0 +1,84 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:12:59 +0100
+Subject: [PATCH 10/29] hrtimer: Switch for loop to _ffs() evaluation
+
+Looping over all clock bases to find active bits is suboptimal if not all
+bases are active.
+
+Avoid this by converting it to a __ffs() evaluation. The functionallity is
+outsourced into an own function and is called via a macro as suggested by
+Peter Zijlstra.
+
+Suggested-by: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   31 +++++++++++++++++++++----------
+ 1 file changed, 21 insertions(+), 10 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -448,6 +448,23 @@ static inline void debug_deactivate(stru
+ 	trace_hrtimer_cancel(timer);
+ }
+ 
++static struct hrtimer_clock_base *
++__next_base(struct hrtimer_cpu_base *cpu_base, unsigned int *active)
++{
++	unsigned int idx;
++
++	if (!*active)
++		return NULL;
++
++	idx = __ffs(*active);
++	*active &= ~(1U << idx);
++
++	return &cpu_base->clock_base[idx];
++}
++
++#define for_each_active_base(base, cpu_base, active)	\
++	while ((base = __next_base((cpu_base), &(active))))
++
+ #if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)
+ static inline void hrtimer_update_next_timer(struct hrtimer_cpu_base *cpu_base,
+ 					     struct hrtimer *timer)
+@@ -459,18 +476,15 @@ static inline void hrtimer_update_next_t
+ 
+ static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
+ {
+-	struct hrtimer_clock_base *base = cpu_base->clock_base;
++	struct hrtimer_clock_base *base;
+ 	unsigned int active = cpu_base->active_bases;
+ 	ktime_t expires, expires_next = KTIME_MAX;
+ 
+ 	hrtimer_update_next_timer(cpu_base, NULL);
+-	for (; active; base++, active >>= 1) {
++	for_each_active_base(base, cpu_base, active) {
+ 		struct timerqueue_node *next;
+ 		struct hrtimer *timer;
+ 
+-		if (!(active & 0x01))
+-			continue;
+-
+ 		next = timerqueue_getnext(&base->active);
+ 		timer = container_of(next, struct hrtimer, node);
+ 		expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
+@@ -1245,16 +1259,13 @@ static void __run_hrtimer(struct hrtimer
+ 
+ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
+ {
+-	struct hrtimer_clock_base *base = cpu_base->clock_base;
++	struct hrtimer_clock_base *base;
+ 	unsigned int active = cpu_base->active_bases;
+ 
+-	for (; active; base++, active >>= 1) {
++	for_each_active_base(base, cpu_base, active) {
+ 		struct timerqueue_node *node;
+ 		ktime_t basenow;
+ 
+-		if (!(active & 0x01))
+-			continue;
+-
+ 		basenow = ktime_add(now, base->offset);
+ 
+ 		while ((node = timerqueue_getnext(&base->active))) {
diff --git a/kernel/patches-4.14.x-rt/0013-0011-hrtimer-Store-running-timer-in-hrtimer_clock_base.patch b/kernel/patches-4.14.x-rt/0013-0011-hrtimer-Store-running-timer-in-hrtimer_clock_base.patch
new file mode 100644
index 000000000..3ed7fd177
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0013-0011-hrtimer-Store-running-timer-in-hrtimer_clock_base.patch
@@ -0,0 +1,191 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:00 +0100
+Subject: [PATCH 11/29] hrtimer: Store running timer in hrtimer_clock_base
+
+The pointer to the currently running timer is stored in hrtimer_cpu_base
+before the base lock is dropped and the callback is invoked.
+
+This results in two levels of indirections and the upcoming support for
+softirq based hrtimer requires splitting the "running" storage into soft
+and hard irq context expiry.
+
+Storing both in the cpu base would require conditionals in all code paths
+accessing that information.
+
+It's possible to have a per clock base sequence count and running pointer
+without changing the semantics of the related mechanisms because the timer
+base pointer cannot be changed while a timer is running the callback.
+
+Unfortunately this makes cpu_clock base larger than 32 bytes on 32bit
+kernels. Instead of having huge gaps due to alignment, remove the alignment
+and let the compiler pack cpu base for 32bit. The resulting cache access
+patterns are fortunately not really different from the current
+behaviour. On 64bit kernels the 64byte alignment stays and the behaviour is
+unchanged. This was determined by analyzing the resulting layout and
+looking at the number of cache lines involved for the frequently used
+clocks.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |   20 +++++++++-----------
+ kernel/time/hrtimer.c   |   28 +++++++++++++---------------
+ 2 files changed, 22 insertions(+), 26 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -118,9 +118,9 @@ struct hrtimer_sleeper {
+ };
+ 
+ #ifdef CONFIG_64BIT
+-# define HRTIMER_CLOCK_BASE_ALIGN	64
++# define __hrtimer_clock_base_align	____cacheline_aligned
+ #else
+-# define HRTIMER_CLOCK_BASE_ALIGN	32
++# define __hrtimer_clock_base_align
+ #endif
+ 
+ /**
+@@ -129,18 +129,22 @@ struct hrtimer_sleeper {
+  * @index:		clock type index for per_cpu support when moving a
+  *			timer to a base on another cpu.
+  * @clockid:		clock id for per_cpu support
++ * @seq:		seqcount around __run_hrtimer
++ * @running:		pointer to the currently running hrtimer
+  * @active:		red black tree root node for the active timers
+  * @get_time:		function to retrieve the current time of the clock
+  * @offset:		offset of this clock to the monotonic base
+  */
+ struct hrtimer_clock_base {
+ 	struct hrtimer_cpu_base	*cpu_base;
+-	int			index;
++	unsigned int		index;
+ 	clockid_t		clockid;
++	seqcount_t		seq;
++	struct hrtimer		*running;
+ 	struct timerqueue_head	active;
+ 	ktime_t			(*get_time)(void);
+ 	ktime_t			offset;
+-} __attribute__((__aligned__(HRTIMER_CLOCK_BASE_ALIGN)));
++} __hrtimer_clock_base_align;
+ 
+ enum  hrtimer_base_type {
+ 	HRTIMER_BASE_MONOTONIC,
+@@ -154,8 +158,6 @@ enum  hrtimer_base_type {
+  * struct hrtimer_cpu_base - the per cpu clock bases
+  * @lock:		lock protecting the base and associated clock bases
+  *			and timers
+- * @seq:		seqcount around __run_hrtimer
+- * @running:		pointer to the currently running hrtimer
+  * @cpu:		cpu number
+  * @active_bases:	Bitfield to mark bases with active timers
+  * @clock_was_set_seq:	Sequence counter of clock was set events
+@@ -177,8 +179,6 @@ enum  hrtimer_base_type {
+  */
+ struct hrtimer_cpu_base {
+ 	raw_spinlock_t			lock;
+-	seqcount_t			seq;
+-	struct hrtimer			*running;
+ 	unsigned int			cpu;
+ 	unsigned int			active_bases;
+ 	unsigned int			clock_was_set_seq;
+@@ -198,8 +198,6 @@ struct hrtimer_cpu_base {
+ 
+ static inline void hrtimer_set_expires(struct hrtimer *timer, ktime_t time)
+ {
+-	BUILD_BUG_ON(sizeof(struct hrtimer_clock_base) > HRTIMER_CLOCK_BASE_ALIGN);
+-
+ 	timer->node.expires = time;
+ 	timer->_softexpires = time;
+ }
+@@ -424,7 +422,7 @@ static inline int hrtimer_is_queued(stru
+  */
+ static inline int hrtimer_callback_running(struct hrtimer *timer)
+ {
+-	return timer->base->cpu_base->running == timer;
++	return timer->base->running == timer;
+ }
+ 
+ /* Forward a hrtimer so it expires after now: */
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -70,7 +70,6 @@
+ DEFINE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases) =
+ {
+ 	.lock = __RAW_SPIN_LOCK_UNLOCKED(hrtimer_bases.lock),
+-	.seq = SEQCNT_ZERO(hrtimer_bases.seq),
+ 	.clock_base =
+ 	{
+ 		{
+@@ -118,7 +117,6 @@ static const int hrtimer_clock_to_base_t
+  * timer->base->cpu_base
+  */
+ static struct hrtimer_cpu_base migration_cpu_base = {
+-	.seq = SEQCNT_ZERO(migration_cpu_base),
+ 	.clock_base = { { .cpu_base = &migration_cpu_base, }, },
+ };
+ 
+@@ -1152,19 +1150,19 @@ EXPORT_SYMBOL_GPL(hrtimer_init);
+  */
+ bool hrtimer_active(const struct hrtimer *timer)
+ {
+-	struct hrtimer_cpu_base *cpu_base;
++	struct hrtimer_clock_base *base;
+ 	unsigned int seq;
+ 
+ 	do {
+-		cpu_base = READ_ONCE(timer->base->cpu_base);
+-		seq = raw_read_seqcount_begin(&cpu_base->seq);
++		base = READ_ONCE(timer->base);
++		seq = raw_read_seqcount_begin(&base->seq);
+ 
+ 		if (timer->state != HRTIMER_STATE_INACTIVE ||
+-		    cpu_base->running == timer)
++		    base->running == timer)
+ 			return true;
+ 
+-	} while (read_seqcount_retry(&cpu_base->seq, seq) ||
+-		 cpu_base != READ_ONCE(timer->base->cpu_base));
++	} while (read_seqcount_retry(&base->seq, seq) ||
++		 base != READ_ONCE(timer->base));
+ 
+ 	return false;
+ }
+@@ -1198,16 +1196,16 @@ static void __run_hrtimer(struct hrtimer
+ 	lockdep_assert_held(&cpu_base->lock);
+ 
+ 	debug_deactivate(timer);
+-	cpu_base->running = timer;
++	base->running = timer;
+ 
+ 	/*
+ 	 * Separate the ->running assignment from the ->state assignment.
+ 	 *
+ 	 * As with a regular write barrier, this ensures the read side in
+-	 * hrtimer_active() cannot observe cpu_base->running == NULL &&
++	 * hrtimer_active() cannot observe base->running == NULL &&
+ 	 * timer->state == INACTIVE.
+ 	 */
+-	raw_write_seqcount_barrier(&cpu_base->seq);
++	raw_write_seqcount_barrier(&base->seq);
+ 
+ 	__remove_hrtimer(timer, base, HRTIMER_STATE_INACTIVE, 0);
+ 	fn = timer->function;
+@@ -1248,13 +1246,13 @@ static void __run_hrtimer(struct hrtimer
+ 	 * Separate the ->running assignment from the ->state assignment.
+ 	 *
+ 	 * As with a regular write barrier, this ensures the read side in
+-	 * hrtimer_active() cannot observe cpu_base->running == NULL &&
++	 * hrtimer_active() cannot observe base->running.timer == NULL &&
+ 	 * timer->state == INACTIVE.
+ 	 */
+-	raw_write_seqcount_barrier(&cpu_base->seq);
++	raw_write_seqcount_barrier(&base->seq);
+ 
+-	WARN_ON_ONCE(cpu_base->running != timer);
+-	cpu_base->running = NULL;
++	WARN_ON_ONCE(base->running != timer);
++	base->running = NULL;
+ }
+ 
+ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
diff --git a/kernel/patches-4.14.x-rt/0014-0012-hrtimer-Make-room-in-struct-hrtimer_cpu_base.patch b/kernel/patches-4.14.x-rt/0014-0012-hrtimer-Make-room-in-struct-hrtimer_cpu_base.patch
new file mode 100644
index 000000000..2e7c181cc
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0014-0012-hrtimer-Make-room-in-struct-hrtimer_cpu_base.patch
@@ -0,0 +1,33 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:01 +0100
+Subject: [PATCH 12/29] hrtimer: Make room in struct hrtimer_cpu_base
+
+The upcoming softirq based hrtimers support requires an additional field in
+the hrtimer_cpu_base struct, which would grow the struct size beyond a
+cache line.
+
+The struct members nr_retries and nr_hangs of hrtimer_cpu_base are solely
+used for diagnostic output and have no requirement to be unsigned int.
+
+Make them unsigned short to create room for the new struct member. No
+functional change.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -189,8 +189,8 @@ struct hrtimer_cpu_base {
+ 	ktime_t				expires_next;
+ 	struct hrtimer			*next_timer;
+ 	unsigned int			nr_events;
+-	unsigned int			nr_retries;
+-	unsigned int			nr_hangs;
++	unsigned short			nr_retries;
++	unsigned short			nr_hangs;
+ 	unsigned int			max_hang_time;
+ #endif
+ 	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
diff --git a/kernel/patches-4.14.x-rt/0015-0013-hrtimer-Reduce-conditional-code-hres_active.patch b/kernel/patches-4.14.x-rt/0015-0013-hrtimer-Reduce-conditional-code-hres_active.patch
new file mode 100644
index 000000000..357fbce56
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0015-0013-hrtimer-Reduce-conditional-code-hres_active.patch
@@ -0,0 +1,149 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:02 +0100
+Subject: [PATCH 13/29] hrtimer: Reduce conditional code (hres_active)
+
+The hrtimer_cpu_base struct has the CONFIG_HIGH_RES_TIMERS conditional
+struct member hres_active. All related functions to this member are
+conditional as well.
+
+There is no functional change, when the hres_active member is
+unconditional with all related functions and is set to zero during
+initialization.
+
+The conditional code sections can be avoided by adding IS_ENABLED(HIGHRES)
+conditionals into common functions, which ensures dead code elimination.
+
+Suggested-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |   20 ++++++++------------
+ kernel/time/hrtimer.c   |   31 +++++++++++++++----------------
+ 2 files changed, 23 insertions(+), 28 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -161,8 +161,8 @@ enum  hrtimer_base_type {
+  * @cpu:		cpu number
+  * @active_bases:	Bitfield to mark bases with active timers
+  * @clock_was_set_seq:	Sequence counter of clock was set events
+- * @in_hrtirq:		hrtimer_interrupt() is currently executing
+  * @hres_active:	State of high resolution mode
++ * @in_hrtirq:		hrtimer_interrupt() is currently executing
+  * @hang_detected:	The last hrtimer interrupt detected a hang
+  * @expires_next:	absolute time of the next event, is required for remote
+  *			hrtimer enqueue
+@@ -182,9 +182,9 @@ struct hrtimer_cpu_base {
+ 	unsigned int			cpu;
+ 	unsigned int			active_bases;
+ 	unsigned int			clock_was_set_seq;
++	unsigned int			hres_active	: 1;
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 	unsigned int			in_hrtirq	: 1,
+-					hres_active	: 1,
+ 					hang_detected	: 1;
+ 	ktime_t				expires_next;
+ 	struct hrtimer			*next_timer;
+@@ -266,16 +266,17 @@ static inline ktime_t hrtimer_cb_get_tim
+ 	return timer->base->get_time();
+ }
+ 
++static inline int hrtimer_is_hres_active(struct hrtimer *timer)
++{
++	return IS_ENABLED(CONFIG_HIGH_RES_TIMERS) ?
++		timer->base->cpu_base->hres_active : 0;
++}
++
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ struct clock_event_device;
+ 
+ extern void hrtimer_interrupt(struct clock_event_device *dev);
+ 
+-static inline int hrtimer_is_hres_active(struct hrtimer *timer)
+-{
+-	return timer->base->cpu_base->hres_active;
+-}
+-
+ /*
+  * The resolution of the clocks. The resolution value is returned in
+  * the clock_getres() system call to give application programmers an
+@@ -298,11 +299,6 @@ extern unsigned int hrtimer_resolution;
+ 
+ #define hrtimer_resolution	(unsigned int)LOW_RES_NSEC
+ 
+-static inline int hrtimer_is_hres_active(struct hrtimer *timer)
+-{
+-	return 0;
+-}
+-
+ static inline void clock_was_set_delayed(void) { }
+ 
+ #endif
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -512,6 +512,20 @@ static inline ktime_t hrtimer_update_bas
+ 					    offs_real, offs_boot, offs_tai);
+ }
+ 
++/*
++ * Is the high resolution mode active ?
++ */
++static inline int __hrtimer_hres_active(struct hrtimer_cpu_base *cpu_base)
++{
++	return IS_ENABLED(CONFIG_HIGH_RES_TIMERS) ?
++		cpu_base->hres_active : 0;
++}
++
++static inline int hrtimer_hres_active(void)
++{
++	return __hrtimer_hres_active(this_cpu_ptr(&hrtimer_bases));
++}
++
+ /* High resolution timer related functions */
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 
+@@ -541,19 +555,6 @@ static inline int hrtimer_is_hres_enable
+ }
+ 
+ /*
+- * Is the high resolution mode active ?
+- */
+-static inline int __hrtimer_hres_active(struct hrtimer_cpu_base *cpu_base)
+-{
+-	return cpu_base->hres_active;
+-}
+-
+-static inline int hrtimer_hres_active(void)
+-{
+-	return __hrtimer_hres_active(this_cpu_ptr(&hrtimer_bases));
+-}
+-
+-/*
+  * Reprogram the event source with checking both queues for the
+  * next event
+  * Called with interrupts disabled and base->lock held
+@@ -662,7 +663,6 @@ static inline void hrtimer_init_hres(str
+ {
+ 	base->expires_next = KTIME_MAX;
+ 	base->hang_detected = 0;
+-	base->hres_active = 0;
+ 	base->next_timer = NULL;
+ }
+ 
+@@ -722,8 +722,6 @@ void clock_was_set_delayed(void)
+ 
+ #else
+ 
+-static inline int __hrtimer_hres_active(struct hrtimer_cpu_base *b) { return 0; }
+-static inline int hrtimer_hres_active(void) { return 0; }
+ static inline int hrtimer_is_hres_enabled(void) { return 0; }
+ static inline void hrtimer_switch_to_hres(void) { }
+ static inline void
+@@ -1605,6 +1603,7 @@ int hrtimers_prepare_cpu(unsigned int cp
+ 
+ 	cpu_base->active_bases = 0;
+ 	cpu_base->cpu = cpu;
++	cpu_base->hres_active = 0;
+ 	hrtimer_init_hres(cpu_base);
+ 	return 0;
+ }
diff --git a/kernel/patches-4.14.x-rt/0016-0014-hrtimer-Use-accesor-functions-instead-of-direct-acce.patch b/kernel/patches-4.14.x-rt/0016-0014-hrtimer-Use-accesor-functions-instead-of-direct-acce.patch
new file mode 100644
index 000000000..d6875c605
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0016-0014-hrtimer-Use-accesor-functions-instead-of-direct-acce.patch
@@ -0,0 +1,35 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:03 +0100
+Subject: [PATCH 14/29] hrtimer: Use accesor functions instead of direct access
+
+__hrtimer_hres_active() is now available unconditionally. Replace the
+direct access to hrtimer_cpu_base.hres_active.
+
+No functional change.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -564,7 +564,7 @@ hrtimer_force_reprogram(struct hrtimer_c
+ {
+ 	ktime_t expires_next;
+ 
+-	if (!cpu_base->hres_active)
++	if (!__hrtimer_hres_active(cpu_base))
+ 		return;
+ 
+ 	expires_next = __hrtimer_get_next_event(cpu_base);
+@@ -675,7 +675,7 @@ static void retrigger_next_event(void *a
+ {
+ 	struct hrtimer_cpu_base *base = this_cpu_ptr(&hrtimer_bases);
+ 
+-	if (!base->hres_active)
++	if (!__hrtimer_hres_active(base))
+ 		return;
+ 
+ 	raw_spin_lock(&base->lock);
diff --git a/kernel/patches-4.14.x-rt/0017-0015-hrtimer-Make-the-remote-enqueue-check-unconditional.patch b/kernel/patches-4.14.x-rt/0017-0015-hrtimer-Make-the-remote-enqueue-check-unconditional.patch
new file mode 100644
index 000000000..0166c3c39
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0017-0015-hrtimer-Make-the-remote-enqueue-check-unconditional.patch
@@ -0,0 +1,136 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:04 +0100
+Subject: [PATCH 15/29] hrtimer: Make the remote enqueue check unconditional
+
+hrtimer_cpu_base.expires_next is used to cache the next event armed in the
+timer hardware. The value is used to check whether an hrtimer can be
+enqueued remotely. If the new hrtimer is expiring before expires_next, then
+remote enqueue is not possible as the remote hrtimer hardware cannot be
+accessed for reprogramming to an earlier expiry time.
+
+The remote enqueue check is currently conditional on
+CONFIG_HIGH_RES_TIMERS=y and hrtimer_cpu_base.hres_active. There is no
+compelling reason to make this conditional.
+
+Move hrtimer_cpu_base.expires_next out of the CONFIG_HIGH_RES_TIMERS=y
+guarded area and remove the conditionals in hrtimer_check_target().
+
+The check is currently a NOOP for the CONFIG_HIGH_RES_TIMERS=n and the
+!hrtimer_cpu_base.hres_active case because in these cases nothing updates
+hrtimer_cpu_base.expires_next yet. This will be changed with later patches
+which further reduce the #ifdef zoo in this code.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    6 +++---
+ kernel/time/hrtimer.c   |   32 +++++++++-----------------------
+ 2 files changed, 12 insertions(+), 26 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -164,13 +164,13 @@ enum  hrtimer_base_type {
+  * @hres_active:	State of high resolution mode
+  * @in_hrtirq:		hrtimer_interrupt() is currently executing
+  * @hang_detected:	The last hrtimer interrupt detected a hang
+- * @expires_next:	absolute time of the next event, is required for remote
+- *			hrtimer enqueue
+  * @next_timer:		Pointer to the first expiring timer
+  * @nr_events:		Total number of hrtimer interrupt events
+  * @nr_retries:		Total number of hrtimer interrupt retries
+  * @nr_hangs:		Total number of hrtimer interrupt hangs
+  * @max_hang_time:	Maximum time spent in hrtimer_interrupt
++ * @expires_next:	absolute time of the next event, is required for remote
++ *			hrtimer enqueue
+  * @clock_base:		array of clock bases for this cpu
+  *
+  * Note: next_timer is just an optimization for __remove_hrtimer().
+@@ -186,13 +186,13 @@ struct hrtimer_cpu_base {
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 	unsigned int			in_hrtirq	: 1,
+ 					hang_detected	: 1;
+-	ktime_t				expires_next;
+ 	struct hrtimer			*next_timer;
+ 	unsigned int			nr_events;
+ 	unsigned short			nr_retries;
+ 	unsigned short			nr_hangs;
+ 	unsigned int			max_hang_time;
+ #endif
++	ktime_t				expires_next;
+ 	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
+ } ____cacheline_aligned;
+ 
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -154,26 +154,21 @@ struct hrtimer_clock_base *lock_hrtimer_
+ }
+ 
+ /*
+- * With HIGHRES=y we do not migrate the timer when it is expiring
+- * before the next event on the target cpu because we cannot reprogram
+- * the target cpu hardware and we would cause it to fire late.
++ * We do not migrate the timer when it is expiring before the next
++ * event on the target cpu. When high resolution is enabled, we cannot
++ * reprogram the target cpu hardware and we would cause it to fire
++ * late. To keep it simple, we handle the high resolution enabled and
++ * disabled case similar.
+  *
+  * Called with cpu_base->lock of target cpu held.
+  */
+ static int
+ hrtimer_check_target(struct hrtimer *timer, struct hrtimer_clock_base *new_base)
+ {
+-#ifdef CONFIG_HIGH_RES_TIMERS
+ 	ktime_t expires;
+ 
+-	if (!new_base->cpu_base->hres_active)
+-		return 0;
+-
+ 	expires = ktime_sub(hrtimer_get_expires(timer), new_base->offset);
+ 	return expires <= new_base->cpu_base->expires_next;
+-#else
+-	return 0;
+-#endif
+ }
+ 
+ static inline
+@@ -657,16 +652,6 @@ static void hrtimer_reprogram(struct hrt
+ }
+ 
+ /*
+- * Initialize the high resolution related parts of cpu_base
+- */
+-static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base)
+-{
+-	base->expires_next = KTIME_MAX;
+-	base->hang_detected = 0;
+-	base->next_timer = NULL;
+-}
+-
+-/*
+  * Retrigger next event is called after clock was set
+  *
+  * Called with interrupts disabled via on_each_cpu()
+@@ -731,7 +716,6 @@ static inline int hrtimer_reprogram(stru
+ {
+ 	return 0;
+ }
+-static inline void hrtimer_init_hres(struct hrtimer_cpu_base *base) { }
+ static inline void retrigger_next_event(void *arg) { }
+ 
+ #endif /* CONFIG_HIGH_RES_TIMERS */
+@@ -1601,10 +1585,12 @@ int hrtimers_prepare_cpu(unsigned int cp
+ 		timerqueue_init_head(&cpu_base->clock_base[i].active);
+ 	}
+ 
+-	cpu_base->active_bases = 0;
+ 	cpu_base->cpu = cpu;
++	cpu_base->active_bases = 0;
+ 	cpu_base->hres_active = 0;
+-	hrtimer_init_hres(cpu_base);
++	cpu_base->hang_detected = 0;
++	cpu_base->next_timer = NULL;
++	cpu_base->expires_next = KTIME_MAX;
+ 	return 0;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0018-0016-hrtimer-Make-hrtimer_cpu_base.next_timer-handling-un.patch b/kernel/patches-4.14.x-rt/0018-0016-hrtimer-Make-hrtimer_cpu_base.next_timer-handling-un.patch
new file mode 100644
index 000000000..004cc873d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0018-0016-hrtimer-Make-hrtimer_cpu_base.next_timer-handling-un.patch
@@ -0,0 +1,97 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:05 +0100
+Subject: [PATCH 16/29] hrtimer: Make hrtimer_cpu_base.next_timer handling
+ unconditional
+
+hrtimer_cpu_base.next_timer stores the pointer to the next expiring timer
+in a cpu base.
+
+This pointer cannot be dereferenced and is solely used to check whether a
+hrtimer which is removed is the hrtimer which is the first to expire in the
+CPU base. If this is the case, then the timer hardware needs to be
+reprogrammed to avoid an extra interrupt for nothing.
+
+Again, this is conditional functionality, but there is no compelling reason
+to make this conditional. As a preparation, hrtimer_cpu_base.next_timer
+needs to be available unconditonal. Aside of that the upcoming support for
+softirq based hrtimers requires access to this pointer unconditionally.
+
+Make the update of hrtimer_cpu_base.next_timer unconditional and remove the
+ifdef cruft. The impact on CONFIG_HIGH_RES_TIMERS=n && CONFIG_NOHZ=n is
+marginal as it's just a store on an already dirtied cacheline.
+
+No functional change.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    4 ++--
+ kernel/time/hrtimer.c   |   12 ++----------
+ 2 files changed, 4 insertions(+), 12 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -164,13 +164,13 @@ enum  hrtimer_base_type {
+  * @hres_active:	State of high resolution mode
+  * @in_hrtirq:		hrtimer_interrupt() is currently executing
+  * @hang_detected:	The last hrtimer interrupt detected a hang
+- * @next_timer:		Pointer to the first expiring timer
+  * @nr_events:		Total number of hrtimer interrupt events
+  * @nr_retries:		Total number of hrtimer interrupt retries
+  * @nr_hangs:		Total number of hrtimer interrupt hangs
+  * @max_hang_time:	Maximum time spent in hrtimer_interrupt
+  * @expires_next:	absolute time of the next event, is required for remote
+  *			hrtimer enqueue
++ * @next_timer:		Pointer to the first expiring timer
+  * @clock_base:		array of clock bases for this cpu
+  *
+  * Note: next_timer is just an optimization for __remove_hrtimer().
+@@ -186,13 +186,13 @@ struct hrtimer_cpu_base {
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 	unsigned int			in_hrtirq	: 1,
+ 					hang_detected	: 1;
+-	struct hrtimer			*next_timer;
+ 	unsigned int			nr_events;
+ 	unsigned short			nr_retries;
+ 	unsigned short			nr_hangs;
+ 	unsigned int			max_hang_time;
+ #endif
+ 	ktime_t				expires_next;
++	struct hrtimer			*next_timer;
+ 	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
+ } ____cacheline_aligned;
+ 
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -459,21 +459,13 @@ static struct hrtimer_clock_base *
+ 	while ((base = __next_base((cpu_base), &(active))))
+ 
+ #if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)
+-static inline void hrtimer_update_next_timer(struct hrtimer_cpu_base *cpu_base,
+-					     struct hrtimer *timer)
+-{
+-#ifdef CONFIG_HIGH_RES_TIMERS
+-	cpu_base->next_timer = timer;
+-#endif
+-}
+-
+ static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
+ {
+ 	struct hrtimer_clock_base *base;
+ 	unsigned int active = cpu_base->active_bases;
+ 	ktime_t expires, expires_next = KTIME_MAX;
+ 
+-	hrtimer_update_next_timer(cpu_base, NULL);
++	cpu_base->next_timer = NULL;
+ 	for_each_active_base(base, cpu_base, active) {
+ 		struct timerqueue_node *next;
+ 		struct hrtimer *timer;
+@@ -483,7 +475,7 @@ static ktime_t __hrtimer_get_next_event(
+ 		expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
+ 		if (expires < expires_next) {
+ 			expires_next = expires;
+-			hrtimer_update_next_timer(cpu_base, timer);
++			cpu_base->next_timer = timer;
+ 		}
+ 	}
+ 	/*
diff --git a/kernel/patches-4.14.x-rt/0019-0017-hrtimer-Make-hrtimer_reprogramm-unconditional.patch b/kernel/patches-4.14.x-rt/0019-0017-hrtimer-Make-hrtimer_reprogramm-unconditional.patch
new file mode 100644
index 000000000..b43311729
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0019-0017-hrtimer-Make-hrtimer_reprogramm-unconditional.patch
@@ -0,0 +1,186 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:06 +0100
+Subject: [PATCH 17/29] hrtimer: Make hrtimer_reprogramm() unconditional
+
+hrtimer_reprogram() needs to be available unconditionally for softirq based
+hrtimers. Move the function and all required struct members out of the
+CONFIG_HIGH_RES_TIMERS #ifdef.
+
+There is no functional change because hrtimer_reprogram() is only invoked
+when hrtimer_cpu_base.hres_active is true. Making it unconditional
+increases the text size for the CONFIG_HIGH_RES_TIMERS=n case, but avoids
+replication of that code for the upcoming softirq based hrtimers support.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |    6 +-
+ kernel/time/hrtimer.c   |  129 +++++++++++++++++++++++-------------------------
+ 2 files changed, 65 insertions(+), 70 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -182,10 +182,10 @@ struct hrtimer_cpu_base {
+ 	unsigned int			cpu;
+ 	unsigned int			active_bases;
+ 	unsigned int			clock_was_set_seq;
+-	unsigned int			hres_active	: 1;
+-#ifdef CONFIG_HIGH_RES_TIMERS
+-	unsigned int			in_hrtirq	: 1,
++	unsigned int			hres_active	: 1,
++					in_hrtirq	: 1,
+ 					hang_detected	: 1;
++#ifdef CONFIG_HIGH_RES_TIMERS
+ 	unsigned int			nr_events;
+ 	unsigned short			nr_retries;
+ 	unsigned short			nr_hangs;
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -582,68 +582,6 @@ hrtimer_force_reprogram(struct hrtimer_c
+ }
+ 
+ /*
+- * When a timer is enqueued and expires earlier than the already enqueued
+- * timers, we have to check, whether it expires earlier than the timer for
+- * which the clock event device was armed.
+- *
+- * Called with interrupts disabled and base->cpu_base.lock held
+- */
+-static void hrtimer_reprogram(struct hrtimer *timer,
+-			      struct hrtimer_clock_base *base)
+-{
+-	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
+-	ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
+-
+-	WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
+-
+-	/*
+-	 * If the timer is not on the current cpu, we cannot reprogram
+-	 * the other cpus clock event device.
+-	 */
+-	if (base->cpu_base != cpu_base)
+-		return;
+-
+-	/*
+-	 * If the hrtimer interrupt is running, then it will
+-	 * reevaluate the clock bases and reprogram the clock event
+-	 * device. The callbacks are always executed in hard interrupt
+-	 * context so we don't need an extra check for a running
+-	 * callback.
+-	 */
+-	if (cpu_base->in_hrtirq)
+-		return;
+-
+-	/*
+-	 * CLOCK_REALTIME timer might be requested with an absolute
+-	 * expiry time which is less than base->offset. Set it to 0.
+-	 */
+-	if (expires < 0)
+-		expires = 0;
+-
+-	if (expires >= cpu_base->expires_next)
+-		return;
+-
+-	/* Update the pointer to the next expiring timer */
+-	cpu_base->next_timer = timer;
+-
+-	/*
+-	 * If a hang was detected in the last timer interrupt then we
+-	 * do not schedule a timer which is earlier than the expiry
+-	 * which we enforced in the hang detection. We want the system
+-	 * to make progress.
+-	 */
+-	if (cpu_base->hang_detected)
+-		return;
+-
+-	/*
+-	 * Program the timer hardware. We enforce the expiry for
+-	 * events which are already in the past.
+-	 */
+-	cpu_base->expires_next = expires;
+-	tick_program_event(expires, 1);
+-}
+-
+-/*
+  * Retrigger next event is called after clock was set
+  *
+  * Called with interrupts disabled via on_each_cpu()
+@@ -703,16 +641,73 @@ static inline int hrtimer_is_hres_enable
+ static inline void hrtimer_switch_to_hres(void) { }
+ static inline void
+ hrtimer_force_reprogram(struct hrtimer_cpu_base *base, int skip_equal) { }
+-static inline int hrtimer_reprogram(struct hrtimer *timer,
+-				    struct hrtimer_clock_base *base)
+-{
+-	return 0;
+-}
+ static inline void retrigger_next_event(void *arg) { }
+ 
+ #endif /* CONFIG_HIGH_RES_TIMERS */
+ 
+ /*
++ * When a timer is enqueued and expires earlier than the already enqueued
++ * timers, we have to check, whether it expires earlier than the timer for
++ * which the clock event device was armed.
++ *
++ * Called with interrupts disabled and base->cpu_base.lock held
++ */
++static void hrtimer_reprogram(struct hrtimer *timer,
++			      struct hrtimer_clock_base *base)
++{
++	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
++	ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
++
++	WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
++
++	/*
++	 * If the timer is not on the current cpu, we cannot reprogram
++	 * the other cpus clock event device.
++	 */
++	if (base->cpu_base != cpu_base)
++		return;
++
++	/*
++	 * If the hrtimer interrupt is running, then it will
++	 * reevaluate the clock bases and reprogram the clock event
++	 * device. The callbacks are always executed in hard interrupt
++	 * context so we don't need an extra check for a running
++	 * callback.
++	 */
++	if (cpu_base->in_hrtirq)
++		return;
++
++	/*
++	 * CLOCK_REALTIME timer might be requested with an absolute
++	 * expiry time which is less than base->offset. Set it to 0.
++	 */
++	if (expires < 0)
++		expires = 0;
++
++	if (expires >= cpu_base->expires_next)
++		return;
++
++	/* Update the pointer to the next expiring timer */
++	cpu_base->next_timer = timer;
++
++	/*
++	 * If a hang was detected in the last timer interrupt then we
++	 * do not schedule a timer which is earlier than the expiry
++	 * which we enforced in the hang detection. We want the system
++	 * to make progress.
++	 */
++	if (cpu_base->hang_detected)
++		return;
++
++	/*
++	 * Program the timer hardware. We enforce the expiry for
++	 * events which are already in the past.
++	 */
++	cpu_base->expires_next = expires;
++	tick_program_event(expires, 1);
++}
++
++/*
+  * Clock realtime was set
+  *
+  * Change the offset of the realtime clock vs. the monotonic
diff --git a/kernel/patches-4.14.x-rt/0020-0018-hrtimer-Make-hrtimer_force_reprogramm-unconditionall.patch b/kernel/patches-4.14.x-rt/0020-0018-hrtimer-Make-hrtimer_force_reprogramm-unconditionall.patch
new file mode 100644
index 000000000..1b280798c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0020-0018-hrtimer-Make-hrtimer_force_reprogramm-unconditionall.patch
@@ -0,0 +1,105 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:07 +0100
+Subject: [PATCH 18/29] hrtimer: Make hrtimer_force_reprogramm()
+ unconditionally available
+
+hrtimer_force_reprogram() needs to be available unconditionally for softirq
+based hrtimers. Move the function and all required struct members out of
+the CONFIG_HIGH_RES_TIMERS #ifdef.
+
+There is no functional change because hrtimer_force_reprogram() is only
+invoked when hrtimer_cpu_base.hres_active is true and
+CONFIG_HIGH_RES_TIMERS=y.
+
+Making it unconditional increases the text size for the
+CONFIG_HIGH_RES_TIMERS=n case slightly, but avoids replication of that code
+for the upcoming softirq based hrtimers support. Most of the code gets
+eliminated in the CONFIG_HIGH_RES_TIMERS=n case by the compiler.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   58 ++++++++++++++++++++++++--------------------------
+ 1 file changed, 28 insertions(+), 30 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -513,34 +513,6 @@ static inline int hrtimer_hres_active(vo
+ 	return __hrtimer_hres_active(this_cpu_ptr(&hrtimer_bases));
+ }
+ 
+-/* High resolution timer related functions */
+-#ifdef CONFIG_HIGH_RES_TIMERS
+-
+-/*
+- * High resolution timer enabled ?
+- */
+-static bool hrtimer_hres_enabled __read_mostly  = true;
+-unsigned int hrtimer_resolution __read_mostly = LOW_RES_NSEC;
+-EXPORT_SYMBOL_GPL(hrtimer_resolution);
+-
+-/*
+- * Enable / Disable high resolution mode
+- */
+-static int __init setup_hrtimer_hres(char *str)
+-{
+-	return (kstrtobool(str, &hrtimer_hres_enabled) == 0);
+-}
+-
+-__setup("highres=", setup_hrtimer_hres);
+-
+-/*
+- * hrtimer_high_res_enabled - query, if the highres mode is enabled
+- */
+-static inline int hrtimer_is_hres_enabled(void)
+-{
+-	return hrtimer_hres_enabled;
+-}
+-
+ /*
+  * Reprogram the event source with checking both queues for the
+  * next event
+@@ -581,6 +553,34 @@ hrtimer_force_reprogram(struct hrtimer_c
+ 	tick_program_event(cpu_base->expires_next, 1);
+ }
+ 
++/* High resolution timer related functions */
++#ifdef CONFIG_HIGH_RES_TIMERS
++
++/*
++ * High resolution timer enabled ?
++ */
++static bool hrtimer_hres_enabled __read_mostly  = true;
++unsigned int hrtimer_resolution __read_mostly = LOW_RES_NSEC;
++EXPORT_SYMBOL_GPL(hrtimer_resolution);
++
++/*
++ * Enable / Disable high resolution mode
++ */
++static int __init setup_hrtimer_hres(char *str)
++{
++	return (kstrtobool(str, &hrtimer_hres_enabled) == 0);
++}
++
++__setup("highres=", setup_hrtimer_hres);
++
++/*
++ * hrtimer_high_res_enabled - query, if the highres mode is enabled
++ */
++static inline int hrtimer_is_hres_enabled(void)
++{
++	return hrtimer_hres_enabled;
++}
++
+ /*
+  * Retrigger next event is called after clock was set
+  *
+@@ -639,8 +639,6 @@ void clock_was_set_delayed(void)
+ 
+ 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) { }
+ static inline void retrigger_next_event(void *arg) { }
+ 
+ #endif /* CONFIG_HIGH_RES_TIMERS */
diff --git a/kernel/patches-4.14.x-rt/0021-0019-hrtimer-Unify-handling-of-hrtimer-remove.patch b/kernel/patches-4.14.x-rt/0021-0019-hrtimer-Unify-handling-of-hrtimer-remove.patch
new file mode 100644
index 000000000..e08612bc2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0021-0019-hrtimer-Unify-handling-of-hrtimer-remove.patch
@@ -0,0 +1,88 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:08 +0100
+Subject: [PATCH 19/29] hrtimer: Unify handling of hrtimer remove
+
+When the first hrtimer on the current CPU is removed,
+hrtimer_force_reprogram() is invoked but only when
+CONFIG_HIGH_RES_TIMERS=y and hrtimer_cpu_base.hres_active is set.
+
+hrtimer_force_reprogram() updates hrtimer_cpu_base.expires_next and
+reprograms the clock event device. When CONFIG_HIGH_RES_TIMERS=y and
+hrtimer_cpu_base.hres_active is set, a pointless hrtimer interrupt can be
+prevented.
+
+hrtimer_check_target() makes the 'can remote enqueue' decision. As soon as
+hrtimer_check_target() is unconditionally available and
+hrtimer_cpu_base.expires_next is updated by hrtimer_reprogram(),
+hrtimer_force_reprogram() needs to be available unconditionally as well to
+prevent the following scenario with CONFIG_HIGH_RES_TIMERS=n:
+
+- the first hrtimer on this CPU is removed and hrtimer_force_reprogram() is
+  not executed
+
+- CPU goes idle (next timer is calculated and hrtimers are taken into
+  account)
+
+- a hrtimer is enqueued remote on the idle CPU: hrtimer_check_target()
+  compares expiry value and hrtimer_cpu_base.expires_next. The expiry value
+  is after expires_next, so the hrtimer is enqueued. This timer will fire
+  late, if it expires before the effective first hrtimer on this CPU and
+  the comparison was with an outdated expires_next value.
+
+To prevent this scenario, make hrtimer_force_reprogram() unconditional
+except the effective reprogramming part, which gets eliminated by the
+compiler in the CONFIG_HIGH_RES_TIMERS=n case.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -523,9 +523,6 @@ hrtimer_force_reprogram(struct hrtimer_c
+ {
+ 	ktime_t expires_next;
+ 
+-	if (!__hrtimer_hres_active(cpu_base))
+-		return;
+-
+ 	expires_next = __hrtimer_get_next_event(cpu_base);
+ 
+ 	if (skip_equal && expires_next == cpu_base->expires_next)
+@@ -534,6 +531,9 @@ hrtimer_force_reprogram(struct hrtimer_c
+ 	cpu_base->expires_next = expires_next;
+ 
+ 	/*
++	 * If hres is not active, hardware does not have to be
++	 * reprogrammed yet.
++	 *
+ 	 * If a hang was detected in the last timer interrupt then we
+ 	 * leave the hang delay active in the hardware. We want the
+ 	 * system to make progress. That also prevents the following
+@@ -547,7 +547,7 @@ hrtimer_force_reprogram(struct hrtimer_c
+ 	 * set. So we'd effectivly block all timers until the T2 event
+ 	 * fires.
+ 	 */
+-	if (cpu_base->hang_detected)
++	if (!__hrtimer_hres_active(cpu_base) || cpu_base->hang_detected)
+ 		return;
+ 
+ 	tick_program_event(cpu_base->expires_next, 1);
+@@ -848,7 +848,6 @@ static void __remove_hrtimer(struct hrti
+ 	if (!timerqueue_del(&base->active, &timer->node))
+ 		cpu_base->active_bases &= ~(1 << base->index);
+ 
+-#ifdef CONFIG_HIGH_RES_TIMERS
+ 	/*
+ 	 * Note: If reprogram is false we do not update
+ 	 * cpu_base->next_timer. This happens when we remove the first
+@@ -859,7 +858,6 @@ static void __remove_hrtimer(struct hrti
+ 	 */
+ 	if (reprogram && timer == cpu_base->next_timer)
+ 		hrtimer_force_reprogram(cpu_base, 1);
+-#endif
+ }
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0022-0020-hrtimer-Unify-handling-of-remote-enqueue.patch b/kernel/patches-4.14.x-rt/0022-0020-hrtimer-Unify-handling-of-remote-enqueue.patch
new file mode 100644
index 000000000..70cdcca87
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0022-0020-hrtimer-Unify-handling-of-remote-enqueue.patch
@@ -0,0 +1,148 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:09 +0100
+Subject: [PATCH 20/29] hrtimer: Unify handling of remote enqueue
+
+hrtimer_reprogram() is conditionally invoked from hrtimer_start_range_ns()
+when hrtimer_cpu_base.hres_active is true.
+
+In the !hres_active case there is a special condition for the nohz_active
+case:
+
+  If the newly enqueued timer expires before the first expiring timer on a
+  remote CPU then the remote CPU needs to be notified and woken up from a
+  NOHZ idle sleep to take the new first expiring timer into account.
+
+Previous changes have already established the prerequisites to make the
+remote enqueue behaviour the same whether high resolution mode is active or
+not:
+
+  If the to be enqueued timer expires before the first expiring timer on a
+  remote CPU, then it cannot be enqueued there.
+
+This was done for the high resolution mode because there is no way to
+access the remote CPU timer hardware. The same is true for NOHZ, but was
+handled differently by unconditionally enqueuing the timer and waking up
+the remote CPU so it can reprogram its timer. Again there is no compelling
+reason for this difference.
+
+hrtimer_check_target(), which makes the 'can remote enqueue' decision is
+already unconditional, but not yet functional because nothing updates
+hrtimer_cpu_base.expires_next in the !hres_active case.
+
+To unify this the following changes are required:
+
+ 1) Make the store of the new first expiry time unconditonal in
+    hrtimer_reprogram() and check __hrtimer_hres_active() before proceeding
+    to the actual hardware access. This check also lets the compiler
+    eliminate the rest of the function in case of CONFIG_HIGH_RES_TIMERS=n.
+
+ 2) Invoke hrtimer_reprogram() unconditionally from
+    hrtimer_start_range_ns()
+
+ 3) Remove the remote wakeup special case for the !high_res && nohz_active
+    case.
+
+Confine the timers_nohz_active static key to timer.c which is the only user
+now.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c       |   18 ++++++------------
+ kernel/time/tick-internal.h |    6 ------
+ kernel/time/timer.c         |    9 ++++++++-
+ 3 files changed, 14 insertions(+), 19 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -687,21 +687,24 @@ static void hrtimer_reprogram(struct hrt
+ 
+ 	/* Update the pointer to the next expiring timer */
+ 	cpu_base->next_timer = timer;
++	cpu_base->expires_next = expires;
+ 
+ 	/*
++	 * If hres is not active, hardware does not have to be
++	 * programmed yet.
++	 *
+ 	 * If a hang was detected in the last timer interrupt then we
+ 	 * do not schedule a timer which is earlier than the expiry
+ 	 * which we enforced in the hang detection. We want the system
+ 	 * to make progress.
+ 	 */
+-	if (cpu_base->hang_detected)
++	if (!__hrtimer_hres_active(cpu_base) || cpu_base->hang_detected)
+ 		return;
+ 
+ 	/*
+ 	 * Program the timer hardware. We enforce the expiry for
+ 	 * events which are already in the past.
+ 	 */
+-	cpu_base->expires_next = expires;
+ 	tick_program_event(expires, 1);
+ }
+ 
+@@ -940,16 +943,7 @@ void hrtimer_start_range_ns(struct hrtim
+ 	if (!leftmost)
+ 		goto unlock;
+ 
+-	if (!hrtimer_is_hres_active(timer)) {
+-		/*
+-		 * Kick to reschedule the next tick to handle the new timer
+-		 * on dynticks target.
+-		 */
+-		if (is_timers_nohz_active())
+-			wake_up_nohz_cpu(new_base->cpu_base->cpu);
+-	} else {
+-		hrtimer_reprogram(timer, new_base);
+-	}
++	hrtimer_reprogram(timer, new_base);
+ unlock:
+ 	unlock_hrtimer_base(timer, &flags);
+ }
+--- a/kernel/time/tick-internal.h
++++ b/kernel/time/tick-internal.h
+@@ -151,18 +151,12 @@ static inline void tick_nohz_init(void)
+ #ifdef CONFIG_NO_HZ_COMMON
+ extern unsigned long tick_nohz_active;
+ extern void timers_update_nohz(void);
+-extern struct static_key_false timers_nohz_active;
+-static inline bool is_timers_nohz_active(void)
+-{
+-	return static_branch_unlikely(&timers_nohz_active);
+-}
+ # ifdef CONFIG_SMP
+ extern struct static_key_false timers_migration_enabled;
+ # endif
+ #else /* CONFIG_NO_HZ_COMMON */
+ static inline void timers_update_nohz(void) { }
+ #define tick_nohz_active (0)
+-static inline bool is_timers_nohz_active(void) { return false; }
+ #endif
+ 
+ DECLARE_PER_CPU(struct hrtimer_cpu_base, hrtimer_bases);
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -210,7 +210,7 @@ static DEFINE_PER_CPU(struct timer_base,
+ 
+ #ifdef CONFIG_NO_HZ_COMMON
+ 
+-DEFINE_STATIC_KEY_FALSE(timers_nohz_active);
++static DEFINE_STATIC_KEY_FALSE(timers_nohz_active);
+ static DEFINE_MUTEX(timer_keys_mutex);
+ 
+ static void timer_update_keys(struct work_struct *work);
+@@ -260,6 +260,13 @@ int timer_migration_handler(struct ctl_t
+ 	mutex_unlock(&timer_keys_mutex);
+ 	return ret;
+ }
++
++static inline bool is_timers_nohz_active(void)
++{
++	return static_branch_unlikely(&timers_nohz_active);
++}
++#else
++static inline bool is_timers_nohz_active(void) { return false; }
+ #endif /* NO_HZ_COMMON */
+ 
+ static unsigned long round_jiffies_common(unsigned long j, int cpu,
diff --git a/kernel/patches-4.14.x-rt/0023-0021-hrtimer-Make-remote-enqueue-decision-less-restrictiv.patch b/kernel/patches-4.14.x-rt/0023-0021-hrtimer-Make-remote-enqueue-decision-less-restrictiv.patch
new file mode 100644
index 000000000..5bbb4d5ee
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0023-0021-hrtimer-Make-remote-enqueue-decision-less-restrictiv.patch
@@ -0,0 +1,31 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:10 +0100
+Subject: [PATCH 21/29] hrtimer: Make remote enqueue decision less restrictive
+
+The current decision whether a timer can be queued on a remote CPU checks
+for timer->expiry <= remote_cpu_base.expires_next.
+
+This is too restrictive because a timer with the same expiry time as an
+existing timer will be enqueued on right-hand size of the existing timer
+inside the rbtree, i.e. behind the first expiring timer.
+
+So its safe to allow enqueuing timers with the same expiry time as the
+first expiring timer on a remote CPU base.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -168,7 +168,7 @@ hrtimer_check_target(struct hrtimer *tim
+ 	ktime_t expires;
+ 
+ 	expires = ktime_sub(hrtimer_get_expires(timer), new_base->offset);
+-	return expires <= new_base->cpu_base->expires_next;
++	return expires < new_base->cpu_base->expires_next;
+ }
+ 
+ static inline
diff --git a/kernel/patches-4.14.x-rt/0024-0022-hrtimer-Remove-base-argument-from-hrtimer_reprogram.patch b/kernel/patches-4.14.x-rt/0024-0022-hrtimer-Remove-base-argument-from-hrtimer_reprogram.patch
new file mode 100644
index 000000000..86faaf1ee
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0024-0022-hrtimer-Remove-base-argument-from-hrtimer_reprogram.patch
@@ -0,0 +1,49 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:11 +0100
+Subject: [PATCH 22/29] hrtimer: Remove base argument from hrtimer_reprogram()
+
+hrtimer_reprogram() must have access to the hrtimer_clock_base of the new
+first expiring timer to access hrtimer_clock_base.offset for adjusting the
+expiry time to CLOCK_MONOTONIC. This is required to evaluate whether the
+new left most timer in the hrtimer_clock_base is the first expiring timer
+of all clock bases in a hrtimer_cpu_base.
+
+The only user of hrtimer_reprogram() is hrtimer_start_range_ns(), which has
+a pointer to hrtimer_clock_base already and hands it in as an argument. But
+hrtimer_start_range_ns() will be split for the upcoming support for softirq
+based hrtimers to avoid code duplication and will lose the direct access to
+the clock base pointer.
+
+Instead of handing in timer and timer->base as an argument remove the base
+argument from hrtimer_reprogram() and retrieve the clock base internally.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -650,10 +650,10 @@ static inline void retrigger_next_event(
+  *
+  * Called with interrupts disabled and base->cpu_base.lock held
+  */
+-static void hrtimer_reprogram(struct hrtimer *timer,
+-			      struct hrtimer_clock_base *base)
++static void hrtimer_reprogram(struct hrtimer *timer)
+ {
+ 	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
++	struct hrtimer_clock_base *base = timer->base;
+ 	ktime_t expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
+ 
+ 	WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
+@@ -943,7 +943,7 @@ void hrtimer_start_range_ns(struct hrtim
+ 	if (!leftmost)
+ 		goto unlock;
+ 
+-	hrtimer_reprogram(timer, new_base);
++	hrtimer_reprogram(timer);
+ unlock:
+ 	unlock_hrtimer_base(timer, &flags);
+ }
diff --git a/kernel/patches-4.14.x-rt/0025-0023-hrtimer-Split-hrtimer_start_range_ns.patch b/kernel/patches-4.14.x-rt/0025-0023-hrtimer-Split-hrtimer_start_range_ns.patch
new file mode 100644
index 000000000..a55143365
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0025-0023-hrtimer-Split-hrtimer_start_range_ns.patch
@@ -0,0 +1,75 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:12 +0100
+Subject: [PATCH 23/29] hrtimer: Split hrtimer_start_range_ns()
+
+Preparatory patch for softirq based hrtimers to avoid code duplication. No
+functional change.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   44 ++++++++++++++++++++++++--------------------
+ 1 file changed, 24 insertions(+), 20 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -909,22 +909,11 @@ static inline ktime_t hrtimer_update_low
+ 	return tim;
+ }
+ 
+-/**
+- * hrtimer_start_range_ns - (re)start an hrtimer
+- * @timer:	the timer to be added
+- * @tim:	expiry time
+- * @delta_ns:	"slack" range for the timer
+- * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
+- *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
+- */
+-void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+-			    u64 delta_ns, const enum hrtimer_mode mode)
++static int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
++				    u64 delta_ns, const enum hrtimer_mode mode,
++				    struct hrtimer_clock_base *base)
+ {
+-	struct hrtimer_clock_base *base, *new_base;
+-	unsigned long flags;
+-	int leftmost;
+-
+-	base = lock_hrtimer_base(timer, &flags);
++	struct hrtimer_clock_base *new_base;
+ 
+ 	/* Remove an active timer from the queue: */
+ 	remove_hrtimer(timer, base, true);
+@@ -939,12 +928,27 @@ void hrtimer_start_range_ns(struct hrtim
+ 	/* Switch the timer base, if necessary: */
+ 	new_base = switch_hrtimer_base(timer, base, mode & HRTIMER_MODE_PINNED);
+ 
+-	leftmost = enqueue_hrtimer(timer, new_base, mode);
+-	if (!leftmost)
+-		goto unlock;
++	return enqueue_hrtimer(timer, new_base, mode);
++}
++/**
++ * hrtimer_start_range_ns - (re)start an hrtimer
++ * @timer:	the timer to be added
++ * @tim:	expiry time
++ * @delta_ns:	"slack" range for the timer
++ * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
++ *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
++ */
++void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
++			    u64 delta_ns, const enum hrtimer_mode mode)
++{
++	struct hrtimer_clock_base *base;
++	unsigned long flags;
++
++	base = lock_hrtimer_base(timer, &flags);
++
++	if (__hrtimer_start_range_ns(timer, tim, delta_ns, mode, base))
++		hrtimer_reprogram(timer);
+ 
+-	hrtimer_reprogram(timer);
+-unlock:
+ 	unlock_hrtimer_base(timer, &flags);
+ }
+ EXPORT_SYMBOL_GPL(hrtimer_start_range_ns);
diff --git a/kernel/patches-4.14.x-rt/0026-0024-hrtimer-Split-__hrtimer_get_next_event.patch b/kernel/patches-4.14.x-rt/0026-0024-hrtimer-Split-__hrtimer_get_next_event.patch
new file mode 100644
index 000000000..ddffefb13
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0026-0024-hrtimer-Split-__hrtimer_get_next_event.patch
@@ -0,0 +1,52 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:13 +0100
+Subject: [PATCH 24/29] hrtimer: Split __hrtimer_get_next_event()
+
+Preparatory patch for softirq based hrtimers to avoid code duplication. No
+functional change.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   20 ++++++++++++++++----
+ 1 file changed, 16 insertions(+), 4 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -459,13 +459,13 @@ static struct hrtimer_clock_base *
+ 	while ((base = __next_base((cpu_base), &(active))))
+ 
+ #if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)
+-static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
++static ktime_t __hrtimer_next_event_base(struct hrtimer_cpu_base *cpu_base,
++					 unsigned int active,
++					 ktime_t expires_next)
+ {
+ 	struct hrtimer_clock_base *base;
+-	unsigned int active = cpu_base->active_bases;
+-	ktime_t expires, expires_next = KTIME_MAX;
++	ktime_t expires;
+ 
+-	cpu_base->next_timer = NULL;
+ 	for_each_active_base(base, cpu_base, active) {
+ 		struct timerqueue_node *next;
+ 		struct hrtimer *timer;
+@@ -487,6 +487,18 @@ static ktime_t __hrtimer_get_next_event(
+ 		expires_next = 0;
+ 	return expires_next;
+ }
++
++static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
++{
++	unsigned int active = cpu_base->active_bases;
++	ktime_t expires_next = KTIME_MAX;
++
++	cpu_base->next_timer = NULL;
++
++	expires_next = __hrtimer_next_event_base(cpu_base, active, expires_next);
++
++	return expires_next;
++}
+ #endif
+ 
+ static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
diff --git a/kernel/patches-4.14.x-rt/0027-0025-hrtimer-Use-irqsave-irqrestore-around-__run_hrtimer.patch b/kernel/patches-4.14.x-rt/0027-0025-hrtimer-Use-irqsave-irqrestore-around-__run_hrtimer.patch
new file mode 100644
index 000000000..8f99ff680
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0027-0025-hrtimer-Use-irqsave-irqrestore-around-__run_hrtimer.patch
@@ -0,0 +1,144 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:14 +0100
+Subject: [PATCH 25/29] hrtimer: Use irqsave/irqrestore around __run_hrtimer()
+
+__run_hrtimer() is called with the hrtimer_cpu_base.lock held and
+interrupts disabled. Before invoking the timer callback the base lock is
+dropped, but interrupts stay disabled.
+
+The upcoming support for softirq based hrtimers requires that interrupts
+are enabled before the timer callback is invoked.
+
+To avoid code duplication, take hrtimer_cpu_base.lock with
+raw_spin_lock_irqsave(flags) at the call site and hand in the flags as
+argument. So raw_spin_unlock_irqrestore() before the callback invocation
+will either keep interrupts disabled in interrupt context or restore to
+interrupt enabled state when called from softirq context.
+
+Suggested-by: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   31 ++++++++++++++++++-------------
+ 1 file changed, 18 insertions(+), 13 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1163,7 +1163,8 @@ EXPORT_SYMBOL_GPL(hrtimer_active);
+ 
+ static void __run_hrtimer(struct hrtimer_cpu_base *cpu_base,
+ 			  struct hrtimer_clock_base *base,
+-			  struct hrtimer *timer, ktime_t *now)
++			  struct hrtimer *timer, ktime_t *now,
++			  unsigned long flags)
+ {
+ 	enum hrtimer_restart (*fn)(struct hrtimer *);
+ 	int restart;
+@@ -1198,11 +1199,11 @@ static void __run_hrtimer(struct hrtimer
+ 	 * protected against migration to a different CPU even if the lock
+ 	 * is dropped.
+ 	 */
+-	raw_spin_unlock(&cpu_base->lock);
++	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ 	trace_hrtimer_expire_entry(timer, now);
+ 	restart = fn(timer);
+ 	trace_hrtimer_expire_exit(timer);
+-	raw_spin_lock(&cpu_base->lock);
++	raw_spin_lock_irq(&cpu_base->lock);
+ 
+ 	/*
+ 	 * Note: We clear the running state after enqueue_hrtimer and
+@@ -1230,7 +1231,8 @@ static void __run_hrtimer(struct hrtimer
+ 	base->running = NULL;
+ }
+ 
+-static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now)
++static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now,
++				 unsigned long flags)
+ {
+ 	struct hrtimer_clock_base *base;
+ 	unsigned int active = cpu_base->active_bases;
+@@ -1261,7 +1263,7 @@ static void __hrtimer_run_queues(struct
+ 			if (basenow < hrtimer_get_softexpires_tv64(timer))
+ 				break;
+ 
+-			__run_hrtimer(cpu_base, base, timer, &basenow);
++			__run_hrtimer(cpu_base, base, timer, &basenow, flags);
+ 		}
+ 	}
+ }
+@@ -1276,13 +1278,14 @@ void hrtimer_interrupt(struct clock_even
+ {
+ 	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
+ 	ktime_t expires_next, now, entry_time, delta;
++	unsigned long flags;
+ 	int retries = 0;
+ 
+ 	BUG_ON(!cpu_base->hres_active);
+ 	cpu_base->nr_events++;
+ 	dev->next_event = KTIME_MAX;
+ 
+-	raw_spin_lock(&cpu_base->lock);
++	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 	entry_time = now = hrtimer_update_base(cpu_base);
+ retry:
+ 	cpu_base->in_hrtirq = 1;
+@@ -1295,7 +1298,7 @@ void hrtimer_interrupt(struct clock_even
+ 	 */
+ 	cpu_base->expires_next = KTIME_MAX;
+ 
+-	__hrtimer_run_queues(cpu_base, now);
++	__hrtimer_run_queues(cpu_base, now, flags);
+ 
+ 	/* Reevaluate the clock bases for the next expiry */
+ 	expires_next = __hrtimer_get_next_event(cpu_base);
+@@ -1305,7 +1308,7 @@ void hrtimer_interrupt(struct clock_even
+ 	 */
+ 	cpu_base->expires_next = expires_next;
+ 	cpu_base->in_hrtirq = 0;
+-	raw_spin_unlock(&cpu_base->lock);
++	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ 
+ 	/* Reprogramming necessary ? */
+ 	if (!tick_program_event(expires_next, 0)) {
+@@ -1326,7 +1329,7 @@ void hrtimer_interrupt(struct clock_even
+ 	 * Acquire base lock for updating the offsets and retrieving
+ 	 * the current time.
+ 	 */
+-	raw_spin_lock(&cpu_base->lock);
++	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 	now = hrtimer_update_base(cpu_base);
+ 	cpu_base->nr_retries++;
+ 	if (++retries < 3)
+@@ -1339,7 +1342,8 @@ void hrtimer_interrupt(struct clock_even
+ 	 */
+ 	cpu_base->nr_hangs++;
+ 	cpu_base->hang_detected = 1;
+-	raw_spin_unlock(&cpu_base->lock);
++	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
++
+ 	delta = ktime_sub(now, entry_time);
+ 	if ((unsigned int)delta > cpu_base->max_hang_time)
+ 		cpu_base->max_hang_time = (unsigned int) delta;
+@@ -1381,6 +1385,7 @@ static inline void __hrtimer_peek_ahead_
+ void hrtimer_run_queues(void)
+ {
+ 	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
++	unsigned long flags;
+ 	ktime_t now;
+ 
+ 	if (__hrtimer_hres_active(cpu_base))
+@@ -1398,10 +1403,10 @@ void hrtimer_run_queues(void)
+ 		return;
+ 	}
+ 
+-	raw_spin_lock(&cpu_base->lock);
++	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 	now = hrtimer_update_base(cpu_base);
+-	__hrtimer_run_queues(cpu_base, now);
+-	raw_spin_unlock(&cpu_base->lock);
++	__hrtimer_run_queues(cpu_base, now, flags);
++	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ }
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0028-0026-hrtimer-Add-clock-bases-and-hrtimer-mode-for-soft-ir.patch b/kernel/patches-4.14.x-rt/0028-0026-hrtimer-Add-clock-bases-and-hrtimer-mode-for-soft-ir.patch
new file mode 100644
index 000000000..be27a42a1
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0028-0026-hrtimer-Add-clock-bases-and-hrtimer-mode-for-soft-ir.patch
@@ -0,0 +1,108 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:15 +0100
+Subject: [PATCH 26/29] hrtimer: Add clock bases and hrtimer mode for soft irq
+ context
+
+hrtimer callback functions are always executed in hard interrupt
+context. Users of hrtimer which need their timer function to be executed
+in soft interrupt context, make use of tasklets to get the proper context.
+
+Add additional hrtimer clock bases for timers which must expire in softirq
+context, so the detour via the tasklet can be avoided. This is also
+required for RT, where the majority of hrtimer is moved into softirq
+hrtimer context.
+
+The selection of the expiry mode happens via a mode bit. Introduce
+HRTIMER_MODE_SOFT and the matching combinations with the ABS/REL/PINNED
+bits and update the decoding of hrtimer_mode in tracepoints.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h      |   14 ++++++++++++++
+ include/trace/events/timer.h |    6 +++++-
+ kernel/time/hrtimer.c        |   20 ++++++++++++++++++++
+ 3 files changed, 39 insertions(+), 1 deletion(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -33,14 +33,24 @@ struct hrtimer_cpu_base;
+  * HRTIMER_MODE_REL		- Time value is relative to now
+  * HRTIMER_MODE_PINNED		- Timer is bound to CPU (is only considered
+  *				  when starting the timer)
++ * HRTIMER_MODE_SOFT		- Timer callback function will be executed in
++ *				  soft irq context
+  */
+ enum hrtimer_mode {
+ 	HRTIMER_MODE_ABS	= 0x00,
+ 	HRTIMER_MODE_REL	= 0x01,
+ 	HRTIMER_MODE_PINNED	= 0x02,
++	HRTIMER_MODE_SOFT	= 0x04,
+ 
+ 	HRTIMER_MODE_ABS_PINNED = HRTIMER_MODE_ABS | HRTIMER_MODE_PINNED,
+ 	HRTIMER_MODE_REL_PINNED = HRTIMER_MODE_REL | HRTIMER_MODE_PINNED,
++
++	HRTIMER_MODE_ABS_SOFT	= HRTIMER_MODE_ABS | HRTIMER_MODE_SOFT,
++	HRTIMER_MODE_REL_SOFT	= HRTIMER_MODE_REL | HRTIMER_MODE_SOFT,
++
++	HRTIMER_MODE_ABS_PINNED_SOFT = HRTIMER_MODE_ABS_PINNED | HRTIMER_MODE_SOFT,
++	HRTIMER_MODE_REL_PINNED_SOFT = HRTIMER_MODE_REL_PINNED | HRTIMER_MODE_SOFT,
++
+ };
+ 
+ /*
+@@ -151,6 +161,10 @@ enum  hrtimer_base_type {
+ 	HRTIMER_BASE_REALTIME,
+ 	HRTIMER_BASE_BOOTTIME,
+ 	HRTIMER_BASE_TAI,
++	HRTIMER_BASE_MONOTONIC_SOFT,
++	HRTIMER_BASE_REALTIME_SOFT,
++	HRTIMER_BASE_BOOTTIME_SOFT,
++	HRTIMER_BASE_TAI_SOFT,
+ 	HRTIMER_MAX_CLOCK_BASES,
+ };
+ 
+--- a/include/trace/events/timer.h
++++ b/include/trace/events/timer.h
+@@ -148,7 +148,11 @@ DEFINE_EVENT(timer_class, timer_cancel,
+ 		{ HRTIMER_MODE_ABS,		"ABS"		},	\
+ 		{ HRTIMER_MODE_REL,		"REL"		},	\
+ 		{ HRTIMER_MODE_ABS_PINNED,	"ABS|PINNED"	},	\
+-		{ HRTIMER_MODE_REL_PINNED,	"REL|PINNED"	})
++		{ HRTIMER_MODE_REL_PINNED,	"REL|PINNED"	},	\
++		{ HRTIMER_MODE_ABS_SOFT,	"ABS|SOFT"	},	\
++		{ HRTIMER_MODE_REL_SOFT,	"REL|SOFT"	},	\
++		{ HRTIMER_MODE_ABS_PINNED_SOFT,	"ABS|PINNED|SOFT" },	\
++		{ HRTIMER_MODE_REL_PINNED_SOFT,	"REL|PINNED|SOFT" })
+ 
+ /**
+  * hrtimer_init - called when the hrtimer is initialized
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -92,6 +92,26 @@ DEFINE_PER_CPU(struct hrtimer_cpu_base,
+ 			.clockid = CLOCK_TAI,
+ 			.get_time = &ktime_get_clocktai,
+ 		},
++		{
++			.index = HRTIMER_BASE_MONOTONIC_SOFT,
++			.clockid = CLOCK_MONOTONIC,
++			.get_time = &ktime_get,
++		},
++		{
++			.index = HRTIMER_BASE_REALTIME_SOFT,
++			.clockid = CLOCK_REALTIME,
++			.get_time = &ktime_get_real,
++		},
++		{
++			.index = HRTIMER_BASE_BOOTTIME_SOFT,
++			.clockid = CLOCK_BOOTTIME,
++			.get_time = &ktime_get_boottime,
++		},
++		{
++			.index = HRTIMER_BASE_TAI_SOFT,
++			.clockid = CLOCK_TAI,
++			.get_time = &ktime_get_clocktai,
++		},
+ 	}
+ };
+ 
diff --git a/kernel/patches-4.14.x-rt/0029-0027-hrtimer-Prepare-handling-of-hard-and-softirq-based-h.patch b/kernel/patches-4.14.x-rt/0029-0027-hrtimer-Prepare-handling-of-hard-and-softirq-based-h.patch
new file mode 100644
index 000000000..71d327bcd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0029-0027-hrtimer-Prepare-handling-of-hard-and-softirq-based-h.patch
@@ -0,0 +1,116 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:16 +0100
+Subject: [PATCH 27/29] hrtimer: Prepare handling of hard and softirq based
+ hrtimers
+
+The softirq based hrtimer can utilize most of the existing hrtimers
+functions, but need to operate on a different data set.
+
+Add an active_mask argument to various functions so the hard and soft bases
+can be selected. Fixup the existing callers and hand in the ACTIVE_HARD
+mask.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   38 +++++++++++++++++++++++++++++---------
+ 1 file changed, 29 insertions(+), 9 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -60,6 +60,15 @@
+ #include "tick-internal.h"
+ 
+ /*
++ * Masks for selecting the soft and hard context timers from
++ * cpu_base->active
++ */
++#define MASK_SHIFT		(HRTIMER_BASE_MONOTONIC_SOFT)
++#define HRTIMER_ACTIVE_HARD	((1U << MASK_SHIFT) - 1)
++#define HRTIMER_ACTIVE_SOFT	(HRTIMER_ACTIVE_HARD << MASK_SHIFT)
++#define HRTIMER_ACTIVE_ALL	(HRTIMER_ACTIVE_SOFT | HRTIMER_ACTIVE_HARD)
++
++/*
+  * The timer bases:
+  *
+  * There are more clockids than hrtimer bases. Thus, we index
+@@ -508,13 +517,24 @@ static ktime_t __hrtimer_next_event_base
+ 	return expires_next;
+ }
+ 
+-static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base)
++/*
++ * Recomputes cpu_base::*next_timer and returns the earliest expires_next but
++ * does not set cpu_base::*expires_next, that is done by hrtimer_reprogram.
++ *
++ * @active_mask must be one of:
++ *  - HRTIMER_ACTIVE,
++ *  - HRTIMER_ACTIVE_SOFT, or
++ *  - HRTIMER_ACTIVE_HARD.
++ */
++static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base,
++					unsigned int active_mask)
+ {
+-	unsigned int active = cpu_base->active_bases;
++	unsigned int active;
+ 	ktime_t expires_next = KTIME_MAX;
+ 
+ 	cpu_base->next_timer = NULL;
+ 
++	active = cpu_base->active_bases & active_mask;
+ 	expires_next = __hrtimer_next_event_base(cpu_base, active, expires_next);
+ 
+ 	return expires_next;
+@@ -555,7 +575,7 @@ hrtimer_force_reprogram(struct hrtimer_c
+ {
+ 	ktime_t expires_next;
+ 
+-	expires_next = __hrtimer_get_next_event(cpu_base);
++	expires_next = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_HARD);
+ 
+ 	if (skip_equal && expires_next == cpu_base->expires_next)
+ 		return;
+@@ -1078,7 +1098,7 @@ u64 hrtimer_get_next_event(void)
+ 	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 
+ 	if (!__hrtimer_hres_active(cpu_base))
+-		expires = __hrtimer_get_next_event(cpu_base);
++		expires = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_HARD);
+ 
+ 	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ 
+@@ -1252,10 +1272,10 @@ static void __run_hrtimer(struct hrtimer
+ }
+ 
+ static void __hrtimer_run_queues(struct hrtimer_cpu_base *cpu_base, ktime_t now,
+-				 unsigned long flags)
++				 unsigned long flags, unsigned int active_mask)
+ {
+ 	struct hrtimer_clock_base *base;
+-	unsigned int active = cpu_base->active_bases;
++	unsigned int active = cpu_base->active_bases & active_mask;
+ 
+ 	for_each_active_base(base, cpu_base, active) {
+ 		struct timerqueue_node *node;
+@@ -1318,10 +1338,10 @@ void hrtimer_interrupt(struct clock_even
+ 	 */
+ 	cpu_base->expires_next = KTIME_MAX;
+ 
+-	__hrtimer_run_queues(cpu_base, now, flags);
++	__hrtimer_run_queues(cpu_base, now, flags, HRTIMER_ACTIVE_HARD);
+ 
+ 	/* Reevaluate the clock bases for the next expiry */
+-	expires_next = __hrtimer_get_next_event(cpu_base);
++	expires_next = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_HARD);
+ 	/*
+ 	 * Store the new expiry value so the migration code can verify
+ 	 * against it.
+@@ -1425,7 +1445,7 @@ void hrtimer_run_queues(void)
+ 
+ 	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 	now = hrtimer_update_base(cpu_base);
+-	__hrtimer_run_queues(cpu_base, now, flags);
++	__hrtimer_run_queues(cpu_base, now, flags, HRTIMER_ACTIVE_HARD);
+ 	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0030-0028-hrtimer-Implement-support-for-softirq-based-hrtimers.patch b/kernel/patches-4.14.x-rt/0030-0028-hrtimer-Implement-support-for-softirq-based-hrtimers.patch
new file mode 100644
index 000000000..073b4d66a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0030-0028-hrtimer-Implement-support-for-softirq-based-hrtimers.patch
@@ -0,0 +1,498 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:17 +0100
+Subject: [PATCH 28/29] hrtimer: Implement support for softirq based hrtimers
+
+hrtimer callbacks are always invoked in hard interrupt context. Several
+users in tree require soft interrupt context for their callbacks and
+achieve this by combining a hrtimer with a tasklet. The hrtimer schedules
+the tasklet in hard interrupt context and the tasklet callback gets invoked
+in softirq context later.
+
+That's suboptimal and aside of that the real-time patch moves most of the
+hrtimers into softirq context. So adding native support for hrtimers
+expiring in softirq context is a valuable extension for both mainline and
+the RT patch set.
+
+Each valid hrtimer clock id has two associated hrtimer clock bases: one for
+timers expiring in hardirq context and one for timers expiring in softirq
+context.
+
+Implement the functionality to associate a hrtimer with the hard or softirq
+related clock bases and update the relevant functions to take them into
+account when the next expiry time needs to be evaluated.
+
+Add a check into the hard interrupt context handler functions to check
+whether the first expiring softirq based timer has expired. If it's expired
+the softirq is raised and the accounting of softirq based timers to
+evaluate the next expiry time for programming the timer hardware is skipped
+until the softirq processing has finished. At the end of the softirq
+processing the regular processing is resumed.
+
+Suggested-by: Thomas Gleixner <tglx@linutronix.de>
+Suggested-by: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/hrtimer.h |   21 +++--
+ kernel/time/hrtimer.c   |  199 +++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 189 insertions(+), 31 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -103,6 +103,7 @@ enum hrtimer_restart {
+  * @base:	pointer to the timer base (per cpu and per clock)
+  * @state:	state information (See bit values above)
+  * @is_rel:	Set if the timer was armed relative
++ * @is_soft:	Set if hrtimer will be expired in soft interrupt context.
+  *
+  * The hrtimer structure must be initialized by hrtimer_init()
+  */
+@@ -113,6 +114,7 @@ struct hrtimer {
+ 	struct hrtimer_clock_base	*base;
+ 	u8				state;
+ 	u8				is_rel;
++	u8				is_soft;
+ };
+ 
+ /**
+@@ -178,13 +180,18 @@ enum  hrtimer_base_type {
+  * @hres_active:	State of high resolution mode
+  * @in_hrtirq:		hrtimer_interrupt() is currently executing
+  * @hang_detected:	The last hrtimer interrupt detected a hang
++ * @softirq_activated:	displays, if the softirq is raised - update of softirq
++ *			related settings is not required then.
+  * @nr_events:		Total number of hrtimer interrupt events
+  * @nr_retries:		Total number of hrtimer interrupt retries
+  * @nr_hangs:		Total number of hrtimer interrupt hangs
+  * @max_hang_time:	Maximum time spent in hrtimer_interrupt
+  * @expires_next:	absolute time of the next event, is required for remote
+- *			hrtimer enqueue
++ *			hrtimer enqueue; it is the total first expiry time (hard
++ *			and soft hrtimer are taken into account)
+  * @next_timer:		Pointer to the first expiring timer
++ * @softirq_expires_next: Time to check, if soft queues needs also to be expired
++ * @softirq_next_timer: Pointer to the first expiring softirq based timer
+  * @clock_base:		array of clock bases for this cpu
+  *
+  * Note: next_timer is just an optimization for __remove_hrtimer().
+@@ -196,9 +203,10 @@ struct hrtimer_cpu_base {
+ 	unsigned int			cpu;
+ 	unsigned int			active_bases;
+ 	unsigned int			clock_was_set_seq;
+-	unsigned int			hres_active	: 1,
+-					in_hrtirq	: 1,
+-					hang_detected	: 1;
++	unsigned int			hres_active		: 1,
++					in_hrtirq		: 1,
++					hang_detected		: 1,
++					softirq_activated       : 1;
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 	unsigned int			nr_events;
+ 	unsigned short			nr_retries;
+@@ -207,6 +215,8 @@ struct hrtimer_cpu_base {
+ #endif
+ 	ktime_t				expires_next;
+ 	struct hrtimer			*next_timer;
++	ktime_t				softirq_expires_next;
++	struct hrtimer			*softirq_next_timer;
+ 	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
+ } ____cacheline_aligned;
+ 
+@@ -379,7 +389,8 @@ extern void hrtimer_start_range_ns(struc
+  * @timer:	the timer to be added
+  * @tim:	expiry time
+  * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
+- *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
++ *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED);
++ *		softirq based mode is considered for debug purpose only!
+  */
+ static inline void hrtimer_start(struct hrtimer *timer, ktime_t tim,
+ 				 const enum hrtimer_mode mode)
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -411,7 +411,8 @@ static inline void debug_hrtimer_init(st
+ 	debug_object_init(timer, &hrtimer_debug_descr);
+ }
+ 
+-static inline void debug_hrtimer_activate(struct hrtimer *timer)
++static inline void debug_hrtimer_activate(struct hrtimer *timer,
++					  enum hrtimer_mode mode)
+ {
+ 	debug_object_activate(timer, &hrtimer_debug_descr);
+ }
+@@ -444,8 +445,10 @@ void destroy_hrtimer_on_stack(struct hrt
+ EXPORT_SYMBOL_GPL(destroy_hrtimer_on_stack);
+ 
+ #else
++
+ static inline void debug_hrtimer_init(struct hrtimer *timer) { }
+-static inline void debug_hrtimer_activate(struct hrtimer *timer) { }
++static inline void debug_hrtimer_activate(struct hrtimer *timer,
++					  enum hrtimer_mode mode) { }
+ static inline void debug_hrtimer_deactivate(struct hrtimer *timer) { }
+ #endif
+ 
+@@ -460,7 +463,7 @@ debug_init(struct hrtimer *timer, clocki
+ static inline void debug_activate(struct hrtimer *timer,
+ 				  enum hrtimer_mode mode)
+ {
+-	debug_hrtimer_activate(timer);
++	debug_hrtimer_activate(timer, mode);
+ 	trace_hrtimer_start(timer, mode);
+ }
+ 
+@@ -487,7 +490,6 @@ static struct hrtimer_clock_base *
+ #define for_each_active_base(base, cpu_base, active)	\
+ 	while ((base = __next_base((cpu_base), &(active))))
+ 
+-#if defined(CONFIG_NO_HZ_COMMON) || defined(CONFIG_HIGH_RES_TIMERS)
+ static ktime_t __hrtimer_next_event_base(struct hrtimer_cpu_base *cpu_base,
+ 					 unsigned int active,
+ 					 ktime_t expires_next)
+@@ -504,7 +506,10 @@ static ktime_t __hrtimer_next_event_base
+ 		expires = ktime_sub(hrtimer_get_expires(timer), base->offset);
+ 		if (expires < expires_next) {
+ 			expires_next = expires;
+-			cpu_base->next_timer = timer;
++			if (timer->is_soft)
++				cpu_base->softirq_next_timer = timer;
++			else
++				cpu_base->next_timer = timer;
+ 		}
+ 	}
+ 	/*
+@@ -521,25 +526,42 @@ static ktime_t __hrtimer_next_event_base
+  * Recomputes cpu_base::*next_timer and returns the earliest expires_next but
+  * does not set cpu_base::*expires_next, that is done by hrtimer_reprogram.
+  *
++ * When a softirq is pending, we can ignore the HRTIMER_ACTIVE_SOFT bases,
++ * those timers will get run whenever the softirq gets handled, at the end of
++ * hrtimer_run_softirq(), hrtimer_update_softirq_timer() will re-add these bases.
++ *
++ * Therefore softirq values are those from the HRTIMER_ACTIVE_SOFT clock bases.
++ * The !softirq values are the minima across HRTIMER_ACTIVE_ALL, unless an actual
++ * softirq is pending, in which case they're the minima of HRTIMER_ACTIVE_HARD.
++ *
+  * @active_mask must be one of:
+- *  - HRTIMER_ACTIVE,
++ *  - HRTIMER_ACTIVE_ALL,
+  *  - HRTIMER_ACTIVE_SOFT, or
+  *  - HRTIMER_ACTIVE_HARD.
+  */
+-static ktime_t __hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base,
+-					unsigned int active_mask)
++static ktime_t
++__hrtimer_get_next_event(struct hrtimer_cpu_base *cpu_base, unsigned int active_mask)
+ {
+ 	unsigned int active;
++	struct hrtimer *next_timer = NULL;
+ 	ktime_t expires_next = KTIME_MAX;
+ 
+-	cpu_base->next_timer = NULL;
++	if (!cpu_base->softirq_activated && (active_mask & HRTIMER_ACTIVE_SOFT)) {
++		active = cpu_base->active_bases & HRTIMER_ACTIVE_SOFT;
++		cpu_base->softirq_next_timer = NULL;
++		expires_next = __hrtimer_next_event_base(cpu_base, active, KTIME_MAX);
++
++		next_timer = cpu_base->softirq_next_timer;
++	}
+ 
+-	active = cpu_base->active_bases & active_mask;
+-	expires_next = __hrtimer_next_event_base(cpu_base, active, expires_next);
++	if (active_mask & HRTIMER_ACTIVE_HARD) {
++		active = cpu_base->active_bases & HRTIMER_ACTIVE_HARD;
++		cpu_base->next_timer = next_timer;
++		expires_next = __hrtimer_next_event_base(cpu_base, active, expires_next);
++	}
+ 
+ 	return expires_next;
+ }
+-#endif
+ 
+ static inline ktime_t hrtimer_update_base(struct hrtimer_cpu_base *base)
+ {
+@@ -547,8 +569,14 @@ static inline ktime_t hrtimer_update_bas
+ 	ktime_t *offs_boot = &base->clock_base[HRTIMER_BASE_BOOTTIME].offset;
+ 	ktime_t *offs_tai = &base->clock_base[HRTIMER_BASE_TAI].offset;
+ 
+-	return ktime_get_update_offsets_now(&base->clock_was_set_seq,
++	ktime_t now = ktime_get_update_offsets_now(&base->clock_was_set_seq,
+ 					    offs_real, offs_boot, offs_tai);
++
++	base->clock_base[HRTIMER_BASE_REALTIME_SOFT].offset = *offs_real;
++	base->clock_base[HRTIMER_BASE_BOOTTIME_SOFT].offset = *offs_boot;
++	base->clock_base[HRTIMER_BASE_TAI_SOFT].offset = *offs_tai;
++
++	return now;
+ }
+ 
+ /*
+@@ -575,7 +603,23 @@ hrtimer_force_reprogram(struct hrtimer_c
+ {
+ 	ktime_t expires_next;
+ 
+-	expires_next = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_HARD);
++	/*
++	 * Find the current next expiration time.
++	 */
++	expires_next = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_ALL);
++
++	if (cpu_base->next_timer && cpu_base->next_timer->is_soft) {
++		/*
++		 * When the softirq is activated, hrtimer has to be
++		 * programmed with the first hard hrtimer because soft
++		 * timer interrupt could occur too late.
++		 */
++		if (cpu_base->softirq_activated)
++			expires_next = __hrtimer_get_next_event(cpu_base,
++								HRTIMER_ACTIVE_HARD);
++		else
++			cpu_base->softirq_expires_next = expires_next;
++	}
+ 
+ 	if (skip_equal && expires_next == cpu_base->expires_next)
+ 		return;
+@@ -702,7 +746,7 @@ static inline void retrigger_next_event(
+  *
+  * Called with interrupts disabled and base->cpu_base.lock held
+  */
+-static void hrtimer_reprogram(struct hrtimer *timer)
++static void hrtimer_reprogram(struct hrtimer *timer, bool reprogram)
+ {
+ 	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
+ 	struct hrtimer_clock_base *base = timer->base;
+@@ -711,6 +755,37 @@ static void hrtimer_reprogram(struct hrt
+ 	WARN_ON_ONCE(hrtimer_get_expires_tv64(timer) < 0);
+ 
+ 	/*
++	 * CLOCK_REALTIME timer might be requested with an absolute
++	 * expiry time which is less than base->offset. Set it to 0.
++	 */
++	if (expires < 0)
++		expires = 0;
++
++	if (timer->is_soft) {
++		/*
++		 * soft hrtimer could be started on a remote CPU. In this
++		 * case softirq_expires_next needs to be updated on the
++		 * remote CPU. The soft hrtimer will not expire before the
++		 * first hard hrtimer on the remote CPU -
++		 * hrtimer_check_target() prevents this case.
++		 */
++		struct hrtimer_cpu_base *timer_cpu_base = base->cpu_base;
++
++		if (timer_cpu_base->softirq_activated)
++			return;
++
++		if (!ktime_before(expires, timer_cpu_base->softirq_expires_next))
++			return;
++
++		timer_cpu_base->softirq_next_timer = timer;
++		timer_cpu_base->softirq_expires_next = expires;
++
++		if (!ktime_before(expires, timer_cpu_base->expires_next) ||
++		    !reprogram)
++			return;
++	}
++
++	/*
+ 	 * If the timer is not on the current cpu, we cannot reprogram
+ 	 * the other cpus clock event device.
+ 	 */
+@@ -727,13 +802,6 @@ static void hrtimer_reprogram(struct hrt
+ 	if (cpu_base->in_hrtirq)
+ 		return;
+ 
+-	/*
+-	 * CLOCK_REALTIME timer might be requested with an absolute
+-	 * expiry time which is less than base->offset. Set it to 0.
+-	 */
+-	if (expires < 0)
+-		expires = 0;
+-
+ 	if (expires >= cpu_base->expires_next)
+ 		return;
+ 
+@@ -961,6 +1029,31 @@ static inline ktime_t hrtimer_update_low
+ 	return tim;
+ }
+ 
++static void
++hrtimer_update_softirq_timer(struct hrtimer_cpu_base *cpu_base, bool reprogram)
++{
++	ktime_t expires;
++
++	/*
++	 * Find the next SOFT expiration.
++	 */
++	expires = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_SOFT);
++
++	/*
++	 * reprogramming needs to be triggered, even if the next soft
++	 * hrtimer expires at the same time than the next hard
++	 * hrtimer. cpu_base->softirq_expires_next needs to be updated!
++	 */
++	if (expires == KTIME_MAX)
++		return;
++
++	/*
++	 * cpu_base->*next_timer is recomputed by __hrtimer_get_next_event()
++	 * cpu_base->*expires_next is only set by hrtimer_reprogram()
++	 */
++	hrtimer_reprogram(cpu_base->softirq_next_timer, reprogram);
++}
++
+ static int __hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+ 				    u64 delta_ns, const enum hrtimer_mode mode,
+ 				    struct hrtimer_clock_base *base)
+@@ -982,13 +1075,15 @@ static int __hrtimer_start_range_ns(stru
+ 
+ 	return enqueue_hrtimer(timer, new_base, mode);
+ }
++
+ /**
+  * hrtimer_start_range_ns - (re)start an hrtimer
+  * @timer:	the timer to be added
+  * @tim:	expiry time
+  * @delta_ns:	"slack" range for the timer
+  * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
+- *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED)
++ *		relative (HRTIMER_MODE_REL), and pinned (HRTIMER_MODE_PINNED);
++ *		softirq based mode is considered for debug purpose only!
+  */
+ void hrtimer_start_range_ns(struct hrtimer *timer, ktime_t tim,
+ 			    u64 delta_ns, const enum hrtimer_mode mode)
+@@ -996,10 +1091,16 @@ void hrtimer_start_range_ns(struct hrtim
+ 	struct hrtimer_clock_base *base;
+ 	unsigned long flags;
+ 
++	/*
++	 * Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft
++	 * match.
++	 */
++	WARN_ON_ONCE(!(mode & HRTIMER_MODE_SOFT) ^ !timer->is_soft);
++
+ 	base = lock_hrtimer_base(timer, &flags);
+ 
+ 	if (__hrtimer_start_range_ns(timer, tim, delta_ns, mode, base))
+-		hrtimer_reprogram(timer);
++		hrtimer_reprogram(timer, true);
+ 
+ 	unlock_hrtimer_base(timer, &flags);
+ }
+@@ -1098,7 +1199,7 @@ u64 hrtimer_get_next_event(void)
+ 	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 
+ 	if (!__hrtimer_hres_active(cpu_base))
+-		expires = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_HARD);
++		expires = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_ALL);
+ 
+ 	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ 
+@@ -1308,6 +1409,23 @@ static void __hrtimer_run_queues(struct
+ 	}
+ }
+ 
++static __latent_entropy void hrtimer_run_softirq(struct softirq_action *h)
++{
++	struct hrtimer_cpu_base *cpu_base = this_cpu_ptr(&hrtimer_bases);
++	unsigned long flags;
++	ktime_t now;
++
++	raw_spin_lock_irqsave(&cpu_base->lock, flags);
++
++	now = hrtimer_update_base(cpu_base);
++	__hrtimer_run_queues(cpu_base, now, flags, HRTIMER_ACTIVE_SOFT);
++
++	cpu_base->softirq_activated = 0;
++	hrtimer_update_softirq_timer(cpu_base, true);
++
++	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
++}
++
+ #ifdef CONFIG_HIGH_RES_TIMERS
+ 
+ /*
+@@ -1338,10 +1456,16 @@ void hrtimer_interrupt(struct clock_even
+ 	 */
+ 	cpu_base->expires_next = KTIME_MAX;
+ 
++	if (!ktime_before(now, cpu_base->softirq_expires_next)) {
++		cpu_base->softirq_expires_next = KTIME_MAX;
++		cpu_base->softirq_activated = 1;
++		raise_softirq_irqoff(HRTIMER_SOFTIRQ);
++	}
++
+ 	__hrtimer_run_queues(cpu_base, now, flags, HRTIMER_ACTIVE_HARD);
+ 
+ 	/* Reevaluate the clock bases for the next expiry */
+-	expires_next = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_HARD);
++	expires_next = __hrtimer_get_next_event(cpu_base, HRTIMER_ACTIVE_ALL);
+ 	/*
+ 	 * Store the new expiry value so the migration code can verify
+ 	 * against it.
+@@ -1445,6 +1569,13 @@ void hrtimer_run_queues(void)
+ 
+ 	raw_spin_lock_irqsave(&cpu_base->lock, flags);
+ 	now = hrtimer_update_base(cpu_base);
++
++	if (!ktime_before(now, cpu_base->softirq_expires_next)) {
++		cpu_base->softirq_expires_next = KTIME_MAX;
++		cpu_base->softirq_activated = 1;
++		raise_softirq_irqoff(HRTIMER_SOFTIRQ);
++	}
++
+ 	__hrtimer_run_queues(cpu_base, now, flags, HRTIMER_ACTIVE_HARD);
+ 	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
+ }
+@@ -1628,7 +1759,9 @@ int hrtimers_prepare_cpu(unsigned int cp
+ 	cpu_base->hres_active = 0;
+ 	cpu_base->hang_detected = 0;
+ 	cpu_base->next_timer = NULL;
++	cpu_base->softirq_next_timer = NULL;
+ 	cpu_base->expires_next = KTIME_MAX;
++	cpu_base->softirq_expires_next = KTIME_MAX;
+ 	return 0;
+ }
+ 
+@@ -1672,6 +1805,12 @@ int hrtimers_dead_cpu(unsigned int scpu)
+ 	BUG_ON(cpu_online(scpu));
+ 	tick_cancel_sched_timer(scpu);
+ 
++	/*
++	 * this BH disable ensures that raise_softirq_irqoff() does
++	 * not wakeup ksoftirqd (and acquire the pi-lock) while
++	 * holding the cpu_base lock
++	 */
++	local_bh_disable();
+ 	local_irq_disable();
+ 	old_base = &per_cpu(hrtimer_bases, scpu);
+ 	new_base = this_cpu_ptr(&hrtimer_bases);
+@@ -1687,12 +1826,19 @@ int hrtimers_dead_cpu(unsigned int scpu)
+ 				     &new_base->clock_base[i]);
+ 	}
+ 
++	/*
++	 * The migration might have changed the first expiring softirq
++	 * timer on this CPU. Update it.
++	 */
++	hrtimer_update_softirq_timer(new_base, false);
++
+ 	raw_spin_unlock(&old_base->lock);
+ 	raw_spin_unlock(&new_base->lock);
+ 
+ 	/* Check, if we got expired work to do */
+ 	__hrtimer_peek_ahead_timers();
+ 	local_irq_enable();
++	local_bh_enable();
+ 	return 0;
+ }
+ 
+@@ -1701,6 +1847,7 @@ int hrtimers_dead_cpu(unsigned int scpu)
+ void __init hrtimers_init(void)
+ {
+ 	hrtimers_prepare_cpu(smp_processor_id());
++	open_softirq(HRTIMER_SOFTIRQ, hrtimer_run_softirq);
+ }
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0031-0029-hrtimer-Implement-SOFT-HARD-clock-base-selection.patch b/kernel/patches-4.14.x-rt/0031-0029-hrtimer-Implement-SOFT-HARD-clock-base-selection.patch
new file mode 100644
index 000000000..71780dcf6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0031-0029-hrtimer-Implement-SOFT-HARD-clock-base-selection.patch
@@ -0,0 +1,55 @@
+From: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Date: Wed, 20 Dec 2017 17:13:18 +0100
+Subject: [PATCH 29/29] hrtimer: Implement SOFT/HARD clock base selection
+
+All prerequisites to handle hrtimers for expiry in either hard or soft
+interrupt context are in place.
+
+Add the missing bit in hrtimer_init() which associates the timer to the
+hard or the soft irq clock base.
+
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1222,8 +1222,9 @@ static inline int hrtimer_clockid_to_bas
+ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
+ 			   enum hrtimer_mode mode)
+ {
++	bool softtimer = !!(mode & HRTIMER_MODE_SOFT);
++	int base = softtimer ? HRTIMER_MAX_CLOCK_BASES / 2 : 0;
+ 	struct hrtimer_cpu_base *cpu_base;
+-	int base;
+ 
+ 	memset(timer, 0, sizeof(struct hrtimer));
+ 
+@@ -1237,7 +1238,8 @@ static void __hrtimer_init(struct hrtime
+ 	if (clock_id == CLOCK_REALTIME && mode & HRTIMER_MODE_REL)
+ 		clock_id = CLOCK_MONOTONIC;
+ 
+-	base = hrtimer_clockid_to_base(clock_id);
++	base += hrtimer_clockid_to_base(clock_id);
++	timer->is_soft = softtimer;
+ 	timer->base = &cpu_base->clock_base[base];
+ 	timerqueue_init(&timer->node);
+ }
+@@ -1246,8 +1248,13 @@ static void __hrtimer_init(struct hrtime
+  * hrtimer_init - initialize a timer to the given clock
+  * @timer:	the timer to be initialized
+  * @clock_id:	the clock to be used
+- * @mode:	timer mode: absolute (HRTIMER_MODE_ABS) or
+- *		relative (HRTIMER_MODE_REL); pinned is not considered here!
++ * @mode:       The modes which are relevant for intitialization:
++ *              HRTIMER_MODE_ABS, HRTIMER_MODE_REL, HRTIMER_MODE_ABS_SOFT,
++ *              HRTIMER_MODE_REL_SOFT
++ *
++ *              The PINNED variants of the above can be handed in,
++ *              but the PINNED bit is ignored as pinning happens
++ *              when the hrtimer is started
+  */
+ void hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
+ 		  enum hrtimer_mode mode)
diff --git a/kernel/patches-4.14.x-rt/0032-0030-can-bcm-Replace-hrtimer_tasklet-with-softirq-based-h.patch b/kernel/patches-4.14.x-rt/0032-0030-can-bcm-Replace-hrtimer_tasklet-with-softirq-based-h.patch
new file mode 100644
index 000000000..26e06e2c4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0032-0030-can-bcm-Replace-hrtimer_tasklet-with-softirq-based-h.patch
@@ -0,0 +1,315 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:11 +0100
+Subject: [PATCH 30/36] can/bcm: Replace hrtimer_tasklet with softirq based
+ hrtimer
+
+Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
+callback in softirq context and remove the hrtimer_tasklet.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Oliver Hartkopp <socketcan@hartkopp.net>
+Cc: Marc Kleine-Budde <mkl@pengutronix.de>
+Cc: linux-can@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/can/bcm.c |  156 +++++++++++++++++++---------------------------------------
+ 1 file changed, 52 insertions(+), 104 deletions(-)
+
+--- a/net/can/bcm.c
++++ b/net/can/bcm.c
+@@ -102,7 +102,6 @@ struct bcm_op {
+ 	unsigned long frames_abs, frames_filtered;
+ 	struct bcm_timeval ival1, ival2;
+ 	struct hrtimer timer, thrtimer;
+-	struct tasklet_struct tsklet, thrtsklet;
+ 	ktime_t rx_stamp, kt_ival1, kt_ival2, kt_lastmsg;
+ 	int rx_ifindex;
+ 	int cfsiz;
+@@ -364,25 +363,34 @@ static void bcm_send_to_user(struct bcm_
+ 	}
+ }
+ 
+-static void bcm_tx_start_timer(struct bcm_op *op)
++static bool bcm_tx_set_expiry(struct bcm_op *op, struct hrtimer *hrt)
+ {
++	ktime_t ival;
++
+ 	if (op->kt_ival1 && op->count)
+-		hrtimer_start(&op->timer,
+-			      ktime_add(ktime_get(), op->kt_ival1),
+-			      HRTIMER_MODE_ABS);
++		ival = op->kt_ival1;
+ 	else if (op->kt_ival2)
+-		hrtimer_start(&op->timer,
+-			      ktime_add(ktime_get(), op->kt_ival2),
+-			      HRTIMER_MODE_ABS);
++		ival = op->kt_ival2;
++	else
++		return false;
++
++	hrtimer_set_expires(hrt, ktime_add(ktime_get(), ival));
++	return true;
+ }
+ 
+-static void bcm_tx_timeout_tsklet(unsigned long data)
++static void bcm_tx_start_timer(struct bcm_op *op)
+ {
+-	struct bcm_op *op = (struct bcm_op *)data;
++	if (bcm_tx_set_expiry(op, &op->timer))
++		hrtimer_start_expires(&op->timer, HRTIMER_MODE_ABS_SOFT);
++}
++
++/* bcm_tx_timeout_handler - performs cyclic CAN frame transmissions */
++static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer)
++{
++	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);
+ 	struct bcm_msg_head msg_head;
+ 
+ 	if (op->kt_ival1 && (op->count > 0)) {
+-
+ 		op->count--;
+ 		if (!op->count && (op->flags & TX_COUNTEVT)) {
+ 
+@@ -399,22 +407,12 @@ static void bcm_tx_timeout_tsklet(unsign
+ 		}
+ 		bcm_can_tx(op);
+ 
+-	} else if (op->kt_ival2)
++	} else if (op->kt_ival2) {
+ 		bcm_can_tx(op);
++	}
+ 
+-	bcm_tx_start_timer(op);
+-}
+-
+-/*
+- * bcm_tx_timeout_handler - performs cyclic CAN frame transmissions
+- */
+-static enum hrtimer_restart bcm_tx_timeout_handler(struct hrtimer *hrtimer)
+-{
+-	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);
+-
+-	tasklet_schedule(&op->tsklet);
+-
+-	return HRTIMER_NORESTART;
++	return bcm_tx_set_expiry(op, &op->timer) ?
++		HRTIMER_RESTART : HRTIMER_NORESTART;
+ }
+ 
+ /*
+@@ -480,7 +478,7 @@ static void bcm_rx_update_and_send(struc
+ 		/* do not send the saved data - only start throttle timer */
+ 		hrtimer_start(&op->thrtimer,
+ 			      ktime_add(op->kt_lastmsg, op->kt_ival2),
+-			      HRTIMER_MODE_ABS);
++			      HRTIMER_MODE_ABS_SOFT);
+ 		return;
+ 	}
+ 
+@@ -539,14 +537,21 @@ static void bcm_rx_starttimer(struct bcm
+ 		return;
+ 
+ 	if (op->kt_ival1)
+-		hrtimer_start(&op->timer, op->kt_ival1, HRTIMER_MODE_REL);
++		hrtimer_start(&op->timer, op->kt_ival1, HRTIMER_MODE_REL_SOFT);
+ }
+ 
+-static void bcm_rx_timeout_tsklet(unsigned long data)
++/* bcm_rx_timeout_handler - when the (cyclic) CAN frame reception timed out */
++static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer)
+ {
+-	struct bcm_op *op = (struct bcm_op *)data;
++	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);
+ 	struct bcm_msg_head msg_head;
+ 
++	/* if user wants to be informed, when cyclic CAN-Messages come back */
++	if ((op->flags & RX_ANNOUNCE_RESUME) && op->last_frames) {
++		/* clear received CAN frames to indicate 'nothing received' */
++		memset(op->last_frames, 0, op->nframes * op->cfsiz);
++	}
++
+ 	/* create notification to user */
+ 	msg_head.opcode  = RX_TIMEOUT;
+ 	msg_head.flags   = op->flags;
+@@ -557,25 +562,6 @@ static void bcm_rx_timeout_tsklet(unsign
+ 	msg_head.nframes = 0;
+ 
+ 	bcm_send_to_user(op, &msg_head, NULL, 0);
+-}
+-
+-/*
+- * bcm_rx_timeout_handler - when the (cyclic) CAN frame reception timed out
+- */
+-static enum hrtimer_restart bcm_rx_timeout_handler(struct hrtimer *hrtimer)
+-{
+-	struct bcm_op *op = container_of(hrtimer, struct bcm_op, timer);
+-
+-	/* schedule before NET_RX_SOFTIRQ */
+-	tasklet_hi_schedule(&op->tsklet);
+-
+-	/* no restart of the timer is done here! */
+-
+-	/* if user wants to be informed, when cyclic CAN-Messages come back */
+-	if ((op->flags & RX_ANNOUNCE_RESUME) && op->last_frames) {
+-		/* clear received CAN frames to indicate 'nothing received' */
+-		memset(op->last_frames, 0, op->nframes * op->cfsiz);
+-	}
+ 
+ 	return HRTIMER_NORESTART;
+ }
+@@ -583,14 +569,12 @@ static enum hrtimer_restart bcm_rx_timeo
+ /*
+  * bcm_rx_do_flush - helper for bcm_rx_thr_flush
+  */
+-static inline int bcm_rx_do_flush(struct bcm_op *op, int update,
+-				  unsigned int index)
++static inline int bcm_rx_do_flush(struct bcm_op *op, unsigned int index)
+ {
+ 	struct canfd_frame *lcf = op->last_frames + op->cfsiz * index;
+ 
+ 	if ((op->last_frames) && (lcf->flags & RX_THR)) {
+-		if (update)
+-			bcm_rx_changed(op, lcf);
++		bcm_rx_changed(op, lcf);
+ 		return 1;
+ 	}
+ 	return 0;
+@@ -598,11 +582,8 @@ static inline int bcm_rx_do_flush(struct
+ 
+ /*
+  * bcm_rx_thr_flush - Check for throttled data and send it to the userspace
+- *
+- * update == 0 : just check if throttled data is available  (any irq context)
+- * update == 1 : check and send throttled data to userspace (soft_irq context)
+  */
+-static int bcm_rx_thr_flush(struct bcm_op *op, int update)
++static int bcm_rx_thr_flush(struct bcm_op *op)
+ {
+ 	int updated = 0;
+ 
+@@ -611,24 +592,16 @@ static int bcm_rx_thr_flush(struct bcm_o
+ 
+ 		/* for MUX filter we start at index 1 */
+ 		for (i = 1; i < op->nframes; i++)
+-			updated += bcm_rx_do_flush(op, update, i);
++			updated += bcm_rx_do_flush(op, i);
+ 
+ 	} else {
+ 		/* for RX_FILTER_ID and simple filter */
+-		updated += bcm_rx_do_flush(op, update, 0);
++		updated += bcm_rx_do_flush(op, 0);
+ 	}
+ 
+ 	return updated;
+ }
+ 
+-static void bcm_rx_thr_tsklet(unsigned long data)
+-{
+-	struct bcm_op *op = (struct bcm_op *)data;
+-
+-	/* push the changed data to the userspace */
+-	bcm_rx_thr_flush(op, 1);
+-}
+-
+ /*
+  * bcm_rx_thr_handler - the time for blocked content updates is over now:
+  *                      Check for throttled data and send it to the userspace
+@@ -637,9 +610,7 @@ static enum hrtimer_restart bcm_rx_thr_h
+ {
+ 	struct bcm_op *op = container_of(hrtimer, struct bcm_op, thrtimer);
+ 
+-	tasklet_schedule(&op->thrtsklet);
+-
+-	if (bcm_rx_thr_flush(op, 0)) {
++	if (bcm_rx_thr_flush(op)) {
+ 		hrtimer_forward(hrtimer, ktime_get(), op->kt_ival2);
+ 		return HRTIMER_RESTART;
+ 	} else {
+@@ -735,23 +706,8 @@ static struct bcm_op *bcm_find_op(struct
+ 
+ static void bcm_remove_op(struct bcm_op *op)
+ {
+-	if (op->tsklet.func) {
+-		while (test_bit(TASKLET_STATE_SCHED, &op->tsklet.state) ||
+-		       test_bit(TASKLET_STATE_RUN, &op->tsklet.state) ||
+-		       hrtimer_active(&op->timer)) {
+-			hrtimer_cancel(&op->timer);
+-			tasklet_kill(&op->tsklet);
+-		}
+-	}
+-
+-	if (op->thrtsklet.func) {
+-		while (test_bit(TASKLET_STATE_SCHED, &op->thrtsklet.state) ||
+-		       test_bit(TASKLET_STATE_RUN, &op->thrtsklet.state) ||
+-		       hrtimer_active(&op->thrtimer)) {
+-			hrtimer_cancel(&op->thrtimer);
+-			tasklet_kill(&op->thrtsklet);
+-		}
+-	}
++	hrtimer_cancel(&op->timer);
++	hrtimer_cancel(&op->thrtimer);
+ 
+ 	if ((op->frames) && (op->frames != &op->sframe))
+ 		kfree(op->frames);
+@@ -979,15 +935,13 @@ static int bcm_tx_setup(struct bcm_msg_h
+ 		op->ifindex = ifindex;
+ 
+ 		/* initialize uninitialized (kzalloc) structure */
+-		hrtimer_init(&op->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++		hrtimer_init(&op->timer, CLOCK_MONOTONIC,
++			     HRTIMER_MODE_REL_SOFT);
+ 		op->timer.function = bcm_tx_timeout_handler;
+ 
+-		/* initialize tasklet for tx countevent notification */
+-		tasklet_init(&op->tsklet, bcm_tx_timeout_tsklet,
+-			     (unsigned long) op);
+-
+ 		/* currently unused in tx_ops */
+-		hrtimer_init(&op->thrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++		hrtimer_init(&op->thrtimer, CLOCK_MONOTONIC,
++			     HRTIMER_MODE_REL_SOFT);
+ 
+ 		/* add this bcm_op to the list of the tx_ops */
+ 		list_add(&op->list, &bo->tx_ops);
+@@ -1150,20 +1104,14 @@ static int bcm_rx_setup(struct bcm_msg_h
+ 		op->rx_ifindex = ifindex;
+ 
+ 		/* initialize uninitialized (kzalloc) structure */
+-		hrtimer_init(&op->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++		hrtimer_init(&op->timer, CLOCK_MONOTONIC,
++			     HRTIMER_MODE_REL_SOFT);
+ 		op->timer.function = bcm_rx_timeout_handler;
+ 
+-		/* initialize tasklet for rx timeout notification */
+-		tasklet_init(&op->tsklet, bcm_rx_timeout_tsklet,
+-			     (unsigned long) op);
+-
+-		hrtimer_init(&op->thrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++		hrtimer_init(&op->thrtimer, CLOCK_MONOTONIC,
++			     HRTIMER_MODE_REL_SOFT);
+ 		op->thrtimer.function = bcm_rx_thr_handler;
+ 
+-		/* initialize tasklet for rx throttle handling */
+-		tasklet_init(&op->thrtsklet, bcm_rx_thr_tsklet,
+-			     (unsigned long) op);
+-
+ 		/* add this bcm_op to the list of the rx_ops */
+ 		list_add(&op->list, &bo->rx_ops);
+ 
+@@ -1209,12 +1157,12 @@ static int bcm_rx_setup(struct bcm_msg_h
+ 			 */
+ 			op->kt_lastmsg = 0;
+ 			hrtimer_cancel(&op->thrtimer);
+-			bcm_rx_thr_flush(op, 1);
++			bcm_rx_thr_flush(op);
+ 		}
+ 
+ 		if ((op->flags & STARTTIMER) && op->kt_ival1)
+ 			hrtimer_start(&op->timer, op->kt_ival1,
+-				      HRTIMER_MODE_REL);
++				      HRTIMER_MODE_REL_SOFT);
+ 	}
+ 
+ 	/* now we can register for can_ids, if we added a new bcm_op */
diff --git a/kernel/patches-4.14.x-rt/0033-0031-mac80211_hwsim-Replace-hrtimer-tasklet-with-softirq-.patch b/kernel/patches-4.14.x-rt/0033-0031-mac80211_hwsim-Replace-hrtimer-tasklet-with-softirq-.patch
new file mode 100644
index 000000000..927cc0fa7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0033-0031-mac80211_hwsim-Replace-hrtimer-tasklet-with-softirq-.patch
@@ -0,0 +1,135 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:12 +0100
+Subject: [PATCH 31/36] mac80211_hwsim: Replace hrtimer tasklet with softirq
+ hrtimer
+
+Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
+callback in softirq context and remove the hrtimer_tasklet.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Cc: linux-wireless@vger.kernel.org
+Cc: Johannes Berg <johannes@sipsolutions.net>
+Cc: Kalle Valo <kvalo@codeaurora.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/net/wireless/mac80211_hwsim.c |   44 +++++++++++++++-------------------
+ 1 file changed, 20 insertions(+), 24 deletions(-)
+
+--- a/drivers/net/wireless/mac80211_hwsim.c
++++ b/drivers/net/wireless/mac80211_hwsim.c
+@@ -537,7 +537,7 @@ struct mac80211_hwsim_data {
+ 	unsigned int rx_filter;
+ 	bool started, idle, scanning;
+ 	struct mutex mutex;
+-	struct tasklet_hrtimer beacon_timer;
++	struct hrtimer beacon_timer;
+ 	enum ps_mode {
+ 		PS_DISABLED, PS_ENABLED, PS_AUTO_POLL, PS_MANUAL_POLL
+ 	} ps;
+@@ -1418,7 +1418,7 @@ static void mac80211_hwsim_stop(struct i
+ {
+ 	struct mac80211_hwsim_data *data = hw->priv;
+ 	data->started = false;
+-	tasklet_hrtimer_cancel(&data->beacon_timer);
++	hrtimer_cancel(&data->beacon_timer);
+ 	wiphy_debug(hw->wiphy, "%s\n", __func__);
+ }
+ 
+@@ -1541,14 +1541,12 @@ static enum hrtimer_restart
+ mac80211_hwsim_beacon(struct hrtimer *timer)
+ {
+ 	struct mac80211_hwsim_data *data =
+-		container_of(timer, struct mac80211_hwsim_data,
+-			     beacon_timer.timer);
++		container_of(timer, struct mac80211_hwsim_data, beacon_timer);
+ 	struct ieee80211_hw *hw = data->hw;
+ 	u64 bcn_int = data->beacon_int;
+-	ktime_t next_bcn;
+ 
+ 	if (!data->started)
+-		goto out;
++		return HRTIMER_NORESTART;
+ 
+ 	ieee80211_iterate_active_interfaces_atomic(
+ 		hw, IEEE80211_IFACE_ITER_NORMAL,
+@@ -1560,11 +1558,9 @@ mac80211_hwsim_beacon(struct hrtimer *ti
+ 		data->bcn_delta = 0;
+ 	}
+ 
+-	next_bcn = ktime_add(hrtimer_get_expires(timer),
+-			     ns_to_ktime(bcn_int * 1000));
+-	tasklet_hrtimer_start(&data->beacon_timer, next_bcn, HRTIMER_MODE_ABS);
+-out:
+-	return HRTIMER_NORESTART;
++	hrtimer_forward(&data->beacon_timer, hrtimer_get_expires(timer),
++			ns_to_ktime(bcn_int * NSEC_PER_USEC));
++	return HRTIMER_RESTART;
+ }
+ 
+ static const char * const hwsim_chanwidths[] = {
+@@ -1638,15 +1634,15 @@ static int mac80211_hwsim_config(struct
+ 	mutex_unlock(&data->mutex);
+ 
+ 	if (!data->started || !data->beacon_int)
+-		tasklet_hrtimer_cancel(&data->beacon_timer);
+-	else if (!hrtimer_is_queued(&data->beacon_timer.timer)) {
++		hrtimer_cancel(&data->beacon_timer);
++	else if (!hrtimer_is_queued(&data->beacon_timer)) {
+ 		u64 tsf = mac80211_hwsim_get_tsf(hw, NULL);
+ 		u32 bcn_int = data->beacon_int;
+ 		u64 until_tbtt = bcn_int - do_div(tsf, bcn_int);
+ 
+-		tasklet_hrtimer_start(&data->beacon_timer,
+-				      ns_to_ktime(until_tbtt * 1000),
+-				      HRTIMER_MODE_REL);
++		hrtimer_start(&data->beacon_timer,
++			      ns_to_ktime(until_tbtt * 1000),
++			      HRTIMER_MODE_REL_SOFT);
+ 	}
+ 
+ 	return 0;
+@@ -1709,7 +1705,7 @@ static void mac80211_hwsim_bss_info_chan
+ 			    info->enable_beacon, info->beacon_int);
+ 		vp->bcn_en = info->enable_beacon;
+ 		if (data->started &&
+-		    !hrtimer_is_queued(&data->beacon_timer.timer) &&
++		    !hrtimer_is_queued(&data->beacon_timer) &&
+ 		    info->enable_beacon) {
+ 			u64 tsf, until_tbtt;
+ 			u32 bcn_int;
+@@ -1717,9 +1713,9 @@ static void mac80211_hwsim_bss_info_chan
+ 			tsf = mac80211_hwsim_get_tsf(hw, vif);
+ 			bcn_int = data->beacon_int;
+ 			until_tbtt = bcn_int - do_div(tsf, bcn_int);
+-			tasklet_hrtimer_start(&data->beacon_timer,
+-					      ns_to_ktime(until_tbtt * 1000),
+-					      HRTIMER_MODE_REL);
++			hrtimer_start(&data->beacon_timer,
++				      ns_to_ktime(until_tbtt * 1000),
++				      HRTIMER_MODE_REL_SOFT);
+ 		} else if (!info->enable_beacon) {
+ 			unsigned int count = 0;
+ 			ieee80211_iterate_active_interfaces_atomic(
+@@ -1728,7 +1724,7 @@ static void mac80211_hwsim_bss_info_chan
+ 			wiphy_debug(hw->wiphy, "  beaconing vifs remaining: %u",
+ 				    count);
+ 			if (count == 0) {
+-				tasklet_hrtimer_cancel(&data->beacon_timer);
++				hrtimer_cancel(&data->beacon_timer);
+ 				data->beacon_int = 0;
+ 			}
+ 		}
+@@ -2720,9 +2716,9 @@ static int mac80211_hwsim_new_radio(stru
+ 				    data->debugfs,
+ 				    data, &hwsim_simulate_radar);
+ 
+-	tasklet_hrtimer_init(&data->beacon_timer,
+-			     mac80211_hwsim_beacon,
+-			     CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
++	hrtimer_init(&data->beacon_timer, CLOCK_MONOTONIC,
++		     HRTIMER_MODE_ABS_SOFT);
++	data->beacon_timer.function = mac80211_hwsim_beacon;
+ 
+ 	spin_lock_bh(&hwsim_radio_lock);
+ 	list_add_tail(&data->list, &hwsim_radios);
diff --git a/kernel/patches-4.14.x-rt/0034-0032-xfrm-Replace-hrtimer-tasklet-with-softirq-hrtimer.patch b/kernel/patches-4.14.x-rt/0034-0032-xfrm-Replace-hrtimer-tasklet-with-softirq-hrtimer.patch
new file mode 100644
index 000000000..09faf9f56
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0034-0032-xfrm-Replace-hrtimer-tasklet-with-softirq-hrtimer.patch
@@ -0,0 +1,132 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:13 +0100
+Subject: [PATCH 32/36] xfrm: Replace hrtimer tasklet with softirq hrtimer
+
+Switch the timer to HRTIMER_MODE_SOFT, which executed the timer
+callback in softirq context and remove the hrtimer_tasklet.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Cc: Steffen Klassert <steffen.klassert@secunet.com>
+Cc: netdev@vger.kernel.org
+Cc: Herbert Xu <herbert@gondor.apana.org.au>
+Cc: "David S. Miller" <davem@davemloft.net>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/net/xfrm.h    |    2 +-
+ net/xfrm/xfrm_state.c |   30 ++++++++++++++++++------------
+ 2 files changed, 19 insertions(+), 13 deletions(-)
+
+--- a/include/net/xfrm.h
++++ b/include/net/xfrm.h
+@@ -217,7 +217,7 @@ struct xfrm_state {
+ 	struct xfrm_stats	stats;
+ 
+ 	struct xfrm_lifetime_cur curlft;
+-	struct tasklet_hrtimer	mtimer;
++	struct hrtimer		mtimer;
+ 
+ 	struct xfrm_state_offload xso;
+ 
+--- a/net/xfrm/xfrm_state.c
++++ b/net/xfrm/xfrm_state.c
+@@ -426,7 +426,7 @@ static void xfrm_put_mode(struct xfrm_mo
+ 
+ static void xfrm_state_gc_destroy(struct xfrm_state *x)
+ {
+-	tasklet_hrtimer_cancel(&x->mtimer);
++	hrtimer_cancel(&x->mtimer);
+ 	del_timer_sync(&x->rtimer);
+ 	kfree(x->aead);
+ 	kfree(x->aalg);
+@@ -471,8 +471,8 @@ static void xfrm_state_gc_task(struct wo
+ 
+ static enum hrtimer_restart xfrm_timer_handler(struct hrtimer *me)
+ {
+-	struct tasklet_hrtimer *thr = container_of(me, struct tasklet_hrtimer, timer);
+-	struct xfrm_state *x = container_of(thr, struct xfrm_state, mtimer);
++	struct xfrm_state *x = container_of(me, struct xfrm_state, mtimer);
++	enum hrtimer_restart ret = HRTIMER_NORESTART;
+ 	unsigned long now = get_seconds();
+ 	long next = LONG_MAX;
+ 	int warn = 0;
+@@ -536,7 +536,8 @@ static enum hrtimer_restart xfrm_timer_h
+ 		km_state_expired(x, 0, 0);
+ resched:
+ 	if (next != LONG_MAX) {
+-		tasklet_hrtimer_start(&x->mtimer, ktime_set(next, 0), HRTIMER_MODE_REL);
++		hrtimer_forward_now(&x->mtimer, ktime_set(next, 0));
++		ret = HRTIMER_RESTART;
+ 	}
+ 
+ 	goto out;
+@@ -553,7 +554,7 @@ static enum hrtimer_restart xfrm_timer_h
+ 
+ out:
+ 	spin_unlock(&x->lock);
+-	return HRTIMER_NORESTART;
++	return ret;
+ }
+ 
+ static void xfrm_replay_timer_handler(unsigned long data);
+@@ -572,8 +573,8 @@ struct xfrm_state *xfrm_state_alloc(stru
+ 		INIT_HLIST_NODE(&x->bydst);
+ 		INIT_HLIST_NODE(&x->bysrc);
+ 		INIT_HLIST_NODE(&x->byspi);
+-		tasklet_hrtimer_init(&x->mtimer, xfrm_timer_handler,
+-					CLOCK_BOOTTIME, HRTIMER_MODE_ABS);
++		hrtimer_init(&x->mtimer, CLOCK_BOOTTIME, HRTIMER_MODE_ABS_SOFT);
++		x->mtimer.function = xfrm_timer_handler;
+ 		setup_timer(&x->rtimer, xfrm_replay_timer_handler,
+ 				(unsigned long)x);
+ 		x->curlft.add_time = get_seconds();
+@@ -1030,7 +1031,9 @@ xfrm_state_find(const xfrm_address_t *da
+ 				hlist_add_head_rcu(&x->byspi, net->xfrm.state_byspi + h);
+ 			}
+ 			x->lft.hard_add_expires_seconds = net->xfrm.sysctl_acq_expires;
+-			tasklet_hrtimer_start(&x->mtimer, ktime_set(net->xfrm.sysctl_acq_expires, 0), HRTIMER_MODE_REL);
++			hrtimer_start(&x->mtimer,
++				      ktime_set(net->xfrm.sysctl_acq_expires, 0),
++				      HRTIMER_MODE_REL_SOFT);
+ 			net->xfrm.state_num++;
+ 			xfrm_hash_grow_check(net, x->bydst.next != NULL);
+ 			spin_unlock_bh(&net->xfrm.xfrm_state_lock);
+@@ -1141,7 +1144,7 @@ static void __xfrm_state_insert(struct x
+ 		hlist_add_head_rcu(&x->byspi, net->xfrm.state_byspi + h);
+ 	}
+ 
+-	tasklet_hrtimer_start(&x->mtimer, ktime_set(1, 0), HRTIMER_MODE_REL);
++	hrtimer_start(&x->mtimer, ktime_set(1, 0), HRTIMER_MODE_REL_SOFT);
+ 	if (x->replay_maxage)
+ 		mod_timer(&x->rtimer, jiffies + x->replay_maxage);
+ 
+@@ -1245,7 +1248,9 @@ static struct xfrm_state *__find_acq_cor
+ 		x->mark.m = m->m;
+ 		x->lft.hard_add_expires_seconds = net->xfrm.sysctl_acq_expires;
+ 		xfrm_state_hold(x);
+-		tasklet_hrtimer_start(&x->mtimer, ktime_set(net->xfrm.sysctl_acq_expires, 0), HRTIMER_MODE_REL);
++		hrtimer_start(&x->mtimer,
++			      ktime_set(net->xfrm.sysctl_acq_expires, 0),
++			      HRTIMER_MODE_REL_SOFT);
+ 		list_add(&x->km.all, &net->xfrm.state_all);
+ 		hlist_add_head_rcu(&x->bydst, net->xfrm.state_bydst + h);
+ 		h = xfrm_src_hash(net, daddr, saddr, family);
+@@ -1544,7 +1549,8 @@ int xfrm_state_update(struct xfrm_state
+ 		memcpy(&x1->lft, &x->lft, sizeof(x1->lft));
+ 		x1->km.dying = 0;
+ 
+-		tasklet_hrtimer_start(&x1->mtimer, ktime_set(1, 0), HRTIMER_MODE_REL);
++		hrtimer_start(&x1->mtimer, ktime_set(1, 0),
++			      HRTIMER_MODE_REL_SOFT);
+ 		if (x1->curlft.use_time)
+ 			xfrm_state_check_expire(x1);
+ 
+@@ -1568,7 +1574,7 @@ int xfrm_state_check_expire(struct xfrm_
+ 	if (x->curlft.bytes >= x->lft.hard_byte_limit ||
+ 	    x->curlft.packets >= x->lft.hard_packet_limit) {
+ 		x->km.state = XFRM_STATE_EXPIRED;
+-		tasklet_hrtimer_start(&x->mtimer, 0, HRTIMER_MODE_REL);
++		hrtimer_start(&x->mtimer, 0, HRTIMER_MODE_REL_SOFT);
+ 		return -EINVAL;
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0035-0033-softirq-Remove-tasklet_hrtimer.patch b/kernel/patches-4.14.x-rt/0035-0033-softirq-Remove-tasklet_hrtimer.patch
new file mode 100644
index 000000000..ceb8475ff
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0035-0033-softirq-Remove-tasklet_hrtimer.patch
@@ -0,0 +1,109 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:14 +0100
+Subject: [PATCH 33/36] softirq: Remove tasklet_hrtimer
+
+There are no more tasklet_hrtimer users of this interface.
+Remove it.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/interrupt.h |   25 ----------------------
+ kernel/softirq.c          |   51 ----------------------------------------------
+ 2 files changed, 76 deletions(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -633,31 +633,6 @@ extern void tasklet_kill_immediate(struc
+ extern void tasklet_init(struct tasklet_struct *t,
+ 			 void (*func)(unsigned long), unsigned long data);
+ 
+-struct tasklet_hrtimer {
+-	struct hrtimer		timer;
+-	struct tasklet_struct	tasklet;
+-	enum hrtimer_restart	(*function)(struct hrtimer *);
+-};
+-
+-extern void
+-tasklet_hrtimer_init(struct tasklet_hrtimer *ttimer,
+-		     enum hrtimer_restart (*function)(struct hrtimer *),
+-		     clockid_t which_clock, enum hrtimer_mode mode);
+-
+-static inline
+-void tasklet_hrtimer_start(struct tasklet_hrtimer *ttimer, ktime_t time,
+-			   const enum hrtimer_mode mode)
+-{
+-	hrtimer_start(&ttimer->timer, time, mode);
+-}
+-
+-static inline
+-void tasklet_hrtimer_cancel(struct tasklet_hrtimer *ttimer)
+-{
+-	hrtimer_cancel(&ttimer->timer);
+-	tasklet_kill(&ttimer->tasklet);
+-}
+-
+ /*
+  * Autoprobing for irqs:
+  *
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -594,57 +594,6 @@ void tasklet_kill(struct tasklet_struct
+ }
+ EXPORT_SYMBOL(tasklet_kill);
+ 
+-/*
+- * tasklet_hrtimer
+- */
+-
+-/*
+- * The trampoline is called when the hrtimer expires. It schedules a tasklet
+- * to run __tasklet_hrtimer_trampoline() which in turn will call the intended
+- * hrtimer callback, but from softirq context.
+- */
+-static enum hrtimer_restart __hrtimer_tasklet_trampoline(struct hrtimer *timer)
+-{
+-	struct tasklet_hrtimer *ttimer =
+-		container_of(timer, struct tasklet_hrtimer, timer);
+-
+-	tasklet_hi_schedule(&ttimer->tasklet);
+-	return HRTIMER_NORESTART;
+-}
+-
+-/*
+- * Helper function which calls the hrtimer callback from
+- * tasklet/softirq context
+- */
+-static void __tasklet_hrtimer_trampoline(unsigned long data)
+-{
+-	struct tasklet_hrtimer *ttimer = (void *)data;
+-	enum hrtimer_restart restart;
+-
+-	restart = ttimer->function(&ttimer->timer);
+-	if (restart != HRTIMER_NORESTART)
+-		hrtimer_restart(&ttimer->timer);
+-}
+-
+-/**
+- * tasklet_hrtimer_init - Init a tasklet/hrtimer combo for softirq callbacks
+- * @ttimer:	 tasklet_hrtimer which is initialized
+- * @function:	 hrtimer callback function which gets called from softirq context
+- * @which_clock: clock id (CLOCK_MONOTONIC/CLOCK_REALTIME)
+- * @mode:	 hrtimer mode (HRTIMER_MODE_ABS/HRTIMER_MODE_REL)
+- */
+-void tasklet_hrtimer_init(struct tasklet_hrtimer *ttimer,
+-			  enum hrtimer_restart (*function)(struct hrtimer *),
+-			  clockid_t which_clock, enum hrtimer_mode mode)
+-{
+-	hrtimer_init(&ttimer->timer, which_clock, mode);
+-	ttimer->timer.function = __hrtimer_tasklet_trampoline;
+-	tasklet_init(&ttimer->tasklet, __tasklet_hrtimer_trampoline,
+-		     (unsigned long)ttimer);
+-	ttimer->function = function;
+-}
+-EXPORT_SYMBOL_GPL(tasklet_hrtimer_init);
+-
+ void __init softirq_init(void)
+ {
+ 	int cpu;
diff --git a/kernel/patches-4.14.x-rt/0036-0034-ALSA-dummy-Replace-tasklet-with-softirq-hrtimer.patch b/kernel/patches-4.14.x-rt/0036-0034-ALSA-dummy-Replace-tasklet-with-softirq-hrtimer.patch
new file mode 100644
index 000000000..84064de84
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0036-0034-ALSA-dummy-Replace-tasklet-with-softirq-hrtimer.patch
@@ -0,0 +1,99 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:15 +0100
+Subject: [PATCH 34/36] ALSA/dummy: Replace tasklet with softirq hrtimer
+
+The tasklet is used to defer the execution of snd_pcm_period_elapsed() to
+the softirq context. Using the HRTIMER_MODE_SOFT mode invokes the timer
+callback in softirq context as well which renders the tasklet useless.
+
+[o-takashi: avoid stall due to a call of hrtimer_cancel() on a callback
+            of hrtimer]
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Cc: alsa-devel@alsa-project.org
+Cc: Takashi Sakamoto <o-takashi@sakamocchi.jp>
+Cc: Takashi Iwai <tiwai@suse.com>
+Cc: Jaroslav Kysela <perex@perex.cz>
+Link: http://lkml.kernel.org/r/20170905161820.jtysvxtfleunbbmf@breakpoint.cc
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ sound/drivers/dummy.c |   27 ++++++++++++---------------
+ 1 file changed, 12 insertions(+), 15 deletions(-)
+
+--- a/sound/drivers/dummy.c
++++ b/sound/drivers/dummy.c
+@@ -376,17 +376,9 @@ struct dummy_hrtimer_pcm {
+ 	ktime_t period_time;
+ 	atomic_t running;
+ 	struct hrtimer timer;
+-	struct tasklet_struct tasklet;
+ 	struct snd_pcm_substream *substream;
+ };
+ 
+-static void dummy_hrtimer_pcm_elapsed(unsigned long priv)
+-{
+-	struct dummy_hrtimer_pcm *dpcm = (struct dummy_hrtimer_pcm *)priv;
+-	if (atomic_read(&dpcm->running))
+-		snd_pcm_period_elapsed(dpcm->substream);
+-}
+-
+ static enum hrtimer_restart dummy_hrtimer_callback(struct hrtimer *timer)
+ {
+ 	struct dummy_hrtimer_pcm *dpcm;
+@@ -394,7 +386,14 @@ static enum hrtimer_restart dummy_hrtime
+ 	dpcm = container_of(timer, struct dummy_hrtimer_pcm, timer);
+ 	if (!atomic_read(&dpcm->running))
+ 		return HRTIMER_NORESTART;
+-	tasklet_schedule(&dpcm->tasklet);
++	/*
++	 * In cases of XRUN and draining, this calls .trigger to stop PCM
++	 * substream.
++	 */
++	snd_pcm_period_elapsed(dpcm->substream);
++	if (!atomic_read(&dpcm->running))
++		return HRTIMER_NORESTART;
++
+ 	hrtimer_forward_now(timer, dpcm->period_time);
+ 	return HRTIMER_RESTART;
+ }
+@@ -404,7 +403,7 @@ static int dummy_hrtimer_start(struct sn
+ 	struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
+ 
+ 	dpcm->base_time = hrtimer_cb_get_time(&dpcm->timer);
+-	hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL);
++	hrtimer_start(&dpcm->timer, dpcm->period_time, HRTIMER_MODE_REL_SOFT);
+ 	atomic_set(&dpcm->running, 1);
+ 	return 0;
+ }
+@@ -414,14 +413,14 @@ static int dummy_hrtimer_stop(struct snd
+ 	struct dummy_hrtimer_pcm *dpcm = substream->runtime->private_data;
+ 
+ 	atomic_set(&dpcm->running, 0);
+-	hrtimer_cancel(&dpcm->timer);
++	if (!hrtimer_callback_running(&dpcm->timer))
++		hrtimer_cancel(&dpcm->timer);
+ 	return 0;
+ }
+ 
+ static inline void dummy_hrtimer_sync(struct dummy_hrtimer_pcm *dpcm)
+ {
+ 	hrtimer_cancel(&dpcm->timer);
+-	tasklet_kill(&dpcm->tasklet);
+ }
+ 
+ static snd_pcm_uframes_t
+@@ -466,12 +465,10 @@ static int dummy_hrtimer_create(struct s
+ 	if (!dpcm)
+ 		return -ENOMEM;
+ 	substream->runtime->private_data = dpcm;
+-	hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(&dpcm->timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);
+ 	dpcm->timer.function = dummy_hrtimer_callback;
+ 	dpcm->substream = substream;
+ 	atomic_set(&dpcm->running, 0);
+-	tasklet_init(&dpcm->tasklet, dummy_hrtimer_pcm_elapsed,
+-		     (unsigned long)dpcm);
+ 	return 0;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0037-0035-usb-gadget-NCM-Replace-tasklet-with-softirq-hrtimer.patch b/kernel/patches-4.14.x-rt/0037-0035-usb-gadget-NCM-Replace-tasklet-with-softirq-hrtimer.patch
new file mode 100644
index 000000000..3f67c54be
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0037-0035-usb-gadget-NCM-Replace-tasklet-with-softirq-hrtimer.patch
@@ -0,0 +1,96 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:16 +0100
+Subject: [PATCH 35/36] usb/gadget/NCM: Replace tasklet with softirq hrtimer
+
+The tx_tasklet tasklet is used in invoke the hrtimer (task_timer) in
+softirq context. This can be also achieved without the tasklet but
+with HRTIMER_MODE_SOFT as hrtimer mode.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Cc: Felipe Balbi <balbi@kernel.org>
+Cc: linux-usb@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/usb/gadget/function/f_ncm.c |   30 +++++++-----------------------
+ 1 file changed, 7 insertions(+), 23 deletions(-)
+
+--- a/drivers/usb/gadget/function/f_ncm.c
++++ b/drivers/usb/gadget/function/f_ncm.c
+@@ -77,9 +77,7 @@ struct f_ncm {
+ 	struct sk_buff			*skb_tx_ndp;
+ 	u16				ndp_dgram_count;
+ 	bool				timer_force_tx;
+-	struct tasklet_struct		tx_tasklet;
+ 	struct hrtimer			task_timer;
+-
+ 	bool				timer_stopping;
+ };
+ 
+@@ -1108,7 +1106,7 @@ static struct sk_buff *ncm_wrap_ntb(stru
+ 
+ 		/* Delay the timer. */
+ 		hrtimer_start(&ncm->task_timer, TX_TIMEOUT_NSECS,
+-			      HRTIMER_MODE_REL);
++			      HRTIMER_MODE_REL_SOFT);
+ 
+ 		/* Add the datagram position entries */
+ 		ntb_ndp = skb_put_zero(ncm->skb_tx_ndp, dgram_idx_len);
+@@ -1152,17 +1150,15 @@ static struct sk_buff *ncm_wrap_ntb(stru
+ }
+ 
+ /*
+- * This transmits the NTB if there are frames waiting.
++ * The transmit should only be run if no skb data has been sent
++ * for a certain duration.
+  */
+-static void ncm_tx_tasklet(unsigned long data)
++static enum hrtimer_restart ncm_tx_timeout(struct hrtimer *data)
+ {
+-	struct f_ncm	*ncm = (void *)data;
+-
+-	if (ncm->timer_stopping)
+-		return;
++	struct f_ncm *ncm = container_of(data, struct f_ncm, task_timer);
+ 
+ 	/* Only send if data is available. */
+-	if (ncm->skb_tx_data) {
++	if (!ncm->timer_stopping && ncm->skb_tx_data) {
+ 		ncm->timer_force_tx = true;
+ 
+ 		/* XXX This allowance of a NULL skb argument to ndo_start_xmit
+@@ -1175,16 +1171,6 @@ static void ncm_tx_tasklet(unsigned long
+ 
+ 		ncm->timer_force_tx = false;
+ 	}
+-}
+-
+-/*
+- * The transmit should only be run if no skb data has been sent
+- * for a certain duration.
+- */
+-static enum hrtimer_restart ncm_tx_timeout(struct hrtimer *data)
+-{
+-	struct f_ncm *ncm = container_of(data, struct f_ncm, task_timer);
+-	tasklet_schedule(&ncm->tx_tasklet);
+ 	return HRTIMER_NORESTART;
+ }
+ 
+@@ -1517,8 +1503,7 @@ static int ncm_bind(struct usb_configura
+ 	ncm->port.open = ncm_open;
+ 	ncm->port.close = ncm_close;
+ 
+-	tasklet_init(&ncm->tx_tasklet, ncm_tx_tasklet, (unsigned long) ncm);
+-	hrtimer_init(&ncm->task_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(&ncm->task_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_SOFT);
+ 	ncm->task_timer.function = ncm_tx_timeout;
+ 
+ 	DBG(cdev, "CDC Network: %s speed IN/%s OUT/%s NOTIFY/%s\n",
+@@ -1627,7 +1612,6 @@ static void ncm_unbind(struct usb_config
+ 	DBG(c->cdev, "ncm unbind\n");
+ 
+ 	hrtimer_cancel(&ncm->task_timer);
+-	tasklet_kill(&ncm->tx_tasklet);
+ 
+ 	ncm_string_defs[0].id = 0;
+ 	usb_free_all_descriptors(f);
diff --git a/kernel/patches-4.14.x-rt/0038-0036-net-mvpp2-Replace-tasklet-with-softirq-hrtimer.patch b/kernel/patches-4.14.x-rt/0038-0036-net-mvpp2-Replace-tasklet-with-softirq-hrtimer.patch
new file mode 100644
index 000000000..644f6c54d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0038-0036-net-mvpp2-Replace-tasklet-with-softirq-hrtimer.patch
@@ -0,0 +1,132 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 23 Nov 2017 16:39:17 +0100
+Subject: [PATCH 36/36] net/mvpp2: Replace tasklet with softirq hrtimer
+
+The tx_done_tasklet tasklet is used in invoke the hrtimer
+(mvpp2_hr_timer_cb) in softirq context. This can be also achieved without
+the tasklet but with HRTIMER_MODE_SOFT as hrtimer mode.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Anna-Maria Gleixner <anna-maria@linutronix.de>
+Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Cc: netdev@vger.kernel.org
+Cc: "David S. Miller" <davem@davemloft.net>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/net/ethernet/marvell/mvpp2.c |   62 ++++++++++++++---------------------
+ 1 file changed, 25 insertions(+), 37 deletions(-)
+
+--- a/drivers/net/ethernet/marvell/mvpp2.c
++++ b/drivers/net/ethernet/marvell/mvpp2.c
+@@ -830,9 +830,8 @@ struct mvpp2_pcpu_stats {
+ /* Per-CPU port control */
+ struct mvpp2_port_pcpu {
+ 	struct hrtimer tx_done_timer;
++	struct net_device *dev;
+ 	bool timer_scheduled;
+-	/* Tasklet for egress finalization */
+-	struct tasklet_struct tx_done_tasklet;
+ };
+ 
+ struct mvpp2_queue_vector {
+@@ -5954,46 +5953,34 @@ static void mvpp2_link_event(struct net_
+ 	}
+ }
+ 
+-static void mvpp2_timer_set(struct mvpp2_port_pcpu *port_pcpu)
+-{
+-	ktime_t interval;
+-
+-	if (!port_pcpu->timer_scheduled) {
+-		port_pcpu->timer_scheduled = true;
+-		interval = MVPP2_TXDONE_HRTIMER_PERIOD_NS;
+-		hrtimer_start(&port_pcpu->tx_done_timer, interval,
+-			      HRTIMER_MODE_REL_PINNED);
+-	}
+-}
+-
+-static void mvpp2_tx_proc_cb(unsigned long data)
++static enum hrtimer_restart mvpp2_hr_timer_cb(struct hrtimer *timer)
+ {
+-	struct net_device *dev = (struct net_device *)data;
+-	struct mvpp2_port *port = netdev_priv(dev);
+-	struct mvpp2_port_pcpu *port_pcpu = this_cpu_ptr(port->pcpu);
++	struct net_device *dev;
++	struct mvpp2_port *port;
++	struct mvpp2_port_pcpu *port_pcpu;
+ 	unsigned int tx_todo, cause;
+ 
++	port_pcpu = container_of(timer, struct mvpp2_port_pcpu, tx_done_timer);
++	dev = port_pcpu->dev;
++
+ 	if (!netif_running(dev))
+-		return;
++		return HRTIMER_NORESTART;
++
+ 	port_pcpu->timer_scheduled = false;
++	port = netdev_priv(dev);
+ 
+ 	/* Process all the Tx queues */
+ 	cause = (1 << port->ntxqs) - 1;
+ 	tx_todo = mvpp2_tx_done(port, cause, smp_processor_id());
+ 
+ 	/* Set the timer in case not all the packets were processed */
+-	if (tx_todo)
+-		mvpp2_timer_set(port_pcpu);
+-}
+-
+-static enum hrtimer_restart mvpp2_hr_timer_cb(struct hrtimer *timer)
+-{
+-	struct mvpp2_port_pcpu *port_pcpu = container_of(timer,
+-							 struct mvpp2_port_pcpu,
+-							 tx_done_timer);
+-
+-	tasklet_schedule(&port_pcpu->tx_done_tasklet);
++	if (tx_todo && !port_pcpu->timer_scheduled) {
++		port_pcpu->timer_scheduled = true;
++		hrtimer_forward_now(&port_pcpu->tx_done_timer,
++				    MVPP2_TXDONE_HRTIMER_PERIOD_NS);
+ 
++		return HRTIMER_RESTART;
++	}
+ 	return HRTIMER_NORESTART;
+ }
+ 
+@@ -6482,7 +6469,12 @@ static int mvpp2_tx(struct sk_buff *skb,
+ 	    txq_pcpu->count > 0) {
+ 		struct mvpp2_port_pcpu *port_pcpu = this_cpu_ptr(port->pcpu);
+ 
+-		mvpp2_timer_set(port_pcpu);
++		if (!port_pcpu->timer_scheduled) {
++			port_pcpu->timer_scheduled = true;
++			hrtimer_start(&port_pcpu->tx_done_timer,
++				      MVPP2_TXDONE_HRTIMER_PERIOD_NS,
++				      HRTIMER_MODE_REL_PINNED_SOFT);
++		}
+ 	}
+ 
+ 	return NETDEV_TX_OK;
+@@ -6871,7 +6863,6 @@ static int mvpp2_stop(struct net_device
+ 
+ 			hrtimer_cancel(&port_pcpu->tx_done_timer);
+ 			port_pcpu->timer_scheduled = false;
+-			tasklet_kill(&port_pcpu->tx_done_tasklet);
+ 		}
+ 	}
+ 	mvpp2_cleanup_rxqs(port);
+@@ -7639,13 +7630,10 @@ static int mvpp2_port_probe(struct platf
+ 			port_pcpu = per_cpu_ptr(port->pcpu, cpu);
+ 
+ 			hrtimer_init(&port_pcpu->tx_done_timer, CLOCK_MONOTONIC,
+-				     HRTIMER_MODE_REL_PINNED);
++				     HRTIMER_MODE_REL_PINNED_SOFT);
+ 			port_pcpu->tx_done_timer.function = mvpp2_hr_timer_cb;
+ 			port_pcpu->timer_scheduled = false;
+-
+-			tasklet_init(&port_pcpu->tx_done_tasklet,
+-				     mvpp2_tx_proc_cb,
+-				     (unsigned long)dev);
++			port_pcpu->dev = dev;
+ 		}
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0039-at91_dont_enable_disable_clock.patch b/kernel/patches-4.14.x-rt/0039-at91_dont_enable_disable_clock.patch
new file mode 100644
index 000000000..417e2e792
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0039-at91_dont_enable_disable_clock.patch
@@ -0,0 +1,91 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 09 Mar 2016 10:51:06 +0100
+Subject: arm: at91: do not disable/enable clocks in a row
+
+Currently the driver will disable the clock and enable it one line later
+if it is switching from periodic mode into one shot.
+This can be avoided and causes a needless warning on -RT.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/clocksource/tcb_clksrc.c |   33 +++++++++++++++++++++++++++++----
+ 1 file changed, 29 insertions(+), 4 deletions(-)
+
+--- a/drivers/clocksource/tcb_clksrc.c
++++ b/drivers/clocksource/tcb_clksrc.c
+@@ -126,6 +126,7 @@ static struct clocksource clksrc = {
+ struct tc_clkevt_device {
+ 	struct clock_event_device	clkevt;
+ 	struct clk			*clk;
++	bool				clk_enabled;
+ 	void __iomem			*regs;
+ };
+ 
+@@ -143,6 +144,24 @@ static struct tc_clkevt_device *to_tc_cl
+  */
+ static u32 timer_clock;
+ 
++static void tc_clk_disable(struct clock_event_device *d)
++{
++	struct tc_clkevt_device *tcd = to_tc_clkevt(d);
++
++	clk_disable(tcd->clk);
++	tcd->clk_enabled = false;
++}
++
++static void tc_clk_enable(struct clock_event_device *d)
++{
++	struct tc_clkevt_device *tcd = to_tc_clkevt(d);
++
++	if (tcd->clk_enabled)
++		return;
++	clk_enable(tcd->clk);
++	tcd->clk_enabled = true;
++}
++
+ static int tc_shutdown(struct clock_event_device *d)
+ {
+ 	struct tc_clkevt_device *tcd = to_tc_clkevt(d);
+@@ -150,8 +169,14 @@ static int tc_shutdown(struct clock_even
+ 
+ 	writel(0xff, regs + ATMEL_TC_REG(2, IDR));
+ 	writel(ATMEL_TC_CLKDIS, regs + ATMEL_TC_REG(2, CCR));
++	return 0;
++}
++
++static int tc_shutdown_clk_off(struct clock_event_device *d)
++{
++	tc_shutdown(d);
+ 	if (!clockevent_state_detached(d))
+-		clk_disable(tcd->clk);
++		tc_clk_disable(d);
+ 
+ 	return 0;
+ }
+@@ -164,7 +189,7 @@ static int tc_set_oneshot(struct clock_e
+ 	if (clockevent_state_oneshot(d) || clockevent_state_periodic(d))
+ 		tc_shutdown(d);
+ 
+-	clk_enable(tcd->clk);
++	tc_clk_enable(d);
+ 
+ 	/* slow clock, count up to RC, then irq and stop */
+ 	writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE |
+@@ -186,7 +211,7 @@ static int tc_set_periodic(struct clock_
+ 	/* By not making the gentime core emulate periodic mode on top
+ 	 * of oneshot, we get lower overhead and improved accuracy.
+ 	 */
+-	clk_enable(tcd->clk);
++	tc_clk_enable(d);
+ 
+ 	/* slow clock, count up to RC, then irq and restart */
+ 	writel(timer_clock | ATMEL_TC_WAVE | ATMEL_TC_WAVESEL_UP_AUTO,
+@@ -220,7 +245,7 @@ static struct tc_clkevt_device clkevt =
+ 		/* Should be lower than at91rm9200's system timer */
+ 		.rating			= 125,
+ 		.set_next_event		= tc_next_event,
+-		.set_state_shutdown	= tc_shutdown,
++		.set_state_shutdown	= tc_shutdown_clk_off,
+ 		.set_state_periodic	= tc_set_periodic,
+ 		.set_state_oneshot	= tc_set_oneshot,
+ 	},
diff --git a/kernel/patches-4.14.x-rt/0040-rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch b/kernel/patches-4.14.x-rt/0040-rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch
new file mode 100644
index 000000000..325a7c0a2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0040-rfc-arm-smp-__cpu_disable-fix-sleeping-function-called-from-invalid-context.patch
@@ -0,0 +1,93 @@
+Subject: ARM: smp: Move clear_tasks_mm_cpumask() call to __cpu_die()
+From: Grygorii Strashko <grygorii.strashko@ti.com>
+Date: Fri, 11 Sep 2015 21:21:23 +0300
+
+When running with the RT-kernel (4.1.5-rt5) on TI OMAP dra7-evm and trying
+to do Suspend to RAM, the following backtrace occurs:
+
+ Disabling non-boot CPUs ...
+ PM: noirq suspend of devices complete after 7.295 msecs
+ Disabling non-boot CPUs ...
+ BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:917
+ in_atomic(): 1, irqs_disabled(): 128, pid: 18, name: migration/1
+ INFO: lockdep is turned off.
+ irq event stamp: 122
+ hardirqs last  enabled at (121): [<c06ac0ac>] _raw_spin_unlock_irqrestore+0x88/0x90
+ hardirqs last disabled at (122): [<c06abed0>] _raw_spin_lock_irq+0x28/0x5c
+ softirqs last  enabled at (0): [<c003d294>] copy_process.part.52+0x410/0x19d8
+ softirqs last disabled at (0): [<  (null)>]   (null)
+ Preemption disabled at:[<  (null)>]   (null)
+  CPU: 1 PID: 18 Comm: migration/1 Tainted: G        W       4.1.4-rt3-01046-g96ac8da #204
+ Hardware name: Generic DRA74X (Flattened Device Tree)
+ [<c0019134>] (unwind_backtrace) from [<c0014774>] (show_stack+0x20/0x24)
+ [<c0014774>] (show_stack) from [<c06a70f4>] (dump_stack+0x88/0xdc)
+ [<c06a70f4>] (dump_stack) from [<c006cab8>] (___might_sleep+0x198/0x2a8)
+ [<c006cab8>] (___might_sleep) from [<c06ac4dc>] (rt_spin_lock+0x30/0x70)
+ [<c06ac4dc>] (rt_spin_lock) from [<c013f790>] (find_lock_task_mm+0x9c/0x174)
+ [<c013f790>] (find_lock_task_mm) from [<c00409ac>] (clear_tasks_mm_cpumask+0xb4/0x1ac)
+ [<c00409ac>] (clear_tasks_mm_cpumask) from [<c00166a4>] (__cpu_disable+0x98/0xbc)
+ [<c00166a4>] (__cpu_disable) from [<c06a2e8c>] (take_cpu_down+0x1c/0x50)
+ [<c06a2e8c>] (take_cpu_down) from [<c00f2600>] (multi_cpu_stop+0x11c/0x158)
+ [<c00f2600>] (multi_cpu_stop) from [<c00f2a9c>] (cpu_stopper_thread+0xc4/0x184)
+ [<c00f2a9c>] (cpu_stopper_thread) from [<c0069058>] (smpboot_thread_fn+0x18c/0x324)
+ [<c0069058>] (smpboot_thread_fn) from [<c00649c4>] (kthread+0xe8/0x104)
+ [<c00649c4>] (kthread) from [<c0010058>] (ret_from_fork+0x14/0x3c)
+ CPU1: shutdown
+ PM: Calling sched_clock_suspend+0x0/0x40
+ PM: Calling timekeeping_suspend+0x0/0x2e0
+ PM: Calling irq_gc_suspend+0x0/0x68
+ PM: Calling fw_suspend+0x0/0x2c
+ PM: Calling cpu_pm_suspend+0x0/0x28
+
+Also, sometimes system stucks right after displaying "Disabling non-boot
+CPUs ...". The root cause of above backtrace is task_lock() which takes
+a sleeping lock on -RT.
+
+To fix the issue, move clear_tasks_mm_cpumask() call from __cpu_disable()
+to __cpu_die() which is called on the thread which is asking for a target
+CPU to be shutdown. In addition, this change restores CPUhotplug functionality
+on TI OMAP dra7-evm and CPU1 can be unplugged/plugged many times.
+
+Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: <linux-arm-kernel@lists.infradead.org>
+Cc: Sekhar Nori <nsekhar@ti.com>
+Cc: Austin Schuh <austin@peloton-tech.com>
+Cc: <philipp@peloton-tech.com>
+Cc: Russell King <linux@arm.linux.org.uk>
+Cc: <bigeasy@linutronix.de>
+Cc: stable-rt@vger.kernel.org
+Link: http://lkml.kernel.org/r/1441995683-30817-1-git-send-email-grygorii.strashko@ti.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+
+RFC: I'm not sure how safe this change is and will be appreciated for any comments.
+Most of arches call clear_tasks_mm_cpumask() from __cpu_disable(), but *powerpc*
+calls it from CPU_DEAD notifier. This patch follows powerpc's approach in
+general.
+
+This issue was first reported in:
+ http://www.spinics.net/lists/linux-rt-users/msg13752.html
+
+ arch/arm/kernel/smp.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/arch/arm/kernel/smp.c
++++ b/arch/arm/kernel/smp.c
+@@ -236,8 +236,6 @@ int __cpu_disable(void)
+ 	flush_cache_louis();
+ 	local_flush_tlb_all();
+ 
+-	clear_tasks_mm_cpumask(cpu);
+-
+ 	return 0;
+ }
+ 
+@@ -255,6 +253,7 @@ void __cpu_die(unsigned int cpu)
+ 	}
+ 	pr_debug("CPU%u: shutdown\n", cpu);
+ 
++	clear_tasks_mm_cpumask(cpu);
+ 	/*
+ 	 * platform_cpu_kill() is generally expected to do the powering off
+ 	 * and/or cutting of clocks to the dying CPU.  Optionally, this may
diff --git a/kernel/patches-4.14.x-rt/0041-rtmutex--Handle-non-enqueued-waiters-gracefully.patch b/kernel/patches-4.14.x-rt/0041-rtmutex--Handle-non-enqueued-waiters-gracefully.patch
new file mode 100644
index 000000000..4ebc55416
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0041-rtmutex--Handle-non-enqueued-waiters-gracefully.patch
@@ -0,0 +1,32 @@
+Subject: rtmutex: Handle non enqueued waiters gracefully
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 06 Nov 2015 18:51:03 +0100
+
+Yimin debugged that in case of a PI wakeup in progress when
+rt_mutex_start_proxy_lock() calls task_blocks_on_rt_mutex() the latter
+returns -EAGAIN and in consequence the remove_waiter() call runs into
+a BUG_ON() because there is nothing to remove.
+
+Guard it with rt_mutex_has_waiters(). This is a quick fix which is
+easy to backport. The proper fix is to have a central check in
+remove_waiter() so we can call it unconditionally.
+
+Reported-and-debugged-by: Yimin Deng <yimin11.deng@gmail.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: stable-rt@vger.kernel.org
+
+---
+ kernel/locking/rtmutex.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1728,7 +1728,7 @@ int __rt_mutex_start_proxy_lock(struct r
+ 		ret = 0;
+ 	}
+ 
+-	if (unlikely(ret))
++	if (ret && rt_mutex_has_waiters(lock))
+ 		remove_waiter(lock, waiter);
+ 
+ 	debug_rt_mutex_print_deadlock(waiter);
diff --git a/kernel/patches-4.14.x-rt/0042-rbtree-include-rcu.h-because-we-use-it.patch b/kernel/patches-4.14.x-rt/0042-rbtree-include-rcu.h-because-we-use-it.patch
new file mode 100644
index 000000000..3070854de
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0042-rbtree-include-rcu.h-because-we-use-it.patch
@@ -0,0 +1,35 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 14 Sep 2016 11:52:17 +0200
+Subject: rbtree: include rcu.h because we use it
+
+Since commit c1adf20052d8 ("Introduce rb_replace_node_rcu()")
+rbtree_augmented.h uses RCU related data structures but does not include
+them. It works as long as gets somehow included before that and fails
+otherwise.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/rbtree_augmented.h |    1 +
+ include/linux/rbtree_latch.h     |    1 +
+ 2 files changed, 2 insertions(+)
+
+--- 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
+--- a/include/linux/rbtree_latch.h
++++ b/include/linux/rbtree_latch.h
+@@ -35,6 +35,7 @@
+ 
+ #include <linux/rbtree.h>
+ #include <linux/seqlock.h>
++#include <linux/rcupdate.h>
+ 
+ struct latch_tree_node {
+ 	struct rb_node node[2];
diff --git a/kernel/patches-4.14.x-rt/0043-rxrpc-remove-unused-static-variables.patch b/kernel/patches-4.14.x-rt/0043-rxrpc-remove-unused-static-variables.patch
new file mode 100644
index 000000000..34b9923b3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0043-rxrpc-remove-unused-static-variables.patch
@@ -0,0 +1,26 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 21 Oct 2016 10:54:50 +0200
+Subject: [PATCH] rxrpc: remove unused static variables
+
+The rxrpc_security_methods and rxrpc_security_sem user has been removed
+in 648af7fca159 ("rxrpc: Absorb the rxkad security module"). This was
+noticed by kbuild test robot for the -RT tree but is also true for !RT.
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/rxrpc/security.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/net/rxrpc/security.c
++++ b/net/rxrpc/security.c
+@@ -19,9 +19,6 @@
+ #include <keys/rxrpc-type.h>
+ #include "ar-internal.h"
+ 
+-static LIST_HEAD(rxrpc_security_methods);
+-static DECLARE_RWSEM(rxrpc_security_sem);
+-
+ static const struct rxrpc_security *rxrpc_security_types[] = {
+ 	[RXRPC_SECURITY_NONE]	= &rxrpc_no_security,
+ #ifdef CONFIG_RXKAD
diff --git a/kernel/patches-4.14.x-rt/0044-mfd-syscon-atmel-smc-include-string.h.patch b/kernel/patches-4.14.x-rt/0044-mfd-syscon-atmel-smc-include-string.h.patch
new file mode 100644
index 000000000..db4e313e6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0044-mfd-syscon-atmel-smc-include-string.h.patch
@@ -0,0 +1,22 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 4 Oct 2017 09:55:58 +0200
+Subject: [PATCH] mfd: syscon: atmel-smc: include string.h
+
+The string.h header file is needed for the memset() definition. The RT
+build fails because it is not pulled in via other header files.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/mfd/atmel-smc.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mfd/atmel-smc.c
++++ b/drivers/mfd/atmel-smc.c
+@@ -12,6 +12,7 @@
+  */
+ 
+ #include <linux/mfd/syscon/atmel-smc.h>
++#include <linux/string.h>
+ 
+ /**
+  * atmel_smc_cs_conf_init - initialize a SMC CS conf
diff --git a/kernel/patches-4.14.x-rt/0045-sched-swait-include-wait.h.patch b/kernel/patches-4.14.x-rt/0045-sched-swait-include-wait.h.patch
new file mode 100644
index 000000000..33e80727a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0045-sched-swait-include-wait.h.patch
@@ -0,0 +1,35 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 4 Dec 2017 13:11:10 +0100
+Subject: [PATCH] sched/swait: include wait.h
+
+kbuild bot reported against an intermediate RT patch that the build
+fails with:
+
+>    In file included from include/linux/completion.h:12:0,
+>                     from include/linux/rcupdate_wait.h:10,
+>                     from kernel/rcu/srcutiny.c:27:
+>    kernel/rcu/srcutiny.c: In function 'srcu_drive_gp':
+> >> include/linux/swait.h:172:7: error: implicit declaration of function '___wait_is_interruptible'; did you mean '__swait_event_interruptible'?
+>       if (___wait_is_interruptible(state) && __int) {  \
+
+That error vanishes a few patches later (in the RT queue) because wait.h
+is then pulled in by other means. It does not seem to surface on !RT.
+I think that swait should include a header file for a function/macro
+(___wait_is_interruptible()) it is using.
+
+Reported-by: kbuild test robot <fengguang.wu@intel.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/swait.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/swait.h
++++ b/include/linux/swait.h
+@@ -5,6 +5,7 @@
+ #include <linux/list.h>
+ #include <linux/stddef.h>
+ #include <linux/spinlock.h>
++#include <linux/wait.h>
+ #include <asm/current.h>
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0046-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch b/kernel/patches-4.14.x-rt/0046-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
new file mode 100644
index 000000000..1b2d144ae
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0046-NFSv4-replace-seqcount_t-with-a-seqlock_t.patch
@@ -0,0 +1,127 @@
+Date:   Fri, 28 Oct 2016 23:05:11 +0200
+From:   Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+To:     Trond Myklebust <trond.myklebust@primarydata.com>
+Cc:     Anna Schumaker <anna.schumaker@netapp.com>,
+        linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org,
+        tglx@linutronix.de
+Subject: NFSv4: replace seqcount_t with a seqlock_t
+
+The raw_write_seqcount_begin() in nfs4_reclaim_open_state() bugs me
+because it maps to preempt_disable() in -RT which I can't have at this
+point. So I took a look at the code.
+It the lockdep part was removed in commit abbec2da13f0 ("NFS: Use
+raw_write_seqcount_begin/end int nfs4_reclaim_open_state") because
+lockdep complained. The whole seqcount thing was introduced in commit
+c137afabe330 ("NFSv4: Allow the state manager to mark an open_owner as
+being recovered").
+The recovery threads runs only once.
+write_seqlock() does not work on !RT because it disables preemption and it the
+writer side is preemptible (has to remain so despite the fact that it will
+block readers).
+
+Reported-by: kernel test robot <xiaolong.ye@intel.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/nfs/delegation.c |    4 ++--
+ fs/nfs/nfs4_fs.h    |    2 +-
+ fs/nfs/nfs4proc.c   |    4 ++--
+ fs/nfs/nfs4state.c  |   22 ++++++++++++++++------
+ 4 files changed, 21 insertions(+), 11 deletions(-)
+
+--- a/fs/nfs/delegation.c
++++ b/fs/nfs/delegation.c
+@@ -150,11 +150,11 @@ static int nfs_delegation_claim_opens(st
+ 		sp = state->owner;
+ 		/* Block nfs4_proc_unlck */
+ 		mutex_lock(&sp->so_delegreturn_mutex);
+-		seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);
++		seq = read_seqbegin(&sp->so_reclaim_seqlock);
+ 		err = nfs4_open_delegation_recall(ctx, state, stateid, type);
+ 		if (!err)
+ 			err = nfs_delegation_claim_locks(ctx, state, stateid);
+-		if (!err && read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
++		if (!err && read_seqretry(&sp->so_reclaim_seqlock, seq))
+ 			err = -EAGAIN;
+ 		mutex_unlock(&sp->so_delegreturn_mutex);
+ 		put_nfs_open_context(ctx);
+--- a/fs/nfs/nfs4_fs.h
++++ b/fs/nfs/nfs4_fs.h
+@@ -112,7 +112,7 @@ struct nfs4_state_owner {
+ 	unsigned long	     so_flags;
+ 	struct list_head     so_states;
+ 	struct nfs_seqid_counter so_seqid;
+-	seqcount_t	     so_reclaim_seqcount;
++	seqlock_t	     so_reclaim_seqlock;
+ 	struct mutex	     so_delegreturn_mutex;
+ };
+ 
+--- a/fs/nfs/nfs4proc.c
++++ b/fs/nfs/nfs4proc.c
+@@ -2638,7 +2638,7 @@ static int _nfs4_open_and_get_state(stru
+ 	unsigned int seq;
+ 	int ret;
+ 
+-	seq = raw_seqcount_begin(&sp->so_reclaim_seqcount);
++	seq = raw_seqcount_begin(&sp->so_reclaim_seqlock.seqcount);
+ 
+ 	ret = _nfs4_proc_open(opendata);
+ 	if (ret != 0)
+@@ -2676,7 +2676,7 @@ static int _nfs4_open_and_get_state(stru
+ 
+ 	if (d_inode(dentry) == state->inode) {
+ 		nfs_inode_attach_open_context(ctx);
+-		if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq))
++		if (read_seqretry(&sp->so_reclaim_seqlock, seq))
+ 			nfs4_schedule_stateid_recovery(server, state);
+ 	}
+ out:
+--- a/fs/nfs/nfs4state.c
++++ b/fs/nfs/nfs4state.c
+@@ -494,7 +494,7 @@ nfs4_alloc_state_owner(struct nfs_server
+ 	nfs4_init_seqid_counter(&sp->so_seqid);
+ 	atomic_set(&sp->so_count, 1);
+ 	INIT_LIST_HEAD(&sp->so_lru);
+-	seqcount_init(&sp->so_reclaim_seqcount);
++	seqlock_init(&sp->so_reclaim_seqlock);
+ 	mutex_init(&sp->so_delegreturn_mutex);
+ 	return sp;
+ }
+@@ -1516,8 +1516,12 @@ static int nfs4_reclaim_open_state(struc
+ 	 * recovering after a network partition or a reboot from a
+ 	 * server that doesn't support a grace period.
+ 	 */
++#ifdef CONFIG_PREEMPT_RT_FULL
++	write_seqlock(&sp->so_reclaim_seqlock);
++#else
++	write_seqcount_begin(&sp->so_reclaim_seqlock.seqcount);
++#endif
+ 	spin_lock(&sp->so_lock);
+-	raw_write_seqcount_begin(&sp->so_reclaim_seqcount);
+ restart:
+ 	list_for_each_entry(state, &sp->so_states, open_states) {
+ 		if (!test_and_clear_bit(ops->state_flag_bit, &state->flags))
+@@ -1586,14 +1590,20 @@ static int nfs4_reclaim_open_state(struc
+ 		spin_lock(&sp->so_lock);
+ 		goto restart;
+ 	}
+-	raw_write_seqcount_end(&sp->so_reclaim_seqcount);
+ 	spin_unlock(&sp->so_lock);
++#ifdef CONFIG_PREEMPT_RT_FULL
++	write_sequnlock(&sp->so_reclaim_seqlock);
++#else
++	write_seqcount_end(&sp->so_reclaim_seqlock.seqcount);
++#endif
+ 	return 0;
+ out_err:
+ 	nfs4_put_open_state(state);
+-	spin_lock(&sp->so_lock);
+-	raw_write_seqcount_end(&sp->so_reclaim_seqcount);
+-	spin_unlock(&sp->so_lock);
++#ifdef CONFIG_PREEMPT_RT_FULL
++	write_sequnlock(&sp->so_reclaim_seqlock);
++#else
++	write_seqcount_end(&sp->so_reclaim_seqlock.seqcount);
++#endif
+ 	return status;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0047-Bluetooth-avoid-recursive-locking-in-hci_send_to_cha.patch b/kernel/patches-4.14.x-rt/0047-Bluetooth-avoid-recursive-locking-in-hci_send_to_cha.patch
new file mode 100644
index 000000000..50c58e5bb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0047-Bluetooth-avoid-recursive-locking-in-hci_send_to_cha.patch
@@ -0,0 +1,70 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 21 Sep 2017 15:35:57 +0200
+Subject: Bluetooth: avoid recursive locking in
+ hci_send_to_channel()
+
+Mart reported a deadlock in -RT in the call path:
+  hci_send_monitor_ctrl_event() -> hci_send_to_channel()
+
+because both functions acquire the same read lock hci_sk_list.lock. This
+is also a mainline issue because the qrwlock implementation is writer
+fair (the traditional rwlock implementation is reader biased).
+
+To avoid the deadlock there is now __hci_send_to_channel() which expects
+the readlock to be held.
+
+Cc: Marcel Holtmann <marcel@holtmann.org>
+Cc: Johan Hedberg <johan.hedberg@intel.com>
+Cc: stable-rt@vger.kernel.org
+Fixes: 38ceaa00d02d ("Bluetooth: Add support for sending MGMT commands and events to monitor")
+Reported-by: Mart van de Wege <mvdwege@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/bluetooth/hci_sock.c |   17 +++++++++++------
+ 1 file changed, 11 insertions(+), 6 deletions(-)
+
+--- a/net/bluetooth/hci_sock.c
++++ b/net/bluetooth/hci_sock.c
+@@ -251,15 +251,13 @@ void hci_send_to_sock(struct hci_dev *hd
+ }
+ 
+ /* Send frame to sockets with specific channel */
+-void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,
+-			 int flag, struct sock *skip_sk)
++static void __hci_send_to_channel(unsigned short channel, struct sk_buff *skb,
++				  int flag, struct sock *skip_sk)
+ {
+ 	struct sock *sk;
+ 
+ 	BT_DBG("channel %u len %d", channel, skb->len);
+ 
+-	read_lock(&hci_sk_list.lock);
+-
+ 	sk_for_each(sk, &hci_sk_list.head) {
+ 		struct sk_buff *nskb;
+ 
+@@ -285,6 +283,13 @@ void hci_send_to_channel(unsigned short
+ 			kfree_skb(nskb);
+ 	}
+ 
++}
++
++void hci_send_to_channel(unsigned short channel, struct sk_buff *skb,
++			 int flag, struct sock *skip_sk)
++{
++	read_lock(&hci_sk_list.lock);
++	__hci_send_to_channel(channel, skb, flag, skip_sk);
+ 	read_unlock(&hci_sk_list.lock);
+ }
+ 
+@@ -388,8 +393,8 @@ void hci_send_monitor_ctrl_event(struct
+ 		hdr->index = index;
+ 		hdr->len = cpu_to_le16(skb->len - HCI_MON_HDR_SIZE);
+ 
+-		hci_send_to_channel(HCI_CHANNEL_MONITOR, skb,
+-				    HCI_SOCK_TRUSTED, NULL);
++		__hci_send_to_channel(HCI_CHANNEL_MONITOR, skb,
++				      HCI_SOCK_TRUSTED, NULL);
+ 		kfree_skb(skb);
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0048-iommu-iova-Use-raw_cpu_ptr-instead-of-get_cpu_ptr-fo.patch b/kernel/patches-4.14.x-rt/0048-iommu-iova-Use-raw_cpu_ptr-instead-of-get_cpu_ptr-fo.patch
new file mode 100644
index 000000000..7c1776429
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0048-iommu-iova-Use-raw_cpu_ptr-instead-of-get_cpu_ptr-fo.patch
@@ -0,0 +1,42 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 21 Sep 2017 17:21:40 +0200
+Subject: [PATCH] iommu/iova: Use raw_cpu_ptr() instead of get_cpu_ptr() for
+ ->fq
+
+get_cpu_ptr() disabled preemption and returns the ->fq object of the
+current CPU. raw_cpu_ptr() does the same except that it not disable
+preemption which means the scheduler can move it to another CPU after it
+obtained the per-CPU object.
+In this case this is not bad because the data structure itself is
+protected with a spin_lock. This change shouldn't matter however on RT
+it does because the sleeping lock can't be accessed with disabled
+preemption.
+
+Cc: Joerg Roedel <joro@8bytes.org>
+Cc: iommu@lists.linux-foundation.org
+Reported-by: vinadhy@gmail.com
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/iommu/iova.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/iommu/iova.c
++++ b/drivers/iommu/iova.c
+@@ -570,7 +570,7 @@ void queue_iova(struct iova_domain *iova
+ 		unsigned long pfn, unsigned long pages,
+ 		unsigned long data)
+ {
+-	struct iova_fq *fq = get_cpu_ptr(iovad->fq);
++	struct iova_fq *fq = raw_cpu_ptr(iovad->fq);
+ 	unsigned long flags;
+ 	unsigned idx;
+ 
+@@ -600,8 +600,6 @@ void queue_iova(struct iova_domain *iova
+ 	if (atomic_cmpxchg(&iovad->fq_timer_on, 0, 1) == 0)
+ 		mod_timer(&iovad->fq_timer,
+ 			  jiffies + msecs_to_jiffies(IOVA_FQ_TIMEOUT));
+-
+-	put_cpu_ptr(iovad->fq);
+ }
+ EXPORT_SYMBOL_GPL(queue_iova);
+ 
diff --git a/kernel/patches-4.14.x-rt/0049-greybus-audio-don-t-inclide-rwlock.h-directly.patch b/kernel/patches-4.14.x-rt/0049-greybus-audio-don-t-inclide-rwlock.h-directly.patch
new file mode 100644
index 000000000..2973b4080
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0049-greybus-audio-don-t-inclide-rwlock.h-directly.patch
@@ -0,0 +1,30 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 5 Oct 2017 14:38:52 +0200
+Subject: [PATCH] greybus: audio: don't inclide rwlock.h directly.
+
+rwlock.h should not be included directly. Instead linux/splinlock.h
+should be included. One thing it does is to break the RT build.
+
+Cc: Vaibhav Agarwal <vaibhav.sr@gmail.com>
+Cc: Mark Greer <mgreer@animalcreek.com>
+Cc: Johan Hovold <johan@kernel.org>
+Cc: Alex Elder <elder@kernel.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: greybus-dev@lists.linaro.org
+Cc: devel@driverdev.osuosl.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/staging/greybus/audio_manager.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/staging/greybus/audio_manager.c
++++ b/drivers/staging/greybus/audio_manager.c
+@@ -10,7 +10,7 @@
+ #include <linux/sysfs.h>
+ #include <linux/module.h>
+ #include <linux/init.h>
+-#include <linux/rwlock.h>
++#include <linux/spinlock.h>
+ #include <linux/idr.h>
+ 
+ #include "audio_manager.h"
diff --git a/kernel/patches-4.14.x-rt/0050-xen-9pfs-don-t-inclide-rwlock.h-directly.patch b/kernel/patches-4.14.x-rt/0050-xen-9pfs-don-t-inclide-rwlock.h-directly.patch
new file mode 100644
index 000000000..8c36bf8c7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0050-xen-9pfs-don-t-inclide-rwlock.h-directly.patch
@@ -0,0 +1,28 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 5 Oct 2017 14:38:52 +0200
+Subject: [PATCH] xen/9pfs: don't inclide rwlock.h directly.
+
+rwlock.h should not be included directly. Instead linux/splinlock.h
+should be included. One thing it does is to break the RT build.
+
+Cc: Eric Van Hensbergen <ericvh@gmail.com>
+Cc: Ron Minnich <rminnich@sandia.gov>
+Cc: Latchesar Ionkov <lucho@ionkov.net>
+Cc: "David S. Miller" <davem@davemloft.net>
+Cc: v9fs-developer@lists.sourceforge.net
+Cc: netdev@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/9p/trans_xen.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/net/9p/trans_xen.c
++++ b/net/9p/trans_xen.c
+@@ -38,7 +38,6 @@
+ 
+ #include <linux/module.h>
+ #include <linux/spinlock.h>
+-#include <linux/rwlock.h>
+ #include <net/9p/9p.h>
+ #include <net/9p/client.h>
+ #include <net/9p/transport.h>
diff --git a/kernel/patches-4.14.x-rt/0051-tty-goldfish-Enable-earlycon-only-if-built-in.patch b/kernel/patches-4.14.x-rt/0051-tty-goldfish-Enable-earlycon-only-if-built-in.patch
new file mode 100644
index 000000000..29dd3c244
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0051-tty-goldfish-Enable-earlycon-only-if-built-in.patch
@@ -0,0 +1,65 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 29 Nov 2017 16:32:20 +0100
+Subject: [PATCH] tty: goldfish: Enable 'earlycon' only if built-in
+
+Commit 3840ed9548f7 ("tty: goldfish: Implement support for kernel
+'earlycon' parameter") breaks an allmodconfig config on x86:
+|  LD      vmlinux.o
+|  MODPOST vmlinux.o
+|drivers/tty/serial/earlycon.o: In function `parse_options':
+|drivers/tty/serial/earlycon.c:97: undefined reference to `uart_parse_earlycon'
+|Makefile:1005: recipe for target 'vmlinux' failed
+
+earlycon.c::parse_options() invokes uart_parse_earlycon() from serial_core.c
+which is compiled=m because GOLDFISH_TTY itself (and most others) are =m.
+To avoid that, I'm adding the _CONSOLE config option which is selected if the
+GOLDFISH module itself is =y since it doesn't need the early bits for the =m
+case (other drivers do the same dance).
+The alternative would be to move uart_parse_earlycon() from
+serial_core.c to earlycon.c (we don't have that many users of that
+function).
+
+Fixes: 3840ed9548f7 ("tty: goldfish: Implement support for kernel
+       'earlycon' parameter")
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/tty/Kconfig    |    6 +++++-
+ drivers/tty/goldfish.c |    2 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+--- a/drivers/tty/Kconfig
++++ b/drivers/tty/Kconfig
+@@ -394,10 +394,14 @@ config GOLDFISH_TTY
+ 	depends on GOLDFISH
+ 	select SERIAL_CORE
+ 	select SERIAL_CORE_CONSOLE
+-	select SERIAL_EARLYCON
+ 	help
+ 	  Console and system TTY driver for the Goldfish virtual platform.
+ 
++config GOLDFISH_TTY_EARLY_CONSOLE
++	bool
++	default y if GOLDFISH_TTY=y
++	select SERIAL_EARLYCON
++
+ config DA_TTY
+ 	bool "DA TTY"
+ 	depends on METAG_DA
+--- a/drivers/tty/goldfish.c
++++ b/drivers/tty/goldfish.c
+@@ -442,6 +442,7 @@ static int goldfish_tty_remove(struct pl
+ 	return 0;
+ }
+ 
++#ifdef CONFIG_GOLDFISH_TTY_EARLY_CONSOLE
+ static void gf_early_console_putchar(struct uart_port *port, int ch)
+ {
+ 	__raw_writel(ch, port->membase);
+@@ -465,6 +466,7 @@ static int __init gf_earlycon_setup(stru
+ }
+ 
+ OF_EARLYCON_DECLARE(early_gf_tty, "google,goldfish-tty", gf_earlycon_setup);
++#endif
+ 
+ static const struct of_device_id goldfish_tty_of_match[] = {
+ 	{ .compatible = "google,goldfish-tty", },
diff --git a/kernel/patches-4.14.x-rt/0052-drm-i915-properly-init-lockdep-class.patch b/kernel/patches-4.14.x-rt/0052-drm-i915-properly-init-lockdep-class.patch
new file mode 100644
index 000000000..f424c480d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0052-drm-i915-properly-init-lockdep-class.patch
@@ -0,0 +1,31 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 30 Nov 2017 16:06:13 +0100
+Subject: [PATCH] drm/i915: properly init lockdep class
+
+The code has an ifdef and uses two functions to either init the bare
+spinlock or init it and set a lock-class. It is possible to do the same
+thing without an ifdef.
+With this patch (in debug case) we first use the "default" lock class
+which is later overwritten to the supplied one. Without lockdep the set
+name/class function vanishes.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/gpu/drm/i915/i915_gem_timeline.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+--- a/drivers/gpu/drm/i915/i915_gem_timeline.c
++++ b/drivers/gpu/drm/i915/i915_gem_timeline.c
+@@ -33,11 +33,8 @@ static void __intel_timeline_init(struct
+ {
+ 	tl->fence_context = context;
+ 	tl->common = parent;
+-#ifdef CONFIG_DEBUG_SPINLOCK
+-	__raw_spin_lock_init(&tl->lock.rlock, lockname, lockclass);
+-#else
+ 	spin_lock_init(&tl->lock);
+-#endif
++	lockdep_set_class_and_name(&tl->lock, lockclass, lockname);
+ 	init_request_active(&tl->last_request, NULL);
+ 	INIT_LIST_HEAD(&tl->requests);
+ 	i915_syncmap_init(&tl->sync);
diff --git a/kernel/patches-4.14.x-rt/0053-timerqueue-Document-return-values-of-timerqueue_add-.patch b/kernel/patches-4.14.x-rt/0053-timerqueue-Document-return-values-of-timerqueue_add-.patch
new file mode 100644
index 000000000..1e09c3363
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0053-timerqueue-Document-return-values-of-timerqueue_add-.patch
@@ -0,0 +1,39 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 22 Dec 2017 15:51:15 +0100
+Subject: [PATCH 4/4] timerqueue: Document return values of
+ timerqueue_add/del()
+
+The return values of timerqueue_add/del() are not documented in the kernel doc
+comment. Add proper documentation.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: rt@linutronix.de
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ lib/timerqueue.c |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--- a/lib/timerqueue.c
++++ b/lib/timerqueue.c
+@@ -33,8 +33,9 @@
+  * @head: head of timerqueue
+  * @node: timer node to be added
+  *
+- * Adds the timer node to the timerqueue, sorted by the
+- * node's expires value.
++ * Adds the timer node to the timerqueue, sorted by the node's expires
++ * value. Returns true if the newly added timer is the first expiring timer in
++ * the queue.
+  */
+ bool timerqueue_add(struct timerqueue_head *head, struct timerqueue_node *node)
+ {
+@@ -70,7 +71,8 @@ EXPORT_SYMBOL_GPL(timerqueue_add);
+  * @head: head of timerqueue
+  * @node: timer node to be removed
+  *
+- * Removes the timer node from the timerqueue.
++ * Removes the timer node from the timerqueue. Returns true if the queue is
++ * not empty after the remove.
+  */
+ bool timerqueue_del(struct timerqueue_head *head, struct timerqueue_node *node)
+ {
diff --git a/kernel/patches-4.14.x-rt/0054-sparc64-use-generic-rwsem-spinlocks-rt.patch b/kernel/patches-4.14.x-rt/0054-sparc64-use-generic-rwsem-spinlocks-rt.patch
new file mode 100644
index 000000000..fadbc6829
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0054-sparc64-use-generic-rwsem-spinlocks-rt.patch
@@ -0,0 +1,27 @@
+From: Allen Pais <allen.pais@oracle.com>
+Date: Fri, 13 Dec 2013 09:44:41 +0530
+Subject: sparc64: use generic rwsem spinlocks rt
+
+Signed-off-by: Allen Pais <allen.pais@oracle.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/sparc/Kconfig |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+--- a/arch/sparc/Kconfig
++++ b/arch/sparc/Kconfig
+@@ -206,12 +206,10 @@ config NR_CPUS
+ source kernel/Kconfig.hz
+ 
+ config RWSEM_GENERIC_SPINLOCK
+-	bool
+-	default y if SPARC32
++	def_bool PREEMPT_RT_FULL
+ 
+ config RWSEM_XCHGADD_ALGORITHM
+-	bool
+-	default y if SPARC64
++	def_bool !RWSEM_GENERIC_SPINLOCK && !PREEMPT_RT_FULL
+ 
+ config GENERIC_HWEIGHT
+ 	bool
diff --git a/kernel/patches-4.14.x-rt/0055-kernel-SRCU-provide-a-static-initializer.patch b/kernel/patches-4.14.x-rt/0055-kernel-SRCU-provide-a-static-initializer.patch
new file mode 100644
index 000000000..5c14f9fc0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0055-kernel-SRCU-provide-a-static-initializer.patch
@@ -0,0 +1,155 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 19 Mar 2013 14:44:30 +0100
+Subject: kernel/SRCU: provide a static initializer
+
+There are macros for static initializer for the three out of four
+possible notifier types, that are:
+	ATOMIC_NOTIFIER_HEAD()
+	BLOCKING_NOTIFIER_HEAD()
+	RAW_NOTIFIER_HEAD()
+
+This patch provides a static initilizer for the forth type to make it
+complete.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/notifier.h |   42 +++++++++++++++++++++++++++++++++---------
+ include/linux/srcutiny.h |    6 +++---
+ include/linux/srcutree.h |    6 +++---
+ 3 files changed, 39 insertions(+), 15 deletions(-)
+
+--- a/include/linux/notifier.h
++++ b/include/linux/notifier.h
+@@ -7,7 +7,7 @@
+  *
+  *				Alan Cox <Alan.Cox@linux.org>
+  */
+- 
++
+ #ifndef _LINUX_NOTIFIER_H
+ #define _LINUX_NOTIFIER_H
+ #include <linux/errno.h>
+@@ -43,9 +43,7 @@
+  * in srcu_notifier_call_chain(): no cache bounces and no memory barriers.
+  * As compensation, srcu_notifier_chain_unregister() is rather expensive.
+  * SRCU notifier chains should be used when the chain will be called very
+- * often but notifier_blocks will seldom be removed.  Also, SRCU notifier
+- * chains are slightly more difficult to use because they require special
+- * runtime initialization.
++ * often but notifier_blocks will seldom be removed.
+  */
+ 
+ struct notifier_block;
+@@ -91,7 +89,7 @@ struct srcu_notifier_head {
+ 		(name)->head = NULL;		\
+ 	} while (0)
+ 
+-/* srcu_notifier_heads must be initialized and cleaned up dynamically */
++/* srcu_notifier_heads must be cleaned up dynamically */
+ extern void srcu_init_notifier_head(struct srcu_notifier_head *nh);
+ #define srcu_cleanup_notifier_head(name)	\
+ 		cleanup_srcu_struct(&(name)->srcu);
+@@ -104,7 +102,13 @@ extern void srcu_init_notifier_head(stru
+ 		.head = NULL }
+ #define RAW_NOTIFIER_INIT(name)	{				\
+ 		.head = NULL }
+-/* srcu_notifier_heads cannot be initialized statically */
++
++#define SRCU_NOTIFIER_INIT(name, pcpu)				\
++	{							\
++		.mutex = __MUTEX_INITIALIZER(name.mutex),	\
++		.head = NULL,					\
++		.srcu = __SRCU_STRUCT_INIT(name.srcu, pcpu),	\
++	}
+ 
+ #define ATOMIC_NOTIFIER_HEAD(name)				\
+ 	struct atomic_notifier_head name =			\
+@@ -116,6 +120,26 @@ extern void srcu_init_notifier_head(stru
+ 	struct raw_notifier_head name =				\
+ 		RAW_NOTIFIER_INIT(name)
+ 
++#ifdef CONFIG_TREE_SRCU
++#define _SRCU_NOTIFIER_HEAD(name, mod)				\
++	static DEFINE_PER_CPU(struct srcu_data,			\
++			name##_head_srcu_data);			\
++	mod struct srcu_notifier_head name =			\
++			SRCU_NOTIFIER_INIT(name, name##_head_srcu_data)
++
++#else
++#define _SRCU_NOTIFIER_HEAD(name, mod)				\
++	mod struct srcu_notifier_head name =			\
++			SRCU_NOTIFIER_INIT(name, name)
++
++#endif
++
++#define SRCU_NOTIFIER_HEAD(name)				\
++	_SRCU_NOTIFIER_HEAD(name, )
++
++#define SRCU_NOTIFIER_HEAD_STATIC(name)				\
++	_SRCU_NOTIFIER_HEAD(name, static)
++
+ #ifdef __KERNEL__
+ 
+ extern int atomic_notifier_chain_register(struct atomic_notifier_head *nh,
+@@ -185,12 +209,12 @@ static inline int notifier_to_errno(int
+ 
+ /*
+  *	Declared notifiers so far. I can imagine quite a few more chains
+- *	over time (eg laptop power reset chains, reboot chain (to clean 
++ *	over time (eg laptop power reset chains, reboot chain (to clean
+  *	device units up), device [un]mount chain, module load/unload chain,
+- *	low memory chain, screenblank chain (for plug in modular screenblankers) 
++ *	low memory chain, screenblank chain (for plug in modular screenblankers)
+  *	VC switch chains (for loadable kernel svgalib VC switch helpers) etc...
+  */
+- 
++
+ /* CPU notfiers are defined in include/linux/cpu.h. */
+ 
+ /* netdevice notifiers are defined in include/linux/netdevice.h */
+--- a/include/linux/srcutiny.h
++++ b/include/linux/srcutiny.h
+@@ -43,7 +43,7 @@ struct srcu_struct {
+ 
+ void srcu_drive_gp(struct work_struct *wp);
+ 
+-#define __SRCU_STRUCT_INIT(name)					\
++#define __SRCU_STRUCT_INIT(name, __ignored)				\
+ {									\
+ 	.srcu_wq = __SWAIT_QUEUE_HEAD_INITIALIZER(name.srcu_wq),	\
+ 	.srcu_cb_tail = &name.srcu_cb_head,				\
+@@ -56,9 +56,9 @@ void srcu_drive_gp(struct work_struct *w
+  * Tree SRCU, which needs some per-CPU data.
+  */
+ #define DEFINE_SRCU(name) \
+-	struct srcu_struct name = __SRCU_STRUCT_INIT(name)
++	struct srcu_struct name = __SRCU_STRUCT_INIT(name, name)
+ #define DEFINE_STATIC_SRCU(name) \
+-	static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
++	static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name)
+ 
+ void synchronize_srcu(struct srcu_struct *sp);
+ 
+--- a/include/linux/srcutree.h
++++ b/include/linux/srcutree.h
+@@ -104,9 +104,9 @@ struct srcu_struct {
+ #define SRCU_STATE_SCAN1	1
+ #define SRCU_STATE_SCAN2	2
+ 
+-#define __SRCU_STRUCT_INIT(name)					\
++#define __SRCU_STRUCT_INIT(name, pcpu_name)				\
+ 	{								\
+-		.sda = &name##_srcu_data,				\
++		.sda = &pcpu_name,					\
+ 		.lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock),		\
+ 		.srcu_gp_seq_needed = 0 - 1,				\
+ 		__SRCU_DEP_MAP_INIT(name)				\
+@@ -133,7 +133,7 @@ struct srcu_struct {
+  */
+ #define __DEFINE_SRCU(name, is_static)					\
+ 	static DEFINE_PER_CPU(struct srcu_data, name##_srcu_data);\
+-	is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name)
++	is_static struct srcu_struct name = __SRCU_STRUCT_INIT(name, name##_srcu_data)
+ #define DEFINE_SRCU(name)		__DEFINE_SRCU(name, /* not static */)
+ #define DEFINE_STATIC_SRCU(name)	__DEFINE_SRCU(name, static)
+ 
diff --git a/kernel/patches-4.14.x-rt/0056-kernel-sched-Provide-a-pointer-to-the-valid-CPU-mask.patch b/kernel/patches-4.14.x-rt/0056-kernel-sched-Provide-a-pointer-to-the-valid-CPU-mask.patch
new file mode 100644
index 000000000..2ddec9c9b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0056-kernel-sched-Provide-a-pointer-to-the-valid-CPU-mask.patch
@@ -0,0 +1,763 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 4 Apr 2017 12:50:16 +0200
+Subject: [PATCH] kernel: sched: Provide a pointer to the valid CPU mask
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In commit 4b53a3412d66 ("sched/core: Remove the tsk_nr_cpus_allowed()
+wrapper") the tsk_nr_cpus_allowed() wrapper was removed. There was not
+much difference in !RT but in RT we used this to implement
+migrate_disable(). Within a migrate_disable() section the CPU mask is
+restricted to single CPU while the "normal" CPU mask remains untouched.
+
+As an alternative implementation Ingo suggested to use
+	struct task_struct {
+		const cpumask_t		*cpus_ptr;
+		cpumask_t		cpus_mask;
+        };
+with
+	t->cpus_allowed_ptr = &t->cpus_allowed;
+
+In -RT we then can switch the cpus_ptr to
+	t->cpus_allowed_ptr = &cpumask_of(task_cpu(p));
+
+in a migration disabled region. The rules are simple:
+- Code that 'uses' ->cpus_allowed would use the pointer.
+- Code that 'modifies' ->cpus_allowed would use the direct mask.
+
+While converting the existing users I tried to stick with the rules
+above however… well mostly CPUFREQ tries to temporary switch the CPU
+mask to do something on a certain CPU and then switches the mask back it
+its original value. So in theory `cpus_ptr' could or should be used.
+However if this is invoked in a migration disabled region (which is not
+the case because it would require something like preempt_disable() and
+set_cpus_allowed_ptr() might sleep so it can't be) then the "restore"
+part would restore the wrong mask. So it only looks strange and I go for
+the pointer…
+
+Some drivers copy the cpumask without cpumask_copy() and others use
+cpumask_copy but without alloc_cpumask_var(). I did not fix those as
+part of this, could do this as a follow up…
+
+So is this the way we want it?
+Is the usage of `cpus_ptr' vs `cpus_mask' for the set + restore part
+(see cpufreq users) what we want? At some point it looks like they
+should use a different interface for their doing. I am not sure why
+switching to certain CPU is important but maybe it could be done via a
+workqueue from the CPUFREQ core (so we have a comment desribing why are
+doing this and a get_online_cpus() to ensure that the CPU does not go
+offline too early).
+
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Mike Galbraith <efault@gmx.de>
+Cc: Ingo Molnar <mingo@elte.hu>
+Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/ia64/kernel/mca.c                     |    2 -
+ arch/mips/include/asm/switch_to.h          |    4 +-
+ arch/mips/kernel/mips-mt-fpaff.c           |    2 -
+ arch/mips/kernel/traps.c                   |    6 ++--
+ arch/powerpc/platforms/cell/spufs/sched.c  |    2 -
+ arch/tile/include/asm/setup.h              |    2 -
+ arch/tile/kernel/hardwall.c                |   10 +++---
+ drivers/infiniband/hw/hfi1/affinity.c      |    6 ++--
+ drivers/infiniband/hw/hfi1/sdma.c          |    3 --
+ drivers/infiniband/hw/qib/qib_file_ops.c   |    7 ++--
+ fs/proc/array.c                            |    4 +-
+ include/linux/init_task.h                  |    3 +-
+ include/linux/sched.h                      |    5 ++-
+ kernel/cgroup/cpuset.c                     |    2 -
+ kernel/fork.c                              |    3 +-
+ kernel/sched/core.c                        |   42 ++++++++++++++---------------
+ kernel/sched/cpudeadline.c                 |    4 +-
+ kernel/sched/cpupri.c                      |    4 +-
+ kernel/sched/deadline.c                    |    6 ++--
+ kernel/sched/fair.c                        |   28 +++++++++----------
+ kernel/sched/rt.c                          |    4 +-
+ kernel/trace/trace_hwlat.c                 |    2 -
+ lib/smp_processor_id.c                     |    2 -
+ samples/trace_events/trace-events-sample.c |    2 -
+ 24 files changed, 78 insertions(+), 77 deletions(-)
+
+--- a/arch/ia64/kernel/mca.c
++++ b/arch/ia64/kernel/mca.c
+@@ -1824,7 +1824,7 @@ format_mca_init_stack(void *mca_data, un
+ 	ti->cpu = cpu;
+ 	p->stack = ti;
+ 	p->state = TASK_UNINTERRUPTIBLE;
+-	cpumask_set_cpu(cpu, &p->cpus_allowed);
++	cpumask_set_cpu(cpu, &p->cpus_mask);
+ 	INIT_LIST_HEAD(&p->tasks);
+ 	p->parent = p->real_parent = p->group_leader = p;
+ 	INIT_LIST_HEAD(&p->children);
+--- a/arch/mips/include/asm/switch_to.h
++++ b/arch/mips/include/asm/switch_to.h
+@@ -42,7 +42,7 @@ extern struct task_struct *ll_task;
+  * inline to try to keep the overhead down. If we have been forced to run on
+  * a "CPU" with an FPU because of a previous high level of FP computation,
+  * but did not actually use the FPU during the most recent time-slice (CU1
+- * isn't set), we undo the restriction on cpus_allowed.
++ * isn't set), we undo the restriction on cpus_mask.
+  *
+  * We're not calling set_cpus_allowed() here, because we have no need to
+  * force prompt migration - we're already switching the current CPU to a
+@@ -57,7 +57,7 @@ do {									\
+ 	    test_ti_thread_flag(__prev_ti, TIF_FPUBOUND) &&		\
+ 	    (!(KSTK_STATUS(prev) & ST0_CU1))) {				\
+ 		clear_ti_thread_flag(__prev_ti, TIF_FPUBOUND);		\
+-		prev->cpus_allowed = prev->thread.user_cpus_allowed;	\
++		prev->cpus_mask = prev->thread.user_cpus_allowed;	\
+ 	}								\
+ 	next->thread.emulated_fp = 0;					\
+ } while(0)
+--- a/arch/mips/kernel/mips-mt-fpaff.c
++++ b/arch/mips/kernel/mips-mt-fpaff.c
+@@ -177,7 +177,7 @@ asmlinkage long mipsmt_sys_sched_getaffi
+ 	if (retval)
+ 		goto out_unlock;
+ 
+-	cpumask_or(&allowed, &p->thread.user_cpus_allowed, &p->cpus_allowed);
++	cpumask_or(&allowed, &p->thread.user_cpus_allowed, p->cpus_ptr);
+ 	cpumask_and(&mask, &allowed, cpu_active_mask);
+ 
+ out_unlock:
+--- a/arch/mips/kernel/traps.c
++++ b/arch/mips/kernel/traps.c
+@@ -1192,12 +1192,12 @@ static void mt_ase_fp_affinity(void)
+ 		 * restricted the allowed set to exclude any CPUs with FPUs,
+ 		 * we'll skip the procedure.
+ 		 */
+-		if (cpumask_intersects(&current->cpus_allowed, &mt_fpu_cpumask)) {
++		if (cpumask_intersects(&current->cpus_mask, &mt_fpu_cpumask)) {
+ 			cpumask_t tmask;
+ 
+ 			current->thread.user_cpus_allowed
+-				= current->cpus_allowed;
+-			cpumask_and(&tmask, &current->cpus_allowed,
++				= current->cpus_mask;
++			cpumask_and(&tmask, &current->cpus_mask,
+ 				    &mt_fpu_cpumask);
+ 			set_cpus_allowed_ptr(current, &tmask);
+ 			set_thread_flag(TIF_FPUBOUND);
+--- a/arch/powerpc/platforms/cell/spufs/sched.c
++++ b/arch/powerpc/platforms/cell/spufs/sched.c
+@@ -141,7 +141,7 @@ void __spu_update_sched_info(struct spu_
+ 	 * runqueue. The context will be rescheduled on the proper node
+ 	 * if it is timesliced or preempted.
+ 	 */
+-	cpumask_copy(&ctx->cpus_allowed, &current->cpus_allowed);
++	cpumask_copy(&ctx->cpus_allowed, current->cpus_ptr);
+ 
+ 	/* Save the current cpu id for spu interrupt routing. */
+ 	ctx->last_ran = raw_smp_processor_id();
+--- a/arch/tile/include/asm/setup.h
++++ b/arch/tile/include/asm/setup.h
+@@ -49,7 +49,7 @@ int hardwall_ipi_valid(int cpu);
+ 
+ /* Hook hardwall code into changes in affinity. */
+ #define arch_set_cpus_allowed(p, new_mask) do { \
+-	if (!cpumask_equal(&p->cpus_allowed, new_mask)) \
++	if (!cpumask_equal(p->cpus_ptr, new_mask)) \
+ 		hardwall_deactivate_all(p); \
+ } while (0)
+ #endif
+--- a/arch/tile/kernel/hardwall.c
++++ b/arch/tile/kernel/hardwall.c
+@@ -590,12 +590,12 @@ static int hardwall_activate(struct hard
+ 	 * Get our affinity; if we're not bound to this tile uniquely,
+ 	 * we can't access the network registers.
+ 	 */
+-	if (cpumask_weight(&p->cpus_allowed) != 1)
++	if (p->nr_cpus_allowed != 1)
+ 		return -EPERM;
+ 
+ 	/* Make sure we are bound to a cpu assigned to this resource. */
+ 	cpu = smp_processor_id();
+-	BUG_ON(cpumask_first(&p->cpus_allowed) != cpu);
++	BUG_ON(cpumask_first(p->cpus_ptr) != cpu);
+ 	if (!cpumask_test_cpu(cpu, &info->cpumask))
+ 		return -EINVAL;
+ 
+@@ -621,17 +621,17 @@ static int hardwall_activate(struct hard
+  * Deactivate a task's hardwall.  Must hold lock for hardwall_type.
+  * This method may be called from exit_thread(), so we don't want to
+  * rely on too many fields of struct task_struct still being valid.
+- * We assume the cpus_allowed, pid, and comm fields are still valid.
++ * We assume the nr_cpus_allowed, pid, and comm fields are still valid.
+  */
+ static void _hardwall_deactivate(struct hardwall_type *hwt,
+ 				 struct task_struct *task)
+ {
+ 	struct thread_struct *ts = &task->thread;
+ 
+-	if (cpumask_weight(&task->cpus_allowed) != 1) {
++	if (task->nr_cpus_allowed != 1) {
+ 		pr_err("pid %d (%s) releasing %s hardwall with an affinity mask containing %d cpus!\n",
+ 		       task->pid, task->comm, hwt->name,
+-		       cpumask_weight(&task->cpus_allowed));
++		       task->nr_cpus_allowed);
+ 		BUG();
+ 	}
+ 
+--- a/drivers/infiniband/hw/hfi1/affinity.c
++++ b/drivers/infiniband/hw/hfi1/affinity.c
+@@ -576,7 +576,7 @@ int hfi1_get_proc_affinity(int node)
+ 	struct hfi1_affinity_node *entry;
+ 	cpumask_var_t diff, hw_thread_mask, available_mask, intrs_mask;
+ 	const struct cpumask *node_mask,
+-		*proc_mask = &current->cpus_allowed;
++		*proc_mask = current->cpus_ptr;
+ 	struct hfi1_affinity_node_list *affinity = &node_affinity;
+ 	struct cpu_mask_set *set = &affinity->proc;
+ 
+@@ -584,7 +584,7 @@ int hfi1_get_proc_affinity(int node)
+ 	 * check whether process/context affinity has already
+ 	 * been set
+ 	 */
+-	if (cpumask_weight(proc_mask) == 1) {
++	if (current->nr_cpus_allowed == 1) {
+ 		hfi1_cdbg(PROC, "PID %u %s affinity set to CPU %*pbl",
+ 			  current->pid, current->comm,
+ 			  cpumask_pr_args(proc_mask));
+@@ -595,7 +595,7 @@ int hfi1_get_proc_affinity(int node)
+ 		cpu = cpumask_first(proc_mask);
+ 		cpumask_set_cpu(cpu, &set->used);
+ 		goto done;
+-	} else if (cpumask_weight(proc_mask) < cpumask_weight(&set->mask)) {
++	} else if (current->nr_cpus_allowed < cpumask_weight(&set->mask)) {
+ 		hfi1_cdbg(PROC, "PID %u %s affinity set to CPU set(s) %*pbl",
+ 			  current->pid, current->comm,
+ 			  cpumask_pr_args(proc_mask));
+--- a/drivers/infiniband/hw/hfi1/sdma.c
++++ b/drivers/infiniband/hw/hfi1/sdma.c
+@@ -856,14 +856,13 @@ struct sdma_engine *sdma_select_user_eng
+ {
+ 	struct sdma_rht_node *rht_node;
+ 	struct sdma_engine *sde = NULL;
+-	const struct cpumask *current_mask = &current->cpus_allowed;
+ 	unsigned long cpu_id;
+ 
+ 	/*
+ 	 * To ensure that always the same sdma engine(s) will be
+ 	 * selected make sure the process is pinned to this CPU only.
+ 	 */
+-	if (cpumask_weight(current_mask) != 1)
++	if (current->nr_cpus_allowed != 1)
+ 		goto out;
+ 
+ 	cpu_id = smp_processor_id();
+--- a/drivers/infiniband/hw/qib/qib_file_ops.c
++++ b/drivers/infiniband/hw/qib/qib_file_ops.c
+@@ -1163,7 +1163,7 @@ static unsigned int qib_poll(struct file
+ static void assign_ctxt_affinity(struct file *fp, struct qib_devdata *dd)
+ {
+ 	struct qib_filedata *fd = fp->private_data;
+-	const unsigned int weight = cpumask_weight(&current->cpus_allowed);
++	const unsigned int weight = current->nr_cpus_allowed;
+ 	const struct cpumask *local_mask = cpumask_of_pcibus(dd->pcidev->bus);
+ 	int local_cpu;
+ 
+@@ -1644,9 +1644,8 @@ static int qib_assign_ctxt(struct file *
+ 		ret = find_free_ctxt(i_minor - 1, fp, uinfo);
+ 	else {
+ 		int unit;
+-		const unsigned int cpu = cpumask_first(&current->cpus_allowed);
+-		const unsigned int weight =
+-			cpumask_weight(&current->cpus_allowed);
++		const unsigned int cpu = cpumask_first(current->cpus_ptr);
++		const unsigned int weight = current->nr_cpus_allowed;
+ 
+ 		if (weight == 1 && !test_bit(cpu, qib_cpulist))
+ 			if (!find_hca(cpu, &unit) && unit >= 0)
+--- a/fs/proc/array.c
++++ b/fs/proc/array.c
+@@ -361,9 +361,9 @@ static inline void task_context_switch_c
+ static void task_cpus_allowed(struct seq_file *m, struct task_struct *task)
+ {
+ 	seq_printf(m, "Cpus_allowed:\t%*pb\n",
+-		   cpumask_pr_args(&task->cpus_allowed));
++		   cpumask_pr_args(task->cpus_ptr));
+ 	seq_printf(m, "Cpus_allowed_list:\t%*pbl\n",
+-		   cpumask_pr_args(&task->cpus_allowed));
++		   cpumask_pr_args(task->cpus_ptr));
+ }
+ 
+ int proc_pid_status(struct seq_file *m, struct pid_namespace *ns,
+--- a/include/linux/init_task.h
++++ b/include/linux/init_task.h
+@@ -234,7 +234,8 @@ extern struct cred init_cred;
+ 	.static_prio	= MAX_PRIO-20,					\
+ 	.normal_prio	= MAX_PRIO-20,					\
+ 	.policy		= SCHED_NORMAL,					\
+-	.cpus_allowed	= CPU_MASK_ALL,					\
++	.cpus_ptr	= &tsk.cpus_mask,				\
++	.cpus_mask	= CPU_MASK_ALL,					\
+ 	.nr_cpus_allowed= NR_CPUS,					\
+ 	.mm		= NULL,						\
+ 	.active_mm	= &init_mm,					\
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -578,7 +578,8 @@ struct task_struct {
+ 
+ 	unsigned int			policy;
+ 	int				nr_cpus_allowed;
+-	cpumask_t			cpus_allowed;
++	const cpumask_t			*cpus_ptr;
++	cpumask_t			cpus_mask;
+ 
+ #ifdef CONFIG_PREEMPT_RCU
+ 	int				rcu_read_lock_nesting;
+@@ -1315,7 +1316,7 @@ extern struct pid *cad_pid;
+ #define PF_KTHREAD		0x00200000	/* I am a kernel thread */
+ #define PF_RANDOMIZE		0x00400000	/* Randomize virtual address space */
+ #define PF_SWAPWRITE		0x00800000	/* Allowed to write to swap */
+-#define PF_NO_SETAFFINITY	0x04000000	/* Userland is not allowed to meddle with cpus_allowed */
++#define PF_NO_SETAFFINITY	0x04000000	/* Userland is not allowed to meddle with cpus_mask */
+ #define PF_MCE_EARLY		0x08000000      /* Early kill for mce process policy */
+ #define PF_MUTEX_TESTER		0x20000000	/* Thread belongs to the rt mutex tester */
+ #define PF_FREEZER_SKIP		0x40000000	/* Freezer should not count it as freezable */
+--- a/kernel/cgroup/cpuset.c
++++ b/kernel/cgroup/cpuset.c
+@@ -2094,7 +2094,7 @@ static void cpuset_fork(struct task_stru
+ 	if (task_css_is_root(task, cpuset_cgrp_id))
+ 		return;
+ 
+-	set_cpus_allowed_ptr(task, &current->cpus_allowed);
++	set_cpus_allowed_ptr(task, current->cpus_ptr);
+ 	task->mems_allowed = current->mems_allowed;
+ }
+ 
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -564,7 +564,8 @@ static struct task_struct *dup_task_stru
+ #ifdef CONFIG_CC_STACKPROTECTOR
+ 	tsk->stack_canary = get_random_canary();
+ #endif
+-
++	if (orig->cpus_ptr == &orig->cpus_mask)
++		tsk->cpus_ptr = &tsk->cpus_mask;
+ 	/*
+ 	 * One for us, one for whoever does the "release_task()" (usually
+ 	 * parent)
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -959,7 +959,7 @@ static struct rq *__migrate_task(struct
+ 	}
+ 
+ 	/* Affinity changed (again). */
+-	if (!cpumask_test_cpu(dest_cpu, &p->cpus_allowed))
++	if (!cpumask_test_cpu(dest_cpu, p->cpus_ptr))
+ 		return rq;
+ 
+ 	update_rq_clock(rq);
+@@ -987,7 +987,7 @@ static int migration_cpu_stop(void *data
+ 	local_irq_disable();
+ 	/*
+ 	 * We need to explicitly wake pending tasks before running
+-	 * __migrate_task() such that we will not miss enforcing cpus_allowed
++	 * __migrate_task() such that we will not miss enforcing cpus_ptr
+ 	 * during wakeups, see set_cpus_allowed_ptr()'s TASK_WAKING test.
+ 	 */
+ 	sched_ttwu_pending();
+@@ -1018,7 +1018,7 @@ static int migration_cpu_stop(void *data
+  */
+ void set_cpus_allowed_common(struct task_struct *p, const struct cpumask *new_mask)
+ {
+-	cpumask_copy(&p->cpus_allowed, new_mask);
++	cpumask_copy(&p->cpus_mask, new_mask);
+ 	p->nr_cpus_allowed = cpumask_weight(new_mask);
+ }
+ 
+@@ -1088,7 +1088,7 @@ static int __set_cpus_allowed_ptr(struct
+ 		goto out;
+ 	}
+ 
+-	if (cpumask_equal(&p->cpus_allowed, new_mask))
++	if (cpumask_equal(p->cpus_ptr, new_mask))
+ 		goto out;
+ 
+ 	if (!cpumask_intersects(new_mask, cpu_valid_mask)) {
+@@ -1249,10 +1249,10 @@ static int migrate_swap_stop(void *data)
+ 	if (task_cpu(arg->src_task) != arg->src_cpu)
+ 		goto unlock;
+ 
+-	if (!cpumask_test_cpu(arg->dst_cpu, &arg->src_task->cpus_allowed))
++	if (!cpumask_test_cpu(arg->dst_cpu, arg->src_task->cpus_ptr))
+ 		goto unlock;
+ 
+-	if (!cpumask_test_cpu(arg->src_cpu, &arg->dst_task->cpus_allowed))
++	if (!cpumask_test_cpu(arg->src_cpu, arg->dst_task->cpus_ptr))
+ 		goto unlock;
+ 
+ 	__migrate_swap_task(arg->src_task, arg->dst_cpu);
+@@ -1293,10 +1293,10 @@ int migrate_swap(struct task_struct *cur
+ 	if (!cpu_active(arg.src_cpu) || !cpu_active(arg.dst_cpu))
+ 		goto out;
+ 
+-	if (!cpumask_test_cpu(arg.dst_cpu, &arg.src_task->cpus_allowed))
++	if (!cpumask_test_cpu(arg.dst_cpu, arg.src_task->cpus_ptr))
+ 		goto out;
+ 
+-	if (!cpumask_test_cpu(arg.src_cpu, &arg.dst_task->cpus_allowed))
++	if (!cpumask_test_cpu(arg.src_cpu, arg.dst_task->cpus_ptr))
+ 		goto out;
+ 
+ 	trace_sched_swap_numa(cur, arg.src_cpu, p, arg.dst_cpu);
+@@ -1440,7 +1440,7 @@ void kick_process(struct task_struct *p)
+ EXPORT_SYMBOL_GPL(kick_process);
+ 
+ /*
+- * ->cpus_allowed is protected by both rq->lock and p->pi_lock
++ * ->cpus_ptr is protected by both rq->lock and p->pi_lock
+  *
+  * A few notes on cpu_active vs cpu_online:
+  *
+@@ -1480,14 +1480,14 @@ static int select_fallback_rq(int cpu, s
+ 		for_each_cpu(dest_cpu, nodemask) {
+ 			if (!cpu_active(dest_cpu))
+ 				continue;
+-			if (cpumask_test_cpu(dest_cpu, &p->cpus_allowed))
++			if (cpumask_test_cpu(dest_cpu, p->cpus_ptr))
+ 				return dest_cpu;
+ 		}
+ 	}
+ 
+ 	for (;;) {
+ 		/* Any allowed, online CPU? */
+-		for_each_cpu(dest_cpu, &p->cpus_allowed) {
++		for_each_cpu(dest_cpu, p->cpus_ptr) {
+ 			if (!(p->flags & PF_KTHREAD) && !cpu_active(dest_cpu))
+ 				continue;
+ 			if (!cpu_online(dest_cpu))
+@@ -1532,7 +1532,7 @@ static int select_fallback_rq(int cpu, s
+ }
+ 
+ /*
+- * The caller (fork, wakeup) owns p->pi_lock, ->cpus_allowed is stable.
++ * The caller (fork, wakeup) owns p->pi_lock, ->cpus_ptr is stable.
+  */
+ static inline
+ int select_task_rq(struct task_struct *p, int cpu, int sd_flags, int wake_flags)
+@@ -1542,11 +1542,11 @@ int select_task_rq(struct task_struct *p
+ 	if (p->nr_cpus_allowed > 1)
+ 		cpu = p->sched_class->select_task_rq(p, cpu, sd_flags, wake_flags);
+ 	else
+-		cpu = cpumask_any(&p->cpus_allowed);
++		cpu = cpumask_any(p->cpus_ptr);
+ 
+ 	/*
+ 	 * In order not to call set_task_cpu() on a blocking task we need
+-	 * to rely on ttwu() to place the task on a valid ->cpus_allowed
++	 * to rely on ttwu() to place the task on a valid ->cpus_ptr
+ 	 * CPU.
+ 	 *
+ 	 * Since this is common to all placement strategies, this lives here.
+@@ -1554,7 +1554,7 @@ int select_task_rq(struct task_struct *p
+ 	 * [ this allows ->select_task() to simply return task_cpu(p) and
+ 	 *   not worry about this generic constraint ]
+ 	 */
+-	if (unlikely(!cpumask_test_cpu(cpu, &p->cpus_allowed) ||
++	if (unlikely(!cpumask_test_cpu(cpu, p->cpus_ptr) ||
+ 		     !cpu_online(cpu)))
+ 		cpu = select_fallback_rq(task_cpu(p), p);
+ 
+@@ -2444,7 +2444,7 @@ void wake_up_new_task(struct task_struct
+ #ifdef CONFIG_SMP
+ 	/*
+ 	 * Fork balancing, do it here and not earlier because:
+-	 *  - cpus_allowed can change in the fork path
++	 *  - cpus_ptr can change in the fork path
+ 	 *  - any previously selected CPU might disappear through hotplug
+ 	 *
+ 	 * Use __set_task_cpu() to avoid calling sched_class::migrate_task_rq,
+@@ -4161,7 +4161,7 @@ static int __sched_setscheduler(struct t
+ 			 * the entire root_domain to become SCHED_DEADLINE. We
+ 			 * will also fail if there's no bandwidth available.
+ 			 */
+-			if (!cpumask_subset(span, &p->cpus_allowed) ||
++			if (!cpumask_subset(span, p->cpus_ptr) ||
+ 			    rq->rd->dl_bw.bw == 0) {
+ 				task_rq_unlock(rq, p, &rf);
+ 				return -EPERM;
+@@ -4755,7 +4755,7 @@ long sched_getaffinity(pid_t pid, struct
+ 		goto out_unlock;
+ 
+ 	raw_spin_lock_irqsave(&p->pi_lock, flags);
+-	cpumask_and(mask, &p->cpus_allowed, cpu_active_mask);
++	cpumask_and(mask, &p->cpus_mask, cpu_active_mask);
+ 	raw_spin_unlock_irqrestore(&p->pi_lock, flags);
+ 
+ out_unlock:
+@@ -5320,7 +5320,7 @@ int task_can_attach(struct task_struct *
+ 	 * allowed nodes is unnecessary.  Thus, cpusets are not
+ 	 * applicable for such threads.  This prevents checking for
+ 	 * success of set_cpus_allowed_ptr() on all attached tasks
+-	 * before cpus_allowed may be changed.
++	 * before cpus_mask may be changed.
+ 	 */
+ 	if (p->flags & PF_NO_SETAFFINITY) {
+ 		ret = -EINVAL;
+@@ -5347,7 +5347,7 @@ int migrate_task_to(struct task_struct *
+ 	if (curr_cpu == target_cpu)
+ 		return 0;
+ 
+-	if (!cpumask_test_cpu(target_cpu, &p->cpus_allowed))
++	if (!cpumask_test_cpu(target_cpu, p->cpus_ptr))
+ 		return -EINVAL;
+ 
+ 	/* TODO: This is not properly updating schedstats */
+@@ -5484,7 +5484,7 @@ static void migrate_tasks(struct rq *dea
+ 		put_prev_task(rq, next);
+ 
+ 		/*
+-		 * Rules for changing task_struct::cpus_allowed are holding
++		 * Rules for changing task_struct::cpus_mask are holding
+ 		 * both pi_lock and rq->lock, such that holding either
+ 		 * stabilizes the mask.
+ 		 *
+--- a/kernel/sched/cpudeadline.c
++++ b/kernel/sched/cpudeadline.c
+@@ -127,13 +127,13 @@ int cpudl_find(struct cpudl *cp, struct
+ 	const struct sched_dl_entity *dl_se = &p->dl;
+ 
+ 	if (later_mask &&
+-	    cpumask_and(later_mask, cp->free_cpus, &p->cpus_allowed)) {
++	    cpumask_and(later_mask, cp->free_cpus, p->cpus_ptr)) {
+ 		return 1;
+ 	} else {
+ 		int best_cpu = cpudl_maximum(cp);
+ 		WARN_ON(best_cpu != -1 && !cpu_present(best_cpu));
+ 
+-		if (cpumask_test_cpu(best_cpu, &p->cpus_allowed) &&
++		if (cpumask_test_cpu(best_cpu, p->cpus_ptr) &&
+ 		    dl_time_before(dl_se->deadline, cp->elements[0].dl)) {
+ 			if (later_mask)
+ 				cpumask_set_cpu(best_cpu, later_mask);
+--- a/kernel/sched/cpupri.c
++++ b/kernel/sched/cpupri.c
+@@ -103,11 +103,11 @@ int cpupri_find(struct cpupri *cp, struc
+ 		if (skip)
+ 			continue;
+ 
+-		if (cpumask_any_and(&p->cpus_allowed, vec->mask) >= nr_cpu_ids)
++		if (cpumask_any_and(p->cpus_ptr, vec->mask) >= nr_cpu_ids)
+ 			continue;
+ 
+ 		if (lowest_mask) {
+-			cpumask_and(lowest_mask, &p->cpus_allowed, vec->mask);
++			cpumask_and(lowest_mask, p->cpus_ptr, vec->mask);
+ 
+ 			/*
+ 			 * We have to ensure that we have at least one bit
+--- a/kernel/sched/deadline.c
++++ b/kernel/sched/deadline.c
+@@ -504,7 +504,7 @@ static struct rq *dl_task_offline_migrat
+ 		 * If we cannot preempt any rq, fall back to pick any
+ 		 * online cpu.
+ 		 */
+-		cpu = cpumask_any_and(cpu_active_mask, &p->cpus_allowed);
++		cpu = cpumask_any_and(cpu_active_mask, p->cpus_ptr);
+ 		if (cpu >= nr_cpu_ids) {
+ 			/*
+ 			 * Fail to find any suitable cpu.
+@@ -1749,7 +1749,7 @@ static void set_curr_task_dl(struct rq *
+ static int pick_dl_task(struct rq *rq, struct task_struct *p, int cpu)
+ {
+ 	if (!task_running(rq, p) &&
+-	    cpumask_test_cpu(cpu, &p->cpus_allowed))
++	    cpumask_test_cpu(cpu, p->cpus_ptr))
+ 		return 1;
+ 	return 0;
+ }
+@@ -1899,7 +1899,7 @@ static struct rq *find_lock_later_rq(str
+ 		/* Retry if something changed. */
+ 		if (double_lock_balance(rq, later_rq)) {
+ 			if (unlikely(task_rq(task) != rq ||
+-				     !cpumask_test_cpu(later_rq->cpu, &task->cpus_allowed) ||
++				     !cpumask_test_cpu(later_rq->cpu, task->cpus_ptr) ||
+ 				     task_running(rq, task) ||
+ 				     !dl_task(task) ||
+ 				     !task_on_rq_queued(task))) {
+--- a/kernel/sched/fair.c
++++ b/kernel/sched/fair.c
+@@ -1596,7 +1596,7 @@ static void task_numa_compare(struct tas
+ 	 */
+ 	if (cur) {
+ 		/* Skip this swap candidate if cannot move to the source cpu */
+-		if (!cpumask_test_cpu(env->src_cpu, &cur->cpus_allowed))
++		if (!cpumask_test_cpu(env->src_cpu, cur->cpus_ptr))
+ 			goto unlock;
+ 
+ 		/*
+@@ -1706,7 +1706,7 @@ static void task_numa_find_cpu(struct ta
+ 
+ 	for_each_cpu(cpu, cpumask_of_node(env->dst_nid)) {
+ 		/* Skip this CPU if the source task cannot migrate */
+-		if (!cpumask_test_cpu(cpu, &env->p->cpus_allowed))
++		if (!cpumask_test_cpu(cpu, env->p->cpus_ptr))
+ 			continue;
+ 
+ 		env->dst_cpu = cpu;
+@@ -5475,7 +5475,7 @@ find_idlest_group(struct sched_domain *s
+ 
+ 		/* Skip over this group if it has no CPUs allowed */
+ 		if (!cpumask_intersects(sched_group_span(group),
+-					&p->cpus_allowed))
++					p->cpus_ptr))
+ 			continue;
+ 
+ 		local_group = cpumask_test_cpu(this_cpu,
+@@ -5595,7 +5595,7 @@ find_idlest_cpu(struct sched_group *grou
+ 		return cpumask_first(sched_group_span(group));
+ 
+ 	/* Traverse only the allowed CPUs */
+-	for_each_cpu_and(i, sched_group_span(group), &p->cpus_allowed) {
++	for_each_cpu_and(i, sched_group_span(group), p->cpus_ptr) {
+ 		if (idle_cpu(i)) {
+ 			struct rq *rq = cpu_rq(i);
+ 			struct cpuidle_state *idle = idle_get_state(rq);
+@@ -5697,7 +5697,7 @@ static int select_idle_core(struct task_
+ 	if (!test_idle_cores(target, false))
+ 		return -1;
+ 
+-	cpumask_and(cpus, sched_domain_span(sd), &p->cpus_allowed);
++	cpumask_and(cpus, sched_domain_span(sd), p->cpus_ptr);
+ 
+ 	for_each_cpu_wrap(core, cpus, target) {
+ 		bool idle = true;
+@@ -5731,7 +5731,7 @@ static int select_idle_smt(struct task_s
+ 		return -1;
+ 
+ 	for_each_cpu(cpu, cpu_smt_mask(target)) {
+-		if (!cpumask_test_cpu(cpu, &p->cpus_allowed))
++		if (!cpumask_test_cpu(cpu, p->cpus_ptr))
+ 			continue;
+ 		if (idle_cpu(cpu))
+ 			return cpu;
+@@ -5794,7 +5794,7 @@ static int select_idle_cpu(struct task_s
+ 	for_each_cpu_wrap(cpu, sched_domain_span(sd), target) {
+ 		if (!--nr)
+ 			return -1;
+-		if (!cpumask_test_cpu(cpu, &p->cpus_allowed))
++		if (!cpumask_test_cpu(cpu, p->cpus_ptr))
+ 			continue;
+ 		if (idle_cpu(cpu))
+ 			break;
+@@ -5949,7 +5949,7 @@ select_task_rq_fair(struct task_struct *
+ 	if (sd_flag & SD_BALANCE_WAKE) {
+ 		record_wakee(p);
+ 		want_affine = !wake_wide(p) && !wake_cap(p, cpu, prev_cpu)
+-			      && cpumask_test_cpu(cpu, &p->cpus_allowed);
++			      && cpumask_test_cpu(cpu, p->cpus_ptr);
+ 	}
+ 
+ 	rcu_read_lock();
+@@ -6698,14 +6698,14 @@ int can_migrate_task(struct task_struct
+ 	/*
+ 	 * We do not migrate tasks that are:
+ 	 * 1) throttled_lb_pair, or
+-	 * 2) cannot be migrated to this CPU due to cpus_allowed, or
++	 * 2) cannot be migrated to this CPU due to cpus_ptr, or
+ 	 * 3) running (obviously), or
+ 	 * 4) are cache-hot on their current CPU.
+ 	 */
+ 	if (throttled_lb_pair(task_group(p), env->src_cpu, env->dst_cpu))
+ 		return 0;
+ 
+-	if (!cpumask_test_cpu(env->dst_cpu, &p->cpus_allowed)) {
++	if (!cpumask_test_cpu(env->dst_cpu, p->cpus_ptr)) {
+ 		int cpu;
+ 
+ 		schedstat_inc(p->se.statistics.nr_failed_migrations_affine);
+@@ -6725,7 +6725,7 @@ int can_migrate_task(struct task_struct
+ 
+ 		/* Prevent to re-select dst_cpu via env's cpus */
+ 		for_each_cpu_and(cpu, env->dst_grpmask, env->cpus) {
+-			if (cpumask_test_cpu(cpu, &p->cpus_allowed)) {
++			if (cpumask_test_cpu(cpu, p->cpus_ptr)) {
+ 				env->flags |= LBF_DST_PINNED;
+ 				env->new_dst_cpu = cpu;
+ 				break;
+@@ -7294,7 +7294,7 @@ check_cpu_capacity(struct rq *rq, struct
+ 
+ /*
+  * Group imbalance indicates (and tries to solve) the problem where balancing
+- * groups is inadequate due to ->cpus_allowed constraints.
++ * groups is inadequate due to ->cpus_ptr constraints.
+  *
+  * Imagine a situation of two groups of 4 cpus each and 4 tasks each with a
+  * cpumask covering 1 cpu of the first group and 3 cpus of the second group.
+@@ -7870,7 +7870,7 @@ static struct sched_group *find_busiest_
+ 	/*
+ 	 * If the busiest group is imbalanced the below checks don't
+ 	 * work because they assume all things are equal, which typically
+-	 * isn't true due to cpus_allowed constraints and the like.
++	 * isn't true due to cpus_ptr constraints and the like.
+ 	 */
+ 	if (busiest->group_type == group_imbalanced)
+ 		goto force_balance;
+@@ -8262,7 +8262,7 @@ static int load_balance(int this_cpu, st
+ 			 * if the curr task on busiest cpu can't be
+ 			 * moved to this_cpu
+ 			 */
+-			if (!cpumask_test_cpu(this_cpu, &busiest->curr->cpus_allowed)) {
++			if (!cpumask_test_cpu(this_cpu, busiest->curr->cpus_ptr)) {
+ 				raw_spin_unlock_irqrestore(&busiest->lock,
+ 							    flags);
+ 				env.flags |= LBF_ALL_PINNED;
+--- a/kernel/sched/rt.c
++++ b/kernel/sched/rt.c
+@@ -1592,7 +1592,7 @@ static void put_prev_task_rt(struct rq *
+ static int pick_rt_task(struct rq *rq, struct task_struct *p, int cpu)
+ {
+ 	if (!task_running(rq, p) &&
+-	    cpumask_test_cpu(cpu, &p->cpus_allowed))
++	    cpumask_test_cpu(cpu, p->cpus_ptr))
+ 		return 1;
+ 	return 0;
+ }
+@@ -1727,7 +1727,7 @@ static struct rq *find_lock_lowest_rq(st
+ 			 * Also make sure that it wasn't scheduled on its rq.
+ 			 */
+ 			if (unlikely(task_rq(task) != rq ||
+-				     !cpumask_test_cpu(lowest_rq->cpu, &task->cpus_allowed) ||
++				     !cpumask_test_cpu(lowest_rq->cpu, task->cpus_ptr) ||
+ 				     task_running(rq, task) ||
+ 				     !rt_task(task) ||
+ 				     !task_on_rq_queued(task))) {
+--- a/kernel/trace/trace_hwlat.c
++++ b/kernel/trace/trace_hwlat.c
+@@ -279,7 +279,7 @@ static void move_to_next_cpu(void)
+ 	 * of this thread, than stop migrating for the duration
+ 	 * of the current test.
+ 	 */
+-	if (!cpumask_equal(current_mask, &current->cpus_allowed))
++	if (!cpumask_equal(current_mask, current->cpus_ptr))
+ 		goto disable;
+ 
+ 	get_online_cpus();
+--- a/lib/smp_processor_id.c
++++ b/lib/smp_processor_id.c
+@@ -23,7 +23,7 @@ notrace static unsigned int check_preemp
+ 	 * Kernel threads bound to a single CPU can safely use
+ 	 * smp_processor_id():
+ 	 */
+-	if (cpumask_equal(&current->cpus_allowed, cpumask_of(this_cpu)))
++	if (cpumask_equal(current->cpus_ptr, cpumask_of(this_cpu)))
+ 		goto out;
+ 
+ 	/*
+--- a/samples/trace_events/trace-events-sample.c
++++ b/samples/trace_events/trace-events-sample.c
+@@ -33,7 +33,7 @@ static void simple_thread_func(int cnt)
+ 
+ 	/* Silly tracepoints */
+ 	trace_foo_bar("hello", cnt, array, random_strings[len],
+-		      &current->cpus_allowed);
++		      current->cpus_ptr);
+ 
+ 	trace_foo_with_template_simple("HELLO", cnt);
+ 
diff --git a/kernel/patches-4.14.x-rt/0057-add_migrate_disable.patch b/kernel/patches-4.14.x-rt/0057-add_migrate_disable.patch
new file mode 100644
index 000000000..0b915a8ce
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0057-add_migrate_disable.patch
@@ -0,0 +1,251 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Sat, 27 May 2017 19:02:06 +0200
+Subject: kernel/sched/core: add migrate_disable()
+
+---
+ include/linux/preempt.h |   23 ++++++++
+ include/linux/sched.h   |    7 ++
+ include/linux/smp.h     |    3 +
+ kernel/sched/core.c     |  130 +++++++++++++++++++++++++++++++++++++++++++++++-
+ kernel/sched/debug.c    |    4 +
+ 5 files changed, 165 insertions(+), 2 deletions(-)
+
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -185,6 +185,22 @@ do { \
+ 
+ #define preemptible()	(preempt_count() == 0 && !irqs_disabled())
+ 
++#ifdef CONFIG_SMP
++
++extern void migrate_disable(void);
++extern void migrate_enable(void);
++
++int __migrate_disabled(struct task_struct *p);
++
++#else
++#define migrate_disable()		barrier()
++#define migrate_enable()		barrier()
++static inline int __migrate_disabled(struct task_struct *p)
++{
++	return 0;
++}
++#endif
++
+ #ifdef CONFIG_PREEMPT
+ #define preempt_enable() \
+ do { \
+@@ -253,6 +269,13 @@ do { \
+ #define preempt_enable_notrace()		barrier()
+ #define preemptible()				0
+ 
++#define migrate_disable()			barrier()
++#define migrate_enable()			barrier()
++
++static inline int __migrate_disabled(struct task_struct *p)
++{
++	return 0;
++}
+ #endif /* CONFIG_PREEMPT_COUNT */
+ 
+ #ifdef MODULE
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -580,6 +580,13 @@ struct task_struct {
+ 	int				nr_cpus_allowed;
+ 	const cpumask_t			*cpus_ptr;
+ 	cpumask_t			cpus_mask;
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++	int				migrate_disable;
++	int				migrate_disable_update;
++# ifdef CONFIG_SCHED_DEBUG
++	int				migrate_disable_atomic;
++# endif
++#endif
+ 
+ #ifdef CONFIG_PREEMPT_RCU
+ 	int				rcu_read_lock_nesting;
+--- a/include/linux/smp.h
++++ b/include/linux/smp.h
+@@ -202,6 +202,9 @@ static inline int get_boot_cpu_id(void)
+ #define get_cpu()		({ preempt_disable(); smp_processor_id(); })
+ #define put_cpu()		preempt_enable()
+ 
++#define get_cpu_light()		({ migrate_disable(); smp_processor_id(); })
++#define put_cpu_light()		migrate_enable()
++
+ /*
+  * Callback to arch code if there's nosmp or maxcpus=0 on the
+  * boot command line:
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -1022,7 +1022,15 @@ void set_cpus_allowed_common(struct task
+ 	p->nr_cpus_allowed = cpumask_weight(new_mask);
+ }
+ 
+-void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++int __migrate_disabled(struct task_struct *p)
++{
++	return p->migrate_disable;
++}
++#endif
++
++static void __do_set_cpus_allowed_tail(struct task_struct *p,
++				       const struct cpumask *new_mask)
+ {
+ 	struct rq *rq = task_rq(p);
+ 	bool queued, running;
+@@ -1051,6 +1059,20 @@ void do_set_cpus_allowed(struct task_str
+ 		set_curr_task(rq, p);
+ }
+ 
++void do_set_cpus_allowed(struct task_struct *p, const struct cpumask *new_mask)
++{
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++	if (__migrate_disabled(p)) {
++		lockdep_assert_held(&p->pi_lock);
++
++		cpumask_copy(&p->cpus_mask, new_mask);
++		p->migrate_disable_update = 1;
++		return;
++	}
++#endif
++	__do_set_cpus_allowed_tail(p, new_mask);
++}
++
+ /*
+  * 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
+@@ -1109,9 +1131,16 @@ static int __set_cpus_allowed_ptr(struct
+ 	}
+ 
+ 	/* Can the task run on the task's current CPU? If so, we're done */
+-	if (cpumask_test_cpu(task_cpu(p), new_mask))
++	if (cpumask_test_cpu(task_cpu(p), new_mask) || __migrate_disabled(p))
+ 		goto out;
+ 
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++	if (__migrate_disabled(p)) {
++		p->migrate_disable_update = 1;
++		goto out;
++	}
++#endif
++
+ 	dest_cpu = cpumask_any_and(cpu_valid_mask, new_mask);
+ 	if (task_running(rq, p) || p->state == TASK_WAKING) {
+ 		struct migration_arg arg = { p, dest_cpu };
+@@ -6759,3 +6788,100 @@ const u32 sched_prio_to_wmult[40] = {
+  /*  10 */  39045157,  49367440,  61356676,  76695844,  95443717,
+  /*  15 */ 119304647, 148102320, 186737708, 238609294, 286331153,
+ };
++
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++
++void migrate_disable(void)
++{
++	struct task_struct *p = current;
++
++	if (in_atomic() || irqs_disabled()) {
++#ifdef CONFIG_SCHED_DEBUG
++		p->migrate_disable_atomic++;
++#endif
++		return;
++	}
++#ifdef CONFIG_SCHED_DEBUG
++	WARN_ON_ONCE(p->migrate_disable_atomic);
++#endif
++
++	if (p->migrate_disable) {
++		p->migrate_disable++;
++		return;
++	}
++
++	preempt_disable();
++	p->migrate_disable = 1;
++
++	p->cpus_ptr = cpumask_of(smp_processor_id());
++	p->nr_cpus_allowed = 1;
++
++	preempt_enable();
++}
++EXPORT_SYMBOL(migrate_disable);
++
++void migrate_enable(void)
++{
++	struct task_struct *p = current;
++
++	if (in_atomic() || irqs_disabled()) {
++#ifdef CONFIG_SCHED_DEBUG
++		p->migrate_disable_atomic--;
++#endif
++		return;
++	}
++
++#ifdef CONFIG_SCHED_DEBUG
++	WARN_ON_ONCE(p->migrate_disable_atomic);
++#endif
++
++	WARN_ON_ONCE(p->migrate_disable <= 0);
++	if (p->migrate_disable > 1) {
++		p->migrate_disable--;
++		return;
++	}
++
++	preempt_disable();
++
++	p->cpus_ptr = &p->cpus_mask;
++	p->nr_cpus_allowed = cpumask_weight(&p->cpus_mask);
++	p->migrate_disable = 0;
++
++	if (p->migrate_disable_update) {
++		struct rq *rq;
++		struct rq_flags rf;
++
++		rq = task_rq_lock(p, &rf);
++		update_rq_clock(rq);
++
++		__do_set_cpus_allowed_tail(p, &p->cpus_mask);
++		task_rq_unlock(rq, p, &rf);
++
++		p->migrate_disable_update = 0;
++
++		WARN_ON(smp_processor_id() != task_cpu(p));
++		if (!cpumask_test_cpu(task_cpu(p), &p->cpus_mask)) {
++			const struct cpumask *cpu_valid_mask = cpu_active_mask;
++			struct migration_arg arg;
++			unsigned int dest_cpu;
++
++			if (p->flags & PF_KTHREAD) {
++				/*
++				 * Kernel threads are allowed on online && !active CPUs
++				 */
++				cpu_valid_mask = cpu_online_mask;
++			}
++			dest_cpu = cpumask_any_and(cpu_valid_mask, &p->cpus_mask);
++			arg.task = p;
++			arg.dest_cpu = dest_cpu;
++
++			preempt_enable();
++			stop_one_cpu(task_cpu(p), migration_cpu_stop, &arg);
++			tlb_migrate_finish(p->mm);
++			return;
++		}
++	}
++	preempt_enable();
++}
++EXPORT_SYMBOL(migrate_enable);
++#endif
+--- a/kernel/sched/debug.c
++++ b/kernel/sched/debug.c
+@@ -1017,6 +1017,10 @@ void proc_sched_show_task(struct task_st
+ 		P(dl.runtime);
+ 		P(dl.deadline);
+ 	}
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++	P(migrate_disable);
++#endif
++	P(nr_cpus_allowed);
+ #undef PN_SCHEDSTAT
+ #undef PN
+ #undef __PN
diff --git a/kernel/patches-4.14.x-rt/0058-0001-tracing-Reverse-the-order-of-trace_types_lock-and-ev.patch b/kernel/patches-4.14.x-rt/0058-0001-tracing-Reverse-the-order-of-trace_types_lock-and-ev.patch
new file mode 100644
index 000000000..2c2213421
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0058-0001-tracing-Reverse-the-order-of-trace_types_lock-and-ev.patch
@@ -0,0 +1,191 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Thu, 21 Sep 2017 16:22:49 -0400
+Subject: [PATCH 01/48] tracing: Reverse the order of trace_types_lock and
+ event_mutex
+
+In order to make future changes where we need to call
+tracing_set_clock() from within an event command, the order of
+trace_types_lock and event_mutex must be reversed, as the event command
+will hold event_mutex and the trace_types_lock is taken from within
+tracing_set_clock().
+
+Link: http://lkml.kernel.org/r/20170921162249.0dde3dca@gandalf.local.home
+
+Requested-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 12ecef0cb12102d8c034770173d2d1363cb97d52)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace.c        |    5 +++++
+ kernel/trace/trace_events.c |   31 +++++++++++++++----------------
+ 2 files changed, 20 insertions(+), 16 deletions(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -7671,6 +7671,7 @@ static int instance_mkdir(const char *na
+ 	struct trace_array *tr;
+ 	int ret;
+ 
++	mutex_lock(&event_mutex);
+ 	mutex_lock(&trace_types_lock);
+ 
+ 	ret = -EEXIST;
+@@ -7726,6 +7727,7 @@ static int instance_mkdir(const char *na
+ 	list_add(&tr->list, &ftrace_trace_arrays);
+ 
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 
+ 	return 0;
+ 
+@@ -7737,6 +7739,7 @@ static int instance_mkdir(const char *na
+ 
+  out_unlock:
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 
+ 	return ret;
+ 
+@@ -7749,6 +7752,7 @@ static int instance_rmdir(const char *na
+ 	int ret;
+ 	int i;
+ 
++	mutex_lock(&event_mutex);
+ 	mutex_lock(&trace_types_lock);
+ 
+ 	ret = -ENODEV;
+@@ -7794,6 +7798,7 @@ static int instance_rmdir(const char *na
+ 
+  out_unlock:
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 
+ 	return ret;
+ }
+--- a/kernel/trace/trace_events.c
++++ b/kernel/trace/trace_events.c
+@@ -1406,8 +1406,8 @@ static int subsystem_open(struct inode *
+ 		return -ENODEV;
+ 
+ 	/* Make sure the system still exists */
+-	mutex_lock(&trace_types_lock);
+ 	mutex_lock(&event_mutex);
++	mutex_lock(&trace_types_lock);
+ 	list_for_each_entry(tr, &ftrace_trace_arrays, list) {
+ 		list_for_each_entry(dir, &tr->systems, list) {
+ 			if (dir == inode->i_private) {
+@@ -1421,8 +1421,8 @@ static int subsystem_open(struct inode *
+ 		}
+ 	}
+  exit_loop:
+-	mutex_unlock(&event_mutex);
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 
+ 	if (!system)
+ 		return -ENODEV;
+@@ -2308,15 +2308,15 @@ static void __add_event_to_tracers(struc
+ int trace_add_event_call(struct trace_event_call *call)
+ {
+ 	int ret;
+-	mutex_lock(&trace_types_lock);
+ 	mutex_lock(&event_mutex);
++	mutex_lock(&trace_types_lock);
+ 
+ 	ret = __register_event(call, NULL);
+ 	if (ret >= 0)
+ 		__add_event_to_tracers(call);
+ 
+-	mutex_unlock(&event_mutex);
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 	return ret;
+ }
+ 
+@@ -2370,13 +2370,13 @@ int trace_remove_event_call(struct trace
+ {
+ 	int ret;
+ 
+-	mutex_lock(&trace_types_lock);
+ 	mutex_lock(&event_mutex);
++	mutex_lock(&trace_types_lock);
+ 	down_write(&trace_event_sem);
+ 	ret = probe_remove_event_call(call);
+ 	up_write(&trace_event_sem);
+-	mutex_unlock(&event_mutex);
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 
+ 	return ret;
+ }
+@@ -2438,8 +2438,8 @@ static int trace_module_notify(struct no
+ {
+ 	struct module *mod = data;
+ 
+-	mutex_lock(&trace_types_lock);
+ 	mutex_lock(&event_mutex);
++	mutex_lock(&trace_types_lock);
+ 	switch (val) {
+ 	case MODULE_STATE_COMING:
+ 		trace_module_add_events(mod);
+@@ -2448,8 +2448,8 @@ static int trace_module_notify(struct no
+ 		trace_module_remove_events(mod);
+ 		break;
+ 	}
+-	mutex_unlock(&event_mutex);
+ 	mutex_unlock(&trace_types_lock);
++	mutex_unlock(&event_mutex);
+ 
+ 	return 0;
+ }
+@@ -2964,24 +2964,24 @@ create_event_toplevel_files(struct dentr
+  * creates the event hierachry in the @parent/events directory.
+  *
+  * Returns 0 on success.
++ *
++ * Must be called with event_mutex held.
+  */
+ int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr)
+ {
+ 	int ret;
+ 
+-	mutex_lock(&event_mutex);
++	lockdep_assert_held(&event_mutex);
+ 
+ 	ret = create_event_toplevel_files(parent, tr);
+ 	if (ret)
+-		goto out_unlock;
++		goto out;
+ 
+ 	down_write(&trace_event_sem);
+ 	__trace_add_event_dirs(tr);
+ 	up_write(&trace_event_sem);
+ 
+- out_unlock:
+-	mutex_unlock(&event_mutex);
+-
++ out:
+ 	return ret;
+ }
+ 
+@@ -3010,9 +3010,10 @@ early_event_add_tracer(struct dentry *pa
+ 	return ret;
+ }
+ 
++/* Must be called with event_mutex held */
+ int event_trace_del_tracer(struct trace_array *tr)
+ {
+-	mutex_lock(&event_mutex);
++	lockdep_assert_held(&event_mutex);
+ 
+ 	/* Disable any event triggers and associated soft-disabled events */
+ 	clear_event_triggers(tr);
+@@ -3033,8 +3034,6 @@ int event_trace_del_tracer(struct trace_
+ 
+ 	tr->event_dir = NULL;
+ 
+-	mutex_unlock(&event_mutex);
+-
+ 	return 0;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0059-0002-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch b/kernel/patches-4.14.x-rt/0059-0002-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch
new file mode 100644
index 000000000..1c3f8a39c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0059-0002-ring-buffer-Rewrite-trace_recursive_-un-lock-to-be-s.patch
@@ -0,0 +1,118 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Fri, 22 Sep 2017 16:59:02 -0400
+Subject: [PATCH 02/48] ring-buffer: Rewrite trace_recursive_(un)lock() to be
+ simpler
+
+The current method to prevent the ring buffer from entering into a recursize
+loop is to use a bitmask and set the bit that maps to the current context
+(normal, softirq, irq or NMI), and if that bit was already set, it is
+considered a recursive loop.
+
+New code is being added that may require the ring buffer to be entered a
+second time in the current context. The recursive locking prevents that from
+happening. Instead of mapping a bitmask to the current context, just allow 4
+levels of nesting in the ring buffer. This matches the 4 context levels that
+it can already nest. It is highly unlikely to have more than two levels,
+thus it should be fine when we add the second entry into the ring buffer. If
+that proves to be a problem, we can always up the number to 8.
+
+An added benefit is that reading preempt_count() to get the current level
+adds a very slight but noticeable overhead. This removes that need.
+
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 1a149d7d3f45d311da1f63473736c05f30ae8a75)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/ring_buffer.c |   66 ++++++++++++---------------------------------
+ 1 file changed, 18 insertions(+), 48 deletions(-)
+
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -2542,61 +2542,29 @@ rb_wakeups(struct ring_buffer *buffer, s
+  * The lock and unlock are done within a preempt disable section.
+  * The current_context per_cpu variable can only be modified
+  * by the current task between lock and unlock. But it can
+- * be modified more than once via an interrupt. To pass this
+- * information from the lock to the unlock without having to
+- * access the 'in_interrupt()' functions again (which do show
+- * a bit of overhead in something as critical as function tracing,
+- * we use a bitmask trick.
++ * be modified more than once via an interrupt. There are four
++ * different contexts that we need to consider.
+  *
+- *  bit 0 =  NMI context
+- *  bit 1 =  IRQ context
+- *  bit 2 =  SoftIRQ context
+- *  bit 3 =  normal context.
+- *
+- * This works because this is the order of contexts that can
+- * preempt other contexts. A SoftIRQ never preempts an IRQ
+- * context.
+- *
+- * When the context is determined, the corresponding bit is
+- * checked and set (if it was set, then a recursion of that context
+- * happened).
+- *
+- * On unlock, we need to clear this bit. To do so, just subtract
+- * 1 from the current_context and AND it to itself.
+- *
+- * (binary)
+- *  101 - 1 = 100
+- *  101 & 100 = 100 (clearing bit zero)
+- *
+- *  1010 - 1 = 1001
+- *  1010 & 1001 = 1000 (clearing bit 1)
+- *
+- * The least significant bit can be cleared this way, and it
+- * just so happens that it is the same bit corresponding to
+- * the current context.
++ *  Normal context.
++ *  SoftIRQ context
++ *  IRQ context
++ *  NMI context
++ *
++ * If for some reason the ring buffer starts to recurse, we
++ * only allow that to happen at most 4 times (one for each
++ * context). If it happens 5 times, then we consider this a
++ * recusive loop and do not let it go further.
+  */
+ 
+ static __always_inline int
+ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+ {
+-	unsigned int val = cpu_buffer->current_context;
+-	int bit;
+-
+-	if (in_interrupt()) {
+-		if (in_nmi())
+-			bit = RB_CTX_NMI;
+-		else if (in_irq())
+-			bit = RB_CTX_IRQ;
+-		else
+-			bit = RB_CTX_SOFTIRQ;
+-	} else
+-		bit = RB_CTX_NORMAL;
+-
+-	if (unlikely(val & (1 << bit)))
++	if (cpu_buffer->current_context >= 4)
+ 		return 1;
+ 
+-	val |= (1 << bit);
+-	cpu_buffer->current_context = val;
++	cpu_buffer->current_context++;
++	/* Interrupts must see this update */
++	barrier();
+ 
+ 	return 0;
+ }
+@@ -2604,7 +2572,9 @@ trace_recursive_lock(struct ring_buffer_
+ static __always_inline void
+ trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
+ {
+-	cpu_buffer->current_context &= cpu_buffer->current_context - 1;
++	/* Don't let the dec leak out */
++	barrier();
++	cpu_buffer->current_context--;
+ }
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0060-0003-tracing-Remove-lookups-from-tracing_map-hitcount.patch b/kernel/patches-4.14.x-rt/0060-0003-tracing-Remove-lookups-from-tracing_map-hitcount.patch
new file mode 100644
index 000000000..c3f323673
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0060-0003-tracing-Remove-lookups-from-tracing_map-hitcount.patch
@@ -0,0 +1,30 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Fri, 22 Sep 2017 14:58:18 -0500
+Subject: [PATCH 03/48] tracing: Remove lookups from tracing_map hitcount
+
+Lookups inflate the hitcount, making it essentially useless.  Only
+inserts and updates should really affect the hitcount anyway, so
+explicitly filter lookups out.
+
+Link: http://lkml.kernel.org/r/c8d9dc39d269a8abf88bf4102d0dfc65deb0fc7f.1506105045.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 83c07ecc4203728e85fc4a2ce6fdf25d16ea118e)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/tracing_map.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/kernel/trace/tracing_map.c
++++ b/kernel/trace/tracing_map.c
+@@ -428,7 +428,8 @@ static inline struct tracing_map_elt *
+ 
+ 		if (test_key && test_key == key_hash && entry->val &&
+ 		    keys_match(key, entry->val->key, map->key_size)) {
+-			atomic64_inc(&map->hits);
++			if (!lookup_only)
++				atomic64_inc(&map->hits);
+ 			return entry->val;
+ 		}
+ 
diff --git a/kernel/patches-4.14.x-rt/0061-0004-tracing-Increase-tracing-map-KEYS_MAX-size.patch b/kernel/patches-4.14.x-rt/0061-0004-tracing-Increase-tracing-map-KEYS_MAX-size.patch
new file mode 100644
index 000000000..20c3ef406
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0061-0004-tracing-Increase-tracing-map-KEYS_MAX-size.patch
@@ -0,0 +1,28 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Fri, 22 Sep 2017 14:58:19 -0500
+Subject: [PATCH 04/48] tracing: Increase tracing map KEYS_MAX size
+
+The current default for the number of subkeys in a compound key is 2,
+which is too restrictive.  Increase it to a more realistic value of 3.
+
+Link: http://lkml.kernel.org/r/b6952cca06d1f912eba33804a6fd6069b3847d44.1506105045.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 4f36c2d85cedea60ad424d44534121ab0458069e)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/tracing_map.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/trace/tracing_map.h
++++ b/kernel/trace/tracing_map.h
+@@ -6,7 +6,7 @@
+ #define TRACING_MAP_BITS_MAX		17
+ #define TRACING_MAP_BITS_MIN		7
+ 
+-#define TRACING_MAP_KEYS_MAX		2
++#define TRACING_MAP_KEYS_MAX		3
+ #define TRACING_MAP_VALS_MAX		3
+ #define TRACING_MAP_FIELDS_MAX		(TRACING_MAP_KEYS_MAX + \
+ 					 TRACING_MAP_VALS_MAX)
diff --git a/kernel/patches-4.14.x-rt/0062-0005-tracing-Make-traceprobe-parsing-code-reusable.patch b/kernel/patches-4.14.x-rt/0062-0005-tracing-Make-traceprobe-parsing-code-reusable.patch
new file mode 100644
index 000000000..14912fcd5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0062-0005-tracing-Make-traceprobe-parsing-code-reusable.patch
@@ -0,0 +1,321 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Fri, 22 Sep 2017 14:58:20 -0500
+Subject: [PATCH 05/48] tracing: Make traceprobe parsing code reusable
+
+traceprobe_probes_write() and traceprobe_command() actually contain
+nothing that ties them to kprobes - the code is generically useful for
+similar types of parsing elsewhere, so separate it out and move it to
+trace.c/trace.h.
+
+Other than moving it, the only change is in naming:
+traceprobe_probes_write() becomes trace_parse_run_command() and
+traceprobe_command() becomes trace_run_command().
+
+Link: http://lkml.kernel.org/r/ae5c26ea40c196a8986854d921eb6e713ede7e3f.1506105045.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 7e465baa80293ed5f87fdf6405391d6f02110d4e)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace.c        |   86 ++++++++++++++++++++++++++++++++++++++++++++
+ kernel/trace/trace.h        |    7 +++
+ kernel/trace/trace_kprobe.c |   18 ++++-----
+ kernel/trace/trace_probe.c  |   86 --------------------------------------------
+ kernel/trace/trace_probe.h  |    7 ---
+ kernel/trace/trace_uprobe.c |    2 -
+ 6 files changed, 103 insertions(+), 103 deletions(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -8265,6 +8265,92 @@ void ftrace_dump(enum ftrace_dump_mode o
+ }
+ EXPORT_SYMBOL_GPL(ftrace_dump);
+ 
++int trace_run_command(const char *buf, int (*createfn)(int, char **))
++{
++	char **argv;
++	int argc, ret;
++
++	argc = 0;
++	ret = 0;
++	argv = argv_split(GFP_KERNEL, buf, &argc);
++	if (!argv)
++		return -ENOMEM;
++
++	if (argc)
++		ret = createfn(argc, argv);
++
++	argv_free(argv);
++
++	return ret;
++}
++
++#define WRITE_BUFSIZE  4096
++
++ssize_t trace_parse_run_command(struct file *file, const char __user *buffer,
++				size_t count, loff_t *ppos,
++				int (*createfn)(int, char **))
++{
++	char *kbuf, *buf, *tmp;
++	int ret = 0;
++	size_t done = 0;
++	size_t size;
++
++	kbuf = kmalloc(WRITE_BUFSIZE, GFP_KERNEL);
++	if (!kbuf)
++		return -ENOMEM;
++
++	while (done < count) {
++		size = count - done;
++
++		if (size >= WRITE_BUFSIZE)
++			size = WRITE_BUFSIZE - 1;
++
++		if (copy_from_user(kbuf, buffer + done, size)) {
++			ret = -EFAULT;
++			goto out;
++		}
++		kbuf[size] = '\0';
++		buf = kbuf;
++		do {
++			tmp = strchr(buf, '\n');
++			if (tmp) {
++				*tmp = '\0';
++				size = tmp - buf + 1;
++			} else {
++				size = strlen(buf);
++				if (done + size < count) {
++					if (buf != kbuf)
++						break;
++					/* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */
++					pr_warn("Line length is too long: Should be less than %d\n",
++						WRITE_BUFSIZE - 2);
++					ret = -EINVAL;
++					goto out;
++				}
++			}
++			done += size;
++
++			/* Remove comments */
++			tmp = strchr(buf, '#');
++
++			if (tmp)
++				*tmp = '\0';
++
++			ret = trace_run_command(buf, createfn);
++			if (ret)
++				goto out;
++			buf += size;
++
++		} while (done < count);
++	}
++	ret = done;
++
++out:
++	kfree(kbuf);
++
++	return ret;
++}
++
+ __init static int tracer_alloc_buffers(void)
+ {
+ 	int ring_buf_size;
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -1755,6 +1755,13 @@ void trace_printk_start_comm(void);
+ int trace_keep_overwrite(struct tracer *tracer, u32 mask, int set);
+ int set_tracer_flag(struct trace_array *tr, unsigned int mask, int enabled);
+ 
++#define MAX_EVENT_NAME_LEN	64
++
++extern int trace_run_command(const char *buf, int (*createfn)(int, char**));
++extern ssize_t trace_parse_run_command(struct file *file,
++		const char __user *buffer, size_t count, loff_t *ppos,
++		int (*createfn)(int, char**));
++
+ /*
+  * Normal trace_printk() and friends allocates special buffers
+  * to do the manipulation, as well as saves the print formats
+--- a/kernel/trace/trace_kprobe.c
++++ b/kernel/trace/trace_kprobe.c
+@@ -907,8 +907,8 @@ static int probes_open(struct inode *ino
+ static ssize_t probes_write(struct file *file, const char __user *buffer,
+ 			    size_t count, loff_t *ppos)
+ {
+-	return traceprobe_probes_write(file, buffer, count, ppos,
+-			create_trace_kprobe);
++	return trace_parse_run_command(file, buffer, count, ppos,
++				       create_trace_kprobe);
+ }
+ 
+ static const struct file_operations kprobe_events_ops = {
+@@ -1433,9 +1433,9 @@ static __init int kprobe_trace_self_test
+ 
+ 	pr_info("Testing kprobe tracing: ");
+ 
+-	ret = traceprobe_command("p:testprobe kprobe_trace_selftest_target "
+-				  "$stack $stack0 +0($stack)",
+-				  create_trace_kprobe);
++	ret = trace_run_command("p:testprobe kprobe_trace_selftest_target "
++				"$stack $stack0 +0($stack)",
++				create_trace_kprobe);
+ 	if (WARN_ON_ONCE(ret)) {
+ 		pr_warn("error on probing function entry.\n");
+ 		warn++;
+@@ -1455,8 +1455,8 @@ static __init int kprobe_trace_self_test
+ 		}
+ 	}
+ 
+-	ret = traceprobe_command("r:testprobe2 kprobe_trace_selftest_target "
+-				  "$retval", create_trace_kprobe);
++	ret = trace_run_command("r:testprobe2 kprobe_trace_selftest_target "
++				"$retval", create_trace_kprobe);
+ 	if (WARN_ON_ONCE(ret)) {
+ 		pr_warn("error on probing function return.\n");
+ 		warn++;
+@@ -1526,13 +1526,13 @@ static __init int kprobe_trace_self_test
+ 			disable_trace_kprobe(tk, file);
+ 	}
+ 
+-	ret = traceprobe_command("-:testprobe", create_trace_kprobe);
++	ret = trace_run_command("-:testprobe", create_trace_kprobe);
+ 	if (WARN_ON_ONCE(ret)) {
+ 		pr_warn("error on deleting a probe.\n");
+ 		warn++;
+ 	}
+ 
+-	ret = traceprobe_command("-:testprobe2", create_trace_kprobe);
++	ret = trace_run_command("-:testprobe2", create_trace_kprobe);
+ 	if (WARN_ON_ONCE(ret)) {
+ 		pr_warn("error on deleting a probe.\n");
+ 		warn++;
+--- a/kernel/trace/trace_probe.c
++++ b/kernel/trace/trace_probe.c
+@@ -623,92 +623,6 @@ void traceprobe_free_probe_arg(struct pr
+ 	kfree(arg->comm);
+ }
+ 
+-int traceprobe_command(const char *buf, int (*createfn)(int, char **))
+-{
+-	char **argv;
+-	int argc, ret;
+-
+-	argc = 0;
+-	ret = 0;
+-	argv = argv_split(GFP_KERNEL, buf, &argc);
+-	if (!argv)
+-		return -ENOMEM;
+-
+-	if (argc)
+-		ret = createfn(argc, argv);
+-
+-	argv_free(argv);
+-
+-	return ret;
+-}
+-
+-#define WRITE_BUFSIZE  4096
+-
+-ssize_t traceprobe_probes_write(struct file *file, const char __user *buffer,
+-				size_t count, loff_t *ppos,
+-				int (*createfn)(int, char **))
+-{
+-	char *kbuf, *buf, *tmp;
+-	int ret = 0;
+-	size_t done = 0;
+-	size_t size;
+-
+-	kbuf = kmalloc(WRITE_BUFSIZE, GFP_KERNEL);
+-	if (!kbuf)
+-		return -ENOMEM;
+-
+-	while (done < count) {
+-		size = count - done;
+-
+-		if (size >= WRITE_BUFSIZE)
+-			size = WRITE_BUFSIZE - 1;
+-
+-		if (copy_from_user(kbuf, buffer + done, size)) {
+-			ret = -EFAULT;
+-			goto out;
+-		}
+-		kbuf[size] = '\0';
+-		buf = kbuf;
+-		do {
+-			tmp = strchr(buf, '\n');
+-			if (tmp) {
+-				*tmp = '\0';
+-				size = tmp - buf + 1;
+-			} else {
+-				size = strlen(buf);
+-				if (done + size < count) {
+-					if (buf != kbuf)
+-						break;
+-					/* This can accept WRITE_BUFSIZE - 2 ('\n' + '\0') */
+-					pr_warn("Line length is too long: Should be less than %d\n",
+-						WRITE_BUFSIZE - 2);
+-					ret = -EINVAL;
+-					goto out;
+-				}
+-			}
+-			done += size;
+-
+-			/* Remove comments */
+-			tmp = strchr(buf, '#');
+-
+-			if (tmp)
+-				*tmp = '\0';
+-
+-			ret = traceprobe_command(buf, createfn);
+-			if (ret)
+-				goto out;
+-			buf += size;
+-
+-		} while (done < count);
+-	}
+-	ret = done;
+-
+-out:
+-	kfree(kbuf);
+-
+-	return ret;
+-}
+-
+ static int __set_print_fmt(struct trace_probe *tp, char *buf, int len,
+ 			   bool is_return)
+ {
+--- a/kernel/trace/trace_probe.h
++++ b/kernel/trace/trace_probe.h
+@@ -42,7 +42,6 @@
+ 
+ #define MAX_TRACE_ARGS		128
+ #define MAX_ARGSTR_LEN		63
+-#define MAX_EVENT_NAME_LEN	64
+ #define MAX_STRING_SIZE		PATH_MAX
+ 
+ /* Reserved field names */
+@@ -356,12 +355,6 @@ extern void traceprobe_free_probe_arg(st
+ 
+ extern int traceprobe_split_symbol_offset(char *symbol, unsigned long *offset);
+ 
+-extern ssize_t traceprobe_probes_write(struct file *file,
+-		const char __user *buffer, size_t count, loff_t *ppos,
+-		int (*createfn)(int, char**));
+-
+-extern int traceprobe_command(const char *buf, int (*createfn)(int, char**));
+-
+ /* Sum up total data length for dynamic arraies (strings) */
+ static nokprobe_inline int
+ __get_data_size(struct trace_probe *tp, struct pt_regs *regs)
+--- a/kernel/trace/trace_uprobe.c
++++ b/kernel/trace/trace_uprobe.c
+@@ -651,7 +651,7 @@ static int probes_open(struct inode *ino
+ static ssize_t probes_write(struct file *file, const char __user *buffer,
+ 			    size_t count, loff_t *ppos)
+ {
+-	return traceprobe_probes_write(file, buffer, count, ppos, create_trace_uprobe);
++	return trace_parse_run_command(file, buffer, count, ppos, create_trace_uprobe);
+ }
+ 
+ static const struct file_operations uprobe_events_ops = {
diff --git a/kernel/patches-4.14.x-rt/0063-0006-tracing-Clean-up-hist_field_flags-enum.patch b/kernel/patches-4.14.x-rt/0063-0006-tracing-Clean-up-hist_field_flags-enum.patch
new file mode 100644
index 000000000..61e6a4c75
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0063-0006-tracing-Clean-up-hist_field_flags-enum.patch
@@ -0,0 +1,47 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Fri, 22 Sep 2017 14:58:21 -0500
+Subject: [PATCH 06/48] tracing: Clean up hist_field_flags enum
+
+As we add more flags, specifying explicit integers for the flag values
+becomes more unwieldy and error-prone - switch them over to left-shift
+values.
+
+Link: http://lkml.kernel.org/r/e644e4fb7665aec015f4a2d84a2f990d3dd5b8a1.1506105045.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 0d7a8325bf3326c92da2d21b4496a9ddde896d4f)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -110,16 +110,16 @@ DEFINE_HIST_FIELD_FN(u8);
+ #define HIST_KEY_SIZE_MAX	(MAX_FILTER_STR_VAL + HIST_STACKTRACE_SIZE)
+ 
+ enum hist_field_flags {
+-	HIST_FIELD_FL_HITCOUNT		= 1,
+-	HIST_FIELD_FL_KEY		= 2,
+-	HIST_FIELD_FL_STRING		= 4,
+-	HIST_FIELD_FL_HEX		= 8,
+-	HIST_FIELD_FL_SYM		= 16,
+-	HIST_FIELD_FL_SYM_OFFSET	= 32,
+-	HIST_FIELD_FL_EXECNAME		= 64,
+-	HIST_FIELD_FL_SYSCALL		= 128,
+-	HIST_FIELD_FL_STACKTRACE	= 256,
+-	HIST_FIELD_FL_LOG2		= 512,
++	HIST_FIELD_FL_HITCOUNT		= 1 << 0,
++	HIST_FIELD_FL_KEY		= 1 << 1,
++	HIST_FIELD_FL_STRING		= 1 << 2,
++	HIST_FIELD_FL_HEX		= 1 << 3,
++	HIST_FIELD_FL_SYM		= 1 << 4,
++	HIST_FIELD_FL_SYM_OFFSET	= 1 << 5,
++	HIST_FIELD_FL_EXECNAME		= 1 << 6,
++	HIST_FIELD_FL_SYSCALL		= 1 << 7,
++	HIST_FIELD_FL_STACKTRACE	= 1 << 8,
++	HIST_FIELD_FL_LOG2		= 1 << 9,
+ };
+ 
+ struct hist_trigger_attrs {
diff --git a/kernel/patches-4.14.x-rt/0064-0007-tracing-Add-hist_field_name-accessor.patch b/kernel/patches-4.14.x-rt/0064-0007-tracing-Add-hist_field_name-accessor.patch
new file mode 100644
index 000000000..e4e0e9401
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0064-0007-tracing-Add-hist_field_name-accessor.patch
@@ -0,0 +1,178 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Fri, 22 Sep 2017 14:58:22 -0500
+Subject: [PATCH 07/48] tracing: Add hist_field_name() accessor
+
+In preparation for hist_fields that won't be strictly based on
+trace_event_fields, add a new hist_field_name() accessor to allow that
+flexibility and update associated users.
+
+Link: http://lkml.kernel.org/r/5b5a2d36dde067cbbe2434b10f06daac27b7dbd5.1506105045.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 85013256cf01629f72a327674c5d007b4a4b40da)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   67 ++++++++++++++++++++++++++-------------
+ 1 file changed, 45 insertions(+), 22 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -146,6 +146,23 @@ struct hist_trigger_data {
+ 	struct tracing_map		*map;
+ };
+ 
++static const char *hist_field_name(struct hist_field *field,
++				   unsigned int level)
++{
++	const char *field_name = "";
++
++	if (level > 1)
++		return field_name;
++
++	if (field->field)
++		field_name = field->field->name;
++
++	if (field_name == NULL)
++		field_name = "";
++
++	return field_name;
++}
++
+ static hist_field_fn_t select_value_fn(int field_size, int field_is_signed)
+ {
+ 	hist_field_fn_t fn = NULL;
+@@ -653,7 +670,6 @@ static int is_descending(const char *str
+ static int create_sort_keys(struct hist_trigger_data *hist_data)
+ {
+ 	char *fields_str = hist_data->attrs->sort_key_str;
+-	struct ftrace_event_field *field = NULL;
+ 	struct tracing_map_sort_key *sort_key;
+ 	int descending, ret = 0;
+ 	unsigned int i, j;
+@@ -670,7 +686,9 @@ static int create_sort_keys(struct hist_
+ 	}
+ 
+ 	for (i = 0; i < TRACING_MAP_SORT_KEYS_MAX; i++) {
++		struct hist_field *hist_field;
+ 		char *field_str, *field_name;
++		const char *test_name;
+ 
+ 		sort_key = &hist_data->sort_keys[i];
+ 
+@@ -703,8 +721,10 @@ static int create_sort_keys(struct hist_
+ 		}
+ 
+ 		for (j = 1; j < hist_data->n_fields; j++) {
+-			field = hist_data->fields[j]->field;
+-			if (field && (strcmp(field_name, field->name) == 0)) {
++			hist_field = hist_data->fields[j];
++			test_name = hist_field_name(hist_field, 0);
++
++			if (strcmp(field_name, test_name) == 0) {
+ 				sort_key->field_idx = j;
+ 				descending = is_descending(field_str);
+ 				if (descending < 0) {
+@@ -952,6 +972,7 @@ hist_trigger_entry_print(struct seq_file
+ 	struct hist_field *key_field;
+ 	char str[KSYM_SYMBOL_LEN];
+ 	bool multiline = false;
++	const char *field_name;
+ 	unsigned int i;
+ 	u64 uval;
+ 
+@@ -963,26 +984,27 @@ hist_trigger_entry_print(struct seq_file
+ 		if (i > hist_data->n_vals)
+ 			seq_puts(m, ", ");
+ 
++		field_name = hist_field_name(key_field, 0);
++
+ 		if (key_field->flags & HIST_FIELD_FL_HEX) {
+ 			uval = *(u64 *)(key + key_field->offset);
+-			seq_printf(m, "%s: %llx",
+-				   key_field->field->name, uval);
++			seq_printf(m, "%s: %llx", field_name, uval);
+ 		} else if (key_field->flags & HIST_FIELD_FL_SYM) {
+ 			uval = *(u64 *)(key + key_field->offset);
+ 			sprint_symbol_no_offset(str, uval);
+-			seq_printf(m, "%s: [%llx] %-45s",
+-				   key_field->field->name, uval, str);
++			seq_printf(m, "%s: [%llx] %-45s", field_name,
++				   uval, str);
+ 		} else if (key_field->flags & HIST_FIELD_FL_SYM_OFFSET) {
+ 			uval = *(u64 *)(key + key_field->offset);
+ 			sprint_symbol(str, uval);
+-			seq_printf(m, "%s: [%llx] %-55s",
+-				   key_field->field->name, uval, str);
++			seq_printf(m, "%s: [%llx] %-55s", field_name,
++				   uval, str);
+ 		} else if (key_field->flags & HIST_FIELD_FL_EXECNAME) {
+ 			char *comm = elt->private_data;
+ 
+ 			uval = *(u64 *)(key + key_field->offset);
+-			seq_printf(m, "%s: %-16s[%10llu]",
+-				   key_field->field->name, comm, uval);
++			seq_printf(m, "%s: %-16s[%10llu]", field_name,
++				   comm, uval);
+ 		} else if (key_field->flags & HIST_FIELD_FL_SYSCALL) {
+ 			const char *syscall_name;
+ 
+@@ -991,8 +1013,8 @@ hist_trigger_entry_print(struct seq_file
+ 			if (!syscall_name)
+ 				syscall_name = "unknown_syscall";
+ 
+-			seq_printf(m, "%s: %-30s[%3llu]",
+-				   key_field->field->name, syscall_name, uval);
++			seq_printf(m, "%s: %-30s[%3llu]", field_name,
++				   syscall_name, uval);
+ 		} else if (key_field->flags & HIST_FIELD_FL_STACKTRACE) {
+ 			seq_puts(m, "stacktrace:\n");
+ 			hist_trigger_stacktrace_print(m,
+@@ -1000,15 +1022,14 @@ hist_trigger_entry_print(struct seq_file
+ 						      HIST_STACKTRACE_DEPTH);
+ 			multiline = true;
+ 		} else if (key_field->flags & HIST_FIELD_FL_LOG2) {
+-			seq_printf(m, "%s: ~ 2^%-2llu", key_field->field->name,
++			seq_printf(m, "%s: ~ 2^%-2llu", field_name,
+ 				   *(u64 *)(key + key_field->offset));
+ 		} else if (key_field->flags & HIST_FIELD_FL_STRING) {
+-			seq_printf(m, "%s: %-50s", key_field->field->name,
++			seq_printf(m, "%s: %-50s", field_name,
+ 				   (char *)(key + key_field->offset));
+ 		} else {
+ 			uval = *(u64 *)(key + key_field->offset);
+-			seq_printf(m, "%s: %10llu", key_field->field->name,
+-				   uval);
++			seq_printf(m, "%s: %10llu", field_name, uval);
+ 		}
+ 	}
+ 
+@@ -1021,13 +1042,13 @@ hist_trigger_entry_print(struct seq_file
+ 		   tracing_map_read_sum(elt, HITCOUNT_IDX));
+ 
+ 	for (i = 1; i < hist_data->n_vals; i++) {
++		field_name = hist_field_name(hist_data->fields[i], 0);
++
+ 		if (hist_data->fields[i]->flags & HIST_FIELD_FL_HEX) {
+-			seq_printf(m, "  %s: %10llx",
+-				   hist_data->fields[i]->field->name,
++			seq_printf(m, "  %s: %10llx", field_name,
+ 				   tracing_map_read_sum(elt, i));
+ 		} else {
+-			seq_printf(m, "  %s: %10llu",
+-				   hist_data->fields[i]->field->name,
++			seq_printf(m, "  %s: %10llu", field_name,
+ 				   tracing_map_read_sum(elt, i));
+ 		}
+ 	}
+@@ -1142,7 +1163,9 @@ static const char *get_hist_field_flags(
+ 
+ static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)
+ {
+-	seq_printf(m, "%s", hist_field->field->name);
++	const char *field_name = hist_field_name(hist_field, 0);
++
++	seq_printf(m, "%s", field_name);
+ 	if (hist_field->flags) {
+ 		const char *flags_str = get_hist_field_flags(hist_field);
+ 
diff --git a/kernel/patches-4.14.x-rt/0065-0008-tracing-Reimplement-log2.patch b/kernel/patches-4.14.x-rt/0065-0008-tracing-Reimplement-log2.patch
new file mode 100644
index 000000000..fced6863d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0065-0008-tracing-Reimplement-log2.patch
@@ -0,0 +1,118 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Fri, 22 Sep 2017 14:58:23 -0500
+Subject: [PATCH 08/48] tracing: Reimplement log2
+
+log2 as currently implemented applies only to u64 trace_event_field
+derived fields, and assumes that anything it's applied to is a u64
+field.
+
+To prepare for synthetic fields like latencies, log2 should be
+applicable to those as well, so take the opportunity now to fix the
+current problems as well as expand to more general uses.
+
+log2 should be thought of as a chaining function rather than a field
+type.  To enable this as well as possible future function
+implementations, add a hist_field operand array into the hist_field
+definition for this purpose, and make use of it to implement the log2
+'function'.
+
+Link: http://lkml.kernel.org/r/b47f93fc0b87b36eccf716b0c018f3a71e1f1111.1506105045.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 5819eaddf35b24d628ddfa4fbb5f8d4026e44b96)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   31 +++++++++++++++++++++++++++----
+ 1 file changed, 27 insertions(+), 4 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -28,12 +28,16 @@ struct hist_field;
+ 
+ typedef u64 (*hist_field_fn_t) (struct hist_field *field, void *event);
+ 
++#define HIST_FIELD_OPERANDS_MAX	2
++
+ struct hist_field {
+ 	struct ftrace_event_field	*field;
+ 	unsigned long			flags;
+ 	hist_field_fn_t			fn;
+ 	unsigned int			size;
+ 	unsigned int			offset;
++	unsigned int                    is_signed;
++	struct hist_field		*operands[HIST_FIELD_OPERANDS_MAX];
+ };
+ 
+ static u64 hist_field_none(struct hist_field *field, void *event)
+@@ -71,7 +75,9 @@ static u64 hist_field_pstring(struct his
+ 
+ static u64 hist_field_log2(struct hist_field *hist_field, void *event)
+ {
+-	u64 val = *(u64 *)(event + hist_field->field->offset);
++	struct hist_field *operand = hist_field->operands[0];
++
++	u64 val = operand->fn(operand, event);
+ 
+ 	return (u64) ilog2(roundup_pow_of_two(val));
+ }
+@@ -156,6 +162,8 @@ static const char *hist_field_name(struc
+ 
+ 	if (field->field)
+ 		field_name = field->field->name;
++	else if (field->flags & HIST_FIELD_FL_LOG2)
++		field_name = hist_field_name(field->operands[0], ++level);
+ 
+ 	if (field_name == NULL)
+ 		field_name = "";
+@@ -357,8 +365,20 @@ static const struct tracing_map_ops hist
+ 	.elt_init	= hist_trigger_elt_comm_init,
+ };
+ 
+-static void destroy_hist_field(struct hist_field *hist_field)
++static void destroy_hist_field(struct hist_field *hist_field,
++			       unsigned int level)
+ {
++	unsigned int i;
++
++	if (level > 2)
++		return;
++
++	if (!hist_field)
++		return;
++
++	for (i = 0; i < HIST_FIELD_OPERANDS_MAX; i++)
++		destroy_hist_field(hist_field->operands[i], level + 1);
++
+ 	kfree(hist_field);
+ }
+ 
+@@ -385,7 +405,10 @@ static struct hist_field *create_hist_fi
+ 	}
+ 
+ 	if (flags & HIST_FIELD_FL_LOG2) {
++		unsigned long fl = flags & ~HIST_FIELD_FL_LOG2;
+ 		hist_field->fn = hist_field_log2;
++		hist_field->operands[0] = create_hist_field(field, fl);
++		hist_field->size = hist_field->operands[0]->size;
+ 		goto out;
+ 	}
+ 
+@@ -405,7 +428,7 @@ static struct hist_field *create_hist_fi
+ 		hist_field->fn = select_value_fn(field->size,
+ 						 field->is_signed);
+ 		if (!hist_field->fn) {
+-			destroy_hist_field(hist_field);
++			destroy_hist_field(hist_field, 0);
+ 			return NULL;
+ 		}
+ 	}
+@@ -422,7 +445,7 @@ static void destroy_hist_fields(struct h
+ 
+ 	for (i = 0; i < TRACING_MAP_FIELDS_MAX; i++) {
+ 		if (hist_data->fields[i]) {
+-			destroy_hist_field(hist_data->fields[i]);
++			destroy_hist_field(hist_data->fields[i], 0);
+ 			hist_data->fields[i] = NULL;
+ 		}
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0066-0009-tracing-Move-hist-trigger-Documentation-to-histogram.patch b/kernel/patches-4.14.x-rt/0066-0009-tracing-Move-hist-trigger-Documentation-to-histogram.patch
new file mode 100644
index 000000000..115c00216
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0066-0009-tracing-Move-hist-trigger-Documentation-to-histogram.patch
@@ -0,0 +1,3145 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:35 -0600
+Subject: [PATCH 09/48] tracing: Move hist trigger Documentation to
+ histogram.txt
+
+The hist trigger Documentation takes up a large part of events.txt -
+since it will be getting even larger, move it to a separate file.
+
+Link: http://lkml.kernel.org/r/92761155ea4f529e590821b1e02207fe8619f248.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 995f87b4d6ddb6bbb40309c08c3ca2a1f9f9db80)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/events.txt    | 1548 -------------------------------------
+ Documentation/trace/histogram.txt | 1568 ++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 1569 insertions(+), 1547 deletions(-)
+ create mode 100644 Documentation/trace/histogram.txt
+
+--- a/Documentation/trace/events.txt
++++ b/Documentation/trace/events.txt
+@@ -517,1550 +517,4 @@ triggers (you have to use '!' for each o
+   totals derived from one or more trace event format fields and/or
+   event counts (hitcount).
+ 
+-  The format of a hist trigger is as follows:
+-
+-        hist:keys=<field1[,field2,...]>[:values=<field1[,field2,...]>]
+-          [:sort=<field1[,field2,...]>][:size=#entries][:pause][:continue]
+-          [:clear][:name=histname1] [if <filter>]
+-
+-  When a matching event is hit, an entry is added to a hash table
+-  using the key(s) and value(s) named.  Keys and values correspond to
+-  fields in the event's format description.  Values must correspond to
+-  numeric fields - on an event hit, the value(s) will be added to a
+-  sum kept for that field.  The special string 'hitcount' can be used
+-  in place of an explicit value field - this is simply a count of
+-  event hits.  If 'values' isn't specified, an implicit 'hitcount'
+-  value will be automatically created and used as the only value.
+-  Keys can be any field, or the special string 'stacktrace', which
+-  will use the event's kernel stacktrace as the key.  The keywords
+-  'keys' or 'key' can be used to specify keys, and the keywords
+-  'values', 'vals', or 'val' can be used to specify values.  Compound
+-  keys consisting of up to two fields can be specified by the 'keys'
+-  keyword.  Hashing a compound key produces a unique entry in the
+-  table for each unique combination of component keys, and can be
+-  useful for providing more fine-grained summaries of event data.
+-  Additionally, sort keys consisting of up to two fields can be
+-  specified by the 'sort' keyword.  If more than one field is
+-  specified, the result will be a 'sort within a sort': the first key
+-  is taken to be the primary sort key and the second the secondary
+-  key.  If a hist trigger is given a name using the 'name' parameter,
+-  its histogram data will be shared with other triggers of the same
+-  name, and trigger hits will update this common data.  Only triggers
+-  with 'compatible' fields can be combined in this way; triggers are
+-  'compatible' if the fields named in the trigger share the same
+-  number and type of fields and those fields also have the same names.
+-  Note that any two events always share the compatible 'hitcount' and
+-  'stacktrace' fields and can therefore be combined using those
+-  fields, however pointless that may be.
+-
+-  'hist' triggers add a 'hist' file to each event's subdirectory.
+-  Reading the 'hist' file for the event will dump the hash table in
+-  its entirety to stdout.  If there are multiple hist triggers
+-  attached to an event, there will be a table for each trigger in the
+-  output.  The table displayed for a named trigger will be the same as
+-  any other instance having the same name. Each printed hash table
+-  entry is a simple list of the keys and values comprising the entry;
+-  keys are printed first and are delineated by curly braces, and are
+-  followed by the set of value fields for the entry.  By default,
+-  numeric fields are displayed as base-10 integers.  This can be
+-  modified by appending any of the following modifiers to the field
+-  name:
+-
+-        .hex        display a number as a hex value
+-	.sym        display an address as a symbol
+-	.sym-offset display an address as a symbol and offset
+-	.syscall    display a syscall id as a system call name
+-	.execname   display a common_pid as a program name
+-
+-  Note that in general the semantics of a given field aren't
+-  interpreted when applying a modifier to it, but there are some
+-  restrictions to be aware of in this regard:
+-
+-    - only the 'hex' modifier can be used for values (because values
+-      are essentially sums, and the other modifiers don't make sense
+-      in that context).
+-    - the 'execname' modifier can only be used on a 'common_pid'.  The
+-      reason for this is that the execname is simply the 'comm' value
+-      saved for the 'current' process when an event was triggered,
+-      which is the same as the common_pid value saved by the event
+-      tracing code.  Trying to apply that comm value to other pid
+-      values wouldn't be correct, and typically events that care save
+-      pid-specific comm fields in the event itself.
+-
+-  A typical usage scenario would be the following to enable a hist
+-  trigger, read its current contents, and then turn it off:
+-
+-  # echo 'hist:keys=skbaddr.hex:vals=len' > \
+-    /sys/kernel/debug/tracing/events/net/netif_rx/trigger
+-
+-  # cat /sys/kernel/debug/tracing/events/net/netif_rx/hist
+-
+-  # echo '!hist:keys=skbaddr.hex:vals=len' > \
+-    /sys/kernel/debug/tracing/events/net/netif_rx/trigger
+-
+-  The trigger file itself can be read to show the details of the
+-  currently attached hist trigger.  This information is also displayed
+-  at the top of the 'hist' file when read.
+-
+-  By default, the size of the hash table is 2048 entries.  The 'size'
+-  parameter can be used to specify more or fewer than that.  The units
+-  are in terms of hashtable entries - if a run uses more entries than
+-  specified, the results will show the number of 'drops', the number
+-  of hits that were ignored.  The size should be a power of 2 between
+-  128 and 131072 (any non- power-of-2 number specified will be rounded
+-  up).
+-
+-  The 'sort' parameter can be used to specify a value field to sort
+-  on.  The default if unspecified is 'hitcount' and the default sort
+-  order is 'ascending'.  To sort in the opposite direction, append
+-  .descending' to the sort key.
+-
+-  The 'pause' parameter can be used to pause an existing hist trigger
+-  or to start a hist trigger but not log any events until told to do
+-  so.  'continue' or 'cont' can be used to start or restart a paused
+-  hist trigger.
+-
+-  The 'clear' parameter will clear the contents of a running hist
+-  trigger and leave its current paused/active state.
+-
+-  Note that the 'pause', 'cont', and 'clear' parameters should be
+-  applied using 'append' shell operator ('>>') if applied to an
+-  existing trigger, rather than via the '>' operator, which will cause
+-  the trigger to be removed through truncation.
+-
+-- enable_hist/disable_hist
+-
+-  The enable_hist and disable_hist triggers can be used to have one
+-  event conditionally start and stop another event's already-attached
+-  hist trigger.  Any number of enable_hist and disable_hist triggers
+-  can be attached to a given event, allowing that event to kick off
+-  and stop aggregations on a host of other events.
+-
+-  The format is very similar to the enable/disable_event triggers:
+-
+-      enable_hist:<system>:<event>[:count]
+-      disable_hist:<system>:<event>[:count]
+-
+-  Instead of enabling or disabling the tracing of the target event
+-  into the trace buffer as the enable/disable_event triggers do, the
+-  enable/disable_hist triggers enable or disable the aggregation of
+-  the target event into a hash table.
+-
+-  A typical usage scenario for the enable_hist/disable_hist triggers
+-  would be to first set up a paused hist trigger on some event,
+-  followed by an enable_hist/disable_hist pair that turns the hist
+-  aggregation on and off when conditions of interest are hit:
+-
+-  # echo 'hist:keys=skbaddr.hex:vals=len:pause' > \
+-    /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-
+-  # echo 'enable_hist:net:netif_receive_skb if filename==/usr/bin/wget' > \
+-    /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
+-
+-  # echo 'disable_hist:net:netif_receive_skb if comm==wget' > \
+-    /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
+-
+-  The above sets up an initially paused hist trigger which is unpaused
+-  and starts aggregating events when a given program is executed, and
+-  which stops aggregating when the process exits and the hist trigger
+-  is paused again.
+-
+-  The examples below provide a more concrete illustration of the
+-  concepts and typical usage patterns discussed above.
+-
+-
+-6.2 'hist' trigger examples
+----------------------------
+-
+-  The first set of examples creates aggregations using the kmalloc
+-  event.  The fields that can be used for the hist trigger are listed
+-  in the kmalloc event's format file:
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/format
+-    name: kmalloc
+-    ID: 374
+-    format:
+-	field:unsigned short common_type;	offset:0;	size:2;	signed:0;
+-	field:unsigned char common_flags;	offset:2;	size:1;	signed:0;
+-	field:unsigned char common_preempt_count;		offset:3;	size:1;	signed:0;
+-	field:int common_pid;					offset:4;	size:4;	signed:1;
+-
+-	field:unsigned long call_site;				offset:8;	size:8;	signed:0;
+-	field:const void * ptr;					offset:16;	size:8;	signed:0;
+-	field:size_t bytes_req;					offset:24;	size:8;	signed:0;
+-	field:size_t bytes_alloc;				offset:32;	size:8;	signed:0;
+-	field:gfp_t gfp_flags;					offset:40;	size:4;	signed:0;
+-
+-  We'll start by creating a hist trigger that generates a simple table
+-  that lists the total number of bytes requested for each function in
+-  the kernel that made one or more calls to kmalloc:
+-
+-    # echo 'hist:key=call_site:val=bytes_req' > \
+-            /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-  This tells the tracing system to create a 'hist' trigger using the
+-  call_site field of the kmalloc event as the key for the table, which
+-  just means that each unique call_site address will have an entry
+-  created for it in the table.  The 'val=bytes_req' parameter tells
+-  the hist trigger that for each unique entry (call_site) in the
+-  table, it should keep a running total of the number of bytes
+-  requested by that call_site.
+-
+-  We'll let it run for awhile and then dump the contents of the 'hist'
+-  file in the kmalloc event's subdirectory (for readability, a number
+-  of entries have been omitted):
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=call_site:vals=bytes_req:sort=hitcount:size=2048 [active]
+-
+-    { call_site: 18446744072106379007 } hitcount:          1  bytes_req:        176
+-    { call_site: 18446744071579557049 } hitcount:          1  bytes_req:       1024
+-    { call_site: 18446744071580608289 } hitcount:          1  bytes_req:      16384
+-    { call_site: 18446744071581827654 } hitcount:          1  bytes_req:         24
+-    { call_site: 18446744071580700980 } hitcount:          1  bytes_req:          8
+-    { call_site: 18446744071579359876 } hitcount:          1  bytes_req:        152
+-    { call_site: 18446744071580795365 } hitcount:          3  bytes_req:        144
+-    { call_site: 18446744071581303129 } hitcount:          3  bytes_req:        144
+-    { call_site: 18446744071580713234 } hitcount:          4  bytes_req:       2560
+-    { call_site: 18446744071580933750 } hitcount:          4  bytes_req:        736
+-    .
+-    .
+-    .
+-    { call_site: 18446744072106047046 } hitcount:         69  bytes_req:       5576
+-    { call_site: 18446744071582116407 } hitcount:         73  bytes_req:       2336
+-    { call_site: 18446744072106054684 } hitcount:        136  bytes_req:     140504
+-    { call_site: 18446744072106224230 } hitcount:        136  bytes_req:      19584
+-    { call_site: 18446744072106078074 } hitcount:        153  bytes_req:       2448
+-    { call_site: 18446744072106062406 } hitcount:        153  bytes_req:      36720
+-    { call_site: 18446744071582507929 } hitcount:        153  bytes_req:      37088
+-    { call_site: 18446744072102520590 } hitcount:        273  bytes_req:      10920
+-    { call_site: 18446744071582143559 } hitcount:        358  bytes_req:        716
+-    { call_site: 18446744072106465852 } hitcount:        417  bytes_req:      56712
+-    { call_site: 18446744072102523378 } hitcount:        485  bytes_req:      27160
+-    { call_site: 18446744072099568646 } hitcount:       1676  bytes_req:      33520
+-
+-    Totals:
+-        Hits: 4610
+-        Entries: 45
+-        Dropped: 0
+-
+-  The output displays a line for each entry, beginning with the key
+-  specified in the trigger, followed by the value(s) also specified in
+-  the trigger.  At the beginning of the output is a line that displays
+-  the trigger info, which can also be displayed by reading the
+-  'trigger' file:
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-    hist:keys=call_site:vals=bytes_req:sort=hitcount:size=2048 [active]
+-
+-  At the end of the output are a few lines that display the overall
+-  totals for the run.  The 'Hits' field shows the total number of
+-  times the event trigger was hit, the 'Entries' field shows the total
+-  number of used entries in the hash table, and the 'Dropped' field
+-  shows the number of hits that were dropped because the number of
+-  used entries for the run exceeded the maximum number of entries
+-  allowed for the table (normally 0, but if not a hint that you may
+-  want to increase the size of the table using the 'size' parameter).
+-
+-  Notice in the above output that there's an extra field, 'hitcount',
+-  which wasn't specified in the trigger.  Also notice that in the
+-  trigger info output, there's a parameter, 'sort=hitcount', which
+-  wasn't specified in the trigger either.  The reason for that is that
+-  every trigger implicitly keeps a count of the total number of hits
+-  attributed to a given entry, called the 'hitcount'.  That hitcount
+-  information is explicitly displayed in the output, and in the
+-  absence of a user-specified sort parameter, is used as the default
+-  sort field.
+-
+-  The value 'hitcount' can be used in place of an explicit value in
+-  the 'values' parameter if you don't really need to have any
+-  particular field summed and are mainly interested in hit
+-  frequencies.
+-
+-  To turn the hist trigger off, simply call up the trigger in the
+-  command history and re-execute it with a '!' prepended:
+-
+-    # echo '!hist:key=call_site:val=bytes_req' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-  Finally, notice that the call_site as displayed in the output above
+-  isn't really very useful.  It's an address, but normally addresses
+-  are displayed in hex.  To have a numeric field displayed as a hex
+-  value, simply append '.hex' to the field name in the trigger:
+-
+-    # echo 'hist:key=call_site.hex:val=bytes_req' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=call_site.hex:vals=bytes_req:sort=hitcount:size=2048 [active]
+-
+-    { call_site: ffffffffa026b291 } hitcount:          1  bytes_req:        433
+-    { call_site: ffffffffa07186ff } hitcount:          1  bytes_req:        176
+-    { call_site: ffffffff811ae721 } hitcount:          1  bytes_req:      16384
+-    { call_site: ffffffff811c5134 } hitcount:          1  bytes_req:          8
+-    { call_site: ffffffffa04a9ebb } hitcount:          1  bytes_req:        511
+-    { call_site: ffffffff8122e0a6 } hitcount:          1  bytes_req:         12
+-    { call_site: ffffffff8107da84 } hitcount:          1  bytes_req:        152
+-    { call_site: ffffffff812d8246 } hitcount:          1  bytes_req:         24
+-    { call_site: ffffffff811dc1e5 } hitcount:          3  bytes_req:        144
+-    { call_site: ffffffffa02515e8 } hitcount:          3  bytes_req:        648
+-    { call_site: ffffffff81258159 } hitcount:          3  bytes_req:        144
+-    { call_site: ffffffff811c80f4 } hitcount:          4  bytes_req:        544
+-    .
+-    .
+-    .
+-    { call_site: ffffffffa06c7646 } hitcount:        106  bytes_req:       8024
+-    { call_site: ffffffffa06cb246 } hitcount:        132  bytes_req:      31680
+-    { call_site: ffffffffa06cef7a } hitcount:        132  bytes_req:       2112
+-    { call_site: ffffffff8137e399 } hitcount:        132  bytes_req:      23232
+-    { call_site: ffffffffa06c941c } hitcount:        185  bytes_req:     171360
+-    { call_site: ffffffffa06f2a66 } hitcount:        185  bytes_req:      26640
+-    { call_site: ffffffffa036a70e } hitcount:        265  bytes_req:      10600
+-    { call_site: ffffffff81325447 } hitcount:        292  bytes_req:        584
+-    { call_site: ffffffffa072da3c } hitcount:        446  bytes_req:      60656
+-    { call_site: ffffffffa036b1f2 } hitcount:        526  bytes_req:      29456
+-    { call_site: ffffffffa0099c06 } hitcount:       1780  bytes_req:      35600
+-
+-    Totals:
+-        Hits: 4775
+-        Entries: 46
+-        Dropped: 0
+-
+-  Even that's only marginally more useful - while hex values do look
+-  more like addresses, what users are typically more interested in
+-  when looking at text addresses are the corresponding symbols
+-  instead.  To have an address displayed as symbolic value instead,
+-  simply append '.sym' or '.sym-offset' to the field name in the
+-  trigger:
+-
+-    # echo 'hist:key=call_site.sym:val=bytes_req' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=call_site.sym:vals=bytes_req:sort=hitcount:size=2048 [active]
+-
+-    { call_site: [ffffffff810adcb9] syslog_print_all                              } hitcount:          1  bytes_req:       1024
+-    { call_site: [ffffffff8154bc62] usb_control_msg                               } hitcount:          1  bytes_req:          8
+-    { call_site: [ffffffffa00bf6fe] hidraw_send_report [hid]                      } hitcount:          1  bytes_req:          7
+-    { call_site: [ffffffff8154acbe] usb_alloc_urb                                 } hitcount:          1  bytes_req:        192
+-    { call_site: [ffffffffa00bf1ca] hidraw_report_event [hid]                     } hitcount:          1  bytes_req:          7
+-    { call_site: [ffffffff811e3a25] __seq_open_private                            } hitcount:          1  bytes_req:         40
+-    { call_site: [ffffffff8109524a] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128
+-    { call_site: [ffffffff811febd5] fsnotify_alloc_group                          } hitcount:          2  bytes_req:        528
+-    { call_site: [ffffffff81440f58] __tty_buffer_request_room                     } hitcount:          2  bytes_req:       2624
+-    { call_site: [ffffffff81200ba6] inotify_new_group                             } hitcount:          2  bytes_req:         96
+-    { call_site: [ffffffffa05e19af] ieee80211_start_tx_ba_session [mac80211]      } hitcount:          2  bytes_req:        464
+-    { call_site: [ffffffff81672406] tcp_get_metrics                               } hitcount:          2  bytes_req:        304
+-    { call_site: [ffffffff81097ec2] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128
+-    { call_site: [ffffffff81089b05] sched_create_group                            } hitcount:          2  bytes_req:       1424
+-    .
+-    .
+-    .
+-    { call_site: [ffffffffa04a580c] intel_crtc_page_flip [i915]                   } hitcount:       1185  bytes_req:     123240
+-    { call_site: [ffffffffa0287592] drm_mode_page_flip_ioctl [drm]                } hitcount:       1185  bytes_req:     104280
+-    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state [i915]            } hitcount:       1402  bytes_req:     190672
+-    { call_site: [ffffffff812891ca] ext4_find_extent                              } hitcount:       1518  bytes_req:     146208
+-    { call_site: [ffffffffa029070e] drm_vma_node_allow [drm]                      } hitcount:       1746  bytes_req:      69840
+-    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       2021  bytes_req:     792312
+-    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc [drm]                   } hitcount:       2592  bytes_req:     145152
+-    { call_site: [ffffffffa0489a66] intel_ring_begin [i915]                       } hitcount:       2629  bytes_req:     378576
+-    { call_site: [ffffffffa046041c] i915_gem_execbuffer2 [i915]                   } hitcount:       2629  bytes_req:    3783248
+-    { call_site: [ffffffff81325607] apparmor_file_alloc_security                  } hitcount:       5192  bytes_req:      10384
+-    { call_site: [ffffffffa00b7c06] hid_report_raw_event [hid]                    } hitcount:       5529  bytes_req:     110584
+-    { call_site: [ffffffff8131ebf7] aa_alloc_task_context                         } hitcount:      21943  bytes_req:     702176
+-    { call_site: [ffffffff8125847d] ext4_htree_store_dirent                       } hitcount:      55759  bytes_req:    5074265
+-
+-    Totals:
+-        Hits: 109928
+-        Entries: 71
+-        Dropped: 0
+-
+-  Because the default sort key above is 'hitcount', the above shows a
+-  the list of call_sites by increasing hitcount, so that at the bottom
+-  we see the functions that made the most kmalloc calls during the
+-  run.  If instead we we wanted to see the top kmalloc callers in
+-  terms of the number of bytes requested rather than the number of
+-  calls, and we wanted the top caller to appear at the top, we can use
+-  the 'sort' parameter, along with the 'descending' modifier:
+-
+-    # echo 'hist:key=call_site.sym:val=bytes_req:sort=bytes_req.descending' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=call_site.sym:vals=bytes_req:sort=bytes_req.descending:size=2048 [active]
+-
+-    { call_site: [ffffffffa046041c] i915_gem_execbuffer2 [i915]                   } hitcount:       2186  bytes_req:    3397464
+-    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       1790  bytes_req:     712176
+-    { call_site: [ffffffff8125847d] ext4_htree_store_dirent                       } hitcount:       8132  bytes_req:     513135
+-    { call_site: [ffffffff811e2a1b] seq_buf_alloc                                 } hitcount:        106  bytes_req:     440128
+-    { call_site: [ffffffffa0489a66] intel_ring_begin [i915]                       } hitcount:       2186  bytes_req:     314784
+-    { call_site: [ffffffff812891ca] ext4_find_extent                              } hitcount:       2174  bytes_req:     208992
+-    { call_site: [ffffffff811ae8e1] __kmalloc                                     } hitcount:          8  bytes_req:     131072
+-    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state [i915]            } hitcount:        859  bytes_req:     116824
+-    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc [drm]                   } hitcount:       1834  bytes_req:     102704
+-    { call_site: [ffffffffa04a580c] intel_crtc_page_flip [i915]                   } hitcount:        972  bytes_req:     101088
+-    { call_site: [ffffffffa0287592] drm_mode_page_flip_ioctl [drm]                } hitcount:        972  bytes_req:      85536
+-    { call_site: [ffffffffa00b7c06] hid_report_raw_event [hid]                    } hitcount:       3333  bytes_req:      66664
+-    { call_site: [ffffffff8137e559] sg_kmalloc                                    } hitcount:        209  bytes_req:      61632
+-    .
+-    .
+-    .
+-    { call_site: [ffffffff81095225] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128
+-    { call_site: [ffffffff81097ec2] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128
+-    { call_site: [ffffffff812d8406] copy_semundo                                  } hitcount:          2  bytes_req:         48
+-    { call_site: [ffffffff81200ba6] inotify_new_group                             } hitcount:          1  bytes_req:         48
+-    { call_site: [ffffffffa027121a] drm_getmagic [drm]                            } hitcount:          1  bytes_req:         48
+-    { call_site: [ffffffff811e3a25] __seq_open_private                            } hitcount:          1  bytes_req:         40
+-    { call_site: [ffffffff811c52f4] bprm_change_interp                            } hitcount:          2  bytes_req:         16
+-    { call_site: [ffffffff8154bc62] usb_control_msg                               } hitcount:          1  bytes_req:          8
+-    { call_site: [ffffffffa00bf1ca] hidraw_report_event [hid]                     } hitcount:          1  bytes_req:          7
+-    { call_site: [ffffffffa00bf6fe] hidraw_send_report [hid]                      } hitcount:          1  bytes_req:          7
+-
+-    Totals:
+-        Hits: 32133
+-        Entries: 81
+-        Dropped: 0
+-
+-  To display the offset and size information in addition to the symbol
+-  name, just use 'sym-offset' instead:
+-
+-    # echo 'hist:key=call_site.sym-offset:val=bytes_req:sort=bytes_req.descending' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=call_site.sym-offset:vals=bytes_req:sort=bytes_req.descending:size=2048 [active]
+-
+-    { call_site: [ffffffffa046041c] i915_gem_execbuffer2+0x6c/0x2c0 [i915]                  } hitcount:       4569  bytes_req:    3163720
+-    { call_site: [ffffffffa0489a66] intel_ring_begin+0xc6/0x1f0 [i915]                      } hitcount:       4569  bytes_req:     657936
+-    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23+0x694/0x1020 [i915]      } hitcount:       1519  bytes_req:     472936
+-    { call_site: [ffffffffa045e646] i915_gem_do_execbuffer.isra.23+0x516/0x1020 [i915]      } hitcount:       3050  bytes_req:     211832
+-    { call_site: [ffffffff811e2a1b] seq_buf_alloc+0x1b/0x50                                 } hitcount:         34  bytes_req:     148384
+-    { call_site: [ffffffffa04a580c] intel_crtc_page_flip+0xbc/0x870 [i915]                  } hitcount:       1385  bytes_req:     144040
+-    { call_site: [ffffffff811ae8e1] __kmalloc+0x191/0x1b0                                   } hitcount:          8  bytes_req:     131072
+-    { call_site: [ffffffffa0287592] drm_mode_page_flip_ioctl+0x282/0x360 [drm]              } hitcount:       1385  bytes_req:     121880
+-    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc+0x32/0x100 [drm]                  } hitcount:       1848  bytes_req:     103488
+-    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state+0x2c/0xa0 [i915]            } hitcount:        461  bytes_req:      62696
+-    { call_site: [ffffffffa029070e] drm_vma_node_allow+0x2e/0xd0 [drm]                      } hitcount:       1541  bytes_req:      61640
+-    { call_site: [ffffffff815f8d7b] sk_prot_alloc+0xcb/0x1b0                                } hitcount:         57  bytes_req:      57456
+-    .
+-    .
+-    .
+-    { call_site: [ffffffff8109524a] alloc_fair_sched_group+0x5a/0x1a0                       } hitcount:          2  bytes_req:        128
+-    { call_site: [ffffffffa027b921] drm_vm_open_locked+0x31/0xa0 [drm]                      } hitcount:          3  bytes_req:         96
+-    { call_site: [ffffffff8122e266] proc_self_follow_link+0x76/0xb0                         } hitcount:          8  bytes_req:         96
+-    { call_site: [ffffffff81213e80] load_elf_binary+0x240/0x1650                            } hitcount:          3  bytes_req:         84
+-    { call_site: [ffffffff8154bc62] usb_control_msg+0x42/0x110                              } hitcount:          1  bytes_req:          8
+-    { call_site: [ffffffffa00bf6fe] hidraw_send_report+0x7e/0x1a0 [hid]                     } hitcount:          1  bytes_req:          7
+-    { call_site: [ffffffffa00bf1ca] hidraw_report_event+0x8a/0x120 [hid]                    } hitcount:          1  bytes_req:          7
+-
+-    Totals:
+-        Hits: 26098
+-        Entries: 64
+-        Dropped: 0
+-
+-  We can also add multiple fields to the 'values' parameter.  For
+-  example, we might want to see the total number of bytes allocated
+-  alongside bytes requested, and display the result sorted by bytes
+-  allocated in a descending order:
+-
+-    # echo 'hist:keys=call_site.sym:values=bytes_req,bytes_alloc:sort=bytes_alloc.descending' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=call_site.sym:vals=bytes_req,bytes_alloc:sort=bytes_alloc.descending:size=2048 [active]
+-
+-    { call_site: [ffffffffa046041c] i915_gem_execbuffer2 [i915]                   } hitcount:       7403  bytes_req:    4084360  bytes_alloc:    5958016
+-    { call_site: [ffffffff811e2a1b] seq_buf_alloc                                 } hitcount:        541  bytes_req:    2213968  bytes_alloc:    2228224
+-    { call_site: [ffffffffa0489a66] intel_ring_begin [i915]                       } hitcount:       7404  bytes_req:    1066176  bytes_alloc:    1421568
+-    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       1565  bytes_req:     557368  bytes_alloc:    1037760
+-    { call_site: [ffffffff8125847d] ext4_htree_store_dirent                       } hitcount:       9557  bytes_req:     595778  bytes_alloc:     695744
+-    { call_site: [ffffffffa045e646] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       5839  bytes_req:     430680  bytes_alloc:     470400
+-    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state [i915]            } hitcount:       2388  bytes_req:     324768  bytes_alloc:     458496
+-    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc [drm]                   } hitcount:       3911  bytes_req:     219016  bytes_alloc:     250304
+-    { call_site: [ffffffff815f8d7b] sk_prot_alloc                                 } hitcount:        235  bytes_req:     236880  bytes_alloc:     240640
+-    { call_site: [ffffffff8137e559] sg_kmalloc                                    } hitcount:        557  bytes_req:     169024  bytes_alloc:     221760
+-    { call_site: [ffffffffa00b7c06] hid_report_raw_event [hid]                    } hitcount:       9378  bytes_req:     187548  bytes_alloc:     206312
+-    { call_site: [ffffffffa04a580c] intel_crtc_page_flip [i915]                   } hitcount:       1519  bytes_req:     157976  bytes_alloc:     194432
+-    .
+-    .
+-    .
+-    { call_site: [ffffffff8109bd3b] sched_autogroup_create_attach                 } hitcount:          2  bytes_req:        144  bytes_alloc:        192
+-    { call_site: [ffffffff81097ee8] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128  bytes_alloc:        128
+-    { call_site: [ffffffff8109524a] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128  bytes_alloc:        128
+-    { call_site: [ffffffff81095225] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128  bytes_alloc:        128
+-    { call_site: [ffffffff81097ec2] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128  bytes_alloc:        128
+-    { call_site: [ffffffff81213e80] load_elf_binary                               } hitcount:          3  bytes_req:         84  bytes_alloc:         96
+-    { call_site: [ffffffff81079a2e] kthread_create_on_node                        } hitcount:          1  bytes_req:         56  bytes_alloc:         64
+-    { call_site: [ffffffffa00bf6fe] hidraw_send_report [hid]                      } hitcount:          1  bytes_req:          7  bytes_alloc:          8
+-    { call_site: [ffffffff8154bc62] usb_control_msg                               } hitcount:          1  bytes_req:          8  bytes_alloc:          8
+-    { call_site: [ffffffffa00bf1ca] hidraw_report_event [hid]                     } hitcount:          1  bytes_req:          7  bytes_alloc:          8
+-
+-    Totals:
+-        Hits: 66598
+-        Entries: 65
+-        Dropped: 0
+-
+-  Finally, to finish off our kmalloc example, instead of simply having
+-  the hist trigger display symbolic call_sites, we can have the hist
+-  trigger additionally display the complete set of kernel stack traces
+-  that led to each call_site.  To do that, we simply use the special
+-  value 'stacktrace' for the key parameter:
+-
+-    # echo 'hist:keys=stacktrace:values=bytes_req,bytes_alloc:sort=bytes_alloc' > \
+-           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
+-
+-  The above trigger will use the kernel stack trace in effect when an
+-  event is triggered as the key for the hash table.  This allows the
+-  enumeration of every kernel callpath that led up to a particular
+-  event, along with a running total of any of the event fields for
+-  that event.  Here we tally bytes requested and bytes allocated for
+-  every callpath in the system that led up to a kmalloc (in this case
+-  every callpath to a kmalloc for a kernel compile):
+-
+-    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
+-    # trigger info: hist:keys=stacktrace:vals=bytes_req,bytes_alloc:sort=bytes_alloc:size=2048 [active]
+-
+-    { stacktrace:
+-         __kmalloc_track_caller+0x10b/0x1a0
+-         kmemdup+0x20/0x50
+-         hidraw_report_event+0x8a/0x120 [hid]
+-         hid_report_raw_event+0x3ea/0x440 [hid]
+-         hid_input_report+0x112/0x190 [hid]
+-         hid_irq_in+0xc2/0x260 [usbhid]
+-         __usb_hcd_giveback_urb+0x72/0x120
+-         usb_giveback_urb_bh+0x9e/0xe0
+-         tasklet_hi_action+0xf8/0x100
+-         __do_softirq+0x114/0x2c0
+-         irq_exit+0xa5/0xb0
+-         do_IRQ+0x5a/0xf0
+-         ret_from_intr+0x0/0x30
+-         cpuidle_enter+0x17/0x20
+-         cpu_startup_entry+0x315/0x3e0
+-         rest_init+0x7c/0x80
+-    } hitcount:          3  bytes_req:         21  bytes_alloc:         24
+-    { stacktrace:
+-         __kmalloc_track_caller+0x10b/0x1a0
+-         kmemdup+0x20/0x50
+-         hidraw_report_event+0x8a/0x120 [hid]
+-         hid_report_raw_event+0x3ea/0x440 [hid]
+-         hid_input_report+0x112/0x190 [hid]
+-         hid_irq_in+0xc2/0x260 [usbhid]
+-         __usb_hcd_giveback_urb+0x72/0x120
+-         usb_giveback_urb_bh+0x9e/0xe0
+-         tasklet_hi_action+0xf8/0x100
+-         __do_softirq+0x114/0x2c0
+-         irq_exit+0xa5/0xb0
+-         do_IRQ+0x5a/0xf0
+-         ret_from_intr+0x0/0x30
+-    } hitcount:          3  bytes_req:         21  bytes_alloc:         24
+-    { stacktrace:
+-         kmem_cache_alloc_trace+0xeb/0x150
+-         aa_alloc_task_context+0x27/0x40
+-         apparmor_cred_prepare+0x1f/0x50
+-         security_prepare_creds+0x16/0x20
+-         prepare_creds+0xdf/0x1a0
+-         SyS_capset+0xb5/0x200
+-         system_call_fastpath+0x12/0x6a
+-    } hitcount:          1  bytes_req:         32  bytes_alloc:         32
+-    .
+-    .
+-    .
+-    { stacktrace:
+-         __kmalloc+0x11b/0x1b0
+-         i915_gem_execbuffer2+0x6c/0x2c0 [i915]
+-         drm_ioctl+0x349/0x670 [drm]
+-         do_vfs_ioctl+0x2f0/0x4f0
+-         SyS_ioctl+0x81/0xa0
+-         system_call_fastpath+0x12/0x6a
+-    } hitcount:      17726  bytes_req:   13944120  bytes_alloc:   19593808
+-    { stacktrace:
+-         __kmalloc+0x11b/0x1b0
+-         load_elf_phdrs+0x76/0xa0
+-         load_elf_binary+0x102/0x1650
+-         search_binary_handler+0x97/0x1d0
+-         do_execveat_common.isra.34+0x551/0x6e0
+-         SyS_execve+0x3a/0x50
+-         return_from_execve+0x0/0x23
+-    } hitcount:      33348  bytes_req:   17152128  bytes_alloc:   20226048
+-    { stacktrace:
+-         kmem_cache_alloc_trace+0xeb/0x150
+-         apparmor_file_alloc_security+0x27/0x40
+-         security_file_alloc+0x16/0x20
+-         get_empty_filp+0x93/0x1c0
+-         path_openat+0x31/0x5f0
+-         do_filp_open+0x3a/0x90
+-         do_sys_open+0x128/0x220
+-         SyS_open+0x1e/0x20
+-         system_call_fastpath+0x12/0x6a
+-    } hitcount:    4766422  bytes_req:    9532844  bytes_alloc:   38131376
+-    { stacktrace:
+-         __kmalloc+0x11b/0x1b0
+-         seq_buf_alloc+0x1b/0x50
+-         seq_read+0x2cc/0x370
+-         proc_reg_read+0x3d/0x80
+-         __vfs_read+0x28/0xe0
+-         vfs_read+0x86/0x140
+-         SyS_read+0x46/0xb0
+-         system_call_fastpath+0x12/0x6a
+-    } hitcount:      19133  bytes_req:   78368768  bytes_alloc:   78368768
+-
+-    Totals:
+-        Hits: 6085872
+-        Entries: 253
+-        Dropped: 0
+-
+-  If you key a hist trigger on common_pid, in order for example to
+-  gather and display sorted totals for each process, you can use the
+-  special .execname modifier to display the executable names for the
+-  processes in the table rather than raw pids.  The example below
+-  keeps a per-process sum of total bytes read:
+-
+-    # echo 'hist:key=common_pid.execname:val=count:sort=count.descending' > \
+-           /sys/kernel/debug/tracing/events/syscalls/sys_enter_read/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/syscalls/sys_enter_read/hist
+-    # trigger info: hist:keys=common_pid.execname:vals=count:sort=count.descending:size=2048 [active]
+-
+-    { common_pid: gnome-terminal  [      3196] } hitcount:        280  count:    1093512
+-    { common_pid: Xorg            [      1309] } hitcount:        525  count:     256640
+-    { common_pid: compiz          [      2889] } hitcount:         59  count:     254400
+-    { common_pid: bash            [      8710] } hitcount:          3  count:      66369
+-    { common_pid: dbus-daemon-lau [      8703] } hitcount:         49  count:      47739
+-    { common_pid: irqbalance      [      1252] } hitcount:         27  count:      27648
+-    { common_pid: 01ifupdown      [      8705] } hitcount:          3  count:      17216
+-    { common_pid: dbus-daemon     [       772] } hitcount:         10  count:      12396
+-    { common_pid: Socket Thread   [      8342] } hitcount:         11  count:      11264
+-    { common_pid: nm-dhcp-client. [      8701] } hitcount:          6  count:       7424
+-    { common_pid: gmain           [      1315] } hitcount:         18  count:       6336
+-    .
+-    .
+-    .
+-    { common_pid: postgres        [      1892] } hitcount:          2  count:         32
+-    { common_pid: postgres        [      1891] } hitcount:          2  count:         32
+-    { common_pid: gmain           [      8704] } hitcount:          2  count:         32
+-    { common_pid: upstart-dbus-br [      2740] } hitcount:         21  count:         21
+-    { common_pid: nm-dispatcher.a [      8696] } hitcount:          1  count:         16
+-    { common_pid: indicator-datet [      2904] } hitcount:          1  count:         16
+-    { common_pid: gdbus           [      2998] } hitcount:          1  count:         16
+-    { common_pid: rtkit-daemon    [      2052] } hitcount:          1  count:          8
+-    { common_pid: init            [         1] } hitcount:          2  count:          2
+-
+-    Totals:
+-        Hits: 2116
+-        Entries: 51
+-        Dropped: 0
+-
+-  Similarly, if you key a hist trigger on syscall id, for example to
+-  gather and display a list of systemwide syscall hits, you can use
+-  the special .syscall modifier to display the syscall names rather
+-  than raw ids.  The example below keeps a running total of syscall
+-  counts for the system during the run:
+-
+-    # echo 'hist:key=id.syscall:val=hitcount' > \
+-           /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/hist
+-    # trigger info: hist:keys=id.syscall:vals=hitcount:sort=hitcount:size=2048 [active]
+-
+-    { id: sys_fsync                     [ 74] } hitcount:          1
+-    { id: sys_newuname                  [ 63] } hitcount:          1
+-    { id: sys_prctl                     [157] } hitcount:          1
+-    { id: sys_statfs                    [137] } hitcount:          1
+-    { id: sys_symlink                   [ 88] } hitcount:          1
+-    { id: sys_sendmmsg                  [307] } hitcount:          1
+-    { id: sys_semctl                    [ 66] } hitcount:          1
+-    { id: sys_readlink                  [ 89] } hitcount:          3
+-    { id: sys_bind                      [ 49] } hitcount:          3
+-    { id: sys_getsockname               [ 51] } hitcount:          3
+-    { id: sys_unlink                    [ 87] } hitcount:          3
+-    { id: sys_rename                    [ 82] } hitcount:          4
+-    { id: unknown_syscall               [ 58] } hitcount:          4
+-    { id: sys_connect                   [ 42] } hitcount:          4
+-    { id: sys_getpid                    [ 39] } hitcount:          4
+-    .
+-    .
+-    .
+-    { id: sys_rt_sigprocmask            [ 14] } hitcount:        952
+-    { id: sys_futex                     [202] } hitcount:       1534
+-    { id: sys_write                     [  1] } hitcount:       2689
+-    { id: sys_setitimer                 [ 38] } hitcount:       2797
+-    { id: sys_read                      [  0] } hitcount:       3202
+-    { id: sys_select                    [ 23] } hitcount:       3773
+-    { id: sys_writev                    [ 20] } hitcount:       4531
+-    { id: sys_poll                      [  7] } hitcount:       8314
+-    { id: sys_recvmsg                   [ 47] } hitcount:      13738
+-    { id: sys_ioctl                     [ 16] } hitcount:      21843
+-
+-    Totals:
+-        Hits: 67612
+-        Entries: 72
+-        Dropped: 0
+-
+-    The syscall counts above provide a rough overall picture of system
+-    call activity on the system; we can see for example that the most
+-    popular system call on this system was the 'sys_ioctl' system call.
+-
+-    We can use 'compound' keys to refine that number and provide some
+-    further insight as to which processes exactly contribute to the
+-    overall ioctl count.
+-
+-    The command below keeps a hitcount for every unique combination of
+-    system call id and pid - the end result is essentially a table
+-    that keeps a per-pid sum of system call hits.  The results are
+-    sorted using the system call id as the primary key, and the
+-    hitcount sum as the secondary key:
+-
+-    # echo 'hist:key=id.syscall,common_pid.execname:val=hitcount:sort=id,hitcount' > \
+-           /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/hist
+-    # trigger info: hist:keys=id.syscall,common_pid.execname:vals=hitcount:sort=id.syscall,hitcount:size=2048 [active]
+-
+-    { id: sys_read                      [  0], common_pid: rtkit-daemon    [      1877] } hitcount:          1
+-    { id: sys_read                      [  0], common_pid: gdbus           [      2976] } hitcount:          1
+-    { id: sys_read                      [  0], common_pid: console-kit-dae [      3400] } hitcount:          1
+-    { id: sys_read                      [  0], common_pid: postgres        [      1865] } hitcount:          1
+-    { id: sys_read                      [  0], common_pid: deja-dup-monito [      3543] } hitcount:          2
+-    { id: sys_read                      [  0], common_pid: NetworkManager  [       890] } hitcount:          2
+-    { id: sys_read                      [  0], common_pid: evolution-calen [      3048] } hitcount:          2
+-    { id: sys_read                      [  0], common_pid: postgres        [      1864] } hitcount:          2
+-    { id: sys_read                      [  0], common_pid: nm-applet       [      3022] } hitcount:          2
+-    { id: sys_read                      [  0], common_pid: whoopsie        [      1212] } hitcount:          2
+-    .
+-    .
+-    .
+-    { id: sys_ioctl                     [ 16], common_pid: bash            [      8479] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: bash            [      3472] } hitcount:         12
+-    { id: sys_ioctl                     [ 16], common_pid: gnome-terminal  [      3199] } hitcount:         16
+-    { id: sys_ioctl                     [ 16], common_pid: Xorg            [      1267] } hitcount:       1808
+-    { id: sys_ioctl                     [ 16], common_pid: compiz          [      2994] } hitcount:       5580
+-    .
+-    .
+-    .
+-    { id: sys_waitid                    [247], common_pid: upstart-dbus-br [      2690] } hitcount:          3
+-    { id: sys_waitid                    [247], common_pid: upstart-dbus-br [      2688] } hitcount:         16
+-    { id: sys_inotify_add_watch         [254], common_pid: gmain           [       975] } hitcount:          2
+-    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      3204] } hitcount:          4
+-    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      2888] } hitcount:          4
+-    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      3003] } hitcount:          4
+-    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      2873] } hitcount:          4
+-    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      3196] } hitcount:          6
+-    { id: sys_openat                    [257], common_pid: java            [      2623] } hitcount:          2
+-    { id: sys_eventfd2                  [290], common_pid: ibus-ui-gtk3    [      2760] } hitcount:          4
+-    { id: sys_eventfd2                  [290], common_pid: compiz          [      2994] } hitcount:          6
+-
+-    Totals:
+-        Hits: 31536
+-        Entries: 323
+-        Dropped: 0
+-
+-    The above list does give us a breakdown of the ioctl syscall by
+-    pid, but it also gives us quite a bit more than that, which we
+-    don't really care about at the moment.  Since we know the syscall
+-    id for sys_ioctl (16, displayed next to the sys_ioctl name), we
+-    can use that to filter out all the other syscalls:
+-
+-    # echo 'hist:key=id.syscall,common_pid.execname:val=hitcount:sort=id,hitcount if id == 16' > \
+-           /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/hist
+-    # trigger info: hist:keys=id.syscall,common_pid.execname:vals=hitcount:sort=id.syscall,hitcount:size=2048 if id == 16 [active]
+-
+-    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2769] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: evolution-addre [      8571] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: gmain           [      3003] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2781] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2829] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: bash            [      8726] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: bash            [      8508] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2970] } hitcount:          1
+-    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2768] } hitcount:          1
+-    .
+-    .
+-    .
+-    { id: sys_ioctl                     [ 16], common_pid: pool            [      8559] } hitcount:         45
+-    { id: sys_ioctl                     [ 16], common_pid: pool            [      8555] } hitcount:         48
+-    { id: sys_ioctl                     [ 16], common_pid: pool            [      8551] } hitcount:         48
+-    { id: sys_ioctl                     [ 16], common_pid: avahi-daemon    [       896] } hitcount:         66
+-    { id: sys_ioctl                     [ 16], common_pid: Xorg            [      1267] } hitcount:      26674
+-    { id: sys_ioctl                     [ 16], common_pid: compiz          [      2994] } hitcount:      73443
+-
+-    Totals:
+-        Hits: 101162
+-        Entries: 103
+-        Dropped: 0
+-
+-    The above output shows that 'compiz' and 'Xorg' are far and away
+-    the heaviest ioctl callers (which might lead to questions about
+-    whether they really need to be making all those calls and to
+-    possible avenues for further investigation.)
+-
+-    The compound key examples used a key and a sum value (hitcount) to
+-    sort the output, but we can just as easily use two keys instead.
+-    Here's an example where we use a compound key composed of the the
+-    common_pid and size event fields.  Sorting with pid as the primary
+-    key and 'size' as the secondary key allows us to display an
+-    ordered summary of the recvfrom sizes, with counts, received by
+-    each process:
+-
+-    # echo 'hist:key=common_pid.execname,size:val=hitcount:sort=common_pid,size' > \
+-           /sys/kernel/debug/tracing/events/syscalls/sys_enter_recvfrom/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/syscalls/sys_enter_recvfrom/hist
+-    # trigger info: hist:keys=common_pid.execname,size:vals=hitcount:sort=common_pid.execname,size:size=2048 [active]
+-
+-    { common_pid: smbd            [       784], size:          4 } hitcount:          1
+-    { common_pid: dnsmasq         [      1412], size:       4096 } hitcount:        672
+-    { common_pid: postgres        [      1796], size:       1000 } hitcount:          6
+-    { common_pid: postgres        [      1867], size:       1000 } hitcount:         10
+-    { common_pid: bamfdaemon      [      2787], size:         28 } hitcount:          2
+-    { common_pid: bamfdaemon      [      2787], size:      14360 } hitcount:          1
+-    { common_pid: compiz          [      2994], size:          8 } hitcount:          1
+-    { common_pid: compiz          [      2994], size:         20 } hitcount:         11
+-    { common_pid: gnome-terminal  [      3199], size:          4 } hitcount:          2
+-    { common_pid: firefox         [      8817], size:          4 } hitcount:          1
+-    { common_pid: firefox         [      8817], size:          8 } hitcount:          5
+-    { common_pid: firefox         [      8817], size:        588 } hitcount:          2
+-    { common_pid: firefox         [      8817], size:        628 } hitcount:          1
+-    { common_pid: firefox         [      8817], size:       6944 } hitcount:          1
+-    { common_pid: firefox         [      8817], size:     408880 } hitcount:          2
+-    { common_pid: firefox         [      8822], size:          8 } hitcount:          2
+-    { common_pid: firefox         [      8822], size:        160 } hitcount:          2
+-    { common_pid: firefox         [      8822], size:        320 } hitcount:          2
+-    { common_pid: firefox         [      8822], size:        352 } hitcount:          1
+-    .
+-    .
+-    .
+-    { common_pid: pool            [      8923], size:       1960 } hitcount:         10
+-    { common_pid: pool            [      8923], size:       2048 } hitcount:         10
+-    { common_pid: pool            [      8924], size:       1960 } hitcount:         10
+-    { common_pid: pool            [      8924], size:       2048 } hitcount:         10
+-    { common_pid: pool            [      8928], size:       1964 } hitcount:          4
+-    { common_pid: pool            [      8928], size:       1965 } hitcount:          2
+-    { common_pid: pool            [      8928], size:       2048 } hitcount:          6
+-    { common_pid: pool            [      8929], size:       1982 } hitcount:          1
+-    { common_pid: pool            [      8929], size:       2048 } hitcount:          1
+-
+-    Totals:
+-        Hits: 2016
+-        Entries: 224
+-        Dropped: 0
+-
+-  The above example also illustrates the fact that although a compound
+-  key is treated as a single entity for hashing purposes, the sub-keys
+-  it's composed of can be accessed independently.
+-
+-  The next example uses a string field as the hash key and
+-  demonstrates how you can manually pause and continue a hist trigger.
+-  In this example, we'll aggregate fork counts and don't expect a
+-  large number of entries in the hash table, so we'll drop it to a
+-  much smaller number, say 256:
+-
+-    # echo 'hist:key=child_comm:val=hitcount:size=256' > \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
+-    # trigger info: hist:keys=child_comm:vals=hitcount:sort=hitcount:size=256 [active]
+-
+-    { child_comm: dconf worker                        } hitcount:          1
+-    { child_comm: ibus-daemon                         } hitcount:          1
+-    { child_comm: whoopsie                            } hitcount:          1
+-    { child_comm: smbd                                } hitcount:          1
+-    { child_comm: gdbus                               } hitcount:          1
+-    { child_comm: kthreadd                            } hitcount:          1
+-    { child_comm: dconf worker                        } hitcount:          1
+-    { child_comm: evolution-alarm                     } hitcount:          2
+-    { child_comm: Socket Thread                       } hitcount:          2
+-    { child_comm: postgres                            } hitcount:          2
+-    { child_comm: bash                                } hitcount:          3
+-    { child_comm: compiz                              } hitcount:          3
+-    { child_comm: evolution-sourc                     } hitcount:          4
+-    { child_comm: dhclient                            } hitcount:          4
+-    { child_comm: pool                                } hitcount:          5
+-    { child_comm: nm-dispatcher.a                     } hitcount:          8
+-    { child_comm: firefox                             } hitcount:          8
+-    { child_comm: dbus-daemon                         } hitcount:          8
+-    { child_comm: glib-pacrunner                      } hitcount:         10
+-    { child_comm: evolution                           } hitcount:         23
+-
+-    Totals:
+-        Hits: 89
+-        Entries: 20
+-        Dropped: 0
+-
+-  If we want to pause the hist trigger, we can simply append :pause to
+-  the command that started the trigger.  Notice that the trigger info
+-  displays as [paused]:
+-
+-    # echo 'hist:key=child_comm:val=hitcount:size=256:pause' >> \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
+-    # trigger info: hist:keys=child_comm:vals=hitcount:sort=hitcount:size=256 [paused]
+-
+-    { child_comm: dconf worker                        } hitcount:          1
+-    { child_comm: kthreadd                            } hitcount:          1
+-    { child_comm: dconf worker                        } hitcount:          1
+-    { child_comm: gdbus                               } hitcount:          1
+-    { child_comm: ibus-daemon                         } hitcount:          1
+-    { child_comm: Socket Thread                       } hitcount:          2
+-    { child_comm: evolution-alarm                     } hitcount:          2
+-    { child_comm: smbd                                } hitcount:          2
+-    { child_comm: bash                                } hitcount:          3
+-    { child_comm: whoopsie                            } hitcount:          3
+-    { child_comm: compiz                              } hitcount:          3
+-    { child_comm: evolution-sourc                     } hitcount:          4
+-    { child_comm: pool                                } hitcount:          5
+-    { child_comm: postgres                            } hitcount:          6
+-    { child_comm: firefox                             } hitcount:          8
+-    { child_comm: dhclient                            } hitcount:         10
+-    { child_comm: emacs                               } hitcount:         12
+-    { child_comm: dbus-daemon                         } hitcount:         20
+-    { child_comm: nm-dispatcher.a                     } hitcount:         20
+-    { child_comm: evolution                           } hitcount:         35
+-    { child_comm: glib-pacrunner                      } hitcount:         59
+-
+-    Totals:
+-        Hits: 199
+-        Entries: 21
+-        Dropped: 0
+-
+-  To manually continue having the trigger aggregate events, append
+-  :cont instead.  Notice that the trigger info displays as [active]
+-  again, and the data has changed:
+-
+-    # echo 'hist:key=child_comm:val=hitcount:size=256:cont' >> \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
+-
+-    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
+-    # trigger info: hist:keys=child_comm:vals=hitcount:sort=hitcount:size=256 [active]
+-
+-    { child_comm: dconf worker                        } hitcount:          1
+-    { child_comm: dconf worker                        } hitcount:          1
+-    { child_comm: kthreadd                            } hitcount:          1
+-    { child_comm: gdbus                               } hitcount:          1
+-    { child_comm: ibus-daemon                         } hitcount:          1
+-    { child_comm: Socket Thread                       } hitcount:          2
+-    { child_comm: evolution-alarm                     } hitcount:          2
+-    { child_comm: smbd                                } hitcount:          2
+-    { child_comm: whoopsie                            } hitcount:          3
+-    { child_comm: compiz                              } hitcount:          3
+-    { child_comm: evolution-sourc                     } hitcount:          4
+-    { child_comm: bash                                } hitcount:          5
+-    { child_comm: pool                                } hitcount:          5
+-    { child_comm: postgres                            } hitcount:          6
+-    { child_comm: firefox                             } hitcount:          8
+-    { child_comm: dhclient                            } hitcount:         11
+-    { child_comm: emacs                               } hitcount:         12
+-    { child_comm: dbus-daemon                         } hitcount:         22
+-    { child_comm: nm-dispatcher.a                     } hitcount:         22
+-    { child_comm: evolution                           } hitcount:         35
+-    { child_comm: glib-pacrunner                      } hitcount:         59
+-
+-    Totals:
+-        Hits: 206
+-        Entries: 21
+-        Dropped: 0
+-
+-  The previous example showed how to start and stop a hist trigger by
+-  appending 'pause' and 'continue' to the hist trigger command.  A
+-  hist trigger can also be started in a paused state by initially
+-  starting the trigger with ':pause' appended.  This allows you to
+-  start the trigger only when you're ready to start collecting data
+-  and not before.  For example, you could start the trigger in a
+-  paused state, then unpause it and do something you want to measure,
+-  then pause the trigger again when done.
+-
+-  Of course, doing this manually can be difficult and error-prone, but
+-  it is possible to automatically start and stop a hist trigger based
+-  on some condition, via the enable_hist and disable_hist triggers.
+-
+-  For example, suppose we wanted to take a look at the relative
+-  weights in terms of skb length for each callpath that leads to a
+-  netif_receieve_skb event when downloading a decent-sized file using
+-  wget.
+-
+-  First we set up an initially paused stacktrace trigger on the
+-  netif_receive_skb event:
+-
+-    # echo 'hist:key=stacktrace:vals=len:pause' > \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-
+-  Next, we set up an 'enable_hist' trigger on the sched_process_exec
+-  event, with an 'if filename==/usr/bin/wget' filter.  The effect of
+-  this new trigger is that it will 'unpause' the hist trigger we just
+-  set up on netif_receive_skb if and only if it sees a
+-  sched_process_exec event with a filename of '/usr/bin/wget'.  When
+-  that happens, all netif_receive_skb events are aggregated into a
+-  hash table keyed on stacktrace:
+-
+-    # echo 'enable_hist:net:netif_receive_skb if filename==/usr/bin/wget' > \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
+-
+-  The aggregation continues until the netif_receive_skb is paused
+-  again, which is what the following disable_hist event does by
+-  creating a similar setup on the sched_process_exit event, using the
+-  filter 'comm==wget':
+-
+-    # echo 'disable_hist:net:netif_receive_skb if comm==wget' > \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
+-
+-  Whenever a process exits and the comm field of the disable_hist
+-  trigger filter matches 'comm==wget', the netif_receive_skb hist
+-  trigger is disabled.
+-
+-  The overall effect is that netif_receive_skb events are aggregated
+-  into the hash table for only the duration of the wget.  Executing a
+-  wget command and then listing the 'hist' file will display the
+-  output generated by the wget command:
+-
+-    $ wget https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.19.xz
+-
+-    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist
+-    # trigger info: hist:keys=stacktrace:vals=len:sort=hitcount:size=2048 [paused]
+-
+-    { stacktrace:
+-         __netif_receive_skb_core+0x46d/0x990
+-         __netif_receive_skb+0x18/0x60
+-         netif_receive_skb_internal+0x23/0x90
+-         napi_gro_receive+0xc8/0x100
+-         ieee80211_deliver_skb+0xd6/0x270 [mac80211]
+-         ieee80211_rx_handlers+0xccf/0x22f0 [mac80211]
+-         ieee80211_prepare_and_rx_handle+0x4e7/0xc40 [mac80211]
+-         ieee80211_rx+0x31d/0x900 [mac80211]
+-         iwlagn_rx_reply_rx+0x3db/0x6f0 [iwldvm]
+-         iwl_rx_dispatch+0x8e/0xf0 [iwldvm]
+-         iwl_pcie_irq_handler+0xe3c/0x12f0 [iwlwifi]
+-         irq_thread_fn+0x20/0x50
+-         irq_thread+0x11f/0x150
+-         kthread+0xd2/0xf0
+-         ret_from_fork+0x42/0x70
+-    } hitcount:         85  len:      28884
+-    { stacktrace:
+-         __netif_receive_skb_core+0x46d/0x990
+-         __netif_receive_skb+0x18/0x60
+-         netif_receive_skb_internal+0x23/0x90
+-         napi_gro_complete+0xa4/0xe0
+-         dev_gro_receive+0x23a/0x360
+-         napi_gro_receive+0x30/0x100
+-         ieee80211_deliver_skb+0xd6/0x270 [mac80211]
+-         ieee80211_rx_handlers+0xccf/0x22f0 [mac80211]
+-         ieee80211_prepare_and_rx_handle+0x4e7/0xc40 [mac80211]
+-         ieee80211_rx+0x31d/0x900 [mac80211]
+-         iwlagn_rx_reply_rx+0x3db/0x6f0 [iwldvm]
+-         iwl_rx_dispatch+0x8e/0xf0 [iwldvm]
+-         iwl_pcie_irq_handler+0xe3c/0x12f0 [iwlwifi]
+-         irq_thread_fn+0x20/0x50
+-         irq_thread+0x11f/0x150
+-         kthread+0xd2/0xf0
+-    } hitcount:         98  len:     664329
+-    { stacktrace:
+-         __netif_receive_skb_core+0x46d/0x990
+-         __netif_receive_skb+0x18/0x60
+-         process_backlog+0xa8/0x150
+-         net_rx_action+0x15d/0x340
+-         __do_softirq+0x114/0x2c0
+-         do_softirq_own_stack+0x1c/0x30
+-         do_softirq+0x65/0x70
+-         __local_bh_enable_ip+0xb5/0xc0
+-         ip_finish_output+0x1f4/0x840
+-         ip_output+0x6b/0xc0
+-         ip_local_out_sk+0x31/0x40
+-         ip_send_skb+0x1a/0x50
+-         udp_send_skb+0x173/0x2a0
+-         udp_sendmsg+0x2bf/0x9f0
+-         inet_sendmsg+0x64/0xa0
+-         sock_sendmsg+0x3d/0x50
+-    } hitcount:        115  len:      13030
+-    { stacktrace:
+-         __netif_receive_skb_core+0x46d/0x990
+-         __netif_receive_skb+0x18/0x60
+-         netif_receive_skb_internal+0x23/0x90
+-         napi_gro_complete+0xa4/0xe0
+-         napi_gro_flush+0x6d/0x90
+-         iwl_pcie_irq_handler+0x92a/0x12f0 [iwlwifi]
+-         irq_thread_fn+0x20/0x50
+-         irq_thread+0x11f/0x150
+-         kthread+0xd2/0xf0
+-         ret_from_fork+0x42/0x70
+-    } hitcount:        934  len:    5512212
+-
+-    Totals:
+-        Hits: 1232
+-        Entries: 4
+-        Dropped: 0
+-
+-  The above shows all the netif_receive_skb callpaths and their total
+-  lengths for the duration of the wget command.
+-
+-  The 'clear' hist trigger param can be used to clear the hash table.
+-  Suppose we wanted to try another run of the previous example but
+-  this time also wanted to see the complete list of events that went
+-  into the histogram.  In order to avoid having to set everything up
+-  again, we can just clear the histogram first:
+-
+-    # echo 'hist:key=stacktrace:vals=len:clear' >> \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-
+-  Just to verify that it is in fact cleared, here's what we now see in
+-  the hist file:
+-
+-    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist
+-    # trigger info: hist:keys=stacktrace:vals=len:sort=hitcount:size=2048 [paused]
+-
+-    Totals:
+-        Hits: 0
+-        Entries: 0
+-        Dropped: 0
+-
+-  Since we want to see the detailed list of every netif_receive_skb
+-  event occurring during the new run, which are in fact the same
+-  events being aggregated into the hash table, we add some additional
+-  'enable_event' events to the triggering sched_process_exec and
+-  sched_process_exit events as such:
+-
+-    # echo 'enable_event:net:netif_receive_skb if filename==/usr/bin/wget' > \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
+-
+-    # echo 'disable_event:net:netif_receive_skb if comm==wget' > \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
+-
+-  If you read the trigger files for the sched_process_exec and
+-  sched_process_exit triggers, you should see two triggers for each:
+-  one enabling/disabling the hist aggregation and the other
+-  enabling/disabling the logging of events:
+-
+-    # cat /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
+-    enable_event:net:netif_receive_skb:unlimited if filename==/usr/bin/wget
+-    enable_hist:net:netif_receive_skb:unlimited if filename==/usr/bin/wget
+-
+-    # cat /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
+-    enable_event:net:netif_receive_skb:unlimited if comm==wget
+-    disable_hist:net:netif_receive_skb:unlimited if comm==wget
+-
+-  In other words, whenever either of the sched_process_exec or
+-  sched_process_exit events is hit and matches 'wget', it enables or
+-  disables both the histogram and the event log, and what you end up
+-  with is a hash table and set of events just covering the specified
+-  duration.  Run the wget command again:
+-
+-    $ wget https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.19.xz
+-
+-  Displaying the 'hist' file should show something similar to what you
+-  saw in the last run, but this time you should also see the
+-  individual events in the trace file:
+-
+-    # cat /sys/kernel/debug/tracing/trace
+-
+-    # tracer: nop
+-    #
+-    # entries-in-buffer/entries-written: 183/1426   #P:4
+-    #
+-    #                              _-----=> irqs-off
+-    #                             / _----=> need-resched
+-    #                            | / _---=> hardirq/softirq
+-    #                            || / _--=> preempt-depth
+-    #                            ||| /     delay
+-    #           TASK-PID   CPU#  ||||    TIMESTAMP  FUNCTION
+-    #              | |       |   ||||       |         |
+-                wget-15108 [000] ..s1 31769.606929: netif_receive_skb: dev=lo skbaddr=ffff88009c353100 len=60
+-                wget-15108 [000] ..s1 31769.606999: netif_receive_skb: dev=lo skbaddr=ffff88009c353200 len=60
+-             dnsmasq-1382  [000] ..s1 31769.677652: netif_receive_skb: dev=lo skbaddr=ffff88009c352b00 len=130
+-             dnsmasq-1382  [000] ..s1 31769.685917: netif_receive_skb: dev=lo skbaddr=ffff88009c352200 len=138
+-    ##### CPU 2 buffer started ####
+-      irq/29-iwlwifi-559   [002] ..s. 31772.031529: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d433d00 len=2948
+-      irq/29-iwlwifi-559   [002] ..s. 31772.031572: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d432200 len=1500
+-      irq/29-iwlwifi-559   [002] ..s. 31772.032196: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d433100 len=2948
+-      irq/29-iwlwifi-559   [002] ..s. 31772.032761: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d433000 len=2948
+-      irq/29-iwlwifi-559   [002] ..s. 31772.033220: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d432e00 len=1500
+-    .
+-    .
+-    .
+-
+-  The following example demonstrates how multiple hist triggers can be
+-  attached to a given event.  This capability can be useful for
+-  creating a set of different summaries derived from the same set of
+-  events, or for comparing the effects of different filters, among
+-  other things.
+-
+-    # echo 'hist:keys=skbaddr.hex:vals=len if len < 0' >> \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-    # echo 'hist:keys=skbaddr.hex:vals=len if len > 4096' >> \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-    # echo 'hist:keys=skbaddr.hex:vals=len if len == 256' >> \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-    # echo 'hist:keys=skbaddr.hex:vals=len' >> \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-    # echo 'hist:keys=len:vals=common_preempt_count' >> \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-
+-  The above set of commands create four triggers differing only in
+-  their filters, along with a completely different though fairly
+-  nonsensical trigger.  Note that in order to append multiple hist
+-  triggers to the same file, you should use the '>>' operator to
+-  append them ('>' will also add the new hist trigger, but will remove
+-  any existing hist triggers beforehand).
+-
+-  Displaying the contents of the 'hist' file for the event shows the
+-  contents of all five histograms:
+-
+-    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:keys=len:vals=hitcount,common_preempt_count:sort=hitcount:size=2048 [active]
+-    #
+-
+-    { len:        176 } hitcount:          1  common_preempt_count:          0
+-    { len:        223 } hitcount:          1  common_preempt_count:          0
+-    { len:       4854 } hitcount:          1  common_preempt_count:          0
+-    { len:        395 } hitcount:          1  common_preempt_count:          0
+-    { len:        177 } hitcount:          1  common_preempt_count:          0
+-    { len:        446 } hitcount:          1  common_preempt_count:          0
+-    { len:       1601 } hitcount:          1  common_preempt_count:          0
+-    .
+-    .
+-    .
+-    { len:       1280 } hitcount:         66  common_preempt_count:          0
+-    { len:        116 } hitcount:         81  common_preempt_count:         40
+-    { len:        708 } hitcount:        112  common_preempt_count:          0
+-    { len:         46 } hitcount:        221  common_preempt_count:          0
+-    { len:       1264 } hitcount:        458  common_preempt_count:          0
+-
+-    Totals:
+-        Hits: 1428
+-        Entries: 147
+-        Dropped: 0
+-
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 [active]
+-    #
+-
+-    { skbaddr: ffff8800baee5e00 } hitcount:          1  len:        130
+-    { skbaddr: ffff88005f3d5600 } hitcount:          1  len:       1280
+-    { skbaddr: ffff88005f3d4900 } hitcount:          1  len:       1280
+-    { skbaddr: ffff88009fed6300 } hitcount:          1  len:        115
+-    { skbaddr: ffff88009fe0ad00 } hitcount:          1  len:        115
+-    { skbaddr: ffff88008cdb1900 } hitcount:          1  len:         46
+-    { skbaddr: ffff880064b5ef00 } hitcount:          1  len:        118
+-    { skbaddr: ffff880044e3c700 } hitcount:          1  len:         60
+-    { skbaddr: ffff880100065900 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d46bd500 } hitcount:          1  len:        116
+-    { skbaddr: ffff88005f3d5f00 } hitcount:          1  len:       1280
+-    { skbaddr: ffff880100064700 } hitcount:          1  len:        365
+-    { skbaddr: ffff8800badb6f00 } hitcount:          1  len:         60
+-    .
+-    .
+-    .
+-    { skbaddr: ffff88009fe0be00 } hitcount:         27  len:      24677
+-    { skbaddr: ffff88009fe0a400 } hitcount:         27  len:      23052
+-    { skbaddr: ffff88009fe0b700 } hitcount:         31  len:      25589
+-    { skbaddr: ffff88009fe0b600 } hitcount:         32  len:      27326
+-    { skbaddr: ffff88006a462800 } hitcount:         68  len:      71678
+-    { skbaddr: ffff88006a463700 } hitcount:         70  len:      72678
+-    { skbaddr: ffff88006a462b00 } hitcount:         71  len:      77589
+-    { skbaddr: ffff88006a463600 } hitcount:         73  len:      71307
+-    { skbaddr: ffff88006a462200 } hitcount:         81  len:      81032
+-
+-    Totals:
+-        Hits: 1451
+-        Entries: 318
+-        Dropped: 0
+-
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 if len == 256 [active]
+-    #
+-
+-
+-    Totals:
+-        Hits: 0
+-        Entries: 0
+-        Dropped: 0
+-
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 if len > 4096 [active]
+-    #
+-
+-    { skbaddr: ffff88009fd2c300 } hitcount:          1  len:       7212
+-    { skbaddr: ffff8800d2bcce00 } hitcount:          1  len:       7212
+-    { skbaddr: ffff8800d2bcd700 } hitcount:          1  len:       7212
+-    { skbaddr: ffff8800d2bcda00 } hitcount:          1  len:      21492
+-    { skbaddr: ffff8800ae2e2d00 } hitcount:          1  len:       7212
+-    { skbaddr: ffff8800d2bcdb00 } hitcount:          1  len:       7212
+-    { skbaddr: ffff88006a4df500 } hitcount:          1  len:       4854
+-    { skbaddr: ffff88008ce47b00 } hitcount:          1  len:      18636
+-    { skbaddr: ffff8800ae2e2200 } hitcount:          1  len:      12924
+-    { skbaddr: ffff88005f3e1000 } hitcount:          1  len:       4356
+-    { skbaddr: ffff8800d2bcdc00 } hitcount:          2  len:      24420
+-    { skbaddr: ffff8800d2bcc200 } hitcount:          2  len:      12996
+-
+-    Totals:
+-        Hits: 14
+-        Entries: 12
+-        Dropped: 0
+-
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 if len < 0 [active]
+-    #
+-
+-
+-    Totals:
+-        Hits: 0
+-        Entries: 0
+-        Dropped: 0
+-
+-  Named triggers can be used to have triggers share a common set of
+-  histogram data.  This capability is mostly useful for combining the
+-  output of events generated by tracepoints contained inside inline
+-  functions, but names can be used in a hist trigger on any event.
+-  For example, these two triggers when hit will update the same 'len'
+-  field in the shared 'foo' histogram data:
+-
+-    # echo 'hist:name=foo:keys=skbaddr.hex:vals=len' > \
+-           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
+-    # echo 'hist:name=foo:keys=skbaddr.hex:vals=len' > \
+-           /sys/kernel/debug/tracing/events/net/netif_rx/trigger
+-
+-  You can see that they're updating common histogram data by reading
+-  each event's hist files at the same time:
+-
+-    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist;
+-      cat /sys/kernel/debug/tracing/events/net/netif_rx/hist
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:name=foo:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 [active]
+-    #
+-
+-    { skbaddr: ffff88000ad53500 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800af5a1500 } hitcount:          1  len:         76
+-    { skbaddr: ffff8800d62a1900 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bccb00 } hitcount:          1  len:        468
+-    { skbaddr: ffff8800d3c69900 } hitcount:          1  len:         46
+-    { skbaddr: ffff88009ff09100 } hitcount:          1  len:         52
+-    { skbaddr: ffff88010f13ab00 } hitcount:          1  len:        168
+-    { skbaddr: ffff88006a54f400 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bcc500 } hitcount:          1  len:        260
+-    { skbaddr: ffff880064505000 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800baf24e00 } hitcount:          1  len:         32
+-    { skbaddr: ffff88009fe0ad00 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d3edff00 } hitcount:          1  len:         44
+-    { skbaddr: ffff88009fe0b400 } hitcount:          1  len:        168
+-    { skbaddr: ffff8800a1c55a00 } hitcount:          1  len:         40
+-    { skbaddr: ffff8800d2bcd100 } hitcount:          1  len:         40
+-    { skbaddr: ffff880064505f00 } hitcount:          1  len:        174
+-    { skbaddr: ffff8800a8bff200 } hitcount:          1  len:        160
+-    { skbaddr: ffff880044e3cc00 } hitcount:          1  len:         76
+-    { skbaddr: ffff8800a8bfe700 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bcdc00 } hitcount:          1  len:         32
+-    { skbaddr: ffff8800a1f64800 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bcde00 } hitcount:          1  len:        988
+-    { skbaddr: ffff88006a5dea00 } hitcount:          1  len:         46
+-    { skbaddr: ffff88002e37a200 } hitcount:          1  len:         44
+-    { skbaddr: ffff8800a1f32c00 } hitcount:          2  len:        676
+-    { skbaddr: ffff88000ad52600 } hitcount:          2  len:        107
+-    { skbaddr: ffff8800a1f91e00 } hitcount:          2  len:         92
+-    { skbaddr: ffff8800af5a0200 } hitcount:          2  len:        142
+-    { skbaddr: ffff8800d2bcc600 } hitcount:          2  len:        220
+-    { skbaddr: ffff8800ba36f500 } hitcount:          2  len:         92
+-    { skbaddr: ffff8800d021f800 } hitcount:          2  len:         92
+-    { skbaddr: ffff8800a1f33600 } hitcount:          2  len:        675
+-    { skbaddr: ffff8800a8bfff00 } hitcount:          3  len:        138
+-    { skbaddr: ffff8800d62a1300 } hitcount:          3  len:        138
+-    { skbaddr: ffff88002e37a100 } hitcount:          4  len:        184
+-    { skbaddr: ffff880064504400 } hitcount:          4  len:        184
+-    { skbaddr: ffff8800a8bfec00 } hitcount:          4  len:        184
+-    { skbaddr: ffff88000ad53700 } hitcount:          5  len:        230
+-    { skbaddr: ffff8800d2bcdb00 } hitcount:          5  len:        196
+-    { skbaddr: ffff8800a1f90000 } hitcount:          6  len:        276
+-    { skbaddr: ffff88006a54f900 } hitcount:          6  len:        276
+-
+-    Totals:
+-        Hits: 81
+-        Entries: 42
+-        Dropped: 0
+-    # event histogram
+-    #
+-    # trigger info: hist:name=foo:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 [active]
+-    #
+-
+-    { skbaddr: ffff88000ad53500 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800af5a1500 } hitcount:          1  len:         76
+-    { skbaddr: ffff8800d62a1900 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bccb00 } hitcount:          1  len:        468
+-    { skbaddr: ffff8800d3c69900 } hitcount:          1  len:         46
+-    { skbaddr: ffff88009ff09100 } hitcount:          1  len:         52
+-    { skbaddr: ffff88010f13ab00 } hitcount:          1  len:        168
+-    { skbaddr: ffff88006a54f400 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bcc500 } hitcount:          1  len:        260
+-    { skbaddr: ffff880064505000 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800baf24e00 } hitcount:          1  len:         32
+-    { skbaddr: ffff88009fe0ad00 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d3edff00 } hitcount:          1  len:         44
+-    { skbaddr: ffff88009fe0b400 } hitcount:          1  len:        168
+-    { skbaddr: ffff8800a1c55a00 } hitcount:          1  len:         40
+-    { skbaddr: ffff8800d2bcd100 } hitcount:          1  len:         40
+-    { skbaddr: ffff880064505f00 } hitcount:          1  len:        174
+-    { skbaddr: ffff8800a8bff200 } hitcount:          1  len:        160
+-    { skbaddr: ffff880044e3cc00 } hitcount:          1  len:         76
+-    { skbaddr: ffff8800a8bfe700 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bcdc00 } hitcount:          1  len:         32
+-    { skbaddr: ffff8800a1f64800 } hitcount:          1  len:         46
+-    { skbaddr: ffff8800d2bcde00 } hitcount:          1  len:        988
+-    { skbaddr: ffff88006a5dea00 } hitcount:          1  len:         46
+-    { skbaddr: ffff88002e37a200 } hitcount:          1  len:         44
+-    { skbaddr: ffff8800a1f32c00 } hitcount:          2  len:        676
+-    { skbaddr: ffff88000ad52600 } hitcount:          2  len:        107
+-    { skbaddr: ffff8800a1f91e00 } hitcount:          2  len:         92
+-    { skbaddr: ffff8800af5a0200 } hitcount:          2  len:        142
+-    { skbaddr: ffff8800d2bcc600 } hitcount:          2  len:        220
+-    { skbaddr: ffff8800ba36f500 } hitcount:          2  len:         92
+-    { skbaddr: ffff8800d021f800 } hitcount:          2  len:         92
+-    { skbaddr: ffff8800a1f33600 } hitcount:          2  len:        675
+-    { skbaddr: ffff8800a8bfff00 } hitcount:          3  len:        138
+-    { skbaddr: ffff8800d62a1300 } hitcount:          3  len:        138
+-    { skbaddr: ffff88002e37a100 } hitcount:          4  len:        184
+-    { skbaddr: ffff880064504400 } hitcount:          4  len:        184
+-    { skbaddr: ffff8800a8bfec00 } hitcount:          4  len:        184
+-    { skbaddr: ffff88000ad53700 } hitcount:          5  len:        230
+-    { skbaddr: ffff8800d2bcdb00 } hitcount:          5  len:        196
+-    { skbaddr: ffff8800a1f90000 } hitcount:          6  len:        276
+-    { skbaddr: ffff88006a54f900 } hitcount:          6  len:        276
+-
+-    Totals:
+-        Hits: 81
+-        Entries: 42
+-        Dropped: 0
+-
+-  And here's an example that shows how to combine histogram data from
+-  any two events even if they don't share any 'compatible' fields
+-  other than 'hitcount' and 'stacktrace'.  These commands create a
+-  couple of triggers named 'bar' using those fields:
+-
+-    # echo 'hist:name=bar:key=stacktrace:val=hitcount' > \
+-           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
+-    # echo 'hist:name=bar:key=stacktrace:val=hitcount' > \
+-          /sys/kernel/debug/tracing/events/net/netif_rx/trigger
+-
+-  And displaying the output of either shows some interesting if
+-  somewhat confusing output:
+-
+-    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
+-    # cat /sys/kernel/debug/tracing/events/net/netif_rx/hist
+-
+-    # event histogram
+-    #
+-    # trigger info: hist:name=bar:keys=stacktrace:vals=hitcount:sort=hitcount:size=2048 [active]
+-    #
+-
+-    { stacktrace:
+-             _do_fork+0x18e/0x330
+-             kernel_thread+0x29/0x30
+-             kthreadd+0x154/0x1b0
+-             ret_from_fork+0x3f/0x70
+-    } hitcount:          1
+-    { stacktrace:
+-             netif_rx_internal+0xb2/0xd0
+-             netif_rx_ni+0x20/0x70
+-             dev_loopback_xmit+0xaa/0xd0
+-             ip_mc_output+0x126/0x240
+-             ip_local_out_sk+0x31/0x40
+-             igmp_send_report+0x1e9/0x230
+-             igmp_timer_expire+0xe9/0x120
+-             call_timer_fn+0x39/0xf0
+-             run_timer_softirq+0x1e1/0x290
+-             __do_softirq+0xfd/0x290
+-             irq_exit+0x98/0xb0
+-             smp_apic_timer_interrupt+0x4a/0x60
+-             apic_timer_interrupt+0x6d/0x80
+-             cpuidle_enter+0x17/0x20
+-             call_cpuidle+0x3b/0x60
+-             cpu_startup_entry+0x22d/0x310
+-    } hitcount:          1
+-    { stacktrace:
+-             netif_rx_internal+0xb2/0xd0
+-             netif_rx_ni+0x20/0x70
+-             dev_loopback_xmit+0xaa/0xd0
+-             ip_mc_output+0x17f/0x240
+-             ip_local_out_sk+0x31/0x40
+-             ip_send_skb+0x1a/0x50
+-             udp_send_skb+0x13e/0x270
+-             udp_sendmsg+0x2bf/0x980
+-             inet_sendmsg+0x67/0xa0
+-             sock_sendmsg+0x38/0x50
+-             SYSC_sendto+0xef/0x170
+-             SyS_sendto+0xe/0x10
+-             entry_SYSCALL_64_fastpath+0x12/0x6a
+-    } hitcount:          2
+-    { stacktrace:
+-             netif_rx_internal+0xb2/0xd0
+-             netif_rx+0x1c/0x60
+-             loopback_xmit+0x6c/0xb0
+-             dev_hard_start_xmit+0x219/0x3a0
+-             __dev_queue_xmit+0x415/0x4f0
+-             dev_queue_xmit_sk+0x13/0x20
+-             ip_finish_output2+0x237/0x340
+-             ip_finish_output+0x113/0x1d0
+-             ip_output+0x66/0xc0
+-             ip_local_out_sk+0x31/0x40
+-             ip_send_skb+0x1a/0x50
+-             udp_send_skb+0x16d/0x270
+-             udp_sendmsg+0x2bf/0x980
+-             inet_sendmsg+0x67/0xa0
+-             sock_sendmsg+0x38/0x50
+-             ___sys_sendmsg+0x14e/0x270
+-    } hitcount:         76
+-    { stacktrace:
+-             netif_rx_internal+0xb2/0xd0
+-             netif_rx+0x1c/0x60
+-             loopback_xmit+0x6c/0xb0
+-             dev_hard_start_xmit+0x219/0x3a0
+-             __dev_queue_xmit+0x415/0x4f0
+-             dev_queue_xmit_sk+0x13/0x20
+-             ip_finish_output2+0x237/0x340
+-             ip_finish_output+0x113/0x1d0
+-             ip_output+0x66/0xc0
+-             ip_local_out_sk+0x31/0x40
+-             ip_send_skb+0x1a/0x50
+-             udp_send_skb+0x16d/0x270
+-             udp_sendmsg+0x2bf/0x980
+-             inet_sendmsg+0x67/0xa0
+-             sock_sendmsg+0x38/0x50
+-             ___sys_sendmsg+0x269/0x270
+-    } hitcount:         77
+-    { stacktrace:
+-             netif_rx_internal+0xb2/0xd0
+-             netif_rx+0x1c/0x60
+-             loopback_xmit+0x6c/0xb0
+-             dev_hard_start_xmit+0x219/0x3a0
+-             __dev_queue_xmit+0x415/0x4f0
+-             dev_queue_xmit_sk+0x13/0x20
+-             ip_finish_output2+0x237/0x340
+-             ip_finish_output+0x113/0x1d0
+-             ip_output+0x66/0xc0
+-             ip_local_out_sk+0x31/0x40
+-             ip_send_skb+0x1a/0x50
+-             udp_send_skb+0x16d/0x270
+-             udp_sendmsg+0x2bf/0x980
+-             inet_sendmsg+0x67/0xa0
+-             sock_sendmsg+0x38/0x50
+-             SYSC_sendto+0xef/0x170
+-    } hitcount:         88
+-    { stacktrace:
+-             _do_fork+0x18e/0x330
+-             SyS_clone+0x19/0x20
+-             entry_SYSCALL_64_fastpath+0x12/0x6a
+-    } hitcount:        244
+-
+-    Totals:
+-        Hits: 489
+-        Entries: 7
+-        Dropped: 0
++  See Documentation/trace/histogram.txt for details and examples.
+--- /dev/null
++++ b/Documentation/trace/histogram.txt
+@@ -0,0 +1,1568 @@
++			     Event Histograms
++
++		    Documentation written by Tom Zanussi
++
++1. Introduction
++===============
++
++  Histogram triggers are special event triggers that can be used to
++  aggregate trace event data into histograms.  For information on
++  trace events and event triggers, see Documentation/trace/events.txt.
++
++
++2. Histogram Trigger Command
++============================
++
++  A histogram trigger command is an event trigger command that
++  aggregates event hits into a hash table keyed on one or more trace
++  event format fields (or stacktrace) and a set of running totals
++  derived from one or more trace event format fields and/or event
++  counts (hitcount).
++
++  The format of a hist trigger is as follows:
++
++        hist:keys=<field1[,field2,...]>[:values=<field1[,field2,...]>]
++          [:sort=<field1[,field2,...]>][:size=#entries][:pause][:continue]
++          [:clear][:name=histname1] [if <filter>]
++
++  When a matching event is hit, an entry is added to a hash table
++  using the key(s) and value(s) named.  Keys and values correspond to
++  fields in the event's format description.  Values must correspond to
++  numeric fields - on an event hit, the value(s) will be added to a
++  sum kept for that field.  The special string 'hitcount' can be used
++  in place of an explicit value field - this is simply a count of
++  event hits.  If 'values' isn't specified, an implicit 'hitcount'
++  value will be automatically created and used as the only value.
++  Keys can be any field, or the special string 'stacktrace', which
++  will use the event's kernel stacktrace as the key.  The keywords
++  'keys' or 'key' can be used to specify keys, and the keywords
++  'values', 'vals', or 'val' can be used to specify values.  Compound
++  keys consisting of up to two fields can be specified by the 'keys'
++  keyword.  Hashing a compound key produces a unique entry in the
++  table for each unique combination of component keys, and can be
++  useful for providing more fine-grained summaries of event data.
++  Additionally, sort keys consisting of up to two fields can be
++  specified by the 'sort' keyword.  If more than one field is
++  specified, the result will be a 'sort within a sort': the first key
++  is taken to be the primary sort key and the second the secondary
++  key.  If a hist trigger is given a name using the 'name' parameter,
++  its histogram data will be shared with other triggers of the same
++  name, and trigger hits will update this common data.  Only triggers
++  with 'compatible' fields can be combined in this way; triggers are
++  'compatible' if the fields named in the trigger share the same
++  number and type of fields and those fields also have the same names.
++  Note that any two events always share the compatible 'hitcount' and
++  'stacktrace' fields and can therefore be combined using those
++  fields, however pointless that may be.
++
++  'hist' triggers add a 'hist' file to each event's subdirectory.
++  Reading the 'hist' file for the event will dump the hash table in
++  its entirety to stdout.  If there are multiple hist triggers
++  attached to an event, there will be a table for each trigger in the
++  output.  The table displayed for a named trigger will be the same as
++  any other instance having the same name. Each printed hash table
++  entry is a simple list of the keys and values comprising the entry;
++  keys are printed first and are delineated by curly braces, and are
++  followed by the set of value fields for the entry.  By default,
++  numeric fields are displayed as base-10 integers.  This can be
++  modified by appending any of the following modifiers to the field
++  name:
++
++        .hex        display a number as a hex value
++	.sym        display an address as a symbol
++	.sym-offset display an address as a symbol and offset
++	.syscall    display a syscall id as a system call name
++	.execname   display a common_pid as a program name
++
++  Note that in general the semantics of a given field aren't
++  interpreted when applying a modifier to it, but there are some
++  restrictions to be aware of in this regard:
++
++    - only the 'hex' modifier can be used for values (because values
++      are essentially sums, and the other modifiers don't make sense
++      in that context).
++    - the 'execname' modifier can only be used on a 'common_pid'.  The
++      reason for this is that the execname is simply the 'comm' value
++      saved for the 'current' process when an event was triggered,
++      which is the same as the common_pid value saved by the event
++      tracing code.  Trying to apply that comm value to other pid
++      values wouldn't be correct, and typically events that care save
++      pid-specific comm fields in the event itself.
++
++  A typical usage scenario would be the following to enable a hist
++  trigger, read its current contents, and then turn it off:
++
++  # echo 'hist:keys=skbaddr.hex:vals=len' > \
++    /sys/kernel/debug/tracing/events/net/netif_rx/trigger
++
++  # cat /sys/kernel/debug/tracing/events/net/netif_rx/hist
++
++  # echo '!hist:keys=skbaddr.hex:vals=len' > \
++    /sys/kernel/debug/tracing/events/net/netif_rx/trigger
++
++  The trigger file itself can be read to show the details of the
++  currently attached hist trigger.  This information is also displayed
++  at the top of the 'hist' file when read.
++
++  By default, the size of the hash table is 2048 entries.  The 'size'
++  parameter can be used to specify more or fewer than that.  The units
++  are in terms of hashtable entries - if a run uses more entries than
++  specified, the results will show the number of 'drops', the number
++  of hits that were ignored.  The size should be a power of 2 between
++  128 and 131072 (any non- power-of-2 number specified will be rounded
++  up).
++
++  The 'sort' parameter can be used to specify a value field to sort
++  on.  The default if unspecified is 'hitcount' and the default sort
++  order is 'ascending'.  To sort in the opposite direction, append
++  .descending' to the sort key.
++
++  The 'pause' parameter can be used to pause an existing hist trigger
++  or to start a hist trigger but not log any events until told to do
++  so.  'continue' or 'cont' can be used to start or restart a paused
++  hist trigger.
++
++  The 'clear' parameter will clear the contents of a running hist
++  trigger and leave its current paused/active state.
++
++  Note that the 'pause', 'cont', and 'clear' parameters should be
++  applied using 'append' shell operator ('>>') if applied to an
++  existing trigger, rather than via the '>' operator, which will cause
++  the trigger to be removed through truncation.
++
++- enable_hist/disable_hist
++
++  The enable_hist and disable_hist triggers can be used to have one
++  event conditionally start and stop another event's already-attached
++  hist trigger.  Any number of enable_hist and disable_hist triggers
++  can be attached to a given event, allowing that event to kick off
++  and stop aggregations on a host of other events.
++
++  The format is very similar to the enable/disable_event triggers:
++
++      enable_hist:<system>:<event>[:count]
++      disable_hist:<system>:<event>[:count]
++
++  Instead of enabling or disabling the tracing of the target event
++  into the trace buffer as the enable/disable_event triggers do, the
++  enable/disable_hist triggers enable or disable the aggregation of
++  the target event into a hash table.
++
++  A typical usage scenario for the enable_hist/disable_hist triggers
++  would be to first set up a paused hist trigger on some event,
++  followed by an enable_hist/disable_hist pair that turns the hist
++  aggregation on and off when conditions of interest are hit:
++
++  # echo 'hist:keys=skbaddr.hex:vals=len:pause' > \
++    /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++
++  # echo 'enable_hist:net:netif_receive_skb if filename==/usr/bin/wget' > \
++    /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
++
++  # echo 'disable_hist:net:netif_receive_skb if comm==wget' > \
++    /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
++
++  The above sets up an initially paused hist trigger which is unpaused
++  and starts aggregating events when a given program is executed, and
++  which stops aggregating when the process exits and the hist trigger
++  is paused again.
++
++  The examples below provide a more concrete illustration of the
++  concepts and typical usage patterns discussed above.
++
++
++6.2 'hist' trigger examples
++---------------------------
++
++  The first set of examples creates aggregations using the kmalloc
++  event.  The fields that can be used for the hist trigger are listed
++  in the kmalloc event's format file:
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/format
++    name: kmalloc
++    ID: 374
++    format:
++	field:unsigned short common_type;	offset:0;	size:2;	signed:0;
++	field:unsigned char common_flags;	offset:2;	size:1;	signed:0;
++	field:unsigned char common_preempt_count;		offset:3;	size:1;	signed:0;
++	field:int common_pid;					offset:4;	size:4;	signed:1;
++
++	field:unsigned long call_site;				offset:8;	size:8;	signed:0;
++	field:const void * ptr;					offset:16;	size:8;	signed:0;
++	field:size_t bytes_req;					offset:24;	size:8;	signed:0;
++	field:size_t bytes_alloc;				offset:32;	size:8;	signed:0;
++	field:gfp_t gfp_flags;					offset:40;	size:4;	signed:0;
++
++  We'll start by creating a hist trigger that generates a simple table
++  that lists the total number of bytes requested for each function in
++  the kernel that made one or more calls to kmalloc:
++
++    # echo 'hist:key=call_site:val=bytes_req' > \
++            /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++  This tells the tracing system to create a 'hist' trigger using the
++  call_site field of the kmalloc event as the key for the table, which
++  just means that each unique call_site address will have an entry
++  created for it in the table.  The 'val=bytes_req' parameter tells
++  the hist trigger that for each unique entry (call_site) in the
++  table, it should keep a running total of the number of bytes
++  requested by that call_site.
++
++  We'll let it run for awhile and then dump the contents of the 'hist'
++  file in the kmalloc event's subdirectory (for readability, a number
++  of entries have been omitted):
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=call_site:vals=bytes_req:sort=hitcount:size=2048 [active]
++
++    { call_site: 18446744072106379007 } hitcount:          1  bytes_req:        176
++    { call_site: 18446744071579557049 } hitcount:          1  bytes_req:       1024
++    { call_site: 18446744071580608289 } hitcount:          1  bytes_req:      16384
++    { call_site: 18446744071581827654 } hitcount:          1  bytes_req:         24
++    { call_site: 18446744071580700980 } hitcount:          1  bytes_req:          8
++    { call_site: 18446744071579359876 } hitcount:          1  bytes_req:        152
++    { call_site: 18446744071580795365 } hitcount:          3  bytes_req:        144
++    { call_site: 18446744071581303129 } hitcount:          3  bytes_req:        144
++    { call_site: 18446744071580713234 } hitcount:          4  bytes_req:       2560
++    { call_site: 18446744071580933750 } hitcount:          4  bytes_req:        736
++    .
++    .
++    .
++    { call_site: 18446744072106047046 } hitcount:         69  bytes_req:       5576
++    { call_site: 18446744071582116407 } hitcount:         73  bytes_req:       2336
++    { call_site: 18446744072106054684 } hitcount:        136  bytes_req:     140504
++    { call_site: 18446744072106224230 } hitcount:        136  bytes_req:      19584
++    { call_site: 18446744072106078074 } hitcount:        153  bytes_req:       2448
++    { call_site: 18446744072106062406 } hitcount:        153  bytes_req:      36720
++    { call_site: 18446744071582507929 } hitcount:        153  bytes_req:      37088
++    { call_site: 18446744072102520590 } hitcount:        273  bytes_req:      10920
++    { call_site: 18446744071582143559 } hitcount:        358  bytes_req:        716
++    { call_site: 18446744072106465852 } hitcount:        417  bytes_req:      56712
++    { call_site: 18446744072102523378 } hitcount:        485  bytes_req:      27160
++    { call_site: 18446744072099568646 } hitcount:       1676  bytes_req:      33520
++
++    Totals:
++        Hits: 4610
++        Entries: 45
++        Dropped: 0
++
++  The output displays a line for each entry, beginning with the key
++  specified in the trigger, followed by the value(s) also specified in
++  the trigger.  At the beginning of the output is a line that displays
++  the trigger info, which can also be displayed by reading the
++  'trigger' file:
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++    hist:keys=call_site:vals=bytes_req:sort=hitcount:size=2048 [active]
++
++  At the end of the output are a few lines that display the overall
++  totals for the run.  The 'Hits' field shows the total number of
++  times the event trigger was hit, the 'Entries' field shows the total
++  number of used entries in the hash table, and the 'Dropped' field
++  shows the number of hits that were dropped because the number of
++  used entries for the run exceeded the maximum number of entries
++  allowed for the table (normally 0, but if not a hint that you may
++  want to increase the size of the table using the 'size' parameter).
++
++  Notice in the above output that there's an extra field, 'hitcount',
++  which wasn't specified in the trigger.  Also notice that in the
++  trigger info output, there's a parameter, 'sort=hitcount', which
++  wasn't specified in the trigger either.  The reason for that is that
++  every trigger implicitly keeps a count of the total number of hits
++  attributed to a given entry, called the 'hitcount'.  That hitcount
++  information is explicitly displayed in the output, and in the
++  absence of a user-specified sort parameter, is used as the default
++  sort field.
++
++  The value 'hitcount' can be used in place of an explicit value in
++  the 'values' parameter if you don't really need to have any
++  particular field summed and are mainly interested in hit
++  frequencies.
++
++  To turn the hist trigger off, simply call up the trigger in the
++  command history and re-execute it with a '!' prepended:
++
++    # echo '!hist:key=call_site:val=bytes_req' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++  Finally, notice that the call_site as displayed in the output above
++  isn't really very useful.  It's an address, but normally addresses
++  are displayed in hex.  To have a numeric field displayed as a hex
++  value, simply append '.hex' to the field name in the trigger:
++
++    # echo 'hist:key=call_site.hex:val=bytes_req' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=call_site.hex:vals=bytes_req:sort=hitcount:size=2048 [active]
++
++    { call_site: ffffffffa026b291 } hitcount:          1  bytes_req:        433
++    { call_site: ffffffffa07186ff } hitcount:          1  bytes_req:        176
++    { call_site: ffffffff811ae721 } hitcount:          1  bytes_req:      16384
++    { call_site: ffffffff811c5134 } hitcount:          1  bytes_req:          8
++    { call_site: ffffffffa04a9ebb } hitcount:          1  bytes_req:        511
++    { call_site: ffffffff8122e0a6 } hitcount:          1  bytes_req:         12
++    { call_site: ffffffff8107da84 } hitcount:          1  bytes_req:        152
++    { call_site: ffffffff812d8246 } hitcount:          1  bytes_req:         24
++    { call_site: ffffffff811dc1e5 } hitcount:          3  bytes_req:        144
++    { call_site: ffffffffa02515e8 } hitcount:          3  bytes_req:        648
++    { call_site: ffffffff81258159 } hitcount:          3  bytes_req:        144
++    { call_site: ffffffff811c80f4 } hitcount:          4  bytes_req:        544
++    .
++    .
++    .
++    { call_site: ffffffffa06c7646 } hitcount:        106  bytes_req:       8024
++    { call_site: ffffffffa06cb246 } hitcount:        132  bytes_req:      31680
++    { call_site: ffffffffa06cef7a } hitcount:        132  bytes_req:       2112
++    { call_site: ffffffff8137e399 } hitcount:        132  bytes_req:      23232
++    { call_site: ffffffffa06c941c } hitcount:        185  bytes_req:     171360
++    { call_site: ffffffffa06f2a66 } hitcount:        185  bytes_req:      26640
++    { call_site: ffffffffa036a70e } hitcount:        265  bytes_req:      10600
++    { call_site: ffffffff81325447 } hitcount:        292  bytes_req:        584
++    { call_site: ffffffffa072da3c } hitcount:        446  bytes_req:      60656
++    { call_site: ffffffffa036b1f2 } hitcount:        526  bytes_req:      29456
++    { call_site: ffffffffa0099c06 } hitcount:       1780  bytes_req:      35600
++
++    Totals:
++        Hits: 4775
++        Entries: 46
++        Dropped: 0
++
++  Even that's only marginally more useful - while hex values do look
++  more like addresses, what users are typically more interested in
++  when looking at text addresses are the corresponding symbols
++  instead.  To have an address displayed as symbolic value instead,
++  simply append '.sym' or '.sym-offset' to the field name in the
++  trigger:
++
++    # echo 'hist:key=call_site.sym:val=bytes_req' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=call_site.sym:vals=bytes_req:sort=hitcount:size=2048 [active]
++
++    { call_site: [ffffffff810adcb9] syslog_print_all                              } hitcount:          1  bytes_req:       1024
++    { call_site: [ffffffff8154bc62] usb_control_msg                               } hitcount:          1  bytes_req:          8
++    { call_site: [ffffffffa00bf6fe] hidraw_send_report [hid]                      } hitcount:          1  bytes_req:          7
++    { call_site: [ffffffff8154acbe] usb_alloc_urb                                 } hitcount:          1  bytes_req:        192
++    { call_site: [ffffffffa00bf1ca] hidraw_report_event [hid]                     } hitcount:          1  bytes_req:          7
++    { call_site: [ffffffff811e3a25] __seq_open_private                            } hitcount:          1  bytes_req:         40
++    { call_site: [ffffffff8109524a] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128
++    { call_site: [ffffffff811febd5] fsnotify_alloc_group                          } hitcount:          2  bytes_req:        528
++    { call_site: [ffffffff81440f58] __tty_buffer_request_room                     } hitcount:          2  bytes_req:       2624
++    { call_site: [ffffffff81200ba6] inotify_new_group                             } hitcount:          2  bytes_req:         96
++    { call_site: [ffffffffa05e19af] ieee80211_start_tx_ba_session [mac80211]      } hitcount:          2  bytes_req:        464
++    { call_site: [ffffffff81672406] tcp_get_metrics                               } hitcount:          2  bytes_req:        304
++    { call_site: [ffffffff81097ec2] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128
++    { call_site: [ffffffff81089b05] sched_create_group                            } hitcount:          2  bytes_req:       1424
++    .
++    .
++    .
++    { call_site: [ffffffffa04a580c] intel_crtc_page_flip [i915]                   } hitcount:       1185  bytes_req:     123240
++    { call_site: [ffffffffa0287592] drm_mode_page_flip_ioctl [drm]                } hitcount:       1185  bytes_req:     104280
++    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state [i915]            } hitcount:       1402  bytes_req:     190672
++    { call_site: [ffffffff812891ca] ext4_find_extent                              } hitcount:       1518  bytes_req:     146208
++    { call_site: [ffffffffa029070e] drm_vma_node_allow [drm]                      } hitcount:       1746  bytes_req:      69840
++    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       2021  bytes_req:     792312
++    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc [drm]                   } hitcount:       2592  bytes_req:     145152
++    { call_site: [ffffffffa0489a66] intel_ring_begin [i915]                       } hitcount:       2629  bytes_req:     378576
++    { call_site: [ffffffffa046041c] i915_gem_execbuffer2 [i915]                   } hitcount:       2629  bytes_req:    3783248
++    { call_site: [ffffffff81325607] apparmor_file_alloc_security                  } hitcount:       5192  bytes_req:      10384
++    { call_site: [ffffffffa00b7c06] hid_report_raw_event [hid]                    } hitcount:       5529  bytes_req:     110584
++    { call_site: [ffffffff8131ebf7] aa_alloc_task_context                         } hitcount:      21943  bytes_req:     702176
++    { call_site: [ffffffff8125847d] ext4_htree_store_dirent                       } hitcount:      55759  bytes_req:    5074265
++
++    Totals:
++        Hits: 109928
++        Entries: 71
++        Dropped: 0
++
++  Because the default sort key above is 'hitcount', the above shows a
++  the list of call_sites by increasing hitcount, so that at the bottom
++  we see the functions that made the most kmalloc calls during the
++  run.  If instead we we wanted to see the top kmalloc callers in
++  terms of the number of bytes requested rather than the number of
++  calls, and we wanted the top caller to appear at the top, we can use
++  the 'sort' parameter, along with the 'descending' modifier:
++
++    # echo 'hist:key=call_site.sym:val=bytes_req:sort=bytes_req.descending' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=call_site.sym:vals=bytes_req:sort=bytes_req.descending:size=2048 [active]
++
++    { call_site: [ffffffffa046041c] i915_gem_execbuffer2 [i915]                   } hitcount:       2186  bytes_req:    3397464
++    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       1790  bytes_req:     712176
++    { call_site: [ffffffff8125847d] ext4_htree_store_dirent                       } hitcount:       8132  bytes_req:     513135
++    { call_site: [ffffffff811e2a1b] seq_buf_alloc                                 } hitcount:        106  bytes_req:     440128
++    { call_site: [ffffffffa0489a66] intel_ring_begin [i915]                       } hitcount:       2186  bytes_req:     314784
++    { call_site: [ffffffff812891ca] ext4_find_extent                              } hitcount:       2174  bytes_req:     208992
++    { call_site: [ffffffff811ae8e1] __kmalloc                                     } hitcount:          8  bytes_req:     131072
++    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state [i915]            } hitcount:        859  bytes_req:     116824
++    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc [drm]                   } hitcount:       1834  bytes_req:     102704
++    { call_site: [ffffffffa04a580c] intel_crtc_page_flip [i915]                   } hitcount:        972  bytes_req:     101088
++    { call_site: [ffffffffa0287592] drm_mode_page_flip_ioctl [drm]                } hitcount:        972  bytes_req:      85536
++    { call_site: [ffffffffa00b7c06] hid_report_raw_event [hid]                    } hitcount:       3333  bytes_req:      66664
++    { call_site: [ffffffff8137e559] sg_kmalloc                                    } hitcount:        209  bytes_req:      61632
++    .
++    .
++    .
++    { call_site: [ffffffff81095225] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128
++    { call_site: [ffffffff81097ec2] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128
++    { call_site: [ffffffff812d8406] copy_semundo                                  } hitcount:          2  bytes_req:         48
++    { call_site: [ffffffff81200ba6] inotify_new_group                             } hitcount:          1  bytes_req:         48
++    { call_site: [ffffffffa027121a] drm_getmagic [drm]                            } hitcount:          1  bytes_req:         48
++    { call_site: [ffffffff811e3a25] __seq_open_private                            } hitcount:          1  bytes_req:         40
++    { call_site: [ffffffff811c52f4] bprm_change_interp                            } hitcount:          2  bytes_req:         16
++    { call_site: [ffffffff8154bc62] usb_control_msg                               } hitcount:          1  bytes_req:          8
++    { call_site: [ffffffffa00bf1ca] hidraw_report_event [hid]                     } hitcount:          1  bytes_req:          7
++    { call_site: [ffffffffa00bf6fe] hidraw_send_report [hid]                      } hitcount:          1  bytes_req:          7
++
++    Totals:
++        Hits: 32133
++        Entries: 81
++        Dropped: 0
++
++  To display the offset and size information in addition to the symbol
++  name, just use 'sym-offset' instead:
++
++    # echo 'hist:key=call_site.sym-offset:val=bytes_req:sort=bytes_req.descending' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=call_site.sym-offset:vals=bytes_req:sort=bytes_req.descending:size=2048 [active]
++
++    { call_site: [ffffffffa046041c] i915_gem_execbuffer2+0x6c/0x2c0 [i915]                  } hitcount:       4569  bytes_req:    3163720
++    { call_site: [ffffffffa0489a66] intel_ring_begin+0xc6/0x1f0 [i915]                      } hitcount:       4569  bytes_req:     657936
++    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23+0x694/0x1020 [i915]      } hitcount:       1519  bytes_req:     472936
++    { call_site: [ffffffffa045e646] i915_gem_do_execbuffer.isra.23+0x516/0x1020 [i915]      } hitcount:       3050  bytes_req:     211832
++    { call_site: [ffffffff811e2a1b] seq_buf_alloc+0x1b/0x50                                 } hitcount:         34  bytes_req:     148384
++    { call_site: [ffffffffa04a580c] intel_crtc_page_flip+0xbc/0x870 [i915]                  } hitcount:       1385  bytes_req:     144040
++    { call_site: [ffffffff811ae8e1] __kmalloc+0x191/0x1b0                                   } hitcount:          8  bytes_req:     131072
++    { call_site: [ffffffffa0287592] drm_mode_page_flip_ioctl+0x282/0x360 [drm]              } hitcount:       1385  bytes_req:     121880
++    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc+0x32/0x100 [drm]                  } hitcount:       1848  bytes_req:     103488
++    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state+0x2c/0xa0 [i915]            } hitcount:        461  bytes_req:      62696
++    { call_site: [ffffffffa029070e] drm_vma_node_allow+0x2e/0xd0 [drm]                      } hitcount:       1541  bytes_req:      61640
++    { call_site: [ffffffff815f8d7b] sk_prot_alloc+0xcb/0x1b0                                } hitcount:         57  bytes_req:      57456
++    .
++    .
++    .
++    { call_site: [ffffffff8109524a] alloc_fair_sched_group+0x5a/0x1a0                       } hitcount:          2  bytes_req:        128
++    { call_site: [ffffffffa027b921] drm_vm_open_locked+0x31/0xa0 [drm]                      } hitcount:          3  bytes_req:         96
++    { call_site: [ffffffff8122e266] proc_self_follow_link+0x76/0xb0                         } hitcount:          8  bytes_req:         96
++    { call_site: [ffffffff81213e80] load_elf_binary+0x240/0x1650                            } hitcount:          3  bytes_req:         84
++    { call_site: [ffffffff8154bc62] usb_control_msg+0x42/0x110                              } hitcount:          1  bytes_req:          8
++    { call_site: [ffffffffa00bf6fe] hidraw_send_report+0x7e/0x1a0 [hid]                     } hitcount:          1  bytes_req:          7
++    { call_site: [ffffffffa00bf1ca] hidraw_report_event+0x8a/0x120 [hid]                    } hitcount:          1  bytes_req:          7
++
++    Totals:
++        Hits: 26098
++        Entries: 64
++        Dropped: 0
++
++  We can also add multiple fields to the 'values' parameter.  For
++  example, we might want to see the total number of bytes allocated
++  alongside bytes requested, and display the result sorted by bytes
++  allocated in a descending order:
++
++    # echo 'hist:keys=call_site.sym:values=bytes_req,bytes_alloc:sort=bytes_alloc.descending' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=call_site.sym:vals=bytes_req,bytes_alloc:sort=bytes_alloc.descending:size=2048 [active]
++
++    { call_site: [ffffffffa046041c] i915_gem_execbuffer2 [i915]                   } hitcount:       7403  bytes_req:    4084360  bytes_alloc:    5958016
++    { call_site: [ffffffff811e2a1b] seq_buf_alloc                                 } hitcount:        541  bytes_req:    2213968  bytes_alloc:    2228224
++    { call_site: [ffffffffa0489a66] intel_ring_begin [i915]                       } hitcount:       7404  bytes_req:    1066176  bytes_alloc:    1421568
++    { call_site: [ffffffffa045e7c4] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       1565  bytes_req:     557368  bytes_alloc:    1037760
++    { call_site: [ffffffff8125847d] ext4_htree_store_dirent                       } hitcount:       9557  bytes_req:     595778  bytes_alloc:     695744
++    { call_site: [ffffffffa045e646] i915_gem_do_execbuffer.isra.23 [i915]         } hitcount:       5839  bytes_req:     430680  bytes_alloc:     470400
++    { call_site: [ffffffffa04c4a3c] intel_plane_duplicate_state [i915]            } hitcount:       2388  bytes_req:     324768  bytes_alloc:     458496
++    { call_site: [ffffffffa02911f2] drm_modeset_lock_crtc [drm]                   } hitcount:       3911  bytes_req:     219016  bytes_alloc:     250304
++    { call_site: [ffffffff815f8d7b] sk_prot_alloc                                 } hitcount:        235  bytes_req:     236880  bytes_alloc:     240640
++    { call_site: [ffffffff8137e559] sg_kmalloc                                    } hitcount:        557  bytes_req:     169024  bytes_alloc:     221760
++    { call_site: [ffffffffa00b7c06] hid_report_raw_event [hid]                    } hitcount:       9378  bytes_req:     187548  bytes_alloc:     206312
++    { call_site: [ffffffffa04a580c] intel_crtc_page_flip [i915]                   } hitcount:       1519  bytes_req:     157976  bytes_alloc:     194432
++    .
++    .
++    .
++    { call_site: [ffffffff8109bd3b] sched_autogroup_create_attach                 } hitcount:          2  bytes_req:        144  bytes_alloc:        192
++    { call_site: [ffffffff81097ee8] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128  bytes_alloc:        128
++    { call_site: [ffffffff8109524a] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128  bytes_alloc:        128
++    { call_site: [ffffffff81095225] alloc_fair_sched_group                        } hitcount:          2  bytes_req:        128  bytes_alloc:        128
++    { call_site: [ffffffff81097ec2] alloc_rt_sched_group                          } hitcount:          2  bytes_req:        128  bytes_alloc:        128
++    { call_site: [ffffffff81213e80] load_elf_binary                               } hitcount:          3  bytes_req:         84  bytes_alloc:         96
++    { call_site: [ffffffff81079a2e] kthread_create_on_node                        } hitcount:          1  bytes_req:         56  bytes_alloc:         64
++    { call_site: [ffffffffa00bf6fe] hidraw_send_report [hid]                      } hitcount:          1  bytes_req:          7  bytes_alloc:          8
++    { call_site: [ffffffff8154bc62] usb_control_msg                               } hitcount:          1  bytes_req:          8  bytes_alloc:          8
++    { call_site: [ffffffffa00bf1ca] hidraw_report_event [hid]                     } hitcount:          1  bytes_req:          7  bytes_alloc:          8
++
++    Totals:
++        Hits: 66598
++        Entries: 65
++        Dropped: 0
++
++  Finally, to finish off our kmalloc example, instead of simply having
++  the hist trigger display symbolic call_sites, we can have the hist
++  trigger additionally display the complete set of kernel stack traces
++  that led to each call_site.  To do that, we simply use the special
++  value 'stacktrace' for the key parameter:
++
++    # echo 'hist:keys=stacktrace:values=bytes_req,bytes_alloc:sort=bytes_alloc' > \
++           /sys/kernel/debug/tracing/events/kmem/kmalloc/trigger
++
++  The above trigger will use the kernel stack trace in effect when an
++  event is triggered as the key for the hash table.  This allows the
++  enumeration of every kernel callpath that led up to a particular
++  event, along with a running total of any of the event fields for
++  that event.  Here we tally bytes requested and bytes allocated for
++  every callpath in the system that led up to a kmalloc (in this case
++  every callpath to a kmalloc for a kernel compile):
++
++    # cat /sys/kernel/debug/tracing/events/kmem/kmalloc/hist
++    # trigger info: hist:keys=stacktrace:vals=bytes_req,bytes_alloc:sort=bytes_alloc:size=2048 [active]
++
++    { stacktrace:
++         __kmalloc_track_caller+0x10b/0x1a0
++         kmemdup+0x20/0x50
++         hidraw_report_event+0x8a/0x120 [hid]
++         hid_report_raw_event+0x3ea/0x440 [hid]
++         hid_input_report+0x112/0x190 [hid]
++         hid_irq_in+0xc2/0x260 [usbhid]
++         __usb_hcd_giveback_urb+0x72/0x120
++         usb_giveback_urb_bh+0x9e/0xe0
++         tasklet_hi_action+0xf8/0x100
++         __do_softirq+0x114/0x2c0
++         irq_exit+0xa5/0xb0
++         do_IRQ+0x5a/0xf0
++         ret_from_intr+0x0/0x30
++         cpuidle_enter+0x17/0x20
++         cpu_startup_entry+0x315/0x3e0
++         rest_init+0x7c/0x80
++    } hitcount:          3  bytes_req:         21  bytes_alloc:         24
++    { stacktrace:
++         __kmalloc_track_caller+0x10b/0x1a0
++         kmemdup+0x20/0x50
++         hidraw_report_event+0x8a/0x120 [hid]
++         hid_report_raw_event+0x3ea/0x440 [hid]
++         hid_input_report+0x112/0x190 [hid]
++         hid_irq_in+0xc2/0x260 [usbhid]
++         __usb_hcd_giveback_urb+0x72/0x120
++         usb_giveback_urb_bh+0x9e/0xe0
++         tasklet_hi_action+0xf8/0x100
++         __do_softirq+0x114/0x2c0
++         irq_exit+0xa5/0xb0
++         do_IRQ+0x5a/0xf0
++         ret_from_intr+0x0/0x30
++    } hitcount:          3  bytes_req:         21  bytes_alloc:         24
++    { stacktrace:
++         kmem_cache_alloc_trace+0xeb/0x150
++         aa_alloc_task_context+0x27/0x40
++         apparmor_cred_prepare+0x1f/0x50
++         security_prepare_creds+0x16/0x20
++         prepare_creds+0xdf/0x1a0
++         SyS_capset+0xb5/0x200
++         system_call_fastpath+0x12/0x6a
++    } hitcount:          1  bytes_req:         32  bytes_alloc:         32
++    .
++    .
++    .
++    { stacktrace:
++         __kmalloc+0x11b/0x1b0
++         i915_gem_execbuffer2+0x6c/0x2c0 [i915]
++         drm_ioctl+0x349/0x670 [drm]
++         do_vfs_ioctl+0x2f0/0x4f0
++         SyS_ioctl+0x81/0xa0
++         system_call_fastpath+0x12/0x6a
++    } hitcount:      17726  bytes_req:   13944120  bytes_alloc:   19593808
++    { stacktrace:
++         __kmalloc+0x11b/0x1b0
++         load_elf_phdrs+0x76/0xa0
++         load_elf_binary+0x102/0x1650
++         search_binary_handler+0x97/0x1d0
++         do_execveat_common.isra.34+0x551/0x6e0
++         SyS_execve+0x3a/0x50
++         return_from_execve+0x0/0x23
++    } hitcount:      33348  bytes_req:   17152128  bytes_alloc:   20226048
++    { stacktrace:
++         kmem_cache_alloc_trace+0xeb/0x150
++         apparmor_file_alloc_security+0x27/0x40
++         security_file_alloc+0x16/0x20
++         get_empty_filp+0x93/0x1c0
++         path_openat+0x31/0x5f0
++         do_filp_open+0x3a/0x90
++         do_sys_open+0x128/0x220
++         SyS_open+0x1e/0x20
++         system_call_fastpath+0x12/0x6a
++    } hitcount:    4766422  bytes_req:    9532844  bytes_alloc:   38131376
++    { stacktrace:
++         __kmalloc+0x11b/0x1b0
++         seq_buf_alloc+0x1b/0x50
++         seq_read+0x2cc/0x370
++         proc_reg_read+0x3d/0x80
++         __vfs_read+0x28/0xe0
++         vfs_read+0x86/0x140
++         SyS_read+0x46/0xb0
++         system_call_fastpath+0x12/0x6a
++    } hitcount:      19133  bytes_req:   78368768  bytes_alloc:   78368768
++
++    Totals:
++        Hits: 6085872
++        Entries: 253
++        Dropped: 0
++
++  If you key a hist trigger on common_pid, in order for example to
++  gather and display sorted totals for each process, you can use the
++  special .execname modifier to display the executable names for the
++  processes in the table rather than raw pids.  The example below
++  keeps a per-process sum of total bytes read:
++
++    # echo 'hist:key=common_pid.execname:val=count:sort=count.descending' > \
++           /sys/kernel/debug/tracing/events/syscalls/sys_enter_read/trigger
++
++    # cat /sys/kernel/debug/tracing/events/syscalls/sys_enter_read/hist
++    # trigger info: hist:keys=common_pid.execname:vals=count:sort=count.descending:size=2048 [active]
++
++    { common_pid: gnome-terminal  [      3196] } hitcount:        280  count:    1093512
++    { common_pid: Xorg            [      1309] } hitcount:        525  count:     256640
++    { common_pid: compiz          [      2889] } hitcount:         59  count:     254400
++    { common_pid: bash            [      8710] } hitcount:          3  count:      66369
++    { common_pid: dbus-daemon-lau [      8703] } hitcount:         49  count:      47739
++    { common_pid: irqbalance      [      1252] } hitcount:         27  count:      27648
++    { common_pid: 01ifupdown      [      8705] } hitcount:          3  count:      17216
++    { common_pid: dbus-daemon     [       772] } hitcount:         10  count:      12396
++    { common_pid: Socket Thread   [      8342] } hitcount:         11  count:      11264
++    { common_pid: nm-dhcp-client. [      8701] } hitcount:          6  count:       7424
++    { common_pid: gmain           [      1315] } hitcount:         18  count:       6336
++    .
++    .
++    .
++    { common_pid: postgres        [      1892] } hitcount:          2  count:         32
++    { common_pid: postgres        [      1891] } hitcount:          2  count:         32
++    { common_pid: gmain           [      8704] } hitcount:          2  count:         32
++    { common_pid: upstart-dbus-br [      2740] } hitcount:         21  count:         21
++    { common_pid: nm-dispatcher.a [      8696] } hitcount:          1  count:         16
++    { common_pid: indicator-datet [      2904] } hitcount:          1  count:         16
++    { common_pid: gdbus           [      2998] } hitcount:          1  count:         16
++    { common_pid: rtkit-daemon    [      2052] } hitcount:          1  count:          8
++    { common_pid: init            [         1] } hitcount:          2  count:          2
++
++    Totals:
++        Hits: 2116
++        Entries: 51
++        Dropped: 0
++
++  Similarly, if you key a hist trigger on syscall id, for example to
++  gather and display a list of systemwide syscall hits, you can use
++  the special .syscall modifier to display the syscall names rather
++  than raw ids.  The example below keeps a running total of syscall
++  counts for the system during the run:
++
++    # echo 'hist:key=id.syscall:val=hitcount' > \
++           /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/trigger
++
++    # cat /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/hist
++    # trigger info: hist:keys=id.syscall:vals=hitcount:sort=hitcount:size=2048 [active]
++
++    { id: sys_fsync                     [ 74] } hitcount:          1
++    { id: sys_newuname                  [ 63] } hitcount:          1
++    { id: sys_prctl                     [157] } hitcount:          1
++    { id: sys_statfs                    [137] } hitcount:          1
++    { id: sys_symlink                   [ 88] } hitcount:          1
++    { id: sys_sendmmsg                  [307] } hitcount:          1
++    { id: sys_semctl                    [ 66] } hitcount:          1
++    { id: sys_readlink                  [ 89] } hitcount:          3
++    { id: sys_bind                      [ 49] } hitcount:          3
++    { id: sys_getsockname               [ 51] } hitcount:          3
++    { id: sys_unlink                    [ 87] } hitcount:          3
++    { id: sys_rename                    [ 82] } hitcount:          4
++    { id: unknown_syscall               [ 58] } hitcount:          4
++    { id: sys_connect                   [ 42] } hitcount:          4
++    { id: sys_getpid                    [ 39] } hitcount:          4
++    .
++    .
++    .
++    { id: sys_rt_sigprocmask            [ 14] } hitcount:        952
++    { id: sys_futex                     [202] } hitcount:       1534
++    { id: sys_write                     [  1] } hitcount:       2689
++    { id: sys_setitimer                 [ 38] } hitcount:       2797
++    { id: sys_read                      [  0] } hitcount:       3202
++    { id: sys_select                    [ 23] } hitcount:       3773
++    { id: sys_writev                    [ 20] } hitcount:       4531
++    { id: sys_poll                      [  7] } hitcount:       8314
++    { id: sys_recvmsg                   [ 47] } hitcount:      13738
++    { id: sys_ioctl                     [ 16] } hitcount:      21843
++
++    Totals:
++        Hits: 67612
++        Entries: 72
++        Dropped: 0
++
++    The syscall counts above provide a rough overall picture of system
++    call activity on the system; we can see for example that the most
++    popular system call on this system was the 'sys_ioctl' system call.
++
++    We can use 'compound' keys to refine that number and provide some
++    further insight as to which processes exactly contribute to the
++    overall ioctl count.
++
++    The command below keeps a hitcount for every unique combination of
++    system call id and pid - the end result is essentially a table
++    that keeps a per-pid sum of system call hits.  The results are
++    sorted using the system call id as the primary key, and the
++    hitcount sum as the secondary key:
++
++    # echo 'hist:key=id.syscall,common_pid.execname:val=hitcount:sort=id,hitcount' > \
++           /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/trigger
++
++    # cat /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/hist
++    # trigger info: hist:keys=id.syscall,common_pid.execname:vals=hitcount:sort=id.syscall,hitcount:size=2048 [active]
++
++    { id: sys_read                      [  0], common_pid: rtkit-daemon    [      1877] } hitcount:          1
++    { id: sys_read                      [  0], common_pid: gdbus           [      2976] } hitcount:          1
++    { id: sys_read                      [  0], common_pid: console-kit-dae [      3400] } hitcount:          1
++    { id: sys_read                      [  0], common_pid: postgres        [      1865] } hitcount:          1
++    { id: sys_read                      [  0], common_pid: deja-dup-monito [      3543] } hitcount:          2
++    { id: sys_read                      [  0], common_pid: NetworkManager  [       890] } hitcount:          2
++    { id: sys_read                      [  0], common_pid: evolution-calen [      3048] } hitcount:          2
++    { id: sys_read                      [  0], common_pid: postgres        [      1864] } hitcount:          2
++    { id: sys_read                      [  0], common_pid: nm-applet       [      3022] } hitcount:          2
++    { id: sys_read                      [  0], common_pid: whoopsie        [      1212] } hitcount:          2
++    .
++    .
++    .
++    { id: sys_ioctl                     [ 16], common_pid: bash            [      8479] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: bash            [      3472] } hitcount:         12
++    { id: sys_ioctl                     [ 16], common_pid: gnome-terminal  [      3199] } hitcount:         16
++    { id: sys_ioctl                     [ 16], common_pid: Xorg            [      1267] } hitcount:       1808
++    { id: sys_ioctl                     [ 16], common_pid: compiz          [      2994] } hitcount:       5580
++    .
++    .
++    .
++    { id: sys_waitid                    [247], common_pid: upstart-dbus-br [      2690] } hitcount:          3
++    { id: sys_waitid                    [247], common_pid: upstart-dbus-br [      2688] } hitcount:         16
++    { id: sys_inotify_add_watch         [254], common_pid: gmain           [       975] } hitcount:          2
++    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      3204] } hitcount:          4
++    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      2888] } hitcount:          4
++    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      3003] } hitcount:          4
++    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      2873] } hitcount:          4
++    { id: sys_inotify_add_watch         [254], common_pid: gmain           [      3196] } hitcount:          6
++    { id: sys_openat                    [257], common_pid: java            [      2623] } hitcount:          2
++    { id: sys_eventfd2                  [290], common_pid: ibus-ui-gtk3    [      2760] } hitcount:          4
++    { id: sys_eventfd2                  [290], common_pid: compiz          [      2994] } hitcount:          6
++
++    Totals:
++        Hits: 31536
++        Entries: 323
++        Dropped: 0
++
++    The above list does give us a breakdown of the ioctl syscall by
++    pid, but it also gives us quite a bit more than that, which we
++    don't really care about at the moment.  Since we know the syscall
++    id for sys_ioctl (16, displayed next to the sys_ioctl name), we
++    can use that to filter out all the other syscalls:
++
++    # echo 'hist:key=id.syscall,common_pid.execname:val=hitcount:sort=id,hitcount if id == 16' > \
++           /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/trigger
++
++    # cat /sys/kernel/debug/tracing/events/raw_syscalls/sys_enter/hist
++    # trigger info: hist:keys=id.syscall,common_pid.execname:vals=hitcount:sort=id.syscall,hitcount:size=2048 if id == 16 [active]
++
++    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2769] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: evolution-addre [      8571] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: gmain           [      3003] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2781] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2829] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: bash            [      8726] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: bash            [      8508] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2970] } hitcount:          1
++    { id: sys_ioctl                     [ 16], common_pid: gmain           [      2768] } hitcount:          1
++    .
++    .
++    .
++    { id: sys_ioctl                     [ 16], common_pid: pool            [      8559] } hitcount:         45
++    { id: sys_ioctl                     [ 16], common_pid: pool            [      8555] } hitcount:         48
++    { id: sys_ioctl                     [ 16], common_pid: pool            [      8551] } hitcount:         48
++    { id: sys_ioctl                     [ 16], common_pid: avahi-daemon    [       896] } hitcount:         66
++    { id: sys_ioctl                     [ 16], common_pid: Xorg            [      1267] } hitcount:      26674
++    { id: sys_ioctl                     [ 16], common_pid: compiz          [      2994] } hitcount:      73443
++
++    Totals:
++        Hits: 101162
++        Entries: 103
++        Dropped: 0
++
++    The above output shows that 'compiz' and 'Xorg' are far and away
++    the heaviest ioctl callers (which might lead to questions about
++    whether they really need to be making all those calls and to
++    possible avenues for further investigation.)
++
++    The compound key examples used a key and a sum value (hitcount) to
++    sort the output, but we can just as easily use two keys instead.
++    Here's an example where we use a compound key composed of the the
++    common_pid and size event fields.  Sorting with pid as the primary
++    key and 'size' as the secondary key allows us to display an
++    ordered summary of the recvfrom sizes, with counts, received by
++    each process:
++
++    # echo 'hist:key=common_pid.execname,size:val=hitcount:sort=common_pid,size' > \
++           /sys/kernel/debug/tracing/events/syscalls/sys_enter_recvfrom/trigger
++
++    # cat /sys/kernel/debug/tracing/events/syscalls/sys_enter_recvfrom/hist
++    # trigger info: hist:keys=common_pid.execname,size:vals=hitcount:sort=common_pid.execname,size:size=2048 [active]
++
++    { common_pid: smbd            [       784], size:          4 } hitcount:          1
++    { common_pid: dnsmasq         [      1412], size:       4096 } hitcount:        672
++    { common_pid: postgres        [      1796], size:       1000 } hitcount:          6
++    { common_pid: postgres        [      1867], size:       1000 } hitcount:         10
++    { common_pid: bamfdaemon      [      2787], size:         28 } hitcount:          2
++    { common_pid: bamfdaemon      [      2787], size:      14360 } hitcount:          1
++    { common_pid: compiz          [      2994], size:          8 } hitcount:          1
++    { common_pid: compiz          [      2994], size:         20 } hitcount:         11
++    { common_pid: gnome-terminal  [      3199], size:          4 } hitcount:          2
++    { common_pid: firefox         [      8817], size:          4 } hitcount:          1
++    { common_pid: firefox         [      8817], size:          8 } hitcount:          5
++    { common_pid: firefox         [      8817], size:        588 } hitcount:          2
++    { common_pid: firefox         [      8817], size:        628 } hitcount:          1
++    { common_pid: firefox         [      8817], size:       6944 } hitcount:          1
++    { common_pid: firefox         [      8817], size:     408880 } hitcount:          2
++    { common_pid: firefox         [      8822], size:          8 } hitcount:          2
++    { common_pid: firefox         [      8822], size:        160 } hitcount:          2
++    { common_pid: firefox         [      8822], size:        320 } hitcount:          2
++    { common_pid: firefox         [      8822], size:        352 } hitcount:          1
++    .
++    .
++    .
++    { common_pid: pool            [      8923], size:       1960 } hitcount:         10
++    { common_pid: pool            [      8923], size:       2048 } hitcount:         10
++    { common_pid: pool            [      8924], size:       1960 } hitcount:         10
++    { common_pid: pool            [      8924], size:       2048 } hitcount:         10
++    { common_pid: pool            [      8928], size:       1964 } hitcount:          4
++    { common_pid: pool            [      8928], size:       1965 } hitcount:          2
++    { common_pid: pool            [      8928], size:       2048 } hitcount:          6
++    { common_pid: pool            [      8929], size:       1982 } hitcount:          1
++    { common_pid: pool            [      8929], size:       2048 } hitcount:          1
++
++    Totals:
++        Hits: 2016
++        Entries: 224
++        Dropped: 0
++
++  The above example also illustrates the fact that although a compound
++  key is treated as a single entity for hashing purposes, the sub-keys
++  it's composed of can be accessed independently.
++
++  The next example uses a string field as the hash key and
++  demonstrates how you can manually pause and continue a hist trigger.
++  In this example, we'll aggregate fork counts and don't expect a
++  large number of entries in the hash table, so we'll drop it to a
++  much smaller number, say 256:
++
++    # echo 'hist:key=child_comm:val=hitcount:size=256' > \
++           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
++    # trigger info: hist:keys=child_comm:vals=hitcount:sort=hitcount:size=256 [active]
++
++    { child_comm: dconf worker                        } hitcount:          1
++    { child_comm: ibus-daemon                         } hitcount:          1
++    { child_comm: whoopsie                            } hitcount:          1
++    { child_comm: smbd                                } hitcount:          1
++    { child_comm: gdbus                               } hitcount:          1
++    { child_comm: kthreadd                            } hitcount:          1
++    { child_comm: dconf worker                        } hitcount:          1
++    { child_comm: evolution-alarm                     } hitcount:          2
++    { child_comm: Socket Thread                       } hitcount:          2
++    { child_comm: postgres                            } hitcount:          2
++    { child_comm: bash                                } hitcount:          3
++    { child_comm: compiz                              } hitcount:          3
++    { child_comm: evolution-sourc                     } hitcount:          4
++    { child_comm: dhclient                            } hitcount:          4
++    { child_comm: pool                                } hitcount:          5
++    { child_comm: nm-dispatcher.a                     } hitcount:          8
++    { child_comm: firefox                             } hitcount:          8
++    { child_comm: dbus-daemon                         } hitcount:          8
++    { child_comm: glib-pacrunner                      } hitcount:         10
++    { child_comm: evolution                           } hitcount:         23
++
++    Totals:
++        Hits: 89
++        Entries: 20
++        Dropped: 0
++
++  If we want to pause the hist trigger, we can simply append :pause to
++  the command that started the trigger.  Notice that the trigger info
++  displays as [paused]:
++
++    # echo 'hist:key=child_comm:val=hitcount:size=256:pause' >> \
++           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
++    # trigger info: hist:keys=child_comm:vals=hitcount:sort=hitcount:size=256 [paused]
++
++    { child_comm: dconf worker                        } hitcount:          1
++    { child_comm: kthreadd                            } hitcount:          1
++    { child_comm: dconf worker                        } hitcount:          1
++    { child_comm: gdbus                               } hitcount:          1
++    { child_comm: ibus-daemon                         } hitcount:          1
++    { child_comm: Socket Thread                       } hitcount:          2
++    { child_comm: evolution-alarm                     } hitcount:          2
++    { child_comm: smbd                                } hitcount:          2
++    { child_comm: bash                                } hitcount:          3
++    { child_comm: whoopsie                            } hitcount:          3
++    { child_comm: compiz                              } hitcount:          3
++    { child_comm: evolution-sourc                     } hitcount:          4
++    { child_comm: pool                                } hitcount:          5
++    { child_comm: postgres                            } hitcount:          6
++    { child_comm: firefox                             } hitcount:          8
++    { child_comm: dhclient                            } hitcount:         10
++    { child_comm: emacs                               } hitcount:         12
++    { child_comm: dbus-daemon                         } hitcount:         20
++    { child_comm: nm-dispatcher.a                     } hitcount:         20
++    { child_comm: evolution                           } hitcount:         35
++    { child_comm: glib-pacrunner                      } hitcount:         59
++
++    Totals:
++        Hits: 199
++        Entries: 21
++        Dropped: 0
++
++  To manually continue having the trigger aggregate events, append
++  :cont instead.  Notice that the trigger info displays as [active]
++  again, and the data has changed:
++
++    # echo 'hist:key=child_comm:val=hitcount:size=256:cont' >> \
++           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
++    # trigger info: hist:keys=child_comm:vals=hitcount:sort=hitcount:size=256 [active]
++
++    { child_comm: dconf worker                        } hitcount:          1
++    { child_comm: dconf worker                        } hitcount:          1
++    { child_comm: kthreadd                            } hitcount:          1
++    { child_comm: gdbus                               } hitcount:          1
++    { child_comm: ibus-daemon                         } hitcount:          1
++    { child_comm: Socket Thread                       } hitcount:          2
++    { child_comm: evolution-alarm                     } hitcount:          2
++    { child_comm: smbd                                } hitcount:          2
++    { child_comm: whoopsie                            } hitcount:          3
++    { child_comm: compiz                              } hitcount:          3
++    { child_comm: evolution-sourc                     } hitcount:          4
++    { child_comm: bash                                } hitcount:          5
++    { child_comm: pool                                } hitcount:          5
++    { child_comm: postgres                            } hitcount:          6
++    { child_comm: firefox                             } hitcount:          8
++    { child_comm: dhclient                            } hitcount:         11
++    { child_comm: emacs                               } hitcount:         12
++    { child_comm: dbus-daemon                         } hitcount:         22
++    { child_comm: nm-dispatcher.a                     } hitcount:         22
++    { child_comm: evolution                           } hitcount:         35
++    { child_comm: glib-pacrunner                      } hitcount:         59
++
++    Totals:
++        Hits: 206
++        Entries: 21
++        Dropped: 0
++
++  The previous example showed how to start and stop a hist trigger by
++  appending 'pause' and 'continue' to the hist trigger command.  A
++  hist trigger can also be started in a paused state by initially
++  starting the trigger with ':pause' appended.  This allows you to
++  start the trigger only when you're ready to start collecting data
++  and not before.  For example, you could start the trigger in a
++  paused state, then unpause it and do something you want to measure,
++  then pause the trigger again when done.
++
++  Of course, doing this manually can be difficult and error-prone, but
++  it is possible to automatically start and stop a hist trigger based
++  on some condition, via the enable_hist and disable_hist triggers.
++
++  For example, suppose we wanted to take a look at the relative
++  weights in terms of skb length for each callpath that leads to a
++  netif_receieve_skb event when downloading a decent-sized file using
++  wget.
++
++  First we set up an initially paused stacktrace trigger on the
++  netif_receive_skb event:
++
++    # echo 'hist:key=stacktrace:vals=len:pause' > \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++
++  Next, we set up an 'enable_hist' trigger on the sched_process_exec
++  event, with an 'if filename==/usr/bin/wget' filter.  The effect of
++  this new trigger is that it will 'unpause' the hist trigger we just
++  set up on netif_receive_skb if and only if it sees a
++  sched_process_exec event with a filename of '/usr/bin/wget'.  When
++  that happens, all netif_receive_skb events are aggregated into a
++  hash table keyed on stacktrace:
++
++    # echo 'enable_hist:net:netif_receive_skb if filename==/usr/bin/wget' > \
++           /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
++
++  The aggregation continues until the netif_receive_skb is paused
++  again, which is what the following disable_hist event does by
++  creating a similar setup on the sched_process_exit event, using the
++  filter 'comm==wget':
++
++    # echo 'disable_hist:net:netif_receive_skb if comm==wget' > \
++           /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
++
++  Whenever a process exits and the comm field of the disable_hist
++  trigger filter matches 'comm==wget', the netif_receive_skb hist
++  trigger is disabled.
++
++  The overall effect is that netif_receive_skb events are aggregated
++  into the hash table for only the duration of the wget.  Executing a
++  wget command and then listing the 'hist' file will display the
++  output generated by the wget command:
++
++    $ wget https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.19.xz
++
++    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist
++    # trigger info: hist:keys=stacktrace:vals=len:sort=hitcount:size=2048 [paused]
++
++    { stacktrace:
++         __netif_receive_skb_core+0x46d/0x990
++         __netif_receive_skb+0x18/0x60
++         netif_receive_skb_internal+0x23/0x90
++         napi_gro_receive+0xc8/0x100
++         ieee80211_deliver_skb+0xd6/0x270 [mac80211]
++         ieee80211_rx_handlers+0xccf/0x22f0 [mac80211]
++         ieee80211_prepare_and_rx_handle+0x4e7/0xc40 [mac80211]
++         ieee80211_rx+0x31d/0x900 [mac80211]
++         iwlagn_rx_reply_rx+0x3db/0x6f0 [iwldvm]
++         iwl_rx_dispatch+0x8e/0xf0 [iwldvm]
++         iwl_pcie_irq_handler+0xe3c/0x12f0 [iwlwifi]
++         irq_thread_fn+0x20/0x50
++         irq_thread+0x11f/0x150
++         kthread+0xd2/0xf0
++         ret_from_fork+0x42/0x70
++    } hitcount:         85  len:      28884
++    { stacktrace:
++         __netif_receive_skb_core+0x46d/0x990
++         __netif_receive_skb+0x18/0x60
++         netif_receive_skb_internal+0x23/0x90
++         napi_gro_complete+0xa4/0xe0
++         dev_gro_receive+0x23a/0x360
++         napi_gro_receive+0x30/0x100
++         ieee80211_deliver_skb+0xd6/0x270 [mac80211]
++         ieee80211_rx_handlers+0xccf/0x22f0 [mac80211]
++         ieee80211_prepare_and_rx_handle+0x4e7/0xc40 [mac80211]
++         ieee80211_rx+0x31d/0x900 [mac80211]
++         iwlagn_rx_reply_rx+0x3db/0x6f0 [iwldvm]
++         iwl_rx_dispatch+0x8e/0xf0 [iwldvm]
++         iwl_pcie_irq_handler+0xe3c/0x12f0 [iwlwifi]
++         irq_thread_fn+0x20/0x50
++         irq_thread+0x11f/0x150
++         kthread+0xd2/0xf0
++    } hitcount:         98  len:     664329
++    { stacktrace:
++         __netif_receive_skb_core+0x46d/0x990
++         __netif_receive_skb+0x18/0x60
++         process_backlog+0xa8/0x150
++         net_rx_action+0x15d/0x340
++         __do_softirq+0x114/0x2c0
++         do_softirq_own_stack+0x1c/0x30
++         do_softirq+0x65/0x70
++         __local_bh_enable_ip+0xb5/0xc0
++         ip_finish_output+0x1f4/0x840
++         ip_output+0x6b/0xc0
++         ip_local_out_sk+0x31/0x40
++         ip_send_skb+0x1a/0x50
++         udp_send_skb+0x173/0x2a0
++         udp_sendmsg+0x2bf/0x9f0
++         inet_sendmsg+0x64/0xa0
++         sock_sendmsg+0x3d/0x50
++    } hitcount:        115  len:      13030
++    { stacktrace:
++         __netif_receive_skb_core+0x46d/0x990
++         __netif_receive_skb+0x18/0x60
++         netif_receive_skb_internal+0x23/0x90
++         napi_gro_complete+0xa4/0xe0
++         napi_gro_flush+0x6d/0x90
++         iwl_pcie_irq_handler+0x92a/0x12f0 [iwlwifi]
++         irq_thread_fn+0x20/0x50
++         irq_thread+0x11f/0x150
++         kthread+0xd2/0xf0
++         ret_from_fork+0x42/0x70
++    } hitcount:        934  len:    5512212
++
++    Totals:
++        Hits: 1232
++        Entries: 4
++        Dropped: 0
++
++  The above shows all the netif_receive_skb callpaths and their total
++  lengths for the duration of the wget command.
++
++  The 'clear' hist trigger param can be used to clear the hash table.
++  Suppose we wanted to try another run of the previous example but
++  this time also wanted to see the complete list of events that went
++  into the histogram.  In order to avoid having to set everything up
++  again, we can just clear the histogram first:
++
++    # echo 'hist:key=stacktrace:vals=len:clear' >> \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++
++  Just to verify that it is in fact cleared, here's what we now see in
++  the hist file:
++
++    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist
++    # trigger info: hist:keys=stacktrace:vals=len:sort=hitcount:size=2048 [paused]
++
++    Totals:
++        Hits: 0
++        Entries: 0
++        Dropped: 0
++
++  Since we want to see the detailed list of every netif_receive_skb
++  event occurring during the new run, which are in fact the same
++  events being aggregated into the hash table, we add some additional
++  'enable_event' events to the triggering sched_process_exec and
++  sched_process_exit events as such:
++
++    # echo 'enable_event:net:netif_receive_skb if filename==/usr/bin/wget' > \
++           /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
++
++    # echo 'disable_event:net:netif_receive_skb if comm==wget' > \
++           /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
++
++  If you read the trigger files for the sched_process_exec and
++  sched_process_exit triggers, you should see two triggers for each:
++  one enabling/disabling the hist aggregation and the other
++  enabling/disabling the logging of events:
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_process_exec/trigger
++    enable_event:net:netif_receive_skb:unlimited if filename==/usr/bin/wget
++    enable_hist:net:netif_receive_skb:unlimited if filename==/usr/bin/wget
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_process_exit/trigger
++    enable_event:net:netif_receive_skb:unlimited if comm==wget
++    disable_hist:net:netif_receive_skb:unlimited if comm==wget
++
++  In other words, whenever either of the sched_process_exec or
++  sched_process_exit events is hit and matches 'wget', it enables or
++  disables both the histogram and the event log, and what you end up
++  with is a hash table and set of events just covering the specified
++  duration.  Run the wget command again:
++
++    $ wget https://www.kernel.org/pub/linux/kernel/v3.x/patch-3.19.xz
++
++  Displaying the 'hist' file should show something similar to what you
++  saw in the last run, but this time you should also see the
++  individual events in the trace file:
++
++    # cat /sys/kernel/debug/tracing/trace
++
++    # tracer: nop
++    #
++    # entries-in-buffer/entries-written: 183/1426   #P:4
++    #
++    #                              _-----=> irqs-off
++    #                             / _----=> need-resched
++    #                            | / _---=> hardirq/softirq
++    #                            || / _--=> preempt-depth
++    #                            ||| /     delay
++    #           TASK-PID   CPU#  ||||    TIMESTAMP  FUNCTION
++    #              | |       |   ||||       |         |
++                wget-15108 [000] ..s1 31769.606929: netif_receive_skb: dev=lo skbaddr=ffff88009c353100 len=60
++                wget-15108 [000] ..s1 31769.606999: netif_receive_skb: dev=lo skbaddr=ffff88009c353200 len=60
++             dnsmasq-1382  [000] ..s1 31769.677652: netif_receive_skb: dev=lo skbaddr=ffff88009c352b00 len=130
++             dnsmasq-1382  [000] ..s1 31769.685917: netif_receive_skb: dev=lo skbaddr=ffff88009c352200 len=138
++    ##### CPU 2 buffer started ####
++      irq/29-iwlwifi-559   [002] ..s. 31772.031529: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d433d00 len=2948
++      irq/29-iwlwifi-559   [002] ..s. 31772.031572: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d432200 len=1500
++      irq/29-iwlwifi-559   [002] ..s. 31772.032196: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d433100 len=2948
++      irq/29-iwlwifi-559   [002] ..s. 31772.032761: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d433000 len=2948
++      irq/29-iwlwifi-559   [002] ..s. 31772.033220: netif_receive_skb: dev=wlan0 skbaddr=ffff88009d432e00 len=1500
++    .
++    .
++    .
++
++  The following example demonstrates how multiple hist triggers can be
++  attached to a given event.  This capability can be useful for
++  creating a set of different summaries derived from the same set of
++  events, or for comparing the effects of different filters, among
++  other things.
++
++    # echo 'hist:keys=skbaddr.hex:vals=len if len < 0' >> \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++    # echo 'hist:keys=skbaddr.hex:vals=len if len > 4096' >> \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++    # echo 'hist:keys=skbaddr.hex:vals=len if len == 256' >> \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++    # echo 'hist:keys=skbaddr.hex:vals=len' >> \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++    # echo 'hist:keys=len:vals=common_preempt_count' >> \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++
++  The above set of commands create four triggers differing only in
++  their filters, along with a completely different though fairly
++  nonsensical trigger.  Note that in order to append multiple hist
++  triggers to the same file, you should use the '>>' operator to
++  append them ('>' will also add the new hist trigger, but will remove
++  any existing hist triggers beforehand).
++
++  Displaying the contents of the 'hist' file for the event shows the
++  contents of all five histograms:
++
++    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist
++
++    # event histogram
++    #
++    # trigger info: hist:keys=len:vals=hitcount,common_preempt_count:sort=hitcount:size=2048 [active]
++    #
++
++    { len:        176 } hitcount:          1  common_preempt_count:          0
++    { len:        223 } hitcount:          1  common_preempt_count:          0
++    { len:       4854 } hitcount:          1  common_preempt_count:          0
++    { len:        395 } hitcount:          1  common_preempt_count:          0
++    { len:        177 } hitcount:          1  common_preempt_count:          0
++    { len:        446 } hitcount:          1  common_preempt_count:          0
++    { len:       1601 } hitcount:          1  common_preempt_count:          0
++    .
++    .
++    .
++    { len:       1280 } hitcount:         66  common_preempt_count:          0
++    { len:        116 } hitcount:         81  common_preempt_count:         40
++    { len:        708 } hitcount:        112  common_preempt_count:          0
++    { len:         46 } hitcount:        221  common_preempt_count:          0
++    { len:       1264 } hitcount:        458  common_preempt_count:          0
++
++    Totals:
++        Hits: 1428
++        Entries: 147
++        Dropped: 0
++
++
++    # event histogram
++    #
++    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 [active]
++    #
++
++    { skbaddr: ffff8800baee5e00 } hitcount:          1  len:        130
++    { skbaddr: ffff88005f3d5600 } hitcount:          1  len:       1280
++    { skbaddr: ffff88005f3d4900 } hitcount:          1  len:       1280
++    { skbaddr: ffff88009fed6300 } hitcount:          1  len:        115
++    { skbaddr: ffff88009fe0ad00 } hitcount:          1  len:        115
++    { skbaddr: ffff88008cdb1900 } hitcount:          1  len:         46
++    { skbaddr: ffff880064b5ef00 } hitcount:          1  len:        118
++    { skbaddr: ffff880044e3c700 } hitcount:          1  len:         60
++    { skbaddr: ffff880100065900 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d46bd500 } hitcount:          1  len:        116
++    { skbaddr: ffff88005f3d5f00 } hitcount:          1  len:       1280
++    { skbaddr: ffff880100064700 } hitcount:          1  len:        365
++    { skbaddr: ffff8800badb6f00 } hitcount:          1  len:         60
++    .
++    .
++    .
++    { skbaddr: ffff88009fe0be00 } hitcount:         27  len:      24677
++    { skbaddr: ffff88009fe0a400 } hitcount:         27  len:      23052
++    { skbaddr: ffff88009fe0b700 } hitcount:         31  len:      25589
++    { skbaddr: ffff88009fe0b600 } hitcount:         32  len:      27326
++    { skbaddr: ffff88006a462800 } hitcount:         68  len:      71678
++    { skbaddr: ffff88006a463700 } hitcount:         70  len:      72678
++    { skbaddr: ffff88006a462b00 } hitcount:         71  len:      77589
++    { skbaddr: ffff88006a463600 } hitcount:         73  len:      71307
++    { skbaddr: ffff88006a462200 } hitcount:         81  len:      81032
++
++    Totals:
++        Hits: 1451
++        Entries: 318
++        Dropped: 0
++
++
++    # event histogram
++    #
++    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 if len == 256 [active]
++    #
++
++
++    Totals:
++        Hits: 0
++        Entries: 0
++        Dropped: 0
++
++
++    # event histogram
++    #
++    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 if len > 4096 [active]
++    #
++
++    { skbaddr: ffff88009fd2c300 } hitcount:          1  len:       7212
++    { skbaddr: ffff8800d2bcce00 } hitcount:          1  len:       7212
++    { skbaddr: ffff8800d2bcd700 } hitcount:          1  len:       7212
++    { skbaddr: ffff8800d2bcda00 } hitcount:          1  len:      21492
++    { skbaddr: ffff8800ae2e2d00 } hitcount:          1  len:       7212
++    { skbaddr: ffff8800d2bcdb00 } hitcount:          1  len:       7212
++    { skbaddr: ffff88006a4df500 } hitcount:          1  len:       4854
++    { skbaddr: ffff88008ce47b00 } hitcount:          1  len:      18636
++    { skbaddr: ffff8800ae2e2200 } hitcount:          1  len:      12924
++    { skbaddr: ffff88005f3e1000 } hitcount:          1  len:       4356
++    { skbaddr: ffff8800d2bcdc00 } hitcount:          2  len:      24420
++    { skbaddr: ffff8800d2bcc200 } hitcount:          2  len:      12996
++
++    Totals:
++        Hits: 14
++        Entries: 12
++        Dropped: 0
++
++
++    # event histogram
++    #
++    # trigger info: hist:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 if len < 0 [active]
++    #
++
++
++    Totals:
++        Hits: 0
++        Entries: 0
++        Dropped: 0
++
++  Named triggers can be used to have triggers share a common set of
++  histogram data.  This capability is mostly useful for combining the
++  output of events generated by tracepoints contained inside inline
++  functions, but names can be used in a hist trigger on any event.
++  For example, these two triggers when hit will update the same 'len'
++  field in the shared 'foo' histogram data:
++
++    # echo 'hist:name=foo:keys=skbaddr.hex:vals=len' > \
++           /sys/kernel/debug/tracing/events/net/netif_receive_skb/trigger
++    # echo 'hist:name=foo:keys=skbaddr.hex:vals=len' > \
++           /sys/kernel/debug/tracing/events/net/netif_rx/trigger
++
++  You can see that they're updating common histogram data by reading
++  each event's hist files at the same time:
++
++    # cat /sys/kernel/debug/tracing/events/net/netif_receive_skb/hist;
++      cat /sys/kernel/debug/tracing/events/net/netif_rx/hist
++
++    # event histogram
++    #
++    # trigger info: hist:name=foo:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 [active]
++    #
++
++    { skbaddr: ffff88000ad53500 } hitcount:          1  len:         46
++    { skbaddr: ffff8800af5a1500 } hitcount:          1  len:         76
++    { skbaddr: ffff8800d62a1900 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bccb00 } hitcount:          1  len:        468
++    { skbaddr: ffff8800d3c69900 } hitcount:          1  len:         46
++    { skbaddr: ffff88009ff09100 } hitcount:          1  len:         52
++    { skbaddr: ffff88010f13ab00 } hitcount:          1  len:        168
++    { skbaddr: ffff88006a54f400 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bcc500 } hitcount:          1  len:        260
++    { skbaddr: ffff880064505000 } hitcount:          1  len:         46
++    { skbaddr: ffff8800baf24e00 } hitcount:          1  len:         32
++    { skbaddr: ffff88009fe0ad00 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d3edff00 } hitcount:          1  len:         44
++    { skbaddr: ffff88009fe0b400 } hitcount:          1  len:        168
++    { skbaddr: ffff8800a1c55a00 } hitcount:          1  len:         40
++    { skbaddr: ffff8800d2bcd100 } hitcount:          1  len:         40
++    { skbaddr: ffff880064505f00 } hitcount:          1  len:        174
++    { skbaddr: ffff8800a8bff200 } hitcount:          1  len:        160
++    { skbaddr: ffff880044e3cc00 } hitcount:          1  len:         76
++    { skbaddr: ffff8800a8bfe700 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bcdc00 } hitcount:          1  len:         32
++    { skbaddr: ffff8800a1f64800 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bcde00 } hitcount:          1  len:        988
++    { skbaddr: ffff88006a5dea00 } hitcount:          1  len:         46
++    { skbaddr: ffff88002e37a200 } hitcount:          1  len:         44
++    { skbaddr: ffff8800a1f32c00 } hitcount:          2  len:        676
++    { skbaddr: ffff88000ad52600 } hitcount:          2  len:        107
++    { skbaddr: ffff8800a1f91e00 } hitcount:          2  len:         92
++    { skbaddr: ffff8800af5a0200 } hitcount:          2  len:        142
++    { skbaddr: ffff8800d2bcc600 } hitcount:          2  len:        220
++    { skbaddr: ffff8800ba36f500 } hitcount:          2  len:         92
++    { skbaddr: ffff8800d021f800 } hitcount:          2  len:         92
++    { skbaddr: ffff8800a1f33600 } hitcount:          2  len:        675
++    { skbaddr: ffff8800a8bfff00 } hitcount:          3  len:        138
++    { skbaddr: ffff8800d62a1300 } hitcount:          3  len:        138
++    { skbaddr: ffff88002e37a100 } hitcount:          4  len:        184
++    { skbaddr: ffff880064504400 } hitcount:          4  len:        184
++    { skbaddr: ffff8800a8bfec00 } hitcount:          4  len:        184
++    { skbaddr: ffff88000ad53700 } hitcount:          5  len:        230
++    { skbaddr: ffff8800d2bcdb00 } hitcount:          5  len:        196
++    { skbaddr: ffff8800a1f90000 } hitcount:          6  len:        276
++    { skbaddr: ffff88006a54f900 } hitcount:          6  len:        276
++
++    Totals:
++        Hits: 81
++        Entries: 42
++        Dropped: 0
++    # event histogram
++    #
++    # trigger info: hist:name=foo:keys=skbaddr.hex:vals=hitcount,len:sort=hitcount:size=2048 [active]
++    #
++
++    { skbaddr: ffff88000ad53500 } hitcount:          1  len:         46
++    { skbaddr: ffff8800af5a1500 } hitcount:          1  len:         76
++    { skbaddr: ffff8800d62a1900 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bccb00 } hitcount:          1  len:        468
++    { skbaddr: ffff8800d3c69900 } hitcount:          1  len:         46
++    { skbaddr: ffff88009ff09100 } hitcount:          1  len:         52
++    { skbaddr: ffff88010f13ab00 } hitcount:          1  len:        168
++    { skbaddr: ffff88006a54f400 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bcc500 } hitcount:          1  len:        260
++    { skbaddr: ffff880064505000 } hitcount:          1  len:         46
++    { skbaddr: ffff8800baf24e00 } hitcount:          1  len:         32
++    { skbaddr: ffff88009fe0ad00 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d3edff00 } hitcount:          1  len:         44
++    { skbaddr: ffff88009fe0b400 } hitcount:          1  len:        168
++    { skbaddr: ffff8800a1c55a00 } hitcount:          1  len:         40
++    { skbaddr: ffff8800d2bcd100 } hitcount:          1  len:         40
++    { skbaddr: ffff880064505f00 } hitcount:          1  len:        174
++    { skbaddr: ffff8800a8bff200 } hitcount:          1  len:        160
++    { skbaddr: ffff880044e3cc00 } hitcount:          1  len:         76
++    { skbaddr: ffff8800a8bfe700 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bcdc00 } hitcount:          1  len:         32
++    { skbaddr: ffff8800a1f64800 } hitcount:          1  len:         46
++    { skbaddr: ffff8800d2bcde00 } hitcount:          1  len:        988
++    { skbaddr: ffff88006a5dea00 } hitcount:          1  len:         46
++    { skbaddr: ffff88002e37a200 } hitcount:          1  len:         44
++    { skbaddr: ffff8800a1f32c00 } hitcount:          2  len:        676
++    { skbaddr: ffff88000ad52600 } hitcount:          2  len:        107
++    { skbaddr: ffff8800a1f91e00 } hitcount:          2  len:         92
++    { skbaddr: ffff8800af5a0200 } hitcount:          2  len:        142
++    { skbaddr: ffff8800d2bcc600 } hitcount:          2  len:        220
++    { skbaddr: ffff8800ba36f500 } hitcount:          2  len:         92
++    { skbaddr: ffff8800d021f800 } hitcount:          2  len:         92
++    { skbaddr: ffff8800a1f33600 } hitcount:          2  len:        675
++    { skbaddr: ffff8800a8bfff00 } hitcount:          3  len:        138
++    { skbaddr: ffff8800d62a1300 } hitcount:          3  len:        138
++    { skbaddr: ffff88002e37a100 } hitcount:          4  len:        184
++    { skbaddr: ffff880064504400 } hitcount:          4  len:        184
++    { skbaddr: ffff8800a8bfec00 } hitcount:          4  len:        184
++    { skbaddr: ffff88000ad53700 } hitcount:          5  len:        230
++    { skbaddr: ffff8800d2bcdb00 } hitcount:          5  len:        196
++    { skbaddr: ffff8800a1f90000 } hitcount:          6  len:        276
++    { skbaddr: ffff88006a54f900 } hitcount:          6  len:        276
++
++    Totals:
++        Hits: 81
++        Entries: 42
++        Dropped: 0
++
++  And here's an example that shows how to combine histogram data from
++  any two events even if they don't share any 'compatible' fields
++  other than 'hitcount' and 'stacktrace'.  These commands create a
++  couple of triggers named 'bar' using those fields:
++
++    # echo 'hist:name=bar:key=stacktrace:val=hitcount' > \
++           /sys/kernel/debug/tracing/events/sched/sched_process_fork/trigger
++    # echo 'hist:name=bar:key=stacktrace:val=hitcount' > \
++          /sys/kernel/debug/tracing/events/net/netif_rx/trigger
++
++  And displaying the output of either shows some interesting if
++  somewhat confusing output:
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_process_fork/hist
++    # cat /sys/kernel/debug/tracing/events/net/netif_rx/hist
++
++    # event histogram
++    #
++    # trigger info: hist:name=bar:keys=stacktrace:vals=hitcount:sort=hitcount:size=2048 [active]
++    #
++
++    { stacktrace:
++             _do_fork+0x18e/0x330
++             kernel_thread+0x29/0x30
++             kthreadd+0x154/0x1b0
++             ret_from_fork+0x3f/0x70
++    } hitcount:          1
++    { stacktrace:
++             netif_rx_internal+0xb2/0xd0
++             netif_rx_ni+0x20/0x70
++             dev_loopback_xmit+0xaa/0xd0
++             ip_mc_output+0x126/0x240
++             ip_local_out_sk+0x31/0x40
++             igmp_send_report+0x1e9/0x230
++             igmp_timer_expire+0xe9/0x120
++             call_timer_fn+0x39/0xf0
++             run_timer_softirq+0x1e1/0x290
++             __do_softirq+0xfd/0x290
++             irq_exit+0x98/0xb0
++             smp_apic_timer_interrupt+0x4a/0x60
++             apic_timer_interrupt+0x6d/0x80
++             cpuidle_enter+0x17/0x20
++             call_cpuidle+0x3b/0x60
++             cpu_startup_entry+0x22d/0x310
++    } hitcount:          1
++    { stacktrace:
++             netif_rx_internal+0xb2/0xd0
++             netif_rx_ni+0x20/0x70
++             dev_loopback_xmit+0xaa/0xd0
++             ip_mc_output+0x17f/0x240
++             ip_local_out_sk+0x31/0x40
++             ip_send_skb+0x1a/0x50
++             udp_send_skb+0x13e/0x270
++             udp_sendmsg+0x2bf/0x980
++             inet_sendmsg+0x67/0xa0
++             sock_sendmsg+0x38/0x50
++             SYSC_sendto+0xef/0x170
++             SyS_sendto+0xe/0x10
++             entry_SYSCALL_64_fastpath+0x12/0x6a
++    } hitcount:          2
++    { stacktrace:
++             netif_rx_internal+0xb2/0xd0
++             netif_rx+0x1c/0x60
++             loopback_xmit+0x6c/0xb0
++             dev_hard_start_xmit+0x219/0x3a0
++             __dev_queue_xmit+0x415/0x4f0
++             dev_queue_xmit_sk+0x13/0x20
++             ip_finish_output2+0x237/0x340
++             ip_finish_output+0x113/0x1d0
++             ip_output+0x66/0xc0
++             ip_local_out_sk+0x31/0x40
++             ip_send_skb+0x1a/0x50
++             udp_send_skb+0x16d/0x270
++             udp_sendmsg+0x2bf/0x980
++             inet_sendmsg+0x67/0xa0
++             sock_sendmsg+0x38/0x50
++             ___sys_sendmsg+0x14e/0x270
++    } hitcount:         76
++    { stacktrace:
++             netif_rx_internal+0xb2/0xd0
++             netif_rx+0x1c/0x60
++             loopback_xmit+0x6c/0xb0
++             dev_hard_start_xmit+0x219/0x3a0
++             __dev_queue_xmit+0x415/0x4f0
++             dev_queue_xmit_sk+0x13/0x20
++             ip_finish_output2+0x237/0x340
++             ip_finish_output+0x113/0x1d0
++             ip_output+0x66/0xc0
++             ip_local_out_sk+0x31/0x40
++             ip_send_skb+0x1a/0x50
++             udp_send_skb+0x16d/0x270
++             udp_sendmsg+0x2bf/0x980
++             inet_sendmsg+0x67/0xa0
++             sock_sendmsg+0x38/0x50
++             ___sys_sendmsg+0x269/0x270
++    } hitcount:         77
++    { stacktrace:
++             netif_rx_internal+0xb2/0xd0
++             netif_rx+0x1c/0x60
++             loopback_xmit+0x6c/0xb0
++             dev_hard_start_xmit+0x219/0x3a0
++             __dev_queue_xmit+0x415/0x4f0
++             dev_queue_xmit_sk+0x13/0x20
++             ip_finish_output2+0x237/0x340
++             ip_finish_output+0x113/0x1d0
++             ip_output+0x66/0xc0
++             ip_local_out_sk+0x31/0x40
++             ip_send_skb+0x1a/0x50
++             udp_send_skb+0x16d/0x270
++             udp_sendmsg+0x2bf/0x980
++             inet_sendmsg+0x67/0xa0
++             sock_sendmsg+0x38/0x50
++             SYSC_sendto+0xef/0x170
++    } hitcount:         88
++    { stacktrace:
++             _do_fork+0x18e/0x330
++             SyS_clone+0x19/0x20
++             entry_SYSCALL_64_fastpath+0x12/0x6a
++    } hitcount:        244
++
++    Totals:
++        Hits: 489
++        Entries: 7
++        Dropped: 0
diff --git a/kernel/patches-4.14.x-rt/0067-0010-tracing-Add-Documentation-for-log2-modifier.patch b/kernel/patches-4.14.x-rt/0067-0010-tracing-Add-Documentation-for-log2-modifier.patch
new file mode 100644
index 000000000..a5f686cf9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0067-0010-tracing-Add-Documentation-for-log2-modifier.patch
@@ -0,0 +1,27 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:36 -0600
+Subject: [PATCH 10/48] tracing: Add Documentation for log2 modifier
+
+Add a line for the log2 modifier, to keep it aligned with
+tracing/README.
+
+Link: http://lkml.kernel.org/r/a419028bccab155749a4b8702d5b97af75f1578f.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit fcb5b95a2bb931f8e72e2dbd2def67382dd99d42)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/histogram.txt |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/Documentation/trace/histogram.txt
++++ b/Documentation/trace/histogram.txt
+@@ -73,6 +73,7 @@
+ 	.sym-offset display an address as a symbol and offset
+ 	.syscall    display a syscall id as a system call name
+ 	.execname   display a common_pid as a program name
++	.log2       display log2 value rather than raw number
+ 
+   Note that in general the semantics of a given field aren't
+   interpreted when applying a modifier to it, but there are some
diff --git a/kernel/patches-4.14.x-rt/0068-0011-tracing-Add-support-to-detect-and-avoid-duplicates.patch b/kernel/patches-4.14.x-rt/0068-0011-tracing-Add-support-to-detect-and-avoid-duplicates.patch
new file mode 100644
index 000000000..3c34776e3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0068-0011-tracing-Add-support-to-detect-and-avoid-duplicates.patch
@@ -0,0 +1,118 @@
+From: Vedang Patel <vedang.patel@intel.com>
+Date: Mon, 15 Jan 2018 20:51:37 -0600
+Subject: [PATCH 11/48] tracing: Add support to detect and avoid duplicates
+
+A duplicate in the tracing_map hash table is when 2 different entries
+have the same key and, as a result, the key_hash. This is possible due
+to a race condition in the algorithm. This race condition is inherent to
+the algorithm and not a bug. This was fine because, until now, we were
+only interested in the sum of all the values related to a particular
+key (the duplicates are dealt with in tracing_map_sort_entries()). But,
+with the inclusion of variables[1], we are interested in individual
+values. So, it will not be clear what value to choose when
+there are duplicates. So, the duplicates need to be removed.
+
+The duplicates can occur in the code in the following scenarios:
+
+- A thread is in the process of adding a new element. It has
+successfully executed cmpxchg() and inserted the key. But, it is still
+not done acquiring the trace_map_elt struct, populating it and storing
+the pointer to the struct in the value field of tracing_map hash table.
+If another thread comes in at this time and wants to add an element with
+the same key, it will not see the current element and add a new one.
+
+- There are multiple threads trying to execute cmpxchg at the same time,
+one of the threads will succeed and the others will fail. The ones which
+fail will go ahead increment 'idx' and add a new element there creating
+a duplicate.
+
+This patch detects and avoids the first condition by asking the thread
+which detects the duplicate to loop one more time. There is also a
+possibility of infinite loop if the thread which is trying to insert
+goes to sleep indefinitely and the one which is trying to insert a new
+element detects a duplicate. Which is why, the thread loops for
+map_size iterations before returning NULL.
+
+The second scenario is avoided by preventing the threads which failed
+cmpxchg() from incrementing idx. This way, they will loop
+around and check if the thread which succeeded in executing cmpxchg()
+had the same key.
+
+[1] http://lkml.kernel.org/r/cover.1498510759.git.tom.zanussi@linux.intel.com
+
+Link: http://lkml.kernel.org/r/e178e89ec399240331d383bd5913d649713110f4.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Vedang Patel <vedang.patel@intel.com>
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit bd0a7ab135d0d0872296c3ae3c4f816a9a4c3dee)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/tracing_map.c |   41 ++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 36 insertions(+), 5 deletions(-)
+
+--- a/kernel/trace/tracing_map.c
++++ b/kernel/trace/tracing_map.c
+@@ -414,7 +414,9 @@ static inline struct tracing_map_elt *
+ __tracing_map_insert(struct tracing_map *map, void *key, bool lookup_only)
+ {
+ 	u32 idx, key_hash, test_key;
++	int dup_try = 0;
+ 	struct tracing_map_entry *entry;
++	struct tracing_map_elt *val;
+ 
+ 	key_hash = jhash(key, map->key_size, 0);
+ 	if (key_hash == 0)
+@@ -426,11 +428,33 @@ static inline struct tracing_map_elt *
+ 		entry = TRACING_MAP_ENTRY(map->map, idx);
+ 		test_key = entry->key;
+ 
+-		if (test_key && test_key == key_hash && entry->val &&
+-		    keys_match(key, entry->val->key, map->key_size)) {
+-			if (!lookup_only)
+-				atomic64_inc(&map->hits);
+-			return entry->val;
++		if (test_key && test_key == key_hash) {
++			val = READ_ONCE(entry->val);
++			if (val &&
++			    keys_match(key, val->key, map->key_size)) {
++				if (!lookup_only)
++					atomic64_inc(&map->hits);
++				return val;
++			} else if (unlikely(!val)) {
++				/*
++				 * The key is present. But, val (pointer to elt
++				 * struct) is still NULL. which means some other
++				 * thread is in the process of inserting an
++				 * element.
++				 *
++				 * On top of that, it's key_hash is same as the
++				 * one being inserted right now. So, it's
++				 * possible that the element has the same
++				 * key as well.
++				 */
++
++				dup_try++;
++				if (dup_try > map->map_size) {
++					atomic64_inc(&map->drops);
++					break;
++				}
++				continue;
++			}
+ 		}
+ 
+ 		if (!test_key) {
+@@ -452,6 +476,13 @@ static inline struct tracing_map_elt *
+ 				atomic64_inc(&map->hits);
+ 
+ 				return entry->val;
++			} else {
++				/*
++				 * cmpxchg() failed. Loop around once
++				 * more to check what key was inserted.
++				 */
++				dup_try++;
++				continue;
+ 			}
+ 		}
+ 
diff --git a/kernel/patches-4.14.x-rt/0069-0012-tracing-Remove-code-which-merges-duplicates.patch b/kernel/patches-4.14.x-rt/0069-0012-tracing-Remove-code-which-merges-duplicates.patch
new file mode 100644
index 000000000..e0e3da1ae
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0069-0012-tracing-Remove-code-which-merges-duplicates.patch
@@ -0,0 +1,192 @@
+From: Vedang Patel <vedang.patel@intel.com>
+Date: Mon, 15 Jan 2018 20:51:38 -0600
+Subject: [PATCH 12/48] tracing: Remove code which merges duplicates
+
+We now have the logic to detect and remove duplicates in the
+tracing_map hash table. The code which merges duplicates in the
+histogram is redundant now. So, modify this code just to detect
+duplicates. The duplication detection code is still kept to ensure
+that any rare race condition which might cause duplicates does not go
+unnoticed.
+
+Link: http://lkml.kernel.org/r/55215cf59e2674391bdaf772fdafc4c393352b03.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Vedang Patel <vedang.patel@intel.com>
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 3f7f4cc21fc62ff7da7d34b5ca95a69d73a1f764)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   11 -----
+ kernel/trace/tracing_map.c       |   83 ++-------------------------------------
+ kernel/trace/tracing_map.h       |    7 ---
+ 3 files changed, 6 insertions(+), 95 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -340,16 +340,6 @@ static int hist_trigger_elt_comm_alloc(s
+ 	return 0;
+ }
+ 
+-static void hist_trigger_elt_comm_copy(struct tracing_map_elt *to,
+-				       struct tracing_map_elt *from)
+-{
+-	char *comm_from = from->private_data;
+-	char *comm_to = to->private_data;
+-
+-	if (comm_from)
+-		memcpy(comm_to, comm_from, TASK_COMM_LEN + 1);
+-}
+-
+ static void hist_trigger_elt_comm_init(struct tracing_map_elt *elt)
+ {
+ 	char *comm = elt->private_data;
+@@ -360,7 +350,6 @@ static void hist_trigger_elt_comm_init(s
+ 
+ static const struct tracing_map_ops hist_trigger_elt_comm_ops = {
+ 	.elt_alloc	= hist_trigger_elt_comm_alloc,
+-	.elt_copy	= hist_trigger_elt_comm_copy,
+ 	.elt_free	= hist_trigger_elt_comm_free,
+ 	.elt_init	= hist_trigger_elt_comm_init,
+ };
+--- a/kernel/trace/tracing_map.c
++++ b/kernel/trace/tracing_map.c
+@@ -847,67 +847,15 @@ create_sort_entry(void *key, struct trac
+ 	return sort_entry;
+ }
+ 
+-static struct tracing_map_elt *copy_elt(struct tracing_map_elt *elt)
+-{
+-	struct tracing_map_elt *dup_elt;
+-	unsigned int i;
+-
+-	dup_elt = tracing_map_elt_alloc(elt->map);
+-	if (IS_ERR(dup_elt))
+-		return NULL;
+-
+-	if (elt->map->ops && elt->map->ops->elt_copy)
+-		elt->map->ops->elt_copy(dup_elt, elt);
+-
+-	dup_elt->private_data = elt->private_data;
+-	memcpy(dup_elt->key, elt->key, elt->map->key_size);
+-
+-	for (i = 0; i < elt->map->n_fields; i++) {
+-		atomic64_set(&dup_elt->fields[i].sum,
+-			     atomic64_read(&elt->fields[i].sum));
+-		dup_elt->fields[i].cmp_fn = elt->fields[i].cmp_fn;
+-	}
+-
+-	return dup_elt;
+-}
+-
+-static int merge_dup(struct tracing_map_sort_entry **sort_entries,
+-		     unsigned int target, unsigned int dup)
+-{
+-	struct tracing_map_elt *target_elt, *elt;
+-	bool first_dup = (target - dup) == 1;
+-	int i;
+-
+-	if (first_dup) {
+-		elt = sort_entries[target]->elt;
+-		target_elt = copy_elt(elt);
+-		if (!target_elt)
+-			return -ENOMEM;
+-		sort_entries[target]->elt = target_elt;
+-		sort_entries[target]->elt_copied = true;
+-	} else
+-		target_elt = sort_entries[target]->elt;
+-
+-	elt = sort_entries[dup]->elt;
+-
+-	for (i = 0; i < elt->map->n_fields; i++)
+-		atomic64_add(atomic64_read(&elt->fields[i].sum),
+-			     &target_elt->fields[i].sum);
+-
+-	sort_entries[dup]->dup = true;
+-
+-	return 0;
+-}
+-
+-static int merge_dups(struct tracing_map_sort_entry **sort_entries,
++static void detect_dups(struct tracing_map_sort_entry **sort_entries,
+ 		      int n_entries, unsigned int key_size)
+ {
+ 	unsigned int dups = 0, total_dups = 0;
+-	int err, i, j;
++	int i;
+ 	void *key;
+ 
+ 	if (n_entries < 2)
+-		return total_dups;
++		return;
+ 
+ 	sort(sort_entries, n_entries, sizeof(struct tracing_map_sort_entry *),
+ 	     (int (*)(const void *, const void *))cmp_entries_dup, NULL);
+@@ -916,30 +864,14 @@ static int merge_dups(struct tracing_map
+ 	for (i = 1; i < n_entries; i++) {
+ 		if (!memcmp(sort_entries[i]->key, key, key_size)) {
+ 			dups++; total_dups++;
+-			err = merge_dup(sort_entries, i - dups, i);
+-			if (err)
+-				return err;
+ 			continue;
+ 		}
+ 		key = sort_entries[i]->key;
+ 		dups = 0;
+ 	}
+ 
+-	if (!total_dups)
+-		return total_dups;
+-
+-	for (i = 0, j = 0; i < n_entries; i++) {
+-		if (!sort_entries[i]->dup) {
+-			sort_entries[j] = sort_entries[i];
+-			if (j++ != i)
+-				sort_entries[i] = NULL;
+-		} else {
+-			destroy_sort_entry(sort_entries[i]);
+-			sort_entries[i] = NULL;
+-		}
+-	}
+-
+-	return total_dups;
++	WARN_ONCE(total_dups > 0,
++		  "Duplicates detected: %d\n", total_dups);
+ }
+ 
+ static bool is_key(struct tracing_map *map, unsigned int field_idx)
+@@ -1065,10 +997,7 @@ int tracing_map_sort_entries(struct trac
+ 		return 1;
+ 	}
+ 
+-	ret = merge_dups(entries, n_entries, map->key_size);
+-	if (ret < 0)
+-		goto free;
+-	n_entries -= ret;
++	detect_dups(entries, n_entries, map->key_size);
+ 
+ 	if (is_key(map, sort_keys[0].field_idx))
+ 		cmp_entries_fn = cmp_entries_key;
+--- a/kernel/trace/tracing_map.h
++++ b/kernel/trace/tracing_map.h
+@@ -215,11 +215,6 @@ struct tracing_map {
+  *	Element allocation occurs before tracing begins, when the
+  *	tracing_map_init() call is made by client code.
+  *
+- * @elt_copy: At certain points in the lifetime of an element, it may
+- *	need to be copied.  The copy should include a copy of the
+- *	client-allocated data, which can be copied into the 'to'
+- *	element from the 'from' element.
+- *
+  * @elt_free: When a tracing_map_elt is freed, this function is called
+  *	and allows client-allocated per-element data to be freed.
+  *
+@@ -233,8 +228,6 @@ struct tracing_map {
+  */
+ struct tracing_map_ops {
+ 	int			(*elt_alloc)(struct tracing_map_elt *elt);
+-	void			(*elt_copy)(struct tracing_map_elt *to,
+-					    struct tracing_map_elt *from);
+ 	void			(*elt_free)(struct tracing_map_elt *elt);
+ 	void			(*elt_clear)(struct tracing_map_elt *elt);
+ 	void			(*elt_init)(struct tracing_map_elt *elt);
diff --git a/kernel/patches-4.14.x-rt/0070-0013-ring-buffer-Add-interface-for-setting-absolute-time-.patch b/kernel/patches-4.14.x-rt/0070-0013-ring-buffer-Add-interface-for-setting-absolute-time-.patch
new file mode 100644
index 000000000..01e87511a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0070-0013-ring-buffer-Add-interface-for-setting-absolute-time-.patch
@@ -0,0 +1,132 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:39 -0600
+Subject: [PATCH 13/48] ring-buffer: Add interface for setting absolute time
+ stamps
+
+Define a new function, tracing_set_time_stamp_abs(), which can be used
+to enable or disable the use of absolute timestamps rather than time
+deltas for a trace array.
+
+Only the interface is added here; a subsequent patch will add the
+underlying implementation.
+
+Link: http://lkml.kernel.org/r/ce96119de44c7fe0ee44786d15254e9b493040d3.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Baohong Liu <baohong.liu@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 22753475c5232cd6f024746d6a6696a4dd2683ab)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/ring_buffer.h |    2 ++
+ kernel/trace/ring_buffer.c  |   11 +++++++++++
+ kernel/trace/trace.c        |   33 ++++++++++++++++++++++++++++++++-
+ kernel/trace/trace.h        |    3 +++
+ 4 files changed, 48 insertions(+), 1 deletion(-)
+
+--- a/include/linux/ring_buffer.h
++++ b/include/linux/ring_buffer.h
+@@ -181,6 +181,8 @@ void ring_buffer_normalize_time_stamp(st
+ 				      int cpu, u64 *ts);
+ void ring_buffer_set_clock(struct ring_buffer *buffer,
+ 			   u64 (*clock)(void));
++void ring_buffer_set_time_stamp_abs(struct ring_buffer *buffer, bool abs);
++bool ring_buffer_time_stamp_abs(struct ring_buffer *buffer);
+ 
+ size_t ring_buffer_page_len(void *page);
+ 
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -489,6 +489,7 @@ struct ring_buffer {
+ 	u64				(*clock)(void);
+ 
+ 	struct rb_irq_work		irq_work;
++	bool				time_stamp_abs;
+ };
+ 
+ struct ring_buffer_iter {
+@@ -1383,6 +1384,16 @@ void ring_buffer_set_clock(struct ring_b
+ 	buffer->clock = clock;
+ }
+ 
++void ring_buffer_set_time_stamp_abs(struct ring_buffer *buffer, bool abs)
++{
++	buffer->time_stamp_abs = abs;
++}
++
++bool ring_buffer_time_stamp_abs(struct ring_buffer *buffer)
++{
++	return buffer->time_stamp_abs;
++}
++
+ static void rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer);
+ 
+ static inline unsigned long rb_page_entries(struct buffer_page *bpage)
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -2269,7 +2269,7 @@ trace_event_buffer_lock_reserve(struct r
+ 
+ 	*current_rb = trace_file->tr->trace_buffer.buffer;
+ 
+-	if ((trace_file->flags &
++	if (!ring_buffer_time_stamp_abs(*current_rb) && (trace_file->flags &
+ 	     (EVENT_FILE_FL_SOFT_DISABLED | EVENT_FILE_FL_FILTERED)) &&
+ 	    (entry = this_cpu_read(trace_buffered_event))) {
+ 		/* Try to use the per cpu buffer first */
+@@ -6286,6 +6286,37 @@ static int tracing_clock_open(struct ino
+ 
+ 	return ret;
+ }
++
++int tracing_set_time_stamp_abs(struct trace_array *tr, bool abs)
++{
++	int ret = 0;
++
++	mutex_lock(&trace_types_lock);
++
++	if (abs && tr->time_stamp_abs_ref++)
++		goto out;
++
++	if (!abs) {
++		if (WARN_ON_ONCE(!tr->time_stamp_abs_ref)) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		if (--tr->time_stamp_abs_ref)
++			goto out;
++	}
++
++	ring_buffer_set_time_stamp_abs(tr->trace_buffer.buffer, abs);
++
++#ifdef CONFIG_TRACER_MAX_TRACE
++	if (tr->max_buffer.buffer)
++		ring_buffer_set_time_stamp_abs(tr->max_buffer.buffer, abs);
++#endif
++ out:
++	mutex_unlock(&trace_types_lock);
++
++	return ret;
++}
+ 
+ struct ftrace_buffer_info {
+ 	struct trace_iterator	iter;
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -273,6 +273,7 @@ struct trace_array {
+ 	/* function tracing enabled */
+ 	int			function_enabled;
+ #endif
++	int			time_stamp_abs_ref;
+ };
+ 
+ enum {
+@@ -286,6 +287,8 @@ extern struct mutex trace_types_lock;
+ extern int trace_array_get(struct trace_array *tr);
+ extern void trace_array_put(struct trace_array *tr);
+ 
++extern int tracing_set_time_stamp_abs(struct trace_array *tr, bool abs);
++
+ /*
+  * The global tracer (top) should be the first trace array added,
+  * but we check the flag anyway.
diff --git a/kernel/patches-4.14.x-rt/0071-0014-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch b/kernel/patches-4.14.x-rt/0071-0014-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch
new file mode 100644
index 000000000..d934b018e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0071-0014-ring-buffer-Redefine-the-unimplemented-RINGBUF_TYPE_.patch
@@ -0,0 +1,322 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:40 -0600
+Subject: [PATCH 14/48] ring-buffer: Redefine the unimplemented
+ RINGBUF_TYPE_TIME_STAMP
+
+RINGBUF_TYPE_TIME_STAMP is defined but not used, and from what I can
+gather was reserved for something like an absolute timestamp feature
+for the ring buffer, if not a complete replacement of the current
+time_delta scheme.
+
+This code redefines RINGBUF_TYPE_TIME_STAMP to implement absolute time
+stamps.  Another way to look at it is that it essentially forces
+extended time_deltas for all events.
+
+The motivation for doing this is to enable time_deltas that aren't
+dependent on previous events in the ring buffer, making it feasible to
+use the ring_buffer_event timetamps in a more random-access way, for
+purposes other than serial event printing.
+
+To set/reset this mode, use tracing_set_timestamp_abs() from the
+previous interface patch.
+
+Link: http://lkml.kernel.org/r/477b362dba1ce7fab9889a1a8e885a62c472f041.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 58c0bd803060b0c0c9de8751382a7af5f507d74d)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/ring_buffer.h |   12 ++---
+ kernel/trace/ring_buffer.c  |  104 ++++++++++++++++++++++++++++++++------------
+ 2 files changed, 83 insertions(+), 33 deletions(-)
+
+--- a/include/linux/ring_buffer.h
++++ b/include/linux/ring_buffer.h
+@@ -37,10 +37,12 @@ struct ring_buffer_event {
+  *				 array[0] = time delta (28 .. 59)
+  *				 size = 8 bytes
+  *
+- * @RINGBUF_TYPE_TIME_STAMP:	Sync time stamp with external clock
+- *				 array[0]    = tv_nsec
+- *				 array[1..2] = tv_sec
+- *				 size = 16 bytes
++ * @RINGBUF_TYPE_TIME_STAMP:	Absolute timestamp
++ *				 Same format as TIME_EXTEND except that the
++ *				 value is an absolute timestamp, not a delta
++ *				 event.time_delta contains bottom 27 bits
++ *				 array[0] = top (28 .. 59) bits
++ *				 size = 8 bytes
+  *
+  * <= @RINGBUF_TYPE_DATA_TYPE_LEN_MAX:
+  *				Data record
+@@ -57,12 +59,12 @@ enum ring_buffer_type {
+ 	RINGBUF_TYPE_DATA_TYPE_LEN_MAX = 28,
+ 	RINGBUF_TYPE_PADDING,
+ 	RINGBUF_TYPE_TIME_EXTEND,
+-	/* FIXME: RINGBUF_TYPE_TIME_STAMP not implemented */
+ 	RINGBUF_TYPE_TIME_STAMP,
+ };
+ 
+ unsigned ring_buffer_event_length(struct ring_buffer_event *event);
+ void *ring_buffer_event_data(struct ring_buffer_event *event);
++u64 ring_buffer_event_time_stamp(struct ring_buffer_event *event);
+ 
+ /*
+  * ring_buffer_discard_commit will remove an event that has not
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -42,6 +42,8 @@ int ring_buffer_print_entry_header(struc
+ 			 RINGBUF_TYPE_PADDING);
+ 	trace_seq_printf(s, "\ttime_extend : type == %d\n",
+ 			 RINGBUF_TYPE_TIME_EXTEND);
++	trace_seq_printf(s, "\ttime_stamp : type == %d\n",
++			 RINGBUF_TYPE_TIME_STAMP);
+ 	trace_seq_printf(s, "\tdata max type_len  == %d\n",
+ 			 RINGBUF_TYPE_DATA_TYPE_LEN_MAX);
+ 
+@@ -141,12 +143,15 @@ int ring_buffer_print_entry_header(struc
+ 
+ enum {
+ 	RB_LEN_TIME_EXTEND = 8,
+-	RB_LEN_TIME_STAMP = 16,
++	RB_LEN_TIME_STAMP =  8,
+ };
+ 
+ #define skip_time_extend(event) \
+ 	((struct ring_buffer_event *)((char *)event + RB_LEN_TIME_EXTEND))
+ 
++#define extended_time(event) \
++	(event->type_len >= RINGBUF_TYPE_TIME_EXTEND)
++
+ static inline int rb_null_event(struct ring_buffer_event *event)
+ {
+ 	return event->type_len == RINGBUF_TYPE_PADDING && !event->time_delta;
+@@ -210,7 +215,7 @@ rb_event_ts_length(struct ring_buffer_ev
+ {
+ 	unsigned len = 0;
+ 
+-	if (event->type_len == RINGBUF_TYPE_TIME_EXTEND) {
++	if (extended_time(event)) {
+ 		/* time extends include the data event after it */
+ 		len = RB_LEN_TIME_EXTEND;
+ 		event = skip_time_extend(event);
+@@ -232,7 +237,7 @@ unsigned ring_buffer_event_length(struct
+ {
+ 	unsigned length;
+ 
+-	if (event->type_len == RINGBUF_TYPE_TIME_EXTEND)
++	if (extended_time(event))
+ 		event = skip_time_extend(event);
+ 
+ 	length = rb_event_length(event);
+@@ -249,7 +254,7 @@ EXPORT_SYMBOL_GPL(ring_buffer_event_leng
+ static __always_inline void *
+ rb_event_data(struct ring_buffer_event *event)
+ {
+-	if (event->type_len == RINGBUF_TYPE_TIME_EXTEND)
++	if (extended_time(event))
+ 		event = skip_time_extend(event);
+ 	BUG_ON(event->type_len > RINGBUF_TYPE_DATA_TYPE_LEN_MAX);
+ 	/* If length is in len field, then array[0] has the data */
+@@ -276,6 +281,27 @@ EXPORT_SYMBOL_GPL(ring_buffer_event_data
+ #define TS_MASK		((1ULL << TS_SHIFT) - 1)
+ #define TS_DELTA_TEST	(~TS_MASK)
+ 
++/**
++ * ring_buffer_event_time_stamp - return the event's extended timestamp
++ * @event: the event to get the timestamp of
++ *
++ * Returns the extended timestamp associated with a data event.
++ * An extended time_stamp is a 64-bit timestamp represented
++ * internally in a special way that makes the best use of space
++ * contained within a ring buffer event.  This function decodes
++ * it and maps it to a straight u64 value.
++ */
++u64 ring_buffer_event_time_stamp(struct ring_buffer_event *event)
++{
++	u64 ts;
++
++	ts = event->array[0];
++	ts <<= TS_SHIFT;
++	ts += event->time_delta;
++
++	return ts;
++}
++
+ /* Flag when events were overwritten */
+ #define RB_MISSED_EVENTS	(1 << 31)
+ /* Missed count stored at end */
+@@ -2225,12 +2251,15 @@ rb_move_tail(struct ring_buffer_per_cpu
+ 
+ /* Slow path, do not inline */
+ static noinline struct ring_buffer_event *
+-rb_add_time_stamp(struct ring_buffer_event *event, u64 delta)
++rb_add_time_stamp(struct ring_buffer_event *event, u64 delta, bool abs)
+ {
+-	event->type_len = RINGBUF_TYPE_TIME_EXTEND;
++	if (abs)
++		event->type_len = RINGBUF_TYPE_TIME_STAMP;
++	else
++		event->type_len = RINGBUF_TYPE_TIME_EXTEND;
+ 
+-	/* Not the first event on the page? */
+-	if (rb_event_index(event)) {
++	/* Not the first event on the page, or not delta? */
++	if (abs || rb_event_index(event)) {
+ 		event->time_delta = delta & TS_MASK;
+ 		event->array[0] = delta >> TS_SHIFT;
+ 	} else {
+@@ -2273,7 +2302,9 @@ rb_update_event(struct ring_buffer_per_c
+ 	 * add it to the start of the resevered space.
+ 	 */
+ 	if (unlikely(info->add_timestamp)) {
+-		event = rb_add_time_stamp(event, delta);
++		bool abs = ring_buffer_time_stamp_abs(cpu_buffer->buffer);
++
++		event = rb_add_time_stamp(event, info->delta, abs);
+ 		length -= RB_LEN_TIME_EXTEND;
+ 		delta = 0;
+ 	}
+@@ -2461,7 +2492,7 @@ static __always_inline void rb_end_commi
+ 
+ static inline void rb_event_discard(struct ring_buffer_event *event)
+ {
+-	if (event->type_len == RINGBUF_TYPE_TIME_EXTEND)
++	if (extended_time(event))
+ 		event = skip_time_extend(event);
+ 
+ 	/* array[0] holds the actual length for the discarded event */
+@@ -2505,10 +2536,11 @@ rb_update_write_stamp(struct ring_buffer
+ 			cpu_buffer->write_stamp =
+ 				cpu_buffer->commit_page->page->time_stamp;
+ 		else if (event->type_len == RINGBUF_TYPE_TIME_EXTEND) {
+-			delta = event->array[0];
+-			delta <<= TS_SHIFT;
+-			delta += event->time_delta;
++			delta = ring_buffer_event_time_stamp(event);
+ 			cpu_buffer->write_stamp += delta;
++		} else if (event->type_len == RINGBUF_TYPE_TIME_STAMP) {
++			delta = ring_buffer_event_time_stamp(event);
++			cpu_buffer->write_stamp = delta;
+ 		} else
+ 			cpu_buffer->write_stamp += event->time_delta;
+ 	}
+@@ -2661,7 +2693,7 @@ static struct ring_buffer_event *
+ 	 * If this is the first commit on the page, then it has the same
+ 	 * timestamp as the page itself.
+ 	 */
+-	if (!tail)
++	if (!tail && !ring_buffer_time_stamp_abs(cpu_buffer->buffer))
+ 		info->delta = 0;
+ 
+ 	/* See if we shot pass the end of this buffer page */
+@@ -2739,8 +2771,11 @@ rb_reserve_next_event(struct ring_buffer
+ 	/* make sure this diff is calculated here */
+ 	barrier();
+ 
+-	/* Did the write stamp get updated already? */
+-	if (likely(info.ts >= cpu_buffer->write_stamp)) {
++	if (ring_buffer_time_stamp_abs(buffer)) {
++		info.delta = info.ts;
++		rb_handle_timestamp(cpu_buffer, &info);
++	} else /* Did the write stamp get updated already? */
++		if (likely(info.ts >= cpu_buffer->write_stamp)) {
+ 		info.delta = diff;
+ 		if (unlikely(test_time_stamp(info.delta)))
+ 			rb_handle_timestamp(cpu_buffer, &info);
+@@ -3422,14 +3457,13 @@ rb_update_read_stamp(struct ring_buffer_
+ 		return;
+ 
+ 	case RINGBUF_TYPE_TIME_EXTEND:
+-		delta = event->array[0];
+-		delta <<= TS_SHIFT;
+-		delta += event->time_delta;
++		delta = ring_buffer_event_time_stamp(event);
+ 		cpu_buffer->read_stamp += delta;
+ 		return;
+ 
+ 	case RINGBUF_TYPE_TIME_STAMP:
+-		/* FIXME: not implemented */
++		delta = ring_buffer_event_time_stamp(event);
++		cpu_buffer->read_stamp = delta;
+ 		return;
+ 
+ 	case RINGBUF_TYPE_DATA:
+@@ -3453,14 +3487,13 @@ rb_update_iter_read_stamp(struct ring_bu
+ 		return;
+ 
+ 	case RINGBUF_TYPE_TIME_EXTEND:
+-		delta = event->array[0];
+-		delta <<= TS_SHIFT;
+-		delta += event->time_delta;
++		delta = ring_buffer_event_time_stamp(event);
+ 		iter->read_stamp += delta;
+ 		return;
+ 
+ 	case RINGBUF_TYPE_TIME_STAMP:
+-		/* FIXME: not implemented */
++		delta = ring_buffer_event_time_stamp(event);
++		iter->read_stamp = delta;
+ 		return;
+ 
+ 	case RINGBUF_TYPE_DATA:
+@@ -3684,6 +3717,8 @@ rb_buffer_peek(struct ring_buffer_per_cp
+ 	struct buffer_page *reader;
+ 	int nr_loops = 0;
+ 
++	if (ts)
++		*ts = 0;
+  again:
+ 	/*
+ 	 * We repeat when a time extend is encountered.
+@@ -3720,12 +3755,17 @@ rb_buffer_peek(struct ring_buffer_per_cp
+ 		goto again;
+ 
+ 	case RINGBUF_TYPE_TIME_STAMP:
+-		/* FIXME: not implemented */
++		if (ts) {
++			*ts = ring_buffer_event_time_stamp(event);
++			ring_buffer_normalize_time_stamp(cpu_buffer->buffer,
++							 cpu_buffer->cpu, ts);
++		}
++		/* Internal data, OK to advance */
+ 		rb_advance_reader(cpu_buffer);
+ 		goto again;
+ 
+ 	case RINGBUF_TYPE_DATA:
+-		if (ts) {
++		if (ts && !(*ts)) {
+ 			*ts = cpu_buffer->read_stamp + event->time_delta;
+ 			ring_buffer_normalize_time_stamp(cpu_buffer->buffer,
+ 							 cpu_buffer->cpu, ts);
+@@ -3750,6 +3790,9 @@ rb_iter_peek(struct ring_buffer_iter *it
+ 	struct ring_buffer_event *event;
+ 	int nr_loops = 0;
+ 
++	if (ts)
++		*ts = 0;
++
+ 	cpu_buffer = iter->cpu_buffer;
+ 	buffer = cpu_buffer->buffer;
+ 
+@@ -3802,12 +3845,17 @@ rb_iter_peek(struct ring_buffer_iter *it
+ 		goto again;
+ 
+ 	case RINGBUF_TYPE_TIME_STAMP:
+-		/* FIXME: not implemented */
++		if (ts) {
++			*ts = ring_buffer_event_time_stamp(event);
++			ring_buffer_normalize_time_stamp(cpu_buffer->buffer,
++							 cpu_buffer->cpu, ts);
++		}
++		/* Internal data, OK to advance */
+ 		rb_advance_iter(iter);
+ 		goto again;
+ 
+ 	case RINGBUF_TYPE_DATA:
+-		if (ts) {
++		if (ts && !(*ts)) {
+ 			*ts = iter->read_stamp + event->time_delta;
+ 			ring_buffer_normalize_time_stamp(buffer,
+ 							 cpu_buffer->cpu, ts);
diff --git a/kernel/patches-4.14.x-rt/0072-0015-tracing-Add-timestamp_mode-trace-file.patch b/kernel/patches-4.14.x-rt/0072-0015-tracing-Add-timestamp_mode-trace-file.patch
new file mode 100644
index 000000000..cfab8da4a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0072-0015-tracing-Add-timestamp_mode-trace-file.patch
@@ -0,0 +1,137 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:41 -0600
+Subject: [PATCH 15/48] tracing: Add timestamp_mode trace file
+
+Add a new option flag indicating whether or not the ring buffer is in
+'absolute timestamp' mode.
+
+Currently this is only set/unset by hist triggers that make use of a
+common_timestamp.  As such, there's no reason to make this writeable
+for users - its purpose is only to allow users to determine
+unequivocally whether or not the ring buffer is in that mode (although
+absolute timestamps can coexist with the normal delta timestamps, when
+the ring buffer is in absolute mode, timestamps written while absolute
+mode is in effect take up more space in the buffer, and are not as
+efficient).
+
+Link: http://lkml.kernel.org/r/e8aa7b1cde1cf15014e66545d06ac6ef2ebba456.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 0eba34f9bf5b66217355a6a66054b3194aca123d)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/ftrace.txt |   24 ++++++++++++++++++++
+ kernel/trace/trace.c           |   47 +++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 71 insertions(+)
+
+--- a/Documentation/trace/ftrace.txt
++++ b/Documentation/trace/ftrace.txt
+@@ -539,6 +539,30 @@ After mounting tracefs you will have acc
+ 
+ 	See events.txt for more information.
+ 
++  timestamp_mode:
++
++	Certain tracers may change the timestamp mode used when
++	logging trace events into the event buffer.  Events with
++	different modes can coexist within a buffer but the mode in
++	effect when an event is logged determines which timestamp mode
++	is used for that event.  The default timestamp mode is
++	'delta'.
++
++	Usual timestamp modes for tracing:
++
++	  # cat timestamp_mode
++	  [delta] absolute
++
++	  The timestamp mode with the square brackets around it is the
++	  one in effect.
++
++	  delta: Default timestamp mode - timestamp is a delta against
++	         a per-buffer timestamp.
++
++	  absolute: The timestamp is a full timestamp, not a delta
++                 against some other value.  As such it takes up more
++                 space and is less efficient.
++
+   hwlat_detector:
+ 
+ 	Directory for the Hardware Latency Detector.
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -4520,6 +4520,9 @@ static const char readme_msg[] =
+ #ifdef CONFIG_X86_64
+ 	"     x86-tsc:   TSC cycle counter\n"
+ #endif
++	"\n  timestamp_mode\t-view the mode used to timestamp events\n"
++	"       delta:   Delta difference against a buffer-wide timestamp\n"
++	"    absolute:   Absolute (standalone) timestamp\n"
+ 	"\n  trace_marker\t\t- Writes into this file writes into the kernel buffer\n"
+ 	"\n  trace_marker_raw\t\t- Writes into this file writes binary data into the kernel buffer\n"
+ 	"  tracing_cpumask\t- Limit which CPUs to trace\n"
+@@ -6287,6 +6290,40 @@ static int tracing_clock_open(struct ino
+ 	return ret;
+ }
+ 
++static int tracing_time_stamp_mode_show(struct seq_file *m, void *v)
++{
++	struct trace_array *tr = m->private;
++
++	mutex_lock(&trace_types_lock);
++
++	if (ring_buffer_time_stamp_abs(tr->trace_buffer.buffer))
++		seq_puts(m, "delta [absolute]\n");
++	else
++		seq_puts(m, "[delta] absolute\n");
++
++	mutex_unlock(&trace_types_lock);
++
++	return 0;
++}
++
++static int tracing_time_stamp_mode_open(struct inode *inode, struct file *file)
++{
++	struct trace_array *tr = inode->i_private;
++	int ret;
++
++	if (tracing_disabled)
++		return -ENODEV;
++
++	if (trace_array_get(tr))
++		return -ENODEV;
++
++	ret = single_open(file, tracing_time_stamp_mode_show, inode->i_private);
++	if (ret < 0)
++		trace_array_put(tr);
++
++	return ret;
++}
++
+ int tracing_set_time_stamp_abs(struct trace_array *tr, bool abs)
+ {
+ 	int ret = 0;
+@@ -6565,6 +6602,13 @@ static const struct file_operations trac
+ 	.write		= tracing_clock_write,
+ };
+ 
++static const struct file_operations trace_time_stamp_mode_fops = {
++	.open		= tracing_time_stamp_mode_open,
++	.read		= seq_read,
++	.llseek		= seq_lseek,
++	.release	= tracing_single_release_tr,
++};
++
+ #ifdef CONFIG_TRACER_SNAPSHOT
+ static const struct file_operations snapshot_fops = {
+ 	.open		= tracing_snapshot_open,
+@@ -7887,6 +7931,9 @@ init_tracer_tracefs(struct trace_array *
+ 	trace_create_file("tracing_on", 0644, d_tracer,
+ 			  tr, &rb_simple_fops);
+ 
++	trace_create_file("timestamp_mode", 0444, d_tracer, tr,
++			  &trace_time_stamp_mode_fops);
++
+ 	create_trace_options_dir(tr);
+ 
+ #if defined(CONFIG_TRACER_MAX_TRACE) || defined(CONFIG_HWLAT_TRACER)
diff --git a/kernel/patches-4.14.x-rt/0073-0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch b/kernel/patches-4.14.x-rt/0073-0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch
new file mode 100644
index 000000000..adaba32d0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0073-0016-tracing-Give-event-triggers-access-to-ring_buffer_ev.patch
@@ -0,0 +1,302 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:42 -0600
+Subject: [PATCH 16/48] tracing: Give event triggers access to
+ ring_buffer_event
+
+The ring_buffer event can provide a timestamp that may be useful to
+various triggers - pass it into the handlers for that purpose.
+
+Link: http://lkml.kernel.org/r/6de592683b59fa70ffa5d43d0109896623fc1367.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 373514437a6f75b5cfe890742b590f2c12f6c335)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/trace_events.h        |   14 ++++++----
+ kernel/trace/trace.h                |    9 +++---
+ kernel/trace/trace_events_hist.c    |   11 +++++---
+ kernel/trace/trace_events_trigger.c |   47 ++++++++++++++++++++++--------------
+ 4 files changed, 49 insertions(+), 32 deletions(-)
+
+--- a/include/linux/trace_events.h
++++ b/include/linux/trace_events.h
+@@ -402,11 +402,13 @@ enum event_trigger_type {
+ 
+ extern int filter_match_preds(struct event_filter *filter, void *rec);
+ 
+-extern enum event_trigger_type event_triggers_call(struct trace_event_file *file,
+-						   void *rec);
+-extern void event_triggers_post_call(struct trace_event_file *file,
+-				     enum event_trigger_type tt,
+-				     void *rec);
++extern enum event_trigger_type
++event_triggers_call(struct trace_event_file *file, void *rec,
++		    struct ring_buffer_event *event);
++extern void
++event_triggers_post_call(struct trace_event_file *file,
++			 enum event_trigger_type tt,
++			 void *rec, struct ring_buffer_event *event);
+ 
+ bool trace_event_ignore_this_pid(struct trace_event_file *trace_file);
+ 
+@@ -426,7 +428,7 @@ trace_trigger_soft_disabled(struct trace
+ 
+ 	if (!(eflags & EVENT_FILE_FL_TRIGGER_COND)) {
+ 		if (eflags & EVENT_FILE_FL_TRIGGER_MODE)
+-			event_triggers_call(file, NULL);
++			event_triggers_call(file, NULL, NULL);
+ 		if (eflags & EVENT_FILE_FL_SOFT_DISABLED)
+ 			return true;
+ 		if (eflags & EVENT_FILE_FL_PID_FILTER)
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -1296,7 +1296,7 @@ static inline bool
+ 	unsigned long eflags = file->flags;
+ 
+ 	if (eflags & EVENT_FILE_FL_TRIGGER_COND)
+-		*tt = event_triggers_call(file, entry);
++		*tt = event_triggers_call(file, entry, event);
+ 
+ 	if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||
+ 	    (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
+@@ -1333,7 +1333,7 @@ event_trigger_unlock_commit(struct trace
+ 		trace_buffer_unlock_commit(file->tr, buffer, event, irq_flags, pc);
+ 
+ 	if (tt)
+-		event_triggers_post_call(file, tt, entry);
++		event_triggers_post_call(file, tt, entry, event);
+ }
+ 
+ /**
+@@ -1366,7 +1366,7 @@ event_trigger_unlock_commit_regs(struct
+ 						irq_flags, pc, regs);
+ 
+ 	if (tt)
+-		event_triggers_post_call(file, tt, entry);
++		event_triggers_post_call(file, tt, entry, event);
+ }
+ 
+ #define FILTER_PRED_INVALID	((unsigned short)-1)
+@@ -1591,7 +1591,8 @@ extern int register_trigger_hist_enable_
+  */
+ struct event_trigger_ops {
+ 	void			(*func)(struct event_trigger_data *data,
+-					void *rec);
++					void *rec,
++					struct ring_buffer_event *rbe);
+ 	int			(*init)(struct event_trigger_ops *ops,
+ 					struct event_trigger_data *data);
+ 	void			(*free)(struct event_trigger_ops *ops,
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -909,7 +909,8 @@ static inline void add_to_key(char *comp
+ 	memcpy(compound_key + key_field->offset, key, size);
+ }
+ 
+-static void event_hist_trigger(struct event_trigger_data *data, void *rec)
++static void event_hist_trigger(struct event_trigger_data *data, void *rec,
++			       struct ring_buffer_event *event)
+ {
+ 	struct hist_trigger_data *hist_data = data->private_data;
+ 	bool use_compound_key = (hist_data->n_keys > 1);
+@@ -1660,7 +1661,8 @@ static struct event_command trigger_hist
+ }
+ 
+ static void
+-hist_enable_trigger(struct event_trigger_data *data, void *rec)
++hist_enable_trigger(struct event_trigger_data *data, void *rec,
++		    struct ring_buffer_event *event)
+ {
+ 	struct enable_trigger_data *enable_data = data->private_data;
+ 	struct event_trigger_data *test;
+@@ -1676,7 +1678,8 @@ hist_enable_trigger(struct event_trigger
+ }
+ 
+ static void
+-hist_enable_count_trigger(struct event_trigger_data *data, void *rec)
++hist_enable_count_trigger(struct event_trigger_data *data, void *rec,
++			  struct ring_buffer_event *event)
+ {
+ 	if (!data->count)
+ 		return;
+@@ -1684,7 +1687,7 @@ hist_enable_count_trigger(struct event_t
+ 	if (data->count != -1)
+ 		(data->count)--;
+ 
+-	hist_enable_trigger(data, rec);
++	hist_enable_trigger(data, rec, event);
+ }
+ 
+ static struct event_trigger_ops hist_enable_trigger_ops = {
+--- a/kernel/trace/trace_events_trigger.c
++++ b/kernel/trace/trace_events_trigger.c
+@@ -63,7 +63,8 @@ void trigger_data_free(struct event_trig
+  * any trigger that should be deferred, ETT_NONE if nothing to defer.
+  */
+ enum event_trigger_type
+-event_triggers_call(struct trace_event_file *file, void *rec)
++event_triggers_call(struct trace_event_file *file, void *rec,
++		    struct ring_buffer_event *event)
+ {
+ 	struct event_trigger_data *data;
+ 	enum event_trigger_type tt = ETT_NONE;
+@@ -76,7 +77,7 @@ event_triggers_call(struct trace_event_f
+ 		if (data->paused)
+ 			continue;
+ 		if (!rec) {
+-			data->ops->func(data, rec);
++			data->ops->func(data, rec, event);
+ 			continue;
+ 		}
+ 		filter = rcu_dereference_sched(data->filter);
+@@ -86,7 +87,7 @@ event_triggers_call(struct trace_event_f
+ 			tt |= data->cmd_ops->trigger_type;
+ 			continue;
+ 		}
+-		data->ops->func(data, rec);
++		data->ops->func(data, rec, event);
+ 	}
+ 	return tt;
+ }
+@@ -108,7 +109,7 @@ EXPORT_SYMBOL_GPL(event_triggers_call);
+ void
+ event_triggers_post_call(struct trace_event_file *file,
+ 			 enum event_trigger_type tt,
+-			 void *rec)
++			 void *rec, struct ring_buffer_event *event)
+ {
+ 	struct event_trigger_data *data;
+ 
+@@ -116,7 +117,7 @@ event_triggers_post_call(struct trace_ev
+ 		if (data->paused)
+ 			continue;
+ 		if (data->cmd_ops->trigger_type & tt)
+-			data->ops->func(data, rec);
++			data->ops->func(data, rec, event);
+ 	}
+ }
+ EXPORT_SYMBOL_GPL(event_triggers_post_call);
+@@ -909,7 +910,8 @@ void set_named_trigger_data(struct event
+ }
+ 
+ static void
+-traceon_trigger(struct event_trigger_data *data, void *rec)
++traceon_trigger(struct event_trigger_data *data, void *rec,
++		struct ring_buffer_event *event)
+ {
+ 	if (tracing_is_on())
+ 		return;
+@@ -918,7 +920,8 @@ traceon_trigger(struct event_trigger_dat
+ }
+ 
+ static void
+-traceon_count_trigger(struct event_trigger_data *data, void *rec)
++traceon_count_trigger(struct event_trigger_data *data, void *rec,
++		      struct ring_buffer_event *event)
+ {
+ 	if (tracing_is_on())
+ 		return;
+@@ -933,7 +936,8 @@ traceon_count_trigger(struct event_trigg
+ }
+ 
+ static void
+-traceoff_trigger(struct event_trigger_data *data, void *rec)
++traceoff_trigger(struct event_trigger_data *data, void *rec,
++		 struct ring_buffer_event *event)
+ {
+ 	if (!tracing_is_on())
+ 		return;
+@@ -942,7 +946,8 @@ traceoff_trigger(struct event_trigger_da
+ }
+ 
+ static void
+-traceoff_count_trigger(struct event_trigger_data *data, void *rec)
++traceoff_count_trigger(struct event_trigger_data *data, void *rec,
++		       struct ring_buffer_event *event)
+ {
+ 	if (!tracing_is_on())
+ 		return;
+@@ -1039,13 +1044,15 @@ static struct event_command trigger_trac
+ 
+ #ifdef CONFIG_TRACER_SNAPSHOT
+ static void
+-snapshot_trigger(struct event_trigger_data *data, void *rec)
++snapshot_trigger(struct event_trigger_data *data, void *rec,
++		 struct ring_buffer_event *event)
+ {
+ 	tracing_snapshot();
+ }
+ 
+ static void
+-snapshot_count_trigger(struct event_trigger_data *data, void *rec)
++snapshot_count_trigger(struct event_trigger_data *data, void *rec,
++		       struct ring_buffer_event *event)
+ {
+ 	if (!data->count)
+ 		return;
+@@ -1053,7 +1060,7 @@ snapshot_count_trigger(struct event_trig
+ 	if (data->count != -1)
+ 		(data->count)--;
+ 
+-	snapshot_trigger(data, rec);
++	snapshot_trigger(data, rec, event);
+ }
+ 
+ static int
+@@ -1132,13 +1139,15 @@ static __init int register_trigger_snaps
+ #define STACK_SKIP 3
+ 
+ static void
+-stacktrace_trigger(struct event_trigger_data *data, void *rec)
++stacktrace_trigger(struct event_trigger_data *data, void *rec,
++		   struct ring_buffer_event *event)
+ {
+ 	trace_dump_stack(STACK_SKIP);
+ }
+ 
+ static void
+-stacktrace_count_trigger(struct event_trigger_data *data, void *rec)
++stacktrace_count_trigger(struct event_trigger_data *data, void *rec,
++			 struct ring_buffer_event *event)
+ {
+ 	if (!data->count)
+ 		return;
+@@ -1146,7 +1155,7 @@ stacktrace_count_trigger(struct event_tr
+ 	if (data->count != -1)
+ 		(data->count)--;
+ 
+-	stacktrace_trigger(data, rec);
++	stacktrace_trigger(data, rec, event);
+ }
+ 
+ static int
+@@ -1208,7 +1217,8 @@ static __init void unregister_trigger_tr
+ }
+ 
+ static void
+-event_enable_trigger(struct event_trigger_data *data, void *rec)
++event_enable_trigger(struct event_trigger_data *data, void *rec,
++		     struct ring_buffer_event *event)
+ {
+ 	struct enable_trigger_data *enable_data = data->private_data;
+ 
+@@ -1219,7 +1229,8 @@ event_enable_trigger(struct event_trigge
+ }
+ 
+ static void
+-event_enable_count_trigger(struct event_trigger_data *data, void *rec)
++event_enable_count_trigger(struct event_trigger_data *data, void *rec,
++			   struct ring_buffer_event *event)
+ {
+ 	struct enable_trigger_data *enable_data = data->private_data;
+ 
+@@ -1233,7 +1244,7 @@ event_enable_count_trigger(struct event_
+ 	if (data->count != -1)
+ 		(data->count)--;
+ 
+-	event_enable_trigger(data, rec);
++	event_enable_trigger(data, rec, event);
+ }
+ 
+ int event_enable_trigger_print(struct seq_file *m,
diff --git a/kernel/patches-4.14.x-rt/0074-0017-tracing-Add-ring-buffer-event-param-to-hist-field-fu.patch b/kernel/patches-4.14.x-rt/0074-0017-tracing-Add-ring-buffer-event-param-to-hist-field-fu.patch
new file mode 100644
index 000000000..ac7f0824b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0074-0017-tracing-Add-ring-buffer-event-param-to-hist-field-fu.patch
@@ -0,0 +1,143 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:43 -0600
+Subject: [PATCH 17/48] tracing: Add ring buffer event param to hist field
+ functions
+
+Some events such as timestamps require access to a ring_buffer_event
+struct; add a param so that hist field functions can access that.
+
+Link: http://lkml.kernel.org/r/2ff4af18e72b6002eb86b26b2a7f39cef7d1dfe4.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit df7253a730d0aaef760d45ea234dc087ba7cac88)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   39 ++++++++++++++++++++++++---------------
+ 1 file changed, 24 insertions(+), 15 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -26,7 +26,8 @@
+ 
+ struct hist_field;
+ 
+-typedef u64 (*hist_field_fn_t) (struct hist_field *field, void *event);
++typedef u64 (*hist_field_fn_t) (struct hist_field *field, void *event,
++				struct ring_buffer_event *rbe);
+ 
+ #define HIST_FIELD_OPERANDS_MAX	2
+ 
+@@ -40,24 +41,28 @@ struct hist_field {
+ 	struct hist_field		*operands[HIST_FIELD_OPERANDS_MAX];
+ };
+ 
+-static u64 hist_field_none(struct hist_field *field, void *event)
++static u64 hist_field_none(struct hist_field *field, void *event,
++			   struct ring_buffer_event *rbe)
+ {
+ 	return 0;
+ }
+ 
+-static u64 hist_field_counter(struct hist_field *field, void *event)
++static u64 hist_field_counter(struct hist_field *field, void *event,
++			      struct ring_buffer_event *rbe)
+ {
+ 	return 1;
+ }
+ 
+-static u64 hist_field_string(struct hist_field *hist_field, void *event)
++static u64 hist_field_string(struct hist_field *hist_field, void *event,
++			     struct ring_buffer_event *rbe)
+ {
+ 	char *addr = (char *)(event + hist_field->field->offset);
+ 
+ 	return (u64)(unsigned long)addr;
+ }
+ 
+-static u64 hist_field_dynstring(struct hist_field *hist_field, void *event)
++static u64 hist_field_dynstring(struct hist_field *hist_field, void *event,
++				struct ring_buffer_event *rbe)
+ {
+ 	u32 str_item = *(u32 *)(event + hist_field->field->offset);
+ 	int str_loc = str_item & 0xffff;
+@@ -66,24 +71,28 @@ static u64 hist_field_dynstring(struct h
+ 	return (u64)(unsigned long)addr;
+ }
+ 
+-static u64 hist_field_pstring(struct hist_field *hist_field, void *event)
++static u64 hist_field_pstring(struct hist_field *hist_field, void *event,
++			      struct ring_buffer_event *rbe)
+ {
+ 	char **addr = (char **)(event + hist_field->field->offset);
+ 
+ 	return (u64)(unsigned long)*addr;
+ }
+ 
+-static u64 hist_field_log2(struct hist_field *hist_field, void *event)
++static u64 hist_field_log2(struct hist_field *hist_field, void *event,
++			   struct ring_buffer_event *rbe)
+ {
+ 	struct hist_field *operand = hist_field->operands[0];
+ 
+-	u64 val = operand->fn(operand, event);
++	u64 val = operand->fn(operand, event, rbe);
+ 
+ 	return (u64) ilog2(roundup_pow_of_two(val));
+ }
+ 
+ #define DEFINE_HIST_FIELD_FN(type)					\
+-static u64 hist_field_##type(struct hist_field *hist_field, void *event)\
++	static u64 hist_field_##type(struct hist_field *hist_field,	\
++				     void *event,			\
++				     struct ring_buffer_event *rbe)	\
+ {									\
+ 	type *addr = (type *)(event + hist_field->field->offset);	\
+ 									\
+@@ -871,8 +880,8 @@ create_hist_data(unsigned int map_bits,
+ }
+ 
+ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
+-				    struct tracing_map_elt *elt,
+-				    void *rec)
++				    struct tracing_map_elt *elt, void *rec,
++				    struct ring_buffer_event *rbe)
+ {
+ 	struct hist_field *hist_field;
+ 	unsigned int i;
+@@ -880,7 +889,7 @@ static void hist_trigger_elt_update(stru
+ 
+ 	for_each_hist_val_field(i, hist_data) {
+ 		hist_field = hist_data->fields[i];
+-		hist_val = hist_field->fn(hist_field, rec);
++		hist_val = hist_field->fn(hist_field, rec, rbe);
+ 		tracing_map_update_sum(elt, i, hist_val);
+ 	}
+ }
+@@ -910,7 +919,7 @@ static inline void add_to_key(char *comp
+ }
+ 
+ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
+-			       struct ring_buffer_event *event)
++			       struct ring_buffer_event *rbe)
+ {
+ 	struct hist_trigger_data *hist_data = data->private_data;
+ 	bool use_compound_key = (hist_data->n_keys > 1);
+@@ -939,7 +948,7 @@ static void event_hist_trigger(struct ev
+ 
+ 			key = entries;
+ 		} else {
+-			field_contents = key_field->fn(key_field, rec);
++			field_contents = key_field->fn(key_field, rec, rbe);
+ 			if (key_field->flags & HIST_FIELD_FL_STRING) {
+ 				key = (void *)(unsigned long)field_contents;
+ 				use_compound_key = true;
+@@ -956,7 +965,7 @@ static void event_hist_trigger(struct ev
+ 
+ 	elt = tracing_map_insert(hist_data->map, key);
+ 	if (elt)
+-		hist_trigger_elt_update(hist_data, elt, rec);
++		hist_trigger_elt_update(hist_data, elt, rec, rbe);
+ }
+ 
+ static void hist_trigger_stacktrace_print(struct seq_file *m,
diff --git a/kernel/patches-4.14.x-rt/0075-0018-tracing-Break-out-hist-trigger-assignment-parsing.patch b/kernel/patches-4.14.x-rt/0075-0018-tracing-Break-out-hist-trigger-assignment-parsing.patch
new file mode 100644
index 000000000..de84be4d2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0075-0018-tracing-Break-out-hist-trigger-assignment-parsing.patch
@@ -0,0 +1,112 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:44 -0600
+Subject: [PATCH 18/48] tracing: Break out hist trigger assignment parsing
+
+This will make it easier to add variables, and makes the parsing code
+cleaner regardless.
+
+Link: http://lkml.kernel.org/r/e574b3291bbe15e35a4dfc87e5395aa715701c98.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Rajvi Jingar <rajvi.jingar@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 3c1e23def1291b21a2057f883ccc0456418dc5ad)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   72 +++++++++++++++++++++++++++------------
+ 1 file changed, 51 insertions(+), 21 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -251,6 +251,51 @@ static void destroy_hist_trigger_attrs(s
+ 	kfree(attrs);
+ }
+ 
++static int parse_assignment(char *str, struct hist_trigger_attrs *attrs)
++{
++	int ret = 0;
++
++	if ((strncmp(str, "key=", strlen("key=")) == 0) ||
++	    (strncmp(str, "keys=", strlen("keys=")) == 0)) {
++		attrs->keys_str = kstrdup(str, GFP_KERNEL);
++		if (!attrs->keys_str) {
++			ret = -ENOMEM;
++			goto out;
++		}
++	} else if ((strncmp(str, "val=", strlen("val=")) == 0) ||
++		 (strncmp(str, "vals=", strlen("vals=")) == 0) ||
++		 (strncmp(str, "values=", strlen("values=")) == 0)) {
++		attrs->vals_str = kstrdup(str, GFP_KERNEL);
++		if (!attrs->vals_str) {
++			ret = -ENOMEM;
++			goto out;
++		}
++	} else if (strncmp(str, "sort=", strlen("sort=")) == 0) {
++		attrs->sort_key_str = kstrdup(str, GFP_KERNEL);
++		if (!attrs->sort_key_str) {
++			ret = -ENOMEM;
++			goto out;
++		}
++	} else if (strncmp(str, "name=", strlen("name=")) == 0) {
++		attrs->name = kstrdup(str, GFP_KERNEL);
++		if (!attrs->name) {
++			ret = -ENOMEM;
++			goto out;
++		}
++	} else if (strncmp(str, "size=", strlen("size=")) == 0) {
++		int map_bits = parse_map_size(str);
++
++		if (map_bits < 0) {
++			ret = map_bits;
++			goto out;
++		}
++		attrs->map_bits = map_bits;
++	} else
++		ret = -EINVAL;
++ out:
++	return ret;
++}
++
+ static struct hist_trigger_attrs *parse_hist_trigger_attrs(char *trigger_str)
+ {
+ 	struct hist_trigger_attrs *attrs;
+@@ -263,33 +308,18 @@ static struct hist_trigger_attrs *parse_
+ 	while (trigger_str) {
+ 		char *str = strsep(&trigger_str, ":");
+ 
+-		if ((strncmp(str, "key=", strlen("key=")) == 0) ||
+-		    (strncmp(str, "keys=", strlen("keys=")) == 0))
+-			attrs->keys_str = kstrdup(str, GFP_KERNEL);
+-		else if ((strncmp(str, "val=", strlen("val=")) == 0) ||
+-			 (strncmp(str, "vals=", strlen("vals=")) == 0) ||
+-			 (strncmp(str, "values=", strlen("values=")) == 0))
+-			attrs->vals_str = kstrdup(str, GFP_KERNEL);
+-		else if (strncmp(str, "sort=", strlen("sort=")) == 0)
+-			attrs->sort_key_str = kstrdup(str, GFP_KERNEL);
+-		else if (strncmp(str, "name=", strlen("name=")) == 0)
+-			attrs->name = kstrdup(str, GFP_KERNEL);
+-		else if (strcmp(str, "pause") == 0)
++		if (strchr(str, '=')) {
++			ret = parse_assignment(str, attrs);
++			if (ret)
++				goto free;
++		} else if (strcmp(str, "pause") == 0)
+ 			attrs->pause = true;
+ 		else if ((strcmp(str, "cont") == 0) ||
+ 			 (strcmp(str, "continue") == 0))
+ 			attrs->cont = true;
+ 		else if (strcmp(str, "clear") == 0)
+ 			attrs->clear = true;
+-		else if (strncmp(str, "size=", strlen("size=")) == 0) {
+-			int map_bits = parse_map_size(str);
+-
+-			if (map_bits < 0) {
+-				ret = map_bits;
+-				goto free;
+-			}
+-			attrs->map_bits = map_bits;
+-		} else {
++		else {
+ 			ret = -EINVAL;
+ 			goto free;
+ 		}
diff --git a/kernel/patches-4.14.x-rt/0076-0019-tracing-Add-hist-trigger-timestamp-support.patch b/kernel/patches-4.14.x-rt/0076-0019-tracing-Add-hist-trigger-timestamp-support.patch
new file mode 100644
index 000000000..dfbf39e6a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0076-0019-tracing-Add-hist-trigger-timestamp-support.patch
@@ -0,0 +1,246 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:45 -0600
+Subject: [PATCH 19/48] tracing: Add hist trigger timestamp support
+
+Add support for a timestamp event field.  This is actually a 'pseudo-'
+event field in that it behaves like it's part of the event record, but
+is really part of the corresponding ring buffer event.
+
+To make use of the timestamp field, users can specify
+"common_timestamp" as a field name for any histogram.  Note that this
+doesn't make much sense on its own either as either a key or value,
+but needs to be supported even so, since follow-on patches will add
+support for making use of this field in time deltas.  The
+common_timestamp 'field' is not a bona fide event field - so you won't
+find it in the event description - but rather it's a synthetic field
+that can be used like a real field.
+
+Note that the use of this field requires the ring buffer be put into
+'absolute timestamp' mode, which saves the complete timestamp for each
+event rather than an offset.  This mode will be enabled if and only if
+a histogram makes use of the "common_timestamp" field.
+
+Link: http://lkml.kernel.org/r/97afbd646ed146e26271f3458b4b33e16d7817c2.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Baohong Liu <baohong.liu@intel.com>
+[kasan use-after-free fix]
+Signed-off-by: Vedang Patel <vedang.patel@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 5d9d58b00ff82078deac8557c91359cd13c8959d)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   94 +++++++++++++++++++++++++++++----------
+ 1 file changed, 71 insertions(+), 23 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -89,6 +89,12 @@ static u64 hist_field_log2(struct hist_f
+ 	return (u64) ilog2(roundup_pow_of_two(val));
+ }
+ 
++static u64 hist_field_timestamp(struct hist_field *hist_field, void *event,
++				struct ring_buffer_event *rbe)
++{
++	return ring_buffer_event_time_stamp(rbe);
++}
++
+ #define DEFINE_HIST_FIELD_FN(type)					\
+ 	static u64 hist_field_##type(struct hist_field *hist_field,	\
+ 				     void *event,			\
+@@ -135,6 +141,7 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_SYSCALL		= 1 << 7,
+ 	HIST_FIELD_FL_STACKTRACE	= 1 << 8,
+ 	HIST_FIELD_FL_LOG2		= 1 << 9,
++	HIST_FIELD_FL_TIMESTAMP		= 1 << 10,
+ };
+ 
+ struct hist_trigger_attrs {
+@@ -159,6 +166,7 @@ struct hist_trigger_data {
+ 	struct trace_event_file		*event_file;
+ 	struct hist_trigger_attrs	*attrs;
+ 	struct tracing_map		*map;
++	bool				enable_timestamps;
+ };
+ 
+ static const char *hist_field_name(struct hist_field *field,
+@@ -173,6 +181,8 @@ static const char *hist_field_name(struc
+ 		field_name = field->field->name;
+ 	else if (field->flags & HIST_FIELD_FL_LOG2)
+ 		field_name = hist_field_name(field->operands[0], ++level);
++	else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
++		field_name = "common_timestamp";
+ 
+ 	if (field_name == NULL)
+ 		field_name = "";
+@@ -440,6 +450,12 @@ static struct hist_field *create_hist_fi
+ 		goto out;
+ 	}
+ 
++	if (flags & HIST_FIELD_FL_TIMESTAMP) {
++		hist_field->fn = hist_field_timestamp;
++		hist_field->size = sizeof(u64);
++		goto out;
++	}
++
+ 	if (WARN_ON_ONCE(!field))
+ 		goto out;
+ 
+@@ -517,10 +533,15 @@ static int create_val_field(struct hist_
+ 		}
+ 	}
+ 
+-	field = trace_find_event_field(file->event_call, field_name);
+-	if (!field || !field->size) {
+-		ret = -EINVAL;
+-		goto out;
++	if (strcmp(field_name, "common_timestamp") == 0) {
++		flags |= HIST_FIELD_FL_TIMESTAMP;
++		hist_data->enable_timestamps = true;
++	} else {
++		field = trace_find_event_field(file->event_call, field_name);
++		if (!field || !field->size) {
++			ret = -EINVAL;
++			goto out;
++		}
+ 	}
+ 
+ 	hist_data->fields[val_idx] = create_hist_field(field, flags);
+@@ -615,16 +636,22 @@ static int create_key_field(struct hist_
+ 			}
+ 		}
+ 
+-		field = trace_find_event_field(file->event_call, field_name);
+-		if (!field || !field->size) {
+-			ret = -EINVAL;
+-			goto out;
+-		}
++		if (strcmp(field_name, "common_timestamp") == 0) {
++			flags |= HIST_FIELD_FL_TIMESTAMP;
++			hist_data->enable_timestamps = true;
++			key_size = sizeof(u64);
++		} else {
++			field = trace_find_event_field(file->event_call, field_name);
++			if (!field || !field->size) {
++				ret = -EINVAL;
++				goto out;
++			}
+ 
+-		if (is_string_field(field))
+-			key_size = MAX_FILTER_STR_VAL;
+-		else
+-			key_size = field->size;
++			if (is_string_field(field))
++				key_size = MAX_FILTER_STR_VAL;
++			else
++				key_size = field->size;
++		}
+ 	}
+ 
+ 	hist_data->fields[key_idx] = create_hist_field(field, flags);
+@@ -820,6 +847,9 @@ static int create_tracing_map_fields(str
+ 
+ 			if (hist_field->flags & HIST_FIELD_FL_STACKTRACE)
+ 				cmp_fn = tracing_map_cmp_none;
++			else if (!field)
++				cmp_fn = tracing_map_cmp_num(hist_field->size,
++							     hist_field->is_signed);
+ 			else if (is_string_field(field))
+ 				cmp_fn = tracing_map_cmp_string;
+ 			else
+@@ -1217,7 +1247,11 @@ static void hist_field_print(struct seq_
+ {
+ 	const char *field_name = hist_field_name(hist_field, 0);
+ 
+-	seq_printf(m, "%s", field_name);
++	if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP)
++		seq_puts(m, "common_timestamp");
++	else if (field_name)
++		seq_printf(m, "%s", field_name);
++
+ 	if (hist_field->flags) {
+ 		const char *flags_str = get_hist_field_flags(hist_field);
+ 
+@@ -1268,27 +1302,25 @@ static int event_hist_trigger_print(stru
+ 
+ 	for (i = 0; i < hist_data->n_sort_keys; i++) {
+ 		struct tracing_map_sort_key *sort_key;
++		unsigned int idx;
+ 
+ 		sort_key = &hist_data->sort_keys[i];
++		idx = sort_key->field_idx;
++
++		if (WARN_ON(idx >= TRACING_MAP_FIELDS_MAX))
++			return -EINVAL;
+ 
+ 		if (i > 0)
+ 			seq_puts(m, ",");
+ 
+-		if (sort_key->field_idx == HITCOUNT_IDX)
++		if (idx == HITCOUNT_IDX)
+ 			seq_puts(m, "hitcount");
+-		else {
+-			unsigned int idx = sort_key->field_idx;
+-
+-			if (WARN_ON(idx >= TRACING_MAP_FIELDS_MAX))
+-				return -EINVAL;
+-
++		else
+ 			hist_field_print(m, hist_data->fields[idx]);
+-		}
+ 
+ 		if (sort_key->descending)
+ 			seq_puts(m, ".descending");
+ 	}
+-
+ 	seq_printf(m, ":size=%u", (1 << hist_data->map->map_bits));
+ 
+ 	if (data->filter_str)
+@@ -1456,6 +1488,10 @@ static bool hist_trigger_match(struct ev
+ 			return false;
+ 		if (key_field->offset != key_field_test->offset)
+ 			return false;
++		if (key_field->size != key_field_test->size)
++			return false;
++		if (key_field->is_signed != key_field_test->is_signed)
++			return false;
+ 	}
+ 
+ 	for (i = 0; i < hist_data->n_sort_keys; i++) {
+@@ -1538,6 +1574,9 @@ static int hist_register_trigger(char *g
+ 
+ 	update_cond_flag(file);
+ 
++	if (hist_data->enable_timestamps)
++		tracing_set_time_stamp_abs(file->tr, true);
++
+ 	if (trace_event_trigger_enable_disable(file, 1) < 0) {
+ 		list_del_rcu(&data->list);
+ 		update_cond_flag(file);
+@@ -1572,17 +1611,26 @@ static void hist_unregister_trigger(char
+ 
+ 	if (unregistered && test->ops->free)
+ 		test->ops->free(test->ops, test);
++
++	if (hist_data->enable_timestamps) {
++		if (unregistered)
++			tracing_set_time_stamp_abs(file->tr, false);
++	}
+ }
+ 
+ static void hist_unreg_all(struct trace_event_file *file)
+ {
+ 	struct event_trigger_data *test, *n;
++	struct hist_trigger_data *hist_data;
+ 
+ 	list_for_each_entry_safe(test, n, &file->triggers, list) {
+ 		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			hist_data = test->private_data;
+ 			list_del_rcu(&test->list);
+ 			trace_event_trigger_enable_disable(file, 0);
+ 			update_cond_flag(file);
++			if (hist_data->enable_timestamps)
++				tracing_set_time_stamp_abs(file->tr, false);
+ 			if (test->ops->free)
+ 				test->ops->free(test->ops, test);
+ 		}
diff --git a/kernel/patches-4.14.x-rt/0077-0020-tracing-Add-per-element-variable-support-to-tracing_.patch b/kernel/patches-4.14.x-rt/0077-0020-tracing-Add-per-element-variable-support-to-tracing_.patch
new file mode 100644
index 000000000..909886416
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0077-0020-tracing-Add-per-element-variable-support-to-tracing_.patch
@@ -0,0 +1,224 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:46 -0600
+Subject: [PATCH 20/48] tracing: Add per-element variable support to
+ tracing_map
+
+In order to allow information to be passed between trace events, add
+support for per-element variables to tracing_map.  This provides a
+means for histograms to associate a value or values with an entry when
+it's saved or updated, and retrieved by a subsequent event occurrences.
+
+Variables can be set using tracing_map_set_var() and read using
+tracing_map_read_var().  tracing_map_var_set() returns true or false
+depending on whether or not the variable has been set or not, which is
+important for event-matching applications.
+
+tracing_map_read_var_once() reads the variable and resets it to the
+'unset' state, implementing read-once variables, which are also
+important for event-matching uses.
+
+Link: http://lkml.kernel.org/r/7fa001108252556f0c6dd9d63145eabfe3370d1a.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 42a38132f9e154e1fa2dd2182dff17f9c0e7ee7e)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/tracing_map.c |  108 +++++++++++++++++++++++++++++++++++++++++++++
+ kernel/trace/tracing_map.h |   11 ++++
+ 2 files changed, 119 insertions(+)
+
+--- a/kernel/trace/tracing_map.c
++++ b/kernel/trace/tracing_map.c
+@@ -66,6 +66,73 @@ u64 tracing_map_read_sum(struct tracing_
+ 	return (u64)atomic64_read(&elt->fields[i].sum);
+ }
+ 
++/**
++ * tracing_map_set_var - Assign a tracing_map_elt's variable field
++ * @elt: The tracing_map_elt
++ * @i: The index of the given variable associated with the tracing_map_elt
++ * @n: The value to assign
++ *
++ * Assign n to variable i associated with the specified tracing_map_elt
++ * instance.  The index i is the index returned by the call to
++ * tracing_map_add_var() when the tracing map was set up.
++ */
++void tracing_map_set_var(struct tracing_map_elt *elt, unsigned int i, u64 n)
++{
++	atomic64_set(&elt->vars[i], n);
++	elt->var_set[i] = true;
++}
++
++/**
++ * tracing_map_var_set - Return whether or not a variable has been set
++ * @elt: The tracing_map_elt
++ * @i: The index of the given variable associated with the tracing_map_elt
++ *
++ * Return true if the variable has been set, false otherwise.  The
++ * index i is the index returned by the call to tracing_map_add_var()
++ * when the tracing map was set up.
++ */
++bool tracing_map_var_set(struct tracing_map_elt *elt, unsigned int i)
++{
++	return elt->var_set[i];
++}
++
++/**
++ * tracing_map_read_var - Return the value of a tracing_map_elt's variable field
++ * @elt: The tracing_map_elt
++ * @i: The index of the given variable associated with the tracing_map_elt
++ *
++ * Retrieve the value of the variable i associated with the specified
++ * tracing_map_elt instance.  The index i is the index returned by the
++ * call to tracing_map_add_var() when the tracing map was set
++ * up.
++ *
++ * Return: The variable value associated with field i for elt.
++ */
++u64 tracing_map_read_var(struct tracing_map_elt *elt, unsigned int i)
++{
++	return (u64)atomic64_read(&elt->vars[i]);
++}
++
++/**
++ * tracing_map_read_var_once - Return and reset a tracing_map_elt's variable field
++ * @elt: The tracing_map_elt
++ * @i: The index of the given variable associated with the tracing_map_elt
++ *
++ * Retrieve the value of the variable i associated with the specified
++ * tracing_map_elt instance, and reset the variable to the 'not set'
++ * state.  The index i is the index returned by the call to
++ * tracing_map_add_var() when the tracing map was set up.  The reset
++ * essentially makes the variable a read-once variable if it's only
++ * accessed using this function.
++ *
++ * Return: The variable value associated with field i for elt.
++ */
++u64 tracing_map_read_var_once(struct tracing_map_elt *elt, unsigned int i)
++{
++	elt->var_set[i] = false;
++	return (u64)atomic64_read(&elt->vars[i]);
++}
++
+ int tracing_map_cmp_string(void *val_a, void *val_b)
+ {
+ 	char *a = val_a;
+@@ -171,6 +238,28 @@ int tracing_map_add_sum_field(struct tra
+ }
+ 
+ /**
++ * tracing_map_add_var - Add a field describing a tracing_map var
++ * @map: The tracing_map
++ *
++ * Add a var to the map and return the index identifying it in the map
++ * and associated tracing_map_elts.  This is the index used for
++ * instance to update a var for a particular tracing_map_elt using
++ * tracing_map_update_var() or reading it via tracing_map_read_var().
++ *
++ * Return: The index identifying the var in the map and associated
++ * tracing_map_elts, or -EINVAL on error.
++ */
++int tracing_map_add_var(struct tracing_map *map)
++{
++	int ret = -EINVAL;
++
++	if (map->n_vars < TRACING_MAP_VARS_MAX)
++		ret = map->n_vars++;
++
++	return ret;
++}
++
++/**
+  * tracing_map_add_key_field - Add a field describing a tracing_map key
+  * @map: The tracing_map
+  * @offset: The offset within the key
+@@ -280,6 +369,11 @@ static void tracing_map_elt_clear(struct
+ 		if (elt->fields[i].cmp_fn == tracing_map_cmp_atomic64)
+ 			atomic64_set(&elt->fields[i].sum, 0);
+ 
++	for (i = 0; i < elt->map->n_vars; i++) {
++		atomic64_set(&elt->vars[i], 0);
++		elt->var_set[i] = false;
++	}
++
+ 	if (elt->map->ops && elt->map->ops->elt_clear)
+ 		elt->map->ops->elt_clear(elt);
+ }
+@@ -306,6 +400,8 @@ static void tracing_map_elt_free(struct
+ 	if (elt->map->ops && elt->map->ops->elt_free)
+ 		elt->map->ops->elt_free(elt);
+ 	kfree(elt->fields);
++	kfree(elt->vars);
++	kfree(elt->var_set);
+ 	kfree(elt->key);
+ 	kfree(elt);
+ }
+@@ -332,6 +428,18 @@ static struct tracing_map_elt *tracing_m
+ 		err = -ENOMEM;
+ 		goto free;
+ 	}
++
++	elt->vars = kcalloc(map->n_vars, sizeof(*elt->vars), GFP_KERNEL);
++	if (!elt->vars) {
++		err = -ENOMEM;
++		goto free;
++	}
++
++	elt->var_set = kcalloc(map->n_vars, sizeof(*elt->var_set), GFP_KERNEL);
++	if (!elt->var_set) {
++		err = -ENOMEM;
++		goto free;
++	}
+ 
+ 	tracing_map_elt_init_fields(elt);
+ 
+--- a/kernel/trace/tracing_map.h
++++ b/kernel/trace/tracing_map.h
+@@ -10,6 +10,7 @@
+ #define TRACING_MAP_VALS_MAX		3
+ #define TRACING_MAP_FIELDS_MAX		(TRACING_MAP_KEYS_MAX + \
+ 					 TRACING_MAP_VALS_MAX)
++#define TRACING_MAP_VARS_MAX		16
+ #define TRACING_MAP_SORT_KEYS_MAX	2
+ 
+ typedef int (*tracing_map_cmp_fn_t) (void *val_a, void *val_b);
+@@ -137,6 +138,8 @@ struct tracing_map_field {
+ struct tracing_map_elt {
+ 	struct tracing_map		*map;
+ 	struct tracing_map_field	*fields;
++	atomic64_t			*vars;
++	bool				*var_set;
+ 	void				*key;
+ 	void				*private_data;
+ };
+@@ -192,6 +195,7 @@ struct tracing_map {
+ 	int				key_idx[TRACING_MAP_KEYS_MAX];
+ 	unsigned int			n_keys;
+ 	struct tracing_map_sort_key	sort_key;
++	unsigned int			n_vars;
+ 	atomic64_t			hits;
+ 	atomic64_t			drops;
+ };
+@@ -241,6 +245,7 @@ tracing_map_create(unsigned int map_bits
+ extern int tracing_map_init(struct tracing_map *map);
+ 
+ extern int tracing_map_add_sum_field(struct tracing_map *map);
++extern int tracing_map_add_var(struct tracing_map *map);
+ extern int tracing_map_add_key_field(struct tracing_map *map,
+ 				     unsigned int offset,
+ 				     tracing_map_cmp_fn_t cmp_fn);
+@@ -260,7 +265,13 @@ extern int tracing_map_cmp_none(void *va
+ 
+ extern void tracing_map_update_sum(struct tracing_map_elt *elt,
+ 				   unsigned int i, u64 n);
++extern void tracing_map_set_var(struct tracing_map_elt *elt,
++				unsigned int i, u64 n);
++extern bool tracing_map_var_set(struct tracing_map_elt *elt, unsigned int i);
+ extern u64 tracing_map_read_sum(struct tracing_map_elt *elt, unsigned int i);
++extern u64 tracing_map_read_var(struct tracing_map_elt *elt, unsigned int i);
++extern u64 tracing_map_read_var_once(struct tracing_map_elt *elt, unsigned int i);
++
+ extern void tracing_map_set_field_descr(struct tracing_map *map,
+ 					unsigned int i,
+ 					unsigned int key_offset,
diff --git a/kernel/patches-4.14.x-rt/0078-0021-tracing-Add-hist_data-member-to-hist_field.patch b/kernel/patches-4.14.x-rt/0078-0021-tracing-Add-hist_data-member-to-hist_field.patch
new file mode 100644
index 000000000..e0041209a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0078-0021-tracing-Add-hist_data-member-to-hist_field.patch
@@ -0,0 +1,82 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:47 -0600
+Subject: [PATCH 21/48] tracing: Add hist_data member to hist_field
+
+Allow hist_data access via hist_field.  Some users of hist_fields
+require or will require more access to the associated hist_data.
+
+Link: http://lkml.kernel.org/r/d04cd0768f5228ebb4ac0ba4a847bc4d14d4826f.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 14ab3edac407939009700c04215935576250e969)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -39,6 +39,7 @@ struct hist_field {
+ 	unsigned int			offset;
+ 	unsigned int                    is_signed;
+ 	struct hist_field		*operands[HIST_FIELD_OPERANDS_MAX];
++	struct hist_trigger_data	*hist_data;
+ };
+ 
+ static u64 hist_field_none(struct hist_field *field, void *event,
+@@ -420,7 +421,8 @@ static void destroy_hist_field(struct hi
+ 	kfree(hist_field);
+ }
+ 
+-static struct hist_field *create_hist_field(struct ftrace_event_field *field,
++static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
++					    struct ftrace_event_field *field,
+ 					    unsigned long flags)
+ {
+ 	struct hist_field *hist_field;
+@@ -432,6 +434,8 @@ static struct hist_field *create_hist_fi
+ 	if (!hist_field)
+ 		return NULL;
+ 
++	hist_field->hist_data = hist_data;
++
+ 	if (flags & HIST_FIELD_FL_HITCOUNT) {
+ 		hist_field->fn = hist_field_counter;
+ 		goto out;
+@@ -445,7 +449,7 @@ static struct hist_field *create_hist_fi
+ 	if (flags & HIST_FIELD_FL_LOG2) {
+ 		unsigned long fl = flags & ~HIST_FIELD_FL_LOG2;
+ 		hist_field->fn = hist_field_log2;
+-		hist_field->operands[0] = create_hist_field(field, fl);
++		hist_field->operands[0] = create_hist_field(hist_data, field, fl);
+ 		hist_field->size = hist_field->operands[0]->size;
+ 		goto out;
+ 	}
+@@ -498,7 +502,7 @@ static void destroy_hist_fields(struct h
+ static int create_hitcount_val(struct hist_trigger_data *hist_data)
+ {
+ 	hist_data->fields[HITCOUNT_IDX] =
+-		create_hist_field(NULL, HIST_FIELD_FL_HITCOUNT);
++		create_hist_field(hist_data, NULL, HIST_FIELD_FL_HITCOUNT);
+ 	if (!hist_data->fields[HITCOUNT_IDX])
+ 		return -ENOMEM;
+ 
+@@ -544,7 +548,7 @@ static int create_val_field(struct hist_
+ 		}
+ 	}
+ 
+-	hist_data->fields[val_idx] = create_hist_field(field, flags);
++	hist_data->fields[val_idx] = create_hist_field(hist_data, field, flags);
+ 	if (!hist_data->fields[val_idx]) {
+ 		ret = -ENOMEM;
+ 		goto out;
+@@ -654,7 +658,7 @@ static int create_key_field(struct hist_
+ 		}
+ 	}
+ 
+-	hist_data->fields[key_idx] = create_hist_field(field, flags);
++	hist_data->fields[key_idx] = create_hist_field(hist_data, field, flags);
+ 	if (!hist_data->fields[key_idx]) {
+ 		ret = -ENOMEM;
+ 		goto out;
diff --git a/kernel/patches-4.14.x-rt/0079-0022-tracing-Add-usecs-modifier-for-hist-trigger-timestam.patch b/kernel/patches-4.14.x-rt/0079-0022-tracing-Add-usecs-modifier-for-hist-trigger-timestam.patch
new file mode 100644
index 000000000..81541442f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0079-0022-tracing-Add-usecs-modifier-for-hist-trigger-timestam.patch
@@ -0,0 +1,157 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:48 -0600
+Subject: [PATCH 22/48] tracing: Add usecs modifier for hist trigger timestamps
+
+Appending .usecs onto a common_timestamp field will cause the
+timestamp value to be in microseconds instead of the default
+nanoseconds.  A typical latency histogram using usecs would look like
+this:
+
+   # echo 'hist:keys=pid,prio:ts0=common_timestamp.usecs ...
+   # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0 ...
+
+This also adds an external trace_clock_in_ns() to trace.c for the
+timestamp conversion.
+
+Link: http://lkml.kernel.org/r/4e813705a170b3e13e97dc3135047362fb1a39f3.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 4fa4fdb0fe5d0e87e05b0c5b443cec2269ec0609)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/histogram.txt |    1 +
+ kernel/trace/trace.c              |   13 +++++++++++--
+ kernel/trace/trace.h              |    2 ++
+ kernel/trace/trace_events_hist.c  |   28 ++++++++++++++++++++++------
+ 4 files changed, 36 insertions(+), 8 deletions(-)
+
+--- a/Documentation/trace/histogram.txt
++++ b/Documentation/trace/histogram.txt
+@@ -74,6 +74,7 @@
+ 	.syscall    display a syscall id as a system call name
+ 	.execname   display a common_pid as a program name
+ 	.log2       display log2 value rather than raw number
++	.usecs      display a common_timestamp in microseconds
+ 
+   Note that in general the semantics of a given field aren't
+   interpreted when applying a modifier to it, but there are some
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -1170,6 +1170,14 @@ static struct {
+ 	ARCH_TRACE_CLOCKS
+ };
+ 
++bool trace_clock_in_ns(struct trace_array *tr)
++{
++	if (trace_clocks[tr->clock_id].in_ns)
++		return true;
++
++	return false;
++}
++
+ /*
+  * trace_parser_get_init - gets the buffer for trace parser
+  */
+@@ -4699,8 +4707,9 @@ static const char readme_msg[] =
+ 	"\t            .sym        display an address as a symbol\n"
+ 	"\t            .sym-offset display an address as a symbol and offset\n"
+ 	"\t            .execname   display a common_pid as a program name\n"
+-	"\t            .syscall    display a syscall id as a syscall name\n\n"
+-	"\t            .log2       display log2 value rather than raw number\n\n"
++	"\t            .syscall    display a syscall id as a syscall name\n"
++	"\t            .log2       display log2 value rather than raw number\n"
++	"\t            .usecs      display a common_timestamp in microseconds\n\n"
+ 	"\t    The 'pause' parameter can be used to pause an existing hist\n"
+ 	"\t    trigger or to start a hist trigger but not log any events\n"
+ 	"\t    until told to do so.  'continue' can be used to start or\n"
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -289,6 +289,8 @@ extern void trace_array_put(struct trace
+ 
+ extern int tracing_set_time_stamp_abs(struct trace_array *tr, bool abs);
+ 
++extern bool trace_clock_in_ns(struct trace_array *tr);
++
+ /*
+  * The global tracer (top) should be the first trace array added,
+  * but we check the flag anyway.
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -90,12 +90,6 @@ static u64 hist_field_log2(struct hist_f
+ 	return (u64) ilog2(roundup_pow_of_two(val));
+ }
+ 
+-static u64 hist_field_timestamp(struct hist_field *hist_field, void *event,
+-				struct ring_buffer_event *rbe)
+-{
+-	return ring_buffer_event_time_stamp(rbe);
+-}
+-
+ #define DEFINE_HIST_FIELD_FN(type)					\
+ 	static u64 hist_field_##type(struct hist_field *hist_field,	\
+ 				     void *event,			\
+@@ -143,6 +137,7 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_STACKTRACE	= 1 << 8,
+ 	HIST_FIELD_FL_LOG2		= 1 << 9,
+ 	HIST_FIELD_FL_TIMESTAMP		= 1 << 10,
++	HIST_FIELD_FL_TIMESTAMP_USECS	= 1 << 11,
+ };
+ 
+ struct hist_trigger_attrs {
+@@ -153,6 +148,7 @@ struct hist_trigger_attrs {
+ 	bool		pause;
+ 	bool		cont;
+ 	bool		clear;
++	bool		ts_in_usecs;
+ 	unsigned int	map_bits;
+ };
+ 
+@@ -170,6 +166,20 @@ struct hist_trigger_data {
+ 	bool				enable_timestamps;
+ };
+ 
++static u64 hist_field_timestamp(struct hist_field *hist_field, void *event,
++				struct ring_buffer_event *rbe)
++{
++	struct hist_trigger_data *hist_data = hist_field->hist_data;
++	struct trace_array *tr = hist_data->event_file->tr;
++
++	u64 ts = ring_buffer_event_time_stamp(rbe);
++
++	if (hist_data->attrs->ts_in_usecs && trace_clock_in_ns(tr))
++		ts = ns2usecs(ts);
++
++	return ts;
++}
++
+ static const char *hist_field_name(struct hist_field *field,
+ 				   unsigned int level)
+ {
+@@ -634,6 +644,8 @@ static int create_key_field(struct hist_
+ 				flags |= HIST_FIELD_FL_SYSCALL;
+ 			else if (strcmp(field_str, "log2") == 0)
+ 				flags |= HIST_FIELD_FL_LOG2;
++			else if (strcmp(field_str, "usecs") == 0)
++				flags |= HIST_FIELD_FL_TIMESTAMP_USECS;
+ 			else {
+ 				ret = -EINVAL;
+ 				goto out;
+@@ -643,6 +655,8 @@ static int create_key_field(struct hist_
+ 		if (strcmp(field_name, "common_timestamp") == 0) {
+ 			flags |= HIST_FIELD_FL_TIMESTAMP;
+ 			hist_data->enable_timestamps = true;
++			if (flags & HIST_FIELD_FL_TIMESTAMP_USECS)
++				hist_data->attrs->ts_in_usecs = true;
+ 			key_size = sizeof(u64);
+ 		} else {
+ 			field = trace_find_event_field(file->event_call, field_name);
+@@ -1243,6 +1257,8 @@ static const char *get_hist_field_flags(
+ 		flags_str = "syscall";
+ 	else if (hist_field->flags & HIST_FIELD_FL_LOG2)
+ 		flags_str = "log2";
++	else if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP_USECS)
++		flags_str = "usecs";
+ 
+ 	return flags_str;
+ }
diff --git a/kernel/patches-4.14.x-rt/0080-0023-tracing-Add-variable-support-to-hist-triggers.patch b/kernel/patches-4.14.x-rt/0080-0023-tracing-Add-variable-support-to-hist-triggers.patch
new file mode 100644
index 000000000..4b85d24eb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0080-0023-tracing-Add-variable-support-to-hist-triggers.patch
@@ -0,0 +1,782 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:49 -0600
+Subject: [PATCH 23/48] tracing: Add variable support to hist triggers
+
+Add support for saving the value of a current event's event field by
+assigning it to a variable that can be read by a subsequent event.
+
+The basic syntax for saving a variable is to simply prefix a unique
+variable name not corresponding to any keyword along with an '=' sign
+to any event field.
+
+Both keys and values can be saved and retrieved in this way:
+
+    # echo 'hist:keys=next_pid:vals=$ts0:ts0=common_timestamp ...
+    # echo 'hist:timer_pid=common_pid:key=$timer_pid ...'
+
+If a variable isn't a key variable or prefixed with 'vals=', the
+associated event field will be saved in a variable but won't be summed
+as a value:
+
+    # echo 'hist:keys=next_pid:ts1=common_timestamp:...
+
+Multiple variables can be assigned at the same time:
+
+    # echo 'hist:keys=pid:vals=$ts0,$b,field2:ts0=common_timestamp,b=field1 ...
+
+Multiple (or single) variables can also be assigned at the same time
+using separate assignments:
+
+    # echo 'hist:keys=pid:vals=$ts0:ts0=common_timestamp:b=field1:c=field2 ...
+
+Variables set as above can be used by being referenced from another
+event, as described in a subsequent patch.
+
+Link: http://lkml.kernel.org/r/fc93c4944d9719dbcb1d0067be627d44e98e2adc.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Baohong Liu <baohong.liu@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit b073711690e3af61965e53f197a56638b3c65a81)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  370 ++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 331 insertions(+), 39 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -30,6 +30,13 @@ typedef u64 (*hist_field_fn_t) (struct h
+ 				struct ring_buffer_event *rbe);
+ 
+ #define HIST_FIELD_OPERANDS_MAX	2
++#define HIST_FIELDS_MAX		(TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX)
++
++struct hist_var {
++	char				*name;
++	struct hist_trigger_data	*hist_data;
++	unsigned int			idx;
++};
+ 
+ struct hist_field {
+ 	struct ftrace_event_field	*field;
+@@ -40,6 +47,7 @@ struct hist_field {
+ 	unsigned int                    is_signed;
+ 	struct hist_field		*operands[HIST_FIELD_OPERANDS_MAX];
+ 	struct hist_trigger_data	*hist_data;
++	struct hist_var			var;
+ };
+ 
+ static u64 hist_field_none(struct hist_field *field, void *event,
+@@ -138,6 +146,13 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_LOG2		= 1 << 9,
+ 	HIST_FIELD_FL_TIMESTAMP		= 1 << 10,
+ 	HIST_FIELD_FL_TIMESTAMP_USECS	= 1 << 11,
++	HIST_FIELD_FL_VAR		= 1 << 12,
++};
++
++struct var_defs {
++	unsigned int	n_vars;
++	char		*name[TRACING_MAP_VARS_MAX];
++	char		*expr[TRACING_MAP_VARS_MAX];
+ };
+ 
+ struct hist_trigger_attrs {
+@@ -150,13 +165,19 @@ struct hist_trigger_attrs {
+ 	bool		clear;
+ 	bool		ts_in_usecs;
+ 	unsigned int	map_bits;
++
++	char		*assignment_str[TRACING_MAP_VARS_MAX];
++	unsigned int	n_assignments;
++
++	struct var_defs	var_defs;
+ };
+ 
+ struct hist_trigger_data {
+-	struct hist_field               *fields[TRACING_MAP_FIELDS_MAX];
++	struct hist_field               *fields[HIST_FIELDS_MAX];
+ 	unsigned int			n_vals;
+ 	unsigned int			n_keys;
+ 	unsigned int			n_fields;
++	unsigned int			n_vars;
+ 	unsigned int			key_size;
+ 	struct tracing_map_sort_key	sort_keys[TRACING_MAP_SORT_KEYS_MAX];
+ 	unsigned int			n_sort_keys;
+@@ -164,6 +185,7 @@ struct hist_trigger_data {
+ 	struct hist_trigger_attrs	*attrs;
+ 	struct tracing_map		*map;
+ 	bool				enable_timestamps;
++	bool				remove;
+ };
+ 
+ static u64 hist_field_timestamp(struct hist_field *hist_field, void *event,
+@@ -180,6 +202,48 @@ static u64 hist_field_timestamp(struct h
+ 	return ts;
+ }
+ 
++static struct hist_field *find_var_field(struct hist_trigger_data *hist_data,
++					 const char *var_name)
++{
++	struct hist_field *hist_field, *found = NULL;
++	int i;
++
++	for_each_hist_field(i, hist_data) {
++		hist_field = hist_data->fields[i];
++		if (hist_field && hist_field->flags & HIST_FIELD_FL_VAR &&
++		    strcmp(hist_field->var.name, var_name) == 0) {
++			found = hist_field;
++			break;
++		}
++	}
++
++	return found;
++}
++
++static struct hist_field *find_var(struct hist_trigger_data *hist_data,
++				   struct trace_event_file *file,
++				   const char *var_name)
++{
++	struct hist_trigger_data *test_data;
++	struct event_trigger_data *test;
++	struct hist_field *hist_field;
++
++	hist_field = find_var_field(hist_data, var_name);
++	if (hist_field)
++		return hist_field;
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			test_data = test->private_data;
++			hist_field = find_var_field(test_data, var_name);
++			if (hist_field)
++				return hist_field;
++		}
++	}
++
++	return NULL;
++}
++
+ static const char *hist_field_name(struct hist_field *field,
+ 				   unsigned int level)
+ {
+@@ -262,9 +326,14 @@ static int parse_map_size(char *str)
+ 
+ static void destroy_hist_trigger_attrs(struct hist_trigger_attrs *attrs)
+ {
++	unsigned int i;
++
+ 	if (!attrs)
+ 		return;
+ 
++	for (i = 0; i < attrs->n_assignments; i++)
++		kfree(attrs->assignment_str[i]);
++
+ 	kfree(attrs->name);
+ 	kfree(attrs->sort_key_str);
+ 	kfree(attrs->keys_str);
+@@ -311,8 +380,22 @@ static int parse_assignment(char *str, s
+ 			goto out;
+ 		}
+ 		attrs->map_bits = map_bits;
+-	} else
+-		ret = -EINVAL;
++	} else {
++		char *assignment;
++
++		if (attrs->n_assignments == TRACING_MAP_VARS_MAX) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		assignment = kstrdup(str, GFP_KERNEL);
++		if (!assignment) {
++			ret = -ENOMEM;
++			goto out;
++		}
++
++		attrs->assignment_str[attrs->n_assignments++] = assignment;
++	}
+  out:
+ 	return ret;
+ }
+@@ -428,12 +511,15 @@ static void destroy_hist_field(struct hi
+ 	for (i = 0; i < HIST_FIELD_OPERANDS_MAX; i++)
+ 		destroy_hist_field(hist_field->operands[i], level + 1);
+ 
++	kfree(hist_field->var.name);
++
+ 	kfree(hist_field);
+ }
+ 
+ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data,
+ 					    struct ftrace_event_field *field,
+-					    unsigned long flags)
++					    unsigned long flags,
++					    char *var_name)
+ {
+ 	struct hist_field *hist_field;
+ 
+@@ -459,7 +545,7 @@ static struct hist_field *create_hist_fi
+ 	if (flags & HIST_FIELD_FL_LOG2) {
+ 		unsigned long fl = flags & ~HIST_FIELD_FL_LOG2;
+ 		hist_field->fn = hist_field_log2;
+-		hist_field->operands[0] = create_hist_field(hist_data, field, fl);
++		hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL);
+ 		hist_field->size = hist_field->operands[0]->size;
+ 		goto out;
+ 	}
+@@ -494,14 +580,23 @@ static struct hist_field *create_hist_fi
+ 	hist_field->field = field;
+ 	hist_field->flags = flags;
+ 
++	if (var_name) {
++		hist_field->var.name = kstrdup(var_name, GFP_KERNEL);
++		if (!hist_field->var.name)
++			goto free;
++	}
++
+ 	return hist_field;
++ free:
++	destroy_hist_field(hist_field, 0);
++	return NULL;
+ }
+ 
+ static void destroy_hist_fields(struct hist_trigger_data *hist_data)
+ {
+ 	unsigned int i;
+ 
+-	for (i = 0; i < TRACING_MAP_FIELDS_MAX; i++) {
++	for (i = 0; i < HIST_FIELDS_MAX; i++) {
+ 		if (hist_data->fields[i]) {
+ 			destroy_hist_field(hist_data->fields[i], 0);
+ 			hist_data->fields[i] = NULL;
+@@ -512,11 +607,12 @@ static void destroy_hist_fields(struct h
+ static int create_hitcount_val(struct hist_trigger_data *hist_data)
+ {
+ 	hist_data->fields[HITCOUNT_IDX] =
+-		create_hist_field(hist_data, NULL, HIST_FIELD_FL_HITCOUNT);
++		create_hist_field(hist_data, NULL, HIST_FIELD_FL_HITCOUNT, NULL);
+ 	if (!hist_data->fields[HITCOUNT_IDX])
+ 		return -ENOMEM;
+ 
+ 	hist_data->n_vals++;
++	hist_data->n_fields++;
+ 
+ 	if (WARN_ON(hist_data->n_vals > TRACING_MAP_VALS_MAX))
+ 		return -EINVAL;
+@@ -524,19 +620,16 @@ static int create_hitcount_val(struct hi
+ 	return 0;
+ }
+ 
+-static int create_val_field(struct hist_trigger_data *hist_data,
+-			    unsigned int val_idx,
+-			    struct trace_event_file *file,
+-			    char *field_str)
++static int __create_val_field(struct hist_trigger_data *hist_data,
++			      unsigned int val_idx,
++			      struct trace_event_file *file,
++			      char *var_name, char *field_str,
++			      unsigned long flags)
+ {
+ 	struct ftrace_event_field *field = NULL;
+-	unsigned long flags = 0;
+ 	char *field_name;
+ 	int ret = 0;
+ 
+-	if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX))
+-		return -EINVAL;
+-
+ 	field_name = strsep(&field_str, ".");
+ 	if (field_str) {
+ 		if (strcmp(field_str, "hex") == 0)
+@@ -558,25 +651,58 @@ static int create_val_field(struct hist_
+ 		}
+ 	}
+ 
+-	hist_data->fields[val_idx] = create_hist_field(hist_data, field, flags);
++	hist_data->fields[val_idx] = create_hist_field(hist_data, field, flags, var_name);
+ 	if (!hist_data->fields[val_idx]) {
+ 		ret = -ENOMEM;
+ 		goto out;
+ 	}
+ 
+ 	++hist_data->n_vals;
++	++hist_data->n_fields;
+ 
+-	if (WARN_ON(hist_data->n_vals > TRACING_MAP_VALS_MAX))
++	if (WARN_ON(hist_data->n_vals > TRACING_MAP_VALS_MAX + TRACING_MAP_VARS_MAX))
+ 		ret = -EINVAL;
+  out:
+ 	return ret;
+ }
+ 
++static int create_val_field(struct hist_trigger_data *hist_data,
++			    unsigned int val_idx,
++			    struct trace_event_file *file,
++			    char *field_str)
++{
++	if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX))
++		return -EINVAL;
++
++	return __create_val_field(hist_data, val_idx, file, NULL, field_str, 0);
++}
++
++static int create_var_field(struct hist_trigger_data *hist_data,
++			    unsigned int val_idx,
++			    struct trace_event_file *file,
++			    char *var_name, char *expr_str)
++{
++	unsigned long flags = 0;
++
++	if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX + TRACING_MAP_VARS_MAX))
++		return -EINVAL;
++	if (find_var(hist_data, file, var_name) && !hist_data->remove) {
++		return -EINVAL;
++	}
++
++	flags |= HIST_FIELD_FL_VAR;
++	hist_data->n_vars++;
++	if (WARN_ON(hist_data->n_vars > TRACING_MAP_VARS_MAX))
++		return -EINVAL;
++
++	return __create_val_field(hist_data, val_idx, file, var_name, expr_str, flags);
++}
++
+ static int create_val_fields(struct hist_trigger_data *hist_data,
+ 			     struct trace_event_file *file)
+ {
+ 	char *fields_str, *field_str;
+-	unsigned int i, j;
++	unsigned int i, j = 1;
+ 	int ret;
+ 
+ 	ret = create_hitcount_val(hist_data);
+@@ -596,12 +722,15 @@ static int create_val_fields(struct hist
+ 		field_str = strsep(&fields_str, ",");
+ 		if (!field_str)
+ 			break;
++
+ 		if (strcmp(field_str, "hitcount") == 0)
+ 			continue;
++
+ 		ret = create_val_field(hist_data, j++, file, field_str);
+ 		if (ret)
+ 			goto out;
+ 	}
++
+ 	if (fields_str && (strcmp(fields_str, "hitcount") != 0))
+ 		ret = -EINVAL;
+  out:
+@@ -615,11 +744,12 @@ static int create_key_field(struct hist_
+ 			    char *field_str)
+ {
+ 	struct ftrace_event_field *field = NULL;
++	struct hist_field *hist_field = NULL;
+ 	unsigned long flags = 0;
+ 	unsigned int key_size;
+ 	int ret = 0;
+ 
+-	if (WARN_ON(key_idx >= TRACING_MAP_FIELDS_MAX))
++	if (WARN_ON(key_idx >= HIST_FIELDS_MAX))
+ 		return -EINVAL;
+ 
+ 	flags |= HIST_FIELD_FL_KEY;
+@@ -627,6 +757,7 @@ static int create_key_field(struct hist_
+ 	if (strcmp(field_str, "stacktrace") == 0) {
+ 		flags |= HIST_FIELD_FL_STACKTRACE;
+ 		key_size = sizeof(unsigned long) * HIST_STACKTRACE_DEPTH;
++		hist_field = create_hist_field(hist_data, NULL, flags, NULL);
+ 	} else {
+ 		char *field_name = strsep(&field_str, ".");
+ 
+@@ -672,7 +803,7 @@ static int create_key_field(struct hist_
+ 		}
+ 	}
+ 
+-	hist_data->fields[key_idx] = create_hist_field(hist_data, field, flags);
++	hist_data->fields[key_idx] = create_hist_field(hist_data, field, flags, NULL);
+ 	if (!hist_data->fields[key_idx]) {
+ 		ret = -ENOMEM;
+ 		goto out;
+@@ -688,6 +819,7 @@ static int create_key_field(struct hist_
+ 	}
+ 
+ 	hist_data->n_keys++;
++	hist_data->n_fields++;
+ 
+ 	if (WARN_ON(hist_data->n_keys > TRACING_MAP_KEYS_MAX))
+ 		return -EINVAL;
+@@ -731,21 +863,111 @@ static int create_key_fields(struct hist
+ 	return ret;
+ }
+ 
++static int create_var_fields(struct hist_trigger_data *hist_data,
++			     struct trace_event_file *file)
++{
++	unsigned int i, j = hist_data->n_vals;
++	int ret = 0;
++
++	unsigned int n_vars = hist_data->attrs->var_defs.n_vars;
++
++	for (i = 0; i < n_vars; i++) {
++		char *var_name = hist_data->attrs->var_defs.name[i];
++		char *expr = hist_data->attrs->var_defs.expr[i];
++
++		ret = create_var_field(hist_data, j++, file, var_name, expr);
++		if (ret)
++			goto out;
++	}
++ out:
++	return ret;
++}
++
++static void free_var_defs(struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->attrs->var_defs.n_vars; i++) {
++		kfree(hist_data->attrs->var_defs.name[i]);
++		kfree(hist_data->attrs->var_defs.expr[i]);
++	}
++
++	hist_data->attrs->var_defs.n_vars = 0;
++}
++
++static int parse_var_defs(struct hist_trigger_data *hist_data)
++{
++	char *s, *str, *var_name, *field_str;
++	unsigned int i, j, n_vars = 0;
++	int ret = 0;
++
++	for (i = 0; i < hist_data->attrs->n_assignments; i++) {
++		str = hist_data->attrs->assignment_str[i];
++		for (j = 0; j < TRACING_MAP_VARS_MAX; j++) {
++			field_str = strsep(&str, ",");
++			if (!field_str)
++				break;
++
++			var_name = strsep(&field_str, "=");
++			if (!var_name || !field_str) {
++				ret = -EINVAL;
++				goto free;
++			}
++
++			if (n_vars == TRACING_MAP_VARS_MAX) {
++				ret = -EINVAL;
++				goto free;
++			}
++
++			s = kstrdup(var_name, GFP_KERNEL);
++			if (!s) {
++				ret = -ENOMEM;
++				goto free;
++			}
++			hist_data->attrs->var_defs.name[n_vars] = s;
++
++			s = kstrdup(field_str, GFP_KERNEL);
++			if (!s) {
++				kfree(hist_data->attrs->var_defs.name[n_vars]);
++				ret = -ENOMEM;
++				goto free;
++			}
++			hist_data->attrs->var_defs.expr[n_vars++] = s;
++
++			hist_data->attrs->var_defs.n_vars = n_vars;
++		}
++	}
++
++	return ret;
++ free:
++	free_var_defs(hist_data);
++
++	return ret;
++}
++
+ static int create_hist_fields(struct hist_trigger_data *hist_data,
+ 			      struct trace_event_file *file)
+ {
+ 	int ret;
+ 
++	ret = parse_var_defs(hist_data);
++	if (ret)
++		goto out;
++
+ 	ret = create_val_fields(hist_data, file);
+ 	if (ret)
+ 		goto out;
+ 
+-	ret = create_key_fields(hist_data, file);
++	ret = create_var_fields(hist_data, file);
+ 	if (ret)
+ 		goto out;
+ 
+-	hist_data->n_fields = hist_data->n_vals + hist_data->n_keys;
++	ret = create_key_fields(hist_data, file);
++	if (ret)
++		goto out;
+  out:
++	free_var_defs(hist_data);
++
+ 	return ret;
+ }
+ 
+@@ -768,7 +990,7 @@ static int create_sort_keys(struct hist_
+ 	char *fields_str = hist_data->attrs->sort_key_str;
+ 	struct tracing_map_sort_key *sort_key;
+ 	int descending, ret = 0;
+-	unsigned int i, j;
++	unsigned int i, j, k;
+ 
+ 	hist_data->n_sort_keys = 1; /* we always have at least one, hitcount */
+ 
+@@ -816,12 +1038,19 @@ static int create_sort_keys(struct hist_
+ 			continue;
+ 		}
+ 
+-		for (j = 1; j < hist_data->n_fields; j++) {
++		for (j = 1, k = 1; j < hist_data->n_fields; j++) {
++			unsigned int idx;
++
+ 			hist_field = hist_data->fields[j];
++			if (hist_field->flags & HIST_FIELD_FL_VAR)
++				continue;
++
++			idx = k++;
++
+ 			test_name = hist_field_name(hist_field, 0);
+ 
+ 			if (strcmp(field_name, test_name) == 0) {
+-				sort_key->field_idx = j;
++				sort_key->field_idx = idx;
+ 				descending = is_descending(field_str);
+ 				if (descending < 0) {
+ 					ret = descending;
+@@ -836,6 +1065,7 @@ static int create_sort_keys(struct hist_
+ 			break;
+ 		}
+ 	}
++
+ 	hist_data->n_sort_keys = i;
+  out:
+ 	return ret;
+@@ -876,12 +1106,19 @@ static int create_tracing_map_fields(str
+ 			idx = tracing_map_add_key_field(map,
+ 							hist_field->offset,
+ 							cmp_fn);
+-
+-		} else
++		} else if (!(hist_field->flags & HIST_FIELD_FL_VAR))
+ 			idx = tracing_map_add_sum_field(map);
+ 
+ 		if (idx < 0)
+ 			return idx;
++
++		if (hist_field->flags & HIST_FIELD_FL_VAR) {
++			idx = tracing_map_add_var(map);
++			if (idx < 0)
++				return idx;
++			hist_field->var.idx = idx;
++			hist_field->var.hist_data = hist_data;
++		}
+ 	}
+ 
+ 	return 0;
+@@ -905,7 +1142,8 @@ static bool need_tracing_map_ops(struct
+ static struct hist_trigger_data *
+ create_hist_data(unsigned int map_bits,
+ 		 struct hist_trigger_attrs *attrs,
+-		 struct trace_event_file *file)
++		 struct trace_event_file *file,
++		 bool remove)
+ {
+ 	const struct tracing_map_ops *map_ops = NULL;
+ 	struct hist_trigger_data *hist_data;
+@@ -916,6 +1154,7 @@ create_hist_data(unsigned int map_bits,
+ 		return ERR_PTR(-ENOMEM);
+ 
+ 	hist_data->attrs = attrs;
++	hist_data->remove = remove;
+ 
+ 	ret = create_hist_fields(hist_data, file);
+ 	if (ret)
+@@ -962,14 +1201,28 @@ static void hist_trigger_elt_update(stru
+ 				    struct ring_buffer_event *rbe)
+ {
+ 	struct hist_field *hist_field;
+-	unsigned int i;
++	unsigned int i, var_idx;
+ 	u64 hist_val;
+ 
+ 	for_each_hist_val_field(i, hist_data) {
+ 		hist_field = hist_data->fields[i];
+ 		hist_val = hist_field->fn(hist_field, rec, rbe);
++		if (hist_field->flags & HIST_FIELD_FL_VAR) {
++			var_idx = hist_field->var.idx;
++			tracing_map_set_var(elt, var_idx, hist_val);
++			continue;
++		}
+ 		tracing_map_update_sum(elt, i, hist_val);
+ 	}
++
++	for_each_hist_key_field(i, hist_data) {
++		hist_field = hist_data->fields[i];
++		if (hist_field->flags & HIST_FIELD_FL_VAR) {
++			hist_val = hist_field->fn(hist_field, rec, rbe);
++			var_idx = hist_field->var.idx;
++			tracing_map_set_var(elt, var_idx, hist_val);
++		}
++	}
+ }
+ 
+ static inline void add_to_key(char *compound_key, void *key,
+@@ -1144,6 +1397,9 @@ hist_trigger_entry_print(struct seq_file
+ 	for (i = 1; i < hist_data->n_vals; i++) {
+ 		field_name = hist_field_name(hist_data->fields[i], 0);
+ 
++		if (hist_data->fields[i]->flags & HIST_FIELD_FL_VAR)
++			continue;
++
+ 		if (hist_data->fields[i]->flags & HIST_FIELD_FL_HEX) {
+ 			seq_printf(m, "  %s: %10llx", field_name,
+ 				   tracing_map_read_sum(elt, i));
+@@ -1267,6 +1523,9 @@ static void hist_field_print(struct seq_
+ {
+ 	const char *field_name = hist_field_name(hist_field, 0);
+ 
++	if (hist_field->var.name)
++		seq_printf(m, "%s=", hist_field->var.name);
++
+ 	if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		seq_puts(m, "common_timestamp");
+ 	else if (field_name)
+@@ -1285,7 +1544,8 @@ static int event_hist_trigger_print(stru
+ 				    struct event_trigger_data *data)
+ {
+ 	struct hist_trigger_data *hist_data = data->private_data;
+-	struct hist_field *key_field;
++	struct hist_field *field;
++	bool have_var = false;
+ 	unsigned int i;
+ 
+ 	seq_puts(m, "hist:");
+@@ -1296,25 +1556,47 @@ static int event_hist_trigger_print(stru
+ 	seq_puts(m, "keys=");
+ 
+ 	for_each_hist_key_field(i, hist_data) {
+-		key_field = hist_data->fields[i];
++		field = hist_data->fields[i];
+ 
+ 		if (i > hist_data->n_vals)
+ 			seq_puts(m, ",");
+ 
+-		if (key_field->flags & HIST_FIELD_FL_STACKTRACE)
++		if (field->flags & HIST_FIELD_FL_STACKTRACE)
+ 			seq_puts(m, "stacktrace");
+ 		else
+-			hist_field_print(m, key_field);
++			hist_field_print(m, field);
+ 	}
+ 
+ 	seq_puts(m, ":vals=");
+ 
+ 	for_each_hist_val_field(i, hist_data) {
++		field = hist_data->fields[i];
++		if (field->flags & HIST_FIELD_FL_VAR) {
++			have_var = true;
++			continue;
++		}
++
+ 		if (i == HITCOUNT_IDX)
+ 			seq_puts(m, "hitcount");
+ 		else {
+ 			seq_puts(m, ",");
+-			hist_field_print(m, hist_data->fields[i]);
++			hist_field_print(m, field);
++		}
++	}
++
++	if (have_var) {
++		unsigned int n = 0;
++
++		seq_puts(m, ":");
++
++		for_each_hist_val_field(i, hist_data) {
++			field = hist_data->fields[i];
++
++			if (field->flags & HIST_FIELD_FL_VAR) {
++				if (n++)
++					seq_puts(m, ",");
++				hist_field_print(m, field);
++			}
+ 		}
+ 	}
+ 
+@@ -1322,7 +1604,10 @@ static int event_hist_trigger_print(stru
+ 
+ 	for (i = 0; i < hist_data->n_sort_keys; i++) {
+ 		struct tracing_map_sort_key *sort_key;
+-		unsigned int idx;
++		unsigned int idx, first_key_idx;
++
++		/* skip VAR vals */
++		first_key_idx = hist_data->n_vals - hist_data->n_vars;
+ 
+ 		sort_key = &hist_data->sort_keys[i];
+ 		idx = sort_key->field_idx;
+@@ -1335,8 +1620,11 @@ static int event_hist_trigger_print(stru
+ 
+ 		if (idx == HITCOUNT_IDX)
+ 			seq_puts(m, "hitcount");
+-		else
++		else {
++			if (idx >= first_key_idx)
++				idx += hist_data->n_vars;
+ 			hist_field_print(m, hist_data->fields[idx]);
++		}
+ 
+ 		if (sort_key->descending)
+ 			seq_puts(m, ".descending");
+@@ -1633,7 +1921,7 @@ static void hist_unregister_trigger(char
+ 		test->ops->free(test->ops, test);
+ 
+ 	if (hist_data->enable_timestamps) {
+-		if (unregistered)
++		if (!hist_data->remove || unregistered)
+ 			tracing_set_time_stamp_abs(file->tr, false);
+ 	}
+ }
+@@ -1666,12 +1954,16 @@ static int event_hist_trigger_func(struc
+ 	struct hist_trigger_attrs *attrs;
+ 	struct event_trigger_ops *trigger_ops;
+ 	struct hist_trigger_data *hist_data;
++	bool remove = false;
+ 	char *trigger;
+ 	int ret = 0;
+ 
+ 	if (!param)
+ 		return -EINVAL;
+ 
++	if (glob[0] == '!')
++		remove = true;
++
+ 	/* separate the trigger from the filter (k:v [if filter]) */
+ 	trigger = strsep(&param, " \t");
+ 	if (!trigger)
+@@ -1684,7 +1976,7 @@ static int event_hist_trigger_func(struc
+ 	if (attrs->map_bits)
+ 		hist_trigger_bits = attrs->map_bits;
+ 
+-	hist_data = create_hist_data(hist_trigger_bits, attrs, file);
++	hist_data = create_hist_data(hist_trigger_bits, attrs, file, remove);
+ 	if (IS_ERR(hist_data)) {
+ 		destroy_hist_trigger_attrs(attrs);
+ 		return PTR_ERR(hist_data);
+@@ -1713,7 +2005,7 @@ static int event_hist_trigger_func(struc
+ 			goto out_free;
+ 	}
+ 
+-	if (glob[0] == '!') {
++	if (remove) {
+ 		cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file);
+ 		ret = 0;
+ 		goto out_free;
diff --git a/kernel/patches-4.14.x-rt/0081-0024-tracing-Account-for-variables-in-named-trigger-compa.patch b/kernel/patches-4.14.x-rt/0081-0024-tracing-Account-for-variables-in-named-trigger-compa.patch
new file mode 100644
index 000000000..a7617a26b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0081-0024-tracing-Account-for-variables-in-named-trigger-compa.patch
@@ -0,0 +1,45 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:50 -0600
+Subject: [PATCH 24/48] tracing: Account for variables in named trigger
+ compatibility
+
+Named triggers must also have the same set of variables in order to be
+considered compatible - update the trigger match test to account for
+that.
+
+The reason for this requirement is that named triggers with variables
+are meant to allow one or more events to set the same variable.
+
+Link: http://lkml.kernel.org/r/a17eae6328a99917f9d5c66129c9fcd355279ee9.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit f94add7df3d72bc8e659f9491e25d91c9dae1b44)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |    7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -1612,7 +1612,7 @@ static int event_hist_trigger_print(stru
+ 		sort_key = &hist_data->sort_keys[i];
+ 		idx = sort_key->field_idx;
+ 
+-		if (WARN_ON(idx >= TRACING_MAP_FIELDS_MAX))
++		if (WARN_ON(idx >= HIST_FIELDS_MAX))
+ 			return -EINVAL;
+ 
+ 		if (i > 0)
+@@ -1800,6 +1800,11 @@ static bool hist_trigger_match(struct ev
+ 			return false;
+ 		if (key_field->is_signed != key_field_test->is_signed)
+ 			return false;
++		if (!!key_field->var.name != !!key_field_test->var.name)
++			return false;
++		if (key_field->var.name &&
++		    strcmp(key_field->var.name, key_field_test->var.name) != 0)
++			return false;
+ 	}
+ 
+ 	for (i = 0; i < hist_data->n_sort_keys; i++) {
diff --git a/kernel/patches-4.14.x-rt/0082-0025-tracing-Move-get_hist_field_flags.patch b/kernel/patches-4.14.x-rt/0082-0025-tracing-Move-get_hist_field_flags.patch
new file mode 100644
index 000000000..767bf7e8f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0082-0025-tracing-Move-get_hist_field_flags.patch
@@ -0,0 +1,77 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:51 -0600
+Subject: [PATCH 25/48] tracing: Move get_hist_field_flags()
+
+Move get_hist_field_flags() to make it more easily accessible for new
+code (and keep the move separate from new functionality).
+
+Link: http://lkml.kernel.org/r/32470f0a7047ec7a6e84ba5ec89d6142cc6ede7d.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit fde3bce553d359c01beb9a6fce4013b65076aff3)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   44 +++++++++++++++++++--------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -497,6 +497,28 @@ static const struct tracing_map_ops hist
+ 	.elt_init	= hist_trigger_elt_comm_init,
+ };
+ 
++static const char *get_hist_field_flags(struct hist_field *hist_field)
++{
++	const char *flags_str = NULL;
++
++	if (hist_field->flags & HIST_FIELD_FL_HEX)
++		flags_str = "hex";
++	else if (hist_field->flags & HIST_FIELD_FL_SYM)
++		flags_str = "sym";
++	else if (hist_field->flags & HIST_FIELD_FL_SYM_OFFSET)
++		flags_str = "sym-offset";
++	else if (hist_field->flags & HIST_FIELD_FL_EXECNAME)
++		flags_str = "execname";
++	else if (hist_field->flags & HIST_FIELD_FL_SYSCALL)
++		flags_str = "syscall";
++	else if (hist_field->flags & HIST_FIELD_FL_LOG2)
++		flags_str = "log2";
++	else if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP_USECS)
++		flags_str = "usecs";
++
++	return flags_str;
++}
++
+ static void destroy_hist_field(struct hist_field *hist_field,
+ 			       unsigned int level)
+ {
+@@ -1497,28 +1519,6 @@ const struct file_operations event_hist_
+ 	.release = single_release,
+ };
+ 
+-static const char *get_hist_field_flags(struct hist_field *hist_field)
+-{
+-	const char *flags_str = NULL;
+-
+-	if (hist_field->flags & HIST_FIELD_FL_HEX)
+-		flags_str = "hex";
+-	else if (hist_field->flags & HIST_FIELD_FL_SYM)
+-		flags_str = "sym";
+-	else if (hist_field->flags & HIST_FIELD_FL_SYM_OFFSET)
+-		flags_str = "sym-offset";
+-	else if (hist_field->flags & HIST_FIELD_FL_EXECNAME)
+-		flags_str = "execname";
+-	else if (hist_field->flags & HIST_FIELD_FL_SYSCALL)
+-		flags_str = "syscall";
+-	else if (hist_field->flags & HIST_FIELD_FL_LOG2)
+-		flags_str = "log2";
+-	else if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP_USECS)
+-		flags_str = "usecs";
+-
+-	return flags_str;
+-}
+-
+ static void hist_field_print(struct seq_file *m, struct hist_field *hist_field)
+ {
+ 	const char *field_name = hist_field_name(hist_field, 0);
diff --git a/kernel/patches-4.14.x-rt/0083-0026-tracing-Add-simple-expression-support-to-hist-trigge.patch b/kernel/patches-4.14.x-rt/0083-0026-tracing-Add-simple-expression-support-to-hist-trigge.patch
new file mode 100644
index 000000000..acfd1dd1f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0083-0026-tracing-Add-simple-expression-support-to-hist-trigge.patch
@@ -0,0 +1,627 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:52 -0600
+Subject: [PATCH 26/48] tracing: Add simple expression support to hist triggers
+
+Add support for simple addition, subtraction, and unary expressions
+(-(expr) and expr, where expr = b-a, a+b, a+b+c) to hist triggers, in
+order to support a minimal set of useful inter-event calculations.
+
+These operations are needed for calculating latencies between events
+(timestamp1-timestamp0) and for combined latencies (latencies over 3
+or more events).
+
+In the process, factor out some common code from key and value
+parsing.
+
+Link: http://lkml.kernel.org/r/9a9308ead4fe32a433d9c7e95921fb798394f6b2.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+[kbuild test robot fix, add static to parse_atom()]
+Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 26c5cb5e4790fec96e3eba02c347e78fa72273a8)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  487 +++++++++++++++++++++++++++++++++------
+ 1 file changed, 413 insertions(+), 74 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -32,6 +32,13 @@ typedef u64 (*hist_field_fn_t) (struct h
+ #define HIST_FIELD_OPERANDS_MAX	2
+ #define HIST_FIELDS_MAX		(TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX)
+ 
++enum field_op_id {
++	FIELD_OP_NONE,
++	FIELD_OP_PLUS,
++	FIELD_OP_MINUS,
++	FIELD_OP_UNARY_MINUS,
++};
++
+ struct hist_var {
+ 	char				*name;
+ 	struct hist_trigger_data	*hist_data;
+@@ -48,6 +55,8 @@ struct hist_field {
+ 	struct hist_field		*operands[HIST_FIELD_OPERANDS_MAX];
+ 	struct hist_trigger_data	*hist_data;
+ 	struct hist_var			var;
++	enum field_op_id		operator;
++	char				*name;
+ };
+ 
+ static u64 hist_field_none(struct hist_field *field, void *event,
+@@ -98,6 +107,41 @@ static u64 hist_field_log2(struct hist_f
+ 	return (u64) ilog2(roundup_pow_of_two(val));
+ }
+ 
++static u64 hist_field_plus(struct hist_field *hist_field, void *event,
++			   struct ring_buffer_event *rbe)
++{
++	struct hist_field *operand1 = hist_field->operands[0];
++	struct hist_field *operand2 = hist_field->operands[1];
++
++	u64 val1 = operand1->fn(operand1, event, rbe);
++	u64 val2 = operand2->fn(operand2, event, rbe);
++
++	return val1 + val2;
++}
++
++static u64 hist_field_minus(struct hist_field *hist_field, void *event,
++			    struct ring_buffer_event *rbe)
++{
++	struct hist_field *operand1 = hist_field->operands[0];
++	struct hist_field *operand2 = hist_field->operands[1];
++
++	u64 val1 = operand1->fn(operand1, event, rbe);
++	u64 val2 = operand2->fn(operand2, event, rbe);
++
++	return val1 - val2;
++}
++
++static u64 hist_field_unary_minus(struct hist_field *hist_field, void *event,
++				  struct ring_buffer_event *rbe)
++{
++	struct hist_field *operand = hist_field->operands[0];
++
++	s64 sval = (s64)operand->fn(operand, event, rbe);
++	u64 val = (u64)-sval;
++
++	return val;
++}
++
+ #define DEFINE_HIST_FIELD_FN(type)					\
+ 	static u64 hist_field_##type(struct hist_field *hist_field,	\
+ 				     void *event,			\
+@@ -147,6 +191,7 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_TIMESTAMP		= 1 << 10,
+ 	HIST_FIELD_FL_TIMESTAMP_USECS	= 1 << 11,
+ 	HIST_FIELD_FL_VAR		= 1 << 12,
++	HIST_FIELD_FL_EXPR		= 1 << 13,
+ };
+ 
+ struct var_defs {
+@@ -258,6 +303,8 @@ static const char *hist_field_name(struc
+ 		field_name = hist_field_name(field->operands[0], ++level);
+ 	else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		field_name = "common_timestamp";
++	else if (field->flags & HIST_FIELD_FL_EXPR)
++		field_name = field->name;
+ 
+ 	if (field_name == NULL)
+ 		field_name = "";
+@@ -519,12 +566,104 @@ static const char *get_hist_field_flags(
+ 	return flags_str;
+ }
+ 
++static void expr_field_str(struct hist_field *field, char *expr)
++{
++	strcat(expr, hist_field_name(field, 0));
++
++	if (field->flags) {
++		const char *flags_str = get_hist_field_flags(field);
++
++		if (flags_str) {
++			strcat(expr, ".");
++			strcat(expr, flags_str);
++		}
++	}
++}
++
++static char *expr_str(struct hist_field *field, unsigned int level)
++{
++	char *expr;
++
++	if (level > 1)
++		return NULL;
++
++	expr = kzalloc(MAX_FILTER_STR_VAL, GFP_KERNEL);
++	if (!expr)
++		return NULL;
++
++	if (!field->operands[0]) {
++		expr_field_str(field, expr);
++		return expr;
++	}
++
++	if (field->operator == FIELD_OP_UNARY_MINUS) {
++		char *subexpr;
++
++		strcat(expr, "-(");
++		subexpr = expr_str(field->operands[0], ++level);
++		if (!subexpr) {
++			kfree(expr);
++			return NULL;
++		}
++		strcat(expr, subexpr);
++		strcat(expr, ")");
++
++		kfree(subexpr);
++
++		return expr;
++	}
++
++	expr_field_str(field->operands[0], expr);
++
++	switch (field->operator) {
++	case FIELD_OP_MINUS:
++		strcat(expr, "-");
++		break;
++	case FIELD_OP_PLUS:
++		strcat(expr, "+");
++		break;
++	default:
++		kfree(expr);
++		return NULL;
++	}
++
++	expr_field_str(field->operands[1], expr);
++
++	return expr;
++}
++
++static int contains_operator(char *str)
++{
++	enum field_op_id field_op = FIELD_OP_NONE;
++	char *op;
++
++	op = strpbrk(str, "+-");
++	if (!op)
++		return FIELD_OP_NONE;
++
++	switch (*op) {
++	case '-':
++		if (*str == '-')
++			field_op = FIELD_OP_UNARY_MINUS;
++		else
++			field_op = FIELD_OP_MINUS;
++		break;
++	case '+':
++		field_op = FIELD_OP_PLUS;
++		break;
++	default:
++		break;
++	}
++
++	return field_op;
++}
++
+ static void destroy_hist_field(struct hist_field *hist_field,
+ 			       unsigned int level)
+ {
+ 	unsigned int i;
+ 
+-	if (level > 2)
++	if (level > 3)
+ 		return;
+ 
+ 	if (!hist_field)
+@@ -534,6 +673,7 @@ static void destroy_hist_field(struct hi
+ 		destroy_hist_field(hist_field->operands[i], level + 1);
+ 
+ 	kfree(hist_field->var.name);
++	kfree(hist_field->name);
+ 
+ 	kfree(hist_field);
+ }
+@@ -554,6 +694,9 @@ static struct hist_field *create_hist_fi
+ 
+ 	hist_field->hist_data = hist_data;
+ 
++	if (flags & HIST_FIELD_FL_EXPR)
++		goto out; /* caller will populate */
++
+ 	if (flags & HIST_FIELD_FL_HITCOUNT) {
+ 		hist_field->fn = hist_field_counter;
+ 		goto out;
+@@ -626,6 +769,257 @@ static void destroy_hist_fields(struct h
+ 	}
+ }
+ 
++static struct ftrace_event_field *
++parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
++	    char *field_str, unsigned long *flags)
++{
++	struct ftrace_event_field *field = NULL;
++	char *field_name, *modifier, *str;
++
++	modifier = str = kstrdup(field_str, GFP_KERNEL);
++	if (!modifier)
++		return ERR_PTR(-ENOMEM);
++
++	field_name = strsep(&modifier, ".");
++	if (modifier) {
++		if (strcmp(modifier, "hex") == 0)
++			*flags |= HIST_FIELD_FL_HEX;
++		else if (strcmp(modifier, "sym") == 0)
++			*flags |= HIST_FIELD_FL_SYM;
++		else if (strcmp(modifier, "sym-offset") == 0)
++			*flags |= HIST_FIELD_FL_SYM_OFFSET;
++		else if ((strcmp(modifier, "execname") == 0) &&
++			 (strcmp(field_name, "common_pid") == 0))
++			*flags |= HIST_FIELD_FL_EXECNAME;
++		else if (strcmp(modifier, "syscall") == 0)
++			*flags |= HIST_FIELD_FL_SYSCALL;
++		else if (strcmp(modifier, "log2") == 0)
++			*flags |= HIST_FIELD_FL_LOG2;
++		else if (strcmp(modifier, "usecs") == 0)
++			*flags |= HIST_FIELD_FL_TIMESTAMP_USECS;
++		else {
++			field = ERR_PTR(-EINVAL);
++			goto out;
++		}
++	}
++
++	if (strcmp(field_name, "common_timestamp") == 0) {
++		*flags |= HIST_FIELD_FL_TIMESTAMP;
++		hist_data->enable_timestamps = true;
++		if (*flags & HIST_FIELD_FL_TIMESTAMP_USECS)
++			hist_data->attrs->ts_in_usecs = true;
++	} else {
++		field = trace_find_event_field(file->event_call, field_name);
++		if (!field || !field->size) {
++			field = ERR_PTR(-EINVAL);
++			goto out;
++		}
++	}
++ out:
++	kfree(str);
++
++	return field;
++}
++
++static struct hist_field *parse_atom(struct hist_trigger_data *hist_data,
++				     struct trace_event_file *file, char *str,
++				     unsigned long *flags, char *var_name)
++{
++	struct ftrace_event_field *field = NULL;
++	struct hist_field *hist_field = NULL;
++	int ret = 0;
++
++	field = parse_field(hist_data, file, str, flags);
++	if (IS_ERR(field)) {
++		ret = PTR_ERR(field);
++		goto out;
++	}
++
++	hist_field = create_hist_field(hist_data, field, *flags, var_name);
++	if (!hist_field) {
++		ret = -ENOMEM;
++		goto out;
++	}
++
++	return hist_field;
++ out:
++	return ERR_PTR(ret);
++}
++
++static struct hist_field *parse_expr(struct hist_trigger_data *hist_data,
++				     struct trace_event_file *file,
++				     char *str, unsigned long flags,
++				     char *var_name, unsigned int level);
++
++static struct hist_field *parse_unary(struct hist_trigger_data *hist_data,
++				      struct trace_event_file *file,
++				      char *str, unsigned long flags,
++				      char *var_name, unsigned int level)
++{
++	struct hist_field *operand1, *expr = NULL;
++	unsigned long operand_flags;
++	int ret = 0;
++	char *s;
++
++	// we support only -(xxx) i.e. explicit parens required
++
++	if (level > 3) {
++		ret = -EINVAL;
++		goto free;
++	}
++
++	str++; // skip leading '-'
++
++	s = strchr(str, '(');
++	if (s)
++		str++;
++	else {
++		ret = -EINVAL;
++		goto free;
++	}
++
++	s = strrchr(str, ')');
++	if (s)
++		*s = '\0';
++	else {
++		ret = -EINVAL; // no closing ')'
++		goto free;
++	}
++
++	flags |= HIST_FIELD_FL_EXPR;
++	expr = create_hist_field(hist_data, NULL, flags, var_name);
++	if (!expr) {
++		ret = -ENOMEM;
++		goto free;
++	}
++
++	operand_flags = 0;
++	operand1 = parse_expr(hist_data, file, str, operand_flags, NULL, ++level);
++	if (IS_ERR(operand1)) {
++		ret = PTR_ERR(operand1);
++		goto free;
++	}
++
++	expr->flags |= operand1->flags &
++		(HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
++	expr->fn = hist_field_unary_minus;
++	expr->operands[0] = operand1;
++	expr->operator = FIELD_OP_UNARY_MINUS;
++	expr->name = expr_str(expr, 0);
++
++	return expr;
++ free:
++	destroy_hist_field(expr, 0);
++	return ERR_PTR(ret);
++}
++
++static int check_expr_operands(struct hist_field *operand1,
++			       struct hist_field *operand2)
++{
++	unsigned long operand1_flags = operand1->flags;
++	unsigned long operand2_flags = operand2->flags;
++
++	if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) !=
++	    (operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS))
++		return -EINVAL;
++
++	return 0;
++}
++
++static struct hist_field *parse_expr(struct hist_trigger_data *hist_data,
++				     struct trace_event_file *file,
++				     char *str, unsigned long flags,
++				     char *var_name, unsigned int level)
++{
++	struct hist_field *operand1 = NULL, *operand2 = NULL, *expr = NULL;
++	unsigned long operand_flags;
++	int field_op, ret = -EINVAL;
++	char *sep, *operand1_str;
++
++	if (level > 3)
++		return ERR_PTR(-EINVAL);
++
++	field_op = contains_operator(str);
++
++	if (field_op == FIELD_OP_NONE)
++		return parse_atom(hist_data, file, str, &flags, var_name);
++
++	if (field_op == FIELD_OP_UNARY_MINUS)
++		return parse_unary(hist_data, file, str, flags, var_name, ++level);
++
++	switch (field_op) {
++	case FIELD_OP_MINUS:
++		sep = "-";
++		break;
++	case FIELD_OP_PLUS:
++		sep = "+";
++		break;
++	default:
++		goto free;
++	}
++
++	operand1_str = strsep(&str, sep);
++	if (!operand1_str || !str)
++		goto free;
++
++	operand_flags = 0;
++	operand1 = parse_atom(hist_data, file, operand1_str,
++			      &operand_flags, NULL);
++	if (IS_ERR(operand1)) {
++		ret = PTR_ERR(operand1);
++		operand1 = NULL;
++		goto free;
++	}
++
++	// rest of string could be another expression e.g. b+c in a+b+c
++	operand_flags = 0;
++	operand2 = parse_expr(hist_data, file, str, operand_flags, NULL, ++level);
++	if (IS_ERR(operand2)) {
++		ret = PTR_ERR(operand2);
++		operand2 = NULL;
++		goto free;
++	}
++
++	ret = check_expr_operands(operand1, operand2);
++	if (ret)
++		goto free;
++
++	flags |= HIST_FIELD_FL_EXPR;
++
++	flags |= operand1->flags &
++		(HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
++
++	expr = create_hist_field(hist_data, NULL, flags, var_name);
++	if (!expr) {
++		ret = -ENOMEM;
++		goto free;
++	}
++
++	expr->operands[0] = operand1;
++	expr->operands[1] = operand2;
++	expr->operator = field_op;
++	expr->name = expr_str(expr, 0);
++
++	switch (field_op) {
++	case FIELD_OP_MINUS:
++		expr->fn = hist_field_minus;
++		break;
++	case FIELD_OP_PLUS:
++		expr->fn = hist_field_plus;
++		break;
++	default:
++		goto free;
++	}
++
++	return expr;
++ free:
++	destroy_hist_field(operand1, 0);
++	destroy_hist_field(operand2, 0);
++	destroy_hist_field(expr, 0);
++
++	return ERR_PTR(ret);
++}
++
+ static int create_hitcount_val(struct hist_trigger_data *hist_data)
+ {
+ 	hist_data->fields[HITCOUNT_IDX] =
+@@ -648,37 +1042,17 @@ static int __create_val_field(struct his
+ 			      char *var_name, char *field_str,
+ 			      unsigned long flags)
+ {
+-	struct ftrace_event_field *field = NULL;
+-	char *field_name;
++	struct hist_field *hist_field;
+ 	int ret = 0;
+ 
+-	field_name = strsep(&field_str, ".");
+-	if (field_str) {
+-		if (strcmp(field_str, "hex") == 0)
+-			flags |= HIST_FIELD_FL_HEX;
+-		else {
+-			ret = -EINVAL;
+-			goto out;
+-		}
+-	}
+-
+-	if (strcmp(field_name, "common_timestamp") == 0) {
+-		flags |= HIST_FIELD_FL_TIMESTAMP;
+-		hist_data->enable_timestamps = true;
+-	} else {
+-		field = trace_find_event_field(file->event_call, field_name);
+-		if (!field || !field->size) {
+-			ret = -EINVAL;
+-			goto out;
+-		}
+-	}
+-
+-	hist_data->fields[val_idx] = create_hist_field(hist_data, field, flags, var_name);
+-	if (!hist_data->fields[val_idx]) {
+-		ret = -ENOMEM;
++	hist_field = parse_expr(hist_data, file, field_str, flags, var_name, 0);
++	if (IS_ERR(hist_field)) {
++		ret = PTR_ERR(hist_field);
+ 		goto out;
+ 	}
+ 
++	hist_data->fields[val_idx] = hist_field;
++
+ 	++hist_data->n_vals;
+ 	++hist_data->n_fields;
+ 
+@@ -765,8 +1139,8 @@ static int create_key_field(struct hist_
+ 			    struct trace_event_file *file,
+ 			    char *field_str)
+ {
+-	struct ftrace_event_field *field = NULL;
+ 	struct hist_field *hist_field = NULL;
++
+ 	unsigned long flags = 0;
+ 	unsigned int key_size;
+ 	int ret = 0;
+@@ -781,60 +1155,24 @@ static int create_key_field(struct hist_
+ 		key_size = sizeof(unsigned long) * HIST_STACKTRACE_DEPTH;
+ 		hist_field = create_hist_field(hist_data, NULL, flags, NULL);
+ 	} else {
+-		char *field_name = strsep(&field_str, ".");
+-
+-		if (field_str) {
+-			if (strcmp(field_str, "hex") == 0)
+-				flags |= HIST_FIELD_FL_HEX;
+-			else if (strcmp(field_str, "sym") == 0)
+-				flags |= HIST_FIELD_FL_SYM;
+-			else if (strcmp(field_str, "sym-offset") == 0)
+-				flags |= HIST_FIELD_FL_SYM_OFFSET;
+-			else if ((strcmp(field_str, "execname") == 0) &&
+-				 (strcmp(field_name, "common_pid") == 0))
+-				flags |= HIST_FIELD_FL_EXECNAME;
+-			else if (strcmp(field_str, "syscall") == 0)
+-				flags |= HIST_FIELD_FL_SYSCALL;
+-			else if (strcmp(field_str, "log2") == 0)
+-				flags |= HIST_FIELD_FL_LOG2;
+-			else if (strcmp(field_str, "usecs") == 0)
+-				flags |= HIST_FIELD_FL_TIMESTAMP_USECS;
+-			else {
+-				ret = -EINVAL;
+-				goto out;
+-			}
++		hist_field = parse_expr(hist_data, file, field_str, flags,
++					NULL, 0);
++		if (IS_ERR(hist_field)) {
++			ret = PTR_ERR(hist_field);
++			goto out;
+ 		}
+ 
+-		if (strcmp(field_name, "common_timestamp") == 0) {
+-			flags |= HIST_FIELD_FL_TIMESTAMP;
+-			hist_data->enable_timestamps = true;
+-			if (flags & HIST_FIELD_FL_TIMESTAMP_USECS)
+-				hist_data->attrs->ts_in_usecs = true;
+-			key_size = sizeof(u64);
+-		} else {
+-			field = trace_find_event_field(file->event_call, field_name);
+-			if (!field || !field->size) {
+-				ret = -EINVAL;
+-				goto out;
+-			}
+-
+-			if (is_string_field(field))
+-				key_size = MAX_FILTER_STR_VAL;
+-			else
+-				key_size = field->size;
+-		}
++		key_size = hist_field->size;
+ 	}
+ 
+-	hist_data->fields[key_idx] = create_hist_field(hist_data, field, flags, NULL);
+-	if (!hist_data->fields[key_idx]) {
+-		ret = -ENOMEM;
+-		goto out;
+-	}
++	hist_data->fields[key_idx] = hist_field;
+ 
+ 	key_size = ALIGN(key_size, sizeof(u64));
+ 	hist_data->fields[key_idx]->size = key_size;
+ 	hist_data->fields[key_idx]->offset = key_offset;
++
+ 	hist_data->key_size += key_size;
++
+ 	if (hist_data->key_size > HIST_KEY_SIZE_MAX) {
+ 		ret = -EINVAL;
+ 		goto out;
+@@ -1419,7 +1757,8 @@ hist_trigger_entry_print(struct seq_file
+ 	for (i = 1; i < hist_data->n_vals; i++) {
+ 		field_name = hist_field_name(hist_data->fields[i], 0);
+ 
+-		if (hist_data->fields[i]->flags & HIST_FIELD_FL_VAR)
++		if (hist_data->fields[i]->flags & HIST_FIELD_FL_VAR ||
++		    hist_data->fields[i]->flags & HIST_FIELD_FL_EXPR)
+ 			continue;
+ 
+ 		if (hist_data->fields[i]->flags & HIST_FIELD_FL_HEX) {
diff --git a/kernel/patches-4.14.x-rt/0084-0027-tracing-Generalize-per-element-hist-trigger-data.patch b/kernel/patches-4.14.x-rt/0084-0027-tracing-Generalize-per-element-hist-trigger-data.patch
new file mode 100644
index 000000000..c51640d37
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0084-0027-tracing-Generalize-per-element-hist-trigger-data.patch
@@ -0,0 +1,158 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:53 -0600
+Subject: [PATCH 27/48] tracing: Generalize per-element hist trigger data
+
+Up until now, hist triggers only needed per-element support for saving
+'comm' data, which was saved directly as a private data pointer.
+
+In anticipation of the need to save other data besides 'comm', add a
+new hist_elt_data struct for the purpose, and switch the current
+'comm'-related code over to that.
+
+Link: http://lkml.kernel.org/r/4502c338c965ddf5fc19fb1ec4764391e001ed4b.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 8102d0cb859d223564b17afb01e33701f57191d1)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   76 ++++++++++++++++++++++-----------------
+ 1 file changed, 43 insertions(+), 33 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -289,6 +289,10 @@ static struct hist_field *find_var(struc
+ 	return NULL;
+ }
+ 
++struct hist_elt_data {
++	char *comm;
++};
++
+ static const char *hist_field_name(struct hist_field *field,
+ 				   unsigned int level)
+ {
+@@ -503,45 +507,61 @@ static inline void save_comm(char *comm,
+ 	memcpy(comm, task->comm, TASK_COMM_LEN);
+ }
+ 
+-static void hist_trigger_elt_comm_free(struct tracing_map_elt *elt)
++static void hist_elt_data_free(struct hist_elt_data *elt_data)
++{
++	kfree(elt_data->comm);
++	kfree(elt_data);
++}
++
++static void hist_trigger_elt_data_free(struct tracing_map_elt *elt)
+ {
+-	kfree((char *)elt->private_data);
++	struct hist_elt_data *elt_data = elt->private_data;
++
++	hist_elt_data_free(elt_data);
+ }
+ 
+-static int hist_trigger_elt_comm_alloc(struct tracing_map_elt *elt)
++static int hist_trigger_elt_data_alloc(struct tracing_map_elt *elt)
+ {
+ 	struct hist_trigger_data *hist_data = elt->map->private_data;
++	unsigned int size = TASK_COMM_LEN;
++	struct hist_elt_data *elt_data;
+ 	struct hist_field *key_field;
+ 	unsigned int i;
+ 
++	elt_data = kzalloc(sizeof(*elt_data), GFP_KERNEL);
++	if (!elt_data)
++		return -ENOMEM;
++
+ 	for_each_hist_key_field(i, hist_data) {
+ 		key_field = hist_data->fields[i];
+ 
+ 		if (key_field->flags & HIST_FIELD_FL_EXECNAME) {
+-			unsigned int size = TASK_COMM_LEN + 1;
+-
+-			elt->private_data = kzalloc(size, GFP_KERNEL);
+-			if (!elt->private_data)
++			elt_data->comm = kzalloc(size, GFP_KERNEL);
++			if (!elt_data->comm) {
++				kfree(elt_data);
+ 				return -ENOMEM;
++			}
+ 			break;
+ 		}
+ 	}
+ 
++	elt->private_data = elt_data;
++
+ 	return 0;
+ }
+ 
+-static void hist_trigger_elt_comm_init(struct tracing_map_elt *elt)
++static void hist_trigger_elt_data_init(struct tracing_map_elt *elt)
+ {
+-	char *comm = elt->private_data;
++	struct hist_elt_data *elt_data = elt->private_data;
+ 
+-	if (comm)
+-		save_comm(comm, current);
++	if (elt_data->comm)
++		save_comm(elt_data->comm, current);
+ }
+ 
+-static const struct tracing_map_ops hist_trigger_elt_comm_ops = {
+-	.elt_alloc	= hist_trigger_elt_comm_alloc,
+-	.elt_free	= hist_trigger_elt_comm_free,
+-	.elt_init	= hist_trigger_elt_comm_init,
++static const struct tracing_map_ops hist_trigger_elt_data_ops = {
++	.elt_alloc	= hist_trigger_elt_data_alloc,
++	.elt_free	= hist_trigger_elt_data_free,
++	.elt_init	= hist_trigger_elt_data_init,
+ };
+ 
+ static const char *get_hist_field_flags(struct hist_field *hist_field)
+@@ -1484,21 +1504,6 @@ static int create_tracing_map_fields(str
+ 	return 0;
+ }
+ 
+-static bool need_tracing_map_ops(struct hist_trigger_data *hist_data)
+-{
+-	struct hist_field *key_field;
+-	unsigned int i;
+-
+-	for_each_hist_key_field(i, hist_data) {
+-		key_field = hist_data->fields[i];
+-
+-		if (key_field->flags & HIST_FIELD_FL_EXECNAME)
+-			return true;
+-	}
+-
+-	return false;
+-}
+-
+ static struct hist_trigger_data *
+ create_hist_data(unsigned int map_bits,
+ 		 struct hist_trigger_attrs *attrs,
+@@ -1524,8 +1529,7 @@ create_hist_data(unsigned int map_bits,
+ 	if (ret)
+ 		goto free;
+ 
+-	if (need_tracing_map_ops(hist_data))
+-		map_ops = &hist_trigger_elt_comm_ops;
++	map_ops = &hist_trigger_elt_data_ops;
+ 
+ 	hist_data->map = tracing_map_create(map_bits, hist_data->key_size,
+ 					    map_ops, hist_data);
+@@ -1713,7 +1717,13 @@ hist_trigger_entry_print(struct seq_file
+ 			seq_printf(m, "%s: [%llx] %-55s", field_name,
+ 				   uval, str);
+ 		} else if (key_field->flags & HIST_FIELD_FL_EXECNAME) {
+-			char *comm = elt->private_data;
++			struct hist_elt_data *elt_data = elt->private_data;
++			char *comm;
++
++			if (WARN_ON_ONCE(!elt_data))
++				return;
++
++			comm = elt_data->comm;
+ 
+ 			uval = *(u64 *)(key + key_field->offset);
+ 			seq_printf(m, "%s: %-16s[%10llu]", field_name,
diff --git a/kernel/patches-4.14.x-rt/0085-0028-tracing-Pass-tracing_map_elt-to-hist_field-accessor-.patch b/kernel/patches-4.14.x-rt/0085-0028-tracing-Pass-tracing_map_elt-to-hist_field-accessor-.patch
new file mode 100644
index 000000000..1634c7210
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0085-0028-tracing-Pass-tracing_map_elt-to-hist_field-accessor-.patch
@@ -0,0 +1,225 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:54 -0600
+Subject: [PATCH 28/48] tracing: Pass tracing_map_elt to hist_field accessor
+ functions
+
+Some accessor functions, such as for variable references, require
+access to a corrsponding tracing_map_elt.
+
+Add a tracing_map_elt param to the function signature and update the
+accessor functions accordingly.
+
+Link: http://lkml.kernel.org/r/e0f292b068e9e4948da1d5af21b5ae0efa9b5717.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 8405bbbbc9dc0d88ffc92848cb8f0bda2c7a1b30)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   91 ++++++++++++++++++++++++---------------
+ 1 file changed, 57 insertions(+), 34 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -26,8 +26,10 @@
+ 
+ struct hist_field;
+ 
+-typedef u64 (*hist_field_fn_t) (struct hist_field *field, void *event,
+-				struct ring_buffer_event *rbe);
++typedef u64 (*hist_field_fn_t) (struct hist_field *field,
++				struct tracing_map_elt *elt,
++				struct ring_buffer_event *rbe,
++				void *event);
+ 
+ #define HIST_FIELD_OPERANDS_MAX	2
+ #define HIST_FIELDS_MAX		(TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX)
+@@ -59,28 +61,36 @@ struct hist_field {
+ 	char				*name;
+ };
+ 
+-static u64 hist_field_none(struct hist_field *field, void *event,
+-			   struct ring_buffer_event *rbe)
++static u64 hist_field_none(struct hist_field *field,
++			   struct tracing_map_elt *elt,
++			   struct ring_buffer_event *rbe,
++			   void *event)
+ {
+ 	return 0;
+ }
+ 
+-static u64 hist_field_counter(struct hist_field *field, void *event,
+-			      struct ring_buffer_event *rbe)
++static u64 hist_field_counter(struct hist_field *field,
++			      struct tracing_map_elt *elt,
++			      struct ring_buffer_event *rbe,
++			      void *event)
+ {
+ 	return 1;
+ }
+ 
+-static u64 hist_field_string(struct hist_field *hist_field, void *event,
+-			     struct ring_buffer_event *rbe)
++static u64 hist_field_string(struct hist_field *hist_field,
++			     struct tracing_map_elt *elt,
++			     struct ring_buffer_event *rbe,
++			     void *event)
+ {
+ 	char *addr = (char *)(event + hist_field->field->offset);
+ 
+ 	return (u64)(unsigned long)addr;
+ }
+ 
+-static u64 hist_field_dynstring(struct hist_field *hist_field, void *event,
+-				struct ring_buffer_event *rbe)
++static u64 hist_field_dynstring(struct hist_field *hist_field,
++				struct tracing_map_elt *elt,
++				struct ring_buffer_event *rbe,
++				void *event)
+ {
+ 	u32 str_item = *(u32 *)(event + hist_field->field->offset);
+ 	int str_loc = str_item & 0xffff;
+@@ -89,54 +99,64 @@ static u64 hist_field_dynstring(struct h
+ 	return (u64)(unsigned long)addr;
+ }
+ 
+-static u64 hist_field_pstring(struct hist_field *hist_field, void *event,
+-			      struct ring_buffer_event *rbe)
++static u64 hist_field_pstring(struct hist_field *hist_field,
++			      struct tracing_map_elt *elt,
++			      struct ring_buffer_event *rbe,
++			      void *event)
+ {
+ 	char **addr = (char **)(event + hist_field->field->offset);
+ 
+ 	return (u64)(unsigned long)*addr;
+ }
+ 
+-static u64 hist_field_log2(struct hist_field *hist_field, void *event,
+-			   struct ring_buffer_event *rbe)
++static u64 hist_field_log2(struct hist_field *hist_field,
++			   struct tracing_map_elt *elt,
++			   struct ring_buffer_event *rbe,
++			   void *event)
+ {
+ 	struct hist_field *operand = hist_field->operands[0];
+ 
+-	u64 val = operand->fn(operand, event, rbe);
++	u64 val = operand->fn(operand, elt, rbe, event);
+ 
+ 	return (u64) ilog2(roundup_pow_of_two(val));
+ }
+ 
+-static u64 hist_field_plus(struct hist_field *hist_field, void *event,
+-			   struct ring_buffer_event *rbe)
++static u64 hist_field_plus(struct hist_field *hist_field,
++			   struct tracing_map_elt *elt,
++			   struct ring_buffer_event *rbe,
++			   void *event)
+ {
+ 	struct hist_field *operand1 = hist_field->operands[0];
+ 	struct hist_field *operand2 = hist_field->operands[1];
+ 
+-	u64 val1 = operand1->fn(operand1, event, rbe);
+-	u64 val2 = operand2->fn(operand2, event, rbe);
++	u64 val1 = operand1->fn(operand1, elt, rbe, event);
++	u64 val2 = operand2->fn(operand2, elt, rbe, event);
+ 
+ 	return val1 + val2;
+ }
+ 
+-static u64 hist_field_minus(struct hist_field *hist_field, void *event,
+-			    struct ring_buffer_event *rbe)
++static u64 hist_field_minus(struct hist_field *hist_field,
++			    struct tracing_map_elt *elt,
++			    struct ring_buffer_event *rbe,
++			    void *event)
+ {
+ 	struct hist_field *operand1 = hist_field->operands[0];
+ 	struct hist_field *operand2 = hist_field->operands[1];
+ 
+-	u64 val1 = operand1->fn(operand1, event, rbe);
+-	u64 val2 = operand2->fn(operand2, event, rbe);
++	u64 val1 = operand1->fn(operand1, elt, rbe, event);
++	u64 val2 = operand2->fn(operand2, elt, rbe, event);
+ 
+ 	return val1 - val2;
+ }
+ 
+-static u64 hist_field_unary_minus(struct hist_field *hist_field, void *event,
+-				  struct ring_buffer_event *rbe)
++static u64 hist_field_unary_minus(struct hist_field *hist_field,
++				  struct tracing_map_elt *elt,
++				  struct ring_buffer_event *rbe,
++				  void *event)
+ {
+ 	struct hist_field *operand = hist_field->operands[0];
+ 
+-	s64 sval = (s64)operand->fn(operand, event, rbe);
++	s64 sval = (s64)operand->fn(operand, elt, rbe, event);
+ 	u64 val = (u64)-sval;
+ 
+ 	return val;
+@@ -144,8 +164,9 @@ static u64 hist_field_unary_minus(struct
+ 
+ #define DEFINE_HIST_FIELD_FN(type)					\
+ 	static u64 hist_field_##type(struct hist_field *hist_field,	\
+-				     void *event,			\
+-				     struct ring_buffer_event *rbe)	\
++				     struct tracing_map_elt *elt,	\
++				     struct ring_buffer_event *rbe,	\
++				     void *event)			\
+ {									\
+ 	type *addr = (type *)(event + hist_field->field->offset);	\
+ 									\
+@@ -233,8 +254,10 @@ struct hist_trigger_data {
+ 	bool				remove;
+ };
+ 
+-static u64 hist_field_timestamp(struct hist_field *hist_field, void *event,
+-				struct ring_buffer_event *rbe)
++static u64 hist_field_timestamp(struct hist_field *hist_field,
++				struct tracing_map_elt *elt,
++				struct ring_buffer_event *rbe,
++				void *event)
+ {
+ 	struct hist_trigger_data *hist_data = hist_field->hist_data;
+ 	struct trace_array *tr = hist_data->event_file->tr;
+@@ -1570,7 +1593,7 @@ static void hist_trigger_elt_update(stru
+ 
+ 	for_each_hist_val_field(i, hist_data) {
+ 		hist_field = hist_data->fields[i];
+-		hist_val = hist_field->fn(hist_field, rec, rbe);
++		hist_val = hist_field->fn(hist_field, elt, rbe, rec);
+ 		if (hist_field->flags & HIST_FIELD_FL_VAR) {
+ 			var_idx = hist_field->var.idx;
+ 			tracing_map_set_var(elt, var_idx, hist_val);
+@@ -1582,7 +1605,7 @@ static void hist_trigger_elt_update(stru
+ 	for_each_hist_key_field(i, hist_data) {
+ 		hist_field = hist_data->fields[i];
+ 		if (hist_field->flags & HIST_FIELD_FL_VAR) {
+-			hist_val = hist_field->fn(hist_field, rec, rbe);
++			hist_val = hist_field->fn(hist_field, elt, rbe, rec);
+ 			var_idx = hist_field->var.idx;
+ 			tracing_map_set_var(elt, var_idx, hist_val);
+ 		}
+@@ -1620,9 +1643,9 @@ static void event_hist_trigger(struct ev
+ 	bool use_compound_key = (hist_data->n_keys > 1);
+ 	unsigned long entries[HIST_STACKTRACE_DEPTH];
+ 	char compound_key[HIST_KEY_SIZE_MAX];
++	struct tracing_map_elt *elt = NULL;
+ 	struct stack_trace stacktrace;
+ 	struct hist_field *key_field;
+-	struct tracing_map_elt *elt;
+ 	u64 field_contents;
+ 	void *key = NULL;
+ 	unsigned int i;
+@@ -1643,7 +1666,7 @@ static void event_hist_trigger(struct ev
+ 
+ 			key = entries;
+ 		} else {
+-			field_contents = key_field->fn(key_field, rec, rbe);
++			field_contents = key_field->fn(key_field, elt, rbe, rec);
+ 			if (key_field->flags & HIST_FIELD_FL_STRING) {
+ 				key = (void *)(unsigned long)field_contents;
+ 				use_compound_key = true;
diff --git a/kernel/patches-4.14.x-rt/0086-0029-tracing-Add-hist_field-type-field.patch b/kernel/patches-4.14.x-rt/0086-0029-tracing-Add-hist_field-type-field.patch
new file mode 100644
index 000000000..8b4ed0015
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0086-0029-tracing-Add-hist_field-type-field.patch
@@ -0,0 +1,117 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:55 -0600
+Subject: [PATCH 29/48] tracing: Add hist_field 'type' field
+
+Future support for synthetic events requires hist_field 'type'
+information, so add a field for that.
+
+Also, make other hist_field attribute usage consistent (size,
+is_signed, etc).
+
+Link: http://lkml.kernel.org/r/3fd12a2e86316b05151ba0d7c68268e780af2c9d.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit d544a468f82526e97cc80c18a019708eb203b00a)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   33 +++++++++++++++++++++++++++++++++
+ 1 file changed, 33 insertions(+)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -54,6 +54,7 @@ struct hist_field {
+ 	unsigned int			size;
+ 	unsigned int			offset;
+ 	unsigned int                    is_signed;
++	const char			*type;
+ 	struct hist_field		*operands[HIST_FIELD_OPERANDS_MAX];
+ 	struct hist_trigger_data	*hist_data;
+ 	struct hist_var			var;
+@@ -717,6 +718,7 @@ static void destroy_hist_field(struct hi
+ 
+ 	kfree(hist_field->var.name);
+ 	kfree(hist_field->name);
++	kfree(hist_field->type);
+ 
+ 	kfree(hist_field);
+ }
+@@ -742,6 +744,10 @@ static struct hist_field *create_hist_fi
+ 
+ 	if (flags & HIST_FIELD_FL_HITCOUNT) {
+ 		hist_field->fn = hist_field_counter;
++		hist_field->size = sizeof(u64);
++		hist_field->type = kstrdup("u64", GFP_KERNEL);
++		if (!hist_field->type)
++			goto free;
+ 		goto out;
+ 	}
+ 
+@@ -755,12 +761,18 @@ static struct hist_field *create_hist_fi
+ 		hist_field->fn = hist_field_log2;
+ 		hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL);
+ 		hist_field->size = hist_field->operands[0]->size;
++		hist_field->type = kstrdup(hist_field->operands[0]->type, GFP_KERNEL);
++		if (!hist_field->type)
++			goto free;
+ 		goto out;
+ 	}
+ 
+ 	if (flags & HIST_FIELD_FL_TIMESTAMP) {
+ 		hist_field->fn = hist_field_timestamp;
+ 		hist_field->size = sizeof(u64);
++		hist_field->type = kstrdup("u64", GFP_KERNEL);
++		if (!hist_field->type)
++			goto free;
+ 		goto out;
+ 	}
+ 
+@@ -770,6 +782,11 @@ static struct hist_field *create_hist_fi
+ 	if (is_string_field(field)) {
+ 		flags |= HIST_FIELD_FL_STRING;
+ 
++		hist_field->size = MAX_FILTER_STR_VAL;
++		hist_field->type = kstrdup(field->type, GFP_KERNEL);
++		if (!hist_field->type)
++			goto free;
++
+ 		if (field->filter_type == FILTER_STATIC_STRING)
+ 			hist_field->fn = hist_field_string;
+ 		else if (field->filter_type == FILTER_DYN_STRING)
+@@ -777,6 +794,12 @@ static struct hist_field *create_hist_fi
+ 		else
+ 			hist_field->fn = hist_field_pstring;
+ 	} else {
++		hist_field->size = field->size;
++		hist_field->is_signed = field->is_signed;
++		hist_field->type = kstrdup(field->type, GFP_KERNEL);
++		if (!hist_field->type)
++			goto free;
++
+ 		hist_field->fn = select_value_fn(field->size,
+ 						 field->is_signed);
+ 		if (!hist_field->fn) {
+@@ -949,6 +972,11 @@ static struct hist_field *parse_unary(st
+ 	expr->operands[0] = operand1;
+ 	expr->operator = FIELD_OP_UNARY_MINUS;
+ 	expr->name = expr_str(expr, 0);
++	expr->type = kstrdup(operand1->type, GFP_KERNEL);
++	if (!expr->type) {
++		ret = -ENOMEM;
++		goto free;
++	}
+ 
+ 	return expr;
+  free:
+@@ -1042,6 +1070,11 @@ static struct hist_field *parse_expr(str
+ 	expr->operands[1] = operand2;
+ 	expr->operator = field_op;
+ 	expr->name = expr_str(expr, 0);
++	expr->type = kstrdup(operand1->type, GFP_KERNEL);
++	if (!expr->type) {
++		ret = -ENOMEM;
++		goto free;
++	}
+ 
+ 	switch (field_op) {
+ 	case FIELD_OP_MINUS:
diff --git a/kernel/patches-4.14.x-rt/0087-0030-tracing-Add-variable-reference-handling-to-hist-trig.patch b/kernel/patches-4.14.x-rt/0087-0030-tracing-Add-variable-reference-handling-to-hist-trig.patch
new file mode 100644
index 000000000..04e707ec9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0087-0030-tracing-Add-variable-reference-handling-to-hist-trig.patch
@@ -0,0 +1,955 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:56 -0600
+Subject: [PATCH 30/48] tracing: Add variable reference handling to hist
+ triggers
+
+Add the necessary infrastructure to allow the variables defined on one
+event to be referenced in another.  This allows variables set by a
+previous event to be referenced and used in expressions combining the
+variable values saved by that previous event and the event fields of
+the current event.  For example, here's how a latency can be
+calculated and saved into yet another variable named 'wakeup_lat':
+
+    # echo 'hist:keys=pid,prio:ts0=common_timestamp ...
+    # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp-$ts0 ...
+
+In the first event, the event's timetamp is saved into the variable
+ts0.  In the next line, ts0 is subtracted from the second event's
+timestamp to produce the latency.
+
+Further users of variable references will be described in subsequent
+patches, such as for instance how the 'wakeup_lat' variable above can
+be displayed in a latency histogram.
+
+Link: http://lkml.kernel.org/r/b1d3e6975374e34d501ff417c20189c3f9b2c7b8.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 434c1d5831194e72e6eb30d46534d75b5a985eb7)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace.c                |    2 
+ kernel/trace/trace.h                |    3 
+ kernel/trace/trace_events_hist.c    |  661 +++++++++++++++++++++++++++++++++++-
+ kernel/trace/trace_events_trigger.c |    6 
+ 4 files changed, 656 insertions(+), 16 deletions(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -7788,6 +7788,7 @@ static int instance_mkdir(const char *na
+ 
+ 	INIT_LIST_HEAD(&tr->systems);
+ 	INIT_LIST_HEAD(&tr->events);
++	INIT_LIST_HEAD(&tr->hist_vars);
+ 
+ 	if (allocate_trace_buffers(tr, trace_buf_size) < 0)
+ 		goto out_free_tr;
+@@ -8538,6 +8539,7 @@ ssize_t trace_parse_run_command(struct f
+ 
+ 	INIT_LIST_HEAD(&global_trace.systems);
+ 	INIT_LIST_HEAD(&global_trace.events);
++	INIT_LIST_HEAD(&global_trace.hist_vars);
+ 	list_add(&global_trace.list, &ftrace_trace_arrays);
+ 
+ 	apply_trace_boot_options();
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -274,6 +274,7 @@ struct trace_array {
+ 	int			function_enabled;
+ #endif
+ 	int			time_stamp_abs_ref;
++	struct list_head	hist_vars;
+ };
+ 
+ enum {
+@@ -1550,6 +1551,8 @@ extern void pause_named_trigger(struct e
+ extern void unpause_named_trigger(struct event_trigger_data *data);
+ extern void set_named_trigger_data(struct event_trigger_data *data,
+ 				   struct event_trigger_data *named_data);
++extern struct event_trigger_data *
++get_named_trigger_data(struct event_trigger_data *data);
+ extern int register_event_command(struct event_command *cmd);
+ extern int unregister_event_command(struct event_command *cmd);
+ extern int register_trigger_hist_enable_disable_cmds(void);
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -59,7 +59,12 @@ struct hist_field {
+ 	struct hist_trigger_data	*hist_data;
+ 	struct hist_var			var;
+ 	enum field_op_id		operator;
++	char				*system;
++	char				*event_name;
+ 	char				*name;
++	unsigned int			var_idx;
++	unsigned int			var_ref_idx;
++	bool                            read_once;
+ };
+ 
+ static u64 hist_field_none(struct hist_field *field,
+@@ -214,6 +219,7 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_TIMESTAMP_USECS	= 1 << 11,
+ 	HIST_FIELD_FL_VAR		= 1 << 12,
+ 	HIST_FIELD_FL_EXPR		= 1 << 13,
++	HIST_FIELD_FL_VAR_REF		= 1 << 14,
+ };
+ 
+ struct var_defs {
+@@ -253,6 +259,8 @@ struct hist_trigger_data {
+ 	struct tracing_map		*map;
+ 	bool				enable_timestamps;
+ 	bool				remove;
++	struct hist_field               *var_refs[TRACING_MAP_VARS_MAX];
++	unsigned int			n_var_refs;
+ };
+ 
+ static u64 hist_field_timestamp(struct hist_field *hist_field,
+@@ -271,6 +279,214 @@ static u64 hist_field_timestamp(struct h
+ 	return ts;
+ }
+ 
++struct hist_var_data {
++	struct list_head list;
++	struct hist_trigger_data *hist_data;
++};
++
++static struct hist_field *
++check_field_for_var_ref(struct hist_field *hist_field,
++			struct hist_trigger_data *var_data,
++			unsigned int var_idx)
++{
++	struct hist_field *found = NULL;
++
++	if (hist_field && hist_field->flags & HIST_FIELD_FL_VAR_REF) {
++		if (hist_field->var.idx == var_idx &&
++		    hist_field->var.hist_data == var_data) {
++			found = hist_field;
++		}
++	}
++
++	return found;
++}
++
++static struct hist_field *
++check_field_for_var_refs(struct hist_trigger_data *hist_data,
++			 struct hist_field *hist_field,
++			 struct hist_trigger_data *var_data,
++			 unsigned int var_idx,
++			 unsigned int level)
++{
++	struct hist_field *found = NULL;
++	unsigned int i;
++
++	if (level > 3)
++		return found;
++
++	if (!hist_field)
++		return found;
++
++	found = check_field_for_var_ref(hist_field, var_data, var_idx);
++	if (found)
++		return found;
++
++	for (i = 0; i < HIST_FIELD_OPERANDS_MAX; i++) {
++		struct hist_field *operand;
++
++		operand = hist_field->operands[i];
++		found = check_field_for_var_refs(hist_data, operand, var_data,
++						 var_idx, level + 1);
++		if (found)
++			return found;
++	}
++
++	return found;
++}
++
++static struct hist_field *find_var_ref(struct hist_trigger_data *hist_data,
++				       struct hist_trigger_data *var_data,
++				       unsigned int var_idx)
++{
++	struct hist_field *hist_field, *found = NULL;
++	unsigned int i;
++
++	for_each_hist_field(i, hist_data) {
++		hist_field = hist_data->fields[i];
++		found = check_field_for_var_refs(hist_data, hist_field,
++						 var_data, var_idx, 0);
++		if (found)
++			return found;
++	}
++
++	return found;
++}
++
++static struct hist_field *find_any_var_ref(struct hist_trigger_data *hist_data,
++					   unsigned int var_idx)
++{
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct hist_field *found = NULL;
++	struct hist_var_data *var_data;
++
++	list_for_each_entry(var_data, &tr->hist_vars, list) {
++		if (var_data->hist_data == hist_data)
++			continue;
++		found = find_var_ref(var_data->hist_data, hist_data, var_idx);
++		if (found)
++			break;
++	}
++
++	return found;
++}
++
++static bool check_var_refs(struct hist_trigger_data *hist_data)
++{
++	struct hist_field *field;
++	bool found = false;
++	int i;
++
++	for_each_hist_field(i, hist_data) {
++		field = hist_data->fields[i];
++		if (field && field->flags & HIST_FIELD_FL_VAR) {
++			if (find_any_var_ref(hist_data, field->var.idx)) {
++				found = true;
++				break;
++			}
++		}
++	}
++
++	return found;
++}
++
++static struct hist_var_data *find_hist_vars(struct hist_trigger_data *hist_data)
++{
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct hist_var_data *var_data, *found = NULL;
++
++	list_for_each_entry(var_data, &tr->hist_vars, list) {
++		if (var_data->hist_data == hist_data) {
++			found = var_data;
++			break;
++		}
++	}
++
++	return found;
++}
++
++static bool field_has_hist_vars(struct hist_field *hist_field,
++				unsigned int level)
++{
++	int i;
++
++	if (level > 3)
++		return false;
++
++	if (!hist_field)
++		return false;
++
++	if (hist_field->flags & HIST_FIELD_FL_VAR ||
++	    hist_field->flags & HIST_FIELD_FL_VAR_REF)
++		return true;
++
++	for (i = 0; i < HIST_FIELD_OPERANDS_MAX; i++) {
++		struct hist_field *operand;
++
++		operand = hist_field->operands[i];
++		if (field_has_hist_vars(operand, level + 1))
++			return true;
++	}
++
++	return false;
++}
++
++static bool has_hist_vars(struct hist_trigger_data *hist_data)
++{
++	struct hist_field *hist_field;
++	int i;
++
++	for_each_hist_field(i, hist_data) {
++		hist_field = hist_data->fields[i];
++		if (field_has_hist_vars(hist_field, 0))
++			return true;
++	}
++
++	return false;
++}
++
++static int save_hist_vars(struct hist_trigger_data *hist_data)
++{
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct hist_var_data *var_data;
++
++	var_data = find_hist_vars(hist_data);
++	if (var_data)
++		return 0;
++
++	if (trace_array_get(tr) < 0)
++		return -ENODEV;
++
++	var_data = kzalloc(sizeof(*var_data), GFP_KERNEL);
++	if (!var_data) {
++		trace_array_put(tr);
++		return -ENOMEM;
++	}
++
++	var_data->hist_data = hist_data;
++	list_add(&var_data->list, &tr->hist_vars);
++
++	return 0;
++}
++
++static void remove_hist_vars(struct hist_trigger_data *hist_data)
++{
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct hist_var_data *var_data;
++
++	var_data = find_hist_vars(hist_data);
++	if (!var_data)
++		return;
++
++	if (WARN_ON(check_var_refs(hist_data)))
++		return;
++
++	list_del(&var_data->list);
++
++	kfree(var_data);
++
++	trace_array_put(tr);
++}
++
+ static struct hist_field *find_var_field(struct hist_trigger_data *hist_data,
+ 					 const char *var_name)
+ {
+@@ -313,10 +529,137 @@ static struct hist_field *find_var(struc
+ 	return NULL;
+ }
+ 
++static struct trace_event_file *find_var_file(struct trace_array *tr,
++					      char *system,
++					      char *event_name,
++					      char *var_name)
++{
++	struct hist_trigger_data *var_hist_data;
++	struct hist_var_data *var_data;
++	struct trace_event_file *file, *found = NULL;
++
++	if (system)
++		return find_event_file(tr, system, event_name);
++
++	list_for_each_entry(var_data, &tr->hist_vars, list) {
++		var_hist_data = var_data->hist_data;
++		file = var_hist_data->event_file;
++		if (file == found)
++			continue;
++
++		if (find_var_field(var_hist_data, var_name)) {
++			if (found)
++				return NULL;
++
++			found = file;
++		}
++	}
++
++	return found;
++}
++
++static struct hist_field *find_file_var(struct trace_event_file *file,
++					const char *var_name)
++{
++	struct hist_trigger_data *test_data;
++	struct event_trigger_data *test;
++	struct hist_field *hist_field;
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			test_data = test->private_data;
++			hist_field = find_var_field(test_data, var_name);
++			if (hist_field)
++				return hist_field;
++		}
++	}
++
++	return NULL;
++}
++
++static struct hist_field *find_event_var(struct hist_trigger_data *hist_data,
++					 char *system,
++					 char *event_name,
++					 char *var_name)
++{
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct hist_field *hist_field = NULL;
++	struct trace_event_file *file;
++
++	file = find_var_file(tr, system, event_name, var_name);
++	if (!file)
++		return NULL;
++
++	hist_field = find_file_var(file, var_name);
++
++	return hist_field;
++}
++
+ struct hist_elt_data {
+ 	char *comm;
++	u64 *var_ref_vals;
+ };
+ 
++static u64 hist_field_var_ref(struct hist_field *hist_field,
++			      struct tracing_map_elt *elt,
++			      struct ring_buffer_event *rbe,
++			      void *event)
++{
++	struct hist_elt_data *elt_data;
++	u64 var_val = 0;
++
++	elt_data = elt->private_data;
++	var_val = elt_data->var_ref_vals[hist_field->var_ref_idx];
++
++	return var_val;
++}
++
++static bool resolve_var_refs(struct hist_trigger_data *hist_data, void *key,
++			     u64 *var_ref_vals, bool self)
++{
++	struct hist_trigger_data *var_data;
++	struct tracing_map_elt *var_elt;
++	struct hist_field *hist_field;
++	unsigned int i, var_idx;
++	bool resolved = true;
++	u64 var_val = 0;
++
++	for (i = 0; i < hist_data->n_var_refs; i++) {
++		hist_field = hist_data->var_refs[i];
++		var_idx = hist_field->var.idx;
++		var_data = hist_field->var.hist_data;
++
++		if (var_data == NULL) {
++			resolved = false;
++			break;
++		}
++
++		if ((self && var_data != hist_data) ||
++		    (!self && var_data == hist_data))
++			continue;
++
++		var_elt = tracing_map_lookup(var_data->map, key);
++		if (!var_elt) {
++			resolved = false;
++			break;
++		}
++
++		if (!tracing_map_var_set(var_elt, var_idx)) {
++			resolved = false;
++			break;
++		}
++
++		if (self || !hist_field->read_once)
++			var_val = tracing_map_read_var(var_elt, var_idx);
++		else
++			var_val = tracing_map_read_var_once(var_elt, var_idx);
++
++		var_ref_vals[i] = var_val;
++	}
++
++	return resolved;
++}
++
+ static const char *hist_field_name(struct hist_field *field,
+ 				   unsigned int level)
+ {
+@@ -331,8 +674,20 @@ static const char *hist_field_name(struc
+ 		field_name = hist_field_name(field->operands[0], ++level);
+ 	else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		field_name = "common_timestamp";
+-	else if (field->flags & HIST_FIELD_FL_EXPR)
+-		field_name = field->name;
++	else if (field->flags & HIST_FIELD_FL_EXPR ||
++		 field->flags & HIST_FIELD_FL_VAR_REF) {
++		if (field->system) {
++			static char full_name[MAX_FILTER_STR_VAL];
++
++			strcat(full_name, field->system);
++			strcat(full_name, ".");
++			strcat(full_name, field->event_name);
++			strcat(full_name, ".");
++			strcat(full_name, field->name);
++			field_name = full_name;
++		} else
++			field_name = field->name;
++	}
+ 
+ 	if (field_name == NULL)
+ 		field_name = "";
+@@ -612,6 +967,9 @@ static const char *get_hist_field_flags(
+ 
+ static void expr_field_str(struct hist_field *field, char *expr)
+ {
++	if (field->flags & HIST_FIELD_FL_VAR_REF)
++		strcat(expr, "$");
++
+ 	strcat(expr, hist_field_name(field, 0));
+ 
+ 	if (field->flags) {
+@@ -742,6 +1100,11 @@ static struct hist_field *create_hist_fi
+ 	if (flags & HIST_FIELD_FL_EXPR)
+ 		goto out; /* caller will populate */
+ 
++	if (flags & HIST_FIELD_FL_VAR_REF) {
++		hist_field->fn = hist_field_var_ref;
++		goto out;
++	}
++
+ 	if (flags & HIST_FIELD_FL_HITCOUNT) {
+ 		hist_field->fn = hist_field_counter;
+ 		hist_field->size = sizeof(u64);
+@@ -835,6 +1198,144 @@ static void destroy_hist_fields(struct h
+ 	}
+ }
+ 
++static int init_var_ref(struct hist_field *ref_field,
++			struct hist_field *var_field,
++			char *system, char *event_name)
++{
++	int err = 0;
++
++	ref_field->var.idx = var_field->var.idx;
++	ref_field->var.hist_data = var_field->hist_data;
++	ref_field->size = var_field->size;
++	ref_field->is_signed = var_field->is_signed;
++	ref_field->flags |= var_field->flags &
++		(HIST_FIELD_FL_TIMESTAMP | HIST_FIELD_FL_TIMESTAMP_USECS);
++
++	if (system) {
++		ref_field->system = kstrdup(system, GFP_KERNEL);
++		if (!ref_field->system)
++			return -ENOMEM;
++	}
++
++	if (event_name) {
++		ref_field->event_name = kstrdup(event_name, GFP_KERNEL);
++		if (!ref_field->event_name) {
++			err = -ENOMEM;
++			goto free;
++		}
++	}
++
++	ref_field->name = kstrdup(var_field->var.name, GFP_KERNEL);
++	if (!ref_field->name) {
++		err = -ENOMEM;
++		goto free;
++	}
++
++	ref_field->type = kstrdup(var_field->type, GFP_KERNEL);
++	if (!ref_field->type) {
++		err = -ENOMEM;
++		goto free;
++	}
++ out:
++	return err;
++ free:
++	kfree(ref_field->system);
++	kfree(ref_field->event_name);
++	kfree(ref_field->name);
++
++	goto out;
++}
++
++static struct hist_field *create_var_ref(struct hist_field *var_field,
++					 char *system, char *event_name)
++{
++	unsigned long flags = HIST_FIELD_FL_VAR_REF;
++	struct hist_field *ref_field;
++
++	ref_field = create_hist_field(var_field->hist_data, NULL, flags, NULL);
++	if (ref_field) {
++		if (init_var_ref(ref_field, var_field, system, event_name)) {
++			destroy_hist_field(ref_field, 0);
++			return NULL;
++		}
++	}
++
++	return ref_field;
++}
++
++static bool is_var_ref(char *var_name)
++{
++	if (!var_name || strlen(var_name) < 2 || var_name[0] != '$')
++		return false;
++
++	return true;
++}
++
++static char *field_name_from_var(struct hist_trigger_data *hist_data,
++				 char *var_name)
++{
++	char *name, *field;
++	unsigned int i;
++
++	for (i = 0; i < hist_data->attrs->var_defs.n_vars; i++) {
++		name = hist_data->attrs->var_defs.name[i];
++
++		if (strcmp(var_name, name) == 0) {
++			field = hist_data->attrs->var_defs.expr[i];
++			if (contains_operator(field) || is_var_ref(field))
++				continue;
++			return field;
++		}
++	}
++
++	return NULL;
++}
++
++static char *local_field_var_ref(struct hist_trigger_data *hist_data,
++				 char *system, char *event_name,
++				 char *var_name)
++{
++	struct trace_event_call *call;
++
++	if (system && event_name) {
++		call = hist_data->event_file->event_call;
++
++		if (strcmp(system, call->class->system) != 0)
++			return NULL;
++
++		if (strcmp(event_name, trace_event_name(call)) != 0)
++			return NULL;
++	}
++
++	if (!!system != !!event_name)
++		return NULL;
++
++	if (!is_var_ref(var_name))
++		return NULL;
++
++	var_name++;
++
++	return field_name_from_var(hist_data, var_name);
++}
++
++static struct hist_field *parse_var_ref(struct hist_trigger_data *hist_data,
++					char *system, char *event_name,
++					char *var_name)
++{
++	struct hist_field *var_field = NULL, *ref_field = NULL;
++
++	if (!is_var_ref(var_name))
++		return NULL;
++
++	var_name++;
++
++	var_field = find_event_var(hist_data, system, event_name, var_name);
++	if (var_field)
++		ref_field = create_var_ref(var_field, system, event_name);
++
++	return ref_field;
++}
++
+ static struct ftrace_event_field *
+ parse_field(struct hist_trigger_data *hist_data, struct trace_event_file *file,
+ 	    char *field_str, unsigned long *flags)
+@@ -891,10 +1392,40 @@ static struct hist_field *parse_atom(str
+ 				     struct trace_event_file *file, char *str,
+ 				     unsigned long *flags, char *var_name)
+ {
++	char *s, *ref_system = NULL, *ref_event = NULL, *ref_var = str;
+ 	struct ftrace_event_field *field = NULL;
+ 	struct hist_field *hist_field = NULL;
+ 	int ret = 0;
+ 
++	s = strchr(str, '.');
++	if (s) {
++		s = strchr(++s, '.');
++		if (s) {
++			ref_system = strsep(&str, ".");
++			if (!str) {
++				ret = -EINVAL;
++				goto out;
++			}
++			ref_event = strsep(&str, ".");
++			if (!str) {
++				ret = -EINVAL;
++				goto out;
++			}
++			ref_var = str;
++		}
++	}
++
++	s = local_field_var_ref(hist_data, ref_system, ref_event, ref_var);
++	if (!s) {
++		hist_field = parse_var_ref(hist_data, ref_system, ref_event, ref_var);
++		if (hist_field) {
++			hist_data->var_refs[hist_data->n_var_refs] = hist_field;
++			hist_field->var_ref_idx = hist_data->n_var_refs++;
++			return hist_field;
++		}
++	} else
++		str = s;
++
+ 	field = parse_field(hist_data, file, str, flags);
+ 	if (IS_ERR(field)) {
+ 		ret = PTR_ERR(field);
+@@ -1066,6 +1597,9 @@ static struct hist_field *parse_expr(str
+ 		goto free;
+ 	}
+ 
++	operand1->read_once = true;
++	operand2->read_once = true;
++
+ 	expr->operands[0] = operand1;
+ 	expr->operands[1] = operand2;
+ 	expr->operator = field_op;
+@@ -1238,6 +1772,12 @@ static int create_key_field(struct hist_
+ 			goto out;
+ 		}
+ 
++		if (hist_field->flags & HIST_FIELD_FL_VAR_REF) {
++			destroy_hist_field(hist_field, 0);
++			ret = -EINVAL;
++			goto out;
++		}
++
+ 		key_size = hist_field->size;
+ 	}
+ 
+@@ -1576,6 +2116,7 @@ create_hist_data(unsigned int map_bits,
+ 
+ 	hist_data->attrs = attrs;
+ 	hist_data->remove = remove;
++	hist_data->event_file = file;
+ 
+ 	ret = create_hist_fields(hist_data, file);
+ 	if (ret)
+@@ -1598,12 +2139,6 @@ create_hist_data(unsigned int map_bits,
+ 	ret = create_tracing_map_fields(hist_data);
+ 	if (ret)
+ 		goto free;
+-
+-	ret = tracing_map_init(hist_data->map);
+-	if (ret)
+-		goto free;
+-
+-	hist_data->event_file = file;
+  out:
+ 	return hist_data;
+  free:
+@@ -1618,12 +2153,17 @@ create_hist_data(unsigned int map_bits,
+ 
+ static void hist_trigger_elt_update(struct hist_trigger_data *hist_data,
+ 				    struct tracing_map_elt *elt, void *rec,
+-				    struct ring_buffer_event *rbe)
++				    struct ring_buffer_event *rbe,
++				    u64 *var_ref_vals)
+ {
++	struct hist_elt_data *elt_data;
+ 	struct hist_field *hist_field;
+ 	unsigned int i, var_idx;
+ 	u64 hist_val;
+ 
++	elt_data = elt->private_data;
++	elt_data->var_ref_vals = var_ref_vals;
++
+ 	for_each_hist_val_field(i, hist_data) {
+ 		hist_field = hist_data->fields[i];
+ 		hist_val = hist_field->fn(hist_field, elt, rbe, rec);
+@@ -1675,6 +2215,7 @@ static void event_hist_trigger(struct ev
+ 	struct hist_trigger_data *hist_data = data->private_data;
+ 	bool use_compound_key = (hist_data->n_keys > 1);
+ 	unsigned long entries[HIST_STACKTRACE_DEPTH];
++	u64 var_ref_vals[TRACING_MAP_VARS_MAX];
+ 	char compound_key[HIST_KEY_SIZE_MAX];
+ 	struct tracing_map_elt *elt = NULL;
+ 	struct stack_trace stacktrace;
+@@ -1714,9 +2255,15 @@ static void event_hist_trigger(struct ev
+ 	if (use_compound_key)
+ 		key = compound_key;
+ 
++	if (hist_data->n_var_refs &&
++	    !resolve_var_refs(hist_data, key, var_ref_vals, false))
++		return;
++
+ 	elt = tracing_map_insert(hist_data->map, key);
+-	if (elt)
+-		hist_trigger_elt_update(hist_data, elt, rec, rbe);
++	if (!elt)
++		return;
++
++	hist_trigger_elt_update(hist_data, elt, rec, rbe, var_ref_vals);
+ }
+ 
+ static void hist_trigger_stacktrace_print(struct seq_file *m,
+@@ -1933,8 +2480,11 @@ static void hist_field_print(struct seq_
+ 
+ 	if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		seq_puts(m, "common_timestamp");
+-	else if (field_name)
++	else if (field_name) {
++		if (hist_field->flags & HIST_FIELD_FL_VAR_REF)
++			seq_putc(m, '$');
+ 		seq_printf(m, "%s", field_name);
++	}
+ 
+ 	if (hist_field->flags) {
+ 		const char *flags_str = get_hist_field_flags(hist_field);
+@@ -2074,7 +2624,11 @@ static void event_hist_trigger_free(stru
+ 	if (!data->ref) {
+ 		if (data->name)
+ 			del_named_trigger(data);
++
+ 		trigger_data_free(data);
++
++		remove_hist_vars(hist_data);
++
+ 		destroy_hist_data(hist_data);
+ 	}
+ }
+@@ -2287,23 +2841,55 @@ static int hist_register_trigger(char *g
+ 			goto out;
+ 	}
+ 
+-	list_add_rcu(&data->list, &file->triggers);
+ 	ret++;
+ 
+-	update_cond_flag(file);
+-
+ 	if (hist_data->enable_timestamps)
+ 		tracing_set_time_stamp_abs(file->tr, true);
++ out:
++	return ret;
++}
++
++static int hist_trigger_enable(struct event_trigger_data *data,
++			       struct trace_event_file *file)
++{
++	int ret = 0;
++
++	list_add_tail_rcu(&data->list, &file->triggers);
++
++	update_cond_flag(file);
+ 
+ 	if (trace_event_trigger_enable_disable(file, 1) < 0) {
+ 		list_del_rcu(&data->list);
+ 		update_cond_flag(file);
+ 		ret--;
+ 	}
+- out:
++
+ 	return ret;
+ }
+ 
++static bool hist_trigger_check_refs(struct event_trigger_data *data,
++				    struct trace_event_file *file)
++{
++	struct hist_trigger_data *hist_data = data->private_data;
++	struct event_trigger_data *test, *named_data = NULL;
++
++	if (hist_data->attrs->name)
++		named_data = find_named_trigger(hist_data->attrs->name);
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			if (!hist_trigger_match(data, test, named_data, false))
++				continue;
++			hist_data = test->private_data;
++			if (check_var_refs(hist_data))
++				return true;
++			break;
++		}
++	}
++
++	return false;
++}
++
+ static void hist_unregister_trigger(char *glob, struct event_trigger_ops *ops,
+ 				    struct event_trigger_data *data,
+ 				    struct trace_event_file *file)
+@@ -2336,11 +2922,30 @@ static void hist_unregister_trigger(char
+ 	}
+ }
+ 
++static bool hist_file_check_refs(struct trace_event_file *file)
++{
++	struct hist_trigger_data *hist_data;
++	struct event_trigger_data *test;
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			hist_data = test->private_data;
++			if (check_var_refs(hist_data))
++				return true;
++		}
++	}
++
++	return false;
++}
++
+ static void hist_unreg_all(struct trace_event_file *file)
+ {
+ 	struct event_trigger_data *test, *n;
+ 	struct hist_trigger_data *hist_data;
+ 
++	if (hist_file_check_refs(file))
++		return;
++
+ 	list_for_each_entry_safe(test, n, &file->triggers, list) {
+ 		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
+ 			hist_data = test->private_data;
+@@ -2416,6 +3021,11 @@ static int event_hist_trigger_func(struc
+ 	}
+ 
+ 	if (remove) {
++		if (hist_trigger_check_refs(trigger_data, file)) {
++			ret = -EBUSY;
++			goto out_free;
++		}
++
+ 		cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file);
+ 		ret = 0;
+ 		goto out_free;
+@@ -2433,14 +3043,33 @@ static int event_hist_trigger_func(struc
+ 		goto out_free;
+ 	} else if (ret < 0)
+ 		goto out_free;
++
++	if (get_named_trigger_data(trigger_data))
++		goto enable;
++
++	if (has_hist_vars(hist_data))
++		save_hist_vars(hist_data);
++
++	ret = tracing_map_init(hist_data->map);
++	if (ret)
++		goto out_unreg;
++enable:
++	ret = hist_trigger_enable(trigger_data, file);
++	if (ret)
++		goto out_unreg;
++
+ 	/* Just return zero, not the number of registered triggers */
+ 	ret = 0;
+  out:
+ 	return ret;
++ out_unreg:
++	cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file);
+  out_free:
+ 	if (cmd_ops->set_filter)
+ 		cmd_ops->set_filter(NULL, trigger_data, NULL);
+ 
++	remove_hist_vars(hist_data);
++
+ 	kfree(trigger_data);
+ 
+ 	destroy_hist_data(hist_data);
+--- a/kernel/trace/trace_events_trigger.c
++++ b/kernel/trace/trace_events_trigger.c
+@@ -909,6 +909,12 @@ void set_named_trigger_data(struct event
+ 	data->named_data = named_data;
+ }
+ 
++struct event_trigger_data *
++get_named_trigger_data(struct event_trigger_data *data)
++{
++	return data->named_data;
++}
++
+ static void
+ traceon_trigger(struct event_trigger_data *data, void *rec,
+ 		struct ring_buffer_event *event)
diff --git a/kernel/patches-4.14.x-rt/0088-0031-tracing-Add-hist-trigger-action-hook.patch b/kernel/patches-4.14.x-rt/0088-0031-tracing-Add-hist-trigger-action-hook.patch
new file mode 100644
index 000000000..203bf614c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0088-0031-tracing-Add-hist-trigger-action-hook.patch
@@ -0,0 +1,215 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:57 -0600
+Subject: [PATCH 31/48] tracing: Add hist trigger action hook
+
+Add a hook for executing extra actions whenever a histogram entry is
+added or updated.
+
+The default 'action' when a hist entry is added to a histogram is to
+update the set of values associated with it.  Some applications may
+want to perform additional actions at that point, such as generate
+another event, or compare and save a maximum.
+
+Add a simple framework for doing that; specific actions will be
+implemented on top of it in later patches.
+
+Link: http://lkml.kernel.org/r/9482ba6a3eaf5ca6e60954314beacd0e25c05b24.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit b91ae245c2f781e6da0532d8545f51a0f1291cc0)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  106 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 104 insertions(+), 2 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -33,6 +33,7 @@ typedef u64 (*hist_field_fn_t) (struct h
+ 
+ #define HIST_FIELD_OPERANDS_MAX	2
+ #define HIST_FIELDS_MAX		(TRACING_MAP_FIELDS_MAX + TRACING_MAP_VARS_MAX)
++#define HIST_ACTIONS_MAX	8
+ 
+ enum field_op_id {
+ 	FIELD_OP_NONE,
+@@ -242,6 +243,9 @@ struct hist_trigger_attrs {
+ 	char		*assignment_str[TRACING_MAP_VARS_MAX];
+ 	unsigned int	n_assignments;
+ 
++	char		*action_str[HIST_ACTIONS_MAX];
++	unsigned int	n_actions;
++
+ 	struct var_defs	var_defs;
+ };
+ 
+@@ -261,6 +265,21 @@ struct hist_trigger_data {
+ 	bool				remove;
+ 	struct hist_field               *var_refs[TRACING_MAP_VARS_MAX];
+ 	unsigned int			n_var_refs;
++
++	struct action_data		*actions[HIST_ACTIONS_MAX];
++	unsigned int			n_actions;
++};
++
++struct action_data;
++
++typedef void (*action_fn_t) (struct hist_trigger_data *hist_data,
++			     struct tracing_map_elt *elt, void *rec,
++			     struct ring_buffer_event *rbe,
++			     struct action_data *data, u64 *var_ref_vals);
++
++struct action_data {
++	action_fn_t		fn;
++	unsigned int		var_ref_idx;
+ };
+ 
+ static u64 hist_field_timestamp(struct hist_field *hist_field,
+@@ -764,6 +783,9 @@ static void destroy_hist_trigger_attrs(s
+ 	for (i = 0; i < attrs->n_assignments; i++)
+ 		kfree(attrs->assignment_str[i]);
+ 
++	for (i = 0; i < attrs->n_actions; i++)
++		kfree(attrs->action_str[i]);
++
+ 	kfree(attrs->name);
+ 	kfree(attrs->sort_key_str);
+ 	kfree(attrs->keys_str);
+@@ -771,6 +793,16 @@ static void destroy_hist_trigger_attrs(s
+ 	kfree(attrs);
+ }
+ 
++static int parse_action(char *str, struct hist_trigger_attrs *attrs)
++{
++	int ret = 0;
++
++	if (attrs->n_actions >= HIST_ACTIONS_MAX)
++		return ret;
++
++	return ret;
++}
++
+ static int parse_assignment(char *str, struct hist_trigger_attrs *attrs)
+ {
+ 	int ret = 0;
+@@ -854,8 +886,9 @@ static struct hist_trigger_attrs *parse_
+ 		else if (strcmp(str, "clear") == 0)
+ 			attrs->clear = true;
+ 		else {
+-			ret = -EINVAL;
+-			goto free;
++			ret = parse_action(str, attrs);
++			if (ret)
++				goto free;
+ 		}
+ 	}
+ 
+@@ -2047,11 +2080,55 @@ static int create_sort_keys(struct hist_
+ 	return ret;
+ }
+ 
++static void destroy_actions(struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_actions; i++) {
++		struct action_data *data = hist_data->actions[i];
++
++		kfree(data);
++	}
++}
++
++static int parse_actions(struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++	int ret = 0;
++	char *str;
++
++	for (i = 0; i < hist_data->attrs->n_actions; i++) {
++		str = hist_data->attrs->action_str[i];
++	}
++
++	return ret;
++}
++
++static int create_actions(struct hist_trigger_data *hist_data,
++			  struct trace_event_file *file)
++{
++	struct action_data *data;
++	unsigned int i;
++	int ret = 0;
++
++	for (i = 0; i < hist_data->attrs->n_actions; i++) {
++		data = hist_data->actions[i];
++	}
++
++	return ret;
++}
++
+ static void destroy_hist_data(struct hist_trigger_data *hist_data)
+ {
++	if (!hist_data)
++		return;
++
+ 	destroy_hist_trigger_attrs(hist_data->attrs);
+ 	destroy_hist_fields(hist_data);
+ 	tracing_map_destroy(hist_data->map);
++
++	destroy_actions(hist_data);
++
+ 	kfree(hist_data);
+ }
+ 
+@@ -2118,6 +2195,10 @@ create_hist_data(unsigned int map_bits,
+ 	hist_data->remove = remove;
+ 	hist_data->event_file = file;
+ 
++	ret = parse_actions(hist_data);
++	if (ret)
++		goto free;
++
+ 	ret = create_hist_fields(hist_data, file);
+ 	if (ret)
+ 		goto free;
+@@ -2209,6 +2290,20 @@ static inline void add_to_key(char *comp
+ 	memcpy(compound_key + key_field->offset, key, size);
+ }
+ 
++static void
++hist_trigger_actions(struct hist_trigger_data *hist_data,
++		     struct tracing_map_elt *elt, void *rec,
++		     struct ring_buffer_event *rbe, u64 *var_ref_vals)
++{
++	struct action_data *data;
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_actions; i++) {
++		data = hist_data->actions[i];
++		data->fn(hist_data, elt, rec, rbe, data, var_ref_vals);
++	}
++}
++
+ static void event_hist_trigger(struct event_trigger_data *data, void *rec,
+ 			       struct ring_buffer_event *rbe)
+ {
+@@ -2264,6 +2359,9 @@ static void event_hist_trigger(struct ev
+ 		return;
+ 
+ 	hist_trigger_elt_update(hist_data, elt, rec, rbe, var_ref_vals);
++
++	if (resolve_var_refs(hist_data, key, var_ref_vals, true))
++		hist_trigger_actions(hist_data, elt, rec, rbe, var_ref_vals);
+ }
+ 
+ static void hist_trigger_stacktrace_print(struct seq_file *m,
+@@ -3050,6 +3148,10 @@ static int event_hist_trigger_func(struc
+ 	if (has_hist_vars(hist_data))
+ 		save_hist_vars(hist_data);
+ 
++	ret = create_actions(hist_data, file);
++	if (ret)
++		goto out_unreg;
++
+ 	ret = tracing_map_init(hist_data->map);
+ 	if (ret)
+ 		goto out_unreg;
diff --git a/kernel/patches-4.14.x-rt/0089-0032-tracing-Add-support-for-synthetic-events.patch b/kernel/patches-4.14.x-rt/0089-0032-tracing-Add-support-for-synthetic-events.patch
new file mode 100644
index 000000000..1873064cd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0089-0032-tracing-Add-support-for-synthetic-events.patch
@@ -0,0 +1,1041 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:58 -0600
+Subject: [PATCH 32/48] tracing: Add support for 'synthetic' events
+
+Synthetic events are user-defined events generated from hist trigger
+variables saved from one or more other events.
+
+To define a synthetic event, the user writes a simple specification
+consisting of the name of the new event along with one or more
+variables and their type(s), to the tracing/synthetic_events file.
+
+For instance, the following creates a new event named 'wakeup_latency'
+with 3 fields: lat, pid, and prio:
+
+    # echo 'wakeup_latency u64 lat; pid_t pid; int prio' >> \
+      /sys/kernel/debug/tracing/synthetic_events
+
+Reading the tracing/synthetic_events file lists all the
+currently-defined synthetic events, in this case the event we defined
+above:
+
+    # cat /sys/kernel/debug/tracing/synthetic_events
+    wakeup_latency u64 lat; pid_t pid; int prio
+
+At this point, the synthetic event is ready to use, and a histogram
+can be defined using it:
+
+    # echo 'hist:keys=pid,prio,lat.log2:sort=pid,lat' >> \
+    /sys/kernel/debug/tracing/events/synthetic/wakeup_latency/trigger
+
+The new event is created under the tracing/events/synthetic/ directory
+and looks and behaves just like any other event:
+
+    # ls /sys/kernel/debug/tracing/events/synthetic/wakeup_latency
+      enable  filter  format  hist  id  trigger
+
+Although a histogram can be defined for it, nothing will happen until
+an action tracing that event via the trace_synth() function occurs.
+The trace_synth() function is very similar to all the other trace_*
+invocations spread throughout the kernel, except in this case the
+trace_ function and its corresponding tracepoint isn't statically
+generated but defined by the user at run-time.
+
+How this can be automatically hooked up via a hist trigger 'action' is
+discussed in a subsequent patch.
+
+Link: http://lkml.kernel.org/r/c68df2284b7d172669daf9be29db62ad49bbc559.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+[fix noderef.cocci warnings, sizeof pointer for kcalloc of event->fields]
+Signed-off-by: Fengguang Wu <fengguang.wu@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit cc9371f8641efd7ce6c8d4e1fd44eae249deadb4)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  895 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 893 insertions(+), 2 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -20,10 +20,16 @@
+ #include <linux/slab.h>
+ #include <linux/stacktrace.h>
+ #include <linux/rculist.h>
++#include <linux/tracefs.h>
+ 
+ #include "tracing_map.h"
+ #include "trace.h"
+ 
++#define SYNTH_SYSTEM		"synthetic"
++#define SYNTH_FIELDS_MAX	16
++
++#define STR_VAR_LEN_MAX		32 /* must be multiple of sizeof(u64) */
++
+ struct hist_field;
+ 
+ typedef u64 (*hist_field_fn_t) (struct hist_field *field,
+@@ -270,6 +276,26 @@ struct hist_trigger_data {
+ 	unsigned int			n_actions;
+ };
+ 
++struct synth_field {
++	char *type;
++	char *name;
++	size_t size;
++	bool is_signed;
++	bool is_string;
++};
++
++struct synth_event {
++	struct list_head			list;
++	int					ref;
++	char					*name;
++	struct synth_field			**fields;
++	unsigned int				n_fields;
++	unsigned int				n_u64;
++	struct trace_event_class		class;
++	struct trace_event_call			call;
++	struct tracepoint			*tp;
++};
++
+ struct action_data;
+ 
+ typedef void (*action_fn_t) (struct hist_trigger_data *hist_data,
+@@ -282,6 +308,790 @@ struct action_data {
+ 	unsigned int		var_ref_idx;
+ };
+ 
++static LIST_HEAD(synth_event_list);
++static DEFINE_MUTEX(synth_event_mutex);
++
++struct synth_trace_event {
++	struct trace_entry	ent;
++	u64			fields[];
++};
++
++static int synth_event_define_fields(struct trace_event_call *call)
++{
++	struct synth_trace_event trace;
++	int offset = offsetof(typeof(trace), fields);
++	struct synth_event *event = call->data;
++	unsigned int i, size, n_u64;
++	char *name, *type;
++	bool is_signed;
++	int ret = 0;
++
++	for (i = 0, n_u64 = 0; i < event->n_fields; i++) {
++		size = event->fields[i]->size;
++		is_signed = event->fields[i]->is_signed;
++		type = event->fields[i]->type;
++		name = event->fields[i]->name;
++		ret = trace_define_field(call, type, name, offset, size,
++					 is_signed, FILTER_OTHER);
++		if (ret)
++			break;
++
++		if (event->fields[i]->is_string) {
++			offset += STR_VAR_LEN_MAX;
++			n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
++		} else {
++			offset += sizeof(u64);
++			n_u64++;
++		}
++	}
++
++	event->n_u64 = n_u64;
++
++	return ret;
++}
++
++static bool synth_field_signed(char *type)
++{
++	if (strncmp(type, "u", 1) == 0)
++		return false;
++
++	return true;
++}
++
++static int synth_field_is_string(char *type)
++{
++	if (strstr(type, "char[") != NULL)
++		return true;
++
++	return false;
++}
++
++static int synth_field_string_size(char *type)
++{
++	char buf[4], *end, *start;
++	unsigned int len;
++	int size, err;
++
++	start = strstr(type, "char[");
++	if (start == NULL)
++		return -EINVAL;
++	start += strlen("char[");
++
++	end = strchr(type, ']');
++	if (!end || end < start)
++		return -EINVAL;
++
++	len = end - start;
++	if (len > 3)
++		return -EINVAL;
++
++	strncpy(buf, start, len);
++	buf[len] = '\0';
++
++	err = kstrtouint(buf, 0, &size);
++	if (err)
++		return err;
++
++	if (size > STR_VAR_LEN_MAX)
++		return -EINVAL;
++
++	return size;
++}
++
++static int synth_field_size(char *type)
++{
++	int size = 0;
++
++	if (strcmp(type, "s64") == 0)
++		size = sizeof(s64);
++	else if (strcmp(type, "u64") == 0)
++		size = sizeof(u64);
++	else if (strcmp(type, "s32") == 0)
++		size = sizeof(s32);
++	else if (strcmp(type, "u32") == 0)
++		size = sizeof(u32);
++	else if (strcmp(type, "s16") == 0)
++		size = sizeof(s16);
++	else if (strcmp(type, "u16") == 0)
++		size = sizeof(u16);
++	else if (strcmp(type, "s8") == 0)
++		size = sizeof(s8);
++	else if (strcmp(type, "u8") == 0)
++		size = sizeof(u8);
++	else if (strcmp(type, "char") == 0)
++		size = sizeof(char);
++	else if (strcmp(type, "unsigned char") == 0)
++		size = sizeof(unsigned char);
++	else if (strcmp(type, "int") == 0)
++		size = sizeof(int);
++	else if (strcmp(type, "unsigned int") == 0)
++		size = sizeof(unsigned int);
++	else if (strcmp(type, "long") == 0)
++		size = sizeof(long);
++	else if (strcmp(type, "unsigned long") == 0)
++		size = sizeof(unsigned long);
++	else if (strcmp(type, "pid_t") == 0)
++		size = sizeof(pid_t);
++	else if (synth_field_is_string(type))
++		size = synth_field_string_size(type);
++
++	return size;
++}
++
++static const char *synth_field_fmt(char *type)
++{
++	const char *fmt = "%llu";
++
++	if (strcmp(type, "s64") == 0)
++		fmt = "%lld";
++	else if (strcmp(type, "u64") == 0)
++		fmt = "%llu";
++	else if (strcmp(type, "s32") == 0)
++		fmt = "%d";
++	else if (strcmp(type, "u32") == 0)
++		fmt = "%u";
++	else if (strcmp(type, "s16") == 0)
++		fmt = "%d";
++	else if (strcmp(type, "u16") == 0)
++		fmt = "%u";
++	else if (strcmp(type, "s8") == 0)
++		fmt = "%d";
++	else if (strcmp(type, "u8") == 0)
++		fmt = "%u";
++	else if (strcmp(type, "char") == 0)
++		fmt = "%d";
++	else if (strcmp(type, "unsigned char") == 0)
++		fmt = "%u";
++	else if (strcmp(type, "int") == 0)
++		fmt = "%d";
++	else if (strcmp(type, "unsigned int") == 0)
++		fmt = "%u";
++	else if (strcmp(type, "long") == 0)
++		fmt = "%ld";
++	else if (strcmp(type, "unsigned long") == 0)
++		fmt = "%lu";
++	else if (strcmp(type, "pid_t") == 0)
++		fmt = "%d";
++	else if (synth_field_is_string(type))
++		fmt = "%s";
++
++	return fmt;
++}
++
++static enum print_line_t print_synth_event(struct trace_iterator *iter,
++					   int flags,
++					   struct trace_event *event)
++{
++	struct trace_array *tr = iter->tr;
++	struct trace_seq *s = &iter->seq;
++	struct synth_trace_event *entry;
++	struct synth_event *se;
++	unsigned int i, n_u64;
++	char print_fmt[32];
++	const char *fmt;
++
++	entry = (struct synth_trace_event *)iter->ent;
++	se = container_of(event, struct synth_event, call.event);
++
++	trace_seq_printf(s, "%s: ", se->name);
++
++	for (i = 0, n_u64 = 0; i < se->n_fields; i++) {
++		if (trace_seq_has_overflowed(s))
++			goto end;
++
++		fmt = synth_field_fmt(se->fields[i]->type);
++
++		/* parameter types */
++		if (tr->trace_flags & TRACE_ITER_VERBOSE)
++			trace_seq_printf(s, "%s ", fmt);
++
++		snprintf(print_fmt, sizeof(print_fmt), "%%s=%s%%s", fmt);
++
++		/* parameter values */
++		if (se->fields[i]->is_string) {
++			trace_seq_printf(s, print_fmt, se->fields[i]->name,
++					 (char *)&entry->fields[n_u64],
++					 i == se->n_fields - 1 ? "" : " ");
++			n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
++		} else {
++			trace_seq_printf(s, print_fmt, se->fields[i]->name,
++					 entry->fields[n_u64],
++					 i == se->n_fields - 1 ? "" : " ");
++			n_u64++;
++		}
++	}
++end:
++	trace_seq_putc(s, '\n');
++
++	return trace_handle_return(s);
++}
++
++static struct trace_event_functions synth_event_funcs = {
++	.trace		= print_synth_event
++};
++
++static notrace void trace_event_raw_event_synth(void *__data,
++						u64 *var_ref_vals,
++						unsigned int var_ref_idx)
++{
++	struct trace_event_file *trace_file = __data;
++	struct synth_trace_event *entry;
++	struct trace_event_buffer fbuffer;
++	struct synth_event *event;
++	unsigned int i, n_u64;
++	int fields_size = 0;
++
++	event = trace_file->event_call->data;
++
++	if (trace_trigger_soft_disabled(trace_file))
++		return;
++
++	fields_size = event->n_u64 * sizeof(u64);
++
++	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
++					   sizeof(*entry) + fields_size);
++	if (!entry)
++		return;
++
++	for (i = 0, n_u64 = 0; i < event->n_fields; i++) {
++		if (event->fields[i]->is_string) {
++			char *str_val = (char *)(long)var_ref_vals[var_ref_idx + i];
++			char *str_field = (char *)&entry->fields[n_u64];
++
++			strncpy(str_field, str_val, STR_VAR_LEN_MAX);
++			n_u64 += STR_VAR_LEN_MAX / sizeof(u64);
++		} else {
++			entry->fields[n_u64] = var_ref_vals[var_ref_idx + i];
++			n_u64++;
++		}
++	}
++
++	trace_event_buffer_commit(&fbuffer);
++}
++
++static void free_synth_event_print_fmt(struct trace_event_call *call)
++{
++	if (call) {
++		kfree(call->print_fmt);
++		call->print_fmt = NULL;
++	}
++}
++
++static int __set_synth_event_print_fmt(struct synth_event *event,
++				       char *buf, int len)
++{
++	const char *fmt;
++	int pos = 0;
++	int i;
++
++	/* When len=0, we just calculate the needed length */
++#define LEN_OR_ZERO (len ? len - pos : 0)
++
++	pos += snprintf(buf + pos, LEN_OR_ZERO, "\"");
++	for (i = 0; i < event->n_fields; i++) {
++		fmt = synth_field_fmt(event->fields[i]->type);
++		pos += snprintf(buf + pos, LEN_OR_ZERO, "%s=%s%s",
++				event->fields[i]->name, fmt,
++				i == event->n_fields - 1 ? "" : ", ");
++	}
++	pos += snprintf(buf + pos, LEN_OR_ZERO, "\"");
++
++	for (i = 0; i < event->n_fields; i++) {
++		pos += snprintf(buf + pos, LEN_OR_ZERO,
++				", REC->%s", event->fields[i]->name);
++	}
++
++#undef LEN_OR_ZERO
++
++	/* return the length of print_fmt */
++	return pos;
++}
++
++static int set_synth_event_print_fmt(struct trace_event_call *call)
++{
++	struct synth_event *event = call->data;
++	char *print_fmt;
++	int len;
++
++	/* First: called with 0 length to calculate the needed length */
++	len = __set_synth_event_print_fmt(event, NULL, 0);
++
++	print_fmt = kmalloc(len + 1, GFP_KERNEL);
++	if (!print_fmt)
++		return -ENOMEM;
++
++	/* Second: actually write the @print_fmt */
++	__set_synth_event_print_fmt(event, print_fmt, len + 1);
++	call->print_fmt = print_fmt;
++
++	return 0;
++}
++
++static void free_synth_field(struct synth_field *field)
++{
++	kfree(field->type);
++	kfree(field->name);
++	kfree(field);
++}
++
++static struct synth_field *parse_synth_field(char *field_type,
++					     char *field_name)
++{
++	struct synth_field *field;
++	int len, ret = 0;
++	char *array;
++
++	if (field_type[0] == ';')
++		field_type++;
++
++	len = strlen(field_name);
++	if (field_name[len - 1] == ';')
++		field_name[len - 1] = '\0';
++
++	field = kzalloc(sizeof(*field), GFP_KERNEL);
++	if (!field)
++		return ERR_PTR(-ENOMEM);
++
++	len = strlen(field_type) + 1;
++	array = strchr(field_name, '[');
++	if (array)
++		len += strlen(array);
++	field->type = kzalloc(len, GFP_KERNEL);
++	if (!field->type) {
++		ret = -ENOMEM;
++		goto free;
++	}
++	strcat(field->type, field_type);
++	if (array) {
++		strcat(field->type, array);
++		*array = '\0';
++	}
++
++	field->size = synth_field_size(field->type);
++	if (!field->size) {
++		ret = -EINVAL;
++		goto free;
++	}
++
++	if (synth_field_is_string(field->type))
++		field->is_string = true;
++
++	field->is_signed = synth_field_signed(field->type);
++
++	field->name = kstrdup(field_name, GFP_KERNEL);
++	if (!field->name) {
++		ret = -ENOMEM;
++		goto free;
++	}
++ out:
++	return field;
++ free:
++	free_synth_field(field);
++	field = ERR_PTR(ret);
++	goto out;
++}
++
++static void free_synth_tracepoint(struct tracepoint *tp)
++{
++	if (!tp)
++		return;
++
++	kfree(tp->name);
++	kfree(tp);
++}
++
++static struct tracepoint *alloc_synth_tracepoint(char *name)
++{
++	struct tracepoint *tp;
++
++	tp = kzalloc(sizeof(*tp), GFP_KERNEL);
++	if (!tp)
++		return ERR_PTR(-ENOMEM);
++
++	tp->name = kstrdup(name, GFP_KERNEL);
++	if (!tp->name) {
++		kfree(tp);
++		return ERR_PTR(-ENOMEM);
++	}
++
++	return tp;
++}
++
++typedef void (*synth_probe_func_t) (void *__data, u64 *var_ref_vals,
++				    unsigned int var_ref_idx);
++
++static inline void trace_synth(struct synth_event *event, u64 *var_ref_vals,
++			       unsigned int var_ref_idx)
++{
++	struct tracepoint *tp = event->tp;
++
++	if (unlikely(atomic_read(&tp->key.enabled) > 0)) {
++		struct tracepoint_func *probe_func_ptr;
++		synth_probe_func_t probe_func;
++		void *__data;
++
++		if (!(cpu_online(raw_smp_processor_id())))
++			return;
++
++		probe_func_ptr = rcu_dereference_sched((tp)->funcs);
++		if (probe_func_ptr) {
++			do {
++				probe_func = probe_func_ptr->func;
++				__data = probe_func_ptr->data;
++				probe_func(__data, var_ref_vals, var_ref_idx);
++			} while ((++probe_func_ptr)->func);
++		}
++	}
++}
++
++static struct synth_event *find_synth_event(const char *name)
++{
++	struct synth_event *event;
++
++	list_for_each_entry(event, &synth_event_list, list) {
++		if (strcmp(event->name, name) == 0)
++			return event;
++	}
++
++	return NULL;
++}
++
++static int register_synth_event(struct synth_event *event)
++{
++	struct trace_event_call *call = &event->call;
++	int ret = 0;
++
++	event->call.class = &event->class;
++	event->class.system = kstrdup(SYNTH_SYSTEM, GFP_KERNEL);
++	if (!event->class.system) {
++		ret = -ENOMEM;
++		goto out;
++	}
++
++	event->tp = alloc_synth_tracepoint(event->name);
++	if (IS_ERR(event->tp)) {
++		ret = PTR_ERR(event->tp);
++		event->tp = NULL;
++		goto out;
++	}
++
++	INIT_LIST_HEAD(&call->class->fields);
++	call->event.funcs = &synth_event_funcs;
++	call->class->define_fields = synth_event_define_fields;
++
++	ret = register_trace_event(&call->event);
++	if (!ret) {
++		ret = -ENODEV;
++		goto out;
++	}
++	call->flags = TRACE_EVENT_FL_TRACEPOINT;
++	call->class->reg = trace_event_reg;
++	call->class->probe = trace_event_raw_event_synth;
++	call->data = event;
++	call->tp = event->tp;
++
++	ret = trace_add_event_call(call);
++	if (ret) {
++		pr_warn("Failed to register synthetic event: %s\n",
++			trace_event_name(call));
++		goto err;
++	}
++
++	ret = set_synth_event_print_fmt(call);
++	if (ret < 0) {
++		trace_remove_event_call(call);
++		goto err;
++	}
++ out:
++	return ret;
++ err:
++	unregister_trace_event(&call->event);
++	goto out;
++}
++
++static int unregister_synth_event(struct synth_event *event)
++{
++	struct trace_event_call *call = &event->call;
++	int ret;
++
++	ret = trace_remove_event_call(call);
++
++	return ret;
++}
++
++static void free_synth_event(struct synth_event *event)
++{
++	unsigned int i;
++
++	if (!event)
++		return;
++
++	for (i = 0; i < event->n_fields; i++)
++		free_synth_field(event->fields[i]);
++
++	kfree(event->fields);
++	kfree(event->name);
++	kfree(event->class.system);
++	free_synth_tracepoint(event->tp);
++	free_synth_event_print_fmt(&event->call);
++	kfree(event);
++}
++
++static struct synth_event *alloc_synth_event(char *event_name, int n_fields,
++					     struct synth_field **fields)
++{
++	struct synth_event *event;
++	unsigned int i;
++
++	event = kzalloc(sizeof(*event), GFP_KERNEL);
++	if (!event) {
++		event = ERR_PTR(-ENOMEM);
++		goto out;
++	}
++
++	event->name = kstrdup(event_name, GFP_KERNEL);
++	if (!event->name) {
++		kfree(event);
++		event = ERR_PTR(-ENOMEM);
++		goto out;
++	}
++
++	event->fields = kcalloc(n_fields, sizeof(*event->fields), GFP_KERNEL);
++	if (!event->fields) {
++		free_synth_event(event);
++		event = ERR_PTR(-ENOMEM);
++		goto out;
++	}
++
++	for (i = 0; i < n_fields; i++)
++		event->fields[i] = fields[i];
++
++	event->n_fields = n_fields;
++ out:
++	return event;
++}
++
++static void add_or_delete_synth_event(struct synth_event *event, int delete)
++{
++	if (delete)
++		free_synth_event(event);
++	else {
++		mutex_lock(&synth_event_mutex);
++		if (!find_synth_event(event->name))
++			list_add(&event->list, &synth_event_list);
++		else
++			free_synth_event(event);
++		mutex_unlock(&synth_event_mutex);
++	}
++}
++
++static int create_synth_event(int argc, char **argv)
++{
++	struct synth_field *field, *fields[SYNTH_FIELDS_MAX];
++	struct synth_event *event = NULL;
++	bool delete_event = false;
++	int i, n_fields = 0, ret = 0;
++	char *name;
++
++	mutex_lock(&synth_event_mutex);
++
++	/*
++	 * Argument syntax:
++	 *  - Add synthetic event: <event_name> field[;field] ...
++	 *  - Remove synthetic event: !<event_name> field[;field] ...
++	 *      where 'field' = type field_name
++	 */
++	if (argc < 1) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	name = argv[0];
++	if (name[0] == '!') {
++		delete_event = true;
++		name++;
++	}
++
++	event = find_synth_event(name);
++	if (event) {
++		if (delete_event) {
++			if (event->ref) {
++				event = NULL;
++				ret = -EBUSY;
++				goto out;
++			}
++			list_del(&event->list);
++			goto out;
++		}
++		event = NULL;
++		ret = -EEXIST;
++		goto out;
++	} else if (delete_event)
++		goto out;
++
++	if (argc < 2) {
++		ret = -EINVAL;
++		goto out;
++	}
++
++	for (i = 1; i < argc - 1; i++) {
++		if (strcmp(argv[i], ";") == 0)
++			continue;
++		if (n_fields == SYNTH_FIELDS_MAX) {
++			ret = -EINVAL;
++			goto err;
++		}
++
++		field = parse_synth_field(argv[i], argv[i + 1]);
++		if (IS_ERR(field)) {
++			ret = PTR_ERR(field);
++			goto err;
++		}
++		fields[n_fields] = field;
++		i++; n_fields++;
++	}
++
++	if (i < argc) {
++		ret = -EINVAL;
++		goto err;
++	}
++
++	event = alloc_synth_event(name, n_fields, fields);
++	if (IS_ERR(event)) {
++		ret = PTR_ERR(event);
++		event = NULL;
++		goto err;
++	}
++ out:
++	mutex_unlock(&synth_event_mutex);
++
++	if (event) {
++		if (delete_event) {
++			ret = unregister_synth_event(event);
++			add_or_delete_synth_event(event, !ret);
++		} else {
++			ret = register_synth_event(event);
++			add_or_delete_synth_event(event, ret);
++		}
++	}
++
++	return ret;
++ err:
++	mutex_unlock(&synth_event_mutex);
++
++	for (i = 0; i < n_fields; i++)
++		free_synth_field(fields[i]);
++	free_synth_event(event);
++
++	return ret;
++}
++
++static int release_all_synth_events(void)
++{
++	struct list_head release_events;
++	struct synth_event *event, *e;
++	int ret = 0;
++
++	INIT_LIST_HEAD(&release_events);
++
++	mutex_lock(&synth_event_mutex);
++
++	list_for_each_entry(event, &synth_event_list, list) {
++		if (event->ref) {
++			mutex_unlock(&synth_event_mutex);
++			return -EBUSY;
++		}
++	}
++
++	list_splice_init(&event->list, &release_events);
++
++	mutex_unlock(&synth_event_mutex);
++
++	list_for_each_entry_safe(event, e, &release_events, list) {
++		list_del(&event->list);
++
++		ret = unregister_synth_event(event);
++		add_or_delete_synth_event(event, !ret);
++	}
++
++	return ret;
++}
++
++
++static void *synth_events_seq_start(struct seq_file *m, loff_t *pos)
++{
++	mutex_lock(&synth_event_mutex);
++
++	return seq_list_start(&synth_event_list, *pos);
++}
++
++static void *synth_events_seq_next(struct seq_file *m, void *v, loff_t *pos)
++{
++	return seq_list_next(v, &synth_event_list, pos);
++}
++
++static void synth_events_seq_stop(struct seq_file *m, void *v)
++{
++	mutex_unlock(&synth_event_mutex);
++}
++
++static int synth_events_seq_show(struct seq_file *m, void *v)
++{
++	struct synth_field *field;
++	struct synth_event *event = v;
++	unsigned int i;
++
++	seq_printf(m, "%s\t", event->name);
++
++	for (i = 0; i < event->n_fields; i++) {
++		field = event->fields[i];
++
++		/* parameter values */
++		seq_printf(m, "%s %s%s", field->type, field->name,
++			   i == event->n_fields - 1 ? "" : "; ");
++	}
++
++	seq_putc(m, '\n');
++
++	return 0;
++}
++
++static const struct seq_operations synth_events_seq_op = {
++	.start  = synth_events_seq_start,
++	.next   = synth_events_seq_next,
++	.stop   = synth_events_seq_stop,
++	.show   = synth_events_seq_show
++};
++
++static int synth_events_open(struct inode *inode, struct file *file)
++{
++	int ret;
++
++	if ((file->f_mode & FMODE_WRITE) && (file->f_flags & O_TRUNC)) {
++		ret = release_all_synth_events();
++		if (ret < 0)
++			return ret;
++	}
++
++	return seq_open(file, &synth_events_seq_op);
++}
++
++static ssize_t synth_events_write(struct file *file,
++				  const char __user *buffer,
++				  size_t count, loff_t *ppos)
++{
++	return trace_parse_run_command(file, buffer, count, ppos,
++				       create_synth_event);
++}
++
++static const struct file_operations synth_events_fops = {
++	.open           = synth_events_open,
++	.write		= synth_events_write,
++	.read           = seq_read,
++	.llseek         = seq_lseek,
++	.release        = seq_release,
++};
++
+ static u64 hist_field_timestamp(struct hist_field *hist_field,
+ 				struct tracing_map_elt *elt,
+ 				struct ring_buffer_event *rbe,
+@@ -2965,6 +3775,28 @@ static int hist_trigger_enable(struct ev
+ 	return ret;
+ }
+ 
++static bool have_hist_trigger_match(struct event_trigger_data *data,
++				    struct trace_event_file *file)
++{
++	struct hist_trigger_data *hist_data = data->private_data;
++	struct event_trigger_data *test, *named_data = NULL;
++	bool match = false;
++
++	if (hist_data->attrs->name)
++		named_data = find_named_trigger(hist_data->attrs->name);
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			if (hist_trigger_match(data, test, named_data, false)) {
++				match = true;
++				break;
++			}
++		}
++	}
++
++	return match;
++}
++
+ static bool hist_trigger_check_refs(struct event_trigger_data *data,
+ 				    struct trace_event_file *file)
+ {
+@@ -3040,6 +3872,8 @@ static void hist_unreg_all(struct trace_
+ {
+ 	struct event_trigger_data *test, *n;
+ 	struct hist_trigger_data *hist_data;
++	struct synth_event *se;
++	const char *se_name;
+ 
+ 	if (hist_file_check_refs(file))
+ 		return;
+@@ -3049,6 +3883,14 @@ static void hist_unreg_all(struct trace_
+ 			hist_data = test->private_data;
+ 			list_del_rcu(&test->list);
+ 			trace_event_trigger_enable_disable(file, 0);
++
++			mutex_lock(&synth_event_mutex);
++			se_name = trace_event_name(file->event_call);
++			se = find_synth_event(se_name);
++			if (se)
++				se->ref--;
++			mutex_unlock(&synth_event_mutex);
++
+ 			update_cond_flag(file);
+ 			if (hist_data->enable_timestamps)
+ 				tracing_set_time_stamp_abs(file->tr, false);
+@@ -3067,6 +3909,8 @@ static int event_hist_trigger_func(struc
+ 	struct hist_trigger_attrs *attrs;
+ 	struct event_trigger_ops *trigger_ops;
+ 	struct hist_trigger_data *hist_data;
++	struct synth_event *se;
++	const char *se_name;
+ 	bool remove = false;
+ 	char *trigger;
+ 	int ret = 0;
+@@ -3097,10 +3941,11 @@ static int event_hist_trigger_func(struc
+ 
+ 	trigger_ops = cmd_ops->get_trigger_ops(cmd, trigger);
+ 
+-	ret = -ENOMEM;
+ 	trigger_data = kzalloc(sizeof(*trigger_data), GFP_KERNEL);
+-	if (!trigger_data)
++	if (!trigger_data) {
++		ret = -ENOMEM;
+ 		goto out_free;
++	}
+ 
+ 	trigger_data->count = -1;
+ 	trigger_data->ops = trigger_ops;
+@@ -3119,12 +3964,23 @@ static int event_hist_trigger_func(struc
+ 	}
+ 
+ 	if (remove) {
++		if (!have_hist_trigger_match(trigger_data, file))
++			goto out_free;
++
+ 		if (hist_trigger_check_refs(trigger_data, file)) {
+ 			ret = -EBUSY;
+ 			goto out_free;
+ 		}
+ 
+ 		cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file);
++
++		mutex_lock(&synth_event_mutex);
++		se_name = trace_event_name(file->event_call);
++		se = find_synth_event(se_name);
++		if (se)
++			se->ref--;
++		mutex_unlock(&synth_event_mutex);
++
+ 		ret = 0;
+ 		goto out_free;
+ 	}
+@@ -3160,6 +4016,13 @@ static int event_hist_trigger_func(struc
+ 	if (ret)
+ 		goto out_unreg;
+ 
++	mutex_lock(&synth_event_mutex);
++	se_name = trace_event_name(file->event_call);
++	se = find_synth_event(se_name);
++	if (se)
++		se->ref++;
++	mutex_unlock(&synth_event_mutex);
++
+ 	/* Just return zero, not the number of registered triggers */
+ 	ret = 0;
+  out:
+@@ -3332,3 +4195,31 @@ static __init void unregister_trigger_hi
+ 
+ 	return ret;
+ }
++
++static __init int trace_events_hist_init(void)
++{
++	struct dentry *entry = NULL;
++	struct dentry *d_tracer;
++	int err = 0;
++
++	d_tracer = tracing_init_dentry();
++	if (IS_ERR(d_tracer)) {
++		err = PTR_ERR(d_tracer);
++		goto err;
++	}
++
++	entry = tracefs_create_file("synthetic_events", 0644, d_tracer,
++				    NULL, &synth_events_fops);
++	if (!entry) {
++		err = -ENODEV;
++		goto err;
++	}
++
++	return err;
++ err:
++	pr_warn("Could not create tracefs 'synthetic_events' entry\n");
++
++	return err;
++}
++
++fs_initcall(trace_events_hist_init);
diff --git a/kernel/patches-4.14.x-rt/0090-0033-tracing-Add-support-for-field-variables.patch b/kernel/patches-4.14.x-rt/0090-0033-tracing-Add-support-for-field-variables.patch
new file mode 100644
index 000000000..a155f63b7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0090-0033-tracing-Add-support-for-field-variables.patch
@@ -0,0 +1,666 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:51:59 -0600
+Subject: [PATCH 33/48] tracing: Add support for 'field variables'
+
+Users should be able to directly specify event fields in hist trigger
+'actions' rather than being forced to explicitly create a variable for
+that purpose.
+
+Add support allowing fields to be used directly in actions, which
+essentially does just that - creates 'invisible' variables for each
+bare field specified in an action.  If a bare field refers to a field
+on another (matching) event, it even creates a special histogram for
+the purpose (since variables can't be defined on an existing histogram
+after histogram creation).
+
+Here's a simple example that demonstrates both.  Basically the
+onmatch() action creates a list of variables corresponding to the
+parameters of the synthetic event to be generated, and then uses those
+values to generate the event.  So for the wakeup_latency synthetic
+event 'call' below the first param, $wakeup_lat, is a variable defined
+explicitly on sched_switch, where 'next_pid' is just a normal field on
+sched_switch, and prio is a normal field on sched_waking.
+
+Since the mechanism works on variables, those two normal fields just
+have 'invisible' variables created internally for them.  In the case of
+'prio', which is on another event, we actually need to create an
+additional hist trigger and define the invisible variable on that, since
+once a hist trigger is defined, variables can't be added to it later.
+
+  echo 'wakeup_latency u64 lat; pid_t pid; int prio' >>
+       /sys/kernel/debug/tracing/synthetic_events
+
+  echo 'hist:keys=pid:ts0=common_timestamp.usecs >>
+       /sys/kernel/debug/tracing/events/sched/sched_waking/trigger
+
+echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:
+      onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,next_pid,prio)
+            >> /sys/kernel/debug/tracing/events/sched/sched_switch/trigger
+
+Link: http://lkml.kernel.org/r/8e8dcdac1ea180ed7a3689e1caeeccede9dc42b3.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 5fcd8c6efab39371cb3ce51b8b391a43e83a94de)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  531 ++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 530 insertions(+), 1 deletion(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -255,6 +255,16 @@ struct hist_trigger_attrs {
+ 	struct var_defs	var_defs;
+ };
+ 
++struct field_var {
++	struct hist_field	*var;
++	struct hist_field	*val;
++};
++
++struct field_var_hist {
++	struct hist_trigger_data	*hist_data;
++	char				*cmd;
++};
++
+ struct hist_trigger_data {
+ 	struct hist_field               *fields[HIST_FIELDS_MAX];
+ 	unsigned int			n_vals;
+@@ -274,6 +284,12 @@ struct hist_trigger_data {
+ 
+ 	struct action_data		*actions[HIST_ACTIONS_MAX];
+ 	unsigned int			n_actions;
++
++	struct field_var		*field_vars[SYNTH_FIELDS_MAX];
++	unsigned int			n_field_vars;
++	unsigned int			n_field_var_str;
++	struct field_var_hist		*field_var_hists[SYNTH_FIELDS_MAX];
++	unsigned int			n_field_var_hists;
+ };
+ 
+ struct synth_field {
+@@ -1427,6 +1443,7 @@ static struct hist_field *find_event_var
+ struct hist_elt_data {
+ 	char *comm;
+ 	u64 *var_ref_vals;
++	char *field_var_str[SYNTH_FIELDS_MAX];
+ };
+ 
+ static u64 hist_field_var_ref(struct hist_field *hist_field,
+@@ -1731,6 +1748,11 @@ static inline void save_comm(char *comm,
+ 
+ static void hist_elt_data_free(struct hist_elt_data *elt_data)
+ {
++	unsigned int i;
++
++	for (i = 0; i < SYNTH_FIELDS_MAX; i++)
++		kfree(elt_data->field_var_str[i]);
++
+ 	kfree(elt_data->comm);
+ 	kfree(elt_data);
+ }
+@@ -1748,7 +1770,7 @@ static int hist_trigger_elt_data_alloc(s
+ 	unsigned int size = TASK_COMM_LEN;
+ 	struct hist_elt_data *elt_data;
+ 	struct hist_field *key_field;
+-	unsigned int i;
++	unsigned int i, n_str;
+ 
+ 	elt_data = kzalloc(sizeof(*elt_data), GFP_KERNEL);
+ 	if (!elt_data)
+@@ -1767,6 +1789,18 @@ static int hist_trigger_elt_data_alloc(s
+ 		}
+ 	}
+ 
++	n_str = hist_data->n_field_var_str;
++
++	size = STR_VAR_LEN_MAX;
++
++	for (i = 0; i < n_str; i++) {
++		elt_data->field_var_str[i] = kzalloc(size, GFP_KERNEL);
++		if (!elt_data->field_var_str[i]) {
++			hist_elt_data_free(elt_data);
++			return -ENOMEM;
++		}
++	}
++
+ 	elt->private_data = elt_data;
+ 
+ 	return 0;
+@@ -2473,6 +2507,470 @@ static struct hist_field *parse_expr(str
+ 	return ERR_PTR(ret);
+ }
+ 
++static char *find_trigger_filter(struct hist_trigger_data *hist_data,
++				 struct trace_event_file *file)
++{
++	struct event_trigger_data *test;
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			if (test->private_data == hist_data)
++				return test->filter_str;
++		}
++	}
++
++	return NULL;
++}
++
++static struct event_command trigger_hist_cmd;
++static int event_hist_trigger_func(struct event_command *cmd_ops,
++				   struct trace_event_file *file,
++				   char *glob, char *cmd, char *param);
++
++static bool compatible_keys(struct hist_trigger_data *target_hist_data,
++			    struct hist_trigger_data *hist_data,
++			    unsigned int n_keys)
++{
++	struct hist_field *target_hist_field, *hist_field;
++	unsigned int n, i, j;
++
++	if (hist_data->n_fields - hist_data->n_vals != n_keys)
++		return false;
++
++	i = hist_data->n_vals;
++	j = target_hist_data->n_vals;
++
++	for (n = 0; n < n_keys; n++) {
++		hist_field = hist_data->fields[i + n];
++		target_hist_field = target_hist_data->fields[j + n];
++
++		if (strcmp(hist_field->type, target_hist_field->type) != 0)
++			return false;
++		if (hist_field->size != target_hist_field->size)
++			return false;
++		if (hist_field->is_signed != target_hist_field->is_signed)
++			return false;
++	}
++
++	return true;
++}
++
++static struct hist_trigger_data *
++find_compatible_hist(struct hist_trigger_data *target_hist_data,
++		     struct trace_event_file *file)
++{
++	struct hist_trigger_data *hist_data;
++	struct event_trigger_data *test;
++	unsigned int n_keys;
++
++	n_keys = target_hist_data->n_fields - target_hist_data->n_vals;
++
++	list_for_each_entry_rcu(test, &file->triggers, list) {
++		if (test->cmd_ops->trigger_type == ETT_EVENT_HIST) {
++			hist_data = test->private_data;
++
++			if (compatible_keys(target_hist_data, hist_data, n_keys))
++				return hist_data;
++		}
++	}
++
++	return NULL;
++}
++
++static struct trace_event_file *event_file(struct trace_array *tr,
++					   char *system, char *event_name)
++{
++	struct trace_event_file *file;
++
++	file = find_event_file(tr, system, event_name);
++	if (!file)
++		return ERR_PTR(-EINVAL);
++
++	return file;
++}
++
++static struct hist_field *
++find_synthetic_field_var(struct hist_trigger_data *target_hist_data,
++			 char *system, char *event_name, char *field_name)
++{
++	struct hist_field *event_var;
++	char *synthetic_name;
++
++	synthetic_name = kzalloc(MAX_FILTER_STR_VAL, GFP_KERNEL);
++	if (!synthetic_name)
++		return ERR_PTR(-ENOMEM);
++
++	strcpy(synthetic_name, "synthetic_");
++	strcat(synthetic_name, field_name);
++
++	event_var = find_event_var(target_hist_data, system, event_name, synthetic_name);
++
++	kfree(synthetic_name);
++
++	return event_var;
++}
++
++/**
++ * create_field_var_hist - Automatically create a histogram and var for a field
++ * @target_hist_data: The target hist trigger
++ * @subsys_name: Optional subsystem name
++ * @event_name: Optional event name
++ * @field_name: The name of the field (and the resulting variable)
++ *
++ * Hist trigger actions fetch data from variables, not directly from
++ * events.  However, for convenience, users are allowed to directly
++ * specify an event field in an action, which will be automatically
++ * converted into a variable on their behalf.
++
++ * If a user specifies a field on an event that isn't the event the
++ * histogram currently being defined (the target event histogram), the
++ * only way that can be accomplished is if a new hist trigger is
++ * created and the field variable defined on that.
++ *
++ * This function creates a new histogram compatible with the target
++ * event (meaning a histogram with the same key as the target
++ * histogram), and creates a variable for the specified field, but
++ * with 'synthetic_' prepended to the variable name in order to avoid
++ * collision with normal field variables.
++ *
++ * Return: The variable created for the field.
++ */
++struct hist_field *
++create_field_var_hist(struct hist_trigger_data *target_hist_data,
++		      char *subsys_name, char *event_name, char *field_name)
++{
++	struct trace_array *tr = target_hist_data->event_file->tr;
++	struct hist_field *event_var = ERR_PTR(-EINVAL);
++	struct hist_trigger_data *hist_data;
++	unsigned int i, n, first = true;
++	struct field_var_hist *var_hist;
++	struct trace_event_file *file;
++	struct hist_field *key_field;
++	char *saved_filter;
++	char *cmd;
++	int ret;
++
++	if (target_hist_data->n_field_var_hists >= SYNTH_FIELDS_MAX)
++		return ERR_PTR(-EINVAL);
++
++	file = event_file(tr, subsys_name, event_name);
++
++	if (IS_ERR(file)) {
++		ret = PTR_ERR(file);
++		return ERR_PTR(ret);
++	}
++
++	/*
++	 * Look for a histogram compatible with target.  We'll use the
++	 * found histogram specification to create a new matching
++	 * histogram with our variable on it.  target_hist_data is not
++	 * yet a registered histogram so we can't use that.
++	 */
++	hist_data = find_compatible_hist(target_hist_data, file);
++	if (!hist_data)
++		return ERR_PTR(-EINVAL);
++
++	/* See if a synthetic field variable has already been created */
++	event_var = find_synthetic_field_var(target_hist_data, subsys_name,
++					     event_name, field_name);
++	if (!IS_ERR_OR_NULL(event_var))
++		return event_var;
++
++	var_hist = kzalloc(sizeof(*var_hist), GFP_KERNEL);
++	if (!var_hist)
++		return ERR_PTR(-ENOMEM);
++
++	cmd = kzalloc(MAX_FILTER_STR_VAL, GFP_KERNEL);
++	if (!cmd) {
++		kfree(var_hist);
++		return ERR_PTR(-ENOMEM);
++	}
++
++	/* Use the same keys as the compatible histogram */
++	strcat(cmd, "keys=");
++
++	for_each_hist_key_field(i, hist_data) {
++		key_field = hist_data->fields[i];
++		if (!first)
++			strcat(cmd, ",");
++		strcat(cmd, key_field->field->name);
++		first = false;
++	}
++
++	/* Create the synthetic field variable specification */
++	strcat(cmd, ":synthetic_");
++	strcat(cmd, field_name);
++	strcat(cmd, "=");
++	strcat(cmd, field_name);
++
++	/* Use the same filter as the compatible histogram */
++	saved_filter = find_trigger_filter(hist_data, file);
++	if (saved_filter) {
++		strcat(cmd, " if ");
++		strcat(cmd, saved_filter);
++	}
++
++	var_hist->cmd = kstrdup(cmd, GFP_KERNEL);
++	if (!var_hist->cmd) {
++		kfree(cmd);
++		kfree(var_hist);
++		return ERR_PTR(-ENOMEM);
++	}
++
++	/* Save the compatible histogram information */
++	var_hist->hist_data = hist_data;
++
++	/* Create the new histogram with our variable */
++	ret = event_hist_trigger_func(&trigger_hist_cmd, file,
++				      "", "hist", cmd);
++	if (ret) {
++		kfree(cmd);
++		kfree(var_hist->cmd);
++		kfree(var_hist);
++		return ERR_PTR(ret);
++	}
++
++	kfree(cmd);
++
++	/* If we can't find the variable, something went wrong */
++	event_var = find_synthetic_field_var(target_hist_data, subsys_name,
++					     event_name, field_name);
++	if (IS_ERR_OR_NULL(event_var)) {
++		kfree(var_hist->cmd);
++		kfree(var_hist);
++		return ERR_PTR(-EINVAL);
++	}
++
++	n = target_hist_data->n_field_var_hists;
++	target_hist_data->field_var_hists[n] = var_hist;
++	target_hist_data->n_field_var_hists++;
++
++	return event_var;
++}
++
++struct hist_field *
++find_target_event_var(struct hist_trigger_data *hist_data,
++		      char *subsys_name, char *event_name, char *var_name)
++{
++	struct trace_event_file *file = hist_data->event_file;
++	struct hist_field *hist_field = NULL;
++
++	if (subsys_name) {
++		struct trace_event_call *call;
++
++		if (!event_name)
++			return NULL;
++
++		call = file->event_call;
++
++		if (strcmp(subsys_name, call->class->system) != 0)
++			return NULL;
++
++		if (strcmp(event_name, trace_event_name(call)) != 0)
++			return NULL;
++	}
++
++	hist_field = find_var_field(hist_data, var_name);
++
++	return hist_field;
++}
++
++static inline void __update_field_vars(struct tracing_map_elt *elt,
++				       struct ring_buffer_event *rbe,
++				       void *rec,
++				       struct field_var **field_vars,
++				       unsigned int n_field_vars,
++				       unsigned int field_var_str_start)
++{
++	struct hist_elt_data *elt_data = elt->private_data;
++	unsigned int i, j, var_idx;
++	u64 var_val;
++
++	for (i = 0, j = field_var_str_start; i < n_field_vars; i++) {
++		struct field_var *field_var = field_vars[i];
++		struct hist_field *var = field_var->var;
++		struct hist_field *val = field_var->val;
++
++		var_val = val->fn(val, elt, rbe, rec);
++		var_idx = var->var.idx;
++
++		if (val->flags & HIST_FIELD_FL_STRING) {
++			char *str = elt_data->field_var_str[j++];
++			char *val_str = (char *)(uintptr_t)var_val;
++
++			strncpy(str, val_str, STR_VAR_LEN_MAX);
++			var_val = (u64)(uintptr_t)str;
++		}
++		tracing_map_set_var(elt, var_idx, var_val);
++	}
++}
++
++static void update_field_vars(struct hist_trigger_data *hist_data,
++			      struct tracing_map_elt *elt,
++			      struct ring_buffer_event *rbe,
++			      void *rec)
++{
++	__update_field_vars(elt, rbe, rec, hist_data->field_vars,
++			    hist_data->n_field_vars, 0);
++}
++
++static struct hist_field *create_var(struct hist_trigger_data *hist_data,
++				     struct trace_event_file *file,
++				     char *name, int size, const char *type)
++{
++	struct hist_field *var;
++	int idx;
++
++	if (find_var(hist_data, file, name) && !hist_data->remove) {
++		var = ERR_PTR(-EINVAL);
++		goto out;
++	}
++
++	var = kzalloc(sizeof(struct hist_field), GFP_KERNEL);
++	if (!var) {
++		var = ERR_PTR(-ENOMEM);
++		goto out;
++	}
++
++	idx = tracing_map_add_var(hist_data->map);
++	if (idx < 0) {
++		kfree(var);
++		var = ERR_PTR(-EINVAL);
++		goto out;
++	}
++
++	var->flags = HIST_FIELD_FL_VAR;
++	var->var.idx = idx;
++	var->var.hist_data = var->hist_data = hist_data;
++	var->size = size;
++	var->var.name = kstrdup(name, GFP_KERNEL);
++	var->type = kstrdup(type, GFP_KERNEL);
++	if (!var->var.name || !var->type) {
++		kfree(var->var.name);
++		kfree(var->type);
++		kfree(var);
++		var = ERR_PTR(-ENOMEM);
++	}
++ out:
++	return var;
++}
++
++static struct field_var *create_field_var(struct hist_trigger_data *hist_data,
++					  struct trace_event_file *file,
++					  char *field_name)
++{
++	struct hist_field *val = NULL, *var = NULL;
++	unsigned long flags = HIST_FIELD_FL_VAR;
++	struct field_var *field_var;
++	int ret = 0;
++
++	if (hist_data->n_field_vars >= SYNTH_FIELDS_MAX) {
++		ret = -EINVAL;
++		goto err;
++	}
++
++	val = parse_atom(hist_data, file, field_name, &flags, NULL);
++	if (IS_ERR(val)) {
++		ret = PTR_ERR(val);
++		goto err;
++	}
++
++	var = create_var(hist_data, file, field_name, val->size, val->type);
++	if (IS_ERR(var)) {
++		kfree(val);
++		ret = PTR_ERR(var);
++		goto err;
++	}
++
++	field_var = kzalloc(sizeof(struct field_var), GFP_KERNEL);
++	if (!field_var) {
++		kfree(val);
++		kfree(var);
++		ret =  -ENOMEM;
++		goto err;
++	}
++
++	field_var->var = var;
++	field_var->val = val;
++ out:
++	return field_var;
++ err:
++	field_var = ERR_PTR(ret);
++	goto out;
++}
++
++/**
++ * create_target_field_var - Automatically create a variable for a field
++ * @target_hist_data: The target hist trigger
++ * @subsys_name: Optional subsystem name
++ * @event_name: Optional event name
++ * @var_name: The name of the field (and the resulting variable)
++ *
++ * Hist trigger actions fetch data from variables, not directly from
++ * events.  However, for convenience, users are allowed to directly
++ * specify an event field in an action, which will be automatically
++ * converted into a variable on their behalf.
++
++ * This function creates a field variable with the name var_name on
++ * the hist trigger currently being defined on the target event.  If
++ * subsys_name and event_name are specified, this function simply
++ * verifies that they do in fact match the target event subsystem and
++ * event name.
++ *
++ * Return: The variable created for the field.
++ */
++struct field_var *
++create_target_field_var(struct hist_trigger_data *target_hist_data,
++			char *subsys_name, char *event_name, char *var_name)
++{
++	struct trace_event_file *file = target_hist_data->event_file;
++
++	if (subsys_name) {
++		struct trace_event_call *call;
++
++		if (!event_name)
++			return NULL;
++
++		call = file->event_call;
++
++		if (strcmp(subsys_name, call->class->system) != 0)
++			return NULL;
++
++		if (strcmp(event_name, trace_event_name(call)) != 0)
++			return NULL;
++	}
++
++	return create_field_var(target_hist_data, file, var_name);
++}
++
++static void destroy_field_var(struct field_var *field_var)
++{
++	if (!field_var)
++		return;
++
++	destroy_hist_field(field_var->var, 0);
++	destroy_hist_field(field_var->val, 0);
++
++	kfree(field_var);
++}
++
++static void destroy_field_vars(struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_field_vars; i++)
++		destroy_field_var(hist_data->field_vars[i]);
++}
++
++void save_field_var(struct hist_trigger_data *hist_data,
++		    struct field_var *field_var)
++{
++	hist_data->field_vars[hist_data->n_field_vars++] = field_var;
++
++	if (field_var->val->flags & HIST_FIELD_FL_STRING)
++		hist_data->n_field_var_str++;
++}
++
+ static int create_hitcount_val(struct hist_trigger_data *hist_data)
+ {
+ 	hist_data->fields[HITCOUNT_IDX] =
+@@ -2928,6 +3426,16 @@ static int create_actions(struct hist_tr
+ 	return ret;
+ }
+ 
++static void destroy_field_var_hists(struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_field_var_hists; i++) {
++		kfree(hist_data->field_var_hists[i]->cmd);
++		kfree(hist_data->field_var_hists[i]);
++	}
++}
++
+ static void destroy_hist_data(struct hist_trigger_data *hist_data)
+ {
+ 	if (!hist_data)
+@@ -2938,6 +3446,8 @@ static void destroy_hist_data(struct his
+ 	tracing_map_destroy(hist_data->map);
+ 
+ 	destroy_actions(hist_data);
++	destroy_field_vars(hist_data);
++	destroy_field_var_hists(hist_data);
+ 
+ 	kfree(hist_data);
+ }
+@@ -3074,6 +3584,8 @@ static void hist_trigger_elt_update(stru
+ 			tracing_map_set_var(elt, var_idx, hist_val);
+ 		}
+ 	}
++
++	update_field_vars(hist_data, elt, rbe, rec);
+ }
+ 
+ static inline void add_to_key(char *compound_key, void *key,
+@@ -3520,6 +4032,21 @@ static int event_hist_trigger_init(struc
+ 	return 0;
+ }
+ 
++static void unregister_field_var_hists(struct hist_trigger_data *hist_data)
++{
++	struct trace_event_file *file;
++	unsigned int i;
++	char *cmd;
++	int ret;
++
++	for (i = 0; i < hist_data->n_field_var_hists; i++) {
++		file = hist_data->field_var_hists[i]->hist_data->event_file;
++		cmd = hist_data->field_var_hists[i]->cmd;
++		ret = event_hist_trigger_func(&trigger_hist_cmd, file,
++					      "!hist", "hist", cmd);
++	}
++}
++
+ static void event_hist_trigger_free(struct event_trigger_ops *ops,
+ 				    struct event_trigger_data *data)
+ {
+@@ -3537,6 +4064,8 @@ static void event_hist_trigger_free(stru
+ 
+ 		remove_hist_vars(hist_data);
+ 
++		unregister_field_var_hists(hist_data);
++
+ 		destroy_hist_data(hist_data);
+ 	}
+ }
diff --git a/kernel/patches-4.14.x-rt/0091-0034-tracing-Add-onmatch-hist-trigger-action-support.patch b/kernel/patches-4.14.x-rt/0091-0034-tracing-Add-onmatch-hist-trigger-action-support.patch
new file mode 100644
index 000000000..04b6a43e0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0091-0034-tracing-Add-onmatch-hist-trigger-action-support.patch
@@ -0,0 +1,687 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:00 -0600
+Subject: [PATCH 34/48] tracing: Add 'onmatch' hist trigger action support
+
+Add an 'onmatch(matching.event).<synthetic_event_name>(param list)'
+hist trigger action which is invoked with the set of variables or
+event fields named in the 'param list'.  The result is the generation
+of a synthetic event that consists of the values contained in those
+variables and/or fields at the time the invoking event was hit.
+
+As an example the below defines a simple synthetic event using a
+variable defined on the sched_wakeup_new event, and shows the event
+definition with unresolved fields, since the sched_wakeup_new event
+with the testpid variable hasn't been defined yet:
+
+    # echo 'wakeup_new_test pid_t pid; int prio' >> \
+      /sys/kernel/debug/tracing/synthetic_events
+
+    # cat /sys/kernel/debug/tracing/synthetic_events
+      wakeup_new_test pid_t pid; int prio
+
+The following hist trigger both defines a testpid variable and
+specifies an onmatch() trace action that uses that variable along with
+a non-variable field to generate a wakeup_new_test synthetic event
+whenever a sched_wakeup_new event occurs, which because of the 'if
+comm == "cyclictest"' filter only happens when the executable is
+cyclictest:
+
+    # echo 'hist:testpid=pid:keys=$testpid:\
+      onmatch(sched.sched_wakeup_new).wakeup_new_test($testpid, prio) \
+        if comm=="cyclictest"' >> \
+      /sys/kernel/debug/tracing/events/sched/sched_wakeup_new/trigger
+
+Creating and displaying a histogram based on those events is now just
+a matter of using the fields and new synthetic event in the
+tracing/events/synthetic directory, as usual:
+
+    # echo 'hist:keys=pid,prio:sort=pid,prio' >> \
+      /sys/kernel/debug/tracing/events/synthetic/wakeup_new_test/trigger
+
+Link: http://lkml.kernel.org/r/8c2a574bcb7530c876629c901ecd23911b14afe8.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Rajvi Jingar <rajvi.jingar@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit ea82307e63ec125d8612d8cedd2618669f674226)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  488 +++++++++++++++++++++++++++++++++++++--
+ 1 file changed, 475 insertions(+), 13 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -285,6 +285,8 @@ struct hist_trigger_data {
+ 	struct action_data		*actions[HIST_ACTIONS_MAX];
+ 	unsigned int			n_actions;
+ 
++	struct hist_field               *synth_var_refs[SYNTH_FIELDS_MAX];
++	unsigned int                    n_synth_var_refs;
+ 	struct field_var		*field_vars[SYNTH_FIELDS_MAX];
+ 	unsigned int			n_field_vars;
+ 	unsigned int			n_field_var_str;
+@@ -321,7 +323,18 @@ typedef void (*action_fn_t) (struct hist
+ 
+ struct action_data {
+ 	action_fn_t		fn;
+-	unsigned int		var_ref_idx;
++	unsigned int		n_params;
++	char			*params[SYNTH_FIELDS_MAX];
++
++	union {
++		struct {
++			unsigned int		var_ref_idx;
++			char			*match_event;
++			char			*match_event_system;
++			char			*synth_event_name;
++			struct synth_event	*synth_event;
++		} onmatch;
++	};
+ };
+ 
+ static LIST_HEAD(synth_event_list);
+@@ -887,6 +900,21 @@ static struct synth_event *alloc_synth_e
+ 	return event;
+ }
+ 
++static void action_trace(struct hist_trigger_data *hist_data,
++			 struct tracing_map_elt *elt, void *rec,
++			 struct ring_buffer_event *rbe,
++			 struct action_data *data, u64 *var_ref_vals)
++{
++	struct synth_event *event = data->onmatch.synth_event;
++
++	trace_synth(event, var_ref_vals, data->onmatch.var_ref_idx);
++}
++
++struct hist_var_data {
++	struct list_head list;
++	struct hist_trigger_data *hist_data;
++};
++
+ static void add_or_delete_synth_event(struct synth_event *event, int delete)
+ {
+ 	if (delete)
+@@ -1124,11 +1152,6 @@ static u64 hist_field_timestamp(struct h
+ 	return ts;
+ }
+ 
+-struct hist_var_data {
+-	struct list_head list;
+-	struct hist_trigger_data *hist_data;
+-};
+-
+ static struct hist_field *
+ check_field_for_var_ref(struct hist_field *hist_field,
+ 			struct hist_trigger_data *var_data,
+@@ -1194,6 +1217,14 @@ static struct hist_field *find_var_ref(s
+ 			return found;
+ 	}
+ 
++	for (i = 0; i < hist_data->n_synth_var_refs; i++) {
++		hist_field = hist_data->synth_var_refs[i];
++		found = check_field_for_var_refs(hist_data, hist_field,
++						 var_data, var_idx, 0);
++		if (found)
++			return found;
++	}
++
+ 	return found;
+ }
+ 
+@@ -1422,6 +1453,37 @@ static struct hist_field *find_file_var(
+ 	return NULL;
+ }
+ 
++static struct hist_field *
++find_match_var(struct hist_trigger_data *hist_data, char *var_name)
++{
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct hist_field *hist_field, *found = NULL;
++	struct trace_event_file *file;
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_actions; i++) {
++		struct action_data *data = hist_data->actions[i];
++
++		if (data->fn == action_trace) {
++			char *system = data->onmatch.match_event_system;
++			char *event_name = data->onmatch.match_event;
++
++			file = find_var_file(tr, system, event_name, var_name);
++			if (!file)
++				continue;
++			hist_field = find_file_var(file, var_name);
++			if (hist_field) {
++				if (found) {
++					return ERR_PTR(-EINVAL);
++				}
++
++				found = hist_field;
++			}
++		}
++	}
++	return found;
++}
++
+ static struct hist_field *find_event_var(struct hist_trigger_data *hist_data,
+ 					 char *system,
+ 					 char *event_name,
+@@ -1431,6 +1493,14 @@ static struct hist_field *find_event_var
+ 	struct hist_field *hist_field = NULL;
+ 	struct trace_event_file *file;
+ 
++	if (!system || !event_name) {
++		hist_field = find_match_var(hist_data, var_name);
++		if (IS_ERR(hist_field))
++			return NULL;
++		if (hist_field)
++			return hist_field;
++	}
++
+ 	file = find_var_file(tr, system, event_name, var_name);
+ 	if (!file)
+ 		return NULL;
+@@ -1622,11 +1692,21 @@ static void destroy_hist_trigger_attrs(s
+ 
+ static int parse_action(char *str, struct hist_trigger_attrs *attrs)
+ {
+-	int ret = 0;
++	int ret = -EINVAL;
+ 
+ 	if (attrs->n_actions >= HIST_ACTIONS_MAX)
+ 		return ret;
+ 
++	if ((strncmp(str, "onmatch(", strlen("onmatch(")) == 0)) {
++		attrs->action_str[attrs->n_actions] = kstrdup(str, GFP_KERNEL);
++		if (!attrs->action_str[attrs->n_actions]) {
++			ret = -ENOMEM;
++			return ret;
++		}
++		attrs->n_actions++;
++		ret = 0;
++	}
++
+ 	return ret;
+ }
+ 
+@@ -2635,7 +2715,7 @@ find_synthetic_field_var(struct hist_tri
+  *
+  * Return: The variable created for the field.
+  */
+-struct hist_field *
++static struct hist_field *
+ create_field_var_hist(struct hist_trigger_data *target_hist_data,
+ 		      char *subsys_name, char *event_name, char *field_name)
+ {
+@@ -2748,7 +2828,7 @@ create_field_var_hist(struct hist_trigge
+ 	return event_var;
+ }
+ 
+-struct hist_field *
++static struct hist_field *
+ find_target_event_var(struct hist_trigger_data *hist_data,
+ 		      char *subsys_name, char *event_name, char *var_name)
+ {
+@@ -2919,7 +2999,7 @@ static struct field_var *create_field_va
+  *
+  * Return: The variable created for the field.
+  */
+-struct field_var *
++static struct field_var *
+ create_target_field_var(struct hist_trigger_data *target_hist_data,
+ 			char *subsys_name, char *event_name, char *var_name)
+ {
+@@ -2943,6 +3023,27 @@ create_target_field_var(struct hist_trig
+ 	return create_field_var(target_hist_data, file, var_name);
+ }
+ 
++static void onmatch_destroy(struct action_data *data)
++{
++	unsigned int i;
++
++	mutex_lock(&synth_event_mutex);
++
++	kfree(data->onmatch.match_event);
++	kfree(data->onmatch.match_event_system);
++	kfree(data->onmatch.synth_event_name);
++
++	for (i = 0; i < data->n_params; i++)
++		kfree(data->params[i]);
++
++	if (data->onmatch.synth_event)
++		data->onmatch.synth_event->ref--;
++
++	kfree(data);
++
++	mutex_unlock(&synth_event_mutex);
++}
++
+ static void destroy_field_var(struct field_var *field_var)
+ {
+ 	if (!field_var)
+@@ -2962,8 +3063,8 @@ static void destroy_field_vars(struct hi
+ 		destroy_field_var(hist_data->field_vars[i]);
+ }
+ 
+-void save_field_var(struct hist_trigger_data *hist_data,
+-		    struct field_var *field_var)
++static void save_field_var(struct hist_trigger_data *hist_data,
++			   struct field_var *field_var)
+ {
+ 	hist_data->field_vars[hist_data->n_field_vars++] = field_var;
+ 
+@@ -2971,6 +3072,304 @@ void save_field_var(struct hist_trigger_
+ 		hist_data->n_field_var_str++;
+ }
+ 
++
++static void destroy_synth_var_refs(struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_synth_var_refs; i++)
++		destroy_hist_field(hist_data->synth_var_refs[i], 0);
++}
++
++static void save_synth_var_ref(struct hist_trigger_data *hist_data,
++			 struct hist_field *var_ref)
++{
++	hist_data->synth_var_refs[hist_data->n_synth_var_refs++] = var_ref;
++
++	hist_data->var_refs[hist_data->n_var_refs] = var_ref;
++	var_ref->var_ref_idx = hist_data->n_var_refs++;
++}
++
++static int check_synth_field(struct synth_event *event,
++			     struct hist_field *hist_field,
++			     unsigned int field_pos)
++{
++	struct synth_field *field;
++
++	if (field_pos >= event->n_fields)
++		return -EINVAL;
++
++	field = event->fields[field_pos];
++
++	if (strcmp(field->type, hist_field->type) != 0)
++		return -EINVAL;
++
++	return 0;
++}
++
++static int parse_action_params(char *params, struct action_data *data)
++{
++	char *param, *saved_param;
++	int ret = 0;
++
++	while (params) {
++		if (data->n_params >= SYNTH_FIELDS_MAX)
++			goto out;
++
++		param = strsep(&params, ",");
++		if (!param) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		param = strstrip(param);
++		if (strlen(param) < 2) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		saved_param = kstrdup(param, GFP_KERNEL);
++		if (!saved_param) {
++			ret = -ENOMEM;
++			goto out;
++		}
++
++		data->params[data->n_params++] = saved_param;
++	}
++ out:
++	return ret;
++}
++
++static struct hist_field *
++onmatch_find_var(struct hist_trigger_data *hist_data, struct action_data *data,
++		 char *system, char *event, char *var)
++{
++	struct hist_field *hist_field;
++
++	var++; /* skip '$' */
++
++	hist_field = find_target_event_var(hist_data, system, event, var);
++	if (!hist_field) {
++		if (!system) {
++			system = data->onmatch.match_event_system;
++			event = data->onmatch.match_event;
++		}
++
++		hist_field = find_event_var(hist_data, system, event, var);
++	}
++
++	return hist_field;
++}
++
++static struct hist_field *
++onmatch_create_field_var(struct hist_trigger_data *hist_data,
++			 struct action_data *data, char *system,
++			 char *event, char *var)
++{
++	struct hist_field *hist_field = NULL;
++	struct field_var *field_var;
++
++	/*
++	 * First try to create a field var on the target event (the
++	 * currently being defined).  This will create a variable for
++	 * unqualified fields on the target event, or if qualified,
++	 * target fields that have qualified names matching the target.
++	 */
++	field_var = create_target_field_var(hist_data, system, event, var);
++
++	if (field_var && !IS_ERR(field_var)) {
++		save_field_var(hist_data, field_var);
++		hist_field = field_var->var;
++	} else {
++		field_var = NULL;
++		/*
++		 * If no explicit system.event is specfied, default to
++		 * looking for fields on the onmatch(system.event.xxx)
++		 * event.
++		 */
++		if (!system) {
++			system = data->onmatch.match_event_system;
++			event = data->onmatch.match_event;
++		}
++
++		/*
++		 * At this point, we're looking at a field on another
++		 * event.  Because we can't modify a hist trigger on
++		 * another event to add a variable for a field, we need
++		 * to create a new trigger on that event and create the
++		 * variable at the same time.
++		 */
++		hist_field = create_field_var_hist(hist_data, system, event, var);
++		if (IS_ERR(hist_field))
++			goto free;
++	}
++ out:
++	return hist_field;
++ free:
++	destroy_field_var(field_var);
++	hist_field = NULL;
++	goto out;
++}
++
++static int onmatch_create(struct hist_trigger_data *hist_data,
++			  struct trace_event_file *file,
++			  struct action_data *data)
++{
++	char *event_name, *param, *system = NULL;
++	struct hist_field *hist_field, *var_ref;
++	unsigned int i, var_ref_idx;
++	unsigned int field_pos = 0;
++	struct synth_event *event;
++	int ret = 0;
++
++	mutex_lock(&synth_event_mutex);
++	event = find_synth_event(data->onmatch.synth_event_name);
++	if (!event) {
++		mutex_unlock(&synth_event_mutex);
++		return -EINVAL;
++	}
++	event->ref++;
++	mutex_unlock(&synth_event_mutex);
++
++	var_ref_idx = hist_data->n_var_refs;
++
++	for (i = 0; i < data->n_params; i++) {
++		char *p;
++
++		p = param = kstrdup(data->params[i], GFP_KERNEL);
++		if (!param) {
++			ret = -ENOMEM;
++			goto err;
++		}
++
++		system = strsep(&param, ".");
++		if (!param) {
++			param = (char *)system;
++			system = event_name = NULL;
++		} else {
++			event_name = strsep(&param, ".");
++			if (!param) {
++				kfree(p);
++				ret = -EINVAL;
++				goto err;
++			}
++		}
++
++		if (param[0] == '$')
++			hist_field = onmatch_find_var(hist_data, data, system,
++						      event_name, param);
++		else
++			hist_field = onmatch_create_field_var(hist_data, data,
++							      system,
++							      event_name,
++							      param);
++
++		if (!hist_field) {
++			kfree(p);
++			ret = -EINVAL;
++			goto err;
++		}
++
++		if (check_synth_field(event, hist_field, field_pos) == 0) {
++			var_ref = create_var_ref(hist_field, system, event_name);
++			if (!var_ref) {
++				kfree(p);
++				ret = -ENOMEM;
++				goto err;
++			}
++
++			save_synth_var_ref(hist_data, var_ref);
++			field_pos++;
++			kfree(p);
++			continue;
++		}
++
++		kfree(p);
++		ret = -EINVAL;
++		goto err;
++	}
++
++	if (field_pos != event->n_fields) {
++		ret = -EINVAL;
++		goto err;
++	}
++
++	data->fn = action_trace;
++	data->onmatch.synth_event = event;
++	data->onmatch.var_ref_idx = var_ref_idx;
++ out:
++	return ret;
++ err:
++	mutex_lock(&synth_event_mutex);
++	event->ref--;
++	mutex_unlock(&synth_event_mutex);
++
++	goto out;
++}
++
++static struct action_data *onmatch_parse(struct trace_array *tr, char *str)
++{
++	char *match_event, *match_event_system;
++	char *synth_event_name, *params;
++	struct action_data *data;
++	int ret = -EINVAL;
++
++	data = kzalloc(sizeof(*data), GFP_KERNEL);
++	if (!data)
++		return ERR_PTR(-ENOMEM);
++
++	match_event = strsep(&str, ")");
++	if (!match_event || !str)
++		goto free;
++
++	match_event_system = strsep(&match_event, ".");
++	if (!match_event)
++		goto free;
++
++	if (IS_ERR(event_file(tr, match_event_system, match_event)))
++		goto free;
++
++	data->onmatch.match_event = kstrdup(match_event, GFP_KERNEL);
++	if (!data->onmatch.match_event) {
++		ret = -ENOMEM;
++		goto free;
++	}
++
++	data->onmatch.match_event_system = kstrdup(match_event_system, GFP_KERNEL);
++	if (!data->onmatch.match_event_system) {
++		ret = -ENOMEM;
++		goto free;
++	}
++
++	strsep(&str, ".");
++	if (!str)
++		goto free;
++
++	synth_event_name = strsep(&str, "(");
++	if (!synth_event_name || !str)
++		goto free;
++
++	data->onmatch.synth_event_name = kstrdup(synth_event_name, GFP_KERNEL);
++	if (!data->onmatch.synth_event_name) {
++		ret = -ENOMEM;
++		goto free;
++	}
++
++	params = strsep(&str, ")");
++	if (!params || !str || (str && strlen(str)))
++		goto free;
++
++	ret = parse_action_params(params, data);
++	if (ret)
++		goto free;
++ out:
++	return data;
++ free:
++	onmatch_destroy(data);
++	data = ERR_PTR(ret);
++	goto out;
++}
++
+ static int create_hitcount_val(struct hist_trigger_data *hist_data)
+ {
+ 	hist_data->fields[HITCOUNT_IDX] =
+@@ -3395,18 +3794,39 @@ static void destroy_actions(struct hist_
+ 	for (i = 0; i < hist_data->n_actions; i++) {
+ 		struct action_data *data = hist_data->actions[i];
+ 
+-		kfree(data);
++		if (data->fn == action_trace)
++			onmatch_destroy(data);
++		else
++			kfree(data);
+ 	}
+ }
+ 
+ static int parse_actions(struct hist_trigger_data *hist_data)
+ {
++	struct trace_array *tr = hist_data->event_file->tr;
++	struct action_data *data;
+ 	unsigned int i;
+ 	int ret = 0;
+ 	char *str;
+ 
+ 	for (i = 0; i < hist_data->attrs->n_actions; i++) {
+ 		str = hist_data->attrs->action_str[i];
++
++		if (strncmp(str, "onmatch(", strlen("onmatch(")) == 0) {
++			char *action_str = str + strlen("onmatch(");
++
++			data = onmatch_parse(tr, action_str);
++			if (IS_ERR(data)) {
++				ret = PTR_ERR(data);
++				break;
++			}
++			data->fn = action_trace;
++		} else {
++			ret = -EINVAL;
++			break;
++		}
++
++		hist_data->actions[hist_data->n_actions++] = data;
+ 	}
+ 
+ 	return ret;
+@@ -3421,11 +3841,50 @@ static int create_actions(struct hist_tr
+ 
+ 	for (i = 0; i < hist_data->attrs->n_actions; i++) {
+ 		data = hist_data->actions[i];
++
++		if (data->fn == action_trace) {
++			ret = onmatch_create(hist_data, file, data);
++			if (ret)
++				return ret;
++		}
+ 	}
+ 
+ 	return ret;
+ }
+ 
++static void print_onmatch_spec(struct seq_file *m,
++			       struct hist_trigger_data *hist_data,
++			       struct action_data *data)
++{
++	unsigned int i;
++
++	seq_printf(m, ":onmatch(%s.%s).", data->onmatch.match_event_system,
++		   data->onmatch.match_event);
++
++	seq_printf(m, "%s(", data->onmatch.synth_event->name);
++
++	for (i = 0; i < data->n_params; i++) {
++		if (i)
++			seq_puts(m, ",");
++		seq_printf(m, "%s", data->params[i]);
++	}
++
++	seq_puts(m, ")");
++}
++
++static void print_actions_spec(struct seq_file *m,
++			       struct hist_trigger_data *hist_data)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_actions; i++) {
++		struct action_data *data = hist_data->actions[i];
++
++		if (data->fn == action_trace)
++			print_onmatch_spec(m, hist_data, data);
++	}
++}
++
+ static void destroy_field_var_hists(struct hist_trigger_data *hist_data)
+ {
+ 	unsigned int i;
+@@ -3448,6 +3907,7 @@ static void destroy_hist_data(struct his
+ 	destroy_actions(hist_data);
+ 	destroy_field_vars(hist_data);
+ 	destroy_field_var_hists(hist_data);
++	destroy_synth_var_refs(hist_data);
+ 
+ 	kfree(hist_data);
+ }
+@@ -4006,6 +4466,8 @@ static int event_hist_trigger_print(stru
+ 	}
+ 	seq_printf(m, ":size=%u", (1 << hist_data->map->map_bits));
+ 
++	print_actions_spec(m, hist_data);
++
+ 	if (data->filter_str)
+ 		seq_printf(m, " if %s", data->filter_str);
+ 
diff --git a/kernel/patches-4.14.x-rt/0092-0035-tracing-Add-onmax-hist-trigger-action-support.patch b/kernel/patches-4.14.x-rt/0092-0035-tracing-Add-onmax-hist-trigger-action-support.patch
new file mode 100644
index 000000000..57f3d28ef
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0092-0035-tracing-Add-onmax-hist-trigger-action-support.patch
@@ -0,0 +1,486 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:01 -0600
+Subject: [PATCH 35/48] tracing: Add 'onmax' hist trigger action support
+
+Add an 'onmax(var).save(field,...)' hist trigger action which is
+invoked whenever an event exceeds the current maximum.
+
+The end result is that the trace event fields or variables specified
+as the onmax.save() params will be saved if 'var' exceeds the current
+maximum for that hist trigger entry.  This allows context from the
+event that exhibited the new maximum to be saved for later reference.
+When the histogram is displayed, additional fields displaying the
+saved values will be printed.
+
+As an example the below defines a couple of hist triggers, one for
+sched_wakeup and another for sched_switch, keyed on pid.  Whenever a
+sched_wakeup occurs, the timestamp is saved in the entry corresponding
+to the current pid, and when the scheduler switches back to that pid,
+the timestamp difference is calculated.  If the resulting latency
+exceeds the current maximum latency, the specified save() values are
+saved:
+
+    # echo 'hist:keys=pid:ts0=common_timestamp.usecs \
+        if comm=="cyclictest"' >> \
+      /sys/kernel/debug/tracing/events/sched/sched_wakeup/trigger
+
+    # echo 'hist:keys=next_pid:\
+      wakeup_lat=common_timestamp.usecs-$ts0:\
+      onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) \
+        if next_comm=="cyclictest"' >> \
+      /sys/kernel/debug/tracing/events/sched/sched_switch/trigger
+
+When the histogram is displayed, the max value and the saved values
+corresponding to the max are displayed following the rest of the
+fields:
+
+    # cat /sys/kernel/debug/tracing/events/sched/sched_switch/hist
+
+      { next_pid:       3728 } hitcount:        199 \
+        max:        123  next_comm: cyclictest  prev_pid:          0 \
+	prev_prio:        120  prev_comm: swapper/3
+      { next_pid:       3730 } hitcount:       1321 \
+        max:         15  next_comm: cyclictest  prev_pid:          0 \
+	prev_prio:        120  prev_comm: swapper/1
+      { next_pid:       3729 } hitcount:       1973\
+        max:         25  next_comm: cyclictest  prev_pid:          0  \
+	prev_prio:        120  prev_comm: swapper/0
+
+    Totals:
+        Hits: 3493
+        Entries: 3
+	Dropped: 0
+
+Link: http://lkml.kernel.org/r/006907f71b1e839bb059337ec3c496f84fcb71de.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 4e30c922f0a19496ff424edd5c473666e1690601)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |  331 ++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 296 insertions(+), 35 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -292,6 +292,10 @@ struct hist_trigger_data {
+ 	unsigned int			n_field_var_str;
+ 	struct field_var_hist		*field_var_hists[SYNTH_FIELDS_MAX];
+ 	unsigned int			n_field_var_hists;
++
++	struct field_var		*max_vars[SYNTH_FIELDS_MAX];
++	unsigned int			n_max_vars;
++	unsigned int			n_max_var_str;
+ };
+ 
+ struct synth_field {
+@@ -334,6 +338,14 @@ struct action_data {
+ 			char			*synth_event_name;
+ 			struct synth_event	*synth_event;
+ 		} onmatch;
++
++		struct {
++			char			*var_str;
++			char			*fn_name;
++			unsigned int		max_var_ref_idx;
++			struct hist_field	*max_var;
++			struct hist_field	*var;
++		} onmax;
+ 	};
+ };
+ 
+@@ -1697,7 +1709,8 @@ static int parse_action(char *str, struc
+ 	if (attrs->n_actions >= HIST_ACTIONS_MAX)
+ 		return ret;
+ 
+-	if ((strncmp(str, "onmatch(", strlen("onmatch(")) == 0)) {
++	if ((strncmp(str, "onmatch(", strlen("onmatch(")) == 0) ||
++	    (strncmp(str, "onmax(", strlen("onmax(")) == 0)) {
+ 		attrs->action_str[attrs->n_actions] = kstrdup(str, GFP_KERNEL);
+ 		if (!attrs->action_str[attrs->n_actions]) {
+ 			ret = -ENOMEM;
+@@ -1869,7 +1882,7 @@ static int hist_trigger_elt_data_alloc(s
+ 		}
+ 	}
+ 
+-	n_str = hist_data->n_field_var_str;
++	n_str = hist_data->n_field_var_str + hist_data->n_max_var_str;
+ 
+ 	size = STR_VAR_LEN_MAX;
+ 
+@@ -2894,6 +2907,15 @@ static void update_field_vars(struct his
+ 			    hist_data->n_field_vars, 0);
+ }
+ 
++static void update_max_vars(struct hist_trigger_data *hist_data,
++			    struct tracing_map_elt *elt,
++			    struct ring_buffer_event *rbe,
++			    void *rec)
++{
++	__update_field_vars(elt, rbe, rec, hist_data->max_vars,
++			    hist_data->n_max_vars, hist_data->n_field_var_str);
++}
++
+ static struct hist_field *create_var(struct hist_trigger_data *hist_data,
+ 				     struct trace_event_file *file,
+ 				     char *name, int size, const char *type)
+@@ -3023,6 +3045,227 @@ create_target_field_var(struct hist_trig
+ 	return create_field_var(target_hist_data, file, var_name);
+ }
+ 
++static void onmax_print(struct seq_file *m,
++			struct hist_trigger_data *hist_data,
++			struct tracing_map_elt *elt,
++			struct action_data *data)
++{
++	unsigned int i, save_var_idx, max_idx = data->onmax.max_var->var.idx;
++
++	seq_printf(m, "\n\tmax: %10llu", tracing_map_read_var(elt, max_idx));
++
++	for (i = 0; i < hist_data->n_max_vars; i++) {
++		struct hist_field *save_val = hist_data->max_vars[i]->val;
++		struct hist_field *save_var = hist_data->max_vars[i]->var;
++		u64 val;
++
++		save_var_idx = save_var->var.idx;
++
++		val = tracing_map_read_var(elt, save_var_idx);
++
++		if (save_val->flags & HIST_FIELD_FL_STRING) {
++			seq_printf(m, "  %s: %-32s", save_var->var.name,
++				   (char *)(uintptr_t)(val));
++		} else
++			seq_printf(m, "  %s: %10llu", save_var->var.name, val);
++	}
++}
++
++static void onmax_save(struct hist_trigger_data *hist_data,
++		       struct tracing_map_elt *elt, void *rec,
++		       struct ring_buffer_event *rbe,
++		       struct action_data *data, u64 *var_ref_vals)
++{
++	unsigned int max_idx = data->onmax.max_var->var.idx;
++	unsigned int max_var_ref_idx = data->onmax.max_var_ref_idx;
++
++	u64 var_val, max_val;
++
++	var_val = var_ref_vals[max_var_ref_idx];
++	max_val = tracing_map_read_var(elt, max_idx);
++
++	if (var_val <= max_val)
++		return;
++
++	tracing_map_set_var(elt, max_idx, var_val);
++
++	update_max_vars(hist_data, elt, rbe, rec);
++}
++
++static void onmax_destroy(struct action_data *data)
++{
++	unsigned int i;
++
++	destroy_hist_field(data->onmax.max_var, 0);
++	destroy_hist_field(data->onmax.var, 0);
++
++	kfree(data->onmax.var_str);
++	kfree(data->onmax.fn_name);
++
++	for (i = 0; i < data->n_params; i++)
++		kfree(data->params[i]);
++
++	kfree(data);
++}
++
++static int onmax_create(struct hist_trigger_data *hist_data,
++			struct action_data *data)
++{
++	struct trace_event_file *file = hist_data->event_file;
++	struct hist_field *var_field, *ref_field, *max_var;
++	unsigned int var_ref_idx = hist_data->n_var_refs;
++	struct field_var *field_var;
++	char *onmax_var_str, *param;
++	unsigned long flags;
++	unsigned int i;
++	int ret = 0;
++
++	onmax_var_str = data->onmax.var_str;
++	if (onmax_var_str[0] != '$')
++		return -EINVAL;
++	onmax_var_str++;
++
++	var_field = find_target_event_var(hist_data, NULL, NULL, onmax_var_str);
++	if (!var_field)
++		return -EINVAL;
++
++	flags = HIST_FIELD_FL_VAR_REF;
++	ref_field = create_hist_field(hist_data, NULL, flags, NULL);
++	if (!ref_field)
++		return -ENOMEM;
++
++	if (init_var_ref(ref_field, var_field, NULL, NULL)) {
++		destroy_hist_field(ref_field, 0);
++		ret = -ENOMEM;
++		goto out;
++	}
++	hist_data->var_refs[hist_data->n_var_refs] = ref_field;
++	ref_field->var_ref_idx = hist_data->n_var_refs++;
++	data->onmax.var = ref_field;
++
++	data->fn = onmax_save;
++	data->onmax.max_var_ref_idx = var_ref_idx;
++	max_var = create_var(hist_data, file, "max", sizeof(u64), "u64");
++	if (IS_ERR(max_var)) {
++		ret = PTR_ERR(max_var);
++		goto out;
++	}
++	data->onmax.max_var = max_var;
++
++	for (i = 0; i < data->n_params; i++) {
++		param = kstrdup(data->params[i], GFP_KERNEL);
++		if (!param) {
++			ret = -ENOMEM;
++			goto out;
++		}
++
++		field_var = create_target_field_var(hist_data, NULL, NULL, param);
++		if (IS_ERR(field_var)) {
++			ret = PTR_ERR(field_var);
++			kfree(param);
++			goto out;
++		}
++
++		hist_data->max_vars[hist_data->n_max_vars++] = field_var;
++		if (field_var->val->flags & HIST_FIELD_FL_STRING)
++			hist_data->n_max_var_str++;
++
++		kfree(param);
++	}
++ out:
++	return ret;
++}
++
++static int parse_action_params(char *params, struct action_data *data)
++{
++	char *param, *saved_param;
++	int ret = 0;
++
++	while (params) {
++		if (data->n_params >= SYNTH_FIELDS_MAX)
++			goto out;
++
++		param = strsep(&params, ",");
++		if (!param) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		param = strstrip(param);
++		if (strlen(param) < 2) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		saved_param = kstrdup(param, GFP_KERNEL);
++		if (!saved_param) {
++			ret = -ENOMEM;
++			goto out;
++		}
++
++		data->params[data->n_params++] = saved_param;
++	}
++ out:
++	return ret;
++}
++
++static struct action_data *onmax_parse(char *str)
++{
++	char *onmax_fn_name, *onmax_var_str;
++	struct action_data *data;
++	int ret = -EINVAL;
++
++	data = kzalloc(sizeof(*data), GFP_KERNEL);
++	if (!data)
++		return ERR_PTR(-ENOMEM);
++
++	onmax_var_str = strsep(&str, ")");
++	if (!onmax_var_str || !str) {
++		ret = -EINVAL;
++		goto free;
++	}
++
++	data->onmax.var_str = kstrdup(onmax_var_str, GFP_KERNEL);
++	if (!data->onmax.var_str) {
++		ret = -ENOMEM;
++		goto free;
++	}
++
++	strsep(&str, ".");
++	if (!str)
++		goto free;
++
++	onmax_fn_name = strsep(&str, "(");
++	if (!onmax_fn_name || !str)
++		goto free;
++
++	if (strncmp(onmax_fn_name, "save", strlen("save")) == 0) {
++		char *params = strsep(&str, ")");
++
++		if (!params) {
++			ret = -EINVAL;
++			goto free;
++		}
++
++		ret = parse_action_params(params, data);
++		if (ret)
++			goto free;
++	} else
++		goto free;
++
++	data->onmax.fn_name = kstrdup(onmax_fn_name, GFP_KERNEL);
++	if (!data->onmax.fn_name) {
++		ret = -ENOMEM;
++		goto free;
++	}
++ out:
++	return data;
++ free:
++	onmax_destroy(data);
++	data = ERR_PTR(ret);
++	goto out;
++}
++
+ static void onmatch_destroy(struct action_data *data)
+ {
+ 	unsigned int i;
+@@ -3107,39 +3350,6 @@ static int check_synth_field(struct synt
+ 	return 0;
+ }
+ 
+-static int parse_action_params(char *params, struct action_data *data)
+-{
+-	char *param, *saved_param;
+-	int ret = 0;
+-
+-	while (params) {
+-		if (data->n_params >= SYNTH_FIELDS_MAX)
+-			goto out;
+-
+-		param = strsep(&params, ",");
+-		if (!param) {
+-			ret = -EINVAL;
+-			goto out;
+-		}
+-
+-		param = strstrip(param);
+-		if (strlen(param) < 2) {
+-			ret = -EINVAL;
+-			goto out;
+-		}
+-
+-		saved_param = kstrdup(param, GFP_KERNEL);
+-		if (!saved_param) {
+-			ret = -ENOMEM;
+-			goto out;
+-		}
+-
+-		data->params[data->n_params++] = saved_param;
+-	}
+- out:
+-	return ret;
+-}
+-
+ static struct hist_field *
+ onmatch_find_var(struct hist_trigger_data *hist_data, struct action_data *data,
+ 		 char *system, char *event, char *var)
+@@ -3796,6 +4006,8 @@ static void destroy_actions(struct hist_
+ 
+ 		if (data->fn == action_trace)
+ 			onmatch_destroy(data);
++		else if (data->fn == onmax_save)
++			onmax_destroy(data);
+ 		else
+ 			kfree(data);
+ 	}
+@@ -3821,6 +4033,15 @@ static int parse_actions(struct hist_tri
+ 				break;
+ 			}
+ 			data->fn = action_trace;
++		} else if (strncmp(str, "onmax(", strlen("onmax(")) == 0) {
++			char *action_str = str + strlen("onmax(");
++
++			data = onmax_parse(action_str);
++			if (IS_ERR(data)) {
++				ret = PTR_ERR(data);
++				break;
++			}
++			data->fn = onmax_save;
+ 		} else {
+ 			ret = -EINVAL;
+ 			break;
+@@ -3846,12 +4067,48 @@ static int create_actions(struct hist_tr
+ 			ret = onmatch_create(hist_data, file, data);
+ 			if (ret)
+ 				return ret;
++		} else if (data->fn == onmax_save) {
++			ret = onmax_create(hist_data, data);
++			if (ret)
++				return ret;
+ 		}
+ 	}
+ 
+ 	return ret;
+ }
+ 
++static void print_actions(struct seq_file *m,
++			  struct hist_trigger_data *hist_data,
++			  struct tracing_map_elt *elt)
++{
++	unsigned int i;
++
++	for (i = 0; i < hist_data->n_actions; i++) {
++		struct action_data *data = hist_data->actions[i];
++
++		if (data->fn == onmax_save)
++			onmax_print(m, hist_data, elt, data);
++	}
++}
++
++static void print_onmax_spec(struct seq_file *m,
++			     struct hist_trigger_data *hist_data,
++			     struct action_data *data)
++{
++	unsigned int i;
++
++	seq_puts(m, ":onmax(");
++	seq_printf(m, "%s", data->onmax.var_str);
++	seq_printf(m, ").%s(", data->onmax.fn_name);
++
++	for (i = 0; i < hist_data->n_max_vars; i++) {
++		seq_printf(m, "%s", hist_data->max_vars[i]->var->var.name);
++		if (i < hist_data->n_max_vars - 1)
++			seq_puts(m, ",");
++	}
++	seq_puts(m, ")");
++}
++
+ static void print_onmatch_spec(struct seq_file *m,
+ 			       struct hist_trigger_data *hist_data,
+ 			       struct action_data *data)
+@@ -3882,6 +4139,8 @@ static void print_actions_spec(struct se
+ 
+ 		if (data->fn == action_trace)
+ 			print_onmatch_spec(m, hist_data, data);
++		else if (data->fn == onmax_save)
++			print_onmax_spec(m, hist_data, data);
+ 	}
+ }
+ 
+@@ -4263,6 +4522,8 @@ hist_trigger_entry_print(struct seq_file
+ 		}
+ 	}
+ 
++	print_actions(m, hist_data, elt);
++
+ 	seq_puts(m, "\n");
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0093-0036-tracing-Allow-whitespace-to-surround-hist-trigger-fi.patch b/kernel/patches-4.14.x-rt/0093-0036-tracing-Allow-whitespace-to-surround-hist-trigger-fi.patch
new file mode 100644
index 000000000..3d306b171
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0093-0036-tracing-Allow-whitespace-to-surround-hist-trigger-fi.patch
@@ -0,0 +1,75 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:02 -0600
+Subject: [PATCH 36/48] tracing: Allow whitespace to surround hist trigger
+ filter
+
+The existing code only allows for one space before and after the 'if'
+specifying the filter for a hist trigger.  Add code to make that more
+permissive as far as whitespace goes.  Specifically, we want to allow
+spaces in the trigger itself now that we have additional syntax
+(onmatch/onmax) where spaces are more natural e.g. spaces after commas
+in param lists.
+
+Link: http://lkml.kernel.org/r/1053090c3c308d4f431accdeb59dff4b511d4554.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit ab257ec0f8eb50c58fafd50b1cb5352553f31ccf)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   37 ++++++++++++++++++++++++++++++++-----
+ 1 file changed, 32 insertions(+), 5 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -5164,7 +5164,7 @@ static int event_hist_trigger_func(struc
+ 	struct synth_event *se;
+ 	const char *se_name;
+ 	bool remove = false;
+-	char *trigger;
++	char *trigger, *p;
+ 	int ret = 0;
+ 
+ 	if (!param)
+@@ -5173,10 +5173,37 @@ static int event_hist_trigger_func(struc
+ 	if (glob[0] == '!')
+ 		remove = true;
+ 
+-	/* separate the trigger from the filter (k:v [if filter]) */
+-	trigger = strsep(&param, " \t");
+-	if (!trigger)
+-		return -EINVAL;
++	/*
++	 * separate the trigger from the filter (k:v [if filter])
++	 * allowing for whitespace in the trigger
++	 */
++	p = trigger = param;
++	do {
++		p = strstr(p, "if");
++		if (!p)
++			break;
++		if (p == param)
++			return -EINVAL;
++		if (*(p - 1) != ' ' && *(p - 1) != '\t') {
++			p++;
++			continue;
++		}
++		if (p >= param + strlen(param) - strlen("if") - 1)
++			return -EINVAL;
++		if (*(p + strlen("if")) != ' ' && *(p + strlen("if")) != '\t') {
++			p++;
++			continue;
++		}
++		break;
++	} while (p);
++
++	if (!p)
++		param = NULL;
++	else {
++		*(p - 1) = '\0';
++		param = strstrip(p);
++		trigger = strstrip(trigger);
++	}
+ 
+ 	attrs = parse_hist_trigger_attrs(trigger);
+ 	if (IS_ERR(attrs))
diff --git a/kernel/patches-4.14.x-rt/0094-0037-tracing-Add-cpu-field-for-hist-triggers.patch b/kernel/patches-4.14.x-rt/0094-0037-tracing-Add-cpu-field-for-hist-triggers.patch
new file mode 100644
index 000000000..80f1abacf
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0094-0037-tracing-Add-cpu-field-for-hist-triggers.patch
@@ -0,0 +1,114 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:03 -0600
+Subject: [PATCH 37/48] tracing: Add cpu field for hist triggers
+
+A common key to use in a histogram is the cpuid - add a new cpu
+'synthetic' field named 'cpu' for that purpose.
+
+Link: http://lkml.kernel.org/r/89537645bfc957e0d76e2cacf5f0ada88691a6cc.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 4bfaa88f0e0e98e706d57647452e4d37afd78d00)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/histogram.txt |   15 +++++++++++++++
+ kernel/trace/trace_events_hist.c  |   28 +++++++++++++++++++++++++++-
+ 2 files changed, 42 insertions(+), 1 deletion(-)
+
+--- a/Documentation/trace/histogram.txt
++++ b/Documentation/trace/histogram.txt
+@@ -172,6 +172,21 @@
+   The examples below provide a more concrete illustration of the
+   concepts and typical usage patterns discussed above.
+ 
++  'special' event fields
++  ------------------------
++
++  There are a number of 'special event fields' available for use as
++  keys or values in a hist trigger.  These look like and behave as if
++  they were actual event fields, but aren't really part of the event's
++  field definition or format file.  They are however available for any
++  event, and can be used anywhere an actual event field could be.
++  They are:
++
++    common_timestamp       u64 - timestamp (from ring buffer) associated
++                                 with the event, in nanoseconds.  May be
++				 modified by .usecs to have timestamps
++				 interpreted as microseconds.
++    cpu                    int - the cpu on which the event occurred.
+ 
+ 6.2 'hist' trigger examples
+ ---------------------------
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -227,6 +227,7 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_VAR		= 1 << 12,
+ 	HIST_FIELD_FL_EXPR		= 1 << 13,
+ 	HIST_FIELD_FL_VAR_REF		= 1 << 14,
++	HIST_FIELD_FL_CPU		= 1 << 15,
+ };
+ 
+ struct var_defs {
+@@ -1164,6 +1165,16 @@ static u64 hist_field_timestamp(struct h
+ 	return ts;
+ }
+ 
++static u64 hist_field_cpu(struct hist_field *hist_field,
++			  struct tracing_map_elt *elt,
++			  struct ring_buffer_event *rbe,
++			  void *event)
++{
++	int cpu = smp_processor_id();
++
++	return cpu;
++}
++
+ static struct hist_field *
+ check_field_for_var_ref(struct hist_field *hist_field,
+ 			struct hist_trigger_data *var_data,
+@@ -1602,6 +1613,8 @@ static const char *hist_field_name(struc
+ 		field_name = hist_field_name(field->operands[0], ++level);
+ 	else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		field_name = "common_timestamp";
++	else if (field->flags & HIST_FIELD_FL_CPU)
++		field_name = "cpu";
+ 	else if (field->flags & HIST_FIELD_FL_EXPR ||
+ 		 field->flags & HIST_FIELD_FL_VAR_REF) {
+ 		if (field->system) {
+@@ -2109,6 +2122,15 @@ static struct hist_field *create_hist_fi
+ 		goto out;
+ 	}
+ 
++	if (flags & HIST_FIELD_FL_CPU) {
++		hist_field->fn = hist_field_cpu;
++		hist_field->size = sizeof(int);
++		hist_field->type = kstrdup("unsigned int", GFP_KERNEL);
++		if (!hist_field->type)
++			goto free;
++		goto out;
++	}
++
+ 	if (WARN_ON_ONCE(!field))
+ 		goto out;
+ 
+@@ -2345,7 +2367,9 @@ parse_field(struct hist_trigger_data *hi
+ 		hist_data->enable_timestamps = true;
+ 		if (*flags & HIST_FIELD_FL_TIMESTAMP_USECS)
+ 			hist_data->attrs->ts_in_usecs = true;
+-	} else {
++	} else if (strcmp(field_name, "cpu") == 0)
++		*flags |= HIST_FIELD_FL_CPU;
++	else {
+ 		field = trace_find_event_field(file->event_call, field_name);
+ 		if (!field || !field->size) {
+ 			field = ERR_PTR(-EINVAL);
+@@ -4621,6 +4645,8 @@ static void hist_field_print(struct seq_
+ 
+ 	if (hist_field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		seq_puts(m, "common_timestamp");
++	else if (hist_field->flags & HIST_FIELD_FL_CPU)
++		seq_puts(m, "cpu");
+ 	else if (field_name) {
+ 		if (hist_field->flags & HIST_FIELD_FL_VAR_REF)
+ 			seq_putc(m, '$');
diff --git a/kernel/patches-4.14.x-rt/0095-0038-tracing-Add-hist-trigger-support-for-variable-refere.patch b/kernel/patches-4.14.x-rt/0095-0038-tracing-Add-hist-trigger-support-for-variable-refere.patch
new file mode 100644
index 000000000..f1a34d221
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0095-0038-tracing-Add-hist-trigger-support-for-variable-refere.patch
@@ -0,0 +1,164 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:04 -0600
+Subject: [PATCH 38/48] tracing: Add hist trigger support for variable
+ reference aliases
+
+Add support for alias=$somevar where alias can be used as
+onmatch.xxx($alias).
+
+Aliases are a way of creating a new name for an existing variable, for
+flexibly in making naming more clear in certain cases.  For example in
+the below the user perhaps feels that using $new_lat in the synthetic
+event invocation is opaque or doesn't fit well stylistically with
+previous triggers, so creates an alias of $new_lat named $latency and
+uses that in the call instead:
+
+  # echo 'hist:keys=next_pid:new_lat=common_timestamp.usecs' >
+    /sys/kernel/debug/tracing/events/sched/sched_switch/trigger
+
+  # echo 'hist:keys=pid:latency=$new_lat:
+    onmatch(sched.sched_switch).wake2($latency,pid)' >
+    /sys/kernel/debug/tracing/events/synthetic/wake1/trigger
+
+Link: http://lkml.kernel.org/r/ef20a65d921af3a873a6f1e8c71407c926d5586f.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 53c5a4f99f1a5f6ba304453716da571f3e51bc79)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   74 +++++++++++++++++++++++++++++++++++----
+ 1 file changed, 67 insertions(+), 7 deletions(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -228,6 +228,7 @@ enum hist_field_flags {
+ 	HIST_FIELD_FL_EXPR		= 1 << 13,
+ 	HIST_FIELD_FL_VAR_REF		= 1 << 14,
+ 	HIST_FIELD_FL_CPU		= 1 << 15,
++	HIST_FIELD_FL_ALIAS		= 1 << 16,
+ };
+ 
+ struct var_defs {
+@@ -1609,7 +1610,8 @@ static const char *hist_field_name(struc
+ 
+ 	if (field->field)
+ 		field_name = field->field->name;
+-	else if (field->flags & HIST_FIELD_FL_LOG2)
++	else if (field->flags & HIST_FIELD_FL_LOG2 ||
++		 field->flags & HIST_FIELD_FL_ALIAS)
+ 		field_name = hist_field_name(field->operands[0], ++level);
+ 	else if (field->flags & HIST_FIELD_FL_TIMESTAMP)
+ 		field_name = "common_timestamp";
+@@ -2080,7 +2082,7 @@ static struct hist_field *create_hist_fi
+ 
+ 	hist_field->hist_data = hist_data;
+ 
+-	if (flags & HIST_FIELD_FL_EXPR)
++	if (flags & HIST_FIELD_FL_EXPR || flags & HIST_FIELD_FL_ALIAS)
+ 		goto out; /* caller will populate */
+ 
+ 	if (flags & HIST_FIELD_FL_VAR_REF) {
+@@ -2217,10 +2219,18 @@ static int init_var_ref(struct hist_fiel
+ 		}
+ 	}
+ 
+-	ref_field->name = kstrdup(var_field->var.name, GFP_KERNEL);
+-	if (!ref_field->name) {
+-		err = -ENOMEM;
+-		goto free;
++	if (var_field->var.name) {
++		ref_field->name = kstrdup(var_field->var.name, GFP_KERNEL);
++		if (!ref_field->name) {
++			err = -ENOMEM;
++			goto free;
++		}
++	} else if (var_field->name) {
++		ref_field->name = kstrdup(var_field->name, GFP_KERNEL);
++		if (!ref_field->name) {
++			err = -ENOMEM;
++			goto free;
++		}
+ 	}
+ 
+ 	ref_field->type = kstrdup(var_field->type, GFP_KERNEL);
+@@ -2382,6 +2392,28 @@ parse_field(struct hist_trigger_data *hi
+ 	return field;
+ }
+ 
++static struct hist_field *create_alias(struct hist_trigger_data *hist_data,
++				       struct hist_field *var_ref,
++				       char *var_name)
++{
++	struct hist_field *alias = NULL;
++	unsigned long flags = HIST_FIELD_FL_ALIAS | HIST_FIELD_FL_VAR;
++
++	alias = create_hist_field(hist_data, NULL, flags, var_name);
++	if (!alias)
++		return NULL;
++
++	alias->fn = var_ref->fn;
++	alias->operands[0] = var_ref;
++
++	if (init_var_ref(alias, var_ref, var_ref->system, var_ref->event_name)) {
++		destroy_hist_field(alias, 0);
++		return NULL;
++	}
++
++	return alias;
++}
++
+ static struct hist_field *parse_atom(struct hist_trigger_data *hist_data,
+ 				     struct trace_event_file *file, char *str,
+ 				     unsigned long *flags, char *var_name)
+@@ -2415,6 +2447,13 @@ static struct hist_field *parse_atom(str
+ 		if (hist_field) {
+ 			hist_data->var_refs[hist_data->n_var_refs] = hist_field;
+ 			hist_field->var_ref_idx = hist_data->n_var_refs++;
++			if (var_name) {
++				hist_field = create_alias(hist_data, hist_field, var_name);
++				if (!hist_field) {
++					ret = -ENOMEM;
++					goto out;
++				}
++			}
+ 			return hist_field;
+ 		}
+ 	} else
+@@ -2515,6 +2554,26 @@ static int check_expr_operands(struct hi
+ 	unsigned long operand1_flags = operand1->flags;
+ 	unsigned long operand2_flags = operand2->flags;
+ 
++	if ((operand1_flags & HIST_FIELD_FL_VAR_REF) ||
++	    (operand1_flags & HIST_FIELD_FL_ALIAS)) {
++		struct hist_field *var;
++
++		var = find_var_field(operand1->var.hist_data, operand1->name);
++		if (!var)
++			return -EINVAL;
++		operand1_flags = var->flags;
++	}
++
++	if ((operand2_flags & HIST_FIELD_FL_VAR_REF) ||
++	    (operand2_flags & HIST_FIELD_FL_ALIAS)) {
++		struct hist_field *var;
++
++		var = find_var_field(operand2->var.hist_data, operand2->name);
++		if (!var)
++			return -EINVAL;
++		operand2_flags = var->flags;
++	}
++
+ 	if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) !=
+ 	    (operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS))
+ 		return -EINVAL;
+@@ -4648,7 +4707,8 @@ static void hist_field_print(struct seq_
+ 	else if (hist_field->flags & HIST_FIELD_FL_CPU)
+ 		seq_puts(m, "cpu");
+ 	else if (field_name) {
+-		if (hist_field->flags & HIST_FIELD_FL_VAR_REF)
++		if (hist_field->flags & HIST_FIELD_FL_VAR_REF ||
++		    hist_field->flags & HIST_FIELD_FL_ALIAS)
+ 			seq_putc(m, '$');
+ 		seq_printf(m, "%s", field_name);
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0096-0039-tracing-Add-last-error-error-facility-for-hist-trigg.patch b/kernel/patches-4.14.x-rt/0096-0039-tracing-Add-last-error-error-facility-for-hist-trigg.patch
new file mode 100644
index 000000000..1d99c35cb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0096-0039-tracing-Add-last-error-error-facility-for-hist-trigg.patch
@@ -0,0 +1,502 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:05 -0600
+Subject: [PATCH 39/48] tracing: Add 'last error' error facility for hist
+ triggers
+
+With the addition of variables and actions, it's become necessary to
+provide more detailed error information to users about syntax errors.
+
+Add a 'last error' facility accessible via the erroring event's 'hist'
+file.  Reading the hist file after an error will display more detailed
+information about what went wrong, if information is available.  This
+extended error information will be available until the next hist
+trigger command for that event.
+
+  # echo xxx > /sys/kernel/debug/tracing/events/sched/sched_wakeup/trigger
+  echo: write error: Invalid argument
+
+  # cat /sys/kernel/debug/tracing/events/sched/sched_wakeup/hist
+
+  ERROR: Couldn't yyy: zzz
+  Last command: xxx
+
+Also add specific error messages for variable and action errors.
+
+Link: http://lkml.kernel.org/r/64e9c422fc8aeafcc2f7a3b4328c0cffe7969129.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 215016863b5ec1ee5db5e20f32ffe015a497209f)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/histogram.txt |   20 ++++
+ kernel/trace/trace_events_hist.c  |  164 ++++++++++++++++++++++++++++++++++----
+ 2 files changed, 170 insertions(+), 14 deletions(-)
+
+--- a/Documentation/trace/histogram.txt
++++ b/Documentation/trace/histogram.txt
+@@ -188,6 +188,26 @@
+ 				 interpreted as microseconds.
+     cpu                    int - the cpu on which the event occurred.
+ 
++  Extended error information
++  --------------------------
++
++  For some error conditions encountered when invoking a hist trigger
++  command, extended error information is available via the
++  corresponding event's 'hist' file.  Reading the hist file after an
++  error will display more detailed information about what went wrong,
++  if information is available.  This extended error information will
++  be available until the next hist trigger command for that event.
++
++  If available for a given error condition, the extended error
++  information and usage takes the following form:
++
++    # echo xxx > /sys/kernel/debug/tracing/events/sched/sched_wakeup/trigger
++    echo: write error: Invalid argument
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_wakeup/hist
++    ERROR: Couldn't yyy: zzz
++      Last command: xxx
++
+ 6.2 'hist' trigger examples
+ ---------------------------
+ 
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -351,6 +351,65 @@ struct action_data {
+ 	};
+ };
+ 
++
++static char last_hist_cmd[MAX_FILTER_STR_VAL];
++static char hist_err_str[MAX_FILTER_STR_VAL];
++
++static void last_cmd_set(char *str)
++{
++	if (!str)
++		return;
++
++	strncpy(last_hist_cmd, str, MAX_FILTER_STR_VAL - 1);
++}
++
++static void hist_err(char *str, char *var)
++{
++	int maxlen = MAX_FILTER_STR_VAL - 1;
++
++	if (!str)
++		return;
++
++	if (strlen(hist_err_str))
++		return;
++
++	if (!var)
++		var = "";
++
++	if (strlen(hist_err_str) + strlen(str) + strlen(var) > maxlen)
++		return;
++
++	strcat(hist_err_str, str);
++	strcat(hist_err_str, var);
++}
++
++static void hist_err_event(char *str, char *system, char *event, char *var)
++{
++	char err[MAX_FILTER_STR_VAL];
++
++	if (system && var)
++		snprintf(err, MAX_FILTER_STR_VAL, "%s.%s.%s", system, event, var);
++	else if (system)
++		snprintf(err, MAX_FILTER_STR_VAL, "%s.%s", system, event);
++	else
++		strncpy(err, var, MAX_FILTER_STR_VAL);
++
++	hist_err(str, err);
++}
++
++static void hist_err_clear(void)
++{
++	hist_err_str[0] = '\0';
++}
++
++static bool have_hist_err(void)
++{
++	if (strlen(hist_err_str))
++		return true;
++
++	return false;
++}
++
+ static LIST_HEAD(synth_event_list);
+ static DEFINE_MUTEX(synth_event_mutex);
+ 
+@@ -1448,8 +1507,10 @@ static struct trace_event_file *find_var
+ 			continue;
+ 
+ 		if (find_var_field(var_hist_data, var_name)) {
+-			if (found)
++			if (found) {
++				hist_err_event("Variable name not unique, need to use fully qualified name (subsys.event.var) for variable: ", system, event_name, var_name);
+ 				return NULL;
++			}
+ 
+ 			found = file;
+ 		}
+@@ -1498,6 +1559,7 @@ find_match_var(struct hist_trigger_data
+ 			hist_field = find_file_var(file, var_name);
+ 			if (hist_field) {
+ 				if (found) {
++					hist_err_event("Variable name not unique, need to use fully qualified name (subsys.event.var) for variable: ", system, event_name, var_name);
+ 					return ERR_PTR(-EINVAL);
+ 				}
+ 
+@@ -1781,6 +1843,7 @@ static int parse_assignment(char *str, s
+ 		char *assignment;
+ 
+ 		if (attrs->n_assignments == TRACING_MAP_VARS_MAX) {
++			hist_err("Too many variables defined: ", str);
+ 			ret = -EINVAL;
+ 			goto out;
+ 		}
+@@ -2335,6 +2398,10 @@ static struct hist_field *parse_var_ref(
+ 	if (var_field)
+ 		ref_field = create_var_ref(var_field, system, event_name);
+ 
++	if (!ref_field)
++		hist_err_event("Couldn't find variable: $",
++			       system, event_name, var_name);
++
+ 	return ref_field;
+ }
+ 
+@@ -2494,6 +2561,7 @@ static struct hist_field *parse_unary(st
+ 	// we support only -(xxx) i.e. explicit parens required
+ 
+ 	if (level > 3) {
++		hist_err("Too many subexpressions (3 max): ", str);
+ 		ret = -EINVAL;
+ 		goto free;
+ 	}
+@@ -2575,8 +2643,10 @@ static int check_expr_operands(struct hi
+ 	}
+ 
+ 	if ((operand1_flags & HIST_FIELD_FL_TIMESTAMP_USECS) !=
+-	    (operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS))
++	    (operand2_flags & HIST_FIELD_FL_TIMESTAMP_USECS)) {
++		hist_err("Timestamp units in expression don't match", NULL);
+ 		return -EINVAL;
++	}
+ 
+ 	return 0;
+ }
+@@ -2591,8 +2661,10 @@ static struct hist_field *parse_expr(str
+ 	int field_op, ret = -EINVAL;
+ 	char *sep, *operand1_str;
+ 
+-	if (level > 3)
++	if (level > 3) {
++		hist_err("Too many subexpressions (3 max): ", str);
+ 		return ERR_PTR(-EINVAL);
++	}
+ 
+ 	field_op = contains_operator(str);
+ 
+@@ -2826,12 +2898,17 @@ create_field_var_hist(struct hist_trigge
+ 	char *cmd;
+ 	int ret;
+ 
+-	if (target_hist_data->n_field_var_hists >= SYNTH_FIELDS_MAX)
++	if (target_hist_data->n_field_var_hists >= SYNTH_FIELDS_MAX) {
++		hist_err_event("onmatch: Too many field variables defined: ",
++			       subsys_name, event_name, field_name);
+ 		return ERR_PTR(-EINVAL);
++	}
+ 
+ 	file = event_file(tr, subsys_name, event_name);
+ 
+ 	if (IS_ERR(file)) {
++		hist_err_event("onmatch: Event file not found: ",
++			       subsys_name, event_name, field_name);
+ 		ret = PTR_ERR(file);
+ 		return ERR_PTR(ret);
+ 	}
+@@ -2843,8 +2920,11 @@ create_field_var_hist(struct hist_trigge
+ 	 * yet a registered histogram so we can't use that.
+ 	 */
+ 	hist_data = find_compatible_hist(target_hist_data, file);
+-	if (!hist_data)
++	if (!hist_data) {
++		hist_err_event("onmatch: Matching event histogram not found: ",
++			       subsys_name, event_name, field_name);
+ 		return ERR_PTR(-EINVAL);
++	}
+ 
+ 	/* See if a synthetic field variable has already been created */
+ 	event_var = find_synthetic_field_var(target_hist_data, subsys_name,
+@@ -2903,6 +2983,8 @@ create_field_var_hist(struct hist_trigge
+ 		kfree(cmd);
+ 		kfree(var_hist->cmd);
+ 		kfree(var_hist);
++		hist_err_event("onmatch: Couldn't create histogram for field: ",
++			       subsys_name, event_name, field_name);
+ 		return ERR_PTR(ret);
+ 	}
+ 
+@@ -2914,6 +2996,8 @@ create_field_var_hist(struct hist_trigge
+ 	if (IS_ERR_OR_NULL(event_var)) {
+ 		kfree(var_hist->cmd);
+ 		kfree(var_hist);
++		hist_err_event("onmatch: Couldn't find synthetic variable: ",
++			       subsys_name, event_name, field_name);
+ 		return ERR_PTR(-EINVAL);
+ 	}
+ 
+@@ -3050,18 +3134,21 @@ static struct field_var *create_field_va
+ 	int ret = 0;
+ 
+ 	if (hist_data->n_field_vars >= SYNTH_FIELDS_MAX) {
++		hist_err("Too many field variables defined: ", field_name);
+ 		ret = -EINVAL;
+ 		goto err;
+ 	}
+ 
+ 	val = parse_atom(hist_data, file, field_name, &flags, NULL);
+ 	if (IS_ERR(val)) {
++		hist_err("Couldn't parse field variable: ", field_name);
+ 		ret = PTR_ERR(val);
+ 		goto err;
+ 	}
+ 
+ 	var = create_var(hist_data, file, field_name, val->size, val->type);
+ 	if (IS_ERR(var)) {
++		hist_err("Couldn't create or find variable: ", field_name);
+ 		kfree(val);
+ 		ret = PTR_ERR(var);
+ 		goto err;
+@@ -3204,13 +3291,17 @@ static int onmax_create(struct hist_trig
+ 	int ret = 0;
+ 
+ 	onmax_var_str = data->onmax.var_str;
+-	if (onmax_var_str[0] != '$')
++	if (onmax_var_str[0] != '$') {
++		hist_err("onmax: For onmax(x), x must be a variable: ", onmax_var_str);
+ 		return -EINVAL;
++	}
+ 	onmax_var_str++;
+ 
+ 	var_field = find_target_event_var(hist_data, NULL, NULL, onmax_var_str);
+-	if (!var_field)
++	if (!var_field) {
++		hist_err("onmax: Couldn't find onmax variable: ", onmax_var_str);
+ 		return -EINVAL;
++	}
+ 
+ 	flags = HIST_FIELD_FL_VAR_REF;
+ 	ref_field = create_hist_field(hist_data, NULL, flags, NULL);
+@@ -3230,6 +3321,7 @@ static int onmax_create(struct hist_trig
+ 	data->onmax.max_var_ref_idx = var_ref_idx;
+ 	max_var = create_var(hist_data, file, "max", sizeof(u64), "u64");
+ 	if (IS_ERR(max_var)) {
++		hist_err("onmax: Couldn't create onmax variable: ", "max");
+ 		ret = PTR_ERR(max_var);
+ 		goto out;
+ 	}
+@@ -3244,6 +3336,7 @@ static int onmax_create(struct hist_trig
+ 
+ 		field_var = create_target_field_var(hist_data, NULL, NULL, param);
+ 		if (IS_ERR(field_var)) {
++			hist_err("onmax: Couldn't create field variable: ", param);
+ 			ret = PTR_ERR(field_var);
+ 			kfree(param);
+ 			goto out;
+@@ -3276,6 +3369,7 @@ static int parse_action_params(char *par
+ 
+ 		param = strstrip(param);
+ 		if (strlen(param) < 2) {
++			hist_err("Invalid action param: ", param);
+ 			ret = -EINVAL;
+ 			goto out;
+ 		}
+@@ -3451,6 +3545,9 @@ onmatch_find_var(struct hist_trigger_dat
+ 		hist_field = find_event_var(hist_data, system, event, var);
+ 	}
+ 
++	if (!hist_field)
++		hist_err_event("onmatch: Couldn't find onmatch param: $", system, event, var);
++
+ 	return hist_field;
+ }
+ 
+@@ -3518,6 +3615,7 @@ static int onmatch_create(struct hist_tr
+ 	mutex_lock(&synth_event_mutex);
+ 	event = find_synth_event(data->onmatch.synth_event_name);
+ 	if (!event) {
++		hist_err("onmatch: Couldn't find synthetic event: ", data->onmatch.synth_event_name);
+ 		mutex_unlock(&synth_event_mutex);
+ 		return -EINVAL;
+ 	}
+@@ -3577,12 +3675,15 @@ static int onmatch_create(struct hist_tr
+ 			continue;
+ 		}
+ 
++		hist_err_event("onmatch: Param type doesn't match synthetic event field type: ",
++			       system, event_name, param);
+ 		kfree(p);
+ 		ret = -EINVAL;
+ 		goto err;
+ 	}
+ 
+ 	if (field_pos != event->n_fields) {
++		hist_err("onmatch: Param count doesn't match synthetic event field count: ", event->name);
+ 		ret = -EINVAL;
+ 		goto err;
+ 	}
+@@ -3612,15 +3713,22 @@ static struct action_data *onmatch_parse
+ 		return ERR_PTR(-ENOMEM);
+ 
+ 	match_event = strsep(&str, ")");
+-	if (!match_event || !str)
++	if (!match_event || !str) {
++		hist_err("onmatch: Missing closing paren: ", match_event);
+ 		goto free;
++	}
+ 
+ 	match_event_system = strsep(&match_event, ".");
+-	if (!match_event)
++	if (!match_event) {
++		hist_err("onmatch: Missing subsystem for match event: ", match_event_system);
+ 		goto free;
++	}
+ 
+-	if (IS_ERR(event_file(tr, match_event_system, match_event)))
++	if (IS_ERR(event_file(tr, match_event_system, match_event))) {
++		hist_err_event("onmatch: Invalid subsystem or event name: ",
++			       match_event_system, match_event, NULL);
+ 		goto free;
++	}
+ 
+ 	data->onmatch.match_event = kstrdup(match_event, GFP_KERNEL);
+ 	if (!data->onmatch.match_event) {
+@@ -3635,12 +3743,16 @@ static struct action_data *onmatch_parse
+ 	}
+ 
+ 	strsep(&str, ".");
+-	if (!str)
++	if (!str) {
++		hist_err("onmatch: Missing . after onmatch(): ", str);
+ 		goto free;
++	}
+ 
+ 	synth_event_name = strsep(&str, "(");
+-	if (!synth_event_name || !str)
++	if (!synth_event_name || !str) {
++		hist_err("onmatch: Missing opening paramlist paren: ", synth_event_name);
+ 		goto free;
++	}
+ 
+ 	data->onmatch.synth_event_name = kstrdup(synth_event_name, GFP_KERNEL);
+ 	if (!data->onmatch.synth_event_name) {
+@@ -3649,8 +3761,10 @@ static struct action_data *onmatch_parse
+ 	}
+ 
+ 	params = strsep(&str, ")");
+-	if (!params || !str || (str && strlen(str)))
++	if (!params || !str || (str && strlen(str))) {
++		hist_err("onmatch: Missing closing paramlist paren: ", params);
+ 		goto free;
++	}
+ 
+ 	ret = parse_action_params(params, data);
+ 	if (ret)
+@@ -3725,7 +3839,9 @@ static int create_var_field(struct hist_
+ 
+ 	if (WARN_ON(val_idx >= TRACING_MAP_VALS_MAX + TRACING_MAP_VARS_MAX))
+ 		return -EINVAL;
++
+ 	if (find_var(hist_data, file, var_name) && !hist_data->remove) {
++		hist_err("Variable already defined: ", var_name);
+ 		return -EINVAL;
+ 	}
+ 
+@@ -3806,6 +3922,7 @@ static int create_key_field(struct hist_
+ 		}
+ 
+ 		if (hist_field->flags & HIST_FIELD_FL_VAR_REF) {
++			hist_err("Using variable references as keys not supported: ", field_str);
+ 			destroy_hist_field(hist_field, 0);
+ 			ret = -EINVAL;
+ 			goto out;
+@@ -3919,11 +4036,13 @@ static int parse_var_defs(struct hist_tr
+ 
+ 			var_name = strsep(&field_str, "=");
+ 			if (!var_name || !field_str) {
++				hist_err("Malformed assignment: ", var_name);
+ 				ret = -EINVAL;
+ 				goto free;
+ 			}
+ 
+ 			if (n_vars == TRACING_MAP_VARS_MAX) {
++				hist_err("Too many variables defined: ", var_name);
+ 				ret = -EINVAL;
+ 				goto free;
+ 			}
+@@ -4677,6 +4796,11 @@ static int hist_show(struct seq_file *m,
+ 			hist_trigger_show(m, data, n++);
+ 	}
+ 
++	if (have_hist_err()) {
++		seq_printf(m, "\nERROR: %s\n", hist_err_str);
++		seq_printf(m, "  Last command: %s\n", last_hist_cmd);
++	}
++
+  out_unlock:
+ 	mutex_unlock(&event_mutex);
+ 
+@@ -5041,6 +5165,7 @@ static int hist_register_trigger(char *g
+ 		if (named_data) {
+ 			if (!hist_trigger_match(data, named_data, named_data,
+ 						true)) {
++				hist_err("Named hist trigger doesn't match existing named trigger (includes variables): ", hist_data->attrs->name);
+ 				ret = -EINVAL;
+ 				goto out;
+ 			}
+@@ -5060,13 +5185,16 @@ static int hist_register_trigger(char *g
+ 				test->paused = false;
+ 			else if (hist_data->attrs->clear)
+ 				hist_clear(test);
+-			else
++			else {
++				hist_err("Hist trigger already exists", NULL);
+ 				ret = -EEXIST;
++			}
+ 			goto out;
+ 		}
+ 	}
+  new:
+ 	if (hist_data->attrs->cont || hist_data->attrs->clear) {
++		hist_err("Can't clear or continue a nonexistent hist trigger", NULL);
+ 		ret = -ENOENT;
+ 		goto out;
+ 	}
+@@ -5253,6 +5381,11 @@ static int event_hist_trigger_func(struc
+ 	char *trigger, *p;
+ 	int ret = 0;
+ 
++	if (glob && strlen(glob)) {
++		last_cmd_set(param);
++		hist_err_clear();
++	}
++
+ 	if (!param)
+ 		return -EINVAL;
+ 
+@@ -5391,6 +5524,9 @@ static int event_hist_trigger_func(struc
+ 	/* Just return zero, not the number of registered triggers */
+ 	ret = 0;
+  out:
++	if (ret == 0)
++		hist_err_clear();
++
+ 	return ret;
+  out_unreg:
+ 	cmd_ops->unreg(glob+1, trigger_ops, trigger_data, file);
diff --git a/kernel/patches-4.14.x-rt/0097-0040-tracing-Add-inter-event-hist-trigger-Documentation.patch b/kernel/patches-4.14.x-rt/0097-0040-tracing-Add-inter-event-hist-trigger-Documentation.patch
new file mode 100644
index 000000000..362cb9490
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0097-0040-tracing-Add-inter-event-hist-trigger-Documentation.patch
@@ -0,0 +1,405 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:06 -0600
+Subject: [PATCH 40/48] tracing: Add inter-event hist trigger Documentation
+
+Add background and details on inter-event hist triggers, including
+hist variables, synthetic events, and actions.
+
+Link: http://lkml.kernel.org/r/b0414efb66535aa52aa7411f58c3d56724027fce.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Baohong Liu <baohong.liu@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 7d5f30af5e39e572f6984c1083fe79fd7dc34d04)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/histogram.txt |  381 ++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 381 insertions(+)
+
+--- a/Documentation/trace/histogram.txt
++++ b/Documentation/trace/histogram.txt
+@@ -1603,3 +1603,384 @@
+         Hits: 489
+         Entries: 7
+         Dropped: 0
++
++
++2.2 Inter-event hist triggers
++-----------------------------
++
++Inter-event hist triggers are hist triggers that combine values from
++one or more other events and create a histogram using that data.  Data
++from an inter-event histogram can in turn become the source for
++further combined histograms, thus providing a chain of related
++histograms, which is important for some applications.
++
++The most important example of an inter-event quantity that can be used
++in this manner is latency, which is simply a difference in timestamps
++between two events.  Although latency is the most important
++inter-event quantity, note that because the support is completely
++general across the trace event subsystem, any event field can be used
++in an inter-event quantity.
++
++An example of a histogram that combines data from other histograms
++into a useful chain would be a 'wakeupswitch latency' histogram that
++combines a 'wakeup latency' histogram and a 'switch latency'
++histogram.
++
++Normally, a hist trigger specification consists of a (possibly
++compound) key along with one or more numeric values, which are
++continually updated sums associated with that key.  A histogram
++specification in this case consists of individual key and value
++specifications that refer to trace event fields associated with a
++single event type.
++
++The inter-event hist trigger extension allows fields from multiple
++events to be referenced and combined into a multi-event histogram
++specification.  In support of this overall goal, a few enabling
++features have been added to the hist trigger support:
++
++  - In order to compute an inter-event quantity, a value from one
++    event needs to saved and then referenced from another event.  This
++    requires the introduction of support for histogram 'variables'.
++
++  - The computation of inter-event quantities and their combination
++    require some minimal amount of support for applying simple
++    expressions to variables (+ and -).
++
++  - A histogram consisting of inter-event quantities isn't logically a
++    histogram on either event (so having the 'hist' file for either
++    event host the histogram output doesn't really make sense).  To
++    address the idea that the histogram is associated with a
++    combination of events, support is added allowing the creation of
++    'synthetic' events that are events derived from other events.
++    These synthetic events are full-fledged events just like any other
++    and can be used as such, as for instance to create the
++    'combination' histograms mentioned previously.
++
++  - A set of 'actions' can be associated with histogram entries -
++    these can be used to generate the previously mentioned synthetic
++    events, but can also be used for other purposes, such as for
++    example saving context when a 'max' latency has been hit.
++
++  - Trace events don't have a 'timestamp' associated with them, but
++    there is an implicit timestamp saved along with an event in the
++    underlying ftrace ring buffer.  This timestamp is now exposed as a
++    a synthetic field named 'common_timestamp' which can be used in
++    histograms as if it were any other event field; it isn't an actual
++    field in the trace format but rather is a synthesized value that
++    nonetheless can be used as if it were an actual field.  By default
++    it is in units of nanoseconds; appending '.usecs' to a
++    common_timestamp field changes the units to microseconds.
++
++These features are decribed in more detail in the following sections.
++
++2.2.1 Histogram Variables
++-------------------------
++
++Variables are simply named locations used for saving and retrieving
++values between matching events.  A 'matching' event is defined as an
++event that has a matching key - if a variable is saved for a histogram
++entry corresponding to that key, any subsequent event with a matching
++key can access that variable.
++
++A variable's value is normally available to any subsequent event until
++it is set to something else by a subsequent event.  The one exception
++to that rule is that any variable used in an expression is essentially
++'read-once' - once it's used by an expression in a subsequent event,
++it's reset to its 'unset' state, which means it can't be used again
++unless it's set again.  This ensures not only that an event doesn't
++use an uninitialized variable in a calculation, but that that variable
++is used only once and not for any unrelated subsequent match.
++
++The basic syntax for saving a variable is to simply prefix a unique
++variable name not corresponding to any keyword along with an '=' sign
++to any event field.
++
++Either keys or values can be saved and retrieved in this way.  This
++creates a variable named 'ts0' for a histogram entry with the key
++'next_pid':
++
++  # echo 'hist:keys=next_pid:vals=$ts0:ts0=common_timestamp ... >> \
++	event/trigger
++
++The ts0 variable can be accessed by any subsequent event having the
++same pid as 'next_pid'.
++
++Variable references are formed by prepending the variable name with
++the '$' sign.  Thus for example, the ts0 variable above would be
++referenced as '$ts0' in expressions.
++
++Because 'vals=' is used, the common_timestamp variable value above
++will also be summed as a normal histogram value would (though for a
++timestamp it makes little sense).
++
++The below shows that a key value can also be saved in the same way:
++
++  # echo 'hist:timer_pid=common_pid:key=timer_pid ...' >> event/trigger
++
++If a variable isn't a key variable or prefixed with 'vals=', the
++associated event field will be saved in a variable but won't be summed
++as a value:
++
++  # echo 'hist:keys=next_pid:ts1=common_timestamp ... >> event/trigger
++
++Multiple variables can be assigned at the same time.  The below would
++result in both ts0 and b being created as variables, with both
++common_timestamp and field1 additionally being summed as values:
++
++  # echo 'hist:keys=pid:vals=$ts0,$b:ts0=common_timestamp,b=field1 ... >> \
++	event/trigger
++
++Note that variable assignments can appear either preceding or
++following their use.  The command below behaves identically to the
++command above:
++
++  # echo 'hist:keys=pid:ts0=common_timestamp,b=field1:vals=$ts0,$b ... >> \
++	event/trigger
++
++Any number of variables not bound to a 'vals=' prefix can also be
++assigned by simply separating them with colons.  Below is the same
++thing but without the values being summed in the histogram:
++
++  # echo 'hist:keys=pid:ts0=common_timestamp:b=field1 ... >> event/trigger
++
++Variables set as above can be referenced and used in expressions on
++another event.
++
++For example, here's how a latency can be calculated:
++
++  # echo 'hist:keys=pid,prio:ts0=common_timestamp ... >> event1/trigger
++  # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp-$ts0 ... >> event2/trigger
++
++In the first line above, the event's timetamp is saved into the
++variable ts0.  In the next line, ts0 is subtracted from the second
++event's timestamp to produce the latency, which is then assigned into
++yet another variable, 'wakeup_lat'.  The hist trigger below in turn
++makes use of the wakeup_lat variable to compute a combined latency
++using the same key and variable from yet another event:
++
++  # echo 'hist:key=pid:wakeupswitch_lat=$wakeup_lat+$switchtime_lat ... >> event3/trigger
++
++2.2.2 Synthetic Events
++----------------------
++
++Synthetic events are user-defined events generated from hist trigger
++variables or fields associated with one or more other events.  Their
++purpose is to provide a mechanism for displaying data spanning
++multiple events consistent with the existing and already familiar
++usage for normal events.
++
++To define a synthetic event, the user writes a simple specification
++consisting of the name of the new event along with one or more
++variables and their types, which can be any valid field type,
++separated by semicolons, to the tracing/synthetic_events file.
++
++For instance, the following creates a new event named 'wakeup_latency'
++with 3 fields: lat, pid, and prio.  Each of those fields is simply a
++variable reference to a variable on another event:
++
++  # echo 'wakeup_latency \
++          u64 lat; \
++          pid_t pid; \
++	  int prio' >> \
++	  /sys/kernel/debug/tracing/synthetic_events
++
++Reading the tracing/synthetic_events file lists all the currently
++defined synthetic events, in this case the event defined above:
++
++  # cat /sys/kernel/debug/tracing/synthetic_events
++    wakeup_latency u64 lat; pid_t pid; int prio
++
++An existing synthetic event definition can be removed by prepending
++the command that defined it with a '!':
++
++  # echo '!wakeup_latency u64 lat pid_t pid int prio' >> \
++    /sys/kernel/debug/tracing/synthetic_events
++
++At this point, there isn't yet an actual 'wakeup_latency' event
++instantiated in the event subsytem - for this to happen, a 'hist
++trigger action' needs to be instantiated and bound to actual fields
++and variables defined on other events (see Section 6.3.3 below).
++
++Once that is done, an event instance is created, and a histogram can
++be defined using it:
++
++  # echo 'hist:keys=pid,prio,lat.log2:sort=pid,lat' >> \
++        /sys/kernel/debug/tracing/events/synthetic/wakeup_latency/trigger
++
++The new event is created under the tracing/events/synthetic/ directory
++and looks and behaves just like any other event:
++
++  # ls /sys/kernel/debug/tracing/events/synthetic/wakeup_latency
++        enable  filter  format  hist  id  trigger
++
++Like any other event, once a histogram is enabled for the event, the
++output can be displayed by reading the event's 'hist' file.
++
++2.2.3 Hist trigger 'actions'
++----------------------------
++
++A hist trigger 'action' is a function that's executed whenever a
++histogram entry is added or updated.
++
++The default 'action' if no special function is explicity specified is
++as it always has been, to simply update the set of values associated
++with an entry.  Some applications, however, may want to perform
++additional actions at that point, such as generate another event, or
++compare and save a maximum.
++
++The following additional actions are available.  To specify an action
++for a given event, simply specify the action between colons in the
++hist trigger specification.
++
++  - onmatch(matching.event).<synthetic_event_name>(param list)
++
++    The 'onmatch(matching.event).<synthetic_event_name>(params)' hist
++    trigger action is invoked whenever an event matches and the
++    histogram entry would be added or updated.  It causes the named
++    synthetic event to be generated with the values given in the
++    'param list'.  The result is the generation of a synthetic event
++    that consists of the values contained in those variables at the
++    time the invoking event was hit.
++
++    The 'param list' consists of one or more parameters which may be
++    either variables or fields defined on either the 'matching.event'
++    or the target event.  The variables or fields specified in the
++    param list may be either fully-qualified or unqualified.  If a
++    variable is specified as unqualified, it must be unique between
++    the two events.  A field name used as a param can be unqualified
++    if it refers to the target event, but must be fully qualified if
++    it refers to the matching event.  A fully-qualified name is of the
++    form 'system.event_name.$var_name' or 'system.event_name.field'.
++
++    The 'matching.event' specification is simply the fully qualified
++    event name of the event that matches the target event for the
++    onmatch() functionality, in the form 'system.event_name'.
++
++    Finally, the number and type of variables/fields in the 'param
++    list' must match the number and types of the fields in the
++    synthetic event being generated.
++
++    As an example the below defines a simple synthetic event and uses
++    a variable defined on the sched_wakeup_new event as a parameter
++    when invoking the synthetic event.  Here we define the synthetic
++    event:
++
++    # echo 'wakeup_new_test pid_t pid' >> \
++           /sys/kernel/debug/tracing/synthetic_events
++
++    # cat /sys/kernel/debug/tracing/synthetic_events
++          wakeup_new_test pid_t pid
++
++    The following hist trigger both defines the missing testpid
++    variable and specifies an onmatch() action that generates a
++    wakeup_new_test synthetic event whenever a sched_wakeup_new event
++    occurs, which because of the 'if comm == "cyclictest"' filter only
++    happens when the executable is cyclictest:
++
++    # echo 'hist:keys=$testpid:testpid=pid:onmatch(sched.sched_wakeup_new).\
++            wakeup_new_test($testpid) if comm=="cyclictest"' >> \
++            /sys/kernel/debug/tracing/events/sched/sched_wakeup_new/trigger
++
++    Creating and displaying a histogram based on those events is now
++    just a matter of using the fields and new synthetic event in the
++    tracing/events/synthetic directory, as usual:
++
++    # echo 'hist:keys=pid:sort=pid' >> \
++           /sys/kernel/debug/tracing/events/synthetic/wakeup_new_test/trigger
++
++    Running 'cyclictest' should cause wakeup_new events to generate
++    wakeup_new_test synthetic events which should result in histogram
++    output in the wakeup_new_test event's hist file:
++
++    # cat /sys/kernel/debug/tracing/events/synthetic/wakeup_new_test/hist
++
++    A more typical usage would be to use two events to calculate a
++    latency.  The following example uses a set of hist triggers to
++    produce a 'wakeup_latency' histogram:
++
++    First, we define a 'wakeup_latency' synthetic event:
++
++    # echo 'wakeup_latency u64 lat; pid_t pid; int prio' >> \
++            /sys/kernel/debug/tracing/synthetic_events
++
++    Next, we specify that whenever we see a sched_waking event for a
++    cyclictest thread, save the timestamp in a 'ts0' variable:
++
++    # echo 'hist:keys=$saved_pid:saved_pid=pid:ts0=common_timestamp.usecs \
++            if comm=="cyclictest"' >> \
++	    /sys/kernel/debug/tracing/events/sched/sched_waking/trigger
++
++    Then, when the corresponding thread is actually scheduled onto the
++    CPU by a sched_switch event, calculate the latency and use that
++    along with another variable and an event field to generate a
++    wakeup_latency synthetic event:
++
++    # echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:\
++            onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,\
++	            $saved_pid,next_prio) if next_comm=="cyclictest"' >> \
++	    /sys/kernel/debug/tracing/events/sched/sched_switch/trigger
++
++    We also need to create a histogram on the wakeup_latency synthetic
++    event in order to aggregate the generated synthetic event data:
++
++    # echo 'hist:keys=pid,prio,lat:sort=pid,lat' >> \
++            /sys/kernel/debug/tracing/events/synthetic/wakeup_latency/trigger
++
++    Finally, once we've run cyclictest to actually generate some
++    events, we can see the output by looking at the wakeup_latency
++    synthetic event's hist file:
++
++    # cat /sys/kernel/debug/tracing/events/synthetic/wakeup_latency/hist
++
++  - onmax(var).save(field,..	.)
++
++    The 'onmax(var).save(field,...)' hist trigger action is invoked
++    whenever the value of 'var' associated with a histogram entry
++    exceeds the current maximum contained in that variable.
++
++    The end result is that the trace event fields specified as the
++    onmax.save() params will be saved if 'var' exceeds the current
++    maximum for that hist trigger entry.  This allows context from the
++    event that exhibited the new maximum to be saved for later
++    reference.  When the histogram is displayed, additional fields
++    displaying the saved values will be printed.
++
++    As an example the below defines a couple of hist triggers, one for
++    sched_waking and another for sched_switch, keyed on pid.  Whenever
++    a sched_waking occurs, the timestamp is saved in the entry
++    corresponding to the current pid, and when the scheduler switches
++    back to that pid, the timestamp difference is calculated.  If the
++    resulting latency, stored in wakeup_lat, exceeds the current
++    maximum latency, the values specified in the save() fields are
++    recoreded:
++
++    # echo 'hist:keys=pid:ts0=common_timestamp.usecs \
++            if comm=="cyclictest"' >> \
++            /sys/kernel/debug/tracing/events/sched/sched_waking/trigger
++
++    # echo 'hist:keys=next_pid:\
++            wakeup_lat=common_timestamp.usecs-$ts0:\
++            onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) \
++            if next_comm=="cyclictest"' >> \
++            /sys/kernel/debug/tracing/events/sched/sched_switch/trigger
++
++    When the histogram is displayed, the max value and the saved
++    values corresponding to the max are displayed following the rest
++    of the fields:
++
++    # cat /sys/kernel/debug/tracing/events/sched/sched_switch/hist
++      { next_pid:       2255 } hitcount:        239
++        common_timestamp-ts0:          0
++        max:         27
++	next_comm: cyclictest
++        prev_pid:          0  prev_prio:        120  prev_comm: swapper/1
++
++      { next_pid:       2256 } hitcount:       2355
++        common_timestamp-ts0: 0
++        max:         49  next_comm: cyclictest
++        prev_pid:          0  prev_prio:        120  prev_comm: swapper/0
++
++      Totals:
++          Hits: 12970
++          Entries: 2
++          Dropped: 0
diff --git a/kernel/patches-4.14.x-rt/0098-0041-tracing-Make-tracing_set_clock-non-static.patch b/kernel/patches-4.14.x-rt/0098-0041-tracing-Make-tracing_set_clock-non-static.patch
new file mode 100644
index 000000000..ac2cbeace
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0098-0041-tracing-Make-tracing_set_clock-non-static.patch
@@ -0,0 +1,43 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:07 -0600
+Subject: [PATCH 41/48] tracing: Make tracing_set_clock() non-static
+
+Allow tracing code outside of trace.c to access tracing_set_clock().
+
+Some applications may require a particular clock in order to function
+properly, such as latency calculations.
+
+Also, add an accessor returning the current clock string.
+
+Link: http://lkml.kernel.org/r/6d1c53e9ee2163f54e1849f5376573f54f0e6009.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit f8913a56885a33eda24452c1839102c305bf7df5)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace.c |    2 +-
+ kernel/trace/trace.h |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -6219,7 +6219,7 @@ static int tracing_clock_show(struct seq
+ 	return 0;
+ }
+ 
+-static int tracing_set_clock(struct trace_array *tr, const char *clockstr)
++int tracing_set_clock(struct trace_array *tr, const char *clockstr)
+ {
+ 	int i;
+ 
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -289,6 +289,7 @@ extern int trace_array_get(struct trace_
+ extern void trace_array_put(struct trace_array *tr);
+ 
+ extern int tracing_set_time_stamp_abs(struct trace_array *tr, bool abs);
++extern int tracing_set_clock(struct trace_array *tr, const char *clockstr);
+ 
+ extern bool trace_clock_in_ns(struct trace_array *tr);
+ 
diff --git a/kernel/patches-4.14.x-rt/0099-0042-tracing-Add-a-clock-attribute-for-hist-triggers.patch b/kernel/patches-4.14.x-rt/0099-0042-tracing-Add-a-clock-attribute-for-hist-triggers.patch
new file mode 100644
index 000000000..c91bd41cb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0099-0042-tracing-Add-a-clock-attribute-for-hist-triggers.patch
@@ -0,0 +1,137 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:08 -0600
+Subject: [PATCH 42/48] tracing: Add a clock attribute for hist triggers
+
+The default clock if timestamps are used in a histogram is "global".
+If timestamps aren't used, the clock is irrelevant.
+
+Use the "clock=" param only if you want to override the default
+"global" clock for a histogram with timestamps.
+
+Link: http://lkml.kernel.org/r/427bed1389c5d22aa40c3e0683e30cc3d151e260.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Rajvi Jingar <rajvi.jingar@intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 77e7689e0b182465cfcd7c328061b70eecdcde31)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ Documentation/trace/histogram.txt |   11 +++++++++
+ kernel/trace/trace_events_hist.c  |   42 +++++++++++++++++++++++++++++++++++---
+ 2 files changed, 49 insertions(+), 4 deletions(-)
+
+--- a/Documentation/trace/histogram.txt
++++ b/Documentation/trace/histogram.txt
+@@ -1671,7 +1671,16 @@ specification.  In support of this overa
+     it is in units of nanoseconds; appending '.usecs' to a
+     common_timestamp field changes the units to microseconds.
+ 
+-These features are decribed in more detail in the following sections.
++A note on inter-event timestamps: If common_timestamp is used in a
++histogram, the trace buffer is automatically switched over to using
++absolute timestamps and the "global" trace clock, in order to avoid
++bogus timestamp differences with other clocks that aren't coherent
++across CPUs.  This can be overridden by specifying one of the other
++trace clocks instead, using the "clock=XXX" hist trigger attribute,
++where XXX is any of the clocks listed in the tracing/trace_clock
++pseudo-file.
++
++These features are described in more detail in the following sections.
+ 
+ 2.2.1 Histogram Variables
+ -------------------------
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -242,6 +242,7 @@ struct hist_trigger_attrs {
+ 	char		*vals_str;
+ 	char		*sort_key_str;
+ 	char		*name;
++	char		*clock;
+ 	bool		pause;
+ 	bool		cont;
+ 	bool		clear;
+@@ -1776,6 +1777,7 @@ static void destroy_hist_trigger_attrs(s
+ 	kfree(attrs->sort_key_str);
+ 	kfree(attrs->keys_str);
+ 	kfree(attrs->vals_str);
++	kfree(attrs->clock);
+ 	kfree(attrs);
+ }
+ 
+@@ -1831,6 +1833,19 @@ static int parse_assignment(char *str, s
+ 			ret = -ENOMEM;
+ 			goto out;
+ 		}
++	} else if (strncmp(str, "clock=", strlen("clock=")) == 0) {
++		strsep(&str, "=");
++		if (!str) {
++			ret = -EINVAL;
++			goto out;
++		}
++
++		str = strstrip(str);
++		attrs->clock = kstrdup(str, GFP_KERNEL);
++		if (!attrs->clock) {
++			ret = -ENOMEM;
++			goto out;
++		}
+ 	} else if (strncmp(str, "size=", strlen("size=")) == 0) {
+ 		int map_bits = parse_map_size(str);
+ 
+@@ -1895,6 +1910,14 @@ static struct hist_trigger_attrs *parse_
+ 		goto free;
+ 	}
+ 
++	if (!attrs->clock) {
++		attrs->clock = kstrdup("global", GFP_KERNEL);
++		if (!attrs->clock) {
++			ret = -ENOMEM;
++			goto free;
++		}
++	}
++
+ 	return attrs;
+  free:
+ 	destroy_hist_trigger_attrs(attrs);
+@@ -4936,6 +4959,8 @@ static int event_hist_trigger_print(stru
+ 			seq_puts(m, ".descending");
+ 	}
+ 	seq_printf(m, ":size=%u", (1 << hist_data->map->map_bits));
++	if (hist_data->enable_timestamps)
++		seq_printf(m, ":clock=%s", hist_data->attrs->clock);
+ 
+ 	print_actions_spec(m, hist_data);
+ 
+@@ -5203,7 +5228,6 @@ static int hist_register_trigger(char *g
+ 		data->paused = true;
+ 
+ 	if (named_data) {
+-		destroy_hist_data(data->private_data);
+ 		data->private_data = named_data->private_data;
+ 		set_named_trigger_data(data, named_data);
+ 		data->ops = &event_hist_trigger_named_ops;
+@@ -5215,10 +5239,22 @@ static int hist_register_trigger(char *g
+ 			goto out;
+ 	}
+ 
+-	ret++;
++	if (hist_data->enable_timestamps) {
++		char *clock = hist_data->attrs->clock;
++
++		ret = tracing_set_clock(file->tr, hist_data->attrs->clock);
++		if (ret) {
++			hist_err("Couldn't set trace_clock: ", clock);
++			goto out;
++		}
+ 
+-	if (hist_data->enable_timestamps)
+ 		tracing_set_time_stamp_abs(file->tr, true);
++	}
++
++	if (named_data)
++		destroy_hist_data(hist_data);
++
++	ret++;
+  out:
+ 	return ret;
+ }
diff --git a/kernel/patches-4.14.x-rt/0100-0043-ring-buffer-Bring-back-context-level-recursive-check.patch b/kernel/patches-4.14.x-rt/0100-0043-ring-buffer-Bring-back-context-level-recursive-check.patch
new file mode 100644
index 000000000..bceb5eef4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0100-0043-ring-buffer-Bring-back-context-level-recursive-check.patch
@@ -0,0 +1,127 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Mon, 15 Jan 2018 10:47:09 -0500
+Subject: [PATCH 43/48] ring-buffer: Bring back context level recursive checks
+
+Commit 1a149d7d3f45 ("ring-buffer: Rewrite trace_recursive_(un)lock() to be
+simpler") replaced the context level recursion checks with a simple counter.
+This would prevent the ring buffer code from recursively calling itself more
+than the max number of contexts that exist (Normal, softirq, irq, nmi). But
+this change caused a lockup in a specific case, which was during suspend and
+resume using a global clock. Adding a stack dump to see where this occurred,
+the issue was in the trace global clock itself:
+
+  trace_buffer_lock_reserve+0x1c/0x50
+  __trace_graph_entry+0x2d/0x90
+  trace_graph_entry+0xe8/0x200
+  prepare_ftrace_return+0x69/0xc0
+  ftrace_graph_caller+0x78/0xa8
+  queued_spin_lock_slowpath+0x5/0x1d0
+  trace_clock_global+0xb0/0xc0
+  ring_buffer_lock_reserve+0xf9/0x390
+
+The function graph tracer traced queued_spin_lock_slowpath that was called
+by trace_clock_global. This pointed out that the trace_clock_global() is not
+reentrant, as it takes a spin lock. It depended on the ring buffer recursive
+lock from letting that happen.
+
+By removing the context detection and adding just a max number of allowable
+recursions, it allowed the trace_clock_global() to be entered again and try
+to retake the spinlock it already held, causing a deadlock.
+
+Fixes: 1a149d7d3f45 ("ring-buffer: Rewrite trace_recursive_(un)lock() to be simpler")
+Reported-by: David Weinehall <david.weinehall@gmail.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit a0e3a18f4baf8e3754ac1e56f0ade924d0c0c721)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/ring_buffer.c |   64 ++++++++++++++++++++++++++++++++-------------
+ 1 file changed, 46 insertions(+), 18 deletions(-)
+
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -2585,29 +2585,59 @@ rb_wakeups(struct ring_buffer *buffer, s
+  * The lock and unlock are done within a preempt disable section.
+  * The current_context per_cpu variable can only be modified
+  * by the current task between lock and unlock. But it can
+- * be modified more than once via an interrupt. There are four
+- * different contexts that we need to consider.
++ * be modified more than once via an interrupt. To pass this
++ * information from the lock to the unlock without having to
++ * access the 'in_interrupt()' functions again (which do show
++ * a bit of overhead in something as critical as function tracing,
++ * we use a bitmask trick.
+  *
+- *  Normal context.
+- *  SoftIRQ context
+- *  IRQ context
+- *  NMI context
+- *
+- * If for some reason the ring buffer starts to recurse, we
+- * only allow that to happen at most 4 times (one for each
+- * context). If it happens 5 times, then we consider this a
+- * recusive loop and do not let it go further.
++ *  bit 0 =  NMI context
++ *  bit 1 =  IRQ context
++ *  bit 2 =  SoftIRQ context
++ *  bit 3 =  normal context.
++ *
++ * This works because this is the order of contexts that can
++ * preempt other contexts. A SoftIRQ never preempts an IRQ
++ * context.
++ *
++ * When the context is determined, the corresponding bit is
++ * checked and set (if it was set, then a recursion of that context
++ * happened).
++ *
++ * On unlock, we need to clear this bit. To do so, just subtract
++ * 1 from the current_context and AND it to itself.
++ *
++ * (binary)
++ *  101 - 1 = 100
++ *  101 & 100 = 100 (clearing bit zero)
++ *
++ *  1010 - 1 = 1001
++ *  1010 & 1001 = 1000 (clearing bit 1)
++ *
++ * The least significant bit can be cleared this way, and it
++ * just so happens that it is the same bit corresponding to
++ * the current context.
+  */
+ 
+ static __always_inline int
+ trace_recursive_lock(struct ring_buffer_per_cpu *cpu_buffer)
+ {
+-	if (cpu_buffer->current_context >= 4)
++	unsigned int val = cpu_buffer->current_context;
++	unsigned long pc = preempt_count();
++	int bit;
++
++	if (!(pc & (NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET)))
++		bit = RB_CTX_NORMAL;
++	else
++		bit = pc & NMI_MASK ? RB_CTX_NMI :
++			pc & HARDIRQ_MASK ? RB_CTX_IRQ :
++			pc & SOFTIRQ_OFFSET ? 2 : RB_CTX_SOFTIRQ;
++
++	if (unlikely(val & (1 << bit)))
+ 		return 1;
+ 
+-	cpu_buffer->current_context++;
+-	/* Interrupts must see this update */
+-	barrier();
++	val |= (1 << bit);
++	cpu_buffer->current_context = val;
+ 
+ 	return 0;
+ }
+@@ -2615,9 +2645,7 @@ trace_recursive_lock(struct ring_buffer_
+ static __always_inline void
+ trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
+ {
+-	/* Don't let the dec leak out */
+-	barrier();
+-	cpu_buffer->current_context--;
++	cpu_buffer->current_context &= cpu_buffer->current_context - 1;
+ }
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0101-0044-ring-buffer-Fix-duplicate-results-in-mapping-context.patch b/kernel/patches-4.14.x-rt/0101-0044-ring-buffer-Fix-duplicate-results-in-mapping-context.patch
new file mode 100644
index 000000000..c9ee7e0e8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0101-0044-ring-buffer-Fix-duplicate-results-in-mapping-context.patch
@@ -0,0 +1,36 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Thu, 18 Jan 2018 15:42:09 -0500
+Subject: [PATCH 44/48] ring-buffer: Fix duplicate results in mapping context
+ to bits in recursive lock
+
+In bringing back the context checks, the code checks first if its normal
+(non-interrupt) context, and then for NMI then IRQ then softirq. The final
+check is redundant. Since the if branch is only hit if the context is one of
+NMI, IRQ, or SOFTIRQ, if it's not NMI or IRQ there's no reason to check if
+it is SOFTIRQ. The current code returns the same result even if its not a
+SOFTIRQ. Which is confusing.
+
+  pc & SOFTIRQ_OFFSET ? 2 : RB_CTX_SOFTIRQ
+
+Is redundant as RB_CTX_SOFTIRQ *is* 2!
+
+Fixes: a0e3a18f4baf ("ring-buffer: Bring back context level recursive checks")
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 0164e0d7e803af3ee1c63770978c728f8778ad01)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/ring_buffer.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -2630,8 +2630,7 @@ trace_recursive_lock(struct ring_buffer_
+ 		bit = RB_CTX_NORMAL;
+ 	else
+ 		bit = pc & NMI_MASK ? RB_CTX_NMI :
+-			pc & HARDIRQ_MASK ? RB_CTX_IRQ :
+-			pc & SOFTIRQ_OFFSET ? 2 : RB_CTX_SOFTIRQ;
++			pc & HARDIRQ_MASK ? RB_CTX_IRQ : RB_CTX_SOFTIRQ;
+ 
+ 	if (unlikely(val & (1 << bit)))
+ 		return 1;
diff --git a/kernel/patches-4.14.x-rt/0102-0045-ring-buffer-Add-nesting-for-adding-events-within-eve.patch b/kernel/patches-4.14.x-rt/0102-0045-ring-buffer-Add-nesting-for-adding-events-within-eve.patch
new file mode 100644
index 000000000..d7b349e10
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0102-0045-ring-buffer-Add-nesting-for-adding-events-within-eve.patch
@@ -0,0 +1,119 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Wed, 7 Feb 2018 17:26:32 -0500
+Subject: [PATCH 45/48] ring-buffer: Add nesting for adding events within
+ events
+
+The ring-buffer code has recusion protection in case tracing ends up tracing
+itself, the ring-buffer will detect that it was called at the same context
+(normal, softirq, interrupt or NMI), and not continue to record the event.
+
+With the histogram synthetic events, they are called while tracing another
+event at the same context. The recusion protection triggers because it
+detects tracing at the same context and stops it.
+
+Add ring_buffer_nest_start() and ring_buffer_nest_end() that will notify the
+ring buffer that a trace is about to happen within another trace and that it
+is intended, and not to trigger the recursion blocking.
+
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit f932ff1d98c482716b4b71a5d76b2aa3d65f66f0)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/ring_buffer.h |    3 ++
+ kernel/trace/ring_buffer.c  |   57 +++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 57 insertions(+), 3 deletions(-)
+
+--- a/include/linux/ring_buffer.h
++++ b/include/linux/ring_buffer.h
+@@ -120,6 +120,9 @@ int ring_buffer_unlock_commit(struct rin
+ int ring_buffer_write(struct ring_buffer *buffer,
+ 		      unsigned long length, void *data);
+ 
++void ring_buffer_nest_start(struct ring_buffer *buffer);
++void ring_buffer_nest_end(struct ring_buffer *buffer);
++
+ struct ring_buffer_event *
+ ring_buffer_peek(struct ring_buffer *buffer, int cpu, u64 *ts,
+ 		 unsigned long *lost_events);
+--- a/kernel/trace/ring_buffer.c
++++ b/kernel/trace/ring_buffer.c
+@@ -478,6 +478,7 @@ struct ring_buffer_per_cpu {
+ 	struct buffer_page		*reader_page;
+ 	unsigned long			lost_events;
+ 	unsigned long			last_overrun;
++	unsigned long			nest;
+ 	local_t				entries_bytes;
+ 	local_t				entries;
+ 	local_t				overrun;
+@@ -2632,10 +2633,10 @@ trace_recursive_lock(struct ring_buffer_
+ 		bit = pc & NMI_MASK ? RB_CTX_NMI :
+ 			pc & HARDIRQ_MASK ? RB_CTX_IRQ : RB_CTX_SOFTIRQ;
+ 
+-	if (unlikely(val & (1 << bit)))
++	if (unlikely(val & (1 << (bit + cpu_buffer->nest))))
+ 		return 1;
+ 
+-	val |= (1 << bit);
++	val |= (1 << (bit + cpu_buffer->nest));
+ 	cpu_buffer->current_context = val;
+ 
+ 	return 0;
+@@ -2644,7 +2645,57 @@ trace_recursive_lock(struct ring_buffer_
+ static __always_inline void
+ trace_recursive_unlock(struct ring_buffer_per_cpu *cpu_buffer)
+ {
+-	cpu_buffer->current_context &= cpu_buffer->current_context - 1;
++	cpu_buffer->current_context &=
++		cpu_buffer->current_context - (1 << cpu_buffer->nest);
++}
++
++/* The recursive locking above uses 4 bits */
++#define NESTED_BITS 4
++
++/**
++ * ring_buffer_nest_start - Allow to trace while nested
++ * @buffer: The ring buffer to modify
++ *
++ * The ring buffer has a safty mechanism to prevent recursion.
++ * But there may be a case where a trace needs to be done while
++ * tracing something else. In this case, calling this function
++ * will allow this function to nest within a currently active
++ * ring_buffer_lock_reserve().
++ *
++ * Call this function before calling another ring_buffer_lock_reserve() and
++ * call ring_buffer_nest_end() after the nested ring_buffer_unlock_commit().
++ */
++void ring_buffer_nest_start(struct ring_buffer *buffer)
++{
++	struct ring_buffer_per_cpu *cpu_buffer;
++	int cpu;
++
++	/* Enabled by ring_buffer_nest_end() */
++	preempt_disable_notrace();
++	cpu = raw_smp_processor_id();
++	cpu_buffer = buffer->buffers[cpu];
++	/* This is the shift value for the above recusive locking */
++	cpu_buffer->nest += NESTED_BITS;
++}
++
++/**
++ * ring_buffer_nest_end - Allow to trace while nested
++ * @buffer: The ring buffer to modify
++ *
++ * Must be called after ring_buffer_nest_start() and after the
++ * ring_buffer_unlock_commit().
++ */
++void ring_buffer_nest_end(struct ring_buffer *buffer)
++{
++	struct ring_buffer_per_cpu *cpu_buffer;
++	int cpu;
++
++	/* disabled by ring_buffer_nest_start() */
++	cpu = raw_smp_processor_id();
++	cpu_buffer = buffer->buffers[cpu];
++	/* This is the shift value for the above recusive locking */
++	cpu_buffer->nest -= NESTED_BITS;
++	preempt_enable_notrace();
+ }
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0103-0046-tracing-Use-the-ring-buffer-nesting-to-allow-synthet.patch b/kernel/patches-4.14.x-rt/0103-0046-tracing-Use-the-ring-buffer-nesting-to-allow-synthet.patch
new file mode 100644
index 000000000..006fb2afb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0103-0046-tracing-Use-the-ring-buffer-nesting-to-allow-synthet.patch
@@ -0,0 +1,54 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Wed, 7 Feb 2018 17:29:46 -0500
+Subject: [PATCH 46/48] tracing: Use the ring-buffer nesting to allow synthetic
+ events to be traced
+
+Synthetic events can be done within the recording of other events. Notify
+the ring buffer via ring_buffer_nest_start() and ring_buffer_nest_end() that
+this is intended and not to block it due to its recursion protection.
+
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 92c571543120ffed5e725f5b57b9de0b535e9d0a)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace_events_hist.c |   12 +++++++++++-
+ 1 file changed, 11 insertions(+), 1 deletion(-)
+
+--- a/kernel/trace/trace_events_hist.c
++++ b/kernel/trace/trace_events_hist.c
+@@ -640,6 +640,7 @@ static notrace void trace_event_raw_even
+ 	struct trace_event_file *trace_file = __data;
+ 	struct synth_trace_event *entry;
+ 	struct trace_event_buffer fbuffer;
++	struct ring_buffer *buffer;
+ 	struct synth_event *event;
+ 	unsigned int i, n_u64;
+ 	int fields_size = 0;
+@@ -651,10 +652,17 @@ static notrace void trace_event_raw_even
+ 
+ 	fields_size = event->n_u64 * sizeof(u64);
+ 
++	/*
++	 * Avoid ring buffer recursion detection, as this event
++	 * is being performed within another event.
++	 */
++	buffer = trace_file->tr->trace_buffer.buffer;
++	ring_buffer_nest_start(buffer);
++
+ 	entry = trace_event_buffer_reserve(&fbuffer, trace_file,
+ 					   sizeof(*entry) + fields_size);
+ 	if (!entry)
+-		return;
++		goto out;
+ 
+ 	for (i = 0, n_u64 = 0; i < event->n_fields; i++) {
+ 		if (event->fields[i]->is_string) {
+@@ -670,6 +678,8 @@ static notrace void trace_event_raw_even
+ 	}
+ 
+ 	trace_event_buffer_commit(&fbuffer);
++out:
++	ring_buffer_nest_end(buffer);
+ }
+ 
+ static void free_synth_event_print_fmt(struct trace_event_call *call)
diff --git a/kernel/patches-4.14.x-rt/0104-0047-tracing-Add-inter-event-blurb-to-HIST_TRIGGERS-confi.patch b/kernel/patches-4.14.x-rt/0104-0047-tracing-Add-inter-event-blurb-to-HIST_TRIGGERS-confi.patch
new file mode 100644
index 000000000..77f9db7c2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0104-0047-tracing-Add-inter-event-blurb-to-HIST_TRIGGERS-confi.patch
@@ -0,0 +1,33 @@
+From: Tom Zanussi <tom.zanussi@linux.intel.com>
+Date: Mon, 15 Jan 2018 20:52:10 -0600
+Subject: [PATCH 47/48] tracing: Add inter-event blurb to HIST_TRIGGERS config
+ option
+
+So that users know that inter-event tracing is supported as part of
+the HIST_TRIGGERS option, include text to that effect in the help
+text.
+
+Link: http://lkml.kernel.org/r/a38e24231d8d980be636b56d35814570acfd167a.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit 02942764c4fd12caeb29868822b7744fa91a9ad0)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/Kconfig |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/kernel/trace/Kconfig
++++ b/kernel/trace/Kconfig
+@@ -585,7 +585,10 @@ config HIST_TRIGGERS
+ 	  event activity as an initial guide for further investigation
+ 	  using more advanced tools.
+ 
+-	  See Documentation/trace/events.txt.
++	  Inter-event tracing of quantities such as latencies is also
++	  supported using hist triggers under this option.
++
++	  See Documentation/trace/histogram.txt.
+ 	  If in doubt, say N.
+ 
+ config MMIOTRACE_TEST
diff --git a/kernel/patches-4.14.x-rt/0105-0048-selftests-ftrace-Add-inter-event-hist-triggers-testc.patch b/kernel/patches-4.14.x-rt/0105-0048-selftests-ftrace-Add-inter-event-hist-triggers-testc.patch
new file mode 100644
index 000000000..98ac79d36
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0105-0048-selftests-ftrace-Add-inter-event-hist-triggers-testc.patch
@@ -0,0 +1,442 @@
+From: Rajvi Jingar <rajvi.jingar@intel.com>
+Date: Mon, 15 Jan 2018 20:52:11 -0600
+Subject: [PATCH 48/48] selftests: ftrace: Add inter-event hist triggers
+ testcases
+
+    This adds inter-event hist triggers testcases which covers following:
+     - create/remove synthetic event
+     - disable histogram for synthetic event
+     - extended error support
+     - field variable support
+     - histogram variables
+     - histogram trigger onmatch action
+     - histogram trigger onmax action
+     - histogram trigger onmatch-onmax action
+     - simple expression support
+     - combined histogram
+
+    Here is the test result.
+    === Ftrace unit tests ===
+    [1] event trigger - test extended error support [PASS]
+    [2] event trigger - test field variable support [PASS]
+    [3] event trigger - test inter-event combined histogram trigger [PASS]
+    [4] event trigger - test inter-event histogram trigger onmatch action   [PASS]
+    [5] event trigger - test inter-event histogram trigger onmatch-onmax action     [PASS]
+    [6] event trigger - test inter-event histogram trigger onmax action     [PASS]
+    [7] event trigger - test synthetic event create remove  [PASS]
+
+Link: http://lkml.kernel.org/r/e07ef1e72f7bf0f84dc87c9b736d6dc91b4b0b49.1516069914.git.tom.zanussi@linux.intel.com
+
+Signed-off-by: Rajvi Jingar <rajvi.jingar@intel.com>
+Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+(cherry picked from commit fb08b656dc9caee4a097bc4d8e050e2ead59bc24)
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ tools/testing/selftests/ftrace/test.d/functions                                                   |    7 +
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc       |   39 ++++++
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc       |   54 +++++++++
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc    |   58 ++++++++++
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc          |   50 ++++++++
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc    |   50 ++++++++
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc            |   48 ++++++++
+ tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc |   54 +++++++++
+ 8 files changed, 360 insertions(+)
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
+ create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
+
+--- a/tools/testing/selftests/ftrace/test.d/functions
++++ b/tools/testing/selftests/ftrace/test.d/functions
+@@ -55,6 +55,13 @@ disable_events() {
+     echo 0 > events/enable
+ }
+ 
++clear_synthetic_events() { # reset all current synthetic events
++    grep -v ^# synthetic_events |
++    while read line; do
++        echo "!$line" >> synthetic_events
++    done
++}
++
+ initialize_ftrace() { # Reset ftrace to initial-state
+ # As the initial state, ftrace will be set to nop tracer,
+ # no events, no triggers, no filters, no function filters,
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-extended-error-support.tc
+@@ -0,0 +1,39 @@
++#!/bin/sh
++# description: event trigger - test extended error support
++
++
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++reset_tracer
++do_reset
++
++echo "Test extended error support"
++echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
++echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_wakeup/trigger &>/dev/null
++if ! grep -q "ERROR:" events/sched/sched_wakeup/hist; then
++    fail "Failed to generate extended error in histogram"
++fi
++
++do_reset
++
++exit 0
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-field-variable-support.tc
+@@ -0,0 +1,54 @@
++#!/bin/sh
++# description: event trigger - test field variable support
++
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++clear_synthetic_events
++reset_tracer
++do_reset
++
++echo "Test field variable support"
++
++echo 'wakeup_latency u64 lat; pid_t pid; int prio; char comm[16]' > synthetic_events
++echo 'hist:keys=comm:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_waking/trigger
++echo 'hist:keys=next_comm:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,next_pid,sched.sched_waking.prio,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
++echo 'hist:keys=pid,prio,comm:vals=lat:sort=pid,prio' > events/synthetic/wakeup_latency/trigger
++
++ping localhost -c 3
++if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
++    fail "Failed to create inter-event histogram"
++fi
++
++if ! grep -q "synthetic_prio=prio" events/sched/sched_waking/hist; then
++    fail "Failed to create histogram with field variable"
++fi
++
++echo '!hist:keys=next_comm:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).wakeup_latency($wakeup_lat,next_pid,sched.sched_waking.prio,next_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
++
++if grep -q "synthetic_prio=prio" events/sched/sched_waking/hist; then
++    fail "Failed to remove histogram with field variable"
++fi
++
++do_reset
++
++exit 0
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-inter-event-combined-hist.tc
+@@ -0,0 +1,58 @@
++#!/bin/sh
++# description: event trigger - test inter-event combined histogram trigger
++
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++reset_tracer
++do_reset
++clear_synthetic_events
++
++echo "Test create synthetic event"
++
++echo 'waking_latency  u64 lat pid_t pid' > synthetic_events
++if [ ! -d events/synthetic/waking_latency ]; then
++    fail "Failed to create waking_latency synthetic event"
++fi
++
++echo "Test combined histogram"
++
++echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_waking/trigger
++echo 'hist:keys=pid:waking_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_waking).waking_latency($waking_lat,pid) if comm=="ping"' > events/sched/sched_wakeup/trigger
++echo 'hist:keys=pid,lat:sort=pid,lat' > events/synthetic/waking_latency/trigger
++
++echo 'wakeup_latency u64 lat pid_t pid' >> synthetic_events
++echo 'hist:keys=pid:ts1=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_wakeup/trigger
++echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts1:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid) if next_comm=="ping"' > events/sched/sched_switch/trigger
++
++echo 'waking+wakeup_latency u64 lat; pid_t pid' >> synthetic_events
++echo 'hist:keys=pid,lat:sort=pid,lat:ww_lat=$waking_lat+$wakeup_lat:onmatch(synthetic.wakeup_latency).waking+wakeup_latency($ww_lat,pid)' >> events/synthetic/wakeup_latency/trigger
++echo 'hist:keys=pid,lat:sort=pid,lat' >> events/synthetic/waking+wakeup_latency/trigger
++
++ping localhost -c 3
++if ! grep -q "pid:" events/synthetic/waking+wakeup_latency/hist; then
++    fail "Failed to create combined histogram"
++fi
++
++do_reset
++
++exit 0
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-action-hist.tc
+@@ -0,0 +1,50 @@
++#!/bin/sh
++# description: event trigger - test inter-event histogram trigger onmatch action
++
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++clear_synthetic_events
++reset_tracer
++do_reset
++
++echo "Test create synthetic event"
++
++echo 'wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
++if [ ! -d events/synthetic/wakeup_latency ]; then
++    fail "Failed to create wakeup_latency synthetic event"
++fi
++
++echo "Test create histogram for synthetic event"
++echo "Test histogram variables,simple expression support and onmatch action"
++
++echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
++echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm) if next_comm=="ping"' > events/sched/sched_switch/trigger
++echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
++ping localhost -c 5
++if ! grep -q "ping" events/synthetic/wakeup_latency/hist; then
++    fail "Failed to create onmatch action inter-event histogram"
++fi
++
++do_reset
++
++exit 0
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmatch-onmax-action-hist.tc
+@@ -0,0 +1,50 @@
++#!/bin/sh
++# description: event trigger - test inter-event histogram trigger onmatch-onmax action
++
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++clear_synthetic_events
++reset_tracer
++do_reset
++
++echo "Test create synthetic event"
++
++echo 'wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
++if [ ! -d events/synthetic/wakeup_latency ]; then
++    fail "Failed to create wakeup_latency synthetic event"
++fi
++
++echo "Test create histogram for synthetic event"
++echo "Test histogram variables,simple expression support and onmatch-onmax action"
++
++echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' > events/sched/sched_wakeup/trigger
++echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmatch(sched.sched_wakeup).wakeup_latency($wakeup_lat,next_pid,next_comm):onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
++echo 'hist:keys=comm,pid,lat:wakeup_lat=lat:sort=lat' > events/synthetic/wakeup_latency/trigger
++ping localhost -c 5
++if [ ! grep -q "ping" events/synthetic/wakeup_latency/hist -o ! grep -q "max:" events/sched/sched_switch/hist]; then
++    fail "Failed to create onmatch-onmax action inter-event histogram"
++fi
++
++do_reset
++
++exit 0
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onmax-action-hist.tc
+@@ -0,0 +1,48 @@
++#!/bin/sh
++# description: event trigger - test inter-event histogram trigger onmax action
++
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++clear_synthetic_events
++reset_tracer
++do_reset
++
++echo "Test create synthetic event"
++
++echo 'wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
++if [ ! -d events/synthetic/wakeup_latency ]; then
++    fail "Failed to create wakeup_latency synthetic event"
++fi
++
++echo "Test onmax action"
++
++echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="ping"' >> events/sched/sched_waking/trigger
++echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0:onmax($wakeup_lat).save(next_comm,prev_pid,prev_prio,prev_comm) if next_comm=="ping"' >> events/sched/sched_switch/trigger
++ping localhost -c 3
++if ! grep -q "max:" events/sched/sched_switch/hist; then
++    fail "Failed to create onmax action inter-event histogram"
++fi
++
++do_reset
++
++exit 0
+--- /dev/null
++++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-synthetic-event-createremove.tc
+@@ -0,0 +1,54 @@
++#!/bin/sh
++# description: event trigger - test synthetic event create remove
++do_reset() {
++    reset_trigger
++    echo > set_event
++    clear_trace
++}
++
++fail() { #msg
++    do_reset
++    echo $1
++    exit_fail
++}
++
++if [ ! -f set_event ]; then
++    echo "event tracing is not supported"
++    exit_unsupported
++fi
++
++if [ ! -f synthetic_events ]; then
++    echo "synthetic event is not supported"
++    exit_unsupported
++fi
++
++clear_synthetic_events
++reset_tracer
++do_reset
++
++echo "Test create synthetic event"
++
++echo 'wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
++if [ ! -d events/synthetic/wakeup_latency ]; then
++    fail "Failed to create wakeup_latency synthetic event"
++fi
++
++reset_trigger
++
++echo "Test create synthetic event with an error"
++echo 'wakeup_latency  u64 lat pid_t pid char' > synthetic_events > /dev/null
++if [ -d events/synthetic/wakeup_latency ]; then
++    fail "Created wakeup_latency synthetic event with an invalid format"
++fi
++
++reset_trigger
++
++echo "Test remove synthetic event"
++echo '!wakeup_latency  u64 lat pid_t pid char comm[16]' > synthetic_events
++if [ -d events/synthetic/wakeup_latency ]; then
++    fail "Failed to delete wakeup_latency synthetic event"
++fi
++
++do_reset
++
++exit 0
diff --git a/kernel/patches-4.14.x-rt/0106-block-shorten-interrupt-disabled-regions.patch b/kernel/patches-4.14.x-rt/0106-block-shorten-interrupt-disabled-regions.patch
new file mode 100644
index 000000000..bc6b2a544
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0106-block-shorten-interrupt-disabled-regions.patch
@@ -0,0 +1,96 @@
+Subject: block: Shorten interrupt disabled regions
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 22 Jun 2011 19:47:02 +0200
+
+Moving the blk_sched_flush_plug() call out of the interrupt/preempt
+disabled region in the scheduler allows us to replace
+local_irq_save/restore(flags) by local_irq_disable/enable() in
+blk_flush_plug().
+
+Now instead of doing this we disable interrupts explicitely when we
+lock the request_queue and reenable them when we drop the lock. That
+allows interrupts to be handled when the plug list contains requests
+for more than one queue.
+
+Aside of that this change makes the scope of the irq disabled region
+more obvious. The current code confused the hell out of me when
+looking at:
+
+ local_irq_save(flags);
+   spin_lock(q->queue_lock);
+   ...
+   queue_unplugged(q...);
+     scsi_request_fn();
+       spin_unlock(q->queue_lock);
+       spin_lock(shost->host_lock);
+       spin_unlock_irq(shost->host_lock);
+
+-------------------^^^ ????
+
+       spin_lock_irq(q->queue_lock);
+       spin_unlock(q->lock);
+ local_irq_restore(flags);
+
+Also add a comment to __blk_run_queue() documenting that
+q->request_fn() can drop q->queue_lock and reenable interrupts, but
+must return with q->queue_lock held and interrupts disabled.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Tejun Heo <tj@kernel.org>
+Cc: Jens Axboe <axboe@kernel.dk>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Link: http://lkml.kernel.org/r/20110622174919.025446432@linutronix.de
+---
+ block/blk-core.c |   12 ++----------
+ 1 file changed, 2 insertions(+), 10 deletions(-)
+
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -3291,7 +3291,7 @@ static void queue_unplugged(struct reque
+ 		blk_run_queue_async(q);
+ 	else
+ 		__blk_run_queue(q);
+-	spin_unlock(q->queue_lock);
++	spin_unlock_irq(q->queue_lock);
+ }
+ 
+ static void flush_plug_callbacks(struct blk_plug *plug, bool from_schedule)
+@@ -3339,7 +3339,6 @@ EXPORT_SYMBOL(blk_check_plugged);
+ void blk_flush_plug_list(struct blk_plug *plug, bool from_schedule)
+ {
+ 	struct request_queue *q;
+-	unsigned long flags;
+ 	struct request *rq;
+ 	LIST_HEAD(list);
+ 	unsigned int depth;
+@@ -3359,11 +3358,6 @@ void blk_flush_plug_list(struct blk_plug
+ 	q = NULL;
+ 	depth = 0;
+ 
+-	/*
+-	 * Save and disable interrupts here, to avoid doing it for every
+-	 * queue lock we have to take.
+-	 */
+-	local_irq_save(flags);
+ 	while (!list_empty(&list)) {
+ 		rq = list_entry_rq(list.next);
+ 		list_del_init(&rq->queuelist);
+@@ -3376,7 +3370,7 @@ void blk_flush_plug_list(struct blk_plug
+ 				queue_unplugged(q, depth, from_schedule);
+ 			q = rq->q;
+ 			depth = 0;
+-			spin_lock(q->queue_lock);
++			spin_lock_irq(q->queue_lock);
+ 		}
+ 
+ 		/*
+@@ -3403,8 +3397,6 @@ void blk_flush_plug_list(struct blk_plug
+ 	 */
+ 	if (q)
+ 		queue_unplugged(q, depth, from_schedule);
+-
+-	local_irq_restore(flags);
+ }
+ 
+ void blk_finish_plug(struct blk_plug *plug)
diff --git a/kernel/patches-4.14.x-rt/0107-timekeeping-split-jiffies-lock.patch b/kernel/patches-4.14.x-rt/0107-timekeeping-split-jiffies-lock.patch
new file mode 100644
index 000000000..4cb9ceef7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0107-timekeeping-split-jiffies-lock.patch
@@ -0,0 +1,156 @@
+Subject: timekeeping: Split jiffies seqlock
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 14 Feb 2013 22:36:59 +0100
+
+Replace jiffies_lock seqlock with a simple seqcounter and a rawlock so
+it can be taken in atomic context on RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/time/jiffies.c     |    7 ++++---
+ kernel/time/tick-common.c |   10 ++++++----
+ kernel/time/tick-sched.c  |   19 ++++++++++++-------
+ kernel/time/timekeeping.c |    6 ++++--
+ kernel/time/timekeeping.h |    3 ++-
+ 5 files changed, 28 insertions(+), 17 deletions(-)
+
+--- a/kernel/time/jiffies.c
++++ b/kernel/time/jiffies.c
+@@ -74,7 +74,8 @@ static struct clocksource clocksource_ji
+ 	.max_cycles	= 10,
+ };
+ 
+-__cacheline_aligned_in_smp DEFINE_SEQLOCK(jiffies_lock);
++__cacheline_aligned_in_smp DEFINE_RAW_SPINLOCK(jiffies_lock);
++__cacheline_aligned_in_smp seqcount_t jiffies_seq;
+ 
+ #if (BITS_PER_LONG < 64)
+ u64 get_jiffies_64(void)
+@@ -83,9 +84,9 @@ u64 get_jiffies_64(void)
+ 	u64 ret;
+ 
+ 	do {
+-		seq = read_seqbegin(&jiffies_lock);
++		seq = read_seqcount_begin(&jiffies_seq);
+ 		ret = jiffies_64;
+-	} while (read_seqretry(&jiffies_lock, seq));
++	} while (read_seqcount_retry(&jiffies_seq, seq));
+ 	return ret;
+ }
+ EXPORT_SYMBOL(get_jiffies_64);
+--- 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) {
+-		write_seqlock(&jiffies_lock);
++		raw_spin_lock(&jiffies_lock);
++		write_seqcount_begin(&jiffies_seq);
+ 
+ 		/* Keep track of the next tick event */
+ 		tick_next_period = ktime_add(tick_next_period, tick_period);
+ 
+ 		do_timer(1);
+-		write_sequnlock(&jiffies_lock);
++		write_seqcount_end(&jiffies_seq);
++		raw_spin_unlock(&jiffies_lock);
+ 		update_wall_time();
+ 	}
+ 
+@@ -157,9 +159,9 @@ void tick_setup_periodic(struct clock_ev
+ 		ktime_t next;
+ 
+ 		do {
+-			seq = read_seqbegin(&jiffies_lock);
++			seq = read_seqcount_begin(&jiffies_seq);
+ 			next = tick_next_period;
+-		} while (read_seqretry(&jiffies_lock, seq));
++		} while (read_seqcount_retry(&jiffies_seq, seq));
+ 
+ 		clockevents_switch_state(dev, CLOCK_EVT_STATE_ONESHOT);
+ 
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -66,7 +66,8 @@ static void tick_do_update_jiffies64(kti
+ 		return;
+ 
+ 	/* Reevaluate with jiffies_lock held */
+-	write_seqlock(&jiffies_lock);
++	raw_spin_lock(&jiffies_lock);
++	write_seqcount_begin(&jiffies_seq);
+ 
+ 	delta = ktime_sub(now, last_jiffies_update);
+ 	if (delta >= tick_period) {
+@@ -89,10 +90,12 @@ static void tick_do_update_jiffies64(kti
+ 		/* Keep the tick_next_period variable up to date */
+ 		tick_next_period = ktime_add(last_jiffies_update, tick_period);
+ 	} else {
+-		write_sequnlock(&jiffies_lock);
++		write_seqcount_end(&jiffies_seq);
++		raw_spin_unlock(&jiffies_lock);
+ 		return;
+ 	}
+-	write_sequnlock(&jiffies_lock);
++	write_seqcount_end(&jiffies_seq);
++	raw_spin_unlock(&jiffies_lock);
+ 	update_wall_time();
+ }
+ 
+@@ -103,12 +106,14 @@ static ktime_t tick_init_jiffy_update(vo
+ {
+ 	ktime_t period;
+ 
+-	write_seqlock(&jiffies_lock);
++	raw_spin_lock(&jiffies_lock);
++	write_seqcount_begin(&jiffies_seq);
+ 	/* Did we start the jiffies update yet ? */
+ 	if (last_jiffies_update == 0)
+ 		last_jiffies_update = tick_next_period;
+ 	period = last_jiffies_update;
+-	write_sequnlock(&jiffies_lock);
++	write_seqcount_end(&jiffies_seq);
++	raw_spin_unlock(&jiffies_lock);
+ 	return period;
+ }
+ 
+@@ -689,10 +694,10 @@ static ktime_t tick_nohz_stop_sched_tick
+ 
+ 	/* Read jiffies and the time when jiffies were updated last */
+ 	do {
+-		seq = read_seqbegin(&jiffies_lock);
++		seq = read_seqcount_begin(&jiffies_seq);
+ 		basemono = last_jiffies_update;
+ 		basejiff = jiffies;
+-	} while (read_seqretry(&jiffies_lock, seq));
++	} while (read_seqcount_retry(&jiffies_seq, seq));
+ 	ts->last_jiffies = basejiff;
+ 
+ 	/*
+--- a/kernel/time/timekeeping.c
++++ b/kernel/time/timekeeping.c
+@@ -2326,8 +2326,10 @@ EXPORT_SYMBOL(hardpps);
+  */
+ void xtime_update(unsigned long ticks)
+ {
+-	write_seqlock(&jiffies_lock);
++	raw_spin_lock(&jiffies_lock);
++	write_seqcount_begin(&jiffies_seq);
+ 	do_timer(ticks);
+-	write_sequnlock(&jiffies_lock);
++	write_seqcount_end(&jiffies_seq);
++	raw_spin_unlock(&jiffies_lock);
+ 	update_wall_time();
+ }
+--- a/kernel/time/timekeeping.h
++++ b/kernel/time/timekeeping.h
+@@ -18,7 +18,8 @@ extern void timekeeping_resume(void);
+ extern void do_timer(unsigned long ticks);
+ extern void update_wall_time(void);
+ 
+-extern seqlock_t jiffies_lock;
++extern raw_spinlock_t jiffies_lock;
++extern seqcount_t jiffies_seq;
+ 
+ #define CS_NAME_LEN	32
+ 
diff --git a/kernel/patches-4.14.x-rt/0108-tracing-account-for-preempt-off-in-preempt_schedule.patch b/kernel/patches-4.14.x-rt/0108-tracing-account-for-preempt-off-in-preempt_schedule.patch
new file mode 100644
index 000000000..36d871271
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0108-tracing-account-for-preempt-off-in-preempt_schedule.patch
@@ -0,0 +1,46 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Thu, 29 Sep 2011 12:24:30 -0500
+Subject: tracing: Account for preempt off in preempt_schedule()
+
+The preempt_schedule() uses the preempt_disable_notrace() version
+because it can cause infinite recursion by the function tracer as
+the function tracer uses preempt_enable_notrace() which may call
+back into the preempt_schedule() code as the NEED_RESCHED is still
+set and the PREEMPT_ACTIVE has not been set yet.
+
+See commit: d1f74e20b5b064a130cd0743a256c2d3cfe84010 that made this
+change.
+
+The preemptoff and preemptirqsoff latency tracers require the first
+and last preempt count modifiers to enable tracing. But this skips
+the checks. Since we can not convert them back to the non notrace
+version, we can use the idle() hooks for the latency tracers here.
+That is, the start/stop_critical_timings() works well to manually
+start and stop the latency tracer for preempt off timings.
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Clark Williams <williams@redhat.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/sched/core.c |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -3604,7 +3604,16 @@ asmlinkage __visible void __sched notrac
+ 		 * an infinite recursion.
+ 		 */
+ 		prev_ctx = exception_enter();
++		/*
++		 * The add/subtract must not be traced by the function
++		 * tracer. But we still want to account for the
++		 * preempt off latency tracer. Since the _notrace versions
++		 * of add/subtract skip the accounting for latency tracer
++		 * we must force it manually.
++		 */
++		start_critical_timings();
+ 		__schedule(true);
++		stop_critical_timings();
+ 		exception_exit(prev_ctx);
+ 
+ 		preempt_latency_stop(1);
diff --git a/kernel/patches-4.14.x-rt/0109-signal-revert-ptrace-preempt-magic.patch b/kernel/patches-4.14.x-rt/0109-signal-revert-ptrace-preempt-magic.patch
new file mode 100644
index 000000000..6554693bb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0109-signal-revert-ptrace-preempt-magic.patch
@@ -0,0 +1,31 @@
+Subject: signal: Revert ptrace preempt magic
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 21 Sep 2011 19:57:12 +0200
+
+Upstream commit '53da1d9456fe7f8 fix ptrace slowness' is nothing more
+than a bandaid around the ptrace design trainwreck. It's not a
+correctness issue, it's merily a cosmetic bandaid.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/signal.c |    8 --------
+ 1 file changed, 8 deletions(-)
+
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1876,15 +1876,7 @@ static void ptrace_stop(int exit_code, i
+ 		if (gstop_done && ptrace_reparented(current))
+ 			do_notify_parent_cldstop(current, false, why);
+ 
+-		/*
+-		 * Don't want to allow preemption here, because
+-		 * sys_ptrace() needs this task to be inactive.
+-		 *
+-		 * XXX: implement read_unlock_no_resched().
+-		 */
+-		preempt_disable();
+ 		read_unlock(&tasklist_lock);
+-		preempt_enable_no_resched();
+ 		freezable_schedule();
+ 	} else {
+ 		/*
diff --git a/kernel/patches-4.14.x-rt/0110-arm-convert-boot-lock-to-raw.patch b/kernel/patches-4.14.x-rt/0110-arm-convert-boot-lock-to-raw.patch
new file mode 100644
index 000000000..b1d6c1caa
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0110-arm-convert-boot-lock-to-raw.patch
@@ -0,0 +1,407 @@
+From: Frank Rowand <frank.rowand@am.sony.com>
+Date: Mon, 19 Sep 2011 14:51:14 -0700
+Subject: arm: Convert arm boot_lock to raw
+
+The arm boot_lock is used by the secondary processor startup code.  The locking
+task is the idle thread, which has idle->sched_class == &idle_sched_class.
+idle_sched_class->enqueue_task == NULL, so if the idle task blocks on the
+lock, the attempt to wake it when the lock becomes available will fail:
+
+try_to_wake_up()
+   ...
+      activate_task()
+         enqueue_task()
+            p->sched_class->enqueue_task(rq, p, flags)
+
+Fix by converting boot_lock to a raw spin lock.
+
+Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
+Link: http://lkml.kernel.org/r/4E77B952.3010606@am.sony.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/arm/mach-exynos/platsmp.c    |   12 ++++++------
+ arch/arm/mach-hisi/platmcpm.c     |   22 +++++++++++-----------
+ arch/arm/mach-omap2/omap-smp.c    |   10 +++++-----
+ arch/arm/mach-prima2/platsmp.c    |   10 +++++-----
+ arch/arm/mach-qcom/platsmp.c      |   10 +++++-----
+ arch/arm/mach-spear/platsmp.c     |   10 +++++-----
+ arch/arm/mach-sti/platsmp.c       |   10 +++++-----
+ arch/arm/plat-versatile/platsmp.c |   10 +++++-----
+ 8 files changed, 47 insertions(+), 47 deletions(-)
+
+--- 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);
+ }
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ static void exynos_secondary_init(unsigned int cpu)
+ {
+@@ -242,8 +242,8 @@ static void exynos_secondary_init(unsign
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ int exynos_set_boot_addr(u32 core_id, unsigned long boot_addr)
+@@ -307,7 +307,7 @@ static int exynos_boot_secondary(unsigne
+ 	 * Set synchronisation state between this boot processor
+ 	 * and the secondary one
+ 	 */
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * The secondary processor is waiting to be released from
+@@ -334,7 +334,7 @@ static int exynos_boot_secondary(unsigne
+ 
+ 		if (timeout == 0) {
+ 			printk(KERN_ERR "cpu1 power enable failed");
+-			spin_unlock(&boot_lock);
++			raw_spin_unlock(&boot_lock);
+ 			return -ETIMEDOUT;
+ 		}
+ 	}
+@@ -380,7 +380,7 @@ static int exynos_boot_secondary(unsigne
+ 	 * calibrations, then wait for it to finish
+ 	 */
+ fail:
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return pen_release != -1 ? ret : 0;
+ }
+--- a/arch/arm/mach-hisi/platmcpm.c
++++ b/arch/arm/mach-hisi/platmcpm.c
+@@ -61,7 +61,7 @@
+ 
+ static void __iomem *sysctrl, *fabric;
+ static int hip04_cpu_table[HIP04_MAX_CLUSTERS][HIP04_MAX_CPUS_PER_CLUSTER];
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ static u32 fabric_phys_addr;
+ /*
+  * [0]: bootwrapper physical address
+@@ -113,7 +113,7 @@ static int hip04_boot_secondary(unsigned
+ 	if (cluster >= HIP04_MAX_CLUSTERS || cpu >= HIP04_MAX_CPUS_PER_CLUSTER)
+ 		return -EINVAL;
+ 
+-	spin_lock_irq(&boot_lock);
++	raw_spin_lock_irq(&boot_lock);
+ 
+ 	if (hip04_cpu_table[cluster][cpu])
+ 		goto out;
+@@ -147,7 +147,7 @@ static int hip04_boot_secondary(unsigned
+ 
+ out:
+ 	hip04_cpu_table[cluster][cpu]++;
+-	spin_unlock_irq(&boot_lock);
++	raw_spin_unlock_irq(&boot_lock);
+ 
+ 	return 0;
+ }
+@@ -162,11 +162,11 @@ static void hip04_cpu_die(unsigned int l
+ 	cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+ 	cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+ 
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 	hip04_cpu_table[cluster][cpu]--;
+ 	if (hip04_cpu_table[cluster][cpu] == 1) {
+ 		/* A power_up request went ahead of us. */
+-		spin_unlock(&boot_lock);
++		raw_spin_unlock(&boot_lock);
+ 		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 @@ static void hip04_cpu_die(unsigned int l
+ 	}
+ 
+ 	last_man = hip04_cluster_is_down(cluster);
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 	if (last_man) {
+ 		/* Since it's Cortex A15, disable L2 prefetching. */
+ 		asm volatile(
+@@ -203,7 +203,7 @@ static int hip04_cpu_kill(unsigned int l
+ 	       cpu >= HIP04_MAX_CPUS_PER_CLUSTER);
+ 
+ 	count = TIMEOUT_MSEC / POLL_MSEC;
+-	spin_lock_irq(&boot_lock);
++	raw_spin_lock_irq(&boot_lock);
+ 	for (tries = 0; tries < count; tries++) {
+ 		if (hip04_cpu_table[cluster][cpu])
+ 			goto err;
+@@ -211,10 +211,10 @@ static int hip04_cpu_kill(unsigned int l
+ 		data = readl_relaxed(sysctrl + SC_CPU_RESET_STATUS(cluster));
+ 		if (data & CORE_WFI_STATUS(cpu))
+ 			break;
+-		spin_unlock_irq(&boot_lock);
++		raw_spin_unlock_irq(&boot_lock);
+ 		/* Wait for clean L2 when the whole cluster is down. */
+ 		msleep(POLL_MSEC);
+-		spin_lock_irq(&boot_lock);
++		raw_spin_lock_irq(&boot_lock);
+ 	}
+ 	if (tries >= count)
+ 		goto err;
+@@ -231,10 +231,10 @@ static int hip04_cpu_kill(unsigned int l
+ 		goto err;
+ 	if (hip04_cluster_is_down(cluster))
+ 		hip04_set_snoop_filter(cluster, 0);
+-	spin_unlock_irq(&boot_lock);
++	raw_spin_unlock_irq(&boot_lock);
+ 	return 1;
+ err:
+-	spin_unlock_irq(&boot_lock);
++	raw_spin_unlock_irq(&boot_lock);
+ 	return 0;
+ }
+ #endif
+--- a/arch/arm/mach-omap2/omap-smp.c
++++ b/arch/arm/mach-omap2/omap-smp.c
+@@ -69,7 +69,7 @@ static const struct omap_smp_config omap
+ 	.startup_addr = omap5_secondary_startup,
+ };
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ void __iomem *omap4_get_scu_base(void)
+ {
+@@ -136,8 +136,8 @@ static void omap4_secondary_init(unsigne
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -150,7 +150,7 @@ static int omap4_boot_secondary(unsigned
+ 	 * Set synchronisation state between this boot processor
+ 	 * and the secondary one
+ 	 */
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * Update the AuxCoreBoot0 with boot state for secondary core.
+@@ -229,7 +229,7 @@ static int omap4_boot_secondary(unsigned
+ 	 * Now the secondary core is starting up let it run its
+ 	 * calibrations, then wait for it to finish
+ 	 */
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return 0;
+ }
+--- a/arch/arm/mach-prima2/platsmp.c
++++ b/arch/arm/mach-prima2/platsmp.c
+@@ -22,7 +22,7 @@
+ 
+ static void __iomem *clk_base;
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ static void sirfsoc_secondary_init(unsigned int cpu)
+ {
+@@ -36,8 +36,8 @@ static void sirfsoc_secondary_init(unsig
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ static const struct of_device_id clk_ids[]  = {
+@@ -75,7 +75,7 @@ static int sirfsoc_boot_secondary(unsign
+ 	/* make sure write buffer is drained */
+ 	mb();
+ 
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * The secondary processor is waiting to be released from
+@@ -107,7 +107,7 @@ static int sirfsoc_boot_secondary(unsign
+ 	 * now the secondary core is starting up let it run its
+ 	 * calibrations, then wait for it to finish
+ 	 */
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return pen_release != -1 ? -ENOSYS : 0;
+ }
+--- a/arch/arm/mach-qcom/platsmp.c
++++ b/arch/arm/mach-qcom/platsmp.c
+@@ -46,7 +46,7 @@
+ 
+ extern void secondary_startup_arm(void);
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+ static void qcom_cpu_die(unsigned int cpu)
+@@ -60,8 +60,8 @@ static void qcom_secondary_init(unsigned
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ static int scss_release_secondary(unsigned int cpu)
+@@ -284,7 +284,7 @@ static int qcom_boot_secondary(unsigned
+ 	 * set synchronisation state between this boot processor
+ 	 * and the secondary one
+ 	 */
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * Send the secondary CPU a soft interrupt, thereby causing
+@@ -297,7 +297,7 @@ static int qcom_boot_secondary(unsigned
+ 	 * now the secondary core is starting up let it run its
+ 	 * calibrations, then wait for it to finish
+ 	 */
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return ret;
+ }
+--- 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);
+ }
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ static void __iomem *scu_base = IOMEM(VA_SCU_BASE);
+ 
+@@ -47,8 +47,8 @@ static void spear13xx_secondary_init(uns
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ static int spear13xx_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -59,7 +59,7 @@ static int spear13xx_boot_secondary(unsi
+ 	 * set synchronisation state between this boot processor
+ 	 * and the secondary one
+ 	 */
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * The secondary processor is waiting to be released from
+@@ -84,7 +84,7 @@ static int spear13xx_boot_secondary(unsi
+ 	 * now the secondary core is starting up let it run its
+ 	 * calibrations, then wait for it to finish
+ 	 */
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return pen_release != -1 ? -ENOSYS : 0;
+ }
+--- 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);
+ }
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ static void sti_secondary_init(unsigned int cpu)
+ {
+@@ -48,8 +48,8 @@ static void sti_secondary_init(unsigned
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ static int sti_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -60,7 +60,7 @@ static int sti_boot_secondary(unsigned i
+ 	 * set synchronisation state between this boot processor
+ 	 * and the secondary one
+ 	 */
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * The secondary processor is waiting to be released from
+@@ -91,7 +91,7 @@ static int sti_boot_secondary(unsigned i
+ 	 * now the secondary core is starting up let it run its
+ 	 * calibrations, then wait for it to finish
+ 	 */
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return pen_release != -1 ? -ENOSYS : 0;
+ }
+--- 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);
+ }
+ 
+-static DEFINE_SPINLOCK(boot_lock);
++static DEFINE_RAW_SPINLOCK(boot_lock);
+ 
+ void versatile_secondary_init(unsigned int cpu)
+ {
+@@ -45,8 +45,8 @@ void versatile_secondary_init(unsigned i
+ 	/*
+ 	 * Synchronise with the boot thread.
+ 	 */
+-	spin_lock(&boot_lock);
+-	spin_unlock(&boot_lock);
++	raw_spin_lock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ }
+ 
+ int versatile_boot_secondary(unsigned int cpu, struct task_struct *idle)
+@@ -57,7 +57,7 @@ int versatile_boot_secondary(unsigned in
+ 	 * Set synchronisation state between this boot processor
+ 	 * and the secondary one
+ 	 */
+-	spin_lock(&boot_lock);
++	raw_spin_lock(&boot_lock);
+ 
+ 	/*
+ 	 * This is really belt and braces; we hold unintended secondary
+@@ -87,7 +87,7 @@ int versatile_boot_secondary(unsigned in
+ 	 * now the secondary core is starting up let it run its
+ 	 * calibrations, then wait for it to finish
+ 	 */
+-	spin_unlock(&boot_lock);
++	raw_spin_unlock(&boot_lock);
+ 
+ 	return pen_release != -1 ? -ENOSYS : 0;
+ }
diff --git a/kernel/patches-4.14.x-rt/0111-arm-kprobe-replace-patch_lock-to-raw-lock.patch b/kernel/patches-4.14.x-rt/0111-arm-kprobe-replace-patch_lock-to-raw-lock.patch
new file mode 100644
index 000000000..9a0fa6413
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0111-arm-kprobe-replace-patch_lock-to-raw-lock.patch
@@ -0,0 +1,69 @@
+From: Yang Shi <yang.shi@linaro.org>
+Date: Thu, 10 Nov 2016 16:17:55 -0800
+Subject: [PATCH] arm: kprobe: replace patch_lock to raw lock
+
+When running kprobe on -rt kernel, the below bug is caught:
+
+BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:931
+in_atomic(): 1, irqs_disabled(): 128, pid: 14, name: migration/0
+INFO: lockdep is turned off.
+irq event stamp: 238
+hardirqs last enabled at (237): [<80b5aecc>] _raw_spin_unlock_irqrestore+0x88/0x90
+hardirqs last disabled at (238): [<80b56d88>] __schedule+0xec/0x94c
+softirqs last enabled at (0): [<80225584>] copy_process.part.5+0x30c/0x1994
+softirqs last disabled at (0): [< (null)>] (null)
+Preemption disabled at:[<802f2b98>] cpu_stopper_thread+0xc0/0x140
+
+CPU: 0 PID: 14 Comm: migration/0 Tainted: G O 4.8.3-rt2 #1
+Hardware name: Freescale LS1021A
+[<80212e7c>] (unwind_backtrace) from [<8020cd2c>] (show_stack+0x20/0x24)
+[<8020cd2c>] (show_stack) from [<80689e14>] (dump_stack+0xa0/0xcc)
+[<80689e14>] (dump_stack) from [<8025a43c>] (___might_sleep+0x1b8/0x2a4)
+[<8025a43c>] (___might_sleep) from [<80b5b324>] (rt_spin_lock+0x34/0x74)
+[<80b5b324>] (rt_spin_lock) from [<80b5c31c>] (__patch_text_real+0x70/0xe8)
+[<80b5c31c>] (__patch_text_real) from [<80b5c3ac>] (patch_text_stop_machine+0x18/0x20)
+[<80b5c3ac>] (patch_text_stop_machine) from [<802f2920>] (multi_cpu_stop+0xfc/0x134)
+[<802f2920>] (multi_cpu_stop) from [<802f2ba0>] (cpu_stopper_thread+0xc8/0x140)
+[<802f2ba0>] (cpu_stopper_thread) from [<802563a4>] (smpboot_thread_fn+0x1a4/0x354)
+[<802563a4>] (smpboot_thread_fn) from [<80251d38>] (kthread+0x104/0x11c)
+[<80251d38>] (kthread) from [<80207f70>] (ret_from_fork+0x14/0x24)
+
+Since patch_text_stop_machine() is called in stop_machine() which disables IRQ,
+sleepable lock should be not used in this atomic context, so replace patch_lock
+to raw lock.
+
+Signed-off-by: Yang Shi <yang.shi@linaro.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/kernel/patch.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/arch/arm/kernel/patch.c
++++ b/arch/arm/kernel/patch.c
+@@ -16,7 +16,7 @@ struct patch {
+ 	unsigned int insn;
+ };
+ 
+-static DEFINE_SPINLOCK(patch_lock);
++static DEFINE_RAW_SPINLOCK(patch_lock);
+ 
+ static void __kprobes *patch_map(void *addr, int fixmap, unsigned long *flags)
+ 	__acquires(&patch_lock)
+@@ -33,7 +33,7 @@ static void __kprobes *patch_map(void *a
+ 		return addr;
+ 
+ 	if (flags)
+-		spin_lock_irqsave(&patch_lock, *flags);
++		raw_spin_lock_irqsave(&patch_lock, *flags);
+ 	else
+ 		__acquire(&patch_lock);
+ 
+@@ -48,7 +48,7 @@ static void __kprobes patch_unmap(int fi
+ 	clear_fixmap(fixmap);
+ 
+ 	if (flags)
+-		spin_unlock_irqrestore(&patch_lock, *flags);
++		raw_spin_unlock_irqrestore(&patch_lock, *flags);
+ 	else
+ 		__release(&patch_lock);
+ }
diff --git a/kernel/patches-4.14.x-rt/0112-posix-timers-no-broadcast.patch b/kernel/patches-4.14.x-rt/0112-posix-timers-no-broadcast.patch
new file mode 100644
index 000000000..d6f45f001
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0112-posix-timers-no-broadcast.patch
@@ -0,0 +1,33 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 3 Jul 2009 08:29:20 -0500
+Subject: posix-timers: Prevent broadcast signals
+
+Posix timers should not send broadcast signals and kernel only
+signals. Prevent it.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/time/posix-timers.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/kernel/time/posix-timers.c
++++ b/kernel/time/posix-timers.c
+@@ -433,6 +433,7 @@ static enum hrtimer_restart posix_timer_
+ static struct pid *good_sigevent(sigevent_t * event)
+ {
+ 	struct task_struct *rtn = current->group_leader;
++	int sig = event->sigev_signo;
+ 
+ 	switch (event->sigev_notify) {
+ 	case SIGEV_SIGNAL | SIGEV_THREAD_ID:
+@@ -442,7 +443,8 @@ static struct pid *good_sigevent(sigeven
+ 		/* FALLTHRU */
+ 	case SIGEV_SIGNAL:
+ 	case SIGEV_THREAD:
+-		if (event->sigev_signo <= 0 || event->sigev_signo > SIGRTMAX)
++		if (sig <= 0 || sig > SIGRTMAX ||
++		    sig_kernel_only(sig) || sig_kernel_coredump(sig))
+ 			return NULL;
+ 		/* FALLTHRU */
+ 	case SIGEV_NONE:
diff --git a/kernel/patches-4.14.x-rt/0113-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch b/kernel/patches-4.14.x-rt/0113-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch
new file mode 100644
index 000000000..355e8ff92
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0113-signals-allow-rt-tasks-to-cache-one-sigqueue-struct.patch
@@ -0,0 +1,199 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 3 Jul 2009 08:44:56 -0500
+Subject: signals: Allow rt tasks to cache one sigqueue struct
+
+To avoid allocation allow rt tasks to cache one sigqueue struct in
+task struct.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/sched.h  |    2 +
+ include/linux/signal.h |    1 
+ kernel/exit.c          |    2 -
+ kernel/fork.c          |    1 
+ kernel/signal.c        |   69 ++++++++++++++++++++++++++++++++++++++++++++++---
+ 5 files changed, 70 insertions(+), 5 deletions(-)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -788,6 +788,8 @@ struct task_struct {
+ 	/* Signal handlers: */
+ 	struct signal_struct		*signal;
+ 	struct sighand_struct		*sighand;
++	struct sigqueue			*sigqueue_cache;
++
+ 	sigset_t			blocked;
+ 	sigset_t			real_blocked;
+ 	/* Restored if set_restore_sigmask() was used: */
+--- a/include/linux/signal.h
++++ b/include/linux/signal.h
+@@ -243,6 +243,7 @@ static inline void init_sigpending(struc
+ }
+ 
+ extern void flush_sigqueue(struct sigpending *queue);
++extern void flush_task_sigqueue(struct task_struct *tsk);
+ 
+ /* Test if 'sig' is valid signal. Use this instead of testing _NSIG directly */
+ static inline int valid_signal(unsigned long sig)
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -159,7 +159,7 @@ static void __exit_signal(struct task_st
+ 	 * Do this under ->siglock, we can race with another thread
+ 	 * doing sigqueue_free() if we have SIGQUEUE_PREALLOC signals.
+ 	 */
+-	flush_sigqueue(&tsk->pending);
++	flush_task_sigqueue(tsk);
+ 	tsk->sighand = NULL;
+ 	spin_unlock(&sighand->siglock);
+ 
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -1648,6 +1648,7 @@ static __latent_entropy struct task_stru
+ 	spin_lock_init(&p->alloc_lock);
+ 
+ 	init_sigpending(&p->pending);
++	p->sigqueue_cache = NULL;
+ 
+ 	p->utime = p->stime = p->gtime = 0;
+ #ifdef CONFIG_ARCH_HAS_SCALED_CPUTIME
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -19,6 +19,7 @@
+ #include <linux/sched/task.h>
+ #include <linux/sched/task_stack.h>
+ #include <linux/sched/cputime.h>
++#include <linux/sched/rt.h>
+ #include <linux/fs.h>
+ #include <linux/tty.h>
+ #include <linux/binfmts.h>
+@@ -360,13 +361,30 @@ static bool task_participate_group_stop(
+ 	return false;
+ }
+ 
++static inline struct sigqueue *get_task_cache(struct task_struct *t)
++{
++	struct sigqueue *q = t->sigqueue_cache;
++
++	if (cmpxchg(&t->sigqueue_cache, q, NULL) != q)
++		return NULL;
++	return q;
++}
++
++static inline int put_task_cache(struct task_struct *t, struct sigqueue *q)
++{
++	if (cmpxchg(&t->sigqueue_cache, NULL, q) == NULL)
++		return 0;
++	return 1;
++}
++
+ /*
+  * allocate a new signal queue record
+  * - this may be called without locks if and only if t == current, otherwise an
+  *   appropriate lock must be held to stop the target task from exiting
+  */
+ static struct sigqueue *
+-__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags, int override_rlimit)
++__sigqueue_do_alloc(int sig, struct task_struct *t, gfp_t flags,
++		    int override_rlimit, int fromslab)
+ {
+ 	struct sigqueue *q = NULL;
+ 	struct user_struct *user;
+@@ -383,7 +401,10 @@ static struct sigqueue *
+ 	if (override_rlimit ||
+ 	    atomic_read(&user->sigpending) <=
+ 			task_rlimit(t, RLIMIT_SIGPENDING)) {
+-		q = kmem_cache_alloc(sigqueue_cachep, flags);
++		if (!fromslab)
++			q = get_task_cache(t);
++		if (!q)
++			q = kmem_cache_alloc(sigqueue_cachep, flags);
+ 	} else {
+ 		print_dropped_signal(sig);
+ 	}
+@@ -400,6 +421,13 @@ static struct sigqueue *
+ 	return q;
+ }
+ 
++static struct sigqueue *
++__sigqueue_alloc(int sig, struct task_struct *t, gfp_t flags,
++		 int override_rlimit)
++{
++	return __sigqueue_do_alloc(sig, t, flags, override_rlimit, 0);
++}
++
+ static void __sigqueue_free(struct sigqueue *q)
+ {
+ 	if (q->flags & SIGQUEUE_PREALLOC)
+@@ -409,6 +437,21 @@ static void __sigqueue_free(struct sigqu
+ 	kmem_cache_free(sigqueue_cachep, q);
+ }
+ 
++static void sigqueue_free_current(struct sigqueue *q)
++{
++	struct user_struct *up;
++
++	if (q->flags & SIGQUEUE_PREALLOC)
++		return;
++
++	up = q->user;
++	if (rt_prio(current->normal_prio) && !put_task_cache(current, q)) {
++		atomic_dec(&up->sigpending);
++		free_uid(up);
++	} else
++		  __sigqueue_free(q);
++}
++
+ void flush_sigqueue(struct sigpending *queue)
+ {
+ 	struct sigqueue *q;
+@@ -422,6 +465,21 @@ void flush_sigqueue(struct sigpending *q
+ }
+ 
+ /*
++ * Called from __exit_signal. Flush tsk->pending and
++ * tsk->sigqueue_cache
++ */
++void flush_task_sigqueue(struct task_struct *tsk)
++{
++	struct sigqueue *q;
++
++	flush_sigqueue(&tsk->pending);
++
++	q = get_task_cache(tsk);
++	if (q)
++		kmem_cache_free(sigqueue_cachep, q);
++}
++
++/*
+  * Flush all pending signals for this kthread.
+  */
+ void flush_signals(struct task_struct *t)
+@@ -542,7 +600,7 @@ static void collect_signal(int sig, stru
+ 			(info->si_code == SI_TIMER) &&
+ 			(info->si_sys_private);
+ 
+-		__sigqueue_free(first);
++		sigqueue_free_current(first);
+ 	} else {
+ 		/*
+ 		 * Ok, it wasn't in the queue.  This must be
+@@ -578,6 +636,8 @@ int dequeue_signal(struct task_struct *t
+ 	bool resched_timer = false;
+ 	int signr;
+ 
++	WARN_ON_ONCE(tsk != current);
++
+ 	/* We only dequeue private signals from ourselves, we don't let
+ 	 * signalfd steal them
+ 	 */
+@@ -1515,7 +1575,8 @@ EXPORT_SYMBOL(kill_pid);
+  */
+ struct sigqueue *sigqueue_alloc(void)
+ {
+-	struct sigqueue *q = __sigqueue_alloc(-1, current, GFP_KERNEL, 0);
++	/* Preallocated sigqueue objects always from the slabcache ! */
++	struct sigqueue *q = __sigqueue_do_alloc(-1, current, GFP_KERNEL, 0, 1);
+ 
+ 	if (q)
+ 		q->flags |= SIGQUEUE_PREALLOC;
diff --git a/kernel/patches-4.14.x-rt/0114-drivers-random-reduce-preempt-disabled-region.patch b/kernel/patches-4.14.x-rt/0114-drivers-random-reduce-preempt-disabled-region.patch
new file mode 100644
index 000000000..6cfd0048e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0114-drivers-random-reduce-preempt-disabled-region.patch
@@ -0,0 +1,32 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:30 -0500
+Subject: drivers: random: Reduce preempt disabled region
+
+No need to keep preemption disabled across the whole function.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/char/random.c |    3 ---
+ 1 file changed, 3 deletions(-)
+
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -1017,8 +1017,6 @@ static void add_timer_randomness(struct
+ 	} sample;
+ 	long delta, delta2, delta3;
+ 
+-	preempt_disable();
+-
+ 	sample.jiffies = jiffies;
+ 	sample.cycles = random_get_entropy();
+ 	sample.num = num;
+@@ -1059,7 +1057,6 @@ static void add_timer_randomness(struct
+ 		 */
+ 		credit_entropy_bits(r, min_t(int, fls(delta>>1), 11));
+ 	}
+-	preempt_enable();
+ }
+ 
+ void add_input_randomness(unsigned int type, unsigned int code,
diff --git a/kernel/patches-4.14.x-rt/0115-arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch b/kernel/patches-4.14.x-rt/0115-arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch
new file mode 100644
index 000000000..0c5f9d4e2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0115-arm-at91-pit-remove-irq-handler-when-clock-is-unused.patch
@@ -0,0 +1,144 @@
+From: Benedikt Spranger <b.spranger@linutronix.de>
+Date: Sat, 6 Mar 2010 17:47:10 +0100
+Subject: ARM: AT91: PIT: Remove irq handler when clock event is unused
+
+Setup and remove the interrupt handler in clock event mode selection.
+This avoids calling the (shared) interrupt handler when the device is
+not used.
+
+Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+[bigeasy: redo the patch with NR_IRQS_LEGACY which is probably required since
+commit 8fe82a55 ("ARM: at91: sparse irq support") which is included since v3.6.
+Patch based on what Sami Pietikäinen <Sami.Pietikainen@wapice.com> suggested].
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/clocksource/timer-atmel-pit.c |   18 +++++++++---------
+ drivers/clocksource/timer-atmel-st.c  |   34 ++++++++++++++++++++++------------
+ 2 files changed, 31 insertions(+), 21 deletions(-)
+
+--- a/drivers/clocksource/timer-atmel-pit.c
++++ b/drivers/clocksource/timer-atmel-pit.c
+@@ -96,15 +96,24 @@ static int pit_clkevt_shutdown(struct cl
+ 
+ 	/* disable irq, leaving the clocksource active */
+ 	pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
++	free_irq(data->irq, data);
+ 	return 0;
+ }
+ 
++static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id);
+ /*
+  * Clockevent device:  interrupts every 1/HZ (== pit_cycles * MCK/16)
+  */
+ static int pit_clkevt_set_periodic(struct clock_event_device *dev)
+ {
+ 	struct pit_data *data = clkevt_to_pit_data(dev);
++	int ret;
++
++	ret = request_irq(data->irq, at91sam926x_pit_interrupt,
++			  IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
++			  "at91_tick", data);
++	if (ret)
++		panic(pr_fmt("Unable to setup IRQ\n"));
+ 
+ 	/* update clocksource counter */
+ 	data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
+@@ -230,15 +239,6 @@ static int __init at91sam926x_pit_dt_ini
+ 		return ret;
+ 	}
+ 
+-	/* Set up irq handler */
+-	ret = request_irq(data->irq, at91sam926x_pit_interrupt,
+-			  IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
+-			  "at91_tick", data);
+-	if (ret) {
+-		pr_err("Unable to setup IRQ\n");
+-		return ret;
+-	}
+-
+ 	/* Set up and register clockevents */
+ 	data->clkevt.name = "pit";
+ 	data->clkevt.features = CLOCK_EVT_FEAT_PERIODIC;
+--- a/drivers/clocksource/timer-atmel-st.c
++++ b/drivers/clocksource/timer-atmel-st.c
+@@ -115,18 +115,29 @@ static void clkdev32k_disable_and_flush_
+ 	last_crtr = read_CRTR();
+ }
+ 
++static int atmel_st_irq;
++
+ static int clkevt32k_shutdown(struct clock_event_device *evt)
+ {
+ 	clkdev32k_disable_and_flush_irq();
+ 	irqmask = 0;
+ 	regmap_write(regmap_st, AT91_ST_IER, irqmask);
++	free_irq(atmel_st_irq, regmap_st);
+ 	return 0;
+ }
+ 
+ static int clkevt32k_set_oneshot(struct clock_event_device *dev)
+ {
++	int ret;
++
+ 	clkdev32k_disable_and_flush_irq();
+ 
++	ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
++			  IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
++			  "at91_tick", regmap_st);
++	if (ret)
++		panic(pr_fmt("Unable to setup IRQ\n"));
++
+ 	/*
+ 	 * ALM for oneshot irqs, set by next_event()
+ 	 * before 32 seconds have passed.
+@@ -139,8 +150,16 @@ static int clkevt32k_set_oneshot(struct
+ 
+ static int clkevt32k_set_periodic(struct clock_event_device *dev)
+ {
++	int ret;
++
+ 	clkdev32k_disable_and_flush_irq();
+ 
++	ret = request_irq(atmel_st_irq, at91rm9200_timer_interrupt,
++			  IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
++			  "at91_tick", regmap_st);
++	if (ret)
++		panic(pr_fmt("Unable to setup IRQ\n"));
++
+ 	/* 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 @@ static int __init atmel_st_timer_init(st
+ {
+ 	struct clk *sclk;
+ 	unsigned int sclk_rate, val;
+-	int irq, ret;
++	int ret;
+ 
+ 	regmap_st = syscon_node_to_regmap(node);
+ 	if (IS_ERR(regmap_st)) {
+@@ -212,21 +231,12 @@ static int __init atmel_st_timer_init(st
+ 	regmap_read(regmap_st, AT91_ST_SR, &val);
+ 
+ 	/* Get the interrupts property */
+-	irq  = irq_of_parse_and_map(node, 0);
+-	if (!irq) {
++	atmel_st_irq  = irq_of_parse_and_map(node, 0);
++	if (!atmel_st_irq) {
+ 		pr_err("Unable to get IRQ from DT\n");
+ 		return -EINVAL;
+ 	}
+ 
+-	/* Make IRQs happen for the system timer */
+-	ret = request_irq(irq, at91rm9200_timer_interrupt,
+-			  IRQF_SHARED | IRQF_TIMER | IRQF_IRQPOLL,
+-			  "at91_tick", regmap_st);
+-	if (ret) {
+-		pr_err("Unable to setup IRQ\n");
+-		return ret;
+-	}
+-
+ 	sclk = of_clk_get(node, 0);
+ 	if (IS_ERR(sclk)) {
+ 		pr_err("Unable to get slow clock\n");
diff --git a/kernel/patches-4.14.x-rt/0116-clockevents-drivers-timer-atmel-pit-fix-double-free_.patch b/kernel/patches-4.14.x-rt/0116-clockevents-drivers-timer-atmel-pit-fix-double-free_.patch
new file mode 100644
index 000000000..9ffe99dbd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0116-clockevents-drivers-timer-atmel-pit-fix-double-free_.patch
@@ -0,0 +1,45 @@
+From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Date: Thu, 17 Mar 2016 21:09:43 +0100
+Subject: [PATCH] clockevents/drivers/timer-atmel-pit: fix double free_irq
+
+clockevents_exchange_device() changes the state from detached to shutdown
+and so at that point the IRQ has not yet been requested.
+
+Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
+Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/clocksource/timer-atmel-pit.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- 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;
++	bool		irq_requested;
+ 	struct clk	*mck;
+ };
+ 
+@@ -96,7 +97,10 @@ static int pit_clkevt_shutdown(struct cl
+ 
+ 	/* disable irq, leaving the clocksource active */
+ 	pit_write(data->base, AT91_PIT_MR, (data->cycle - 1) | AT91_PIT_PITEN);
+-	free_irq(data->irq, data);
++	if (data->irq_requested) {
++		free_irq(data->irq, data);
++		data->irq_requested = false;
++	}
+ 	return 0;
+ }
+ 
+@@ -115,6 +119,8 @@ static int pit_clkevt_set_periodic(struc
+ 	if (ret)
+ 		panic(pr_fmt("Unable to setup IRQ\n"));
+ 
++	data->irq_requested = true;
++
+ 	/* update clocksource counter */
+ 	data->cnt += data->cycle * PIT_PICNT(pit_read(data->base, AT91_PIT_PIVR));
+ 	pit_write(data->base, AT91_PIT_MR,
diff --git a/kernel/patches-4.14.x-rt/0117-clocksource-tclib-allow-higher-clockrates.patch b/kernel/patches-4.14.x-rt/0117-clocksource-tclib-allow-higher-clockrates.patch
new file mode 100644
index 000000000..891ab76ba
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0117-clocksource-tclib-allow-higher-clockrates.patch
@@ -0,0 +1,157 @@
+From: Benedikt Spranger <b.spranger@linutronix.de>
+Date: Mon, 8 Mar 2010 18:57:04 +0100
+Subject: clocksource: TCLIB: Allow higher clock rates for clock events
+
+As default the TCLIB uses the 32KiHz base clock rate for clock events.
+Add a compile time selection to allow higher clock resulution.
+
+(fixed up by Sami Pietikäinen <Sami.Pietikainen@wapice.com>)
+
+Signed-off-by: Benedikt Spranger <b.spranger@linutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/clocksource/tcb_clksrc.c |   36 +++++++++++++++++++++---------------
+ drivers/misc/Kconfig             |   12 ++++++++++--
+ 2 files changed, 31 insertions(+), 17 deletions(-)
+
+--- a/drivers/clocksource/tcb_clksrc.c
++++ b/drivers/clocksource/tcb_clksrc.c
+@@ -25,8 +25,7 @@
+  *     this 32 bit free-running counter. the second channel is not used.
+  *
+  *   - The third channel may be used to provide a 16-bit clockevent
+- *     source, used in either periodic or oneshot mode.  This runs
+- *     at 32 KiHZ, and can handle delays of up to two seconds.
++ *     source, used in either periodic or oneshot mode.
+  *
+  * A boot clocksource and clockevent source are also currently needed,
+  * unless the relevant platforms (ARM/AT91, AVR32/AT32) are changed so
+@@ -127,6 +126,7 @@ struct tc_clkevt_device {
+ 	struct clock_event_device	clkevt;
+ 	struct clk			*clk;
+ 	bool				clk_enabled;
++	u32				freq;
+ 	void __iomem			*regs;
+ };
+ 
+@@ -135,13 +135,6 @@ static struct tc_clkevt_device *to_tc_cl
+ 	return container_of(clkevt, struct tc_clkevt_device, clkevt);
+ }
+ 
+-/* For now, we always use the 32K clock ... this optimizes for NO_HZ,
+- * because using one of the divided clocks would usually mean the
+- * tick rate can never be less than several dozen Hz (vs 0.5 Hz).
+- *
+- * A divided clock could be good for high resolution timers, since
+- * 30.5 usec resolution can seem "low".
+- */
+ static u32 timer_clock;
+ 
+ static void tc_clk_disable(struct clock_event_device *d)
+@@ -191,7 +184,7 @@ static int tc_set_oneshot(struct clock_e
+ 
+ 	tc_clk_enable(d);
+ 
+-	/* slow clock, count up to RC, then irq and stop */
++	/* count up to RC, then irq and stop */
+ 	writel(timer_clock | ATMEL_TC_CPCSTOP | ATMEL_TC_WAVE |
+ 		     ATMEL_TC_WAVESEL_UP_AUTO, regs + ATMEL_TC_REG(2, CMR));
+ 	writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
+@@ -213,10 +206,10 @@ static int tc_set_periodic(struct clock_
+ 	 */
+ 	tc_clk_enable(d);
+ 
+-	/* slow clock, count up to RC, then irq and restart */
++	/* count up to RC, then irq and restart */
+ 	writel(timer_clock | ATMEL_TC_WAVE | ATMEL_TC_WAVESEL_UP_AUTO,
+ 		     regs + ATMEL_TC_REG(2, CMR));
+-	writel((32768 + HZ / 2) / HZ, tcaddr + ATMEL_TC_REG(2, RC));
++	writel((tcd->freq + HZ / 2) / HZ, tcaddr + ATMEL_TC_REG(2, RC));
+ 
+ 	/* Enable clock and interrupts on RC compare */
+ 	writel(ATMEL_TC_CPCS, regs + ATMEL_TC_REG(2, IER));
+@@ -243,7 +236,11 @@ static struct tc_clkevt_device clkevt =
+ 		.features		= CLOCK_EVT_FEAT_PERIODIC |
+ 					  CLOCK_EVT_FEAT_ONESHOT,
+ 		/* Should be lower than at91rm9200's system timer */
++#ifdef CONFIG_ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
+ 		.rating			= 125,
++#else
++		.rating			= 200,
++#endif
+ 		.set_next_event		= tc_next_event,
+ 		.set_state_shutdown	= tc_shutdown_clk_off,
+ 		.set_state_periodic	= tc_set_periodic,
+@@ -265,8 +262,9 @@ static irqreturn_t ch2_irq(int irq, void
+ 	return IRQ_NONE;
+ }
+ 
+-static int __init setup_clkevents(struct atmel_tc *tc, int clk32k_divisor_idx)
++static int __init setup_clkevents(struct atmel_tc *tc, int divisor_idx)
+ {
++	unsigned divisor = atmel_tc_divisors[divisor_idx];
+ 	int ret;
+ 	struct clk *t2_clk = tc->clk[2];
+ 	int irq = tc->irq[2];
+@@ -287,7 +285,11 @@ static int __init setup_clkevents(struct
+ 	clkevt.regs = tc->regs;
+ 	clkevt.clk = t2_clk;
+ 
+-	timer_clock = clk32k_divisor_idx;
++	timer_clock = divisor_idx;
++	if (!divisor)
++		clkevt.freq = 32768;
++	else
++		clkevt.freq = clk_get_rate(t2_clk) / divisor;
+ 
+ 	clkevt.clkevt.cpumask = cpumask_of(0);
+ 
+@@ -298,7 +300,7 @@ static int __init setup_clkevents(struct
+ 		return ret;
+ 	}
+ 
+-	clockevents_config_and_register(&clkevt.clkevt, 32768, 1, 0xffff);
++	clockevents_config_and_register(&clkevt.clkevt, clkevt.freq, 1, 0xffff);
+ 
+ 	return ret;
+ }
+@@ -435,7 +437,11 @@ static int __init tcb_clksrc_init(void)
+ 		goto err_disable_t1;
+ 
+ 	/* channel 2:  periodic and oneshot timer support */
++#ifdef CONFIG_ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
+ 	ret = setup_clkevents(tc, clk32k_divisor_idx);
++#else
++	ret = setup_clkevents(tc, best_divisor_idx);
++#endif
+ 	if (ret)
+ 		goto err_unregister_clksrc;
+ 
+--- a/drivers/misc/Kconfig
++++ b/drivers/misc/Kconfig
+@@ -69,8 +69,7 @@ config ATMEL_TCB_CLKSRC
+ 	  are combined to make a single 32-bit timer.
+ 
+ 	  When GENERIC_CLOCKEVENTS is defined, the third timer channel
+-	  may be used as a clock event device supporting oneshot mode
+-	  (delays of up to two seconds) based on the 32 KiHz clock.
++	  may be used as a clock event device supporting oneshot mode.
+ 
+ config ATMEL_TCB_CLKSRC_BLOCK
+ 	int
+@@ -84,6 +83,15 @@ config ATMEL_TCB_CLKSRC_BLOCK
+ 	  TC can be used for other purposes, such as PWM generation and
+ 	  interval timing.
+ 
++config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
++	bool "TC Block use 32 KiHz clock"
++	depends on ATMEL_TCB_CLKSRC
++	default y
++	help
++	  Select this to use 32 KiHz base clock rate as TC block clock
++	  source for clock events.
++
++
+ config DUMMY_IRQ
+ 	tristate "Dummy IRQ handler"
+ 	default n
diff --git a/kernel/patches-4.14.x-rt/0118-drivers-net-8139-disable-irq-nosync.patch b/kernel/patches-4.14.x-rt/0118-drivers-net-8139-disable-irq-nosync.patch
new file mode 100644
index 000000000..3c01971e0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0118-drivers-net-8139-disable-irq-nosync.patch
@@ -0,0 +1,25 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:24 -0500
+Subject: drivers/net: Use disable_irq_nosync() in 8139too
+
+Use disable_irq_nosync() instead of disable_irq() as this might be
+called in atomic context with netpoll.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/net/ethernet/realtek/8139too.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/realtek/8139too.c
++++ b/drivers/net/ethernet/realtek/8139too.c
+@@ -2224,7 +2224,7 @@ static void rtl8139_poll_controller(stru
+ 	struct rtl8139_private *tp = netdev_priv(dev);
+ 	const int irq = tp->pci_dev->irq;
+ 
+-	disable_irq(irq);
++	disable_irq_nosync(irq);
+ 	rtl8139_interrupt(irq, dev);
+ 	enable_irq(irq);
+ }
diff --git a/kernel/patches-4.14.x-rt/0119-suspend-prevernt-might-sleep-splats.patch b/kernel/patches-4.14.x-rt/0119-suspend-prevernt-might-sleep-splats.patch
new file mode 100644
index 000000000..b2bd8af0d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0119-suspend-prevernt-might-sleep-splats.patch
@@ -0,0 +1,106 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 15 Jul 2010 10:29:00 +0200
+Subject: suspend: Prevent might sleep splats
+
+timekeeping suspend/resume calls read_persistant_clock() which takes
+rtc_lock. That results in might sleep warnings because at that point
+we run with interrupts disabled.
+
+We cannot convert rtc_lock to a raw spinlock as that would trigger
+other might sleep warnings.
+
+As a temporary workaround we disable the might sleep warnings by
+setting system_state to SYSTEM_SUSPEND before calling sysdev_suspend()
+and restoring it to SYSTEM_RUNNING afer sysdev_resume().
+
+Needs to be revisited.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/kernel.h   |    1 +
+ kernel/power/hibernate.c |    7 +++++++
+ kernel/power/suspend.c   |    4 ++++
+ 3 files changed, 12 insertions(+)
+
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -531,6 +531,7 @@ extern enum system_states {
+ 	SYSTEM_HALT,
+ 	SYSTEM_POWER_OFF,
+ 	SYSTEM_RESTART,
++	SYSTEM_SUSPEND,
+ } system_state;
+ 
+ #define TAINT_PROPRIETARY_MODULE	0
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -287,6 +287,8 @@ static int create_image(int platform_mod
+ 
+ 	local_irq_disable();
+ 
++	system_state = SYSTEM_SUSPEND;
++
+ 	error = syscore_suspend();
+ 	if (error) {
+ 		pr_err("Some system devices failed to power down, aborting hibernation\n");
+@@ -317,6 +319,7 @@ static int create_image(int platform_mod
+ 	syscore_resume();
+ 
+  Enable_irqs:
++	system_state = SYSTEM_RUNNING;
+ 	local_irq_enable();
+ 
+  Enable_cpus:
+@@ -445,6 +448,7 @@ static int resume_target_kernel(bool pla
+ 		goto Enable_cpus;
+ 
+ 	local_irq_disable();
++	system_state = SYSTEM_SUSPEND;
+ 
+ 	error = syscore_suspend();
+ 	if (error)
+@@ -478,6 +482,7 @@ static int resume_target_kernel(bool pla
+ 	syscore_resume();
+ 
+  Enable_irqs:
++	system_state = SYSTEM_RUNNING;
+ 	local_irq_enable();
+ 
+  Enable_cpus:
+@@ -563,6 +568,7 @@ int hibernation_platform_enter(void)
+ 		goto Enable_cpus;
+ 
+ 	local_irq_disable();
++	system_state = SYSTEM_SUSPEND;
+ 	syscore_suspend();
+ 	if (pm_wakeup_pending()) {
+ 		error = -EAGAIN;
+@@ -575,6 +581,7 @@ int hibernation_platform_enter(void)
+ 
+  Power_up:
+ 	syscore_resume();
++	system_state = SYSTEM_RUNNING;
+ 	local_irq_enable();
+ 
+  Enable_cpus:
+--- a/kernel/power/suspend.c
++++ b/kernel/power/suspend.c
+@@ -428,6 +428,8 @@ static int suspend_enter(suspend_state_t
+ 	arch_suspend_disable_irqs();
+ 	BUG_ON(!irqs_disabled());
+ 
++	system_state = SYSTEM_SUSPEND;
++
+ 	error = syscore_suspend();
+ 	if (!error) {
+ 		*wakeup = pm_wakeup_pending();
+@@ -443,6 +445,8 @@ static int suspend_enter(suspend_state_t
+ 		syscore_resume();
+ 	}
+ 
++	system_state = SYSTEM_RUNNING;
++
+ 	arch_suspend_enable_irqs();
+ 	BUG_ON(irqs_disabled());
+ 
diff --git a/kernel/patches-4.14.x-rt/0120-net-prevent-abba-deadlock.patch b/kernel/patches-4.14.x-rt/0120-net-prevent-abba-deadlock.patch
new file mode 100644
index 000000000..ed9035be5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0120-net-prevent-abba-deadlock.patch
@@ -0,0 +1,111 @@
+Subject: net-flip-lock-dep-thingy.patch
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 28 Jun 2011 10:59:58 +0200
+
+=======================================================
+[ INFO: possible circular locking dependency detected ]
+3.0.0-rc3+ #26
+-------------------------------------------------------
+ip/1104 is trying to acquire lock:
+ (local_softirq_lock){+.+...}, at: [<ffffffff81056d12>] __local_lock+0x25/0x68
+
+but task is already holding lock:
+ (sk_lock-AF_INET){+.+...}, at: [<ffffffff81433308>] lock_sock+0x10/0x12
+
+which lock already depends on the new lock.
+
+
+the existing dependency chain (in reverse order) is:
+
+-> #1 (sk_lock-AF_INET){+.+...}:
+       [<ffffffff810836e5>] lock_acquire+0x103/0x12e
+       [<ffffffff813e2781>] lock_sock_nested+0x82/0x92
+       [<ffffffff81433308>] lock_sock+0x10/0x12
+       [<ffffffff81433afa>] tcp_close+0x1b/0x355
+       [<ffffffff81453c99>] inet_release+0xc3/0xcd
+       [<ffffffff813dff3f>] sock_release+0x1f/0x74
+       [<ffffffff813dffbb>] sock_close+0x27/0x2b
+       [<ffffffff81129c63>] fput+0x11d/0x1e3
+       [<ffffffff81126577>] filp_close+0x70/0x7b
+       [<ffffffff8112667a>] sys_close+0xf8/0x13d
+       [<ffffffff814ae882>] system_call_fastpath+0x16/0x1b
+
+-> #0 (local_softirq_lock){+.+...}:
+       [<ffffffff81082ecc>] __lock_acquire+0xacc/0xdc8
+       [<ffffffff810836e5>] lock_acquire+0x103/0x12e
+       [<ffffffff814a7e40>] _raw_spin_lock+0x3b/0x4a
+       [<ffffffff81056d12>] __local_lock+0x25/0x68
+       [<ffffffff81056d8b>] local_bh_disable+0x36/0x3b
+       [<ffffffff814a7fc4>] _raw_write_lock_bh+0x16/0x4f
+       [<ffffffff81433c38>] tcp_close+0x159/0x355
+       [<ffffffff81453c99>] inet_release+0xc3/0xcd
+       [<ffffffff813dff3f>] sock_release+0x1f/0x74
+       [<ffffffff813dffbb>] sock_close+0x27/0x2b
+       [<ffffffff81129c63>] fput+0x11d/0x1e3
+       [<ffffffff81126577>] filp_close+0x70/0x7b
+       [<ffffffff8112667a>] sys_close+0xf8/0x13d
+       [<ffffffff814ae882>] system_call_fastpath+0x16/0x1b
+
+other info that might help us debug this:
+
+ Possible unsafe locking scenario:
+
+       CPU0                    CPU1
+       ----                    ----
+  lock(sk_lock-AF_INET);
+                               lock(local_softirq_lock);
+                               lock(sk_lock-AF_INET);
+  lock(local_softirq_lock);
+
+ *** DEADLOCK ***
+
+1 lock held by ip/1104:
+ #0:  (sk_lock-AF_INET){+.+...}, at: [<ffffffff81433308>] lock_sock+0x10/0x12
+
+stack backtrace:
+Pid: 1104, comm: ip Not tainted 3.0.0-rc3+ #26
+Call Trace:
+ [<ffffffff81081649>] print_circular_bug+0x1f8/0x209
+ [<ffffffff81082ecc>] __lock_acquire+0xacc/0xdc8
+ [<ffffffff81056d12>] ? __local_lock+0x25/0x68
+ [<ffffffff810836e5>] lock_acquire+0x103/0x12e
+ [<ffffffff81056d12>] ? __local_lock+0x25/0x68
+ [<ffffffff81046c75>] ? get_parent_ip+0x11/0x41
+ [<ffffffff814a7e40>] _raw_spin_lock+0x3b/0x4a
+ [<ffffffff81056d12>] ? __local_lock+0x25/0x68
+ [<ffffffff81046c8c>] ? get_parent_ip+0x28/0x41
+ [<ffffffff81056d12>] __local_lock+0x25/0x68
+ [<ffffffff81056d8b>] local_bh_disable+0x36/0x3b
+ [<ffffffff81433308>] ? lock_sock+0x10/0x12
+ [<ffffffff814a7fc4>] _raw_write_lock_bh+0x16/0x4f
+ [<ffffffff81433c38>] tcp_close+0x159/0x355
+ [<ffffffff81453c99>] inet_release+0xc3/0xcd
+ [<ffffffff813dff3f>] sock_release+0x1f/0x74
+ [<ffffffff813dffbb>] sock_close+0x27/0x2b
+ [<ffffffff81129c63>] fput+0x11d/0x1e3
+ [<ffffffff81126577>] filp_close+0x70/0x7b
+ [<ffffffff8112667a>] sys_close+0xf8/0x13d
+ [<ffffffff814ae882>] system_call_fastpath+0x16/0x1b
+
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ net/core/sock.c |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+--- a/net/core/sock.c
++++ b/net/core/sock.c
+@@ -2762,12 +2762,11 @@ void lock_sock_nested(struct sock *sk, i
+ 	if (sk->sk_lock.owned)
+ 		__lock_sock(sk);
+ 	sk->sk_lock.owned = 1;
+-	spin_unlock(&sk->sk_lock.slock);
++	spin_unlock_bh(&sk->sk_lock.slock);
+ 	/*
+ 	 * The sk_lock has mutex_lock() semantics here:
+ 	 */
+ 	mutex_acquire(&sk->sk_lock.dep_map, subclass, 0, _RET_IP_);
+-	local_bh_enable();
+ }
+ EXPORT_SYMBOL(lock_sock_nested);
+ 
diff --git a/kernel/patches-4.14.x-rt/0121-net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch b/kernel/patches-4.14.x-rt/0121-net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch
new file mode 100644
index 000000000..136412182
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0121-net-sched-dev_deactivate_many-use-msleep-1-instead-o.patch
@@ -0,0 +1,57 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 5 Mar 2014 00:49:47 +0100
+Subject: net: sched: Use msleep() instead of yield()
+
+On PREEMPT_RT enabled systems the interrupt handler run as threads at prio 50
+(by default). If a high priority userspace process tries to shut down a busy
+network interface it might spin in a yield loop waiting for the device to
+become idle. With the interrupt thread having a lower priority than the
+looping process it might never be scheduled and so result in a deadlock on UP
+systems.
+
+With Magic SysRq the following backtrace can be produced:
+
+> test_app R running      0   174    168 0x00000000
+> [<c02c7070>] (__schedule+0x220/0x3fc) from [<c02c7870>] (preempt_schedule_irq+0x48/0x80)
+> [<c02c7870>] (preempt_schedule_irq+0x48/0x80) from [<c0008fa8>] (svc_preempt+0x8/0x20)
+> [<c0008fa8>] (svc_preempt+0x8/0x20) from [<c001a984>] (local_bh_enable+0x18/0x88)
+> [<c001a984>] (local_bh_enable+0x18/0x88) from [<c025316c>] (dev_deactivate_many+0x220/0x264)
+> [<c025316c>] (dev_deactivate_many+0x220/0x264) from [<c023be04>] (__dev_close_many+0x64/0xd4)
+> [<c023be04>] (__dev_close_many+0x64/0xd4) from [<c023be9c>] (__dev_close+0x28/0x3c)
+> [<c023be9c>] (__dev_close+0x28/0x3c) from [<c023f7f0>] (__dev_change_flags+0x88/0x130)
+> [<c023f7f0>] (__dev_change_flags+0x88/0x130) from [<c023f904>] (dev_change_flags+0x10/0x48)
+> [<c023f904>] (dev_change_flags+0x10/0x48) from [<c024c140>] (do_setlink+0x370/0x7ec)
+> [<c024c140>] (do_setlink+0x370/0x7ec) from [<c024d2f0>] (rtnl_newlink+0x2b4/0x450)
+> [<c024d2f0>] (rtnl_newlink+0x2b4/0x450) from [<c024cfa0>] (rtnetlink_rcv_msg+0x158/0x1f4)
+> [<c024cfa0>] (rtnetlink_rcv_msg+0x158/0x1f4) from [<c0256740>] (netlink_rcv_skb+0xac/0xc0)
+> [<c0256740>] (netlink_rcv_skb+0xac/0xc0) from [<c024bbd8>] (rtnetlink_rcv+0x18/0x24)
+> [<c024bbd8>] (rtnetlink_rcv+0x18/0x24) from [<c02561b8>] (netlink_unicast+0x13c/0x198)
+> [<c02561b8>] (netlink_unicast+0x13c/0x198) from [<c025651c>] (netlink_sendmsg+0x264/0x2e0)
+> [<c025651c>] (netlink_sendmsg+0x264/0x2e0) from [<c022af98>] (sock_sendmsg+0x78/0x98)
+> [<c022af98>] (sock_sendmsg+0x78/0x98) from [<c022bb50>] (___sys_sendmsg.part.25+0x268/0x278)
+> [<c022bb50>] (___sys_sendmsg.part.25+0x268/0x278) from [<c022cf08>] (__sys_sendmsg+0x48/0x78)
+> [<c022cf08>] (__sys_sendmsg+0x48/0x78) from [<c0009320>] (ret_fast_syscall+0x0/0x2c)
+
+This patch works around the problem by replacing yield() by msleep(1), giving
+the interrupt thread time to finish, similar to other changes contained in the
+rt patch set. Using wait_for_completion() instead would probably be a better
+solution.
+
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/sched/sch_generic.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -930,7 +930,7 @@ void dev_deactivate_many(struct list_hea
+ 	/* Wait for outstanding qdisc_run calls. */
+ 	list_for_each_entry(dev, head, close_list)
+ 		while (some_qdisc_is_busy(dev))
+-			yield();
++			msleep(1);
+ }
+ 
+ void dev_deactivate(struct net_device *dev)
diff --git a/kernel/patches-4.14.x-rt/0122-net_disable_NET_RX_BUSY_POLL.patch b/kernel/patches-4.14.x-rt/0122-net_disable_NET_RX_BUSY_POLL.patch
new file mode 100644
index 000000000..75bf42ac7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0122-net_disable_NET_RX_BUSY_POLL.patch
@@ -0,0 +1,28 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Sat, 27 May 2017 19:02:06 +0200
+Subject: net/core: disable NET_RX_BUSY_POLL
+
+sk_busy_loop() does preempt_disable() followed by a few operations which can
+take sleeping locks and may get long.
+I _think_ that we could use preempt_disable_nort() (in sk_busy_loop()) instead
+but after a successfull cmpxchg(&napi->state, …) we would gain the ressource
+and could be scheduled out. At this point nobody knows who (which context) owns
+it and so it could take a while until the state is realeased and napi_poll()
+could be invoked again.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/Kconfig
++++ b/net/Kconfig
+@@ -272,7 +272,7 @@ config CGROUP_NET_CLASSID
+ 
+ config NET_RX_BUSY_POLL
+ 	bool
+-	default y
++	default y if !PREEMPT_RT_FULL
+ 
+ config BQL
+ 	bool
diff --git a/kernel/patches-4.14.x-rt/0123-x86-io-apic-migra-no-unmask.patch b/kernel/patches-4.14.x-rt/0123-x86-io-apic-migra-no-unmask.patch
new file mode 100644
index 000000000..d8e91ba27
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0123-x86-io-apic-migra-no-unmask.patch
@@ -0,0 +1,27 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:27 -0500
+Subject: x86/ioapic: Do not unmask io_apic when interrupt is in progress
+
+With threaded interrupts we might see an interrupt in progress on
+migration. Do not unmask it when this is the case.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+xXx
+ arch/x86/kernel/apic/io_apic.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/kernel/apic/io_apic.c
++++ b/arch/x86/kernel/apic/io_apic.c
+@@ -1690,7 +1690,8 @@ static bool io_apic_level_ack_pending(st
+ static inline bool ioapic_irqd_mask(struct irq_data *data)
+ {
+ 	/* If we are moving the irq we need to mask it */
+-	if (unlikely(irqd_is_setaffinity_pending(data))) {
++	if (unlikely(irqd_is_setaffinity_pending(data) &&
++		     !irqd_irq_inprogress(data))) {
+ 		mask_ioapic_irq(data);
+ 		return true;
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0124-rcu-segcblist-include-rcupdate.h.patch b/kernel/patches-4.14.x-rt/0124-rcu-segcblist-include-rcupdate.h.patch
new file mode 100644
index 000000000..3cfcdaf38
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0124-rcu-segcblist-include-rcupdate.h.patch
@@ -0,0 +1,22 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 22 Sep 2017 15:01:46 +0200
+Subject: [PATCH] rcu/segcblist: include rcupdate.h
+
+The RT build on ARM complains about non-existing ULONG_CMP_LT. Since
+rcu_segcblist.c uses that macro it should include the header file.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/rcu_segcblist.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/kernel/rcu/rcu_segcblist.c
++++ b/kernel/rcu/rcu_segcblist.c
+@@ -23,6 +23,7 @@
+ #include <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/interrupt.h>
++#include <linux/rcupdate.h>
+ 
+ #include "rcu_segcblist.h"
+ 
diff --git a/kernel/patches-4.14.x-rt/0125-printk-kill.patch b/kernel/patches-4.14.x-rt/0125-printk-kill.patch
new file mode 100644
index 000000000..b281b87b6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0125-printk-kill.patch
@@ -0,0 +1,163 @@
+Subject: printk: Add a printk kill switch
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 22 Jul 2011 17:58:40 +0200
+
+Add a prinkt-kill-switch. This is used from (NMI) watchdog to ensure that
+it does not dead-lock with the early printk code.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/printk.h |    2 +
+ kernel/printk/printk.c |   79 ++++++++++++++++++++++++++++++++++++-------------
+ kernel/watchdog_hld.c  |   10 ++++++
+ 3 files changed, 71 insertions(+), 20 deletions(-)
+
+--- a/include/linux/printk.h
++++ b/include/linux/printk.h
+@@ -142,9 +142,11 @@ struct va_format {
+ #ifdef CONFIG_EARLY_PRINTK
+ extern asmlinkage __printf(1, 2)
+ void early_printk(const char *fmt, ...);
++extern void printk_kill(void);
+ #else
+ static inline __printf(1, 2) __cold
+ void early_printk(const char *s, ...) { }
++static inline void printk_kill(void) { }
+ #endif
+ 
+ #ifdef CONFIG_PRINTK_NMI
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -400,6 +400,58 @@ DEFINE_RAW_SPINLOCK(logbuf_lock);
+ 		printk_safe_exit_irqrestore(flags);	\
+ 	} while (0)
+ 
++#ifdef CONFIG_EARLY_PRINTK
++struct console *early_console;
++
++static void early_vprintk(const char *fmt, va_list ap)
++{
++	if (early_console) {
++		char buf[512];
++		int n = vscnprintf(buf, sizeof(buf), fmt, ap);
++
++		early_console->write(early_console, buf, n);
++	}
++}
++
++asmlinkage void early_printk(const char *fmt, ...)
++{
++	va_list ap;
++
++	va_start(ap, fmt);
++	early_vprintk(fmt, ap);
++	va_end(ap);
++}
++
++/*
++ * This is independent of any log levels - a global
++ * kill switch that turns off all of printk.
++ *
++ * Used by the NMI watchdog if early-printk is enabled.
++ */
++static bool __read_mostly printk_killswitch;
++
++void printk_kill(void)
++{
++	printk_killswitch = true;
++}
++
++#ifdef CONFIG_PRINTK
++static int forced_early_printk(const char *fmt, va_list ap)
++{
++	if (!printk_killswitch)
++		return 0;
++	early_vprintk(fmt, ap);
++	return 1;
++}
++#endif
++
++#else
++static inline int forced_early_printk(const char *fmt, va_list ap)
++{
++	return 0;
++}
++#endif
++
+ #ifdef CONFIG_PRINTK
+ DECLARE_WAIT_QUEUE_HEAD(log_wait);
+ /* the next printk record to read by syslog(READ) or /proc/kmsg */
+@@ -1692,6 +1744,13 @@ asmlinkage int vprintk_emit(int facility
+ 	int printed_len;
+ 	bool in_sched = false;
+ 
++	/*
++	 * Fall back to early_printk if a debugging subsystem has
++	 * killed printk output
++	 */
++	if (unlikely(forced_early_printk(fmt, args)))
++		return 1;
++
+ 	if (level == LOGLEVEL_SCHED) {
+ 		level = LOGLEVEL_DEFAULT;
+ 		in_sched = true;
+@@ -1863,26 +1922,6 @@ static bool suppress_message_printing(in
+ 
+ #endif /* CONFIG_PRINTK */
+ 
+-#ifdef CONFIG_EARLY_PRINTK
+-struct console *early_console;
+-
+-asmlinkage __visible void early_printk(const char *fmt, ...)
+-{
+-	va_list ap;
+-	char buf[512];
+-	int n;
+-
+-	if (!early_console)
+-		return;
+-
+-	va_start(ap, fmt);
+-	n = vscnprintf(buf, sizeof(buf), fmt, ap);
+-	va_end(ap);
+-
+-	early_console->write(early_console, buf, n);
+-}
+-#endif
+-
+ static int __add_preferred_console(char *name, int idx, char *options,
+ 				   char *brl_options)
+ {
+--- a/kernel/watchdog_hld.c
++++ b/kernel/watchdog_hld.c
+@@ -24,6 +24,8 @@ static DEFINE_PER_CPU(bool, hard_watchdo
+ static DEFINE_PER_CPU(bool, watchdog_nmi_touch);
+ static DEFINE_PER_CPU(struct perf_event *, watchdog_ev);
+ static DEFINE_PER_CPU(struct perf_event *, dead_event);
++static DEFINE_RAW_SPINLOCK(watchdog_output_lock);
++
+ static struct cpumask dead_events_mask;
+ 
+ static unsigned long hardlockup_allcpu_dumped;
+@@ -134,6 +136,13 @@ static void watchdog_overflow_callback(s
+ 		/* only print hardlockups once */
+ 		if (__this_cpu_read(hard_watchdog_warn) == true)
+ 			return;
++		/*
++		 * If early-printk is enabled then make sure we do not
++		 * lock up in printk() and kill console logging:
++		 */
++		printk_kill();
++
++		raw_spin_lock(&watchdog_output_lock);
+ 
+ 		pr_emerg("Watchdog detected hard LOCKUP on cpu %d", this_cpu);
+ 		print_modules();
+@@ -151,6 +160,7 @@ static void watchdog_overflow_callback(s
+ 				!test_and_set_bit(0, &hardlockup_allcpu_dumped))
+ 			trigger_allbutself_cpu_backtrace();
+ 
++		raw_spin_unlock(&watchdog_output_lock);
+ 		if (hardlockup_panic)
+ 			nmi_panic(regs, "Hard LOCKUP");
+ 
diff --git a/kernel/patches-4.14.x-rt/0126-printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch b/kernel/patches-4.14.x-rt/0126-printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch
new file mode 100644
index 000000000..a9a912fa5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0126-printk-27force_early_printk-27-boot-param-to-help-with-debugging.patch
@@ -0,0 +1,31 @@
+Subject: printk: Add "force_early_printk" boot param to help with debugging
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Fri, 02 Sep 2011 14:41:29 +0200
+
+Gives me an option to screw printk and actually see what the machine
+says.
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Link: http://lkml.kernel.org/r/1314967289.1301.11.camel@twins
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Link: http://lkml.kernel.org/n/tip-ykb97nsfmobq44xketrxs977@git.kernel.org
+---
+ kernel/printk/printk.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -430,6 +430,13 @@ asmlinkage void early_printk(const char
+  */
+ static bool __read_mostly printk_killswitch;
+ 
++static int __init force_early_printk_setup(char *str)
++{
++	printk_killswitch = true;
++	return 0;
++}
++early_param("force_early_printk", force_early_printk_setup);
++
+ void printk_kill(void)
+ {
+ 	printk_killswitch = true;
diff --git a/kernel/patches-4.14.x-rt/0127-rt-preempt-base-config.patch b/kernel/patches-4.14.x-rt/0127-rt-preempt-base-config.patch
new file mode 100644
index 000000000..3f962fb74
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0127-rt-preempt-base-config.patch
@@ -0,0 +1,53 @@
+Subject: rt: Provide PREEMPT_RT_BASE config switch
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 17 Jun 2011 12:39:57 +0200
+
+Introduce PREEMPT_RT_BASE which enables parts of
+PREEMPT_RT_FULL. Forces interrupt threading and enables some of the RT
+substitutions for testing.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/Kconfig.preempt |   19 +++++++++++++++++--
+ 1 file changed, 17 insertions(+), 2 deletions(-)
+
+--- a/kernel/Kconfig.preempt
++++ b/kernel/Kconfig.preempt
+@@ -1,3 +1,10 @@
++config PREEMPT
++	bool
++	select PREEMPT_COUNT
++
++config PREEMPT_RT_BASE
++	bool
++	select PREEMPT
+ 
+ choice
+ 	prompt "Preemption Model"
+@@ -33,9 +40,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 +59,14 @@ 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.
++
+ endchoice
+ 
+ config PREEMPT_COUNT
diff --git a/kernel/patches-4.14.x-rt/0128-kconfig-disable-a-few-options-rt.patch b/kernel/patches-4.14.x-rt/0128-kconfig-disable-a-few-options-rt.patch
new file mode 100644
index 000000000..eecb81a33
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0128-kconfig-disable-a-few-options-rt.patch
@@ -0,0 +1,33 @@
+Subject: kconfig: Disable config options which are not RT compatible
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 24 Jul 2011 12:11:43 +0200
+
+Disable stuff which is known to have issues on RT
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/Kconfig |    1 +
+ mm/Kconfig   |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/Kconfig
++++ b/arch/Kconfig
+@@ -17,6 +17,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
+--- a/mm/Kconfig
++++ b/mm/Kconfig
+@@ -385,7 +385,7 @@ config NOMMU_INITIAL_TRIM_EXCESS
+ 
+ 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/kernel/patches-4.14.x-rt/0129-kconfig-preempt-rt-full.patch b/kernel/patches-4.14.x-rt/0129-kconfig-preempt-rt-full.patch
new file mode 100644
index 000000000..9e5dfe30c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0129-kconfig-preempt-rt-full.patch
@@ -0,0 +1,58 @@
+Subject: kconfig: Add PREEMPT_RT_FULL
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 29 Jun 2011 14:58:57 +0200
+
+Introduce the final symbol for PREEMPT_RT_FULL.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ init/Makefile          |    2 +-
+ kernel/Kconfig.preempt |    8 ++++++++
+ scripts/mkcompile_h    |    4 +++-
+ 3 files changed, 12 insertions(+), 2 deletions(-)
+
+--- a/init/Makefile
++++ b/init/Makefile
+@@ -36,4 +36,4 @@ mounts-$(CONFIG_BLK_DEV_MD)	+= do_mounts
+ 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)"
+--- a/kernel/Kconfig.preempt
++++ b/kernel/Kconfig.preempt
+@@ -67,6 +67,14 @@ config PREEMPT_RTB
+ 	  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
+--- a/scripts/mkcompile_h
++++ b/scripts/mkcompile_h
+@@ -5,7 +5,8 @@ TARGET=$1
+ ARCH=$2
+ SMP=$3
+ PREEMPT=$4
+-CC=$5
++RT=$5
++CC=$6
+ 
+ vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
+ 
+@@ -58,6 +59,7 @@ UTS_VERSION="#$VERSION"
+ CONFIG_FLAGS=""
+ if [ -n "$SMP" ] ; then CONFIG_FLAGS="SMP"; fi
+ if [ -n "$PREEMPT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS PREEMPT"; fi
++if [ -n "$RT" ] ; then CONFIG_FLAGS="$CONFIG_FLAGS RT"; fi
+ UTS_VERSION="$UTS_VERSION $CONFIG_FLAGS $TIMESTAMP"
+ 
+ # Truncate to maximum length
diff --git a/kernel/patches-4.14.x-rt/0130-bug-rt-dependend-variants.patch b/kernel/patches-4.14.x-rt/0130-bug-rt-dependend-variants.patch
new file mode 100644
index 000000000..a8c591934
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0130-bug-rt-dependend-variants.patch
@@ -0,0 +1,36 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:58 -0500
+Subject: bug: BUG_ON/WARN_ON variants dependend on RT/!RT
+
+Introduce RT/NON-RT WARN/BUG statements to avoid ifdefs in the code.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/asm-generic/bug.h |   14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+
+--- a/include/asm-generic/bug.h
++++ b/include/asm-generic/bug.h
+@@ -233,6 +233,20 @@ void __warn(const char *file, int line,
+ # define WARN_ON_SMP(x)			({0;})
+ #endif
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++# define BUG_ON_RT(c)			BUG_ON(c)
++# define BUG_ON_NONRT(c)		do { } while (0)
++# define WARN_ON_RT(condition)		WARN_ON(condition)
++# define WARN_ON_NONRT(condition)	do { } while (0)
++# define WARN_ON_ONCE_NONRT(condition)	do { } while (0)
++#else
++# define BUG_ON_RT(c)			do { } while (0)
++# define BUG_ON_NONRT(c)		BUG_ON(c)
++# define WARN_ON_RT(condition)		do { } while (0)
++# define WARN_ON_NONRT(condition)	WARN_ON(condition)
++# define WARN_ON_ONCE_NONRT(condition)	WARN_ON_ONCE(condition)
++#endif
++
+ #endif /* __ASSEMBLY__ */
+ 
+ #endif
diff --git a/kernel/patches-4.14.x-rt/0131-iommu-amd--Use-WARN_ON_NORT.patch b/kernel/patches-4.14.x-rt/0131-iommu-amd--Use-WARN_ON_NORT.patch
new file mode 100644
index 000000000..77e6c4702
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0131-iommu-amd--Use-WARN_ON_NORT.patch
@@ -0,0 +1,46 @@
+Subject: iommu/amd: Use WARN_ON_NORT in __attach_device()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 27 Feb 2016 10:22:23 +0100
+
+RT does not disable interrupts here, but the protection is still
+correct. Fixup the WARN_ON so it won't yell on RT.
+
+Note: This WARN_ON is bogus anyway. The real thing this needs to check is that
+amd_iommu_devtable_lock is held.
+
+Reported-by: DIXLOR <dixlor@gmail.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/iommu/amd_iommu.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/iommu/amd_iommu.c
++++ b/drivers/iommu/amd_iommu.c
+@@ -1944,10 +1944,10 @@ static int __attach_device(struct iommu_
+ 	int ret;
+ 
+ 	/*
+-	 * Must be called with IRQs disabled. Warn here to detect early
+-	 * when its not.
++	 * Must be called with IRQs disabled on a non RT kernel. Warn here to
++	 * detect early when its not.
+ 	 */
+-	WARN_ON(!irqs_disabled());
++	WARN_ON_NONRT(!irqs_disabled());
+ 
+ 	/* lock domain */
+ 	spin_lock(&domain->lock);
+@@ -2115,10 +2115,10 @@ static void __detach_device(struct iommu
+ 	struct protection_domain *domain;
+ 
+ 	/*
+-	 * Must be called with IRQs disabled. Warn here to detect early
+-	 * when its not.
++	 * Must be called with IRQs disabled on a non RT kernel. Warn here to
++	 * detect early when its not.
+ 	 */
+-	WARN_ON(!irqs_disabled());
++	WARN_ON_NONRT(!irqs_disabled());
+ 
+ 	if (WARN_ON(!dev_data->domain))
+ 		return;
diff --git a/kernel/patches-4.14.x-rt/0132-local-irq-rt-depending-variants.patch b/kernel/patches-4.14.x-rt/0132-local-irq-rt-depending-variants.patch
new file mode 100644
index 000000000..f94a73892
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0132-local-irq-rt-depending-variants.patch
@@ -0,0 +1,52 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 21 Jul 2009 22:34:14 +0200
+Subject: rt: local_irq_* variants depending on RT/!RT
+
+Add local_irq_*_(no)rt variant which are mainly used to break
+interrupt disabled sections on PREEMPT_RT or to explicitely disable
+interrupts on PREEMPT_RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/interrupt.h |    2 +-
+ include/linux/irqflags.h  |   19 +++++++++++++++++++
+ 2 files changed, 20 insertions(+), 1 deletion(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -207,7 +207,7 @@ extern void devm_free_irq(struct device
+ #ifdef CONFIG_LOCKDEP
+ # define local_irq_enable_in_hardirq()	do { } while (0)
+ #else
+-# define local_irq_enable_in_hardirq()	local_irq_enable()
++# define local_irq_enable_in_hardirq()	local_irq_enable_nort()
+ #endif
+ 
+ extern void disable_irq_nosync(unsigned int irq);
+--- a/include/linux/irqflags.h
++++ b/include/linux/irqflags.h
+@@ -165,4 +165,23 @@ do {						\
+ 
+ #define irqs_disabled_flags(flags) raw_irqs_disabled_flags(flags)
+ 
++/*
++ * local_irq* variants depending on RT/!RT
++ */
++#ifdef CONFIG_PREEMPT_RT_FULL
++# define local_irq_disable_nort()	do { } while (0)
++# define local_irq_enable_nort()	do { } while (0)
++# define local_irq_save_nort(flags)	local_save_flags(flags)
++# define local_irq_restore_nort(flags)	(void)(flags)
++# define local_irq_disable_rt()		local_irq_disable()
++# define local_irq_enable_rt()		local_irq_enable()
++#else
++# define local_irq_disable_nort()	local_irq_disable()
++# define local_irq_enable_nort()	local_irq_enable()
++# define local_irq_save_nort(flags)	local_irq_save(flags)
++# define local_irq_restore_nort(flags)	local_irq_restore(flags)
++# define local_irq_disable_rt()		do { } while (0)
++# define local_irq_enable_rt()		do { } while (0)
++#endif
++
+ #endif
diff --git a/kernel/patches-4.14.x-rt/0133-preempt-nort-rt-variants.patch b/kernel/patches-4.14.x-rt/0133-preempt-nort-rt-variants.patch
new file mode 100644
index 000000000..c9a87c546
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0133-preempt-nort-rt-variants.patch
@@ -0,0 +1,47 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 24 Jul 2009 12:38:56 +0200
+Subject: preempt: Provide preempt_*_(no)rt variants
+
+RT needs a few preempt_disable/enable points which are not necessary
+otherwise. Implement variants to avoid #ifdeffery.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/preempt.h |   18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -181,7 +181,11 @@ do { \
+ 	preempt_count_dec(); \
+ } while (0)
+ 
+-#define preempt_enable_no_resched() sched_preempt_enable_no_resched()
++#ifdef CONFIG_PREEMPT_RT_BASE
++# define preempt_enable_no_resched() sched_preempt_enable_no_resched()
++#else
++# define preempt_enable_no_resched() preempt_enable()
++#endif
+ 
+ #define preemptible()	(preempt_count() == 0 && !irqs_disabled())
+ 
+@@ -298,6 +302,18 @@ do { \
+ 		set_preempt_need_resched(); \
+ } while (0)
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++# define preempt_disable_rt()		preempt_disable()
++# define preempt_enable_rt()		preempt_enable()
++# define preempt_disable_nort()		barrier()
++# define preempt_enable_nort()		barrier()
++#else
++# define preempt_disable_rt()		barrier()
++# define preempt_enable_rt()		barrier()
++# define preempt_disable_nort()		preempt_disable()
++# define preempt_enable_nort()		preempt_enable()
++#endif
++
+ #ifdef CONFIG_PREEMPT_NOTIFIERS
+ 
+ struct preempt_notifier;
diff --git a/kernel/patches-4.14.x-rt/0134-futex-workaround-migrate_disable-enable-in-different.patch b/kernel/patches-4.14.x-rt/0134-futex-workaround-migrate_disable-enable-in-different.patch
new file mode 100644
index 000000000..c6ea50626
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0134-futex-workaround-migrate_disable-enable-in-different.patch
@@ -0,0 +1,58 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 8 Mar 2017 14:23:35 +0100
+Subject: [PATCH] futex: workaround migrate_disable/enable in different context
+
+migrate_disable()/migrate_enable() takes a different path in atomic() vs
+!atomic() context. These little hacks ensure that we don't underflow / overflow
+the migrate code counts properly while we lock the hb lockwith interrupts
+enabled and unlock it with interrupts disabled.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/futex.c |   19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -2816,9 +2816,18 @@ static int futex_lock_pi(u32 __user *uad
+ 	 * lock handoff sequence.
+ 	 */
+ 	raw_spin_lock_irq(&q.pi_state->pi_mutex.wait_lock);
++	/*
++	 * the migrate_disable() here disables migration in the in_atomic() fast
++	 * path which is enabled again in the following spin_unlock(). We have
++	 * one migrate_disable() pending in the slow-path which is reversed
++	 * after the raw_spin_unlock_irq() where we leave the atomic context.
++	 */
++	migrate_disable();
++
+ 	spin_unlock(q.lock_ptr);
+ 	ret = __rt_mutex_start_proxy_lock(&q.pi_state->pi_mutex, &rt_waiter, current);
+ 	raw_spin_unlock_irq(&q.pi_state->pi_mutex.wait_lock);
++	migrate_enable();
+ 
+ 	if (ret) {
+ 		if (ret == 1)
+@@ -2965,11 +2974,21 @@ static int futex_unlock_pi(u32 __user *u
+ 		 * observed.
+ 		 */
+ 		raw_spin_lock_irq(&pi_state->pi_mutex.wait_lock);
++		/*
++		 * Magic trickery for now to make the RT migrate disable
++		 * logic happy. The following spin_unlock() happens with
++		 * interrupts disabled so the internal migrate_enable()
++		 * won't undo the migrate_disable() which was issued when
++		 * locking hb->lock.
++		 */
++		migrate_disable();
+ 		spin_unlock(&hb->lock);
+ 
+ 		/* drops pi_state->pi_mutex.wait_lock */
+ 		ret = wake_futex_pi(uaddr, uval, pi_state);
+ 
++		migrate_enable();
++
+ 		put_pi_state(pi_state);
+ 
+ 		/*
diff --git a/kernel/patches-4.14.x-rt/0135-rt-local-irq-lock.patch b/kernel/patches-4.14.x-rt/0135-rt-local-irq-lock.patch
new file mode 100644
index 000000000..c27d96204
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0135-rt-local-irq-lock.patch
@@ -0,0 +1,330 @@
+Subject: rt: Add local irq locks
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 20 Jun 2011 09:03:47 +0200
+
+Introduce locallock. For !RT this maps to preempt_disable()/
+local_irq_disable() so there is not much that changes. For RT this will
+map to a spinlock. This makes preemption possible and locked "ressource"
+gets the lockdep anotation it wouldn't have otherwise. The locks are
+recursive for owner == current. Also, all locks user migrate_disable()
+which ensures that the task is not migrated to another CPU while the lock
+is held and the owner is preempted.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/locallock.h |  271 ++++++++++++++++++++++++++++++++++++++++++++++
+ include/linux/percpu.h    |   29 ++++
+ 2 files changed, 300 insertions(+)
+
+--- /dev/null
++++ b/include/linux/locallock.h
+@@ -0,0 +1,271 @@
++#ifndef _LINUX_LOCALLOCK_H
++#define _LINUX_LOCALLOCK_H
++
++#include <linux/percpu.h>
++#include <linux/spinlock.h>
++
++#ifdef CONFIG_PREEMPT_RT_BASE
++
++#ifdef CONFIG_DEBUG_SPINLOCK
++# define LL_WARN(cond)	WARN_ON(cond)
++#else
++# define LL_WARN(cond)	do { } while (0)
++#endif
++
++/*
++ * per cpu lock based substitute for local_irq_*()
++ */
++struct local_irq_lock {
++	spinlock_t		lock;
++	struct task_struct	*owner;
++	int			nestcnt;
++	unsigned long		flags;
++};
++
++#define DEFINE_LOCAL_IRQ_LOCK(lvar)					\
++	DEFINE_PER_CPU(struct local_irq_lock, lvar) = {			\
++		.lock = __SPIN_LOCK_UNLOCKED((lvar).lock) }
++
++#define DECLARE_LOCAL_IRQ_LOCK(lvar)					\
++	DECLARE_PER_CPU(struct local_irq_lock, lvar)
++
++#define local_irq_lock_init(lvar)					\
++	do {								\
++		int __cpu;						\
++		for_each_possible_cpu(__cpu)				\
++			spin_lock_init(&per_cpu(lvar, __cpu).lock);	\
++	} while (0)
++
++static inline void __local_lock(struct local_irq_lock *lv)
++{
++	if (lv->owner != current) {
++		spin_lock(&lv->lock);
++		LL_WARN(lv->owner);
++		LL_WARN(lv->nestcnt);
++		lv->owner = current;
++	}
++	lv->nestcnt++;
++}
++
++#define local_lock(lvar)					\
++	do { __local_lock(&get_local_var(lvar)); } while (0)
++
++#define local_lock_on(lvar, cpu)				\
++	do { __local_lock(&per_cpu(lvar, cpu)); } while (0)
++
++static inline int __local_trylock(struct local_irq_lock *lv)
++{
++	if (lv->owner != current && spin_trylock(&lv->lock)) {
++		LL_WARN(lv->owner);
++		LL_WARN(lv->nestcnt);
++		lv->owner = current;
++		lv->nestcnt = 1;
++		return 1;
++	} else if (lv->owner == current) {
++		lv->nestcnt++;
++		return 1;
++	}
++	return 0;
++}
++
++#define local_trylock(lvar)						\
++	({								\
++		int __locked;						\
++		__locked = __local_trylock(&get_local_var(lvar));	\
++		if (!__locked)						\
++			put_local_var(lvar);				\
++		__locked;						\
++	})
++
++static inline void __local_unlock(struct local_irq_lock *lv)
++{
++	LL_WARN(lv->nestcnt == 0);
++	LL_WARN(lv->owner != current);
++	if (--lv->nestcnt)
++		return;
++
++	lv->owner = NULL;
++	spin_unlock(&lv->lock);
++}
++
++#define local_unlock(lvar)					\
++	do {							\
++		__local_unlock(this_cpu_ptr(&lvar));		\
++		put_local_var(lvar);				\
++	} while (0)
++
++#define local_unlock_on(lvar, cpu)                       \
++	do { __local_unlock(&per_cpu(lvar, cpu)); } while (0)
++
++static inline void __local_lock_irq(struct local_irq_lock *lv)
++{
++	spin_lock_irqsave(&lv->lock, lv->flags);
++	LL_WARN(lv->owner);
++	LL_WARN(lv->nestcnt);
++	lv->owner = current;
++	lv->nestcnt = 1;
++}
++
++#define local_lock_irq(lvar)						\
++	do { __local_lock_irq(&get_local_var(lvar)); } while (0)
++
++#define local_lock_irq_on(lvar, cpu)					\
++	do { __local_lock_irq(&per_cpu(lvar, cpu)); } while (0)
++
++static inline void __local_unlock_irq(struct local_irq_lock *lv)
++{
++	LL_WARN(!lv->nestcnt);
++	LL_WARN(lv->owner != current);
++	lv->owner = NULL;
++	lv->nestcnt = 0;
++	spin_unlock_irq(&lv->lock);
++}
++
++#define local_unlock_irq(lvar)						\
++	do {								\
++		__local_unlock_irq(this_cpu_ptr(&lvar));		\
++		put_local_var(lvar);					\
++	} while (0)
++
++#define local_unlock_irq_on(lvar, cpu)					\
++	do {								\
++		__local_unlock_irq(&per_cpu(lvar, cpu));		\
++	} while (0)
++
++static inline int __local_lock_irqsave(struct local_irq_lock *lv)
++{
++	if (lv->owner != current) {
++		__local_lock_irq(lv);
++		return 0;
++	} else {
++		lv->nestcnt++;
++		return 1;
++	}
++}
++
++#define local_lock_irqsave(lvar, _flags)				\
++	do {								\
++		if (__local_lock_irqsave(&get_local_var(lvar)))		\
++			put_local_var(lvar);				\
++		_flags = __this_cpu_read(lvar.flags);			\
++	} while (0)
++
++#define local_lock_irqsave_on(lvar, _flags, cpu)			\
++	do {								\
++		__local_lock_irqsave(&per_cpu(lvar, cpu));		\
++		_flags = per_cpu(lvar, cpu).flags;			\
++	} while (0)
++
++static inline int __local_unlock_irqrestore(struct local_irq_lock *lv,
++					    unsigned long flags)
++{
++	LL_WARN(!lv->nestcnt);
++	LL_WARN(lv->owner != current);
++	if (--lv->nestcnt)
++		return 0;
++
++	lv->owner = NULL;
++	spin_unlock_irqrestore(&lv->lock, lv->flags);
++	return 1;
++}
++
++#define local_unlock_irqrestore(lvar, flags)				\
++	do {								\
++		if (__local_unlock_irqrestore(this_cpu_ptr(&lvar), flags)) \
++			put_local_var(lvar);				\
++	} while (0)
++
++#define local_unlock_irqrestore_on(lvar, flags, cpu)			\
++	do {								\
++		__local_unlock_irqrestore(&per_cpu(lvar, cpu), flags);	\
++	} while (0)
++
++#define local_spin_trylock_irq(lvar, lock)				\
++	({								\
++		int __locked;						\
++		local_lock_irq(lvar);					\
++		__locked = spin_trylock(lock);				\
++		if (!__locked)						\
++			local_unlock_irq(lvar);				\
++		__locked;						\
++	})
++
++#define local_spin_lock_irq(lvar, lock)					\
++	do {								\
++		local_lock_irq(lvar);					\
++		spin_lock(lock);					\
++	} while (0)
++
++#define local_spin_unlock_irq(lvar, lock)				\
++	do {								\
++		spin_unlock(lock);					\
++		local_unlock_irq(lvar);					\
++	} while (0)
++
++#define local_spin_lock_irqsave(lvar, lock, flags)			\
++	do {								\
++		local_lock_irqsave(lvar, flags);			\
++		spin_lock(lock);					\
++	} while (0)
++
++#define local_spin_unlock_irqrestore(lvar, lock, flags)			\
++	do {								\
++		spin_unlock(lock);					\
++		local_unlock_irqrestore(lvar, flags);			\
++	} while (0)
++
++#define get_locked_var(lvar, var)					\
++	(*({								\
++		local_lock(lvar);					\
++		this_cpu_ptr(&var);					\
++	}))
++
++#define put_locked_var(lvar, var)	local_unlock(lvar);
++
++#define local_lock_cpu(lvar)						\
++	({								\
++		local_lock(lvar);					\
++		smp_processor_id();					\
++	})
++
++#define local_unlock_cpu(lvar)			local_unlock(lvar)
++
++#else /* PREEMPT_RT_BASE */
++
++#define DEFINE_LOCAL_IRQ_LOCK(lvar)		__typeof__(const int) lvar
++#define DECLARE_LOCAL_IRQ_LOCK(lvar)		extern __typeof__(const int) lvar
++
++static inline void local_irq_lock_init(int lvar) { }
++
++#define local_trylock(lvar)					\
++	({							\
++		preempt_disable();				\
++		1;						\
++	})
++
++#define local_lock(lvar)			preempt_disable()
++#define local_unlock(lvar)			preempt_enable()
++#define local_lock_irq(lvar)			local_irq_disable()
++#define local_lock_irq_on(lvar, cpu)		local_irq_disable()
++#define local_unlock_irq(lvar)			local_irq_enable()
++#define local_unlock_irq_on(lvar, cpu)		local_irq_enable()
++#define local_lock_irqsave(lvar, flags)		local_irq_save(flags)
++#define local_unlock_irqrestore(lvar, flags)	local_irq_restore(flags)
++
++#define local_spin_trylock_irq(lvar, lock)	spin_trylock_irq(lock)
++#define local_spin_lock_irq(lvar, lock)		spin_lock_irq(lock)
++#define local_spin_unlock_irq(lvar, lock)	spin_unlock_irq(lock)
++#define local_spin_lock_irqsave(lvar, lock, flags)	\
++	spin_lock_irqsave(lock, flags)
++#define local_spin_unlock_irqrestore(lvar, lock, flags)	\
++	spin_unlock_irqrestore(lock, flags)
++
++#define get_locked_var(lvar, var)		get_cpu_var(var)
++#define put_locked_var(lvar, var)		put_cpu_var(var)
++
++#define local_lock_cpu(lvar)			get_cpu()
++#define local_unlock_cpu(lvar)			put_cpu()
++
++#endif
++
++#endif
+--- a/include/linux/percpu.h
++++ b/include/linux/percpu.h
+@@ -19,6 +19,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)
+ 
diff --git a/kernel/patches-4.14.x-rt/0136-ata-disable-interrupts-if-non-rt.patch b/kernel/patches-4.14.x-rt/0136-ata-disable-interrupts-if-non-rt.patch
new file mode 100644
index 000000000..6de60f7f8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0136-ata-disable-interrupts-if-non-rt.patch
@@ -0,0 +1,28 @@
+From: Steven Rostedt <srostedt@redhat.com>
+Date: Fri, 3 Jul 2009 08:44:29 -0500
+Subject: ata: Do not disable interrupts in ide code for preempt-rt
+
+Use the local_irq_*_nort variants.
+
+Signed-off-by: Steven Rostedt <srostedt@redhat.com>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/ata/libata-sff.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/ata/libata-sff.c
++++ b/drivers/ata/libata-sff.c
+@@ -679,9 +679,9 @@ unsigned int ata_sff_data_xfer_noirq(str
+ 	unsigned long flags;
+ 	unsigned int consumed;
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	consumed = ata_sff_data_xfer32(qc, buf, buflen, rw);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 
+ 	return consumed;
+ }
diff --git a/kernel/patches-4.14.x-rt/0137-ide-use-nort-local-irq-variants.patch b/kernel/patches-4.14.x-rt/0137-ide-use-nort-local-irq-variants.patch
new file mode 100644
index 000000000..974d1c716
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0137-ide-use-nort-local-irq-variants.patch
@@ -0,0 +1,169 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:30:16 -0500
+Subject: ide: Do not disable interrupts for PREEMPT-RT
+
+Use the local_irq_*_nort variants.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/ide/alim15x3.c     |    4 ++--
+ drivers/ide/hpt366.c       |    4 ++--
+ drivers/ide/ide-io-std.c   |    8 ++++----
+ drivers/ide/ide-io.c       |    2 +-
+ drivers/ide/ide-iops.c     |    4 ++--
+ drivers/ide/ide-probe.c    |    4 ++--
+ drivers/ide/ide-taskfile.c |    6 +++---
+ 7 files changed, 16 insertions(+), 16 deletions(-)
+
+--- a/drivers/ide/alim15x3.c
++++ b/drivers/ide/alim15x3.c
+@@ -234,7 +234,7 @@ static int init_chipset_ali15x3(struct p
+ 
+ 	isa_dev = pci_get_device(PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1533, NULL);
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 
+ 	if (m5229_revision < 0xC2) {
+ 		/*
+@@ -325,7 +325,7 @@ static int init_chipset_ali15x3(struct p
+ 	}
+ 	pci_dev_put(north);
+ 	pci_dev_put(isa_dev);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 	return 0;
+ }
+ 
+--- a/drivers/ide/hpt366.c
++++ b/drivers/ide/hpt366.c
+@@ -1236,7 +1236,7 @@ static int init_dma_hpt366(ide_hwif_t *h
+ 
+ 	dma_old = inb(base + 2);
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 
+ 	dma_new = dma_old;
+ 	pci_read_config_byte(dev, hwif->channel ? 0x4b : 0x43, &masterdma);
+@@ -1247,7 +1247,7 @@ static int init_dma_hpt366(ide_hwif_t *h
+ 	if (dma_new != dma_old)
+ 		outb(dma_new, base + 2);
+ 
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 
+ 	printk(KERN_INFO "    %s: BM-DMA at 0x%04lx-0x%04lx\n",
+ 			 hwif->name, base, base + 7);
+--- 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,
+ 		unsigned long uninitialized_var(flags);
+ 
+ 		if ((io_32bit & 2) && !mmio) {
+-			local_irq_save(flags);
++			local_irq_save_nort(flags);
+ 			ata_vlb_sync(io_ports->nsect_addr);
+ 		}
+ 
+@@ -186,7 +186,7 @@ void ide_input_data(ide_drive_t *drive,
+ 			insl(data_addr, buf, words);
+ 
+ 		if ((io_32bit & 2) && !mmio)
+-			local_irq_restore(flags);
++			local_irq_restore_nort(flags);
+ 
+ 		if (((len + 1) & 3) < 2)
+ 			return;
+@@ -219,7 +219,7 @@ void ide_output_data(ide_drive_t *drive,
+ 		unsigned long uninitialized_var(flags);
+ 
+ 		if ((io_32bit & 2) && !mmio) {
+-			local_irq_save(flags);
++			local_irq_save_nort(flags);
+ 			ata_vlb_sync(io_ports->nsect_addr);
+ 		}
+ 
+@@ -230,7 +230,7 @@ void ide_output_data(ide_drive_t *drive,
+ 			outsl(data_addr, buf, words);
+ 
+ 		if ((io_32bit & 2) && !mmio)
+-			local_irq_restore(flags);
++			local_irq_restore_nort(flags);
+ 
+ 		if (((len + 1) & 3) < 2)
+ 			return;
+--- a/drivers/ide/ide-io.c
++++ b/drivers/ide/ide-io.c
+@@ -660,7 +660,7 @@ void ide_timer_expiry (unsigned long dat
+ 		/* 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)) {
+--- a/drivers/ide/ide-iops.c
++++ b/drivers/ide/ide-iops.c
+@@ -129,12 +129,12 @@ int __ide_wait_stat(ide_drive_t *drive,
+ 				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.
+--- a/drivers/ide/ide-probe.c
++++ b/drivers/ide/ide-probe.c
+@@ -196,10 +196,10 @@ static void do_identify(ide_drive_t *dri
+ 	int bswap = 1;
+ 
+ 	/* local CPU only; some systems need this */
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	/* read 512 bytes of id info */
+ 	hwif->tp_ops->input_data(drive, NULL, id, SECTOR_SIZE);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 
+ 	drive->dev_flags |= IDE_DFLAG_ID_READ;
+ #ifdef DEBUG
+--- a/drivers/ide/ide-taskfile.c
++++ b/drivers/ide/ide-taskfile.c
+@@ -251,7 +251,7 @@ void ide_pio_bytes(ide_drive_t *drive, s
+ 
+ 		page_is_high = PageHighMem(page);
+ 		if (page_is_high)
+-			local_irq_save(flags);
++			local_irq_save_nort(flags);
+ 
+ 		buf = kmap_atomic(page) + offset;
+ 
+@@ -272,7 +272,7 @@ void ide_pio_bytes(ide_drive_t *drive, s
+ 		kunmap_atomic(buf);
+ 
+ 		if (page_is_high)
+-			local_irq_restore(flags);
++			local_irq_restore_nort(flags);
+ 
+ 		len -= nr_bytes;
+ 	}
+@@ -415,7 +415,7 @@ static ide_startstop_t pre_task_out_intr
+ 	}
+ 
+ 	if ((drive->dev_flags & IDE_DFLAG_UNMASK) == 0)
+-		local_irq_disable();
++		local_irq_disable_nort();
+ 
+ 	ide_set_handler(drive, &task_pio_intr, WAIT_WORSTCASE);
+ 
diff --git a/kernel/patches-4.14.x-rt/0138-infiniband-mellanox-ib-use-nort-irq.patch b/kernel/patches-4.14.x-rt/0138-infiniband-mellanox-ib-use-nort-irq.patch
new file mode 100644
index 000000000..d62a01a35
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0138-infiniband-mellanox-ib-use-nort-irq.patch
@@ -0,0 +1,40 @@
+From: Sven-Thorsten Dietrich <sdietrich@novell.com>
+Date: Fri, 3 Jul 2009 08:30:35 -0500
+Subject: infiniband: Mellanox IB driver patch use _nort() primitives
+
+Fixes in_atomic stack-dump, when Mellanox module is loaded into the RT
+Kernel.
+
+Michael S. Tsirkin <mst@dev.mellanox.co.il> sayeth:
+"Basically, if you just make spin_lock_irqsave (and spin_lock_irq) not disable
+interrupts for non-raw spinlocks, I think all of infiniband will be fine without
+changes."
+
+Signed-off-by: Sven-Thorsten Dietrich <sven@thebigcorporation.com>
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/infiniband/ulp/ipoib/ipoib_multicast.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
++++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+@@ -895,7 +895,7 @@ void ipoib_mcast_restart_task(struct wor
+ 
+ 	ipoib_dbg_mcast(priv, "restarting multicast task\n");
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	netif_addr_lock(dev);
+ 	spin_lock(&priv->lock);
+ 
+@@ -977,7 +977,7 @@ void ipoib_mcast_restart_task(struct wor
+ 
+ 	spin_unlock(&priv->lock);
+ 	netif_addr_unlock(dev);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 
+ 	ipoib_mcast_remove_list(&remove_list);
+ 
diff --git a/kernel/patches-4.14.x-rt/0139-inpt-gameport-use-local-irq-nort.patch b/kernel/patches-4.14.x-rt/0139-inpt-gameport-use-local-irq-nort.patch
new file mode 100644
index 000000000..94f34ce39
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0139-inpt-gameport-use-local-irq-nort.patch
@@ -0,0 +1,60 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:30:16 -0500
+Subject: input: gameport: Do not disable interrupts on PREEMPT_RT
+
+Use the _nort() primitives.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/input/gameport/gameport.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/drivers/input/gameport/gameport.c
++++ b/drivers/input/gameport/gameport.c
+@@ -91,13 +91,13 @@ static int gameport_measure_speed(struct
+ 	tx = ~0;
+ 
+ 	for (i = 0; i < 50; i++) {
+-		local_irq_save(flags);
++		local_irq_save_nort(flags);
+ 		t1 = ktime_get_ns();
+ 		for (t = 0; t < 50; t++)
+ 			gameport_read(gameport);
+ 		t2 = ktime_get_ns();
+ 		t3 = ktime_get_ns();
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ 		udelay(i * 10);
+ 		t = (t2 - t1) - (t3 - t2);
+ 		if (t < tx)
+@@ -124,12 +124,12 @@ static int old_gameport_measure_speed(st
+ 	tx = 1 << 30;
+ 
+ 	for(i = 0; i < 50; i++) {
+-		local_irq_save(flags);
++		local_irq_save_nort(flags);
+ 		GET_TIME(t1);
+ 		for (t = 0; t < 50; t++) gameport_read(gameport);
+ 		GET_TIME(t2);
+ 		GET_TIME(t3);
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ 		udelay(i * 10);
+ 		if ((t = DELTA(t2,t1) - DELTA(t3,t2)) < tx) tx = t;
+ 	}
+@@ -148,11 +148,11 @@ static int old_gameport_measure_speed(st
+ 	tx = 1 << 30;
+ 
+ 	for(i = 0; i < 50; i++) {
+-		local_irq_save(flags);
++		local_irq_save_nort(flags);
+ 		t1 = rdtsc();
+ 		for (t = 0; t < 50; t++) gameport_read(gameport);
+ 		t2 = rdtsc();
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ 		udelay(i * 10);
+ 		if (t2 - t1 < tx) tx = t2 - t1;
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0140-user-use-local-irq-nort.patch b/kernel/patches-4.14.x-rt/0140-user-use-local-irq-nort.patch
new file mode 100644
index 000000000..70bc0c583
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0140-user-use-local-irq-nort.patch
@@ -0,0 +1,29 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 21 Jul 2009 23:06:05 +0200
+Subject: core: Do not disable interrupts on RT in kernel/users.c
+
+Use the local_irq_*_nort variants to reduce latencies in RT. The code
+is serialized by the locks. No need to disable interrupts.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/user.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/user.c
++++ b/kernel/user.c
+@@ -162,11 +162,11 @@ void free_uid(struct user_struct *up)
+ 	if (!up)
+ 		return;
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	if (atomic_dec_and_lock(&up->__count, &uidhash_lock))
+ 		free_user(up, flags);
+ 	else
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ }
+ 
+ struct user_struct *alloc_uid(kuid_t uid)
diff --git a/kernel/patches-4.14.x-rt/0141-usb-use-_nort-in-giveback.patch b/kernel/patches-4.14.x-rt/0141-usb-use-_nort-in-giveback.patch
new file mode 100644
index 000000000..c05d4d70c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0141-usb-use-_nort-in-giveback.patch
@@ -0,0 +1,57 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 8 Nov 2013 17:34:54 +0100
+Subject: usb: Use _nort in giveback function
+
+Since commit 94dfd7ed ("USB: HCD: support giveback of URB in tasklet
+context") I see
+
+|BUG: sleeping function called from invalid context at kernel/rtmutex.c:673
+|in_atomic(): 0, irqs_disabled(): 1, pid: 109, name: irq/11-uhci_hcd
+|no locks held by irq/11-uhci_hcd/109.
+|irq event stamp: 440
+|hardirqs last  enabled at (439): [<ffffffff816a7555>] _raw_spin_unlock_irqrestore+0x75/0x90
+|hardirqs last disabled at (440): [<ffffffff81514906>] __usb_hcd_giveback_urb+0x46/0xc0
+|softirqs last  enabled at (0): [<ffffffff81081821>] copy_process.part.52+0x511/0x1510
+|softirqs last disabled at (0): [<          (null)>]           (null)
+|CPU: 3 PID: 109 Comm: irq/11-uhci_hcd Not tainted 3.12.0-rt0-rc1+ #13
+|Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
+| 0000000000000000 ffff8800db9ffbe0 ffffffff8169f064 0000000000000000
+| ffff8800db9ffbf8 ffffffff810b2122 ffff88020f03e888 ffff8800db9ffc18
+| ffffffff816a6944 ffffffff810b5748 ffff88020f03c000 ffff8800db9ffc50
+|Call Trace:
+| [<ffffffff8169f064>] dump_stack+0x4e/0x8f
+| [<ffffffff810b2122>] __might_sleep+0x112/0x190
+| [<ffffffff816a6944>] rt_spin_lock+0x24/0x60
+| [<ffffffff8158435b>] hid_ctrl+0x3b/0x190
+| [<ffffffff8151490f>] __usb_hcd_giveback_urb+0x4f/0xc0
+| [<ffffffff81514aaf>] usb_hcd_giveback_urb+0x3f/0x140
+| [<ffffffff815346af>] uhci_giveback_urb+0xaf/0x280
+| [<ffffffff8153666a>] uhci_scan_schedule+0x47a/0xb10
+| [<ffffffff81537336>] uhci_irq+0xa6/0x1a0
+| [<ffffffff81513c48>] usb_hcd_irq+0x28/0x40
+| [<ffffffff810c8ba3>] irq_forced_thread_fn+0x23/0x70
+| [<ffffffff810c918f>] irq_thread+0x10f/0x150
+| [<ffffffff810a6fad>] kthread+0xcd/0xe0
+| [<ffffffff816a842c>] ret_from_fork+0x7c/0xb0
+
+on -RT we run threaded so no need to disable interrupts.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/usb/core/hcd.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/usb/core/hcd.c
++++ b/drivers/usb/core/hcd.c
+@@ -1775,9 +1775,9 @@ static void __usb_hcd_giveback_urb(struc
+ 	 * and no one may trigger the above deadlock situation when
+ 	 * running complete() in tasklet.
+ 	 */
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	urb->complete(urb);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 
+ 	usb_anchor_resume_wakeups(anchor);
+ 	atomic_dec(&urb->use_count);
diff --git a/kernel/patches-4.14.x-rt/0142-mm-scatterlist-dont-disable-irqs-on-RT.patch b/kernel/patches-4.14.x-rt/0142-mm-scatterlist-dont-disable-irqs-on-RT.patch
new file mode 100644
index 000000000..2072310b6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0142-mm-scatterlist-dont-disable-irqs-on-RT.patch
@@ -0,0 +1,23 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 3 Jul 2009 08:44:34 -0500
+Subject: mm/scatterlist: Do not disable irqs on RT
+
+For -RT it is enough to keep pagefault disabled (which is currently handled by
+kmap_atomic()).
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ lib/scatterlist.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/scatterlist.c
++++ b/lib/scatterlist.c
+@@ -620,7 +620,7 @@ void sg_miter_stop(struct sg_mapping_ite
+ 			flush_kernel_dcache_page(miter->page);
+ 
+ 		if (miter->__flags & SG_MITER_ATOMIC) {
+-			WARN_ON_ONCE(preemptible());
++			WARN_ON_ONCE(!pagefault_disabled());
+ 			kunmap_atomic(miter->addr);
+ 		} else
+ 			kunmap(miter->page);
diff --git a/kernel/patches-4.14.x-rt/0143-mm-workingset-do-not-protect-workingset_shadow_nodes.patch b/kernel/patches-4.14.x-rt/0143-mm-workingset-do-not-protect-workingset_shadow_nodes.patch
new file mode 100644
index 000000000..800d0d213
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0143-mm-workingset-do-not-protect-workingset_shadow_nodes.patch
@@ -0,0 +1,183 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 29 Jan 2015 17:19:44 +0100
+Subject: mm/workingset: Do not protect workingset_shadow_nodes with irq off
+
+workingset_shadow_nodes is protected by local_irq_disable(). Some users
+use spin_lock_irq().
+Replace the irq/on with a local_lock(). Rename workingset_shadow_nodes
+so I catch users of it which will be introduced later.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/swap.h |    4 +++-
+ mm/filemap.c         |    9 +++++++--
+ mm/truncate.c        |    4 +++-
+ mm/workingset.c      |   31 ++++++++++++++++---------------
+ 4 files changed, 29 insertions(+), 19 deletions(-)
+
+--- a/include/linux/swap.h
++++ b/include/linux/swap.h
+@@ -12,6 +12,7 @@
+ #include <linux/fs.h>
+ #include <linux/atomic.h>
+ #include <linux/page-flags.h>
++#include <linux/locallock.h>
+ #include <asm/page.h>
+ 
+ struct notifier_block;
+@@ -297,7 +298,8 @@ struct vma_swap_readahead {
+ void *workingset_eviction(struct address_space *mapping, struct page *page);
+ bool workingset_refault(void *shadow);
+ void workingset_activation(struct page *page);
+-void workingset_update_node(struct radix_tree_node *node, void *private);
++void __workingset_update_node(struct radix_tree_node *node, void *private);
++DECLARE_LOCAL_IRQ_LOCK(shadow_nodes_lock);
+ 
+ /* linux/mm/page_alloc.c */
+ extern unsigned long totalram_pages;
+--- a/mm/filemap.c
++++ b/mm/filemap.c
+@@ -110,6 +110,7 @@
+  * ->i_mmap_rwsem
+  *   ->tasklist_lock            (memory_failure, collect_procs_ao)
+  */
++DECLARE_LOCAL_IRQ_LOCK(shadow_nodes_lock);
+ 
+ static int page_cache_tree_insert(struct address_space *mapping,
+ 				  struct page *page, void **shadowp)
+@@ -133,8 +134,10 @@ static int page_cache_tree_insert(struct
+ 		if (shadowp)
+ 			*shadowp = p;
+ 	}
++	local_lock(shadow_nodes_lock);
+ 	__radix_tree_replace(&mapping->page_tree, node, slot, page,
+-			     workingset_update_node, mapping);
++			     __workingset_update_node, mapping);
++	local_unlock(shadow_nodes_lock);
+ 	mapping->nrpages++;
+ 	return 0;
+ }
+@@ -151,6 +154,7 @@ static void page_cache_tree_delete(struc
+ 	VM_BUG_ON_PAGE(PageTail(page), page);
+ 	VM_BUG_ON_PAGE(nr != 1 && shadow, page);
+ 
++	local_lock(shadow_nodes_lock);
+ 	for (i = 0; i < nr; i++) {
+ 		struct radix_tree_node *node;
+ 		void **slot;
+@@ -162,8 +166,9 @@ static void page_cache_tree_delete(struc
+ 
+ 		radix_tree_clear_tags(&mapping->page_tree, node, slot);
+ 		__radix_tree_replace(&mapping->page_tree, node, slot, shadow,
+-				     workingset_update_node, mapping);
++				     __workingset_update_node, mapping);
+ 	}
++	local_unlock(shadow_nodes_lock);
+ 
+ 	if (shadow) {
+ 		mapping->nrexceptional += nr;
+--- a/mm/truncate.c
++++ b/mm/truncate.c
+@@ -41,8 +41,10 @@ static void clear_shadow_entry(struct ad
+ 		goto unlock;
+ 	if (*slot != entry)
+ 		goto unlock;
++	local_lock(shadow_nodes_lock);
+ 	__radix_tree_replace(&mapping->page_tree, node, slot, NULL,
+-			     workingset_update_node, mapping);
++			     __workingset_update_node, mapping);
++	local_unlock(shadow_nodes_lock);
+ 	mapping->nrexceptional--;
+ unlock:
+ 	spin_unlock_irq(&mapping->tree_lock);
+--- a/mm/workingset.c
++++ b/mm/workingset.c
+@@ -338,9 +338,10 @@ void workingset_activation(struct page *
+  * point where they would still be useful.
+  */
+ 
+-static struct list_lru shadow_nodes;
++static struct list_lru __shadow_nodes;
++DEFINE_LOCAL_IRQ_LOCK(shadow_nodes_lock);
+ 
+-void workingset_update_node(struct radix_tree_node *node, void *private)
++void __workingset_update_node(struct radix_tree_node *node, void *private)
+ {
+ 	struct address_space *mapping = private;
+ 
+@@ -358,10 +359,10 @@ void workingset_update_node(struct radix
+ 	 */
+ 	if (node->count && node->count == node->exceptional) {
+ 		if (list_empty(&node->private_list))
+-			list_lru_add(&shadow_nodes, &node->private_list);
++			list_lru_add(&__shadow_nodes, &node->private_list);
+ 	} else {
+ 		if (!list_empty(&node->private_list))
+-			list_lru_del(&shadow_nodes, &node->private_list);
++			list_lru_del(&__shadow_nodes, &node->private_list);
+ 	}
+ }
+ 
+@@ -373,9 +374,9 @@ static unsigned long count_shadow_nodes(
+ 	unsigned long cache;
+ 
+ 	/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
+-	local_irq_disable();
+-	nodes = list_lru_shrink_count(&shadow_nodes, sc);
+-	local_irq_enable();
++	local_lock_irq(shadow_nodes_lock);
++	nodes = list_lru_shrink_count(&__shadow_nodes, sc);
++	local_unlock_irq(shadow_nodes_lock);
+ 
+ 	/*
+ 	 * Approximate a reasonable limit for the radix tree nodes
+@@ -475,15 +476,15 @@ static enum lru_status shadow_lru_isolat
+ 		goto out_invalid;
+ 	inc_lruvec_page_state(virt_to_page(node), WORKINGSET_NODERECLAIM);
+ 	__radix_tree_delete_node(&mapping->page_tree, node,
+-				 workingset_update_node, mapping);
++				 __workingset_update_node, mapping);
+ 
+ out_invalid:
+ 	spin_unlock(&mapping->tree_lock);
+ 	ret = LRU_REMOVED_RETRY;
+ out:
+-	local_irq_enable();
++	local_unlock_irq(shadow_nodes_lock);
+ 	cond_resched();
+-	local_irq_disable();
++	local_lock_irq(shadow_nodes_lock);
+ 	spin_lock(lru_lock);
+ 	return ret;
+ }
+@@ -494,9 +495,9 @@ static unsigned long scan_shadow_nodes(s
+ 	unsigned long ret;
+ 
+ 	/* list_lru lock nests inside IRQ-safe mapping->tree_lock */
+-	local_irq_disable();
+-	ret = list_lru_shrink_walk(&shadow_nodes, sc, shadow_lru_isolate, NULL);
+-	local_irq_enable();
++	local_lock_irq(shadow_nodes_lock);
++	ret = list_lru_shrink_walk(&__shadow_nodes, sc, shadow_lru_isolate, NULL);
++	local_unlock_irq(shadow_nodes_lock);
+ 	return ret;
+ }
+ 
+@@ -534,7 +535,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);
+ 
+-	ret = __list_lru_init(&shadow_nodes, true, &shadow_nodes_key);
++	ret = __list_lru_init(&__shadow_nodes, true, &shadow_nodes_key);
+ 	if (ret)
+ 		goto err;
+ 	ret = register_shrinker(&workingset_shadow_shrinker);
+@@ -542,7 +543,7 @@ static int __init workingset_init(void)
+ 		goto err_list_lru;
+ 	return 0;
+ err_list_lru:
+-	list_lru_destroy(&shadow_nodes);
++	list_lru_destroy(&__shadow_nodes);
+ err:
+ 	return ret;
+ }
diff --git a/kernel/patches-4.14.x-rt/0144-signal-fix-up-rcu-wreckage.patch b/kernel/patches-4.14.x-rt/0144-signal-fix-up-rcu-wreckage.patch
new file mode 100644
index 000000000..4af8a7a69
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0144-signal-fix-up-rcu-wreckage.patch
@@ -0,0 +1,38 @@
+Subject: signal: Make __lock_task_sighand() RT aware
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 22 Jul 2011 08:07:08 +0200
+
+local_irq_save() + spin_lock(&sighand->siglock) does not work on
+-RT. Use the nort variants.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/signal.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1302,12 +1302,12 @@ struct sighand_struct *__lock_task_sigha
+ 		 * Disable interrupts early to avoid deadlocks.
+ 		 * See rcu_read_unlock() comment header for details.
+ 		 */
+-		local_irq_save(*flags);
++		local_irq_save_nort(*flags);
+ 		rcu_read_lock();
+ 		sighand = rcu_dereference(tsk->sighand);
+ 		if (unlikely(sighand == NULL)) {
+ 			rcu_read_unlock();
+-			local_irq_restore(*flags);
++			local_irq_restore_nort(*flags);
+ 			break;
+ 		}
+ 		/*
+@@ -1328,7 +1328,7 @@ struct sighand_struct *__lock_task_sigha
+ 		}
+ 		spin_unlock(&sighand->siglock);
+ 		rcu_read_unlock();
+-		local_irq_restore(*flags);
++		local_irq_restore_nort(*flags);
+ 	}
+ 
+ 	return sighand;
diff --git a/kernel/patches-4.14.x-rt/0145-oleg-signal-rt-fix.patch b/kernel/patches-4.14.x-rt/0145-oleg-signal-rt-fix.patch
new file mode 100644
index 000000000..5ecc92d2d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0145-oleg-signal-rt-fix.patch
@@ -0,0 +1,142 @@
+From: Oleg Nesterov <oleg@redhat.com>
+Date: Tue, 14 Jul 2015 14:26:34 +0200
+Subject: signal/x86: Delay calling signals in atomic
+
+On x86_64 we must disable preemption before we enable interrupts
+for stack faults, int3 and debugging, because the current task is using
+a per CPU debug stack defined by the IST. If we schedule out, another task
+can come in and use the same stack and cause the stack to be corrupted
+and crash the kernel on return.
+
+When CONFIG_PREEMPT_RT_FULL is enabled, spin_locks become mutexes, and
+one of these is the spin lock used in signal handling.
+
+Some of the debug code (int3) causes do_trap() to send a signal.
+This function calls a spin lock that has been converted to a mutex
+and has the possibility to sleep. If this happens, the above issues with
+the corrupted stack is possible.
+
+Instead of calling the signal right away, for PREEMPT_RT and x86_64,
+the signal information is stored on the stacks task_struct and
+TIF_NOTIFY_RESUME is set. Then on exit of the trap, the signal resume
+code will send the signal when preemption is enabled.
+
+[ rostedt: Switched from #ifdef CONFIG_PREEMPT_RT_FULL to
+  ARCH_RT_DELAYS_SIGNAL_SEND and added comments to the code. ]
+
+
+Signed-off-by: Oleg Nesterov <oleg@redhat.com>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+
+ arch/x86/entry/common.c       |    7 +++++++
+ arch/x86/include/asm/signal.h |   13 +++++++++++++
+ include/linux/sched.h         |    4 ++++
+ kernel/signal.c               |   37 +++++++++++++++++++++++++++++++++++--
+ 4 files changed, 59 insertions(+), 2 deletions(-)
+
+--- a/arch/x86/entry/common.c
++++ b/arch/x86/entry/common.c
+@@ -151,6 +151,13 @@ static void exit_to_usermode_loop(struct
+ 		if (cached_flags & _TIF_NEED_RESCHED)
+ 			schedule();
+ 
++#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
++		if (unlikely(current->forced_info.si_signo)) {
++			struct task_struct *t = current;
++			force_sig_info(t->forced_info.si_signo, &t->forced_info, t);
++			t->forced_info.si_signo = 0;
++		}
++#endif
+ 		if (cached_flags & _TIF_UPROBE)
+ 			uprobe_notify_resume(regs);
+ 
+--- a/arch/x86/include/asm/signal.h
++++ b/arch/x86/include/asm/signal.h
+@@ -28,6 +28,19 @@ typedef struct {
+ #define SA_IA32_ABI	0x02000000u
+ #define SA_X32_ABI	0x01000000u
+ 
++/*
++ * Because some traps use the IST stack, we must keep preemption
++ * disabled while calling do_trap(), but do_trap() may call
++ * force_sig_info() which will grab the signal spin_locks for the
++ * task, which in PREEMPT_RT_FULL are mutexes.  By defining
++ * ARCH_RT_DELAYS_SIGNAL_SEND the force_sig_info() will set
++ * TIF_NOTIFY_RESUME and set up the signal to be sent on exit of the
++ * trap.
++ */
++#if defined(CONFIG_PREEMPT_RT_FULL) && defined(CONFIG_X86_64)
++#define ARCH_RT_DELAYS_SIGNAL_SEND
++#endif
++
+ #ifndef CONFIG_COMPAT
+ typedef sigset_t compat_sigset_t;
+ #endif
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -795,6 +795,10 @@ struct task_struct {
+ 	/* Restored if set_restore_sigmask() was used: */
+ 	sigset_t			saved_sigmask;
+ 	struct sigpending		pending;
++#ifdef CONFIG_PREEMPT_RT_FULL
++	/* TODO: move me into ->restart_block ? */
++	struct				siginfo forced_info;
++#endif
+ 	unsigned long			sas_ss_sp;
+ 	size_t				sas_ss_size;
+ 	unsigned int			sas_ss_flags;
+--- a/kernel/signal.c
++++ b/kernel/signal.c
+@@ -1238,8 +1238,8 @@ int do_send_sig_info(int sig, struct sig
+  * We don't want to have recursive SIGSEGV's etc, for example,
+  * that is why we also clear SIGNAL_UNKILLABLE.
+  */
+-int
+-force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
++static int
++do_force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
+ {
+ 	unsigned long int flags;
+ 	int ret, blocked, ignored;
+@@ -1268,6 +1268,39 @@ force_sig_info(int sig, struct siginfo *
+ 	return ret;
+ }
+ 
++int force_sig_info(int sig, struct siginfo *info, struct task_struct *t)
++{
++/*
++ * On some archs, PREEMPT_RT has to delay sending a signal from a trap
++ * since it can not enable preemption, and the signal code's spin_locks
++ * turn into mutexes. Instead, it must set TIF_NOTIFY_RESUME which will
++ * send the signal on exit of the trap.
++ */
++#ifdef ARCH_RT_DELAYS_SIGNAL_SEND
++	if (in_atomic()) {
++		if (WARN_ON_ONCE(t != current))
++			return 0;
++		if (WARN_ON_ONCE(t->forced_info.si_signo))
++			return 0;
++
++		if (is_si_special(info)) {
++			WARN_ON_ONCE(info != SEND_SIG_PRIV);
++			t->forced_info.si_signo = sig;
++			t->forced_info.si_errno = 0;
++			t->forced_info.si_code = SI_KERNEL;
++			t->forced_info.si_pid = 0;
++			t->forced_info.si_uid = 0;
++		} else {
++			t->forced_info = *info;
++		}
++
++		set_tsk_thread_flag(t, TIF_NOTIFY_RESUME);
++		return 0;
++	}
++#endif
++	return do_force_sig_info(sig, info, t);
++}
++
+ /*
+  * Nuke all other threads in the group.
+  */
diff --git a/kernel/patches-4.14.x-rt/0146-x86-signal-delay-calling-signals-on-32bit.patch b/kernel/patches-4.14.x-rt/0146-x86-signal-delay-calling-signals-on-32bit.patch
new file mode 100644
index 000000000..e41ae9db7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0146-x86-signal-delay-calling-signals-on-32bit.patch
@@ -0,0 +1,42 @@
+From: Yang Shi <yang.shi@linaro.org>
+Date: Thu, 10 Dec 2015 10:58:51 -0800
+Subject: x86/signal: delay calling signals on 32bit
+
+When running some ptrace single step tests on x86-32 machine, the below problem
+is triggered:
+
+BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:917
+in_atomic(): 1, irqs_disabled(): 0, pid: 1041, name: dummy2
+Preemption disabled at:[<c100326f>] do_debug+0x1f/0x1a0
+
+CPU: 10 PID: 1041 Comm: dummy2 Tainted: G        W       4.1.13-rt13 #1
+Call Trace:
+ [<c1aa8306>] dump_stack+0x46/0x5c
+ [<c1080517>] ___might_sleep+0x137/0x220
+ [<c1ab0eff>] rt_spin_lock+0x1f/0x80
+ [<c1064b5a>] do_force_sig_info+0x2a/0xc0
+ [<c106567d>] force_sig_info+0xd/0x10
+ [<c1010cff>] send_sigtrap+0x6f/0x80
+ [<c10033b1>] do_debug+0x161/0x1a0
+ [<c1ab2921>] debug_stack_correct+0x2e/0x35
+
+This happens since 959274753857 ("x86, traps: Track entry into and exit
+from IST context") which was merged in v4.1-rc1.
+
+Signed-off-by: Yang Shi <yang.shi@linaro.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/include/asm/signal.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/x86/include/asm/signal.h
++++ b/arch/x86/include/asm/signal.h
+@@ -37,7 +37,7 @@ typedef struct {
+  * TIF_NOTIFY_RESUME and set up the signal to be sent on exit of the
+  * trap.
+  */
+-#if defined(CONFIG_PREEMPT_RT_FULL) && defined(CONFIG_X86_64)
++#if defined(CONFIG_PREEMPT_RT_FULL)
+ #define ARCH_RT_DELAYS_SIGNAL_SEND
+ #endif
+ 
diff --git a/kernel/patches-4.14.x-rt/0147-net-wireless-warn-nort.patch b/kernel/patches-4.14.x-rt/0147-net-wireless-warn-nort.patch
new file mode 100644
index 000000000..a035c737e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0147-net-wireless-warn-nort.patch
@@ -0,0 +1,23 @@
+Subject: net/wireless: Use WARN_ON_NORT()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 21 Jul 2011 21:05:33 +0200
+
+The softirq counter is meaningless on RT, so the check triggers a
+false positive.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ net/mac80211/rx.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/mac80211/rx.c
++++ b/net/mac80211/rx.c
+@@ -4250,7 +4250,7 @@ void ieee80211_rx_napi(struct ieee80211_
+ 	struct ieee80211_supported_band *sband;
+ 	struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb);
+ 
+-	WARN_ON_ONCE(softirq_count() == 0);
++	WARN_ON_ONCE_NONRT(softirq_count() == 0);
+ 
+ 	if (WARN_ON(status->band >= NUM_NL80211_BANDS))
+ 		goto drop;
diff --git a/kernel/patches-4.14.x-rt/0148-fs-replace-bh_uptodate_lock-for-rt.patch b/kernel/patches-4.14.x-rt/0148-fs-replace-bh_uptodate_lock-for-rt.patch
new file mode 100644
index 000000000..0145a2000
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0148-fs-replace-bh_uptodate_lock-for-rt.patch
@@ -0,0 +1,207 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 18 Mar 2011 09:18:52 +0100
+Subject: buffer_head: Replace bh_uptodate_lock for -rt
+
+Wrap the bit_spin_lock calls into a separate inline and add the RT
+replacements with a real spinlock.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ fs/buffer.c                 |   21 +++++++--------------
+ fs/ext4/page-io.c           |    6 ++----
+ fs/ntfs/aops.c              |   10 +++-------
+ fs/xfs/xfs_aops.c           |    6 ++----
+ include/linux/buffer_head.h |   34 ++++++++++++++++++++++++++++++++++
+ 5 files changed, 48 insertions(+), 29 deletions(-)
+
+--- a/fs/buffer.c
++++ b/fs/buffer.c
+@@ -302,8 +302,7 @@ static void end_buffer_async_read(struct
+ 	 * decide that the page is now completely done.
+ 	 */
+ 	first = page_buffers(page);
+-	local_irq_save(flags);
+-	bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
++	flags = bh_uptodate_lock_irqsave(first);
+ 	clear_buffer_async_read(bh);
+ 	unlock_buffer(bh);
+ 	tmp = bh;
+@@ -316,8 +315,7 @@ static void end_buffer_async_read(struct
+ 		}
+ 		tmp = tmp->b_this_page;
+ 	} while (tmp != bh);
+-	bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
+-	local_irq_restore(flags);
++	bh_uptodate_unlock_irqrestore(first, flags);
+ 
+ 	/*
+ 	 * If none of the buffers had errors and they are all
+@@ -329,9 +327,7 @@ static void end_buffer_async_read(struct
+ 	return;
+ 
+ still_busy:
+-	bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
+-	local_irq_restore(flags);
+-	return;
++	bh_uptodate_unlock_irqrestore(first, flags);
+ }
+ 
+ /*
+@@ -358,8 +354,7 @@ void end_buffer_async_write(struct buffe
+ 	}
+ 
+ 	first = page_buffers(page);
+-	local_irq_save(flags);
+-	bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
++	flags = bh_uptodate_lock_irqsave(first);
+ 
+ 	clear_buffer_async_write(bh);
+ 	unlock_buffer(bh);
+@@ -371,15 +366,12 @@ void end_buffer_async_write(struct buffe
+ 		}
+ 		tmp = tmp->b_this_page;
+ 	}
+-	bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
+-	local_irq_restore(flags);
++	bh_uptodate_unlock_irqrestore(first, flags);
+ 	end_page_writeback(page);
+ 	return;
+ 
+ still_busy:
+-	bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
+-	local_irq_restore(flags);
+-	return;
++	bh_uptodate_unlock_irqrestore(first, flags);
+ }
+ EXPORT_SYMBOL(end_buffer_async_write);
+ 
+@@ -3417,6 +3409,7 @@ struct buffer_head *alloc_buffer_head(gf
+ 	struct buffer_head *ret = kmem_cache_zalloc(bh_cachep, gfp_flags);
+ 	if (ret) {
+ 		INIT_LIST_HEAD(&ret->b_assoc_buffers);
++		buffer_head_init_locks(ret);
+ 		preempt_disable();
+ 		__this_cpu_inc(bh_accounting.nr);
+ 		recalc_bh_state();
+--- a/fs/ext4/page-io.c
++++ b/fs/ext4/page-io.c
+@@ -95,8 +95,7 @@ static void ext4_finish_bio(struct bio *
+ 		 * We check all buffers in the page under BH_Uptodate_Lock
+ 		 * to avoid races with other end io clearing async_write flags
+ 		 */
+-		local_irq_save(flags);
+-		bit_spin_lock(BH_Uptodate_Lock, &head->b_state);
++		flags = bh_uptodate_lock_irqsave(head);
+ 		do {
+ 			if (bh_offset(bh) < bio_start ||
+ 			    bh_offset(bh) + bh->b_size > bio_end) {
+@@ -108,8 +107,7 @@ static void ext4_finish_bio(struct bio *
+ 			if (bio->bi_status)
+ 				buffer_io_error(bh);
+ 		} while ((bh = bh->b_this_page) != head);
+-		bit_spin_unlock(BH_Uptodate_Lock, &head->b_state);
+-		local_irq_restore(flags);
++		bh_uptodate_unlock_irqrestore(head, flags);
+ 		if (!under_io) {
+ #ifdef CONFIG_EXT4_FS_ENCRYPTION
+ 			if (data_page)
+--- a/fs/ntfs/aops.c
++++ b/fs/ntfs/aops.c
+@@ -108,8 +108,7 @@ static void ntfs_end_buffer_async_read(s
+ 				"0x%llx.", (unsigned long long)bh->b_blocknr);
+ 	}
+ 	first = page_buffers(page);
+-	local_irq_save(flags);
+-	bit_spin_lock(BH_Uptodate_Lock, &first->b_state);
++	flags = bh_uptodate_lock_irqsave(first);
+ 	clear_buffer_async_read(bh);
+ 	unlock_buffer(bh);
+ 	tmp = bh;
+@@ -124,8 +123,7 @@ static void ntfs_end_buffer_async_read(s
+ 		}
+ 		tmp = tmp->b_this_page;
+ 	} while (tmp != bh);
+-	bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
+-	local_irq_restore(flags);
++	bh_uptodate_unlock_irqrestore(first, flags);
+ 	/*
+ 	 * 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
+@@ -160,9 +158,7 @@ static void ntfs_end_buffer_async_read(s
+ 	unlock_page(page);
+ 	return;
+ still_busy:
+-	bit_spin_unlock(BH_Uptodate_Lock, &first->b_state);
+-	local_irq_restore(flags);
+-	return;
++	bh_uptodate_unlock_irqrestore(first, flags);
+ }
+ 
+ /**
+--- a/fs/xfs/xfs_aops.c
++++ b/fs/xfs/xfs_aops.c
+@@ -120,8 +120,7 @@ xfs_finish_page_writeback(
+ 	ASSERT(bvec->bv_offset + bvec->bv_len <= PAGE_SIZE);
+ 	ASSERT((bvec->bv_len & (i_blocksize(inode) - 1)) == 0);
+ 
+-	local_irq_save(flags);
+-	bit_spin_lock(BH_Uptodate_Lock, &head->b_state);
++	flags = bh_uptodate_lock_irqsave(head);
+ 	do {
+ 		if (off >= bvec->bv_offset &&
+ 		    off < bvec->bv_offset + bvec->bv_len) {
+@@ -143,8 +142,7 @@ xfs_finish_page_writeback(
+ 		}
+ 		off += bh->b_size;
+ 	} while ((bh = bh->b_this_page) != head);
+-	bit_spin_unlock(BH_Uptodate_Lock, &head->b_state);
+-	local_irq_restore(flags);
++	bh_uptodate_unlock_irqrestore(head, flags);
+ 
+ 	if (!busy)
+ 		end_page_writeback(bvec->bv_page);
+--- a/include/linux/buffer_head.h
++++ b/include/linux/buffer_head.h
+@@ -76,8 +76,42 @@ struct buffer_head {
+ 	struct address_space *b_assoc_map;	/* mapping this buffer is
+ 						   associated with */
+ 	atomic_t b_count;		/* users using this buffer_head */
++#ifdef CONFIG_PREEMPT_RT_BASE
++	spinlock_t b_uptodate_lock;
++#endif
+ };
+ 
++static inline unsigned long bh_uptodate_lock_irqsave(struct buffer_head *bh)
++{
++	unsigned long flags;
++
++#ifndef CONFIG_PREEMPT_RT_BASE
++	local_irq_save(flags);
++	bit_spin_lock(BH_Uptodate_Lock, &bh->b_state);
++#else
++	spin_lock_irqsave(&bh->b_uptodate_lock, flags);
++#endif
++	return flags;
++}
++
++static inline void
++bh_uptodate_unlock_irqrestore(struct buffer_head *bh, unsigned long flags)
++{
++#ifndef CONFIG_PREEMPT_RT_BASE
++	bit_spin_unlock(BH_Uptodate_Lock, &bh->b_state);
++	local_irq_restore(flags);
++#else
++	spin_unlock_irqrestore(&bh->b_uptodate_lock, flags);
++#endif
++}
++
++static inline void buffer_head_init_locks(struct buffer_head *bh)
++{
++#ifdef CONFIG_PREEMPT_RT_BASE
++	spin_lock_init(&bh->b_uptodate_lock);
++#endif
++}
++
+ /*
+  * macro tricks to expand the set_buffer_foo(), clear_buffer_foo()
+  * and buffer_foo() functions.
diff --git a/kernel/patches-4.14.x-rt/0149-fs-jbd-replace-bh_state-lock.patch b/kernel/patches-4.14.x-rt/0149-fs-jbd-replace-bh_state-lock.patch
new file mode 100644
index 000000000..a56bc6909
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0149-fs-jbd-replace-bh_state-lock.patch
@@ -0,0 +1,96 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 18 Mar 2011 10:11:25 +0100
+Subject: fs: jbd/jbd2: Make state lock and journal head lock rt safe
+
+bit_spin_locks break under RT.
+
+Based on a previous patch from Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+--
+ include/linux/buffer_head.h |    8 ++++++++
+ include/linux/jbd2.h        |   24 ++++++++++++++++++++++++
+ 2 files changed, 32 insertions(+)
+
+--- a/include/linux/buffer_head.h
++++ b/include/linux/buffer_head.h
+@@ -78,6 +78,10 @@ struct buffer_head {
+ 	atomic_t b_count;		/* users using this buffer_head */
+ #ifdef CONFIG_PREEMPT_RT_BASE
+ 	spinlock_t b_uptodate_lock;
++#if IS_ENABLED(CONFIG_JBD2)
++	spinlock_t b_state_lock;
++	spinlock_t b_journal_head_lock;
++#endif
+ #endif
+ };
+ 
+@@ -109,6 +113,10 @@ static inline void buffer_head_init_lock
+ {
+ #ifdef CONFIG_PREEMPT_RT_BASE
+ 	spin_lock_init(&bh->b_uptodate_lock);
++#if IS_ENABLED(CONFIG_JBD2)
++	spin_lock_init(&bh->b_state_lock);
++	spin_lock_init(&bh->b_journal_head_lock);
++#endif
+ #endif
+ }
+ 
+--- a/include/linux/jbd2.h
++++ b/include/linux/jbd2.h
+@@ -347,32 +347,56 @@ static inline struct journal_head *bh2jh
+ 
+ static inline void jbd_lock_bh_state(struct buffer_head *bh)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	bit_spin_lock(BH_State, &bh->b_state);
++#else
++	spin_lock(&bh->b_state_lock);
++#endif
+ }
+ 
+ static inline int jbd_trylock_bh_state(struct buffer_head *bh)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	return bit_spin_trylock(BH_State, &bh->b_state);
++#else
++	return spin_trylock(&bh->b_state_lock);
++#endif
+ }
+ 
+ static inline int jbd_is_locked_bh_state(struct buffer_head *bh)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	return bit_spin_is_locked(BH_State, &bh->b_state);
++#else
++	return spin_is_locked(&bh->b_state_lock);
++#endif
+ }
+ 
+ static inline void jbd_unlock_bh_state(struct buffer_head *bh)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	bit_spin_unlock(BH_State, &bh->b_state);
++#else
++	spin_unlock(&bh->b_state_lock);
++#endif
+ }
+ 
+ static inline void jbd_lock_bh_journal_head(struct buffer_head *bh)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	bit_spin_lock(BH_JournalHead, &bh->b_state);
++#else
++	spin_lock(&bh->b_journal_head_lock);
++#endif
+ }
+ 
+ static inline void jbd_unlock_bh_journal_head(struct buffer_head *bh)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	bit_spin_unlock(BH_JournalHead, &bh->b_state);
++#else
++	spin_unlock(&bh->b_journal_head_lock);
++#endif
+ }
+ 
+ #define J_ASSERT(assert)	BUG_ON(!(assert))
diff --git a/kernel/patches-4.14.x-rt/0150-list_bl.h-make-list-head-locking-RT-safe.patch b/kernel/patches-4.14.x-rt/0150-list_bl.h-make-list-head-locking-RT-safe.patch
new file mode 100644
index 000000000..9ea1a600d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0150-list_bl.h-make-list-head-locking-RT-safe.patch
@@ -0,0 +1,114 @@
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Fri, 21 Jun 2013 15:07:25 -0400
+Subject: list_bl: Make list head locking RT safe
+
+As per changes in include/linux/jbd_common.h for avoiding the
+bit_spin_locks on RT ("fs: jbd/jbd2: Make state lock and journal
+head lock rt safe") we do the same thing here.
+
+We use the non atomic __set_bit and __clear_bit inside the scope of
+the lock to preserve the ability of the existing LIST_DEBUG code to
+use the zero'th bit in the sanity checks.
+
+As a bit spinlock, we had no lockdep visibility into the usage
+of the list head locking.  Now, if we were to implement it as a
+standard non-raw spinlock, we would see:
+
+BUG: sleeping function called from invalid context at kernel/rtmutex.c:658
+in_atomic(): 1, irqs_disabled(): 0, pid: 122, name: udevd
+5 locks held by udevd/122:
+ #0:  (&sb->s_type->i_mutex_key#7/1){+.+.+.}, at: [<ffffffff811967e8>] lock_rename+0xe8/0xf0
+ #1:  (rename_lock){+.+...}, at: [<ffffffff811a277c>] d_move+0x2c/0x60
+ #2:  (&dentry->d_lock){+.+...}, at: [<ffffffff811a0763>] dentry_lock_for_move+0xf3/0x130
+ #3:  (&dentry->d_lock/2){+.+...}, at: [<ffffffff811a0734>] dentry_lock_for_move+0xc4/0x130
+ #4:  (&dentry->d_lock/3){+.+...}, at: [<ffffffff811a0747>] dentry_lock_for_move+0xd7/0x130
+Pid: 122, comm: udevd Not tainted 3.4.47-rt62 #7
+Call Trace:
+ [<ffffffff810b9624>] __might_sleep+0x134/0x1f0
+ [<ffffffff817a24d4>] rt_spin_lock+0x24/0x60
+ [<ffffffff811a0c4c>] __d_shrink+0x5c/0xa0
+ [<ffffffff811a1b2d>] __d_drop+0x1d/0x40
+ [<ffffffff811a24be>] __d_move+0x8e/0x320
+ [<ffffffff811a278e>] d_move+0x3e/0x60
+ [<ffffffff81199598>] vfs_rename+0x198/0x4c0
+ [<ffffffff8119b093>] sys_renameat+0x213/0x240
+ [<ffffffff817a2de5>] ? _raw_spin_unlock+0x35/0x60
+ [<ffffffff8107781c>] ? do_page_fault+0x1ec/0x4b0
+ [<ffffffff817a32ca>] ? retint_swapgs+0xe/0x13
+ [<ffffffff813eb0e6>] ? trace_hardirqs_on_thunk+0x3a/0x3f
+ [<ffffffff8119b0db>] sys_rename+0x1b/0x20
+ [<ffffffff817a3b96>] system_call_fastpath+0x1a/0x1f
+
+Since we are only taking the lock during short lived list operations,
+lets assume for now that it being raw won't be a significant latency
+concern.
+
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/list_bl.h |   28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+--- a/include/linux/list_bl.h
++++ b/include/linux/list_bl.h
+@@ -3,6 +3,7 @@
+ #define _LINUX_LIST_BL_H
+ 
+ #include <linux/list.h>
++#include <linux/spinlock.h>
+ #include <linux/bit_spinlock.h>
+ 
+ /*
+@@ -33,13 +34,22 @@
+ 
+ struct hlist_bl_head {
+ 	struct hlist_bl_node *first;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	raw_spinlock_t lock;
++#endif
+ };
+ 
+ struct hlist_bl_node {
+ 	struct hlist_bl_node *next, **pprev;
+ };
+-#define INIT_HLIST_BL_HEAD(ptr) \
+-	((ptr)->first = NULL)
++
++static inline void INIT_HLIST_BL_HEAD(struct hlist_bl_head *h)
++{
++	h->first = NULL;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	raw_spin_lock_init(&h->lock);
++#endif
++}
+ 
+ static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h)
+ {
+@@ -119,12 +129,26 @@ static inline void hlist_bl_del_init(str
+ 
+ static inline void hlist_bl_lock(struct hlist_bl_head *b)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	bit_spin_lock(0, (unsigned long *)b);
++#else
++	raw_spin_lock(&b->lock);
++#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
++	__set_bit(0, (unsigned long *)b);
++#endif
++#endif
+ }
+ 
+ static inline void hlist_bl_unlock(struct hlist_bl_head *b)
+ {
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	__bit_spin_unlock(0, (unsigned long *)b);
++#else
++#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_SPINLOCK)
++	__clear_bit(0, (unsigned long *)b);
++#endif
++	raw_spin_unlock(&b->lock);
++#endif
+ }
+ 
+ static inline bool hlist_bl_is_locked(struct hlist_bl_head *b)
diff --git a/kernel/patches-4.14.x-rt/0151-list_bl-fixup-bogus-lockdep-warning.patch b/kernel/patches-4.14.x-rt/0151-list_bl-fixup-bogus-lockdep-warning.patch
new file mode 100644
index 000000000..43ebad4b9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0151-list_bl-fixup-bogus-lockdep-warning.patch
@@ -0,0 +1,97 @@
+From: Josh Cartwright <joshc@ni.com>
+Date: Thu, 31 Mar 2016 00:04:25 -0500
+Subject: [PATCH] list_bl: fixup bogus lockdep warning
+
+At first glance, the use of 'static inline' seems appropriate for
+INIT_HLIST_BL_HEAD().
+
+However, when a 'static inline' function invocation is inlined by gcc,
+all callers share any static local data declared within that inline
+function.
+
+This presents a problem for how lockdep classes are setup.  raw_spinlocks, for
+example, when CONFIG_DEBUG_SPINLOCK,
+
+	# define raw_spin_lock_init(lock)				\
+	do {								\
+		static struct lock_class_key __key;			\
+									\
+		__raw_spin_lock_init((lock), #lock, &__key);		\
+	} while (0)
+
+When this macro is expanded into a 'static inline' caller, like
+INIT_HLIST_BL_HEAD():
+
+	static inline INIT_HLIST_BL_HEAD(struct hlist_bl_head *h)
+	{
+		h->first = NULL;
+		raw_spin_lock_init(&h->lock);
+	}
+
+...the static local lock_class_key object is made a function static.
+
+For compilation units which initialize invoke INIT_HLIST_BL_HEAD() more
+than once, then, all of the invocations share this same static local
+object.
+
+This can lead to some very confusing lockdep splats (example below).
+Solve this problem by forcing the INIT_HLIST_BL_HEAD() to be a macro,
+which prevents the lockdep class object sharing.
+
+ =============================================
+ [ INFO: possible recursive locking detected ]
+ 4.4.4-rt11 #4 Not tainted
+ ---------------------------------------------
+ kswapd0/59 is trying to acquire lock:
+  (&h->lock#2){+.+.-.}, at: mb_cache_shrink_scan
+
+ but task is already holding lock:
+  (&h->lock#2){+.+.-.}, at:  mb_cache_shrink_scan
+
+ other info that might help us debug this:
+  Possible unsafe locking scenario:
+
+        CPU0
+        ----
+   lock(&h->lock#2);
+   lock(&h->lock#2);
+
+  *** DEADLOCK ***
+
+  May be due to missing lock nesting notation
+
+ 2 locks held by kswapd0/59:
+  #0:  (shrinker_rwsem){+.+...}, at: rt_down_read_trylock
+  #1:  (&h->lock#2){+.+.-.}, at: mb_cache_shrink_scan
+
+Reported-by: Luis Claudio R. Goncalves <lclaudio@uudg.org>
+Tested-by: Luis Claudio R. Goncalves <lclaudio@uudg.org>
+Signed-off-by: Josh Cartwright <joshc@ni.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/list_bl.h |   12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+--- a/include/linux/list_bl.h
++++ b/include/linux/list_bl.h
+@@ -43,13 +43,15 @@ struct hlist_bl_node {
+ 	struct hlist_bl_node *next, **pprev;
+ };
+ 
+-static inline void INIT_HLIST_BL_HEAD(struct hlist_bl_head *h)
+-{
+-	h->first = NULL;
+ #ifdef CONFIG_PREEMPT_RT_BASE
+-	raw_spin_lock_init(&h->lock);
++#define INIT_HLIST_BL_HEAD(h)		\
++do {					\
++	(h)->first = NULL;		\
++	raw_spin_lock_init(&(h)->lock);	\
++} while (0)
++#else
++#define INIT_HLIST_BL_HEAD(h) (h)->first = NULL
+ #endif
+-}
+ 
+ static inline void INIT_HLIST_BL_NODE(struct hlist_bl_node *h)
+ {
diff --git a/kernel/patches-4.14.x-rt/0152-genirq-disable-irqpoll-on-rt.patch b/kernel/patches-4.14.x-rt/0152-genirq-disable-irqpoll-on-rt.patch
new file mode 100644
index 000000000..e696a2cd8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0152-genirq-disable-irqpoll-on-rt.patch
@@ -0,0 +1,37 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:57 -0500
+Subject: genirq: Disable irqpoll on -rt
+
+Creates long latencies for no value
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/irq/spurious.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/kernel/irq/spurious.c
++++ b/kernel/irq/spurious.c
+@@ -445,6 +445,10 @@ MODULE_PARM_DESC(noirqdebug, "Disable ir
+ 
+ static int __init irqfixup_setup(char *str)
+ {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	pr_warn("irqfixup boot option not supported w/ CONFIG_PREEMPT_RT_BASE\n");
++	return 1;
++#endif
+ 	irqfixup = 1;
+ 	printk(KERN_WARNING "Misrouted IRQ fixup support enabled.\n");
+ 	printk(KERN_WARNING "This may impact system performance.\n");
+@@ -457,6 +461,10 @@ module_param(irqfixup, int, 0644);
+ 
+ static int __init irqpoll_setup(char *str)
+ {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	pr_warn("irqpoll boot option not supported w/ CONFIG_PREEMPT_RT_BASE\n");
++	return 1;
++#endif
+ 	irqfixup = 2;
+ 	printk(KERN_WARNING "Misrouted IRQ fixup and polling support "
+ 				"enabled\n");
diff --git a/kernel/patches-4.14.x-rt/0153-genirq-force-threading.patch b/kernel/patches-4.14.x-rt/0153-genirq-force-threading.patch
new file mode 100644
index 000000000..9fddc86f9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0153-genirq-force-threading.patch
@@ -0,0 +1,48 @@
+Subject: genirq: Force interrupt thread on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 03 Apr 2011 11:57:29 +0200
+
+Force threaded_irqs and optimize the code (force_irqthreads) in regard
+to this.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/interrupt.h |    6 +++++-
+ kernel/irq/manage.c       |    2 ++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -429,9 +429,13 @@ extern int irq_set_irqchip_state(unsigne
+ 				 bool state);
+ 
+ #ifdef CONFIG_IRQ_FORCED_THREADING
++# ifndef CONFIG_PREEMPT_RT_BASE
+ extern bool force_irqthreads;
++# else
++#  define force_irqthreads	(true)
++# endif
+ #else
+-#define force_irqthreads	(0)
++#define force_irqthreads	(false)
+ #endif
+ 
+ #ifndef __ARCH_SET_SOFTIRQ_PENDING
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -24,6 +24,7 @@
+ #include "internals.h"
+ 
+ #ifdef CONFIG_IRQ_FORCED_THREADING
++# ifndef CONFIG_PREEMPT_RT_BASE
+ __read_mostly bool force_irqthreads;
+ 
+ static int __init setup_forced_irqthreads(char *arg)
+@@ -32,6 +33,7 @@ static int __init setup_forced_irqthread
+ 	return 0;
+ }
+ early_param("threadirqs", setup_forced_irqthreads);
++# endif
+ #endif
+ 
+ static void __synchronize_hardirq(struct irq_desc *desc)
diff --git a/kernel/patches-4.14.x-rt/0154-drivers-net-vortex-fix-locking-issues.patch b/kernel/patches-4.14.x-rt/0154-drivers-net-vortex-fix-locking-issues.patch
new file mode 100644
index 000000000..54eb60b05
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0154-drivers-net-vortex-fix-locking-issues.patch
@@ -0,0 +1,48 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Fri, 3 Jul 2009 08:30:00 -0500
+Subject: drivers/net: vortex fix locking issues
+
+Argh, cut and paste wasn't enough...
+
+Use this patch instead.  It needs an irq disable.  But, believe it or not,
+on SMP this is actually better.  If the irq is shared (as it is in Mark's
+case), we don't stop the irq of other devices from being handled on
+another CPU (unfortunately for Mark, he pinned all interrupts to one CPU).
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+ drivers/net/ethernet/3com/3c59x.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+
+--- a/drivers/net/ethernet/3com/3c59x.c
++++ b/drivers/net/ethernet/3com/3c59x.c
+@@ -842,9 +842,9 @@ static void poll_vortex(struct net_devic
+ {
+ 	struct vortex_private *vp = netdev_priv(dev);
+ 	unsigned long flags;
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	(vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ }
+ #endif
+ 
+@@ -1908,12 +1908,12 @@ static void vortex_tx_timeout(struct net
+ 			 * Block interrupts because vortex_interrupt does a bare spin_lock()
+ 			 */
+ 			unsigned long flags;
+-			local_irq_save(flags);
++			local_irq_save_nort(flags);
+ 			if (vp->full_bus_master_tx)
+ 				boomerang_interrupt(dev->irq, dev);
+ 			else
+ 				vortex_interrupt(dev->irq, dev);
+-			local_irq_restore(flags);
++			local_irq_restore_nort(flags);
+ 		}
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0155-delayacct-use-raw_spinlocks.patch b/kernel/patches-4.14.x-rt/0155-delayacct-use-raw_spinlocks.patch
new file mode 100644
index 000000000..9ca3e774b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0155-delayacct-use-raw_spinlocks.patch
@@ -0,0 +1,86 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Sat, 20 May 2017 12:32:23 +0200
+Subject: [PATCH] delayacct: use raw_spinlocks
+
+try_to_wake_up() might invoke delayacct_blkio_end() while holding the
+pi_lock. The lock is only held for a short amount of time so it should
+be safe to make it raw.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/delayacct.h |    2 +-
+ kernel/delayacct.c        |   16 ++++++++--------
+ 2 files changed, 9 insertions(+), 9 deletions(-)
+
+--- a/include/linux/delayacct.h
++++ b/include/linux/delayacct.h
+@@ -29,7 +29,7 @@
+ 
+ #ifdef CONFIG_TASK_DELAY_ACCT
+ struct task_delay_info {
+-	spinlock_t	lock;
++	raw_spinlock_t	lock;
+ 	unsigned int	flags;	/* Private per-task flags */
+ 
+ 	/* For each stat XXX, add following, aligned appropriately
+--- a/kernel/delayacct.c
++++ b/kernel/delayacct.c
+@@ -44,23 +44,23 @@ void __delayacct_tsk_init(struct task_st
+ {
+ 	tsk->delays = kmem_cache_zalloc(delayacct_cache, GFP_KERNEL);
+ 	if (tsk->delays)
+-		spin_lock_init(&tsk->delays->lock);
++		raw_spin_lock_init(&tsk->delays->lock);
+ }
+ 
+ /*
+  * Finish delay accounting for a statistic using its timestamps (@start),
+  * accumalator (@total) and @count
+  */
+-static void delayacct_end(spinlock_t *lock, u64 *start, u64 *total, u32 *count)
++static void delayacct_end(raw_spinlock_t *lock, u64 *start, u64 *total, u32 *count)
+ {
+ 	s64 ns = ktime_get_ns() - *start;
+ 	unsigned long flags;
+ 
+ 	if (ns > 0) {
+-		spin_lock_irqsave(lock, flags);
++		raw_spin_lock_irqsave(lock, flags);
+ 		*total += ns;
+ 		(*count)++;
+-		spin_unlock_irqrestore(lock, flags);
++		raw_spin_unlock_irqrestore(lock, flags);
+ 	}
+ }
+ 
+@@ -127,7 +127,7 @@ int __delayacct_add_tsk(struct taskstats
+ 
+ 	/* zero XXX_total, non-zero XXX_count implies XXX stat overflowed */
+ 
+-	spin_lock_irqsave(&tsk->delays->lock, flags);
++	raw_spin_lock_irqsave(&tsk->delays->lock, flags);
+ 	tmp = d->blkio_delay_total + tsk->delays->blkio_delay;
+ 	d->blkio_delay_total = (tmp < d->blkio_delay_total) ? 0 : tmp;
+ 	tmp = d->swapin_delay_total + tsk->delays->swapin_delay;
+@@ -137,7 +137,7 @@ int __delayacct_add_tsk(struct taskstats
+ 	d->blkio_count += tsk->delays->blkio_count;
+ 	d->swapin_count += tsk->delays->swapin_count;
+ 	d->freepages_count += tsk->delays->freepages_count;
+-	spin_unlock_irqrestore(&tsk->delays->lock, flags);
++	raw_spin_unlock_irqrestore(&tsk->delays->lock, flags);
+ 
+ 	return 0;
+ }
+@@ -147,10 +147,10 @@ int __delayacct_add_tsk(struct taskstats
+ 	__u64 ret;
+ 	unsigned long flags;
+ 
+-	spin_lock_irqsave(&tsk->delays->lock, flags);
++	raw_spin_lock_irqsave(&tsk->delays->lock, flags);
+ 	ret = nsec_to_clock_t(tsk->delays->blkio_delay +
+ 				tsk->delays->swapin_delay);
+-	spin_unlock_irqrestore(&tsk->delays->lock, flags);
++	raw_spin_unlock_irqrestore(&tsk->delays->lock, flags);
+ 	return ret;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0156-mm-page_alloc-rt-friendly-per-cpu-pages.patch b/kernel/patches-4.14.x-rt/0156-mm-page_alloc-rt-friendly-per-cpu-pages.patch
new file mode 100644
index 000000000..08339a8d2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0156-mm-page_alloc-rt-friendly-per-cpu-pages.patch
@@ -0,0 +1,214 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:37 -0500
+Subject: mm: page_alloc: rt-friendly per-cpu pages
+
+rt-friendly per-cpu pages: convert the irqs-off per-cpu locking
+method into a preemptible, explicit-per-cpu-locks method.
+
+Contains fixes from:
+	 Peter Zijlstra <a.p.zijlstra@chello.nl>
+	 Thomas Gleixner <tglx@linutronix.de>
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ mm/page_alloc.c |   55 +++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 39 insertions(+), 16 deletions(-)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -62,6 +62,7 @@
+ #include <linux/hugetlb.h>
+ #include <linux/sched/rt.h>
+ #include <linux/sched/mm.h>
++#include <linux/locallock.h>
+ #include <linux/page_owner.h>
+ #include <linux/kthread.h>
+ #include <linux/memcontrol.h>
+@@ -287,6 +288,18 @@ EXPORT_SYMBOL(nr_node_ids);
+ EXPORT_SYMBOL(nr_online_nodes);
+ #endif
+ 
++static DEFINE_LOCAL_IRQ_LOCK(pa_lock);
++
++#ifdef CONFIG_PREEMPT_RT_BASE
++# define cpu_lock_irqsave(cpu, flags)		\
++	spin_lock_irqsave(&per_cpu(pa_lock, cpu).lock, flags)
++# define cpu_unlock_irqrestore(cpu, flags)	\
++	spin_unlock_irqrestore(&per_cpu(pa_lock, cpu).lock, flags)
++#else
++# define cpu_lock_irqsave(cpu, flags)		local_irq_save(flags)
++# define cpu_unlock_irqrestore(cpu, flags)	local_irq_restore(flags)
++#endif
++
+ int page_group_by_mobility_disabled __read_mostly;
+ 
+ #ifdef CONFIG_DEFERRED_STRUCT_PAGE_INIT
+@@ -1259,10 +1272,10 @@ static void __free_pages_ok(struct page
+ 		return;
+ 
+ 	migratetype = get_pfnblock_migratetype(page, pfn);
+-	local_irq_save(flags);
++	local_lock_irqsave(pa_lock, flags);
+ 	__count_vm_events(PGFREE, 1 << order);
+ 	free_one_page(page_zone(page), page, pfn, order, migratetype);
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ }
+ 
+ static void __init __free_pages_boot_core(struct page *page, unsigned int order)
+@@ -2382,14 +2395,14 @@ void drain_zone_pages(struct zone *zone,
+ 	unsigned long flags;
+ 	int to_drain, batch;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(pa_lock, flags);
+ 	batch = READ_ONCE(pcp->batch);
+ 	to_drain = min(pcp->count, batch);
+ 	if (to_drain > 0) {
+ 		free_pcppages_bulk(zone, to_drain, pcp);
+ 		pcp->count -= to_drain;
+ 	}
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ }
+ #endif
+ 
+@@ -2406,7 +2419,7 @@ static void drain_pages_zone(unsigned in
+ 	struct per_cpu_pageset *pset;
+ 	struct per_cpu_pages *pcp;
+ 
+-	local_irq_save(flags);
++	cpu_lock_irqsave(cpu, flags);
+ 	pset = per_cpu_ptr(zone->pageset, cpu);
+ 
+ 	pcp = &pset->pcp;
+@@ -2414,7 +2427,7 @@ static void drain_pages_zone(unsigned in
+ 		free_pcppages_bulk(zone, pcp->count, pcp);
+ 		pcp->count = 0;
+ 	}
+-	local_irq_restore(flags);
++	cpu_unlock_irqrestore(cpu, flags);
+ }
+ 
+ /*
+@@ -2449,6 +2462,7 @@ void drain_local_pages(struct zone *zone
+ 		drain_pages(cpu);
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_BASE
+ static void drain_local_pages_wq(struct work_struct *work)
+ {
+ 	/*
+@@ -2462,6 +2476,7 @@ static void drain_local_pages_wq(struct
+ 	drain_local_pages(NULL);
+ 	preempt_enable();
+ }
++#endif
+ 
+ /*
+  * Spill all the per-cpu pages from all CPUs back into the buddy allocator.
+@@ -2528,7 +2543,14 @@ void drain_all_pages(struct zone *zone)
+ 		else
+ 			cpumask_clear_cpu(cpu, &cpus_with_pcps);
+ 	}
+-
++#ifdef CONFIG_PREEMPT_RT_BASE
++	for_each_cpu(cpu, &cpus_with_pcps) {
++		if (zone)
++			drain_pages_zone(cpu, zone);
++		else
++			drain_pages(cpu);
++	}
++#else
+ 	for_each_cpu(cpu, &cpus_with_pcps) {
+ 		struct work_struct *work = per_cpu_ptr(&pcpu_drain, cpu);
+ 		INIT_WORK(work, drain_local_pages_wq);
+@@ -2536,6 +2558,7 @@ void drain_all_pages(struct zone *zone)
+ 	}
+ 	for_each_cpu(cpu, &cpus_with_pcps)
+ 		flush_work(per_cpu_ptr(&pcpu_drain, cpu));
++#endif
+ 
+ 	mutex_unlock(&pcpu_drain_mutex);
+ }
+@@ -2612,7 +2635,7 @@ void free_hot_cold_page(struct page *pag
+ 
+ 	migratetype = get_pfnblock_migratetype(page, pfn);
+ 	set_pcppage_migratetype(page, migratetype);
+-	local_irq_save(flags);
++	local_lock_irqsave(pa_lock, flags);
+ 	__count_vm_event(PGFREE);
+ 
+ 	/*
+@@ -2643,7 +2666,7 @@ void free_hot_cold_page(struct page *pag
+ 	}
+ 
+ out:
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ }
+ 
+ /*
+@@ -2800,7 +2823,7 @@ static struct page *rmqueue_pcplist(stru
+ 	struct page *page;
+ 	unsigned long flags;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(pa_lock, flags);
+ 	pcp = &this_cpu_ptr(zone->pageset)->pcp;
+ 	list = &pcp->lists[migratetype];
+ 	page = __rmqueue_pcplist(zone,  migratetype, cold, pcp, list);
+@@ -2808,7 +2831,7 @@ static struct page *rmqueue_pcplist(stru
+ 		__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
+ 		zone_statistics(preferred_zone, zone);
+ 	}
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ 	return page;
+ }
+ 
+@@ -2835,7 +2858,7 @@ struct page *rmqueue(struct zone *prefer
+ 	 * allocate greater than order-1 page units with __GFP_NOFAIL.
+ 	 */
+ 	WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
+-	spin_lock_irqsave(&zone->lock, flags);
++	local_spin_lock_irqsave(pa_lock, &zone->lock, flags);
+ 
+ 	do {
+ 		page = NULL;
+@@ -2855,14 +2878,14 @@ struct page *rmqueue(struct zone *prefer
+ 
+ 	__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
+ 	zone_statistics(preferred_zone, zone);
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ 
+ out:
+ 	VM_BUG_ON_PAGE(page && bad_range(zone, page), page);
+ 	return page;
+ 
+ failed:
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ 	return NULL;
+ }
+ 
+@@ -7707,7 +7730,7 @@ void zone_pcp_reset(struct zone *zone)
+ 	struct per_cpu_pageset *pset;
+ 
+ 	/* avoid races with drain_pages()  */
+-	local_irq_save(flags);
++	local_lock_irqsave(pa_lock, flags);
+ 	if (zone->pageset != &boot_pageset) {
+ 		for_each_online_cpu(cpu) {
+ 			pset = per_cpu_ptr(zone->pageset, cpu);
+@@ -7716,7 +7739,7 @@ void zone_pcp_reset(struct zone *zone)
+ 		free_percpu(zone->pageset);
+ 		zone->pageset = &boot_pageset;
+ 	}
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pa_lock, flags);
+ }
+ 
+ #ifdef CONFIG_MEMORY_HOTREMOVE
diff --git a/kernel/patches-4.14.x-rt/0157-mm-page_alloc-reduce-lock-sections-further.patch b/kernel/patches-4.14.x-rt/0157-mm-page_alloc-reduce-lock-sections-further.patch
new file mode 100644
index 000000000..4e6d6920b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0157-mm-page_alloc-reduce-lock-sections-further.patch
@@ -0,0 +1,197 @@
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Fri Jul 3 08:44:37 2009 -0500
+Subject: mm: page_alloc: Reduce lock sections further
+
+Split out the pages which are to be freed into a separate list and
+call free_pages_bulk() outside of the percpu page allocator locks.
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ mm/page_alloc.c |   93 +++++++++++++++++++++++++++++++++++++++-----------------
+ 1 file changed, 65 insertions(+), 28 deletions(-)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -1109,7 +1109,7 @@ static bool bulkfree_pcp_prepare(struct
+ #endif /* CONFIG_DEBUG_VM */
+ 
+ /*
+- * Frees a number of pages from the PCP lists
++ * Frees a number of pages which have been collected from the pcp lists.
+  * Assumes all pages on list are in same zone, and of same order.
+  * count is the number of pages to free.
+  *
+@@ -1120,15 +1120,53 @@ static bool bulkfree_pcp_prepare(struct
+  * pinned" detection logic.
+  */
+ static void free_pcppages_bulk(struct zone *zone, int count,
+-					struct per_cpu_pages *pcp)
++			       struct list_head *list)
+ {
+-	int migratetype = 0;
+-	int batch_free = 0;
+ 	bool isolated_pageblocks;
++	unsigned long flags;
+ 
+-	spin_lock(&zone->lock);
++	spin_lock_irqsave(&zone->lock, flags);
+ 	isolated_pageblocks = has_isolate_pageblock(zone);
+ 
++	while (!list_empty(list)) {
++		struct page *page;
++		int mt; /* migratetype of the to-be-freed page */
++
++		page = list_first_entry(list, struct page, lru);
++		/* must delete as __free_one_page list manipulates */
++		list_del(&page->lru);
++
++		mt = get_pcppage_migratetype(page);
++		/* MIGRATE_ISOLATE page should not go to pcplists */
++		VM_BUG_ON_PAGE(is_migrate_isolate(mt), page);
++		/* Pageblock could have been isolated meanwhile */
++		if (unlikely(isolated_pageblocks))
++			mt = get_pageblock_migratetype(page);
++
++		if (bulkfree_pcp_prepare(page))
++			continue;
++
++		__free_one_page(page, page_to_pfn(page), zone, 0, mt);
++		trace_mm_page_pcpu_drain(page, 0, mt);
++		count--;
++	}
++	WARN_ON(count != 0);
++	spin_unlock_irqrestore(&zone->lock, flags);
++}
++
++/*
++ * Moves a number of pages from the PCP lists to free list which
++ * is freed outside of the locked region.
++ *
++ * Assumes all pages on list are in same zone, and of same order.
++ * count is the number of pages to free.
++ */
++static void isolate_pcp_pages(int count, struct per_cpu_pages *src,
++			      struct list_head *dst)
++{
++	int migratetype = 0;
++	int batch_free = 0;
++
+ 	while (count) {
+ 		struct page *page;
+ 		struct list_head *list;
+@@ -1144,7 +1182,7 @@ static void free_pcppages_bulk(struct zo
+ 			batch_free++;
+ 			if (++migratetype == MIGRATE_PCPTYPES)
+ 				migratetype = 0;
+-			list = &pcp->lists[migratetype];
++			list = &src->lists[migratetype];
+ 		} while (list_empty(list));
+ 
+ 		/* This is the only non-empty list. Free them all. */
+@@ -1152,27 +1190,12 @@ static void free_pcppages_bulk(struct zo
+ 			batch_free = count;
+ 
+ 		do {
+-			int mt;	/* migratetype of the to-be-freed page */
+-
+ 			page = list_last_entry(list, struct page, lru);
+-			/* must delete as __free_one_page list manipulates */
+ 			list_del(&page->lru);
+ 
+-			mt = get_pcppage_migratetype(page);
+-			/* MIGRATE_ISOLATE page should not go to pcplists */
+-			VM_BUG_ON_PAGE(is_migrate_isolate(mt), page);
+-			/* Pageblock could have been isolated meanwhile */
+-			if (unlikely(isolated_pageblocks))
+-				mt = get_pageblock_migratetype(page);
+-
+-			if (bulkfree_pcp_prepare(page))
+-				continue;
+-
+-			__free_one_page(page, page_to_pfn(page), zone, 0, mt);
+-			trace_mm_page_pcpu_drain(page, 0, mt);
++			list_add(&page->lru, dst);
+ 		} while (--count && --batch_free && !list_empty(list));
+ 	}
+-	spin_unlock(&zone->lock);
+ }
+ 
+ static void free_one_page(struct zone *zone,
+@@ -1180,13 +1203,15 @@ static void free_one_page(struct zone *z
+ 				unsigned int order,
+ 				int migratetype)
+ {
+-	spin_lock(&zone->lock);
++	unsigned long flags;
++
++	spin_lock_irqsave(&zone->lock, flags);
+ 	if (unlikely(has_isolate_pageblock(zone) ||
+ 		is_migrate_isolate(migratetype))) {
+ 		migratetype = get_pfnblock_migratetype(page, pfn);
+ 	}
+ 	__free_one_page(page, pfn, zone, order, migratetype);
+-	spin_unlock(&zone->lock);
++	spin_unlock_irqrestore(&zone->lock, flags);
+ }
+ 
+ static void __meminit __init_single_page(struct page *page, unsigned long pfn,
+@@ -2393,16 +2418,18 @@ static int rmqueue_bulk(struct zone *zon
+ void drain_zone_pages(struct zone *zone, struct per_cpu_pages *pcp)
+ {
+ 	unsigned long flags;
++	LIST_HEAD(dst);
+ 	int to_drain, batch;
+ 
+ 	local_lock_irqsave(pa_lock, flags);
+ 	batch = READ_ONCE(pcp->batch);
+ 	to_drain = min(pcp->count, batch);
+ 	if (to_drain > 0) {
+-		free_pcppages_bulk(zone, to_drain, pcp);
++		isolate_pcp_pages(to_drain, pcp, &dst);
+ 		pcp->count -= to_drain;
+ 	}
+ 	local_unlock_irqrestore(pa_lock, flags);
++	free_pcppages_bulk(zone, to_drain, &dst);
+ }
+ #endif
+ 
+@@ -2418,16 +2445,21 @@ static void drain_pages_zone(unsigned in
+ 	unsigned long flags;
+ 	struct per_cpu_pageset *pset;
+ 	struct per_cpu_pages *pcp;
++	LIST_HEAD(dst);
++	int count;
+ 
+ 	cpu_lock_irqsave(cpu, flags);
+ 	pset = per_cpu_ptr(zone->pageset, cpu);
+ 
+ 	pcp = &pset->pcp;
+-	if (pcp->count) {
+-		free_pcppages_bulk(zone, pcp->count, pcp);
++	count = pcp->count;
++	if (count) {
++		isolate_pcp_pages(count, pcp, &dst);
+ 		pcp->count = 0;
+ 	}
+ 	cpu_unlock_irqrestore(cpu, flags);
++	if (count)
++		free_pcppages_bulk(zone, count, &dst);
+ }
+ 
+ /*
+@@ -2661,8 +2693,13 @@ void free_hot_cold_page(struct page *pag
+ 	pcp->count++;
+ 	if (pcp->count >= pcp->high) {
+ 		unsigned long batch = READ_ONCE(pcp->batch);
+-		free_pcppages_bulk(zone, batch, pcp);
++		LIST_HEAD(dst);
++
++		isolate_pcp_pages(batch, pcp, &dst);
+ 		pcp->count -= batch;
++		local_unlock_irqrestore(pa_lock, flags);
++		free_pcppages_bulk(zone, batch, &dst);
++		return;
+ 	}
+ 
+ out:
diff --git a/kernel/patches-4.14.x-rt/0158-mm-convert-swap-to-percpu-locked.patch b/kernel/patches-4.14.x-rt/0158-mm-convert-swap-to-percpu-locked.patch
new file mode 100644
index 000000000..c1ff7ea1d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0158-mm-convert-swap-to-percpu-locked.patch
@@ -0,0 +1,191 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:51 -0500
+Subject: mm/swap: Convert to percpu locked
+
+Replace global locks (get_cpu + local_irq_save) with "local_locks()".
+Currently there is one of for "rotate" and one for "swap".
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/swap.h |    1 +
+ mm/compaction.c      |    6 ++++--
+ mm/page_alloc.c      |    3 ++-
+ mm/swap.c            |   38 ++++++++++++++++++++++----------------
+ 4 files changed, 29 insertions(+), 19 deletions(-)
+
+--- a/include/linux/swap.h
++++ b/include/linux/swap.h
+@@ -312,6 +312,7 @@ extern unsigned long nr_free_pagecache_p
+ 
+ 
+ /* linux/mm/swap.c */
++DECLARE_LOCAL_IRQ_LOCK(swapvec_lock);
+ 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);
+--- a/mm/compaction.c
++++ b/mm/compaction.c
+@@ -1634,10 +1634,12 @@ static enum compact_result compact_zone(
+ 				block_start_pfn(cc->migrate_pfn, cc->order);
+ 
+ 			if (cc->last_migrated_pfn < current_block_start) {
+-				cpu = get_cpu();
++				cpu = get_cpu_light();
++				local_lock_irq(swapvec_lock);
+ 				lru_add_drain_cpu(cpu);
++				local_unlock_irq(swapvec_lock);
+ 				drain_local_pages(zone);
+-				put_cpu();
++				put_cpu_light();
+ 				/* No more flushing until we migrate again */
+ 				cc->last_migrated_pfn = 0;
+ 			}
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -6862,8 +6862,9 @@ void __init free_area_init(unsigned long
+ 
+ static int page_alloc_cpu_dead(unsigned int cpu)
+ {
+-
++	local_lock_irq_on(swapvec_lock, cpu);
+ 	lru_add_drain_cpu(cpu);
++	local_unlock_irq_on(swapvec_lock, cpu);
+ 	drain_pages(cpu);
+ 
+ 	/*
+--- a/mm/swap.c
++++ b/mm/swap.c
+@@ -32,6 +32,7 @@
+ #include <linux/memcontrol.h>
+ #include <linux/gfp.h>
+ #include <linux/uio.h>
++#include <linux/locallock.h>
+ #include <linux/hugetlb.h>
+ #include <linux/page_idle.h>
+ 
+@@ -50,6 +51,8 @@ static DEFINE_PER_CPU(struct pagevec, lr
+ #ifdef CONFIG_SMP
+ static DEFINE_PER_CPU(struct pagevec, activate_page_pvecs);
+ #endif
++static DEFINE_LOCAL_IRQ_LOCK(rotate_lock);
++DEFINE_LOCAL_IRQ_LOCK(swapvec_lock);
+ 
+ /*
+  * This path almost never happens for VM activity - pages are normally
+@@ -252,11 +255,11 @@ void rotate_reclaimable_page(struct page
+ 		unsigned long flags;
+ 
+ 		get_page(page);
+-		local_irq_save(flags);
++		local_lock_irqsave(rotate_lock, flags);
+ 		pvec = this_cpu_ptr(&lru_rotate_pvecs);
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
+ 			pagevec_move_tail(pvec);
+-		local_irq_restore(flags);
++		local_unlock_irqrestore(rotate_lock, flags);
+ 	}
+ }
+ 
+@@ -306,12 +309,13 @@ void activate_page(struct page *page)
+ {
+ 	page = compound_head(page);
+ 	if (PageLRU(page) && !PageActive(page) && !PageUnevictable(page)) {
+-		struct pagevec *pvec = &get_cpu_var(activate_page_pvecs);
++		struct pagevec *pvec = &get_locked_var(swapvec_lock,
++						       activate_page_pvecs);
+ 
+ 		get_page(page);
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
+ 			pagevec_lru_move_fn(pvec, __activate_page, NULL);
+-		put_cpu_var(activate_page_pvecs);
++		put_locked_var(swapvec_lock, activate_page_pvecs);
+ 	}
+ }
+ 
+@@ -338,7 +342,7 @@ void activate_page(struct page *page)
+ 
+ static void __lru_cache_activate_page(struct page *page)
+ {
+-	struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
++	struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
+ 	int i;
+ 
+ 	/*
+@@ -360,7 +364,7 @@ static void __lru_cache_activate_page(st
+ 		}
+ 	}
+ 
+-	put_cpu_var(lru_add_pvec);
++	put_locked_var(swapvec_lock, lru_add_pvec);
+ }
+ 
+ /*
+@@ -402,12 +406,12 @@ EXPORT_SYMBOL(mark_page_accessed);
+ 
+ static void __lru_cache_add(struct page *page)
+ {
+-	struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
++	struct pagevec *pvec = &get_locked_var(swapvec_lock, lru_add_pvec);
+ 
+ 	get_page(page);
+ 	if (!pagevec_add(pvec, page) || PageCompound(page))
+ 		__pagevec_lru_add(pvec);
+-	put_cpu_var(lru_add_pvec);
++	put_locked_var(swapvec_lock, lru_add_pvec);
+ }
+ 
+ /**
+@@ -613,9 +617,9 @@ void lru_add_drain_cpu(int cpu)
+ 		unsigned long flags;
+ 
+ 		/* No harm done if a racing interrupt already did this */
+-		local_irq_save(flags);
++		local_lock_irqsave(rotate_lock, flags);
+ 		pagevec_move_tail(pvec);
+-		local_irq_restore(flags);
++		local_unlock_irqrestore(rotate_lock, flags);
+ 	}
+ 
+ 	pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
+@@ -647,11 +651,12 @@ void deactivate_file_page(struct page *p
+ 		return;
+ 
+ 	if (likely(get_page_unless_zero(page))) {
+-		struct pagevec *pvec = &get_cpu_var(lru_deactivate_file_pvecs);
++		struct pagevec *pvec = &get_locked_var(swapvec_lock,
++						       lru_deactivate_file_pvecs);
+ 
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
+ 			pagevec_lru_move_fn(pvec, lru_deactivate_file_fn, NULL);
+-		put_cpu_var(lru_deactivate_file_pvecs);
++		put_locked_var(swapvec_lock, lru_deactivate_file_pvecs);
+ 	}
+ }
+ 
+@@ -666,19 +671,20 @@ void mark_page_lazyfree(struct page *pag
+ {
+ 	if (PageLRU(page) && PageAnon(page) && PageSwapBacked(page) &&
+ 	    !PageSwapCache(page) && !PageUnevictable(page)) {
+-		struct pagevec *pvec = &get_cpu_var(lru_lazyfree_pvecs);
++		struct pagevec *pvec = &get_locked_var(swapvec_lock,
++						       lru_lazyfree_pvecs);
+ 
+ 		get_page(page);
+ 		if (!pagevec_add(pvec, page) || PageCompound(page))
+ 			pagevec_lru_move_fn(pvec, lru_lazyfree_fn, NULL);
+-		put_cpu_var(lru_lazyfree_pvecs);
++		put_locked_var(swapvec_lock, lru_lazyfree_pvecs);
+ 	}
+ }
+ 
+ void lru_add_drain(void)
+ {
+-	lru_add_drain_cpu(get_cpu());
+-	put_cpu();
++	lru_add_drain_cpu(local_lock_cpu(swapvec_lock));
++	local_unlock_cpu(swapvec_lock);
+ }
+ 
+ static void lru_add_drain_per_cpu(struct work_struct *dummy)
diff --git a/kernel/patches-4.14.x-rt/0159-mm-perform-lru_add_drain_all-remotely.patch b/kernel/patches-4.14.x-rt/0159-mm-perform-lru_add_drain_all-remotely.patch
new file mode 100644
index 000000000..a223409eb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0159-mm-perform-lru_add_drain_all-remotely.patch
@@ -0,0 +1,102 @@
+From: Luiz Capitulino <lcapitulino@redhat.com>
+Date: Fri, 27 May 2016 15:03:28 +0200
+Subject: [PATCH] mm: perform lru_add_drain_all() remotely
+
+lru_add_drain_all() works by scheduling lru_add_drain_cpu() to run
+on all CPUs that have non-empty LRU pagevecs and then waiting for
+the scheduled work to complete. However, workqueue threads may never
+have the chance to run on a CPU that's running a SCHED_FIFO task.
+This causes lru_add_drain_all() to block forever.
+
+This commit solves this problem by changing lru_add_drain_all()
+to drain the LRU pagevecs of remote CPUs. This is done by grabbing
+swapvec_lock and calling lru_add_drain_cpu().
+
+PS: This is based on an idea and initial implementation by
+    Rik van Riel.
+
+Signed-off-by: Rik van Riel <riel@redhat.com>
+Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/swap.c |   36 ++++++++++++++++++++++++++++++------
+ 1 file changed, 30 insertions(+), 6 deletions(-)
+
+--- a/mm/swap.c
++++ b/mm/swap.c
+@@ -617,9 +617,15 @@ void lru_add_drain_cpu(int cpu)
+ 		unsigned long flags;
+ 
+ 		/* No harm done if a racing interrupt already did this */
++#ifdef CONFIG_PREEMPT_RT_BASE
++		local_lock_irqsave_on(rotate_lock, flags, cpu);
++		pagevec_move_tail(pvec);
++		local_unlock_irqrestore_on(rotate_lock, flags, cpu);
++#else
+ 		local_lock_irqsave(rotate_lock, flags);
+ 		pagevec_move_tail(pvec);
+ 		local_unlock_irqrestore(rotate_lock, flags);
++#endif
+ 	}
+ 
+ 	pvec = &per_cpu(lru_deactivate_file_pvecs, cpu);
+@@ -687,6 +693,16 @@ void lru_add_drain(void)
+ 	local_unlock_cpu(swapvec_lock);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
++{
++	local_lock_on(swapvec_lock, cpu);
++	lru_add_drain_cpu(cpu);
++	local_unlock_on(swapvec_lock, cpu);
++}
++
++#else
++
+ static void lru_add_drain_per_cpu(struct work_struct *dummy)
+ {
+ 	lru_add_drain();
+@@ -694,6 +710,16 @@ static void lru_add_drain_per_cpu(struct
+ 
+ static DEFINE_PER_CPU(struct work_struct, lru_add_drain_work);
+ 
++static inline void remote_lru_add_drain(int cpu, struct cpumask *has_work)
++{
++	struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
++
++	INIT_WORK(work, lru_add_drain_per_cpu);
++	queue_work_on(cpu, mm_percpu_wq, work);
++	cpumask_set_cpu(cpu, has_work);
++}
++#endif
++
+ void lru_add_drain_all_cpuslocked(void)
+ {
+ 	static DEFINE_MUTEX(lock);
+@@ -711,21 +737,19 @@ void lru_add_drain_all_cpuslocked(void)
+ 	cpumask_clear(&has_work);
+ 
+ 	for_each_online_cpu(cpu) {
+-		struct work_struct *work = &per_cpu(lru_add_drain_work, cpu);
+ 
+ 		if (pagevec_count(&per_cpu(lru_add_pvec, cpu)) ||
+ 		    pagevec_count(&per_cpu(lru_rotate_pvecs, cpu)) ||
+ 		    pagevec_count(&per_cpu(lru_deactivate_file_pvecs, cpu)) ||
+ 		    pagevec_count(&per_cpu(lru_lazyfree_pvecs, cpu)) ||
+-		    need_activate_page_drain(cpu)) {
+-			INIT_WORK(work, lru_add_drain_per_cpu);
+-			queue_work_on(cpu, mm_percpu_wq, work);
+-			cpumask_set_cpu(cpu, &has_work);
+-		}
++		    need_activate_page_drain(cpu))
++			remote_lru_add_drain(cpu, &has_work);
+ 	}
+ 
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	for_each_cpu(cpu, &has_work)
+ 		flush_work(&per_cpu(lru_add_drain_work, cpu));
++#endif
+ 
+ 	mutex_unlock(&lock);
+ }
diff --git a/kernel/patches-4.14.x-rt/0160-mm-make-vmstat-rt-aware.patch b/kernel/patches-4.14.x-rt/0160-mm-make-vmstat-rt-aware.patch
new file mode 100644
index 000000000..7a45b97c0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0160-mm-make-vmstat-rt-aware.patch
@@ -0,0 +1,136 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:30:13 -0500
+Subject: mm/vmstat: Protect per cpu variables with preempt disable on RT
+
+Disable preemption on -RT for the vmstat code. On vanila the code runs in
+IRQ-off regions while on -RT it is not. "preempt_disable" ensures that the
+same ressources is not updated in parallel due to preemption.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/vmstat.h |    4 ++++
+ mm/vmstat.c            |   12 ++++++++++++
+ 2 files changed, 16 insertions(+)
+
+--- a/include/linux/vmstat.h
++++ b/include/linux/vmstat.h
+@@ -33,7 +33,9 @@ DECLARE_PER_CPU(struct vm_event_state, v
+  */
+ static inline void __count_vm_event(enum vm_event_item item)
+ {
++	preempt_disable_rt();
+ 	raw_cpu_inc(vm_event_states.event[item]);
++	preempt_enable_rt();
+ }
+ 
+ static inline void count_vm_event(enum vm_event_item item)
+@@ -43,7 +45,9 @@ static inline void count_vm_event(enum v
+ 
+ static inline void __count_vm_events(enum vm_event_item item, long delta)
+ {
++	preempt_disable_rt();
+ 	raw_cpu_add(vm_event_states.event[item], delta);
++	preempt_enable_rt();
+ }
+ 
+ static inline void count_vm_events(enum vm_event_item item, long delta)
+--- a/mm/vmstat.c
++++ b/mm/vmstat.c
+@@ -249,6 +249,7 @@ void __mod_zone_page_state(struct zone *
+ 	long x;
+ 	long t;
+ 
++	preempt_disable_rt();
+ 	x = delta + __this_cpu_read(*p);
+ 
+ 	t = __this_cpu_read(pcp->stat_threshold);
+@@ -258,6 +259,7 @@ void __mod_zone_page_state(struct zone *
+ 		x = 0;
+ 	}
+ 	__this_cpu_write(*p, x);
++	preempt_enable_rt();
+ }
+ EXPORT_SYMBOL(__mod_zone_page_state);
+ 
+@@ -269,6 +271,7 @@ void __mod_node_page_state(struct pglist
+ 	long x;
+ 	long t;
+ 
++	preempt_disable_rt();
+ 	x = delta + __this_cpu_read(*p);
+ 
+ 	t = __this_cpu_read(pcp->stat_threshold);
+@@ -278,6 +281,7 @@ void __mod_node_page_state(struct pglist
+ 		x = 0;
+ 	}
+ 	__this_cpu_write(*p, x);
++	preempt_enable_rt();
+ }
+ EXPORT_SYMBOL(__mod_node_page_state);
+ 
+@@ -310,6 +314,7 @@ void __inc_zone_state(struct zone *zone,
+ 	s8 __percpu *p = pcp->vm_stat_diff + item;
+ 	s8 v, t;
+ 
++	preempt_disable_rt();
+ 	v = __this_cpu_inc_return(*p);
+ 	t = __this_cpu_read(pcp->stat_threshold);
+ 	if (unlikely(v > t)) {
+@@ -318,6 +323,7 @@ void __inc_zone_state(struct zone *zone,
+ 		zone_page_state_add(v + overstep, zone, item);
+ 		__this_cpu_write(*p, -overstep);
+ 	}
++	preempt_enable_rt();
+ }
+ 
+ void __inc_node_state(struct pglist_data *pgdat, enum node_stat_item item)
+@@ -326,6 +332,7 @@ void __inc_node_state(struct pglist_data
+ 	s8 __percpu *p = pcp->vm_node_stat_diff + item;
+ 	s8 v, t;
+ 
++	preempt_disable_rt();
+ 	v = __this_cpu_inc_return(*p);
+ 	t = __this_cpu_read(pcp->stat_threshold);
+ 	if (unlikely(v > t)) {
+@@ -334,6 +341,7 @@ void __inc_node_state(struct pglist_data
+ 		node_page_state_add(v + overstep, pgdat, item);
+ 		__this_cpu_write(*p, -overstep);
+ 	}
++	preempt_enable_rt();
+ }
+ 
+ void __inc_zone_page_state(struct page *page, enum zone_stat_item item)
+@@ -354,6 +362,7 @@ void __dec_zone_state(struct zone *zone,
+ 	s8 __percpu *p = pcp->vm_stat_diff + item;
+ 	s8 v, t;
+ 
++	preempt_disable_rt();
+ 	v = __this_cpu_dec_return(*p);
+ 	t = __this_cpu_read(pcp->stat_threshold);
+ 	if (unlikely(v < - t)) {
+@@ -362,6 +371,7 @@ void __dec_zone_state(struct zone *zone,
+ 		zone_page_state_add(v - overstep, zone, item);
+ 		__this_cpu_write(*p, overstep);
+ 	}
++	preempt_enable_rt();
+ }
+ 
+ void __dec_node_state(struct pglist_data *pgdat, enum node_stat_item item)
+@@ -370,6 +380,7 @@ void __dec_node_state(struct pglist_data
+ 	s8 __percpu *p = pcp->vm_node_stat_diff + item;
+ 	s8 v, t;
+ 
++	preempt_disable_rt();
+ 	v = __this_cpu_dec_return(*p);
+ 	t = __this_cpu_read(pcp->stat_threshold);
+ 	if (unlikely(v < - t)) {
+@@ -378,6 +389,7 @@ void __dec_node_state(struct pglist_data
+ 		node_page_state_add(v - overstep, pgdat, item);
+ 		__this_cpu_write(*p, overstep);
+ 	}
++	preempt_enable_rt();
+ }
+ 
+ void __dec_zone_page_state(struct page *page, enum zone_stat_item item)
diff --git a/kernel/patches-4.14.x-rt/0161-re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch b/kernel/patches-4.14.x-rt/0161-re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch
new file mode 100644
index 000000000..6c857ac9a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0161-re-preempt_rt_full-arm-coredump-fails-for-cpu-3e-3d-4.patch
@@ -0,0 +1,68 @@
+Subject: ARM: Initialize split page table locks for vector page
+From: Frank Rowand <frank.rowand@am.sony.com>
+Date: Sat, 1 Oct 2011 18:58:13 -0700
+
+Without this patch, ARM can not use SPLIT_PTLOCK_CPUS if
+PREEMPT_RT_FULL=y because vectors_user_mapping() creates a
+VM_ALWAYSDUMP mapping of the vector page (address 0xffff0000), but no
+ptl->lock has been allocated for the page.  An attempt to coredump
+that page will result in a kernel NULL pointer dereference when
+follow_page() attempts to lock the page.
+
+The call tree to the NULL pointer dereference is:
+
+   do_notify_resume()
+      get_signal_to_deliver()
+         do_coredump()
+            elf_core_dump()
+               get_dump_page()
+                  __get_user_pages()
+                     follow_page()
+                        pte_offset_map_lock() <----- a #define
+                           ...
+                              rt_spin_lock()
+
+The underlying problem is exposed by mm-shrink-the-page-frame-to-rt-size.patch.
+
+Signed-off-by: Frank Rowand <frank.rowand@am.sony.com>
+Cc: Frank <Frank_Rowand@sonyusa.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Link: http://lkml.kernel.org/r/4E87C535.2030907@am.sony.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/arm/kernel/process.c |   24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+--- a/arch/arm/kernel/process.c
++++ b/arch/arm/kernel/process.c
+@@ -325,6 +325,30 @@ unsigned long arch_randomize_brk(struct
+ }
+ 
+ #ifdef CONFIG_MMU
++/*
++ * CONFIG_SPLIT_PTLOCK_CPUS results in a page->ptl lock.  If the lock is not
++ * initialized by pgtable_page_ctor() then a coredump of the vector page will
++ * fail.
++ */
++static int __init vectors_user_mapping_init_page(void)
++{
++	struct page *page;
++	unsigned long addr = 0xffff0000;
++	pgd_t *pgd;
++	pud_t *pud;
++	pmd_t *pmd;
++
++	pgd = pgd_offset_k(addr);
++	pud = pud_offset(pgd, addr);
++	pmd = pmd_offset(pud, addr);
++	page = pmd_page(*(pmd));
++
++	pgtable_page_ctor(page);
++
++	return 0;
++}
++late_initcall(vectors_user_mapping_init_page);
++
+ #ifdef CONFIG_KUSER_HELPERS
+ /*
+  * The vectors page is always readable from user space for the
diff --git a/kernel/patches-4.14.x-rt/0162-mm-bounce-local-irq-save-nort.patch b/kernel/patches-4.14.x-rt/0162-mm-bounce-local-irq-save-nort.patch
new file mode 100644
index 000000000..e7719b494
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0162-mm-bounce-local-irq-save-nort.patch
@@ -0,0 +1,27 @@
+Subject: mm: bounce: Use local_irq_save_nort
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 09 Jan 2013 10:33:09 +0100
+
+kmap_atomic() is preemptible on RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ block/bounce.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/block/bounce.c
++++ b/block/bounce.c
+@@ -66,11 +66,11 @@ static void bounce_copy_vec(struct bio_v
+ 	unsigned long flags;
+ 	unsigned char *vto;
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	vto = kmap_atomic(to->bv_page);
+ 	memcpy(vto + to->bv_offset, vfrom, to->bv_len);
+ 	kunmap_atomic(vto);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ }
+ 
+ #else /* CONFIG_HIGHMEM */
diff --git a/kernel/patches-4.14.x-rt/0163-mm-disable-sloub-rt.patch b/kernel/patches-4.14.x-rt/0163-mm-disable-sloub-rt.patch
new file mode 100644
index 000000000..d5f5b2b35
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0163-mm-disable-sloub-rt.patch
@@ -0,0 +1,31 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:44:03 -0500
+Subject: mm: Allow only slub on RT
+
+Disable SLAB and SLOB on -RT. Only SLUB is adopted to -RT needs.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ init/Kconfig |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1533,6 +1533,7 @@ choice
+ 
+ config SLAB
+ 	bool "SLAB"
++	depends on !PREEMPT_RT_FULL
+ 	select HAVE_HARDENED_USERCOPY_ALLOCATOR
+ 	help
+ 	  The regular slab allocator that is established and known to work
+@@ -1553,6 +1554,7 @@ config SLUB
+ config SLOB
+ 	depends on EXPERT
+ 	bool "SLOB (Simple Allocator)"
++	depends on !PREEMPT_RT_FULL
+ 	help
+ 	   SLOB replaces the stock allocator with a drastically simpler
+ 	   allocator. SLOB is generally more space efficient but
diff --git a/kernel/patches-4.14.x-rt/0164-mm-enable-slub.patch b/kernel/patches-4.14.x-rt/0164-mm-enable-slub.patch
new file mode 100644
index 000000000..12b601abb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0164-mm-enable-slub.patch
@@ -0,0 +1,473 @@
+Subject: mm: Enable SLUB for RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 25 Oct 2012 10:32:35 +0100
+
+Make SLUB RT aware by converting locks to raw and using free lists to
+move the freeing out of the lock held region.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ mm/slab.h |    4 +
+ mm/slub.c |  136 ++++++++++++++++++++++++++++++++++++++++++++++++--------------
+ 2 files changed, 110 insertions(+), 30 deletions(-)
+
+--- a/mm/slab.h
++++ b/mm/slab.h
+@@ -454,7 +454,11 @@ static inline void slab_post_alloc_hook(
+  * The slab lists for all objects.
+  */
+ struct kmem_cache_node {
++#ifdef CONFIG_SLUB
++	raw_spinlock_t list_lock;
++#else
+ 	spinlock_t list_lock;
++#endif
+ 
+ #ifdef CONFIG_SLAB
+ 	struct list_head slabs_partial;	/* partial list first, better asm code */
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -1180,7 +1180,7 @@ static noinline int free_debug_processin
+ 	unsigned long uninitialized_var(flags);
+ 	int ret = 0;
+ 
+-	spin_lock_irqsave(&n->list_lock, flags);
++	raw_spin_lock_irqsave(&n->list_lock, flags);
+ 	slab_lock(page);
+ 
+ 	if (s->flags & SLAB_CONSISTENCY_CHECKS) {
+@@ -1215,7 +1215,7 @@ static noinline int free_debug_processin
+ 			 bulk_cnt, cnt);
+ 
+ 	slab_unlock(page);
+-	spin_unlock_irqrestore(&n->list_lock, flags);
++	raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 	if (!ret)
+ 		slab_fix(s, "Object at 0x%p not freed", object);
+ 	return ret;
+@@ -1343,6 +1343,12 @@ static inline void dec_slabs_node(struct
+ 
+ #endif /* CONFIG_SLUB_DEBUG */
+ 
++struct slub_free_list {
++	raw_spinlock_t		lock;
++	struct list_head	list;
++};
++static DEFINE_PER_CPU(struct slub_free_list, slub_free_list);
++
+ /*
+  * Hooks for other subsystems that check memory allocations. In a typical
+  * production configuration these hooks all should produce no code at all.
+@@ -1569,7 +1575,11 @@ static struct page *allocate_slab(struct
+ 
+ 	flags &= gfp_allowed_mask;
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (system_state > SYSTEM_BOOTING)
++#else
+ 	if (gfpflags_allow_blocking(flags))
++#endif
+ 		local_irq_enable();
+ 
+ 	flags |= s->allocflags;
+@@ -1644,7 +1654,11 @@ static struct page *allocate_slab(struct
+ 	page->frozen = 1;
+ 
+ out:
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (system_state > SYSTEM_BOOTING)
++#else
+ 	if (gfpflags_allow_blocking(flags))
++#endif
+ 		local_irq_disable();
+ 	if (!page)
+ 		return NULL;
+@@ -1704,6 +1718,16 @@ static void __free_slab(struct kmem_cach
+ 	__free_pages(page, order);
+ }
+ 
++static void free_delayed(struct list_head *h)
++{
++	while(!list_empty(h)) {
++		struct page *page = list_first_entry(h, struct page, lru);
++
++		list_del(&page->lru);
++		__free_slab(page->slab_cache, page);
++	}
++}
++
+ #define need_reserve_slab_rcu						\
+ 	(sizeof(((struct page *)NULL)->lru) < sizeof(struct rcu_head))
+ 
+@@ -1735,6 +1759,12 @@ static void free_slab(struct kmem_cache
+ 		}
+ 
+ 		call_rcu(head, rcu_free_slab);
++	} else if (irqs_disabled()) {
++		struct slub_free_list *f = this_cpu_ptr(&slub_free_list);
++
++		raw_spin_lock(&f->lock);
++		list_add(&page->lru, &f->list);
++		raw_spin_unlock(&f->lock);
+ 	} else
+ 		__free_slab(s, page);
+ }
+@@ -1842,7 +1872,7 @@ static void *get_partial_node(struct kme
+ 	if (!n || !n->nr_partial)
+ 		return NULL;
+ 
+-	spin_lock(&n->list_lock);
++	raw_spin_lock(&n->list_lock);
+ 	list_for_each_entry_safe(page, page2, &n->partial, lru) {
+ 		void *t;
+ 
+@@ -1867,7 +1897,7 @@ static void *get_partial_node(struct kme
+ 			break;
+ 
+ 	}
+-	spin_unlock(&n->list_lock);
++	raw_spin_unlock(&n->list_lock);
+ 	return object;
+ }
+ 
+@@ -2113,7 +2143,7 @@ static void deactivate_slab(struct kmem_
+ 			 * that acquire_slab() will see a slab page that
+ 			 * is frozen
+ 			 */
+-			spin_lock(&n->list_lock);
++			raw_spin_lock(&n->list_lock);
+ 		}
+ 	} else {
+ 		m = M_FULL;
+@@ -2124,7 +2154,7 @@ static void deactivate_slab(struct kmem_
+ 			 * slabs from diagnostic functions will not see
+ 			 * any frozen slabs.
+ 			 */
+-			spin_lock(&n->list_lock);
++			raw_spin_lock(&n->list_lock);
+ 		}
+ 	}
+ 
+@@ -2159,7 +2189,7 @@ static void deactivate_slab(struct kmem_
+ 		goto redo;
+ 
+ 	if (lock)
+-		spin_unlock(&n->list_lock);
++		raw_spin_unlock(&n->list_lock);
+ 
+ 	if (m == M_FREE) {
+ 		stat(s, DEACTIVATE_EMPTY);
+@@ -2194,10 +2224,10 @@ static void unfreeze_partials(struct kme
+ 		n2 = get_node(s, page_to_nid(page));
+ 		if (n != n2) {
+ 			if (n)
+-				spin_unlock(&n->list_lock);
++				raw_spin_unlock(&n->list_lock);
+ 
+ 			n = n2;
+-			spin_lock(&n->list_lock);
++			raw_spin_lock(&n->list_lock);
+ 		}
+ 
+ 		do {
+@@ -2226,7 +2256,7 @@ static void unfreeze_partials(struct kme
+ 	}
+ 
+ 	if (n)
+-		spin_unlock(&n->list_lock);
++		raw_spin_unlock(&n->list_lock);
+ 
+ 	while (discard_page) {
+ 		page = discard_page;
+@@ -2265,14 +2295,21 @@ static void put_cpu_partial(struct kmem_
+ 			pobjects = oldpage->pobjects;
+ 			pages = oldpage->pages;
+ 			if (drain && pobjects > s->cpu_partial) {
++				struct slub_free_list *f;
+ 				unsigned long flags;
++				LIST_HEAD(tofree);
+ 				/*
+ 				 * partial array is full. Move the existing
+ 				 * set to the per node partial list.
+ 				 */
+ 				local_irq_save(flags);
+ 				unfreeze_partials(s, this_cpu_ptr(s->cpu_slab));
++				f = this_cpu_ptr(&slub_free_list);
++				raw_spin_lock(&f->lock);
++				list_splice_init(&f->list, &tofree);
++				raw_spin_unlock(&f->lock);
+ 				local_irq_restore(flags);
++				free_delayed(&tofree);
+ 				oldpage = NULL;
+ 				pobjects = 0;
+ 				pages = 0;
+@@ -2342,7 +2379,22 @@ static bool has_cpu_slab(int cpu, void *
+ 
+ static void flush_all(struct kmem_cache *s)
+ {
++	LIST_HEAD(tofree);
++	int cpu;
++
+ 	on_each_cpu_cond(has_cpu_slab, flush_cpu_slab, s, 1, GFP_ATOMIC);
++	for_each_online_cpu(cpu) {
++		struct slub_free_list *f;
++
++		if (!has_cpu_slab(cpu, s))
++			continue;
++
++		f = &per_cpu(slub_free_list, cpu);
++		raw_spin_lock_irq(&f->lock);
++		list_splice_init(&f->list, &tofree);
++		raw_spin_unlock_irq(&f->lock);
++		free_delayed(&tofree);
++	}
+ }
+ 
+ /*
+@@ -2397,10 +2449,10 @@ static unsigned long count_partial(struc
+ 	unsigned long x = 0;
+ 	struct page *page;
+ 
+-	spin_lock_irqsave(&n->list_lock, flags);
++	raw_spin_lock_irqsave(&n->list_lock, flags);
+ 	list_for_each_entry(page, &n->partial, lru)
+ 		x += get_count(page);
+-	spin_unlock_irqrestore(&n->list_lock, flags);
++	raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 	return x;
+ }
+ #endif /* CONFIG_SLUB_DEBUG || CONFIG_SYSFS */
+@@ -2538,8 +2590,10 @@ static inline void *get_freelist(struct
+  * already disabled (which is the case for bulk allocation).
+  */
+ static void *___slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node,
+-			  unsigned long addr, struct kmem_cache_cpu *c)
++			  unsigned long addr, struct kmem_cache_cpu *c,
++			  struct list_head *to_free)
+ {
++	struct slub_free_list *f;
+ 	void *freelist;
+ 	struct page *page;
+ 
+@@ -2595,6 +2649,13 @@ static void *___slab_alloc(struct kmem_c
+ 	VM_BUG_ON(!c->page->frozen);
+ 	c->freelist = get_freepointer(s, freelist);
+ 	c->tid = next_tid(c->tid);
++
++out:
++	f = this_cpu_ptr(&slub_free_list);
++	raw_spin_lock(&f->lock);
++	list_splice_init(&f->list, to_free);
++	raw_spin_unlock(&f->lock);
++
+ 	return freelist;
+ 
+ new_slab:
+@@ -2610,7 +2671,7 @@ static void *___slab_alloc(struct kmem_c
+ 
+ 	if (unlikely(!freelist)) {
+ 		slab_out_of_memory(s, gfpflags, node);
+-		return NULL;
++		goto out;
+ 	}
+ 
+ 	page = c->page;
+@@ -2623,7 +2684,7 @@ static void *___slab_alloc(struct kmem_c
+ 		goto new_slab;	/* Slab failed checks. Next slab needed */
+ 
+ 	deactivate_slab(s, page, get_freepointer(s, freelist), c);
+-	return freelist;
++	goto out;
+ }
+ 
+ /*
+@@ -2635,6 +2696,7 @@ static void *__slab_alloc(struct kmem_ca
+ {
+ 	void *p;
+ 	unsigned long flags;
++	LIST_HEAD(tofree);
+ 
+ 	local_irq_save(flags);
+ #ifdef CONFIG_PREEMPT
+@@ -2646,8 +2708,9 @@ static void *__slab_alloc(struct kmem_ca
+ 	c = this_cpu_ptr(s->cpu_slab);
+ #endif
+ 
+-	p = ___slab_alloc(s, gfpflags, node, addr, c);
++	p = ___slab_alloc(s, gfpflags, node, addr, c, &tofree);
+ 	local_irq_restore(flags);
++	free_delayed(&tofree);
+ 	return p;
+ }
+ 
+@@ -2833,7 +2896,7 @@ static void __slab_free(struct kmem_cach
+ 
+ 	do {
+ 		if (unlikely(n)) {
+-			spin_unlock_irqrestore(&n->list_lock, flags);
++			raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 			n = NULL;
+ 		}
+ 		prior = page->freelist;
+@@ -2865,7 +2928,7 @@ static void __slab_free(struct kmem_cach
+ 				 * Otherwise the list_lock will synchronize with
+ 				 * other processors updating the list of slabs.
+ 				 */
+-				spin_lock_irqsave(&n->list_lock, flags);
++				raw_spin_lock_irqsave(&n->list_lock, flags);
+ 
+ 			}
+ 		}
+@@ -2907,7 +2970,7 @@ static void __slab_free(struct kmem_cach
+ 		add_partial(n, page, DEACTIVATE_TO_TAIL);
+ 		stat(s, FREE_ADD_PARTIAL);
+ 	}
+-	spin_unlock_irqrestore(&n->list_lock, flags);
++	raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 	return;
+ 
+ slab_empty:
+@@ -2922,7 +2985,7 @@ static void __slab_free(struct kmem_cach
+ 		remove_full(s, n, page);
+ 	}
+ 
+-	spin_unlock_irqrestore(&n->list_lock, flags);
++	raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 	stat(s, FREE_SLAB);
+ 	discard_slab(s, page);
+ }
+@@ -3127,6 +3190,7 @@ int kmem_cache_alloc_bulk(struct kmem_ca
+ 			  void **p)
+ {
+ 	struct kmem_cache_cpu *c;
++	LIST_HEAD(to_free);
+ 	int i;
+ 
+ 	/* memcg and kmem_cache debug support */
+@@ -3150,7 +3214,7 @@ int kmem_cache_alloc_bulk(struct kmem_ca
+ 			 * of re-populating per CPU c->freelist
+ 			 */
+ 			p[i] = ___slab_alloc(s, flags, NUMA_NO_NODE,
+-					    _RET_IP_, c);
++					    _RET_IP_, c, &to_free);
+ 			if (unlikely(!p[i]))
+ 				goto error;
+ 
+@@ -3162,6 +3226,7 @@ int kmem_cache_alloc_bulk(struct kmem_ca
+ 	}
+ 	c->tid = next_tid(c->tid);
+ 	local_irq_enable();
++	free_delayed(&to_free);
+ 
+ 	/* Clear memory outside IRQ disabled fastpath loop */
+ 	if (unlikely(flags & __GFP_ZERO)) {
+@@ -3309,7 +3374,7 @@ static void
+ init_kmem_cache_node(struct kmem_cache_node *n)
+ {
+ 	n->nr_partial = 0;
+-	spin_lock_init(&n->list_lock);
++	raw_spin_lock_init(&n->list_lock);
+ 	INIT_LIST_HEAD(&n->partial);
+ #ifdef CONFIG_SLUB_DEBUG
+ 	atomic_long_set(&n->nr_slabs, 0);
+@@ -3663,6 +3728,10 @@ static void list_slab_objects(struct kme
+ 							const char *text)
+ {
+ #ifdef CONFIG_SLUB_DEBUG
++#ifdef CONFIG_PREEMPT_RT_BASE
++	/* XXX move out of irq-off section */
++	slab_err(s, page, text, s->name);
++#else
+ 	void *addr = page_address(page);
+ 	void *p;
+ 	unsigned long *map = kzalloc(BITS_TO_LONGS(page->objects) *
+@@ -3683,6 +3752,7 @@ static void list_slab_objects(struct kme
+ 	slab_unlock(page);
+ 	kfree(map);
+ #endif
++#endif
+ }
+ 
+ /*
+@@ -3696,7 +3766,7 @@ static void free_partial(struct kmem_cac
+ 	struct page *page, *h;
+ 
+ 	BUG_ON(irqs_disabled());
+-	spin_lock_irq(&n->list_lock);
++	raw_spin_lock_irq(&n->list_lock);
+ 	list_for_each_entry_safe(page, h, &n->partial, lru) {
+ 		if (!page->inuse) {
+ 			remove_partial(n, page);
+@@ -3706,7 +3776,7 @@ static void free_partial(struct kmem_cac
+ 			"Objects remaining in %s on __kmem_cache_shutdown()");
+ 		}
+ 	}
+-	spin_unlock_irq(&n->list_lock);
++	raw_spin_unlock_irq(&n->list_lock);
+ 
+ 	list_for_each_entry_safe(page, h, &discard, lru)
+ 		discard_slab(s, page);
+@@ -3950,7 +4020,7 @@ int __kmem_cache_shrink(struct kmem_cach
+ 		for (i = 0; i < SHRINK_PROMOTE_MAX; i++)
+ 			INIT_LIST_HEAD(promote + i);
+ 
+-		spin_lock_irqsave(&n->list_lock, flags);
++		raw_spin_lock_irqsave(&n->list_lock, flags);
+ 
+ 		/*
+ 		 * Build lists of slabs to discard or promote.
+@@ -3981,7 +4051,7 @@ int __kmem_cache_shrink(struct kmem_cach
+ 		for (i = SHRINK_PROMOTE_MAX - 1; i >= 0; i--)
+ 			list_splice(promote + i, &n->partial);
+ 
+-		spin_unlock_irqrestore(&n->list_lock, flags);
++		raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 
+ 		/* Release empty slabs */
+ 		list_for_each_entry_safe(page, t, &discard, lru)
+@@ -4194,6 +4264,12 @@ void __init kmem_cache_init(void)
+ {
+ 	static __initdata struct kmem_cache boot_kmem_cache,
+ 		boot_kmem_cache_node;
++	int cpu;
++
++	for_each_possible_cpu(cpu) {
++		raw_spin_lock_init(&per_cpu(slub_free_list, cpu).lock);
++		INIT_LIST_HEAD(&per_cpu(slub_free_list, cpu).list);
++	}
+ 
+ 	if (debug_guardpage_minorder())
+ 		slub_max_order = 0;
+@@ -4402,7 +4478,7 @@ static int validate_slab_node(struct kme
+ 	struct page *page;
+ 	unsigned long flags;
+ 
+-	spin_lock_irqsave(&n->list_lock, flags);
++	raw_spin_lock_irqsave(&n->list_lock, flags);
+ 
+ 	list_for_each_entry(page, &n->partial, lru) {
+ 		validate_slab_slab(s, page, map);
+@@ -4424,7 +4500,7 @@ static int validate_slab_node(struct kme
+ 		       s->name, count, atomic_long_read(&n->nr_slabs));
+ 
+ out:
+-	spin_unlock_irqrestore(&n->list_lock, flags);
++	raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 	return count;
+ }
+ 
+@@ -4612,12 +4688,12 @@ static int list_locations(struct kmem_ca
+ 		if (!atomic_long_read(&n->nr_slabs))
+ 			continue;
+ 
+-		spin_lock_irqsave(&n->list_lock, flags);
++		raw_spin_lock_irqsave(&n->list_lock, flags);
+ 		list_for_each_entry(page, &n->partial, lru)
+ 			process_slab(&t, s, page, alloc, map);
+ 		list_for_each_entry(page, &n->full, lru)
+ 			process_slab(&t, s, page, alloc, map);
+-		spin_unlock_irqrestore(&n->list_lock, flags);
++		raw_spin_unlock_irqrestore(&n->list_lock, flags);
+ 	}
+ 
+ 	for (i = 0; i < t.count; i++) {
diff --git a/kernel/patches-4.14.x-rt/0165-mm-slub-close-possible-memory-leak-in-kmem_cache_all.patch b/kernel/patches-4.14.x-rt/0165-mm-slub-close-possible-memory-leak-in-kmem_cache_all.patch
new file mode 100644
index 000000000..1c30f0a30
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0165-mm-slub-close-possible-memory-leak-in-kmem_cache_all.patch
@@ -0,0 +1,25 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 13 Dec 2017 12:44:14 +0100
+Subject: [PATCH] mm/slub: close possible memory-leak in
+ kmem_cache_alloc_bulk()
+
+Under certain circumstances we could leak elements which were moved to
+the local "to_free" list. The damage is limited since I can't find
+any users here.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/slub.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -3241,6 +3241,7 @@ int kmem_cache_alloc_bulk(struct kmem_ca
+ 	return i;
+ error:
+ 	local_irq_enable();
++	free_delayed(&to_free);
+ 	slab_post_alloc_hook(s, flags, i, p);
+ 	__kmem_cache_free_bulk(s, i, p);
+ 	return 0;
diff --git a/kernel/patches-4.14.x-rt/0166-slub-enable-irqs-for-no-wait.patch b/kernel/patches-4.14.x-rt/0166-slub-enable-irqs-for-no-wait.patch
new file mode 100644
index 000000000..4336c4fe7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0166-slub-enable-irqs-for-no-wait.patch
@@ -0,0 +1,47 @@
+Subject: slub: Enable irqs for __GFP_WAIT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 09 Jan 2013 12:08:15 +0100
+
+SYSTEM_RUNNING might be too late for enabling interrupts. Allocations
+with GFP_WAIT can happen before that. So use this as an indicator.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ mm/slub.c |   13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+--- a/mm/slub.c
++++ b/mm/slub.c
+@@ -1572,14 +1572,17 @@ static struct page *allocate_slab(struct
+ 	void *start, *p;
+ 	int idx, order;
+ 	bool shuffle;
++	bool enableirqs = false;
+ 
+ 	flags &= gfp_allowed_mask;
+ 
++	if (gfpflags_allow_blocking(flags))
++		enableirqs = true;
+ #ifdef CONFIG_PREEMPT_RT_FULL
+ 	if (system_state > SYSTEM_BOOTING)
+-#else
+-	if (gfpflags_allow_blocking(flags))
++		enableirqs = true;
+ #endif
++	if (enableirqs)
+ 		local_irq_enable();
+ 
+ 	flags |= s->allocflags;
+@@ -1654,11 +1657,7 @@ static struct page *allocate_slab(struct
+ 	page->frozen = 1;
+ 
+ out:
+-#ifdef CONFIG_PREEMPT_RT_FULL
+-	if (system_state > SYSTEM_BOOTING)
+-#else
+-	if (gfpflags_allow_blocking(flags))
+-#endif
++	if (enableirqs)
+ 		local_irq_disable();
+ 	if (!page)
+ 		return NULL;
diff --git a/kernel/patches-4.14.x-rt/0167-slub-disable-SLUB_CPU_PARTIAL.patch b/kernel/patches-4.14.x-rt/0167-slub-disable-SLUB_CPU_PARTIAL.patch
new file mode 100644
index 000000000..08db81110
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0167-slub-disable-SLUB_CPU_PARTIAL.patch
@@ -0,0 +1,47 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 15 Apr 2015 19:00:47 +0200
+Subject: slub: Disable SLUB_CPU_PARTIAL
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:915
+|in_atomic(): 1, irqs_disabled(): 0, pid: 87, name: rcuop/7
+|1 lock held by rcuop/7/87:
+| #0:  (rcu_callback){......}, at: [<ffffffff8112c76a>] rcu_nocb_kthread+0x1ca/0x5d0
+|Preemption disabled at:[<ffffffff811eebd9>] put_cpu_partial+0x29/0x220
+|
+|CPU: 0 PID: 87 Comm: rcuop/7 Tainted: G        W       4.0.0-rt0+ #477
+|Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.7.5-20140531_083030-gandalf 04/01/2014
+| 000000000007a9fc ffff88013987baf8 ffffffff817441c7 0000000000000007
+| 0000000000000000 ffff88013987bb18 ffffffff810eee51 0000000000000000
+| ffff88013fc10200 ffff88013987bb48 ffffffff8174a1c4 000000000007a9fc
+|Call Trace:
+| [<ffffffff817441c7>] dump_stack+0x4f/0x90
+| [<ffffffff810eee51>] ___might_sleep+0x121/0x1b0
+| [<ffffffff8174a1c4>] rt_spin_lock+0x24/0x60
+| [<ffffffff811a689a>] __free_pages_ok+0xaa/0x540
+| [<ffffffff811a729d>] __free_pages+0x1d/0x30
+| [<ffffffff811eddd5>] __free_slab+0xc5/0x1e0
+| [<ffffffff811edf46>] free_delayed+0x56/0x70
+| [<ffffffff811eecfd>] put_cpu_partial+0x14d/0x220
+| [<ffffffff811efc98>] __slab_free+0x158/0x2c0
+| [<ffffffff811f0021>] kmem_cache_free+0x221/0x2d0
+| [<ffffffff81204d0c>] file_free_rcu+0x2c/0x40
+| [<ffffffff8112c7e3>] rcu_nocb_kthread+0x243/0x5d0
+| [<ffffffff810e951c>] kthread+0xfc/0x120
+| [<ffffffff8174abc8>] ret_from_fork+0x58/0x90
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ init/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -1596,7 +1596,7 @@ config SLAB_FREELIST_HARDENED
+ 
+ config SLUB_CPU_PARTIAL
+ 	default y
+-	depends on SLUB && SMP
++	depends on SLUB && SMP && !PREEMPT_RT_FULL
+ 	bool "SLUB per cpu partial cache"
+ 	help
+ 	  Per cpu partial caches accellerate objects allocation and freeing
diff --git a/kernel/patches-4.14.x-rt/0168-mm-page-alloc-use-local-lock-on-target-cpu.patch b/kernel/patches-4.14.x-rt/0168-mm-page-alloc-use-local-lock-on-target-cpu.patch
new file mode 100644
index 000000000..e5e462b4b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0168-mm-page-alloc-use-local-lock-on-target-cpu.patch
@@ -0,0 +1,27 @@
+Subject: mm: page_alloc: Use local_lock_on() instead of plain spinlock
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 27 Sep 2012 11:11:46 +0200
+
+The plain spinlock while sufficient does not update the local_lock
+internals. Use a proper local_lock function instead to ease debugging.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ mm/page_alloc.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/mm/page_alloc.c
++++ b/mm/page_alloc.c
+@@ -292,9 +292,9 @@ static DEFINE_LOCAL_IRQ_LOCK(pa_lock);
+ 
+ #ifdef CONFIG_PREEMPT_RT_BASE
+ # define cpu_lock_irqsave(cpu, flags)		\
+-	spin_lock_irqsave(&per_cpu(pa_lock, cpu).lock, flags)
++	local_lock_irqsave_on(pa_lock, flags, cpu)
+ # define cpu_unlock_irqrestore(cpu, flags)	\
+-	spin_unlock_irqrestore(&per_cpu(pa_lock, cpu).lock, flags)
++	local_unlock_irqrestore_on(pa_lock, flags, cpu)
+ #else
+ # define cpu_lock_irqsave(cpu, flags)		local_irq_save(flags)
+ # define cpu_unlock_irqrestore(cpu, flags)	local_irq_restore(flags)
diff --git a/kernel/patches-4.14.x-rt/0169-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch b/kernel/patches-4.14.x-rt/0169-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch
new file mode 100644
index 000000000..52ddca411
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0169-mm-memcontrol-Don-t-call-schedule_work_on-in-preempt.patch
@@ -0,0 +1,68 @@
+From: Yang Shi <yang.shi@windriver.com>
+Subject: mm/memcontrol: Don't call schedule_work_on in preemption disabled context
+Date: Wed, 30 Oct 2013 11:48:33 -0700
+
+The following trace is triggered when running ltp oom test cases:
+
+BUG: sleeping function called from invalid context at kernel/rtmutex.c:659
+in_atomic(): 1, irqs_disabled(): 0, pid: 17188, name: oom03
+Preemption disabled at:[<ffffffff8112ba70>] mem_cgroup_reclaim+0x90/0xe0
+
+CPU: 2 PID: 17188 Comm: oom03 Not tainted 3.10.10-rt3 #2
+Hardware name: Intel Corporation Calpella platform/MATXM-CORE-411-B, BIOS 4.6.3 08/18/2010
+ffff88007684d730 ffff880070df9b58 ffffffff8169918d ffff880070df9b70
+ffffffff8106db31 ffff88007688b4a0 ffff880070df9b88 ffffffff8169d9c0
+ffff88007688b4a0 ffff880070df9bc8 ffffffff81059da1 0000000170df9bb0
+Call Trace:
+[<ffffffff8169918d>] dump_stack+0x19/0x1b
+[<ffffffff8106db31>] __might_sleep+0xf1/0x170
+[<ffffffff8169d9c0>] rt_spin_lock+0x20/0x50
+[<ffffffff81059da1>] queue_work_on+0x61/0x100
+[<ffffffff8112b361>] drain_all_stock+0xe1/0x1c0
+[<ffffffff8112ba70>] mem_cgroup_reclaim+0x90/0xe0
+[<ffffffff8112beda>] __mem_cgroup_try_charge+0x41a/0xc40
+[<ffffffff810f1c91>] ? release_pages+0x1b1/0x1f0
+[<ffffffff8106f200>] ? sched_exec+0x40/0xb0
+[<ffffffff8112cc87>] mem_cgroup_charge_common+0x37/0x70
+[<ffffffff8112e2c6>] mem_cgroup_newpage_charge+0x26/0x30
+[<ffffffff8110af68>] handle_pte_fault+0x618/0x840
+[<ffffffff8103ecf6>] ? unpin_current_cpu+0x16/0x70
+[<ffffffff81070f94>] ? migrate_enable+0xd4/0x200
+[<ffffffff8110cde5>] handle_mm_fault+0x145/0x1e0
+[<ffffffff810301e1>] __do_page_fault+0x1a1/0x4c0
+[<ffffffff8169c9eb>] ? preempt_schedule_irq+0x4b/0x70
+[<ffffffff8169e3b7>] ? retint_kernel+0x37/0x40
+[<ffffffff8103053e>] do_page_fault+0xe/0x10
+[<ffffffff8169e4c2>] page_fault+0x22/0x30
+
+So, to prevent schedule_work_on from being called in preempt disabled context,
+replace the pair of get/put_cpu() to get/put_cpu_light().
+
+
+Signed-off-by: Yang Shi <yang.shi@windriver.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+
+ mm/memcontrol.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -1831,7 +1831,7 @@ static void drain_all_stock(struct mem_c
+ 	 * as well as workers from this path always operate on the local
+ 	 * per-cpu data. CPU up doesn't touch memcg_stock at all.
+ 	 */
+-	curcpu = get_cpu();
++	curcpu = get_cpu_light();
+ 	for_each_online_cpu(cpu) {
+ 		struct memcg_stock_pcp *stock = &per_cpu(memcg_stock, cpu);
+ 		struct mem_cgroup *memcg;
+@@ -1851,7 +1851,7 @@ static void drain_all_stock(struct mem_c
+ 		}
+ 		css_put(&memcg->css);
+ 	}
+-	put_cpu();
++	put_cpu_light();
+ 	mutex_unlock(&percpu_charge_mutex);
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0170-mm-memcontrol-do_not_disable_irq.patch b/kernel/patches-4.14.x-rt/0170-mm-memcontrol-do_not_disable_irq.patch
new file mode 100644
index 000000000..9cddf870e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0170-mm-memcontrol-do_not_disable_irq.patch
@@ -0,0 +1,116 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Subject: mm/memcontrol: Replace local_irq_disable with local locks
+Date: Wed, 28 Jan 2015 17:14:16 +0100
+
+There are a few local_irq_disable() which then take sleeping locks. This
+patch converts them local locks.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/memcontrol.c |   24 ++++++++++++++++--------
+ 1 file changed, 16 insertions(+), 8 deletions(-)
+
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -69,6 +69,7 @@
+ #include <net/sock.h>
+ #include <net/ip.h>
+ #include "slab.h"
++#include <linux/locallock.h>
+ 
+ #include <linux/uaccess.h>
+ 
+@@ -94,6 +95,8 @@ int do_swap_account __read_mostly;
+ #define do_swap_account		0
+ #endif
+ 
++static DEFINE_LOCAL_IRQ_LOCK(event_lock);
++
+ /* Whether legacy memory+swap accounting is active */
+ static bool do_memsw_account(void)
+ {
+@@ -4621,12 +4624,12 @@ static int mem_cgroup_move_account(struc
+ 
+ 	ret = 0;
+ 
+-	local_irq_disable();
++	local_lock_irq(event_lock);
+ 	mem_cgroup_charge_statistics(to, page, compound, nr_pages);
+ 	memcg_check_events(to, page);
+ 	mem_cgroup_charge_statistics(from, page, compound, -nr_pages);
+ 	memcg_check_events(from, page);
+-	local_irq_enable();
++	local_unlock_irq(event_lock);
+ out_unlock:
+ 	unlock_page(page);
+ out:
+@@ -5569,10 +5572,10 @@ void mem_cgroup_commit_charge(struct pag
+ 
+ 	commit_charge(page, memcg, lrucare);
+ 
+-	local_irq_disable();
++	local_lock_irq(event_lock);
+ 	mem_cgroup_charge_statistics(memcg, page, compound, nr_pages);
+ 	memcg_check_events(memcg, page);
+-	local_irq_enable();
++	local_unlock_irq(event_lock);
+ 
+ 	if (do_memsw_account() && PageSwapCache(page)) {
+ 		swp_entry_t entry = { .val = page_private(page) };
+@@ -5641,7 +5644,7 @@ static void uncharge_batch(const struct
+ 		memcg_oom_recover(ug->memcg);
+ 	}
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(event_lock, flags);
+ 	__this_cpu_sub(ug->memcg->stat->count[MEMCG_RSS], ug->nr_anon);
+ 	__this_cpu_sub(ug->memcg->stat->count[MEMCG_CACHE], ug->nr_file);
+ 	__this_cpu_sub(ug->memcg->stat->count[MEMCG_RSS_HUGE], ug->nr_huge);
+@@ -5649,7 +5652,7 @@ static void uncharge_batch(const struct
+ 	__this_cpu_add(ug->memcg->stat->events[PGPGOUT], ug->pgpgout);
+ 	__this_cpu_add(ug->memcg->stat->nr_page_events, nr_pages);
+ 	memcg_check_events(ug->memcg, ug->dummy_page);
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(event_lock, flags);
+ 
+ 	if (!mem_cgroup_is_root(ug->memcg))
+ 		css_put_many(&ug->memcg->css, nr_pages);
+@@ -5812,10 +5815,10 @@ void mem_cgroup_migrate(struct page *old
+ 
+ 	commit_charge(newpage, memcg, false);
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(event_lock, flags);
+ 	mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
+ 	memcg_check_events(memcg, newpage);
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(event_lock, flags);
+ }
+ 
+ DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
+@@ -5993,6 +5996,7 @@ void mem_cgroup_swapout(struct page *pag
+ 	struct mem_cgroup *memcg, *swap_memcg;
+ 	unsigned int nr_entries;
+ 	unsigned short oldid;
++	unsigned long flags;
+ 
+ 	VM_BUG_ON_PAGE(PageLRU(page), page);
+ 	VM_BUG_ON_PAGE(page_count(page), page);
+@@ -6038,13 +6042,17 @@ void mem_cgroup_swapout(struct page *pag
+ 	 * important here to have the interrupts disabled because it is the
+ 	 * only synchronisation we have for udpating the per-CPU variables.
+ 	 */
++	local_lock_irqsave(event_lock, flags);
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	VM_BUG_ON(!irqs_disabled());
++#endif
+ 	mem_cgroup_charge_statistics(memcg, page, PageTransHuge(page),
+ 				     -nr_entries);
+ 	memcg_check_events(memcg, page);
+ 
+ 	if (!mem_cgroup_is_root(memcg))
+ 		css_put_many(&memcg->css, nr_entries);
++	local_unlock_irqrestore(event_lock, flags);
+ }
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0171-mm-backing-dev-don-t-disable-IRQs-in-wb_congested_pu.patch b/kernel/patches-4.14.x-rt/0171-mm-backing-dev-don-t-disable-IRQs-in-wb_congested_pu.patch
new file mode 100644
index 000000000..1b4eb21d1
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0171-mm-backing-dev-don-t-disable-IRQs-in-wb_congested_pu.patch
@@ -0,0 +1,41 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 5 Feb 2016 12:17:14 +0100
+Subject: mm: backing-dev: don't disable IRQs in wb_congested_put()
+
+it triggers:
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:930
+|in_atomic(): 0, irqs_disabled(): 1, pid: 12, name: rcuc/0
+|1 lock held by rcuc/0/12:
+| #0:  (rcu_callback){......}, at: [<ffffffff810ce1a6>] rcu_cpu_kthread+0x376/0xb10
+|irq event stamp: 23636
+|hardirqs last  enabled at (23635): [<ffffffff8173524c>] _raw_spin_unlock_irqrestore+0x6c/0x80
+|hardirqs last disabled at (23636): [<ffffffff81173918>] wb_congested_put+0x18/0x90
+| [<ffffffff81735434>] rt_spin_lock+0x24/0x60
+| [<ffffffff810afed2>] atomic_dec_and_spin_lock+0x52/0x90
+| [<ffffffff81173928>] wb_congested_put+0x28/0x90
+| [<ffffffff813b833e>] __blkg_release_rcu+0x5e/0x1e0
+| [<ffffffff813b8367>] ? __blkg_release_rcu+0x87/0x1e0
+| [<ffffffff813b82e0>] ? blkg_conf_finish+0x90/0x90
+| [<ffffffff810ce1e7>] rcu_cpu_kthread+0x3b7/0xb10
+
+due to cgwb_lock beeing taken with spin_lock_irqsave() usually.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/backing-dev.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/mm/backing-dev.c
++++ b/mm/backing-dev.c
+@@ -482,9 +482,9 @@ void wb_congested_put(struct bdi_writeba
+ {
+ 	unsigned long flags;
+ 
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	if (!atomic_dec_and_lock(&congested->refcnt, &cgwb_lock)) {
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ 		return;
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0172-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch b/kernel/patches-4.14.x-rt/0172-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch
new file mode 100644
index 000000000..578138506
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0172-mm_zsmalloc_copy_with_get_cpu_var_and_locking.patch
@@ -0,0 +1,196 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Tue, 22 Mar 2016 11:16:09 +0100
+Subject: [PATCH] mm/zsmalloc: copy with get_cpu_var() and locking
+
+get_cpu_var() disables preemption and triggers a might_sleep() splat later.
+This is replaced with get_locked_var().
+This bitspinlocks are replaced with a proper mutex which requires a slightly
+larger struct to allocate.
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+[bigeasy: replace the bitspin_lock() with a mutex, get_locked_var(). Mike then
+fixed the size magic]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/zsmalloc.c |   80 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 74 insertions(+), 6 deletions(-)
+
+--- a/mm/zsmalloc.c
++++ b/mm/zsmalloc.c
+@@ -53,6 +53,7 @@
+ #include <linux/mount.h>
+ #include <linux/migrate.h>
+ #include <linux/pagemap.h>
++#include <linux/locallock.h>
+ 
+ #define ZSPAGE_MAGIC	0x58
+ 
+@@ -70,9 +71,22 @@
+  */
+ #define ZS_MAX_ZSPAGE_ORDER 2
+ #define ZS_MAX_PAGES_PER_ZSPAGE (_AC(1, UL) << ZS_MAX_ZSPAGE_ORDER)
+-
+ #define ZS_HANDLE_SIZE (sizeof(unsigned long))
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++
++struct zsmalloc_handle {
++	unsigned long addr;
++	struct mutex lock;
++};
++
++#define ZS_HANDLE_ALLOC_SIZE (sizeof(struct zsmalloc_handle))
++
++#else
++
++#define ZS_HANDLE_ALLOC_SIZE (sizeof(unsigned long))
++#endif
++
+ /*
+  * Object location (<PFN>, <obj_idx>) is encoded as
+  * as single (unsigned long) handle value.
+@@ -320,7 +334,7 @@ static void SetZsPageMovable(struct zs_p
+ 
+ static int create_cache(struct zs_pool *pool)
+ {
+-	pool->handle_cachep = kmem_cache_create("zs_handle", ZS_HANDLE_SIZE,
++	pool->handle_cachep = kmem_cache_create("zs_handle", ZS_HANDLE_ALLOC_SIZE,
+ 					0, 0, NULL);
+ 	if (!pool->handle_cachep)
+ 		return 1;
+@@ -344,10 +358,27 @@ static void destroy_cache(struct zs_pool
+ 
+ static unsigned long cache_alloc_handle(struct zs_pool *pool, gfp_t gfp)
+ {
+-	return (unsigned long)kmem_cache_alloc(pool->handle_cachep,
+-			gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
++	void *p;
++
++	p = kmem_cache_alloc(pool->handle_cachep,
++			     gfp & ~(__GFP_HIGHMEM|__GFP_MOVABLE));
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (p) {
++		struct zsmalloc_handle *zh = p;
++
++		mutex_init(&zh->lock);
++	}
++#endif
++	return (unsigned long)p;
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static struct zsmalloc_handle *zs_get_pure_handle(unsigned long handle)
++{
++	return (void *)(handle &~((1 << OBJ_TAG_BITS) - 1));
++}
++#endif
++
+ static void cache_free_handle(struct zs_pool *pool, unsigned long handle)
+ {
+ 	kmem_cache_free(pool->handle_cachep, (void *)handle);
+@@ -366,12 +397,18 @@ static void cache_free_zspage(struct zs_
+ 
+ static void record_obj(unsigned long handle, unsigned long obj)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
++
++	WRITE_ONCE(zh->addr, obj);
++#else
+ 	/*
+ 	 * lsb of @obj represents handle lock while other bits
+ 	 * represent object value the handle is pointing so
+ 	 * updating shouldn't do store tearing.
+ 	 */
+ 	WRITE_ONCE(*(unsigned long *)handle, obj);
++#endif
+ }
+ 
+ /* zpool driver */
+@@ -460,6 +497,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);
++static DEFINE_LOCAL_IRQ_LOCK(zs_map_area_lock);
+ 
+ static bool is_zspage_isolated(struct zspage *zspage)
+ {
+@@ -898,7 +936,13 @@ static unsigned long location_to_obj(str
+ 
+ static unsigned long handle_to_obj(unsigned long handle)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
++
++	return zh->addr;
++#else
+ 	return *(unsigned long *)handle;
++#endif
+ }
+ 
+ static unsigned long obj_to_head(struct page *page, void *obj)
+@@ -912,22 +956,46 @@ static unsigned long obj_to_head(struct
+ 
+ static inline int testpin_tag(unsigned long handle)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
++
++	return mutex_is_locked(&zh->lock);
++#else
+ 	return bit_spin_is_locked(HANDLE_PIN_BIT, (unsigned long *)handle);
++#endif
+ }
+ 
+ static inline int trypin_tag(unsigned long handle)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
++
++	return mutex_trylock(&zh->lock);
++#else
+ 	return bit_spin_trylock(HANDLE_PIN_BIT, (unsigned long *)handle);
++#endif
+ }
+ 
+ static void pin_tag(unsigned long handle)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
++
++	return mutex_lock(&zh->lock);
++#else
+ 	bit_spin_lock(HANDLE_PIN_BIT, (unsigned long *)handle);
++#endif
+ }
+ 
+ static void unpin_tag(unsigned long handle)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct zsmalloc_handle *zh = zs_get_pure_handle(handle);
++
++	return mutex_unlock(&zh->lock);
++#else
+ 	bit_spin_unlock(HANDLE_PIN_BIT, (unsigned long *)handle);
++#endif
+ }
+ 
+ static void reset_page(struct page *page)
+@@ -1365,7 +1433,7 @@ void *zs_map_object(struct zs_pool *pool
+ 	class = pool->size_class[class_idx];
+ 	off = (class->size * obj_idx) & ~PAGE_MASK;
+ 
+-	area = &get_cpu_var(zs_map_area);
++	area = &get_locked_var(zs_map_area_lock, zs_map_area);
+ 	area->vm_mm = mm;
+ 	if (off + class->size <= PAGE_SIZE) {
+ 		/* this object is contained entirely within a page */
+@@ -1419,7 +1487,7 @@ void zs_unmap_object(struct zs_pool *poo
+ 
+ 		__zs_unmap_object(area, pages, off, class->size);
+ 	}
+-	put_cpu_var(zs_map_area);
++	put_locked_var(zs_map_area_lock, zs_map_area);
+ 
+ 	migrate_read_unlock(zspage);
+ 	unpin_tag(handle);
diff --git a/kernel/patches-4.14.x-rt/0173-radix-tree-use-local-locks.patch b/kernel/patches-4.14.x-rt/0173-radix-tree-use-local-locks.patch
new file mode 100644
index 000000000..271b7a0ad
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0173-radix-tree-use-local-locks.patch
@@ -0,0 +1,165 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 25 Jan 2017 16:34:27 +0100
+Subject: [PATCH] radix-tree: use local locks
+
+The preload functionality uses per-CPU variables and preempt-disable to
+ensure that it does not switch CPUs during its usage. This patch adds
+local_locks() instead preempt_disable() for the same purpose and to
+remain preemptible on -RT.
+
+Cc: stable-rt@vger.kernel.org
+Reported-and-debugged-by: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/idr.h        |    5 +----
+ include/linux/radix-tree.h |    7 ++-----
+ lib/radix-tree.c           |   32 +++++++++++++++++++++++---------
+ 3 files changed, 26 insertions(+), 18 deletions(-)
+
+--- a/include/linux/idr.h
++++ b/include/linux/idr.h
+@@ -167,10 +167,7 @@ static inline bool idr_is_empty(const st
+  * Each idr_preload() should be matched with an invocation of this
+  * function.  See idr_preload() for details.
+  */
+-static inline void idr_preload_end(void)
+-{
+-	preempt_enable();
+-}
++void idr_preload_end(void);
+ 
+ /**
+  * idr_find - return pointer for given id
+--- a/include/linux/radix-tree.h
++++ b/include/linux/radix-tree.h
+@@ -328,6 +328,8 @@ unsigned int radix_tree_gang_lookup_slot
+ 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);
++void radix_tree_preload_end(void);
++
+ void radix_tree_init(void);
+ void *radix_tree_tag_set(struct radix_tree_root *,
+ 			unsigned long index, unsigned int tag);
+@@ -347,11 +349,6 @@ unsigned int radix_tree_gang_lookup_tag_
+ 		unsigned int max_items, unsigned int tag);
+ int radix_tree_tagged(const struct radix_tree_root *, unsigned int tag);
+ 
+-static inline void radix_tree_preload_end(void)
+-{
+-	preempt_enable();
+-}
+-
+ int radix_tree_split_preload(unsigned old_order, unsigned new_order, gfp_t);
+ int radix_tree_split(struct radix_tree_root *, unsigned long index,
+ 			unsigned new_order);
+--- a/lib/radix-tree.c
++++ b/lib/radix-tree.c
+@@ -37,7 +37,7 @@
+ #include <linux/rcupdate.h>
+ #include <linux/slab.h>
+ #include <linux/string.h>
+-
++#include <linux/locallock.h>
+ 
+ /* Number of nodes in fully populated tree of given height */
+ static unsigned long height_to_maxnodes[RADIX_TREE_MAX_PATH + 1] __read_mostly;
+@@ -86,6 +86,7 @@ struct radix_tree_preload {
+ 	struct radix_tree_node *nodes;
+ };
+ static DEFINE_PER_CPU(struct radix_tree_preload, radix_tree_preloads) = { 0, };
++static DEFINE_LOCAL_IRQ_LOCK(radix_tree_preloads_lock);
+ 
+ static inline struct radix_tree_node *entry_to_node(void *ptr)
+ {
+@@ -404,12 +405,13 @@ radix_tree_node_alloc(gfp_t gfp_mask, st
+ 		 * succeed in getting a node here (and never reach
+ 		 * kmem_cache_alloc)
+ 		 */
+-		rtp = this_cpu_ptr(&radix_tree_preloads);
++		rtp = &get_locked_var(radix_tree_preloads_lock, radix_tree_preloads);
+ 		if (rtp->nr) {
+ 			ret = rtp->nodes;
+ 			rtp->nodes = ret->parent;
+ 			rtp->nr--;
+ 		}
++		put_locked_var(radix_tree_preloads_lock, radix_tree_preloads);
+ 		/*
+ 		 * Update the allocation stack trace as this is more useful
+ 		 * for debugging.
+@@ -475,14 +477,14 @@ static __must_check int __radix_tree_pre
+ 	 */
+ 	gfp_mask &= ~__GFP_ACCOUNT;
+ 
+-	preempt_disable();
++	local_lock(radix_tree_preloads_lock);
+ 	rtp = this_cpu_ptr(&radix_tree_preloads);
+ 	while (rtp->nr < nr) {
+-		preempt_enable();
++		local_unlock(radix_tree_preloads_lock);
+ 		node = kmem_cache_alloc(radix_tree_node_cachep, gfp_mask);
+ 		if (node == NULL)
+ 			goto out;
+-		preempt_disable();
++		local_lock(radix_tree_preloads_lock);
+ 		rtp = this_cpu_ptr(&radix_tree_preloads);
+ 		if (rtp->nr < nr) {
+ 			node->parent = rtp->nodes;
+@@ -524,7 +526,7 @@ int radix_tree_maybe_preload(gfp_t gfp_m
+ 	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 */
+-	preempt_disable();
++	local_lock(radix_tree_preloads_lock);
+ 	return 0;
+ }
+ EXPORT_SYMBOL(radix_tree_maybe_preload);
+@@ -562,7 +564,7 @@ int radix_tree_maybe_preload_order(gfp_t
+ 
+ 	/* Preloading doesn't help anything with this gfp mask, skip it */
+ 	if (!gfpflags_allow_blocking(gfp_mask)) {
+-		preempt_disable();
++		local_lock(radix_tree_preloads_lock);
+ 		return 0;
+ 	}
+ 
+@@ -596,6 +598,12 @@ int radix_tree_maybe_preload_order(gfp_t
+ 	return __radix_tree_preload(gfp_mask, nr_nodes);
+ }
+ 
++void radix_tree_preload_end(void)
++{
++	local_unlock(radix_tree_preloads_lock);
++}
++EXPORT_SYMBOL(radix_tree_preload_end);
++
+ static unsigned radix_tree_load_root(const struct radix_tree_root *root,
+ 		struct radix_tree_node **nodep, unsigned long *maxindex)
+ {
+@@ -2105,10 +2113,16 @@ EXPORT_SYMBOL(radix_tree_tagged);
+ void idr_preload(gfp_t gfp_mask)
+ {
+ 	if (__radix_tree_preload(gfp_mask, IDR_PRELOAD_SIZE))
+-		preempt_disable();
++		local_lock(radix_tree_preloads_lock);
+ }
+ EXPORT_SYMBOL(idr_preload);
+ 
++void idr_preload_end(void)
++{
++	local_unlock(radix_tree_preloads_lock);
++}
++EXPORT_SYMBOL(idr_preload_end);
++
+ /**
+  * ida_pre_get - reserve resources for ida allocation
+  * @ida: ida handle
+@@ -2125,7 +2139,7 @@ int ida_pre_get(struct ida *ida, gfp_t g
+ 	 * to return to the ida_pre_get() step.
+ 	 */
+ 	if (!__radix_tree_preload(gfp, IDA_PRELOAD_SIZE))
+-		preempt_enable();
++		local_unlock(radix_tree_preloads_lock);
+ 
+ 	if (!this_cpu_read(ida_bitmap)) {
+ 		struct ida_bitmap *bitmap = kmalloc(sizeof(*bitmap), gfp);
diff --git a/kernel/patches-4.14.x-rt/0174-panic-disable-random-on-rt.patch b/kernel/patches-4.14.x-rt/0174-panic-disable-random-on-rt.patch
new file mode 100644
index 000000000..c21c7d016
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0174-panic-disable-random-on-rt.patch
@@ -0,0 +1,26 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 14 Jul 2015 14:26:34 +0200
+Subject: panic: skip get_random_bytes for RT_FULL in init_oops_id
+
+Disable on -RT. If this is invoked from irq-context we will have problems
+to acquire the sleeping lock.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/panic.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/panic.c
++++ b/kernel/panic.c
+@@ -482,9 +482,11 @@ static u64 oops_id;
+ 
+ static int init_oops_id(void)
+ {
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	if (!oops_id)
+ 		get_random_bytes(&oops_id, sizeof(oops_id));
+ 	else
++#endif
+ 		oops_id++;
+ 
+ 	return 0;
diff --git a/kernel/patches-4.14.x-rt/0175-timers-prepare-for-full-preemption.patch b/kernel/patches-4.14.x-rt/0175-timers-prepare-for-full-preemption.patch
new file mode 100644
index 000000000..fff75bee9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0175-timers-prepare-for-full-preemption.patch
@@ -0,0 +1,166 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:34 -0500
+Subject: timers: Prepare for full preemption
+
+When softirqs can be preempted we need to make sure that cancelling
+the timer from the active thread can not deadlock vs. a running timer
+callback. Add a waitqueue to resolve that.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/timer.h |    2 +-
+ kernel/sched/core.c   |    9 +++++++--
+ kernel/time/timer.c   |   45 +++++++++++++++++++++++++++++++++++++++++----
+ 3 files changed, 49 insertions(+), 7 deletions(-)
+
+--- a/include/linux/timer.h
++++ b/include/linux/timer.h
+@@ -213,7 +213,7 @@ extern void add_timer(struct timer_list
+ 
+ extern int try_to_del_timer_sync(struct timer_list *timer);
+ 
+-#ifdef CONFIG_SMP
++#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
+   extern int del_timer_sync(struct timer_list *timer);
+ #else
+ # define del_timer_sync(t)		del_timer(t)
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -522,11 +522,14 @@ void resched_cpu(int cpu)
+  */
+ int get_nohz_timer_target(void)
+ {
+-	int i, cpu = smp_processor_id();
++	int i, cpu;
+ 	struct sched_domain *sd;
+ 
++	preempt_disable_rt();
++	cpu = smp_processor_id();
++
+ 	if (!idle_cpu(cpu) && is_housekeeping_cpu(cpu))
+-		return cpu;
++		goto preempt_en_rt;
+ 
+ 	rcu_read_lock();
+ 	for_each_domain(cpu, sd) {
+@@ -545,6 +548,8 @@ int get_nohz_timer_target(void)
+ 		cpu = housekeeping_any_cpu();
+ unlock:
+ 	rcu_read_unlock();
++preempt_en_rt:
++	preempt_enable_rt();
+ 	return cpu;
+ }
+ 
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -44,6 +44,7 @@
+ #include <linux/sched/debug.h>
+ #include <linux/slab.h>
+ #include <linux/compat.h>
++#include <linux/swait.h>
+ 
+ #include <linux/uaccess.h>
+ #include <asm/unistd.h>
+@@ -197,6 +198,9 @@ EXPORT_SYMBOL(jiffies_64);
+ struct timer_base {
+ 	raw_spinlock_t		lock;
+ 	struct timer_list	*running_timer;
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct swait_queue_head	wait_for_running_timer;
++#endif
+ 	unsigned long		clk;
+ 	unsigned long		next_expiry;
+ 	unsigned int		cpu;
+@@ -1140,6 +1144,33 @@ void add_timer_on(struct timer_list *tim
+ }
+ EXPORT_SYMBOL_GPL(add_timer_on);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++/*
++ * Wait for a running timer
++ */
++static void wait_for_running_timer(struct timer_list *timer)
++{
++	struct timer_base *base;
++	u32 tf = timer->flags;
++
++	if (tf & TIMER_MIGRATING)
++		return;
++
++	base = get_timer_base(tf);
++	swait_event(base->wait_for_running_timer,
++		    base->running_timer != timer);
++}
++
++# define wakeup_timer_waiters(b)	swake_up_all(&(b)->wait_for_running_timer)
++#else
++static inline void wait_for_running_timer(struct timer_list *timer)
++{
++	cpu_relax();
++}
++
++# define wakeup_timer_waiters(b)	do { } while (0)
++#endif
++
+ /**
+  * del_timer - deactivate a timer.
+  * @timer: the timer to be deactivated
+@@ -1195,7 +1226,7 @@ int try_to_del_timer_sync(struct timer_l
+ }
+ EXPORT_SYMBOL(try_to_del_timer_sync);
+ 
+-#ifdef CONFIG_SMP
++#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
+ /**
+  * del_timer_sync - deactivate a timer and wait for the handler to finish.
+  * @timer: the timer to be deactivated
+@@ -1255,7 +1286,7 @@ int del_timer_sync(struct timer_list *ti
+ 		int ret = try_to_del_timer_sync(timer);
+ 		if (ret >= 0)
+ 			return ret;
+-		cpu_relax();
++		wait_for_running_timer(timer);
+ 	}
+ }
+ EXPORT_SYMBOL(del_timer_sync);
+@@ -1319,13 +1350,16 @@ static void expire_timers(struct timer_b
+ 		fn = timer->function;
+ 		data = timer->data;
+ 
+-		if (timer->flags & TIMER_IRQSAFE) {
++		if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL) &&
++		    timer->flags & TIMER_IRQSAFE) {
+ 			raw_spin_unlock(&base->lock);
+ 			call_timer_fn(timer, fn, data);
++			base->running_timer = NULL;
+ 			raw_spin_lock(&base->lock);
+ 		} else {
+ 			raw_spin_unlock_irq(&base->lock);
+ 			call_timer_fn(timer, fn, data);
++			base->running_timer = NULL;
+ 			raw_spin_lock_irq(&base->lock);
+ 		}
+ 	}
+@@ -1627,8 +1661,8 @@ static inline void __run_timers(struct t
+ 		while (levels--)
+ 			expire_timers(base, heads + levels);
+ 	}
+-	base->running_timer = NULL;
+ 	raw_spin_unlock_irq(&base->lock);
++	wakeup_timer_waiters(base);
+ }
+ 
+ /*
+@@ -1868,6 +1902,9 @@ static void __init init_timer_cpu(int cp
+ 		base->cpu = cpu;
+ 		raw_spin_lock_init(&base->lock);
+ 		base->clk = jiffies;
++#ifdef CONFIG_PREEMPT_RT_FULL
++		init_swait_queue_head(&base->wait_for_running_timer);
++#endif
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0176-timer-delay-waking-softirqs-from-the-jiffy-tick.patch b/kernel/patches-4.14.x-rt/0176-timer-delay-waking-softirqs-from-the-jiffy-tick.patch
new file mode 100644
index 000000000..29c0215d0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0176-timer-delay-waking-softirqs-from-the-jiffy-tick.patch
@@ -0,0 +1,75 @@
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Fri, 21 Aug 2009 11:56:45 +0200
+Subject: timer: delay waking softirqs from the jiffy tick
+
+People were complaining about broken balancing with the recent -rt
+series.
+
+A look at /proc/sched_debug yielded:
+
+cpu#0, 2393.874 MHz
+  .nr_running                    : 0
+  .load                          : 0
+  .cpu_load[0]                   : 177522
+  .cpu_load[1]                   : 177522
+  .cpu_load[2]                   : 177522
+  .cpu_load[3]                   : 177522
+  .cpu_load[4]                   : 177522
+cpu#1, 2393.874 MHz
+  .nr_running                    : 4
+  .load                          : 4096
+  .cpu_load[0]                   : 181618
+  .cpu_load[1]                   : 180850
+  .cpu_load[2]                   : 180274
+  .cpu_load[3]                   : 179938
+  .cpu_load[4]                   : 179758
+
+Which indicated the cpu_load computation was hosed, the 177522 value
+indicates that there is one RT task runnable. Initially I thought the
+old problem of calculating the cpu_load from a softirq had re-surfaced,
+however looking at the code shows its being done from scheduler_tick().
+
+[ we really should fix this RT/cfs interaction some day... ]
+
+A few trace_printk()s later:
+
+    sirq-timer/1-19    [001]   174.289744:     19: 50:S ==> [001]     0:140:R <idle>
+          <idle>-0     [001]   174.290724: enqueue_task_rt: adding task: 19/sirq-timer/1 with load: 177522
+          <idle>-0     [001]   174.290725:      0:140:R   + [001]    19: 50:S sirq-timer/1
+          <idle>-0     [001]   174.290730: scheduler_tick: current load: 177522
+          <idle>-0     [001]   174.290732: scheduler_tick: current: 0/swapper
+          <idle>-0     [001]   174.290736:      0:140:R ==> [001]    19: 50:R sirq-timer/1
+    sirq-timer/1-19    [001]   174.290741: dequeue_task_rt: removing task: 19/sirq-timer/1 with load: 177522
+    sirq-timer/1-19    [001]   174.290743:     19: 50:S ==> [001]     0:140:R <idle>
+
+We see that we always raise the timer softirq before doing the load
+calculation. Avoid this by re-ordering the scheduler_tick() call in
+update_process_times() to occur before we deal with timers.
+
+This lowers the load back to sanity and restores regular load-balancing
+behaviour.
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/time/timer.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1628,13 +1628,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);
++	scheduler_tick();
+ 	run_local_timers();
+ 	rcu_check_callbacks(user_tick);
+ #ifdef CONFIG_IRQ_WORK
+ 	if (in_irq())
+ 		irq_work_tick();
+ #endif
+-	scheduler_tick();
+ 	if (IS_ENABLED(CONFIG_POSIX_TIMERS))
+ 		run_posix_cpu_timers(p);
+ }
diff --git a/kernel/patches-4.14.x-rt/0177-nohz-Prevent-erroneous-tick-stop-invocations.patch b/kernel/patches-4.14.x-rt/0177-nohz-Prevent-erroneous-tick-stop-invocations.patch
new file mode 100644
index 000000000..975d15f86
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0177-nohz-Prevent-erroneous-tick-stop-invocations.patch
@@ -0,0 +1,53 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 22 Dec 2017 15:51:13 +0100
+Subject: [PATCH 2/4] nohz: Prevent erroneous tick stop invocations
+
+The conditions in irq_exit() to invoke tick_nohz_irq_exit() are:
+
+  if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu))
+
+This is too permissive in various aspects:
+
+  1) If need_resched() is set, then the tick cannot be stopped whether
+     the CPU is idle or in nohz full mode.
+
+  2) If need_resched() is not set, but softirqs are pending then this is an
+     indication that the softirq code punted and delegated the execution to
+     softirqd. need_resched() is not true because the current interrupted
+     task takes precedence over softirqd.
+
+Invoking tick_nohz_irq_exit() in these cases can cause an endless loop of
+timer interrupts because the timer wheel contains an expired timer, but
+softirqs are not yet executed. So it returns an immediate expiry request,
+which causes the timer to fire immediately again. Lather, rinse and
+repeat....
+
+Prevent that by making the conditions proper and only allow invokation when
+in idle or nohz full mode and neither need_resched() nor
+local_softirq_pending() are set.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+[ bigeasy: XXX still needed for RT, to avoid hangup due to pending timer softirq,
+	   keep it RT only ]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/softirq.c |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -381,7 +381,13 @@ static inline void tick_irq_exit(void)
+ 	int cpu = smp_processor_id();
+ 
+ 	/* Make sure that timer wheel updates are propagated */
+-	if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu)) {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	if ((idle_cpu(cpu) || tick_nohz_full_cpu(cpu)) &&
++	    !need_resched() && !local_softirq_pending())
++#else
++	if ((idle_cpu(cpu) && !need_resched()) || tick_nohz_full_cpu(cpu))
++#endif
++	{
+ 		if (!in_interrupt())
+ 			tick_nohz_irq_exit();
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0178-x86-kvm-require-const-tsc-for-rt.patch b/kernel/patches-4.14.x-rt/0178-x86-kvm-require-const-tsc-for-rt.patch
new file mode 100644
index 000000000..fe27b3fed
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0178-x86-kvm-require-const-tsc-for-rt.patch
@@ -0,0 +1,30 @@
+Subject: x86: kvm Require const tsc for RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 06 Nov 2011 12:26:18 +0100
+
+Non constant TSC is a nightmare on bare metal already, but with
+virtualization it becomes a complete disaster because the workarounds
+are horrible latency wise. That's also a preliminary for running RT in
+a guest on top of a RT host.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/x86/kvm/x86.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/arch/x86/kvm/x86.c
++++ b/arch/x86/kvm/x86.c
+@@ -6142,6 +6142,13 @@ int kvm_arch_init(void *opaque)
+ 		goto out;
+ 	}
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
++		printk(KERN_ERR "RT requires X86_FEATURE_CONSTANT_TSC\n");
++		return -EOPNOTSUPP;
++	}
++#endif
++
+ 	r = kvm_mmu_module_init();
+ 	if (r)
+ 		goto out_free_percpu;
diff --git a/kernel/patches-4.14.x-rt/0179-wait.h-include-atomic.h.patch b/kernel/patches-4.14.x-rt/0179-wait.h-include-atomic.h.patch
new file mode 100644
index 000000000..0a04f7859
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0179-wait.h-include-atomic.h.patch
@@ -0,0 +1,32 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 28 Oct 2013 12:19:57 +0100
+Subject: wait.h: include atomic.h
+
+|  CC      init/main.o
+|In file included from include/linux/mmzone.h:9:0,
+|                 from include/linux/gfp.h:4,
+|                 from include/linux/kmod.h:22,
+|                 from include/linux/module.h:13,
+|                 from init/main.c:15:
+|include/linux/wait.h: In function ‘wait_on_atomic_t’:
+|include/linux/wait.h:982:2: error: implicit declaration of function ‘atomic_read’ [-Werror=implicit-function-declaration]
+|  if (atomic_read(val) == 0)
+|  ^
+
+This pops up on ARM. Non-RT gets its atomic.h include from spinlock.h
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/wait.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/wait.h
++++ b/include/linux/wait.h
+@@ -10,6 +10,7 @@
+ 
+ #include <asm/current.h>
+ #include <uapi/linux/wait.h>
++#include <linux/atomic.h>
+ 
+ typedef struct wait_queue_entry wait_queue_entry_t;
+ 
diff --git a/kernel/patches-4.14.x-rt/0180-work-simple-Simple-work-queue-implemenation.patch b/kernel/patches-4.14.x-rt/0180-work-simple-Simple-work-queue-implemenation.patch
new file mode 100644
index 000000000..b73fc3929
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0180-work-simple-Simple-work-queue-implemenation.patch
@@ -0,0 +1,231 @@
+From: Daniel Wagner <daniel.wagner@bmw-carit.de>
+Date: Fri, 11 Jul 2014 15:26:11 +0200
+Subject: work-simple: Simple work queue implemenation
+
+Provides a framework for enqueuing callbacks from irq context
+PREEMPT_RT_FULL safe. The callbacks are executed in kthread context.
+
+Bases on wait-simple.
+
+Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
+---
+ include/linux/swork.h |   24 ++++++
+ kernel/sched/Makefile |    2 
+ kernel/sched/swork.c  |  173 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 198 insertions(+), 1 deletion(-)
+
+--- /dev/null
++++ b/include/linux/swork.h
+@@ -0,0 +1,24 @@
++#ifndef _LINUX_SWORK_H
++#define _LINUX_SWORK_H
++
++#include <linux/list.h>
++
++struct swork_event {
++	struct list_head item;
++	unsigned long flags;
++	void (*func)(struct swork_event *);
++};
++
++static inline void INIT_SWORK(struct swork_event *event,
++			      void (*func)(struct swork_event *))
++{
++	event->flags = 0;
++	event->func = func;
++}
++
++bool swork_queue(struct swork_event *sev);
++
++int swork_get(void);
++void swork_put(void);
++
++#endif /* _LINUX_SWORK_H */
+--- a/kernel/sched/Makefile
++++ b/kernel/sched/Makefile
+@@ -18,7 +18,7 @@ endif
+ 
+ obj-y += core.o loadavg.o clock.o cputime.o
+ obj-y += idle_task.o fair.o rt.o deadline.o
+-obj-y += wait.o wait_bit.o swait.o completion.o idle.o
++obj-y += wait.o wait_bit.o swait.o swork.o completion.o idle.o
+ obj-$(CONFIG_SMP) += cpupri.o cpudeadline.o topology.o stop_task.o
+ obj-$(CONFIG_SCHED_AUTOGROUP) += autogroup.o
+ obj-$(CONFIG_SCHEDSTATS) += stats.o
+--- /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
++ *
++ * Provides a framework for enqueuing callbacks from irq context
++ * PREEMPT_RT_FULL safe. The callbacks are executed in kthread context.
++ */
++
++#include <linux/swait.h>
++#include <linux/swork.h>
++#include <linux/kthread.h>
++#include <linux/slab.h>
++#include <linux/spinlock.h>
++#include <linux/export.h>
++
++#define SWORK_EVENT_PENDING     (1 << 0)
++
++static DEFINE_MUTEX(worker_mutex);
++static struct sworker *glob_worker;
++
++struct sworker {
++	struct list_head events;
++	struct swait_queue_head wq;
++
++	raw_spinlock_t lock;
++
++	struct task_struct *task;
++	int refs;
++};
++
++static bool swork_readable(struct sworker *worker)
++{
++	bool r;
++
++	if (kthread_should_stop())
++		return true;
++
++	raw_spin_lock_irq(&worker->lock);
++	r = !list_empty(&worker->events);
++	raw_spin_unlock_irq(&worker->lock);
++
++	return r;
++}
++
++static int swork_kthread(void *arg)
++{
++	struct sworker *worker = arg;
++
++	for (;;) {
++		swait_event_interruptible(worker->wq,
++					swork_readable(worker));
++		if (kthread_should_stop())
++			break;
++
++		raw_spin_lock_irq(&worker->lock);
++		while (!list_empty(&worker->events)) {
++			struct swork_event *sev;
++
++			sev = list_first_entry(&worker->events,
++					struct swork_event, item);
++			list_del(&sev->item);
++			raw_spin_unlock_irq(&worker->lock);
++
++			WARN_ON_ONCE(!test_and_clear_bit(SWORK_EVENT_PENDING,
++							 &sev->flags));
++			sev->func(sev);
++			raw_spin_lock_irq(&worker->lock);
++		}
++		raw_spin_unlock_irq(&worker->lock);
++	}
++	return 0;
++}
++
++static struct sworker *swork_create(void)
++{
++	struct sworker *worker;
++
++	worker = kzalloc(sizeof(*worker), GFP_KERNEL);
++	if (!worker)
++		return ERR_PTR(-ENOMEM);
++
++	INIT_LIST_HEAD(&worker->events);
++	raw_spin_lock_init(&worker->lock);
++	init_swait_queue_head(&worker->wq);
++
++	worker->task = kthread_run(swork_kthread, worker, "kswork");
++	if (IS_ERR(worker->task)) {
++		kfree(worker);
++		return ERR_PTR(-ENOMEM);
++	}
++
++	return worker;
++}
++
++static void swork_destroy(struct sworker *worker)
++{
++	kthread_stop(worker->task);
++
++	WARN_ON(!list_empty(&worker->events));
++	kfree(worker);
++}
++
++/**
++ * swork_queue - queue swork
++ *
++ * Returns %false if @work was already on a queue, %true otherwise.
++ *
++ * The work is queued and processed on a random CPU
++ */
++bool swork_queue(struct swork_event *sev)
++{
++	unsigned long flags;
++
++	if (test_and_set_bit(SWORK_EVENT_PENDING, &sev->flags))
++		return false;
++
++	raw_spin_lock_irqsave(&glob_worker->lock, flags);
++	list_add_tail(&sev->item, &glob_worker->events);
++	raw_spin_unlock_irqrestore(&glob_worker->lock, flags);
++
++	swake_up(&glob_worker->wq);
++	return true;
++}
++EXPORT_SYMBOL_GPL(swork_queue);
++
++/**
++ * swork_get - get an instance of the sworker
++ *
++ * Returns an negative error code if the initialization if the worker did not
++ * work, %0 otherwise.
++ *
++ */
++int swork_get(void)
++{
++	struct sworker *worker;
++
++	mutex_lock(&worker_mutex);
++	if (!glob_worker) {
++		worker = swork_create();
++		if (IS_ERR(worker)) {
++			mutex_unlock(&worker_mutex);
++			return -ENOMEM;
++		}
++
++		glob_worker = worker;
++	}
++
++	glob_worker->refs++;
++	mutex_unlock(&worker_mutex);
++
++	return 0;
++}
++EXPORT_SYMBOL_GPL(swork_get);
++
++/**
++ * swork_put - puts an instance of the sworker
++ *
++ * Will destroy the sworker thread. This function must not be called until all
++ * queued events have been completed.
++ */
++void swork_put(void)
++{
++	mutex_lock(&worker_mutex);
++
++	glob_worker->refs--;
++	if (glob_worker->refs > 0)
++		goto out;
++
++	swork_destroy(glob_worker);
++	glob_worker = NULL;
++out:
++	mutex_unlock(&worker_mutex);
++}
++EXPORT_SYMBOL_GPL(swork_put);
diff --git a/kernel/patches-4.14.x-rt/0181-completion-use-simple-wait-queues.patch b/kernel/patches-4.14.x-rt/0181-completion-use-simple-wait-queues.patch
new file mode 100644
index 000000000..30a21eacf
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0181-completion-use-simple-wait-queues.patch
@@ -0,0 +1,352 @@
+Subject: completion: Use simple wait queues
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 11 Jan 2013 11:23:51 +0100
+
+Completions have no long lasting callbacks and therefor do not need
+the complex waitqueue variant. Use simple waitqueues which reduces the
+contention on the waitqueue lock.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/net/wireless/intersil/orinoco/orinoco_usb.c |    2 -
+ drivers/usb/gadget/function/f_fs.c                  |    2 -
+ drivers/usb/gadget/legacy/inode.c                   |    4 +-
+ include/linux/completion.h                          |   10 ++---
+ include/linux/suspend.h                             |    6 +++
+ include/linux/swait.h                               |    1 
+ kernel/power/hibernate.c                            |    7 ++++
+ kernel/power/suspend.c                              |    4 ++
+ kernel/sched/completion.c                           |   34 ++++++++++----------
+ kernel/sched/core.c                                 |   10 ++++-
+ kernel/sched/swait.c                                |   20 +++++++++++
+ 11 files changed, 72 insertions(+), 28 deletions(-)
+
+--- 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 ez
+ 			while (!ctx->done.done && msecs--)
+ 				udelay(1000);
+ 		} else {
+-			wait_event_interruptible(ctx->done.wait,
++			swait_event_interruptible(ctx->done.wait,
+ 						 ctx->done.done);
+ 		}
+ 		break;
+--- a/drivers/usb/gadget/function/f_fs.c
++++ b/drivers/usb/gadget/function/f_fs.c
+@@ -1610,7 +1610,7 @@ static void ffs_data_put(struct ffs_data
+ 		pr_info("%s(): freeing\n", __func__);
+ 		ffs_data_clear(ffs);
+ 		BUG_ON(waitqueue_active(&ffs->ev.waitq) ||
+-		       waitqueue_active(&ffs->ep0req_completion.wait) ||
++		       swait_active(&ffs->ep0req_completion.wait) ||
+ 		       waitqueue_active(&ffs->wait));
+ 		destroy_workqueue(ffs->io_completion_wq);
+ 		kfree(ffs->dev_name);
+--- a/drivers/usb/gadget/legacy/inode.c
++++ b/drivers/usb/gadget/legacy/inode.c
+@@ -347,7 +347,7 @@ ep_io (struct ep_data *epdata, void *buf
+ 	spin_unlock_irq (&epdata->dev->lock);
+ 
+ 	if (likely (value == 0)) {
+-		value = wait_event_interruptible (done.wait, done.done);
++		value = swait_event_interruptible (done.wait, done.done);
+ 		if (value != 0) {
+ 			spin_lock_irq (&epdata->dev->lock);
+ 			if (likely (epdata->ep != NULL)) {
+@@ -356,7 +356,7 @@ ep_io (struct ep_data *epdata, void *buf
+ 				usb_ep_dequeue (epdata->ep, epdata->req);
+ 				spin_unlock_irq (&epdata->dev->lock);
+ 
+-				wait_event (done.wait, done.done);
++				swait_event (done.wait, done.done);
+ 				if (epdata->status == -ECONNRESET)
+ 					epdata->status = -EINTR;
+ 			} else {
+--- a/include/linux/completion.h
++++ b/include/linux/completion.h
+@@ -9,7 +9,7 @@
+  * See kernel/sched/completion.c for details.
+  */
+ 
+-#include <linux/wait.h>
++#include <linux/swait.h>
+ #ifdef CONFIG_LOCKDEP_COMPLETIONS
+ #include <linux/lockdep.h>
+ #endif
+@@ -28,7 +28,7 @@
+  */
+ struct completion {
+ 	unsigned int done;
+-	wait_queue_head_t wait;
++	struct swait_queue_head wait;
+ #ifdef CONFIG_LOCKDEP_COMPLETIONS
+ 	struct lockdep_map_cross map;
+ #endif
+@@ -67,11 +67,11 @@ static inline void complete_release_comm
+ 
+ #ifdef CONFIG_LOCKDEP_COMPLETIONS
+ #define COMPLETION_INITIALIZER(work) \
+-	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait), \
++	{ 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait), \
+ 	STATIC_CROSS_LOCKDEP_MAP_INIT("(complete)" #work, &(work)) }
+ #else
+ #define COMPLETION_INITIALIZER(work) \
+-	{ 0, __WAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
++	{ 0, __SWAIT_QUEUE_HEAD_INITIALIZER((work).wait) }
+ #endif
+ 
+ #define COMPLETION_INITIALIZER_ONSTACK(work) \
+@@ -117,7 +117,7 @@ static inline void complete_release_comm
+ static inline void __init_completion(struct completion *x)
+ {
+ 	x->done = 0;
+-	init_waitqueue_head(&x->wait);
++	init_swait_queue_head(&x->wait);
+ }
+ 
+ /**
+--- a/include/linux/suspend.h
++++ b/include/linux/suspend.h
+@@ -196,6 +196,12 @@ struct platform_s2idle_ops {
+ 	void (*end)(void);
+ };
+ 
++#if defined(CONFIG_SUSPEND) || defined(CONFIG_HIBERNATION)
++extern bool pm_in_action;
++#else
++# define pm_in_action false
++#endif
++
+ #ifdef CONFIG_SUSPEND
+ extern suspend_state_t mem_sleep_current;
+ extern suspend_state_t mem_sleep_default;
+--- a/include/linux/swait.h
++++ b/include/linux/swait.h
+@@ -148,6 +148,7 @@ static inline bool swq_has_sleeper(struc
+ 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);
++extern void swake_up_all_locked(struct swait_queue_head *q);
+ 
+ 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);
+--- a/kernel/power/hibernate.c
++++ b/kernel/power/hibernate.c
+@@ -679,6 +679,10 @@ static int load_image_and_restore(void)
+ 	return error;
+ }
+ 
++#ifndef CONFIG_SUSPEND
++bool pm_in_action;
++#endif
++
+ /**
+  * hibernate - Carry out system hibernation, including saving the image.
+  */
+@@ -692,6 +696,8 @@ int hibernate(void)
+ 		return -EPERM;
+ 	}
+ 
++	pm_in_action = true;
++
+ 	lock_system_sleep();
+ 	/* The snapshot device should not be opened while we're running */
+ 	if (!atomic_add_unless(&snapshot_device_available, -1, 0)) {
+@@ -770,6 +776,7 @@ int hibernate(void)
+ 	atomic_inc(&snapshot_device_available);
+  Unlock:
+ 	unlock_system_sleep();
++	pm_in_action = false;
+ 	pr_info("hibernation exit\n");
+ 
+ 	return error;
+--- a/kernel/power/suspend.c
++++ b/kernel/power/suspend.c
+@@ -593,6 +593,8 @@ static int enter_state(suspend_state_t s
+ 	return error;
+ }
+ 
++bool pm_in_action;
++
+ /**
+  * pm_suspend - Externally visible function for suspending the system.
+  * @state: System sleep state to enter.
+@@ -607,6 +609,7 @@ int pm_suspend(suspend_state_t state)
+ 	if (state <= PM_SUSPEND_ON || state >= PM_SUSPEND_MAX)
+ 		return -EINVAL;
+ 
++	pm_in_action = true;
+ 	pr_info("suspend entry (%s)\n", mem_sleep_labels[state]);
+ 	error = enter_state(state);
+ 	if (error) {
+@@ -616,6 +619,7 @@ int pm_suspend(suspend_state_t state)
+ 		suspend_stats.success++;
+ 	}
+ 	pr_info("suspend exit\n");
++	pm_in_action = false;
+ 	return error;
+ }
+ EXPORT_SYMBOL(pm_suspend);
+--- a/kernel/sched/completion.c
++++ b/kernel/sched/completion.c
+@@ -32,7 +32,7 @@ void complete(struct completion *x)
+ {
+ 	unsigned long flags;
+ 
+-	spin_lock_irqsave(&x->wait.lock, flags);
++	raw_spin_lock_irqsave(&x->wait.lock, flags);
+ 
+ 	/*
+ 	 * Perform commit of crossrelease here.
+@@ -41,8 +41,8 @@ void complete(struct completion *x)
+ 
+ 	if (x->done != UINT_MAX)
+ 		x->done++;
+-	__wake_up_locked(&x->wait, TASK_NORMAL, 1);
+-	spin_unlock_irqrestore(&x->wait.lock, flags);
++	swake_up_locked(&x->wait);
++	raw_spin_unlock_irqrestore(&x->wait.lock, flags);
+ }
+ EXPORT_SYMBOL(complete);
+ 
+@@ -66,10 +66,10 @@ void complete_all(struct completion *x)
+ {
+ 	unsigned long flags;
+ 
+-	spin_lock_irqsave(&x->wait.lock, flags);
++	raw_spin_lock_irqsave(&x->wait.lock, flags);
+ 	x->done = UINT_MAX;
+-	__wake_up_locked(&x->wait, TASK_NORMAL, 0);
+-	spin_unlock_irqrestore(&x->wait.lock, flags);
++	swake_up_all_locked(&x->wait);
++	raw_spin_unlock_irqrestore(&x->wait.lock, flags);
+ }
+ EXPORT_SYMBOL(complete_all);
+ 
+@@ -78,20 +78,20 @@ do_wait_for_common(struct completion *x,
+ 		   long (*action)(long), long timeout, int state)
+ {
+ 	if (!x->done) {
+-		DECLARE_WAITQUEUE(wait, current);
++		DECLARE_SWAITQUEUE(wait);
+ 
+-		__add_wait_queue_entry_tail_exclusive(&x->wait, &wait);
++		__prepare_to_swait(&x->wait, &wait);
+ 		do {
+ 			if (signal_pending_state(state, current)) {
+ 				timeout = -ERESTARTSYS;
+ 				break;
+ 			}
+ 			__set_current_state(state);
+-			spin_unlock_irq(&x->wait.lock);
++			raw_spin_unlock_irq(&x->wait.lock);
+ 			timeout = action(timeout);
+-			spin_lock_irq(&x->wait.lock);
++			raw_spin_lock_irq(&x->wait.lock);
+ 		} while (!x->done && timeout);
+-		__remove_wait_queue(&x->wait, &wait);
++		__finish_swait(&x->wait, &wait);
+ 		if (!x->done)
+ 			return timeout;
+ 	}
+@@ -108,9 +108,9 @@ static inline long __sched
+ 
+ 	complete_acquire(x);
+ 
+-	spin_lock_irq(&x->wait.lock);
++	raw_spin_lock_irq(&x->wait.lock);
+ 	timeout = do_wait_for_common(x, action, timeout, state);
+-	spin_unlock_irq(&x->wait.lock);
++	raw_spin_unlock_irq(&x->wait.lock);
+ 
+ 	complete_release(x);
+ 
+@@ -299,12 +299,12 @@ bool try_wait_for_completion(struct comp
+ 	if (!READ_ONCE(x->done))
+ 		return 0;
+ 
+-	spin_lock_irqsave(&x->wait.lock, flags);
++	raw_spin_lock_irqsave(&x->wait.lock, flags);
+ 	if (!x->done)
+ 		ret = 0;
+ 	else if (x->done != UINT_MAX)
+ 		x->done--;
+-	spin_unlock_irqrestore(&x->wait.lock, flags);
++	raw_spin_unlock_irqrestore(&x->wait.lock, flags);
+ 	return ret;
+ }
+ EXPORT_SYMBOL(try_wait_for_completion);
+@@ -330,8 +330,8 @@ bool completion_done(struct completion *
+ 	 * otherwise we can end up freeing the completion before complete()
+ 	 * is done referencing it.
+ 	 */
+-	spin_lock_irqsave(&x->wait.lock, flags);
+-	spin_unlock_irqrestore(&x->wait.lock, flags);
++	raw_spin_lock_irqsave(&x->wait.lock, flags);
++	raw_spin_unlock_irqrestore(&x->wait.lock, flags);
+ 	return true;
+ }
+ EXPORT_SYMBOL(completion_done);
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -6816,7 +6816,10 @@ void migrate_disable(void)
+ 		return;
+ 	}
+ #ifdef CONFIG_SCHED_DEBUG
+-	WARN_ON_ONCE(p->migrate_disable_atomic);
++	if (unlikely(p->migrate_disable_atomic)) {
++		tracing_off();
++		WARN_ON_ONCE(1);
++	}
+ #endif
+ 
+ 	if (p->migrate_disable) {
+@@ -6846,7 +6849,10 @@ void migrate_enable(void)
+ 	}
+ 
+ #ifdef CONFIG_SCHED_DEBUG
+-	WARN_ON_ONCE(p->migrate_disable_atomic);
++	if (unlikely(p->migrate_disable_atomic)) {
++		tracing_off();
++		WARN_ON_ONCE(1);
++	}
+ #endif
+ 
+ 	WARN_ON_ONCE(p->migrate_disable <= 0);
+--- a/kernel/sched/swait.c
++++ b/kernel/sched/swait.c
+@@ -1,6 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
+ #include <linux/sched/signal.h>
+ #include <linux/swait.h>
++#include <linux/suspend.h>
+ 
+ void __init_swait_queue_head(struct swait_queue_head *q, const char *name,
+ 			     struct lock_class_key *key)
+@@ -30,6 +31,25 @@ void swake_up_locked(struct swait_queue_
+ }
+ EXPORT_SYMBOL(swake_up_locked);
+ 
++void swake_up_all_locked(struct swait_queue_head *q)
++{
++	struct swait_queue *curr;
++	int wakes = 0;
++
++	while (!list_empty(&q->task_list)) {
++
++		curr = list_first_entry(&q->task_list, typeof(*curr),
++					task_list);
++		wake_up_process(curr->task);
++		list_del_init(&curr->task_list);
++		wakes++;
++	}
++	if (pm_in_action)
++		return;
++	WARN(wakes > 2, "complete_all() with %d waiters\n", wakes);
++}
++EXPORT_SYMBOL(swake_up_all_locked);
++
+ void swake_up(struct swait_queue_head *q)
+ {
+ 	unsigned long flags;
diff --git a/kernel/patches-4.14.x-rt/0182-fs-aio-simple-simple-work.patch b/kernel/patches-4.14.x-rt/0182-fs-aio-simple-simple-work.patch
new file mode 100644
index 000000000..112840171
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0182-fs-aio-simple-simple-work.patch
@@ -0,0 +1,106 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 16 Feb 2015 18:49:10 +0100
+Subject: fs/aio: simple simple work
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:768
+|in_atomic(): 1, irqs_disabled(): 0, pid: 26, name: rcuos/2
+|2 locks held by rcuos/2/26:
+| #0:  (rcu_callback){.+.+..}, at: [<ffffffff810b1a12>] rcu_nocb_kthread+0x1e2/0x380
+| #1:  (rcu_read_lock_sched){.+.+..}, at: [<ffffffff812acd26>] percpu_ref_kill_rcu+0xa6/0x1c0
+|Preemption disabled at:[<ffffffff810b1a93>] rcu_nocb_kthread+0x263/0x380
+|Call Trace:
+| [<ffffffff81582e9e>] dump_stack+0x4e/0x9c
+| [<ffffffff81077aeb>] __might_sleep+0xfb/0x170
+| [<ffffffff81589304>] rt_spin_lock+0x24/0x70
+| [<ffffffff811c5790>] free_ioctx_users+0x30/0x130
+| [<ffffffff812ace34>] percpu_ref_kill_rcu+0x1b4/0x1c0
+| [<ffffffff810b1a93>] rcu_nocb_kthread+0x263/0x380
+| [<ffffffff8106e046>] kthread+0xd6/0xf0
+| [<ffffffff81591eec>] ret_from_fork+0x7c/0xb0
+
+replace this preempt_disable() friendly swork.
+
+Reported-By: Mike Galbraith <umgwanakikbuti@gmail.com>
+Suggested-by: Benjamin LaHaise <bcrl@kvack.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/aio.c |   24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -40,6 +40,7 @@
+ #include <linux/ramfs.h>
+ #include <linux/percpu-refcount.h>
+ #include <linux/mount.h>
++#include <linux/swork.h>
+ 
+ #include <asm/kmap_types.h>
+ #include <linux/uaccess.h>
+@@ -115,7 +116,7 @@ struct kioctx {
+ 	struct page		**ring_pages;
+ 	long			nr_pages;
+ 
+-	struct work_struct	free_work;
++	struct swork_event	free_work;
+ 
+ 	/*
+ 	 * signals when all in-flight requests are done
+@@ -258,6 +259,7 @@ static int __init aio_setup(void)
+ 		.mount		= aio_mount,
+ 		.kill_sb	= kill_anon_super,
+ 	};
++	BUG_ON(swork_get());
+ 	aio_mnt = kern_mount(&aio_fs);
+ 	if (IS_ERR(aio_mnt))
+ 		panic("Failed to create aio fs mount.");
+@@ -588,9 +590,9 @@ static int kiocb_cancel(struct aio_kiocb
+ 	return cancel(&kiocb->common);
+ }
+ 
+-static void free_ioctx(struct work_struct *work)
++static void free_ioctx(struct swork_event *sev)
+ {
+-	struct kioctx *ctx = container_of(work, struct kioctx, free_work);
++	struct kioctx *ctx = container_of(sev, struct kioctx, free_work);
+ 
+ 	pr_debug("freeing %p\n", ctx);
+ 
+@@ -609,8 +611,8 @@ static void free_ioctx_reqs(struct percp
+ 	if (ctx->rq_wait && atomic_dec_and_test(&ctx->rq_wait->count))
+ 		complete(&ctx->rq_wait->comp);
+ 
+-	INIT_WORK(&ctx->free_work, free_ioctx);
+-	schedule_work(&ctx->free_work);
++	INIT_SWORK(&ctx->free_work, free_ioctx);
++	swork_queue(&ctx->free_work);
+ }
+ 
+ /*
+@@ -618,9 +620,9 @@ static void free_ioctx_reqs(struct percp
+  * 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.
+  */
+-static void free_ioctx_users(struct percpu_ref *ref)
++static void free_ioctx_users_work(struct swork_event *sev)
+ {
+-	struct kioctx *ctx = container_of(ref, struct kioctx, users);
++	struct kioctx *ctx = container_of(sev, struct kioctx, free_work);
+ 	struct aio_kiocb *req;
+ 
+ 	spin_lock_irq(&ctx->ctx_lock);
+@@ -639,6 +641,14 @@ static void free_ioctx_users(struct perc
+ 	percpu_ref_put(&ctx->reqs);
+ }
+ 
++static void free_ioctx_users(struct percpu_ref *ref)
++{
++	struct kioctx *ctx = container_of(ref, struct kioctx, users);
++
++	INIT_SWORK(&ctx->free_work, free_ioctx_users_work);
++	swork_queue(&ctx->free_work);
++}
++
+ static int ioctx_add_table(struct kioctx *ctx, struct mm_struct *mm)
+ {
+ 	unsigned i, new_nr;
diff --git a/kernel/patches-4.14.x-rt/0183-genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch b/kernel/patches-4.14.x-rt/0183-genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch
new file mode 100644
index 000000000..5bb2d24ea
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0183-genirq-do-not-invoke-the-affinity-callback-via-a-wor.patch
@@ -0,0 +1,121 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 21 Aug 2013 17:48:46 +0200
+Subject: genirq: Do not invoke the affinity callback via a workqueue on RT
+
+Joe Korty reported, that __irq_set_affinity_locked() schedules a
+workqueue while holding a rawlock which results in a might_sleep()
+warning.
+This patch uses swork_queue() instead.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/interrupt.h |    6 ++++++
+ kernel/irq/manage.c       |   43 ++++++++++++++++++++++++++++++++++++++++---
+ 2 files changed, 46 insertions(+), 3 deletions(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -15,6 +15,7 @@
+ #include <linux/hrtimer.h>
+ #include <linux/kref.h>
+ #include <linux/workqueue.h>
++#include <linux/swork.h>
+ 
+ #include <linux/atomic.h>
+ #include <asm/ptrace.h>
+@@ -227,6 +228,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
++ * @swork:		Swork item, for internal use
+  * @work:		Work item, for internal use
+  * @notify:		Function to be called on change.  This will be
+  *			called in process context.
+@@ -238,7 +240,11 @@ extern void resume_device_irqs(void);
+ struct irq_affinity_notify {
+ 	unsigned int irq;
+ 	struct kref kref;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	struct swork_event swork;
++#else
+ 	struct work_struct work;
++#endif
+ 	void (*notify)(struct irq_affinity_notify *, const cpumask_t *mask);
+ 	void (*release)(struct kref *ref);
+ };
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -226,7 +226,12 @@ int irq_set_affinity_locked(struct irq_d
+ 
+ 	if (desc->affinity_notify) {
+ 		kref_get(&desc->affinity_notify->kref);
++
++#ifdef CONFIG_PREEMPT_RT_BASE
++		swork_queue(&desc->affinity_notify->swork);
++#else
+ 		schedule_work(&desc->affinity_notify->work);
++#endif
+ 	}
+ 	irqd_set(data, IRQD_AFFINITY_SET);
+ 
+@@ -264,10 +269,8 @@ int irq_set_affinity_hint(unsigned int i
+ }
+ EXPORT_SYMBOL_GPL(irq_set_affinity_hint);
+ 
+-static void irq_affinity_notify(struct work_struct *work)
++static void _irq_affinity_notify(struct irq_affinity_notify *notify)
+ {
+-	struct irq_affinity_notify *notify =
+-		container_of(work, struct irq_affinity_notify, work);
+ 	struct irq_desc *desc = irq_to_desc(notify->irq);
+ 	cpumask_var_t cpumask;
+ 	unsigned long flags;
+@@ -289,6 +292,35 @@ static void irq_affinity_notify(struct w
+ 	kref_put(&notify->kref, notify->release);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++static void init_helper_thread(void)
++{
++	static int init_sworker_once;
++
++	if (init_sworker_once)
++		return;
++	if (WARN_ON(swork_get()))
++		return;
++	init_sworker_once = 1;
++}
++
++static void irq_affinity_notify(struct swork_event *swork)
++{
++	struct irq_affinity_notify *notify =
++		container_of(swork, struct irq_affinity_notify, swork);
++	_irq_affinity_notify(notify);
++}
++
++#else
++
++static void irq_affinity_notify(struct work_struct *work)
++{
++	struct irq_affinity_notify *notify =
++		container_of(work, struct irq_affinity_notify, work);
++	_irq_affinity_notify(notify);
++}
++#endif
++
+ /**
+  *	irq_set_affinity_notifier - control notification of IRQ affinity changes
+  *	@irq:		Interrupt for which to enable/disable notification
+@@ -317,7 +349,12 @@ irq_set_affinity_notifier(unsigned int i
+ 	if (notify) {
+ 		notify->irq = irq;
+ 		kref_init(&notify->kref);
++#ifdef CONFIG_PREEMPT_RT_BASE
++		INIT_SWORK(&notify->swork, irq_affinity_notify);
++		init_helper_thread();
++#else
+ 		INIT_WORK(&notify->work, irq_affinity_notify);
++#endif
+ 	}
+ 
+ 	raw_spin_lock_irqsave(&desc->lock, flags);
diff --git a/kernel/patches-4.14.x-rt/0184-time-hrtimer-avoid-schedule_work-with-interrupts-dis.patch b/kernel/patches-4.14.x-rt/0184-time-hrtimer-avoid-schedule_work-with-interrupts-dis.patch
new file mode 100644
index 000000000..01818c08a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0184-time-hrtimer-avoid-schedule_work-with-interrupts-dis.patch
@@ -0,0 +1,52 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 15 Nov 2017 17:29:51 +0100
+Subject: [PATCH] time/hrtimer: avoid schedule_work() with interrupts disabled
+
+The NOHZ code tries to schedule a workqueue with interrupts disabled.
+Since this does not work -RT I am switching it to swork instead.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/timer.c |   15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -217,8 +217,7 @@ static DEFINE_PER_CPU(struct timer_base,
+ static DEFINE_STATIC_KEY_FALSE(timers_nohz_active);
+ static DEFINE_MUTEX(timer_keys_mutex);
+ 
+-static void timer_update_keys(struct work_struct *work);
+-static DECLARE_WORK(timer_update_work, timer_update_keys);
++static struct swork_event timer_update_swork;
+ 
+ #ifdef CONFIG_SMP
+ unsigned int sysctl_timer_migration = 1;
+@@ -238,7 +237,7 @@ static void timers_update_migration(void
+ static inline void timers_update_migration(void) { }
+ #endif /* !CONFIG_SMP */
+ 
+-static void timer_update_keys(struct work_struct *work)
++static void timer_update_keys(struct swork_event *event)
+ {
+ 	mutex_lock(&timer_keys_mutex);
+ 	timers_update_migration();
+@@ -248,9 +247,17 @@ static void timer_update_keys(struct wor
+ 
+ void timers_update_nohz(void)
+ {
+-	schedule_work(&timer_update_work);
++	swork_queue(&timer_update_swork);
+ }
+ 
++static __init int hrtimer_init_thread(void)
++{
++	WARN_ON(swork_get());
++	INIT_SWORK(&timer_update_swork, timer_update_keys);
++	return 0;
++}
++early_initcall(hrtimer_init_thread);
++
+ int timer_migration_handler(struct ctl_table *table, int write,
+ 			    void __user *buffer, size_t *lenp,
+ 			    loff_t *ppos)
diff --git a/kernel/patches-4.14.x-rt/0185-hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch b/kernel/patches-4.14.x-rt/0185-hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
new file mode 100644
index 000000000..ef075783f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0185-hrtimer-consolidate-hrtimer_init-hrtimer_init_sleepe.patch
@@ -0,0 +1,246 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 4 Sep 2017 18:31:50 +0200
+Subject: [PATCH] hrtimer: consolidate hrtimer_init() + hrtimer_init_sleeper()
+ calls
+
+hrtimer_init_sleeper() calls require a prior initialisation of the
+hrtimer object with hrtimer_init(). Lets make the initialisation of the
+hrtimer object part of hrtimer_init_sleeper().
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ block/blk-mq.c          |    3 +--
+ include/linux/hrtimer.h |   19 ++++++++++++++++---
+ include/linux/wait.h    |    4 ++--
+ kernel/futex.c          |   19 ++++++++-----------
+ kernel/time/hrtimer.c   |   46 ++++++++++++++++++++++++++++++++++++----------
+ net/core/pktgen.c       |    4 ++--
+ 6 files changed, 65 insertions(+), 30 deletions(-)
+
+--- a/block/blk-mq.c
++++ b/block/blk-mq.c
+@@ -2800,10 +2800,9 @@ static bool blk_mq_poll_hybrid_sleep(str
+ 	kt = nsecs;
+ 
+ 	mode = HRTIMER_MODE_REL;
+-	hrtimer_init_on_stack(&hs.timer, CLOCK_MONOTONIC, mode);
++	hrtimer_init_sleeper_on_stack(&hs, CLOCK_MONOTONIC, mode, current);
+ 	hrtimer_set_expires(&hs.timer, kt);
+ 
+-	hrtimer_init_sleeper(&hs, current);
+ 	do {
+ 		if (test_bit(REQ_ATOM_COMPLETE, &rq->atomic_flags))
+ 			break;
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -364,10 +364,17 @@ DECLARE_PER_CPU(struct tick_device, tick
+ /* Initialize timers: */
+ extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock,
+ 			 enum hrtimer_mode mode);
++extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, clockid_t clock_id,
++				 enum hrtimer_mode mode,
++				 struct task_struct *task);
+ 
+ #ifdef CONFIG_DEBUG_OBJECTS_TIMERS
+ extern void hrtimer_init_on_stack(struct hrtimer *timer, clockid_t which_clock,
+ 				  enum hrtimer_mode mode);
++extern void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,
++					  clockid_t clock_id,
++					  enum hrtimer_mode mode,
++					  struct task_struct *task);
+ 
+ extern void destroy_hrtimer_on_stack(struct hrtimer *timer);
+ #else
+@@ -377,6 +384,15 @@ static inline void hrtimer_init_on_stack
+ {
+ 	hrtimer_init(timer, which_clock, mode);
+ }
++
++static inline void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,
++					    clockid_t clock_id,
++					    enum hrtimer_mode mode,
++					    struct task_struct *task)
++{
++	hrtimer_init_sleeper(sl, clock_id, mode, task);
++}
++
+ static inline void destroy_hrtimer_on_stack(struct hrtimer *timer) { }
+ #endif
+ 
+@@ -479,9 +495,6 @@ extern long hrtimer_nanosleep(const stru
+ 			      const enum hrtimer_mode mode,
+ 			      const clockid_t clockid);
+ 
+-extern void hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
+-				 struct task_struct *tsk);
+-
+ extern int schedule_hrtimeout_range(ktime_t *expires, u64 delta,
+ 						const enum hrtimer_mode mode);
+ extern int schedule_hrtimeout_range_clock(ktime_t *expires,
+--- a/include/linux/wait.h
++++ b/include/linux/wait.h
+@@ -487,8 +487,8 @@ do {										\
+ 	int __ret = 0;								\
+ 	struct hrtimer_sleeper __t;						\
+ 										\
+-	hrtimer_init_on_stack(&__t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);	\
+-	hrtimer_init_sleeper(&__t, current);					\
++	hrtimer_init_sleeper_on_stack(&__t, CLOCK_MONOTONIC, HRTIMER_MODE_REL,	\
++				      current);					\
+ 	if ((timeout) != KTIME_MAX)						\
+ 		hrtimer_start_range_ns(&__t.timer, timeout,			\
+ 				       current->timer_slack_ns,			\
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -2642,10 +2642,9 @@ static int futex_wait(u32 __user *uaddr,
+ 	if (abs_time) {
+ 		to = &timeout;
+ 
+-		hrtimer_init_on_stack(&to->timer, (flags & FLAGS_CLOCKRT) ?
+-				      CLOCK_REALTIME : CLOCK_MONOTONIC,
+-				      HRTIMER_MODE_ABS);
+-		hrtimer_init_sleeper(to, current);
++		hrtimer_init_sleeper_on_stack(to, (flags & FLAGS_CLOCKRT) ?
++					      CLOCK_REALTIME : CLOCK_MONOTONIC,
++					      HRTIMER_MODE_ABS, current);
+ 		hrtimer_set_expires_range_ns(&to->timer, *abs_time,
+ 					     current->timer_slack_ns);
+ 	}
+@@ -2744,9 +2743,8 @@ static int futex_lock_pi(u32 __user *uad
+ 
+ 	if (time) {
+ 		to = &timeout;
+-		hrtimer_init_on_stack(&to->timer, CLOCK_REALTIME,
+-				      HRTIMER_MODE_ABS);
+-		hrtimer_init_sleeper(to, current);
++		hrtimer_init_sleeper_on_stack(to, CLOCK_REALTIME,
++					      HRTIMER_MODE_ABS, current);
+ 		hrtimer_set_expires(&to->timer, *time);
+ 	}
+ 
+@@ -3162,10 +3160,9 @@ static int futex_wait_requeue_pi(u32 __u
+ 
+ 	if (abs_time) {
+ 		to = &timeout;
+-		hrtimer_init_on_stack(&to->timer, (flags & FLAGS_CLOCKRT) ?
+-				      CLOCK_REALTIME : CLOCK_MONOTONIC,
+-				      HRTIMER_MODE_ABS);
+-		hrtimer_init_sleeper(to, current);
++		hrtimer_init_sleeper_on_stack(to, (flags & FLAGS_CLOCKRT) ?
++					      CLOCK_REALTIME : CLOCK_MONOTONIC,
++					      HRTIMER_MODE_ABS, current);
+ 		hrtimer_set_expires_range_ns(&to->timer, *abs_time,
+ 					     current->timer_slack_ns);
+ 	}
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1603,13 +1603,44 @@ static enum hrtimer_restart hrtimer_wake
+ 	return HRTIMER_NORESTART;
+ }
+ 
+-void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, struct task_struct *task)
++static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
++				   clockid_t clock_id,
++				   enum hrtimer_mode mode,
++				   struct task_struct *task)
+ {
++	__hrtimer_init(&sl->timer, clock_id, mode);
+ 	sl->timer.function = hrtimer_wakeup;
+ 	sl->task = task;
+ }
++
++/**
++ * hrtimer_init_sleeper - initialize sleeper to the given clock
++ * @sl:		sleeper to be initialized
++ * @clock_id:	the clock to be used
++ * @mode:	timer mode abs/rel
++ * @task:	the task to wake up
++ */
++void hrtimer_init_sleeper(struct hrtimer_sleeper *sl, clockid_t clock_id,
++			  enum hrtimer_mode mode, struct task_struct *task)
++{
++	debug_init(&sl->timer, clock_id, mode);
++	__hrtimer_init_sleeper(sl, clock_id, mode, task);
++
++}
+ EXPORT_SYMBOL_GPL(hrtimer_init_sleeper);
+ 
++#ifdef CONFIG_DEBUG_OBJECTS_TIMERS
++void hrtimer_init_sleeper_on_stack(struct hrtimer_sleeper *sl,
++				   clockid_t clock_id,
++				   enum hrtimer_mode mode,
++				   struct task_struct *task)
++{
++	debug_object_init_on_stack(&sl->timer, &hrtimer_debug_descr);
++	__hrtimer_init_sleeper(sl, clock_id, mode, task);
++}
++EXPORT_SYMBOL_GPL(hrtimer_init_sleeper_on_stack);
++#endif
++
+ int nanosleep_copyout(struct restart_block *restart, struct timespec64 *ts)
+ {
+ 	switch(restart->nanosleep.type) {
+@@ -1633,8 +1664,6 @@ static int __sched do_nanosleep(struct h
+ {
+ 	struct restart_block *restart;
+ 
+-	hrtimer_init_sleeper(t, current);
+-
+ 	do {
+ 		set_current_state(TASK_INTERRUPTIBLE);
+ 		hrtimer_start_expires(&t->timer, mode);
+@@ -1671,10 +1700,9 @@ static long __sched hrtimer_nanosleep_re
+ 	struct hrtimer_sleeper t;
+ 	int ret;
+ 
+-	hrtimer_init_on_stack(&t.timer, restart->nanosleep.clockid,
+-				HRTIMER_MODE_ABS);
++	hrtimer_init_sleeper_on_stack(&t, restart->nanosleep.clockid,
++				      HRTIMER_MODE_ABS, current);
+ 	hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
+-
+ 	ret = do_nanosleep(&t, HRTIMER_MODE_ABS);
+ 	destroy_hrtimer_on_stack(&t.timer);
+ 	return ret;
+@@ -1692,7 +1720,7 @@ long hrtimer_nanosleep(const struct time
+ 	if (dl_task(current) || rt_task(current))
+ 		slack = 0;
+ 
+-	hrtimer_init_on_stack(&t.timer, clockid, mode);
++	hrtimer_init_sleeper_on_stack(&t, clockid, mode, current);
+ 	hrtimer_set_expires_range_ns(&t.timer, timespec64_to_ktime(*rqtp), slack);
+ 	ret = do_nanosleep(&t, mode);
+ 	if (ret != -ERESTART_RESTARTBLOCK)
+@@ -1887,11 +1915,9 @@ schedule_hrtimeout_range_clock(ktime_t *
+ 		return -EINTR;
+ 	}
+ 
+-	hrtimer_init_on_stack(&t.timer, clock_id, mode);
++	hrtimer_init_sleeper_on_stack(&t, clock_id, mode, current);
+ 	hrtimer_set_expires_range_ns(&t.timer, *expires, delta);
+ 
+-	hrtimer_init_sleeper(&t, current);
+-
+ 	hrtimer_start_expires(&t.timer, mode);
+ 
+ 	if (likely(t.task))
+--- a/net/core/pktgen.c
++++ b/net/core/pktgen.c
+@@ -2252,7 +2252,8 @@ static void spin(struct pktgen_dev *pkt_
+ 	s64 remaining;
+ 	struct hrtimer_sleeper t;
+ 
+-	hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
++	hrtimer_init_sleeper_on_stack(&t, CLOCK_MONOTONIC, HRTIMER_MODE_ABS,
++				      current);
+ 	hrtimer_set_expires(&t.timer, spin_until);
+ 
+ 	remaining = ktime_to_ns(hrtimer_expires_remaining(&t.timer));
+@@ -2267,7 +2268,6 @@ static void spin(struct pktgen_dev *pkt_
+ 		} while (ktime_compare(end_time, spin_until) < 0);
+ 	} else {
+ 		/* see do_nanosleep */
+-		hrtimer_init_sleeper(&t, current);
+ 		do {
+ 			set_current_state(TASK_INTERRUPTIBLE);
+ 			hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);
diff --git a/kernel/patches-4.14.x-rt/0186-hrtimers-prepare-full-preemption.patch b/kernel/patches-4.14.x-rt/0186-hrtimers-prepare-full-preemption.patch
new file mode 100644
index 000000000..0bd771791
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0186-hrtimers-prepare-full-preemption.patch
@@ -0,0 +1,212 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:29:34 -0500
+Subject: hrtimers: Prepare full preemption
+
+Make cancellation of a running callback in softirq context safe
+against preemption.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/hrtimer.h    |   13 ++++++++++++-
+ kernel/time/hrtimer.c      |   33 ++++++++++++++++++++++++++++++++-
+ kernel/time/itimer.c       |    1 +
+ kernel/time/posix-timers.c |   33 +++++++++++++++++++++++++++++++++
+ 4 files changed, 78 insertions(+), 2 deletions(-)
+
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -22,6 +22,7 @@
+ #include <linux/percpu.h>
+ #include <linux/timer.h>
+ #include <linux/timerqueue.h>
++#include <linux/wait.h>
+ 
+ struct hrtimer_clock_base;
+ struct hrtimer_cpu_base;
+@@ -216,6 +217,9 @@ struct hrtimer_cpu_base {
+ 	ktime_t				expires_next;
+ 	struct hrtimer			*next_timer;
+ 	ktime_t				softirq_expires_next;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	wait_queue_head_t		wait;
++#endif
+ 	struct hrtimer			*softirq_next_timer;
+ 	struct hrtimer_clock_base	clock_base[HRTIMER_MAX_CLOCK_BASES];
+ } ____cacheline_aligned;
+@@ -433,6 +437,13 @@ static inline void hrtimer_restart(struc
+ 	hrtimer_start_expires(timer, HRTIMER_MODE_ABS);
+ }
+ 
++/* Softirq preemption could deadlock timer removal */
++#ifdef CONFIG_PREEMPT_RT_BASE
++  extern void hrtimer_wait_for_timer(const struct hrtimer *timer);
++#else
++# define hrtimer_wait_for_timer(timer)	do { cpu_relax(); } while (0)
++#endif
++
+ /* Query timers: */
+ extern ktime_t __hrtimer_get_remaining(const struct hrtimer *timer, bool adjust);
+ 
+@@ -457,7 +468,7 @@ static inline int hrtimer_is_queued(stru
+  * Helper function to check, whether the timer is running the callback
+  * function
+  */
+-static inline int hrtimer_callback_running(struct hrtimer *timer)
++static inline int hrtimer_callback_running(const struct hrtimer *timer)
+ {
+ 	return timer->base->running == timer;
+ }
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -926,6 +926,33 @@ u64 hrtimer_forward(struct hrtimer *time
+ }
+ EXPORT_SYMBOL_GPL(hrtimer_forward);
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++# define wake_up_timer_waiters(b)	wake_up(&(b)->wait)
++
++/**
++ * hrtimer_wait_for_timer - Wait for a running timer
++ *
++ * @timer:	timer to wait for
++ *
++ * The function waits in case the timers callback function is
++ * currently executed on the waitqueue of the timer base. The
++ * waitqueue is woken up after the timer callback function has
++ * finished execution.
++ */
++void hrtimer_wait_for_timer(const struct hrtimer *timer)
++{
++	struct hrtimer_clock_base *base = timer->base;
++
++	if (base && base->cpu_base &&
++	    base->index >= HRTIMER_BASE_MONOTONIC_SOFT)
++		wait_event(base->cpu_base->wait,
++				!(hrtimer_callback_running(timer)));
++}
++
++#else
++# define wake_up_timer_waiters(b)	do { } while (0)
++#endif
++
+ /*
+  * enqueue_hrtimer - internal function to (re)start a timer
+  *
+@@ -1158,7 +1185,7 @@ int hrtimer_cancel(struct hrtimer *timer
+ 
+ 		if (ret >= 0)
+ 			return ret;
+-		cpu_relax();
++		hrtimer_wait_for_timer(timer);
+ 	}
+ }
+ EXPORT_SYMBOL_GPL(hrtimer_cancel);
+@@ -1431,6 +1458,7 @@ static __latent_entropy void hrtimer_run
+ 	hrtimer_update_softirq_timer(cpu_base, true);
+ 
+ 	raw_spin_unlock_irqrestore(&cpu_base->lock, flags);
++	wake_up_timer_waiters(cpu_base);
+ }
+ 
+ #ifdef CONFIG_HIGH_RES_TIMERS
+@@ -1797,6 +1825,9 @@ int hrtimers_prepare_cpu(unsigned int cp
+ 	cpu_base->softirq_next_timer = NULL;
+ 	cpu_base->expires_next = KTIME_MAX;
+ 	cpu_base->softirq_expires_next = KTIME_MAX;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	init_waitqueue_head(&cpu_base->wait);
++#endif
+ 	return 0;
+ }
+ 
+--- a/kernel/time/itimer.c
++++ b/kernel/time/itimer.c
+@@ -214,6 +214,7 @@ int do_setitimer(int which, struct itime
+ 		/* We are sharing ->siglock with it_real_fn() */
+ 		if (hrtimer_try_to_cancel(timer) < 0) {
+ 			spin_unlock_irq(&tsk->sighand->siglock);
++			hrtimer_wait_for_timer(&tsk->signal->real_timer);
+ 			goto again;
+ 		}
+ 		expires = timeval_to_ktime(value->it_value);
+--- a/kernel/time/posix-timers.c
++++ b/kernel/time/posix-timers.c
+@@ -796,6 +796,20 @@ SYSCALL_DEFINE1(timer_getoverrun, timer_
+ 	return overrun;
+ }
+ 
++/*
++ * Protected by RCU!
++ */
++static void timer_wait_for_callback(const struct k_clock *kc, struct k_itimer *timr)
++{
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (kc->timer_set == common_timer_set)
++		hrtimer_wait_for_timer(&timr->it.real.timer);
++	else
++		/* FIXME: Whacky hack for posix-cpu-timers */
++		schedule_timeout(1);
++#endif
++}
++
+ static void common_hrtimer_arm(struct k_itimer *timr, ktime_t expires,
+ 			       bool absolute, bool sigev_none)
+ {
+@@ -890,6 +904,7 @@ static int do_timer_settime(timer_t time
+ 	if (!timr)
+ 		return -EINVAL;
+ 
++	rcu_read_lock();
+ 	kc = timr->kclock;
+ 	if (WARN_ON_ONCE(!kc || !kc->timer_set))
+ 		error = -EINVAL;
+@@ -898,9 +913,12 @@ static int do_timer_settime(timer_t time
+ 
+ 	unlock_timer(timr, flag);
+ 	if (error == TIMER_RETRY) {
++		timer_wait_for_callback(kc, timr);
+ 		old_spec64 = NULL;	// We already got the old time...
++		rcu_read_unlock();
+ 		goto retry;
+ 	}
++	rcu_read_unlock();
+ 
+ 	return error;
+ }
+@@ -982,10 +1000,15 @@ SYSCALL_DEFINE1(timer_delete, timer_t, t
+ 	if (!timer)
+ 		return -EINVAL;
+ 
++	rcu_read_lock();
+ 	if (timer_delete_hook(timer) == TIMER_RETRY) {
+ 		unlock_timer(timer, flags);
++		timer_wait_for_callback(clockid_to_kclock(timer->it_clock),
++					timer);
++		rcu_read_unlock();
+ 		goto retry_delete;
+ 	}
++	rcu_read_unlock();
+ 
+ 	spin_lock(&current->sighand->siglock);
+ 	list_del(&timer->list);
+@@ -1011,8 +1034,18 @@ static void itimer_delete(struct k_itime
+ retry_delete:
+ 	spin_lock_irqsave(&timer->it_lock, flags);
+ 
++	/* On RT we can race with a deletion */
++	if (!timer->it_signal) {
++		unlock_timer(timer, flags);
++		return;
++	}
++
+ 	if (timer_delete_hook(timer) == TIMER_RETRY) {
++		rcu_read_lock();
+ 		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 --git a/kernel/patches-4.14.x-rt/0187-hrtimer-by-timers-by-default-into-the-softirq-context.patch b/kernel/patches-4.14.x-rt/0187-hrtimer-by-timers-by-default-into-the-softirq-context.patch
new file mode 100644
index 000000000..e0dc5f346
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0187-hrtimer-by-timers-by-default-into-the-softirq-context.patch
@@ -0,0 +1,212 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 3 Jul 2009 08:44:31 -0500
+Subject: hrtimer: by timers by default into the softirq context
+
+We can't have hrtimers callbacks running in hardirq context on RT. Therefore
+the timers are deferred to the softirq context by default.
+There are few timers which expect to be run in hardirq context even on RT.
+Those are:
+- very short running where low latency is critical (kvm lapic)
+- timers which take raw locks and need run in hard-irq context (perf, sched)
+- wake up related timer (kernel side of clock_nanosleep() and so on)
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/kvm/lapic.c                 |    2 +-
+ include/linux/hrtimer.h              |    6 ++++++
+ kernel/events/core.c                 |    4 ++--
+ kernel/sched/core.c                  |    2 +-
+ kernel/sched/deadline.c              |    2 +-
+ kernel/sched/rt.c                    |    4 ++--
+ kernel/time/hrtimer.c                |   34 ++++++++++++++++++++++++++++++++--
+ kernel/time/tick-broadcast-hrtimer.c |    2 +-
+ kernel/time/tick-sched.c             |    2 +-
+ kernel/watchdog.c                    |    2 +-
+ 10 files changed, 48 insertions(+), 12 deletions(-)
+
+--- a/arch/x86/kvm/lapic.c
++++ b/arch/x86/kvm/lapic.c
+@@ -2098,7 +2098,7 @@ int kvm_create_lapic(struct kvm_vcpu *vc
+ 	apic->vcpu = vcpu;
+ 
+ 	hrtimer_init(&apic->lapic_timer.timer, CLOCK_MONOTONIC,
+-		     HRTIMER_MODE_ABS_PINNED);
++		     HRTIMER_MODE_ABS_PINNED_HARD);
+ 	apic->lapic_timer.timer.function = apic_timer_fn;
+ 
+ 	/*
+--- a/include/linux/hrtimer.h
++++ b/include/linux/hrtimer.h
+@@ -42,6 +42,7 @@ enum hrtimer_mode {
+ 	HRTIMER_MODE_REL	= 0x01,
+ 	HRTIMER_MODE_PINNED	= 0x02,
+ 	HRTIMER_MODE_SOFT	= 0x04,
++	HRTIMER_MODE_HARD	= 0x08,
+ 
+ 	HRTIMER_MODE_ABS_PINNED = HRTIMER_MODE_ABS | HRTIMER_MODE_PINNED,
+ 	HRTIMER_MODE_REL_PINNED = HRTIMER_MODE_REL | HRTIMER_MODE_PINNED,
+@@ -52,6 +53,11 @@ enum hrtimer_mode {
+ 	HRTIMER_MODE_ABS_PINNED_SOFT = HRTIMER_MODE_ABS_PINNED | HRTIMER_MODE_SOFT,
+ 	HRTIMER_MODE_REL_PINNED_SOFT = HRTIMER_MODE_REL_PINNED | HRTIMER_MODE_SOFT,
+ 
++	HRTIMER_MODE_ABS_HARD	= HRTIMER_MODE_ABS | HRTIMER_MODE_HARD,
++	HRTIMER_MODE_REL_HARD	= HRTIMER_MODE_REL | HRTIMER_MODE_HARD,
++
++	HRTIMER_MODE_ABS_PINNED_HARD = HRTIMER_MODE_ABS_PINNED | HRTIMER_MODE_HARD,
++	HRTIMER_MODE_REL_PINNED_HARD = HRTIMER_MODE_REL_PINNED | HRTIMER_MODE_HARD,
+ };
+ 
+ /*
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -1042,7 +1042,7 @@ static void __perf_mux_hrtimer_init(stru
+ 	cpuctx->hrtimer_interval = ns_to_ktime(NSEC_PER_MSEC * interval);
+ 
+ 	raw_spin_lock_init(&cpuctx->hrtimer_lock);
+-	hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED);
++	hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED_HARD);
+ 	timer->function = perf_mux_hrtimer_handler;
+ }
+ 
+@@ -8706,7 +8706,7 @@ static void perf_swevent_init_hrtimer(st
+ 	if (!is_sampling_event(event))
+ 		return;
+ 
+-	hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(&hwc->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
+ 	hwc->hrtimer.function = perf_swevent_hrtimer;
+ 
+ 	/*
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -341,7 +341,7 @@ static void init_rq_hrtick(struct rq *rq
+ 	rq->hrtick_csd.info = rq;
+ #endif
+ 
+-	hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(&rq->hrtick_timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
+ 	rq->hrtick_timer.function = hrtick;
+ }
+ #else	/* CONFIG_SCHED_HRTICK */
+--- a/kernel/sched/deadline.c
++++ b/kernel/sched/deadline.c
+@@ -1020,7 +1020,7 @@ void init_dl_task_timer(struct sched_dl_
+ {
+ 	struct hrtimer *timer = &dl_se->dl_timer;
+ 
+-	hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
+ 	timer->function = dl_task_timer;
+ }
+ 
+--- a/kernel/sched/rt.c
++++ b/kernel/sched/rt.c
+@@ -47,8 +47,8 @@ void init_rt_bandwidth(struct rt_bandwid
+ 
+ 	raw_spin_lock_init(&rt_b->rt_runtime_lock);
+ 
+-	hrtimer_init(&rt_b->rt_period_timer,
+-			CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(&rt_b->rt_period_timer, CLOCK_MONOTONIC,
++		     HRTIMER_MODE_REL_HARD);
+ 	rt_b->rt_period_timer.function = sched_rt_period_timer;
+ }
+ 
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1122,7 +1122,9 @@ void hrtimer_start_range_ns(struct hrtim
+ 	 * Check whether the HRTIMER_MODE_SOFT bit and hrtimer.is_soft
+ 	 * match.
+ 	 */
++#ifndef CONFIG_PREEMPT_RT_BASE
+ 	WARN_ON_ONCE(!(mode & HRTIMER_MODE_SOFT) ^ !timer->is_soft);
++#endif
+ 
+ 	base = lock_hrtimer_base(timer, &flags);
+ 
+@@ -1249,10 +1251,17 @@ static inline int hrtimer_clockid_to_bas
+ static void __hrtimer_init(struct hrtimer *timer, clockid_t clock_id,
+ 			   enum hrtimer_mode mode)
+ {
+-	bool softtimer = !!(mode & HRTIMER_MODE_SOFT);
+-	int base = softtimer ? HRTIMER_MAX_CLOCK_BASES / 2 : 0;
++	bool softtimer;
++	int base;
+ 	struct hrtimer_cpu_base *cpu_base;
+ 
++	softtimer = !!(mode & HRTIMER_MODE_SOFT);
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (!softtimer && !(mode & HRTIMER_MODE_HARD))
++		softtimer = true;
++#endif
++	base = softtimer ? HRTIMER_MAX_CLOCK_BASES / 2 : 0;
++
+ 	memset(timer, 0, sizeof(struct hrtimer));
+ 
+ 	cpu_base = raw_cpu_ptr(&hrtimer_bases);
+@@ -1631,11 +1640,32 @@ static enum hrtimer_restart hrtimer_wake
+ 	return HRTIMER_NORESTART;
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static bool task_is_realtime(struct task_struct *tsk)
++{
++	int policy = tsk->policy;
++
++	if (policy == SCHED_FIFO || policy == SCHED_RR)
++		return true;
++	if (policy == SCHED_DEADLINE)
++		return true;
++	return false;
++}
++#endif
++
+ static void __hrtimer_init_sleeper(struct hrtimer_sleeper *sl,
+ 				   clockid_t clock_id,
+ 				   enum hrtimer_mode mode,
+ 				   struct task_struct *task)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (!(mode & (HRTIMER_MODE_SOFT | HRTIMER_MODE_HARD))) {
++		if (task_is_realtime(current) || system_state != SYSTEM_RUNNING)
++			mode |= HRTIMER_MODE_HARD;
++		else
++			mode |= HRTIMER_MODE_SOFT;
++	}
++#endif
+ 	__hrtimer_init(&sl->timer, clock_id, mode);
+ 	sl->timer.function = hrtimer_wakeup;
+ 	sl->task = task;
+--- a/kernel/time/tick-broadcast-hrtimer.c
++++ b/kernel/time/tick-broadcast-hrtimer.c
+@@ -106,7 +106,7 @@ static enum hrtimer_restart bc_handler(s
+ 
+ void tick_setup_hrtimer_broadcast(void)
+ {
+-	hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
++	hrtimer_init(&bctimer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
+ 	bctimer.function = bc_handler;
+ 	clockevents_register_device(&ce_broadcast_hrtimer);
+ }
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -1254,7 +1254,7 @@ void tick_setup_sched_timer(void)
+ 	/*
+ 	 * Emulate tick processing via per-CPU hrtimers:
+ 	 */
+-	hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS);
++	hrtimer_init(&ts->sched_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_HARD);
+ 	ts->sched_timer.function = tick_sched_timer;
+ 
+ 	/* Get the next period (per-CPU) */
+--- a/kernel/watchdog.c
++++ b/kernel/watchdog.c
+@@ -462,7 +462,7 @@ static void watchdog_enable(unsigned int
+ 	 * Start the timer first to prevent the NMI watchdog triggering
+ 	 * before the timer has a chance to fire.
+ 	 */
+-	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	hrtimer_init(hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL_HARD);
+ 	hrtimer->function = watchdog_timer_fn;
+ 	hrtimer_start(hrtimer, ns_to_ktime(sample_period),
+ 		      HRTIMER_MODE_REL_PINNED);
diff --git a/kernel/patches-4.14.x-rt/0188-hrtimer-Move-schedule_work-call-to-helper-thread.patch b/kernel/patches-4.14.x-rt/0188-hrtimer-Move-schedule_work-call-to-helper-thread.patch
new file mode 100644
index 000000000..c0246f092
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0188-hrtimer-Move-schedule_work-call-to-helper-thread.patch
@@ -0,0 +1,91 @@
+From: Yang Shi <yang.shi@windriver.com>
+Date: Mon, 16 Sep 2013 14:09:19 -0700
+Subject: hrtimer: Move schedule_work call to helper thread
+
+When run ltp leapsec_timer test, the following call trace is caught:
+
+BUG: sleeping function called from invalid context at kernel/rtmutex.c:659
+in_atomic(): 1, irqs_disabled(): 1, pid: 0, name: swapper/1
+Preemption disabled at:[<ffffffff810857f3>] cpu_startup_entry+0x133/0x310
+
+CPU: 1 PID: 0 Comm: swapper/1 Not tainted 3.10.10-rt3 #2
+Hardware name: Intel Corporation Calpella platform/MATXM-CORE-411-B, BIOS 4.6.3 08/18/2010
+ffffffff81c2f800 ffff880076843e40 ffffffff8169918d ffff880076843e58
+ffffffff8106db31 ffff88007684b4a0 ffff880076843e70 ffffffff8169d9c0
+ffff88007684b4a0 ffff880076843eb0 ffffffff81059da1 0000001876851200
+Call Trace:
+<IRQ>  [<ffffffff8169918d>] dump_stack+0x19/0x1b
+[<ffffffff8106db31>] __might_sleep+0xf1/0x170
+[<ffffffff8169d9c0>] rt_spin_lock+0x20/0x50
+[<ffffffff81059da1>] queue_work_on+0x61/0x100
+[<ffffffff81065aa1>] clock_was_set_delayed+0x21/0x30
+[<ffffffff810883be>] do_timer+0x40e/0x660
+[<ffffffff8108f487>] tick_do_update_jiffies64+0xf7/0x140
+[<ffffffff8108fe42>] tick_check_idle+0x92/0xc0
+[<ffffffff81044327>] irq_enter+0x57/0x70
+[<ffffffff816a040e>] smp_apic_timer_interrupt+0x3e/0x9b
+[<ffffffff8169f80a>] apic_timer_interrupt+0x6a/0x70
+<EOI>  [<ffffffff8155ea1c>] ? cpuidle_enter_state+0x4c/0xc0
+[<ffffffff8155eb68>] cpuidle_idle_call+0xd8/0x2d0
+[<ffffffff8100b59e>] arch_cpu_idle+0xe/0x30
+[<ffffffff8108585e>] cpu_startup_entry+0x19e/0x310
+[<ffffffff8168efa2>] start_secondary+0x1ad/0x1b0
+
+The clock_was_set_delayed is called in hard IRQ handler (timer interrupt), which
+calls schedule_work.
+
+Under PREEMPT_RT_FULL, schedule_work calls spinlocks which could sleep, so it's
+not safe to call schedule_work in interrupt context.
+
+Reference upstream commit b68d61c705ef02384c0538b8d9374545097899ca
+(rt,ntp: Move call to schedule_delayed_work() to helper thread)
+from git://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git, which
+makes a similar change.
+
+Signed-off-by: Yang Shi <yang.shi@windriver.com>
+[bigeasy: use swork_queue() instead a helper thread]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   24 ++++++++++++++++++++++++
+ 1 file changed, 24 insertions(+)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -715,6 +715,29 @@ static void hrtimer_switch_to_hres(void)
+ 	retrigger_next_event(NULL);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++
++static struct swork_event clock_set_delay_work;
++
++static void run_clock_set_delay(struct swork_event *event)
++{
++	clock_was_set();
++}
++
++void clock_was_set_delayed(void)
++{
++	swork_queue(&clock_set_delay_work);
++}
++
++static __init int create_clock_set_delay_thread(void)
++{
++	WARN_ON(swork_get());
++	INIT_SWORK(&clock_set_delay_work, run_clock_set_delay);
++	return 0;
++}
++early_initcall(create_clock_set_delay_thread);
++#else /* PREEMPT_RT_FULL */
++
+ static void clock_was_set_work(struct work_struct *work)
+ {
+ 	clock_was_set();
+@@ -730,6 +753,7 @@ void clock_was_set_delayed(void)
+ {
+ 	schedule_work(&hrtimer_work);
+ }
++#endif
+ 
+ #else
+ 
diff --git a/kernel/patches-4.14.x-rt/0189-timer-fd-avoid-live-lock.patch b/kernel/patches-4.14.x-rt/0189-timer-fd-avoid-live-lock.patch
new file mode 100644
index 000000000..31a9b1b5e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0189-timer-fd-avoid-live-lock.patch
@@ -0,0 +1,30 @@
+Subject: timer-fd: Prevent live lock
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 25 Jan 2012 11:08:40 +0100
+
+If hrtimer_try_to_cancel() requires a retry, then depending on the
+priority setting te retry loop might prevent timer callback completion
+on RT. Prevent that by waiting for completion on RT, no change for a
+non RT kernel.
+
+Reported-by: Sankara Muthukrishnan <sankara.m@gmail.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ fs/timerfd.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/fs/timerfd.c
++++ b/fs/timerfd.c
+@@ -471,7 +471,10 @@ static int do_timerfd_settime(int ufd, i
+ 				break;
+ 		}
+ 		spin_unlock_irq(&ctx->wqh.lock);
+-		cpu_relax();
++		if (isalarm(ctx))
++			hrtimer_wait_for_timer(&ctx->t.alarm.timer);
++		else
++			hrtimer_wait_for_timer(&ctx->t.tmr);
+ 	}
+ 
+ 	/*
diff --git a/kernel/patches-4.14.x-rt/0190-posix-timers-thread-posix-cpu-timers-on-rt.patch b/kernel/patches-4.14.x-rt/0190-posix-timers-thread-posix-cpu-timers-on-rt.patch
new file mode 100644
index 000000000..8a6d4ab94
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0190-posix-timers-thread-posix-cpu-timers-on-rt.patch
@@ -0,0 +1,274 @@
+From: John Stultz <johnstul@us.ibm.com>
+Date: Fri, 3 Jul 2009 08:29:58 -0500
+Subject: posix-timers: Thread posix-cpu-timers on -rt
+
+posix-cpu-timer code takes non -rt safe locks in hard irq
+context. Move it to a thread.
+
+[ 3.0 fixes from Peter Zijlstra <peterz@infradead.org> ]
+
+Signed-off-by: John Stultz <johnstul@us.ibm.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/init_task.h      |    7 +
+ include/linux/sched.h          |    3 
+ kernel/fork.c                  |    3 
+ kernel/time/posix-cpu-timers.c |  157 +++++++++++++++++++++++++++++++++++++++--
+ 4 files changed, 166 insertions(+), 4 deletions(-)
+
+--- a/include/linux/init_task.h
++++ b/include/linux/init_task.h
+@@ -163,6 +163,12 @@ extern struct cred init_cred;
+ # define INIT_PERF_EVENTS(tsk)
+ #endif
+ 
++#if defined(CONFIG_POSIX_TIMERS) && defined(CONFIG_PREEMPT_RT_BASE)
++# define INIT_TIMER_LIST		.posix_timer_list = NULL,
++#else
++# define INIT_TIMER_LIST
++#endif
++
+ #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
+ # define INIT_VTIME(tsk)						\
+ 	.vtime.seqcount = SEQCNT_ZERO(tsk.vtime.seqcount),		\
+@@ -277,6 +283,7 @@ extern struct cred init_cred;
+ 	INIT_CPU_TIMERS(tsk)						\
+ 	.pi_lock	= __RAW_SPIN_LOCK_UNLOCKED(tsk.pi_lock),	\
+ 	.timer_slack_ns = 50000, /* 50 usec default slack */		\
++	INIT_TIMER_LIST							\
+ 	.pids = {							\
+ 		[PIDTYPE_PID]  = INIT_PID_LINK(PIDTYPE_PID),		\
+ 		[PIDTYPE_PGID] = INIT_PID_LINK(PIDTYPE_PGID),		\
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -745,6 +745,9 @@ struct task_struct {
+ #ifdef CONFIG_POSIX_TIMERS
+ 	struct task_cputime		cputime_expires;
+ 	struct list_head		cpu_timers[3];
++#ifdef CONFIG_PREEMPT_RT_BASE
++	struct task_struct		*posix_timer_list;
++#endif
+ #endif
+ 
+ 	/* Process credentials: */
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -1496,6 +1496,9 @@ static void rt_mutex_init_task(struct ta
+  */
+ static void posix_cpu_timers_init(struct task_struct *tsk)
+ {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	tsk->posix_timer_list = NULL;
++#endif
+ 	tsk->cputime_expires.prof_exp = 0;
+ 	tsk->cputime_expires.virt_exp = 0;
+ 	tsk->cputime_expires.sched_exp = 0;
+--- a/kernel/time/posix-cpu-timers.c
++++ b/kernel/time/posix-cpu-timers.c
+@@ -3,8 +3,10 @@
+  * Implement CPU time clocks for the POSIX clock interface.
+  */
+ 
++#include <uapi/linux/sched/types.h>
+ #include <linux/sched/signal.h>
+ #include <linux/sched/cputime.h>
++#include <linux/sched/rt.h>
+ #include <linux/posix-timers.h>
+ #include <linux/errno.h>
+ #include <linux/math64.h>
+@@ -14,6 +16,7 @@
+ #include <linux/tick.h>
+ #include <linux/workqueue.h>
+ #include <linux/compat.h>
++#include <linux/smpboot.h>
+ 
+ #include "posix-timers.h"
+ 
+@@ -603,7 +606,7 @@ static int posix_cpu_timer_set(struct k_
+ 	/*
+ 	 * Disarm any old timer after extracting its expiry time.
+ 	 */
+-	WARN_ON_ONCE(!irqs_disabled());
++	WARN_ON_ONCE_NONRT(!irqs_disabled());
+ 
+ 	ret = 0;
+ 	old_incr = timer->it.cpu.incr;
+@@ -1034,7 +1037,7 @@ static void posix_cpu_timer_rearm(struct
+ 	/*
+ 	 * Now re-arm for the new expiry time.
+ 	 */
+-	WARN_ON_ONCE(!irqs_disabled());
++	WARN_ON_ONCE_NONRT(!irqs_disabled());
+ 	arm_timer(timer);
+ unlock:
+ 	unlock_task_sighand(p, &flags);
+@@ -1119,13 +1122,13 @@ static inline int fastpath_timer_check(s
+  * already updated our counts.  We need to check if any timers fire now.
+  * Interrupts are disabled.
+  */
+-void run_posix_cpu_timers(struct task_struct *tsk)
++static void __run_posix_cpu_timers(struct task_struct *tsk)
+ {
+ 	LIST_HEAD(firing);
+ 	struct k_itimer *timer, *next;
+ 	unsigned long flags;
+ 
+-	WARN_ON_ONCE(!irqs_disabled());
++	WARN_ON_ONCE_NONRT(!irqs_disabled());
+ 
+ 	/*
+ 	 * The fast path checks that there are no expired thread or thread
+@@ -1179,6 +1182,152 @@ void run_posix_cpu_timers(struct task_st
+ 	}
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++#include <linux/kthread.h>
++#include <linux/cpu.h>
++DEFINE_PER_CPU(struct task_struct *, posix_timer_task);
++DEFINE_PER_CPU(struct task_struct *, posix_timer_tasklist);
++DEFINE_PER_CPU(bool, posix_timer_th_active);
++
++static void posix_cpu_kthread_fn(unsigned int cpu)
++{
++	struct task_struct *tsk = NULL;
++	struct task_struct *next = NULL;
++
++	BUG_ON(per_cpu(posix_timer_task, cpu) != current);
++
++	/* grab task list */
++	raw_local_irq_disable();
++	tsk = per_cpu(posix_timer_tasklist, cpu);
++	per_cpu(posix_timer_tasklist, cpu) = NULL;
++	raw_local_irq_enable();
++
++	/* its possible the list is empty, just return */
++	if (!tsk)
++		return;
++
++	/* Process task list */
++	while (1) {
++		/* save next */
++		next = tsk->posix_timer_list;
++
++		/* run the task timers, clear its ptr and
++		 * unreference it
++		 */
++		__run_posix_cpu_timers(tsk);
++		tsk->posix_timer_list = NULL;
++		put_task_struct(tsk);
++
++		/* check if this is the last on the list */
++		if (next == tsk)
++			break;
++		tsk = next;
++	}
++}
++
++static inline int __fastpath_timer_check(struct task_struct *tsk)
++{
++	/* tsk == current, ensure it is safe to use ->signal/sighand */
++	if (unlikely(tsk->exit_state))
++		return 0;
++
++	if (!task_cputime_zero(&tsk->cputime_expires))
++			return 1;
++
++	if (!task_cputime_zero(&tsk->signal->cputime_expires))
++			return 1;
++
++	return 0;
++}
++
++void run_posix_cpu_timers(struct task_struct *tsk)
++{
++	unsigned int cpu = smp_processor_id();
++	struct task_struct *tasklist;
++
++	BUG_ON(!irqs_disabled());
++
++	if (per_cpu(posix_timer_th_active, cpu) != true)
++		return;
++
++	/* get per-cpu references */
++	tasklist = per_cpu(posix_timer_tasklist, cpu);
++
++	/* check to see if we're already queued */
++	if (!tsk->posix_timer_list && __fastpath_timer_check(tsk)) {
++		get_task_struct(tsk);
++		if (tasklist) {
++			tsk->posix_timer_list = tasklist;
++		} else {
++			/*
++			 * The list is terminated by a self-pointing
++			 * task_struct
++			 */
++			tsk->posix_timer_list = tsk;
++		}
++		per_cpu(posix_timer_tasklist, cpu) = tsk;
++
++		wake_up_process(per_cpu(posix_timer_task, cpu));
++	}
++}
++
++static int posix_cpu_kthread_should_run(unsigned int cpu)
++{
++	return __this_cpu_read(posix_timer_tasklist) != NULL;
++}
++
++static void posix_cpu_kthread_park(unsigned int cpu)
++{
++	this_cpu_write(posix_timer_th_active, false);
++}
++
++static void posix_cpu_kthread_unpark(unsigned int cpu)
++{
++	this_cpu_write(posix_timer_th_active, true);
++}
++
++static void posix_cpu_kthread_setup(unsigned int cpu)
++{
++	struct sched_param sp;
++
++	sp.sched_priority = MAX_RT_PRIO - 1;
++	sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
++	posix_cpu_kthread_unpark(cpu);
++}
++
++static struct smp_hotplug_thread posix_cpu_thread = {
++	.store			= &posix_timer_task,
++	.thread_should_run	= posix_cpu_kthread_should_run,
++	.thread_fn		= posix_cpu_kthread_fn,
++	.thread_comm		= "posixcputmr/%u",
++	.setup			= posix_cpu_kthread_setup,
++	.park			= posix_cpu_kthread_park,
++	.unpark			= posix_cpu_kthread_unpark,
++};
++
++static int __init posix_cpu_thread_init(void)
++{
++	/* Start one for boot CPU. */
++	unsigned long cpu;
++	int ret;
++
++	/* init the per-cpu posix_timer_tasklets */
++	for_each_possible_cpu(cpu)
++		per_cpu(posix_timer_tasklist, cpu) = NULL;
++
++	ret = smpboot_register_percpu_thread(&posix_cpu_thread);
++	WARN_ON(ret);
++
++	return 0;
++}
++early_initcall(posix_cpu_thread_init);
++#else /* CONFIG_PREEMPT_RT_BASE */
++void run_posix_cpu_timers(struct task_struct *tsk)
++{
++	__run_posix_cpu_timers(tsk);
++}
++#endif /* CONFIG_PREEMPT_RT_BASE */
++
+ /*
+  * Set one of the process-wide special case CPU timers or RLIMIT_CPU.
+  * The tsk->sighand->siglock must be held by the caller.
diff --git a/kernel/patches-4.14.x-rt/0191-sched-delay-put-task.patch b/kernel/patches-4.14.x-rt/0191-sched-delay-put-task.patch
new file mode 100644
index 000000000..5f8fcdb57
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0191-sched-delay-put-task.patch
@@ -0,0 +1,85 @@
+Subject: sched: Move task_struct cleanup to RCU
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 31 May 2011 16:59:16 +0200
+
+__put_task_struct() does quite some expensive work. We don't want to
+burden random tasks with that.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/sched.h      |    3 +++
+ include/linux/sched/task.h |   11 ++++++++++-
+ kernel/fork.c              |   15 ++++++++++++++-
+ 3 files changed, 27 insertions(+), 2 deletions(-)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1093,6 +1093,9 @@ struct task_struct {
+ 	unsigned int			sequential_io;
+ 	unsigned int			sequential_io_avg;
+ #endif
++#ifdef CONFIG_PREEMPT_RT_BASE
++	struct rcu_head			put_rcu;
++#endif
+ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
+ 	unsigned long			task_state_change;
+ #endif
+--- a/include/linux/sched/task.h
++++ b/include/linux/sched/task.h
+@@ -88,6 +88,15 @@ extern void sched_exec(void);
+ 
+ #define get_task_struct(tsk) do { atomic_inc(&(tsk)->usage); } while(0)
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++extern void __put_task_struct_cb(struct rcu_head *rhp);
++
++static inline void put_task_struct(struct task_struct *t)
++{
++	if (atomic_dec_and_test(&t->usage))
++		call_rcu(&t->put_rcu, __put_task_struct_cb);
++}
++#else
+ extern void __put_task_struct(struct task_struct *t);
+ 
+ static inline void put_task_struct(struct task_struct *t)
+@@ -95,7 +104,7 @@ static inline void put_task_struct(struc
+ 	if (atomic_dec_and_test(&t->usage))
+ 		__put_task_struct(t);
+ }
+-
++#endif
+ struct task_struct *task_rcu_dereference(struct task_struct **ptask);
+ 
+ #ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -408,7 +408,9 @@ static inline void put_signal_struct(str
+ 	if (atomic_dec_and_test(&sig->sigcnt))
+ 		free_signal_struct(sig);
+ }
+-
++#ifdef CONFIG_PREEMPT_RT_BASE
++static
++#endif
+ void __put_task_struct(struct task_struct *tsk)
+ {
+ 	WARN_ON(!tsk->exit_state);
+@@ -425,7 +427,18 @@ void __put_task_struct(struct task_struc
+ 	if (!profile_handoff_task(tsk))
+ 		free_task(tsk);
+ }
++#ifndef CONFIG_PREEMPT_RT_BASE
+ EXPORT_SYMBOL_GPL(__put_task_struct);
++#else
++void __put_task_struct_cb(struct rcu_head *rhp)
++{
++	struct task_struct *tsk = container_of(rhp, struct task_struct, put_rcu);
++
++	__put_task_struct(tsk);
++
++}
++EXPORT_SYMBOL_GPL(__put_task_struct_cb);
++#endif
+ 
+ void __init __weak arch_task_cache_init(void) { }
+ 
diff --git a/kernel/patches-4.14.x-rt/0192-sched-limit-nr-migrate.patch b/kernel/patches-4.14.x-rt/0192-sched-limit-nr-migrate.patch
new file mode 100644
index 000000000..18bdc4601
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0192-sched-limit-nr-migrate.patch
@@ -0,0 +1,26 @@
+Subject: sched: Limit the number of task migrations per batch
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 06 Jun 2011 12:12:51 +0200
+
+Put an upper limit on the number of tasks which are migrated per batch
+to avoid large latencies.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/sched/core.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -59,7 +59,11 @@ const_debug unsigned int sysctl_sched_fe
+  * Number of tasks to iterate in a single balance run.
+  * Limited because this is done with IRQs disabled.
+  */
++#ifndef CONFIG_PREEMPT_RT_FULL
+ const_debug unsigned int sysctl_sched_nr_migrate = 32;
++#else
++const_debug unsigned int sysctl_sched_nr_migrate = 8;
++#endif
+ 
+ /*
+  * period over which we average the RT time consumption, measured
diff --git a/kernel/patches-4.14.x-rt/0193-sched-mmdrop-delayed.patch b/kernel/patches-4.14.x-rt/0193-sched-mmdrop-delayed.patch
new file mode 100644
index 000000000..460a73ad1
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0193-sched-mmdrop-delayed.patch
@@ -0,0 +1,127 @@
+Subject: sched: Move mmdrop to RCU on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 06 Jun 2011 12:20:33 +0200
+
+Takes sleeping locks and calls into the memory allocator, so nothing
+we want to do in task switch and oder atomic contexts.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/mm_types.h |    4 ++++
+ include/linux/sched/mm.h |   11 +++++++++++
+ kernel/fork.c            |   13 +++++++++++++
+ kernel/sched/core.c      |   19 +++++++++++++++++--
+ 4 files changed, 45 insertions(+), 2 deletions(-)
+
+--- a/include/linux/mm_types.h
++++ b/include/linux/mm_types.h
+@@ -12,6 +12,7 @@
+ #include <linux/completion.h>
+ #include <linux/cpumask.h>
+ #include <linux/uprobes.h>
++#include <linux/rcupdate.h>
+ #include <linux/page-flags-layout.h>
+ #include <linux/workqueue.h>
+ 
+@@ -504,6 +505,9 @@ struct mm_struct {
+ 	bool tlb_flush_batched;
+ #endif
+ 	struct uprobes_state uprobes_state;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	struct rcu_head delayed_drop;
++#endif
+ #ifdef CONFIG_HUGETLB_PAGE
+ 	atomic_long_t hugetlb_usage;
+ #endif
+--- a/include/linux/sched/mm.h
++++ b/include/linux/sched/mm.h
+@@ -43,6 +43,17 @@ static inline void mmdrop(struct mm_stru
+ 		__mmdrop(mm);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++extern void __mmdrop_delayed(struct rcu_head *rhp);
++static inline void mmdrop_delayed(struct mm_struct *mm)
++{
++	if (atomic_dec_and_test(&mm->mm_count))
++		call_rcu(&mm->delayed_drop, __mmdrop_delayed);
++}
++#else
++# define mmdrop_delayed(mm)	mmdrop(mm)
++#endif
++
+ static inline void mmdrop_async_fn(struct work_struct *work)
+ {
+ 	struct mm_struct *mm = container_of(work, struct mm_struct, async_put_work);
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -930,6 +930,19 @@ void __mmdrop(struct mm_struct *mm)
+ }
+ EXPORT_SYMBOL_GPL(__mmdrop);
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++/*
++ * RCU callback for delayed mm drop. Not strictly rcu, but we don't
++ * want another facility to make this work.
++ */
++void __mmdrop_delayed(struct rcu_head *rhp)
++{
++	struct mm_struct *mm = container_of(rhp, struct mm_struct, delayed_drop);
++
++	__mmdrop(mm);
++}
++#endif
++
+ static inline void __mmput(struct mm_struct *mm)
+ {
+ 	VM_BUG_ON(atomic_read(&mm->mm_users));
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -2695,8 +2695,12 @@ static struct rq *finish_task_switch(str
+ 	finish_arch_post_lock_switch();
+ 
+ 	fire_sched_in_preempt_notifiers(current);
++	/*
++	 * We use mmdrop_delayed() here so we don't have to do the
++	 * full __mmdrop() when we are the last user.
++	 */
+ 	if (mm)
+-		mmdrop(mm);
++		mmdrop_delayed(mm);
+ 	if (unlikely(prev_state == TASK_DEAD)) {
+ 		if (prev->sched_class->task_dead)
+ 			prev->sched_class->task_dead(prev);
+@@ -5433,6 +5437,8 @@ void sched_setnuma(struct task_struct *p
+ #endif /* CONFIG_NUMA_BALANCING */
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
++static DEFINE_PER_CPU(struct mm_struct *, idle_last_mm);
++
+ /*
+  * Ensure that the idle task is using init_mm right before its CPU goes
+  * offline.
+@@ -5447,7 +5453,12 @@ void idle_task_exit(void)
+ 		switch_mm(mm, &init_mm, current);
+ 		finish_arch_post_lock_switch();
+ 	}
+-	mmdrop(mm);
++	/*
++	 * Defer the cleanup to an alive cpu. On RT we can neither
++	 * call mmdrop() nor mmdrop_delayed() from here.
++	 */
++	per_cpu(idle_last_mm, smp_processor_id()) = mm;
++
+ }
+ 
+ /*
+@@ -5750,6 +5761,10 @@ int sched_cpu_dying(unsigned int cpu)
+ 	update_max_interval();
+ 	nohz_balance_exit_idle(cpu);
+ 	hrtick_clear(rq);
++	if (per_cpu(idle_last_mm, cpu)) {
++		mmdrop_delayed(per_cpu(idle_last_mm, cpu));
++		per_cpu(idle_last_mm, cpu) = NULL;
++	}
+ 	return 0;
+ }
+ #endif
diff --git a/kernel/patches-4.14.x-rt/0194-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch b/kernel/patches-4.14.x-rt/0194-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch
new file mode 100644
index 000000000..94b0c11ee
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0194-kernel-sched-move-stack-kprobe-clean-up-to-__put_tas.patch
@@ -0,0 +1,60 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 21 Nov 2016 19:31:08 +0100
+Subject: [PATCH] kernel/sched: move stack + kprobe clean up to
+ __put_task_struct()
+
+There is no need to free the stack before the task struct. This also
+comes handy on -RT because we can't free memory in preempt disabled
+region.
+
+Cc: stable-rt@vger.kernel.org #for kprobe_flush_task()
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/fork.c       |   10 ++++++++++
+ kernel/sched/core.c |    9 ---------
+ 2 files changed, 10 insertions(+), 9 deletions(-)
+
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -40,6 +40,7 @@
+ #include <linux/hmm.h>
+ #include <linux/fs.h>
+ #include <linux/mm.h>
++#include <linux/kprobes.h>
+ #include <linux/vmacache.h>
+ #include <linux/nsproxy.h>
+ #include <linux/capability.h>
+@@ -417,6 +418,15 @@ void __put_task_struct(struct task_struc
+ 	WARN_ON(atomic_read(&tsk->usage));
+ 	WARN_ON(tsk == current);
+ 
++	/*
++	 * Remove function-return probe instances associated with this
++	 * task and put them back on the free list.
++	 */
++	kprobe_flush_task(tsk);
++
++	/* Task is done with its stack. */
++	put_task_stack(tsk);
++
+ 	cgroup_free(tsk);
+ 	task_numa_free(tsk);
+ 	security_task_free(tsk);
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -2705,15 +2705,6 @@ static struct rq *finish_task_switch(str
+ 		if (prev->sched_class->task_dead)
+ 			prev->sched_class->task_dead(prev);
+ 
+-		/*
+-		 * Remove function-return probe instances associated with this
+-		 * task and put them back on the free list.
+-		 */
+-		kprobe_flush_task(prev);
+-
+-		/* Task is done with its stack. */
+-		put_task_stack(prev);
+-
+ 		put_task_struct(prev);
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0195-sched-rt-mutex-wakeup.patch b/kernel/patches-4.14.x-rt/0195-sched-rt-mutex-wakeup.patch
new file mode 100644
index 000000000..114b1ed2d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0195-sched-rt-mutex-wakeup.patch
@@ -0,0 +1,94 @@
+Subject: sched: Add saved_state for tasks blocked on sleeping locks
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 25 Jun 2011 09:21:04 +0200
+
+Spinlocks are state preserving in !RT. RT changes the state when a
+task gets blocked on a lock. So we need to remember the state before
+the lock contention. If a regular wakeup (not a RTmutex related
+wakeup) happens, the saved_state is updated to running. When the lock
+sleep is done, the saved state is restored.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/sched.h |    3 +++
+ kernel/sched/core.c   |   31 ++++++++++++++++++++++++++++++-
+ kernel/sched/sched.h  |    1 +
+ 3 files changed, 34 insertions(+), 1 deletion(-)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -526,6 +526,8 @@ struct task_struct {
+ #endif
+ 	/* -1 unrunnable, 0 runnable, >0 stopped: */
+ 	volatile long			state;
++	/* saved state for "spinlock sleepers" */
++	volatile long			saved_state;
+ 
+ 	/*
+ 	 * This begins the randomizable portion of task_struct. Only
+@@ -1507,6 +1509,7 @@ extern struct task_struct *find_task_by_
+ 
+ extern int wake_up_state(struct task_struct *tsk, unsigned int state);
+ extern int wake_up_process(struct task_struct *tsk);
++extern int wake_up_lock_sleeper(struct task_struct *tsk);
+ extern void wake_up_new_task(struct task_struct *tsk);
+ 
+ #ifdef CONFIG_SMP
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -2015,8 +2015,25 @@ try_to_wake_up(struct task_struct *p, un
+ 	 */
+ 	raw_spin_lock_irqsave(&p->pi_lock, flags);
+ 	smp_mb__after_spinlock();
+-	if (!(p->state & state))
++	if (!(p->state & state)) {
++		/*
++		 * The task might be running due to a spinlock sleeper
++		 * wakeup. Check the saved state and set it to running
++		 * if the wakeup condition is true.
++		 */
++		if (!(wake_flags & WF_LOCK_SLEEPER)) {
++			if (p->saved_state & state)
++				p->saved_state = TASK_RUNNING;
++		}
+ 		goto out;
++	}
++
++	/*
++	 * If this is a regular wakeup, then we can unconditionally
++	 * clear the saved state of a "lock sleeper".
++	 */
++	if (!(wake_flags & WF_LOCK_SLEEPER))
++		p->saved_state = TASK_RUNNING;
+ 
+ 	trace_sched_waking(p);
+ 
+@@ -2180,6 +2197,18 @@ int wake_up_process(struct task_struct *
+ }
+ EXPORT_SYMBOL(wake_up_process);
+ 
++/**
++ * wake_up_lock_sleeper - Wake up a specific process blocked on a "sleeping lock"
++ * @p: The process to be woken up.
++ *
++ * Same as wake_up_process() above, but wake_flags=WF_LOCK_SLEEPER to indicate
++ * the nature of the wakeup.
++ */
++int wake_up_lock_sleeper(struct task_struct *p)
++{
++	return try_to_wake_up(p, TASK_ALL, WF_LOCK_SLEEPER);
++}
++
+ int wake_up_state(struct task_struct *p, unsigned int state)
+ {
+ 	return try_to_wake_up(p, state, 0);
+--- a/kernel/sched/sched.h
++++ b/kernel/sched/sched.h
+@@ -1352,6 +1352,7 @@ static inline void finish_lock_switch(st
+ #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 */
++#define WF_LOCK_SLEEPER	0x08		/* wakeup spinlock "sleeper" */
+ 
+ /*
+  * To aid in avoiding the subversion of "niceness" due to uneven distribution
diff --git a/kernel/patches-4.14.x-rt/0196-sched-Prevent-task-state-corruption-by-spurious-lock.patch b/kernel/patches-4.14.x-rt/0196-sched-Prevent-task-state-corruption-by-spurious-lock.patch
new file mode 100644
index 000000000..f505d221e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0196-sched-Prevent-task-state-corruption-by-spurious-lock.patch
@@ -0,0 +1,77 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 6 Jun 2017 14:20:37 +0200
+Subject: sched: Prevent task state corruption by spurious lock wakeup
+
+Mathias and others reported GDB failures on RT.
+
+The following scenario leads to task state corruption:
+
+CPU0						CPU1
+
+T1->state = TASK_XXX;
+spin_lock(&lock)
+  rt_spin_lock_slowlock(&lock->rtmutex)
+    raw_spin_lock(&rtm->wait_lock);
+    T1->saved_state = current->state;
+    T1->state = TASK_UNINTERRUPTIBLE;
+						spin_unlock(&lock)
+    task_blocks_on_rt_mutex(rtm)  		  rt_spin_lock_slowunlock(&lock->rtmutex)
+      queue_waiter(rtm)				    raw_spin_lock(&rtm->wait_lock);
+      pi_chain_walk(rtm)
+        raw_spin_unlock(&rtm->wait_lock);
+						    wake_top_waiter(T1)
+
+      raw_spin_lock(&rtm->wait_lock);
+
+    for (;;) {
+      if (__try_to_take_rt_mutex())  <- Succeeds
+        break;
+      ...
+    }
+
+    T1->state = T1->saved_state;
+						     try_to_wake_up(T1)
+						       ttwu_do_wakeup(T1)
+						         T1->state = TASK_RUNNING;
+
+In most cases this is harmless because waiting for some event, which is the
+usual reason for TASK_[UN]INTERRUPTIBLE has to be safe against other forms
+of spurious wakeups anyway.
+
+But in case of TASK_TRACED this is actually fatal, because the task loses
+the TASK_TRACED state. In consequence it fails to consume SIGSTOP which was
+sent from the debugger and actually delivers SIGSTOP to the task which
+breaks the ptrace mechanics and brings the debugger into an unexpected
+state.
+
+The TASK_TRACED state should prevent getting there due to the state
+matching logic in try_to_wake_up(). But that's not true because
+wake_up_lock_sleeper() uses TASK_ALL as state mask. That's bogus because
+lock sleepers always use TASK_UNINTERRUPTIBLE, so the wakeup should use
+that as well.
+
+The cure is way simpler as figuring it out:
+
+Change the mask used in wake_up_lock_sleeper() from TASK_ALL to
+TASK_UNINTERRUPTIBLE.
+
+Cc: stable-rt@vger.kernel.org
+Reported-by: Mathias Koehrer <mathias.koehrer@etas.com>
+Reported-by: David Hauck <davidh@netacquire.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/sched/core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -2206,7 +2206,7 @@ EXPORT_SYMBOL(wake_up_process);
+  */
+ 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)
diff --git a/kernel/patches-4.14.x-rt/0197-sched-Remove-TASK_ALL.patch b/kernel/patches-4.14.x-rt/0197-sched-Remove-TASK_ALL.patch
new file mode 100644
index 000000000..4844fb7e9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0197-sched-Remove-TASK_ALL.patch
@@ -0,0 +1,29 @@
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Wed, 7 Jun 2017 10:12:45 +0200
+Subject: [PATCH] sched: Remove TASK_ALL
+
+It's unused:
+
+$ git grep "\<TASK_ALL\>" | wc -l
+1
+
+And dangerous, kill the bugger.
+
+Cc: stable-rt@vger.kernel.org
+Acked-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/sched.h |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -93,7 +93,6 @@ struct task_group;
+ 
+ /* 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 | \
diff --git a/kernel/patches-4.14.x-rt/0198-sched-might-sleep-do-not-account-rcu-depth.patch b/kernel/patches-4.14.x-rt/0198-sched-might-sleep-do-not-account-rcu-depth.patch
new file mode 100644
index 000000000..8d9175cbc
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0198-sched-might-sleep-do-not-account-rcu-depth.patch
@@ -0,0 +1,47 @@
+Subject: sched: Do not account rcu_preempt_depth on RT in might_sleep()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 07 Jun 2011 09:19:06 +0200
+
+RT changes the rcu_preempt_depth semantics, so we cannot check for it
+in might_sleep().
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/rcupdate.h |    7 +++++++
+ kernel/sched/core.c      |    2 +-
+ 2 files changed, 8 insertions(+), 1 deletion(-)
+
+--- a/include/linux/rcupdate.h
++++ b/include/linux/rcupdate.h
+@@ -74,6 +74,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)
++#ifndef CONFIG_PREEMPT_RT_FULL
++#define sched_rcu_preempt_depth()	rcu_preempt_depth()
++#else
++static inline int sched_rcu_preempt_depth(void) { return 0; }
++#endif
+ 
+ #else /* #ifdef CONFIG_PREEMPT_RCU */
+ 
+@@ -99,6 +104,8 @@ static inline int rcu_preempt_depth(void
+ 	return 0;
+ }
+ 
++#define sched_rcu_preempt_depth()	rcu_preempt_depth()
++
+ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
+ 
+ /* Internal to kernel */
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -6049,7 +6049,7 @@ void __init sched_init(void)
+ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
+ static inline int preempt_count_equals(int preempt_offset)
+ {
+-	int nested = preempt_count() + rcu_preempt_depth();
++	int nested = preempt_count() + sched_rcu_preempt_depth();
+ 
+ 	return (nested == preempt_offset);
+ }
diff --git a/kernel/patches-4.14.x-rt/0199-cond-resched-softirq-rt.patch b/kernel/patches-4.14.x-rt/0199-cond-resched-softirq-rt.patch
new file mode 100644
index 000000000..db2854e25
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0199-cond-resched-softirq-rt.patch
@@ -0,0 +1,52 @@
+Subject: sched: Take RT softirq semantics into account in cond_resched()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 14 Jul 2011 09:56:44 +0200
+
+The softirq semantics work different on -RT. There is no SOFTIRQ_MASK in
+the preemption counter which leads to the BUG_ON() statement in
+__cond_resched_softirq(). As for -RT it is enough to perform a "normal"
+schedule.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/sched.h |    4 ++++
+ kernel/sched/core.c   |    2 ++
+ 2 files changed, 6 insertions(+)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1606,12 +1606,16 @@ extern int __cond_resched_lock(spinlock_
+ 	__cond_resched_lock(lock);				\
+ })
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ extern int __cond_resched_softirq(void);
+ 
+ #define cond_resched_softirq() ({					\
+ 	___might_sleep(__FILE__, __LINE__, SOFTIRQ_DISABLE_OFFSET);	\
+ 	__cond_resched_softirq();					\
+ })
++#else
++# define cond_resched_softirq()		cond_resched()
++#endif
+ 
+ static inline void cond_resched_rcu(void)
+ {
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -4945,6 +4945,7 @@ int __cond_resched_lock(spinlock_t *lock
+ }
+ EXPORT_SYMBOL(__cond_resched_lock);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ int __sched __cond_resched_softirq(void)
+ {
+ 	BUG_ON(!in_softirq());
+@@ -4958,6 +4959,7 @@ int __sched __cond_resched_softirq(void)
+ 	return 0;
+ }
+ EXPORT_SYMBOL(__cond_resched_softirq);
++#endif
+ 
+ /**
+  * yield - yield the current processor to other threads.
diff --git a/kernel/patches-4.14.x-rt/0200-cond-resched-lock-rt-tweak.patch b/kernel/patches-4.14.x-rt/0200-cond-resched-lock-rt-tweak.patch
new file mode 100644
index 000000000..c3caef32f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0200-cond-resched-lock-rt-tweak.patch
@@ -0,0 +1,26 @@
+Subject: sched: Use the proper LOCK_OFFSET for cond_resched()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 17 Jul 2011 22:51:33 +0200
+
+RT does not increment preempt count when a 'sleeping' spinlock is
+locked. Update PREEMPT_LOCK_OFFSET for that case.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/preempt.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -118,7 +118,11 @@
+ /*
+  * The preempt_count offset after spin_lock()
+  */
++#if !defined(CONFIG_PREEMPT_RT_FULL)
+ #define PREEMPT_LOCK_OFFSET	PREEMPT_DISABLE_OFFSET
++#else
++#define PREEMPT_LOCK_OFFSET	0
++#endif
+ 
+ /*
+  * The preempt_count offset needed for things like:
diff --git a/kernel/patches-4.14.x-rt/0201-sched-disable-ttwu-queue.patch b/kernel/patches-4.14.x-rt/0201-sched-disable-ttwu-queue.patch
new file mode 100644
index 000000000..95221e680
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0201-sched-disable-ttwu-queue.patch
@@ -0,0 +1,31 @@
+Subject: sched: Disable TTWU_QUEUE on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 13 Sep 2011 16:42:35 +0200
+
+The queued remote wakeup mechanism can introduce rather large
+latencies if the number of migrated tasks is high. Disable it for RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/sched/features.h |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/kernel/sched/features.h
++++ b/kernel/sched/features.h
+@@ -46,11 +46,16 @@ SCHED_FEAT(LB_BIAS, true)
+  */
+ SCHED_FEAT(NONTASK_CAPACITY, true)
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++SCHED_FEAT(TTWU_QUEUE, false)
++#else
++
+ /*
+  * Queue remote wakeups on the target CPU and process them
+  * using the scheduler IPI. Reduces rq->lock contention/bounces.
+  */
+ SCHED_FEAT(TTWU_QUEUE, true)
++#endif
+ 
+ /*
+  * When doing wakeups, attempt to limit superfluous scans of the LLC domain.
diff --git a/kernel/patches-4.14.x-rt/0202-sched-disable-rt-group-sched-on-rt.patch b/kernel/patches-4.14.x-rt/0202-sched-disable-rt-group-sched-on-rt.patch
new file mode 100644
index 000000000..b99d7c6fb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0202-sched-disable-rt-group-sched-on-rt.patch
@@ -0,0 +1,28 @@
+Subject: sched: Disable CONFIG_RT_GROUP_SCHED on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 18 Jul 2011 17:03:52 +0200
+
+Carsten reported problems when running:
+
+  taskset 01 chrt -f 1 sleep 1
+
+from within rc.local on a F15 machine. The task stays running and
+never gets on the run queue because some of the run queues have
+rt_throttled=1 which does not go away. Works nice from a ssh login
+shell. Disabling CONFIG_RT_GROUP_SCHED solves that as well.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ init/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/init/Kconfig
++++ b/init/Kconfig
+@@ -744,6 +744,7 @@ config CFS_BANDWIDTH
+ config RT_GROUP_SCHED
+ 	bool "Group scheduling for SCHED_RR/FIFO"
+ 	depends on CGROUP_SCHED
++	depends on !PREEMPT_RT_FULL
+ 	default n
+ 	help
+ 	  This feature lets you explicitly allocate real CPU bandwidth
diff --git a/kernel/patches-4.14.x-rt/0203-sched-ttwu-ensure-success-return-is-correct.patch b/kernel/patches-4.14.x-rt/0203-sched-ttwu-ensure-success-return-is-correct.patch
new file mode 100644
index 000000000..ba04c81fd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0203-sched-ttwu-ensure-success-return-is-correct.patch
@@ -0,0 +1,34 @@
+Subject: sched: ttwu: Return success when only changing the saved_state value
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 13 Dec 2011 21:42:19 +0100
+
+When a task blocks on a rt lock, it saves the current state in
+p->saved_state, so a lock related wake up will not destroy the
+original state.
+
+When a real wakeup happens, while the task is running due to a lock
+wakeup already, we update p->saved_state to TASK_RUNNING, but we do
+not return success, which might cause another wakeup in the waitqueue
+code and the task remains in the waitqueue list. Return success in
+that case as well.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/sched/core.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -2022,8 +2022,10 @@ try_to_wake_up(struct task_struct *p, un
+ 		 * if the wakeup condition is true.
+ 		 */
+ 		if (!(wake_flags & WF_LOCK_SLEEPER)) {
+-			if (p->saved_state & state)
++			if (p->saved_state & state) {
+ 				p->saved_state = TASK_RUNNING;
++				success = 1;
++			}
+ 		}
+ 		goto out;
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0204-sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch b/kernel/patches-4.14.x-rt/0204-sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch
new file mode 100644
index 000000000..aaa80817e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0204-sched-workqueue-Only-wake-up-idle-workers-if-not-blo.patch
@@ -0,0 +1,37 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Mon, 18 Mar 2013 15:12:49 -0400
+Subject: sched/workqueue: Only wake up idle workers if not blocked on sleeping spin lock
+
+In -rt, most spin_locks() turn into mutexes. One of these spin_lock
+conversions is performed on the workqueue gcwq->lock. When the idle
+worker is worken, the first thing it will do is grab that same lock and
+it too will block, possibly jumping into the same code, but because
+nr_running would already be decremented it prevents an infinite loop.
+
+But this is still a waste of CPU cycles, and it doesn't follow the method
+of mainline, as new workers should only be woken when a worker thread is
+truly going to sleep, and not just blocked on a spin_lock().
+
+Check the saved_state too before waking up new workers.
+
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/sched/core.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -3387,8 +3387,10 @@ static void __sched notrace __schedule(b
+ 			 * If a worker went to sleep, notify and ask workqueue
+ 			 * whether it wants to wake up a task to maintain
+ 			 * concurrency.
++			 * Only call wake up if prev isn't blocked on a sleeping
++			 * spin lock.
+ 			 */
+-			if (prev->flags & PF_WQ_WORKER) {
++			if (prev->flags & PF_WQ_WORKER && !prev->saved_state) {
+ 				struct task_struct *to_wakeup;
+ 
+ 				to_wakeup = wq_worker_sleeping(prev);
diff --git a/kernel/patches-4.14.x-rt/0205-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch b/kernel/patches-4.14.x-rt/0205-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch
new file mode 100644
index 000000000..6dbb90f1f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0205-rt-Increase-decrease-the-nr-of-migratory-tasks-when-.patch
@@ -0,0 +1,154 @@
+From: Daniel Bristot de Oliveira <bristot@redhat.com>
+Date: Mon, 26 Jun 2017 17:07:15 +0200
+Subject: rt: Increase/decrease the nr of migratory tasks when enabling/disabling migration
+
+There is a problem in the migrate_disable()/enable() implementation
+regarding the number of migratory tasks in the rt/dl RQs. The problem
+is the following:
+
+When a task is attached to the rt runqueue, it is checked if it either
+can run in more than one CPU, or if it is with migration disable. If
+either check is true, the rt_rq->rt_nr_migratory counter is not
+increased. The counter increases otherwise.
+
+When the task is detached, the same check is done. If either check is
+true, the rt_rq->rt_nr_migratory counter is not decreased. The counter
+decreases otherwise. The same check is done in the dl scheduler.
+
+One important thing is that, migrate disable/enable does not touch this
+counter for tasks attached to the rt rq. So suppose the following chain
+of events.
+
+Assumptions:
+Task A is the only runnable task in A      Task B runs on the CPU B
+Task A runs on CFS (non-rt)                Task B has RT priority
+Thus, rt_nr_migratory is 0                 B is running
+Task A can run on all CPUS.
+
+Timeline:
+        CPU A/TASK A                        CPU B/TASK B
+A takes the rt mutex X                           .
+A disables migration                             .
+           .                          B tries to take the rt mutex X
+           .                          As it is held by A {
+           .                            A inherits the rt priority of B
+           .                            A is dequeued from CFS RQ of CPU A
+           .                            A is enqueued in the RT RQ of CPU A
+           .                            As migration is disabled
+           .                              rt_nr_migratory in A is not increased
+           .
+A enables migration
+A releases the rt mutex X {
+  A returns to its original priority
+  A ask to be dequeued from RT RQ {
+    As migration is now enabled and it can run on all CPUS {
+       rt_nr_migratory should be decreased
+       As rt_nr_migratory is 0, rt_nr_migratory under flows
+    }
+}
+
+This variable is important because it notifies if there are more than one
+runnable & migratory task in the runqueue. If there are more than one
+tasks, the rt_rq is set as overloaded, and then tries to migrate some
+tasks. This rule is important to keep the scheduler working conserving,
+that is, in a system with M CPUs, the M highest priority tasks should be
+running.
+
+As rt_nr_migratory is unsigned, it will become > 0, notifying that the
+RQ is overloaded, activating pushing mechanism without need.
+
+This patch fixes this problem by decreasing/increasing the
+rt/dl_nr_migratory in the migrate disable/enable operations.
+
+Reported-by: Pei Zhang <pezhang@redhat.com>
+Reported-by: Luiz Capitulino <lcapitulino@redhat.com>
+Signed-off-by: Daniel Bristot de Oliveira <bristot@redhat.com>
+Cc: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
+Cc: Clark Williams <williams@redhat.com>
+Cc: Luiz Capitulino <lcapitulino@redhat.com>
+Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Ingo Molnar <mingo@kernel.org>
+Cc: LKML <linux-kernel@vger.kernel.org>
+Cc: linux-rt-users <linux-rt-users@vger.kernel.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/sched/core.c |   49 ++++++++++++++++++++++++++++++++++++++++++++-----
+ 1 file changed, 44 insertions(+), 5 deletions(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -6850,6 +6850,47 @@ const u32 sched_prio_to_wmult[40] = {
+ 
+ #if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
+ 
++static inline void
++update_nr_migratory(struct task_struct *p, long delta)
++{
++	if (unlikely((p->sched_class == &rt_sched_class ||
++		      p->sched_class == &dl_sched_class) &&
++		      p->nr_cpus_allowed > 1)) {
++		if (p->sched_class == &rt_sched_class)
++			task_rq(p)->rt.rt_nr_migratory += delta;
++		else
++			task_rq(p)->dl.dl_nr_migratory += delta;
++	}
++}
++
++static inline void
++migrate_disable_update_cpus_allowed(struct task_struct *p)
++{
++	struct rq *rq;
++	struct rq_flags rf;
++
++	p->cpus_ptr = cpumask_of(smp_processor_id());
++
++	rq = task_rq_lock(p, &rf);
++	update_nr_migratory(p, -1);
++	p->nr_cpus_allowed = 1;
++	task_rq_unlock(rq, p, &rf);
++}
++
++static inline void
++migrate_enable_update_cpus_allowed(struct task_struct *p)
++{
++	struct rq *rq;
++	struct rq_flags rf;
++
++	p->cpus_ptr = &p->cpus_mask;
++
++	rq = task_rq_lock(p, &rf);
++	p->nr_cpus_allowed = cpumask_weight(&p->cpus_mask);
++	update_nr_migratory(p, 1);
++	task_rq_unlock(rq, p, &rf);
++}
++
+ void migrate_disable(void)
+ {
+ 	struct task_struct *p = current;
+@@ -6873,10 +6914,9 @@ void migrate_disable(void)
+ 	}
+ 
+ 	preempt_disable();
+-	p->migrate_disable = 1;
+ 
+-	p->cpus_ptr = cpumask_of(smp_processor_id());
+-	p->nr_cpus_allowed = 1;
++	migrate_disable_update_cpus_allowed(p);
++	p->migrate_disable = 1;
+ 
+ 	preempt_enable();
+ }
+@@ -6908,9 +6948,8 @@ void migrate_enable(void)
+ 
+ 	preempt_disable();
+ 
+-	p->cpus_ptr = &p->cpus_mask;
+-	p->nr_cpus_allowed = cpumask_weight(&p->cpus_mask);
+ 	p->migrate_disable = 0;
++	migrate_enable_update_cpus_allowed(p);
+ 
+ 	if (p->migrate_disable_update) {
+ 		struct rq *rq;
diff --git a/kernel/patches-4.14.x-rt/0206-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch b/kernel/patches-4.14.x-rt/0206-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch
new file mode 100644
index 000000000..3f0172962
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0206-stop_machine-convert-stop_machine_run-to-PREEMPT_RT.patch
@@ -0,0 +1,34 @@
+From: Ingo Molnar <mingo@elte.hu>
+Date: Fri, 3 Jul 2009 08:30:27 -0500
+Subject: stop_machine: convert stop_machine_run() to PREEMPT_RT
+
+Instead of playing with non-preemption, introduce explicit
+startup serialization. This is more robust and cleaner as
+well.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+[bigeasy: XXX: stopper_lock -> stop_cpus_lock]
+---
+ kernel/stop_machine.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/kernel/stop_machine.c
++++ b/kernel/stop_machine.c
+@@ -475,6 +475,16 @@ static void cpu_stopper_thread(unsigned
+ 		struct cpu_stop_done *done = work->done;
+ 		int ret;
+ 
++		/*
++		 * Wait until the stopper finished scheduling on all
++		 * cpus
++		 */
++		lg_global_lock(&stop_cpus_lock);
++		/*
++		 * Let other cpu threads continue as well
++		 */
++		lg_global_unlock(&stop_cpus_lock);
++
+ 		/* cpu stop callbacks must not sleep, make in_atomic() == T */
+ 		preempt_count_inc();
+ 		ret = fn(arg);
diff --git a/kernel/patches-4.14.x-rt/0207-stop-machine-raw-lock.patch b/kernel/patches-4.14.x-rt/0207-stop-machine-raw-lock.patch
new file mode 100644
index 000000000..412d5bc41
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0207-stop-machine-raw-lock.patch
@@ -0,0 +1,115 @@
+Subject: stop_machine: Use raw spinlocks
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 29 Jun 2011 11:01:51 +0200
+
+Use raw-locks in stomp_machine() to allow locking in irq-off regions.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/stop_machine.c |   34 +++++++++++++---------------------
+ 1 file changed, 13 insertions(+), 21 deletions(-)
+
+--- 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;
+ 
+-	spinlock_t		lock;
++	raw_spinlock_t		lock;
+ 	bool			enabled;	/* is this stopper enabled? */
+ 	struct list_head	works;		/* list of pending works */
+ 
+@@ -78,14 +78,14 @@ static bool cpu_stop_queue_work(unsigned
+ 	unsigned long flags;
+ 	bool enabled;
+ 
+-	spin_lock_irqsave(&stopper->lock, flags);
++	raw_spin_lock_irqsave(&stopper->lock, flags);
+ 	enabled = stopper->enabled;
+ 	if (enabled)
+ 		__cpu_stop_queue_work(stopper, work);
+ 	else if (work->done)
+ 		cpu_stop_signal_done(work->done);
+-	spin_unlock_irqrestore(&stopper->lock, flags);
+ 
++	raw_spin_unlock_irqrestore(&stopper->lock, flags);
+ 	return enabled;
+ }
+ 
+@@ -231,8 +231,8 @@ static int cpu_stop_queue_two_works(int
+ 	struct cpu_stopper *stopper2 = per_cpu_ptr(&cpu_stopper, cpu2);
+ 	int err;
+ retry:
+-	spin_lock_irq(&stopper1->lock);
+-	spin_lock_nested(&stopper2->lock, SINGLE_DEPTH_NESTING);
++	raw_spin_lock_irq(&stopper1->lock);
++	raw_spin_lock_nested(&stopper2->lock, SINGLE_DEPTH_NESTING);
+ 
+ 	err = -ENOENT;
+ 	if (!stopper1->enabled || !stopper2->enabled)
+@@ -255,8 +255,8 @@ static int cpu_stop_queue_two_works(int
+ 	__cpu_stop_queue_work(stopper1, work1);
+ 	__cpu_stop_queue_work(stopper2, work2);
+ unlock:
+-	spin_unlock(&stopper2->lock);
+-	spin_unlock_irq(&stopper1->lock);
++	raw_spin_unlock(&stopper2->lock);
++	raw_spin_unlock_irq(&stopper1->lock);
+ 
+ 	if (unlikely(err == -EDEADLK)) {
+ 		while (stop_cpus_in_progress)
+@@ -448,9 +448,9 @@ static int cpu_stop_should_run(unsigned
+ 	unsigned long flags;
+ 	int run;
+ 
+-	spin_lock_irqsave(&stopper->lock, flags);
++	raw_spin_lock_irqsave(&stopper->lock, flags);
+ 	run = !list_empty(&stopper->works);
+-	spin_unlock_irqrestore(&stopper->lock, flags);
++	raw_spin_unlock_irqrestore(&stopper->lock, flags);
+ 	return run;
+ }
+ 
+@@ -461,13 +461,13 @@ static void cpu_stopper_thread(unsigned
+ 
+ repeat:
+ 	work = NULL;
+-	spin_lock_irq(&stopper->lock);
++	raw_spin_lock_irq(&stopper->lock);
+ 	if (!list_empty(&stopper->works)) {
+ 		work = list_first_entry(&stopper->works,
+ 					struct cpu_stop_work, list);
+ 		list_del_init(&work->list);
+ 	}
+-	spin_unlock_irq(&stopper->lock);
++	raw_spin_unlock_irq(&stopper->lock);
+ 
+ 	if (work) {
+ 		cpu_stop_fn_t fn = work->fn;
+@@ -475,15 +475,7 @@ static void cpu_stopper_thread(unsigned
+ 		struct cpu_stop_done *done = work->done;
+ 		int ret;
+ 
+-		/*
+-		 * Wait until the stopper finished scheduling on all
+-		 * cpus
+-		 */
+-		lg_global_lock(&stop_cpus_lock);
+-		/*
+-		 * Let other cpu threads continue as well
+-		 */
+-		lg_global_unlock(&stop_cpus_lock);
++		/* XXX */
+ 
+ 		/* cpu stop callbacks must not sleep, make in_atomic() == T */
+ 		preempt_count_inc();
+@@ -551,7 +543,7 @@ static int __init cpu_stop_init(void)
+ 	for_each_possible_cpu(cpu) {
+ 		struct cpu_stopper *stopper = &per_cpu(cpu_stopper, cpu);
+ 
+-		spin_lock_init(&stopper->lock);
++		raw_spin_lock_init(&stopper->lock);
+ 		INIT_LIST_HEAD(&stopper->works);
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0208-hotplug-light-get-online-cpus.patch b/kernel/patches-4.14.x-rt/0208-hotplug-light-get-online-cpus.patch
new file mode 100644
index 000000000..bd8b9f91d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0208-hotplug-light-get-online-cpus.patch
@@ -0,0 +1,90 @@
+Subject: hotplug: Lightweight get online cpus
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 15 Jun 2011 12:36:06 +0200
+
+get_online_cpus() is a heavy weight function which involves a global
+mutex. migrate_disable() wants a simpler construct which prevents only
+a CPU from going doing while a task is in a migrate disabled section.
+
+Implement a per cpu lockless mechanism, which serializes only in the
+real unplug case on a global mutex. That serialization affects only
+tasks on the cpu which should be brought down.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/cpu.h |    5 +++++
+ kernel/cpu.c        |   15 +++++++++++++++
+ kernel/sched/core.c |    4 ++++
+ 3 files changed, 24 insertions(+)
+
+--- a/include/linux/cpu.h
++++ b/include/linux/cpu.h
+@@ -116,6 +116,8 @@ extern void cpu_hotplug_disable(void);
+ extern void cpu_hotplug_enable(void);
+ void clear_tasks_mm_cpumask(int cpu);
+ int cpu_down(unsigned int cpu);
++extern void pin_current_cpu(void);
++extern void unpin_current_cpu(void);
+ 
+ #else /* CONFIG_HOTPLUG_CPU */
+ 
+@@ -126,6 +128,9 @@ static inline void cpus_read_unlock(void
+ static inline void lockdep_assert_cpus_held(void) { }
+ static inline void cpu_hotplug_disable(void) { }
+ static inline void cpu_hotplug_enable(void) { }
++static inline void pin_current_cpu(void) { }
++static inline void unpin_current_cpu(void) { }
++
+ #endif	/* !CONFIG_HOTPLUG_CPU */
+ 
+ /* Wrappers which go away once all code is converted */
+--- a/kernel/cpu.c
++++ b/kernel/cpu.c
+@@ -286,6 +286,21 @@ static int cpu_hotplug_disabled;
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+ 
++/**
++ * pin_current_cpu - Prevent the current cpu from being unplugged
++ */
++void pin_current_cpu(void)
++{
++
++}
++
++/**
++ * unpin_current_cpu - Allow unplug of current cpu
++ */
++void unpin_current_cpu(void)
++{
++}
++
+ DEFINE_STATIC_PERCPU_RWSEM(cpu_hotplug_lock);
+ 
+ void cpus_read_lock(void)
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -6914,6 +6914,7 @@ void migrate_disable(void)
+ 	}
+ 
+ 	preempt_disable();
++	pin_current_cpu();
+ 
+ 	migrate_disable_update_cpus_allowed(p);
+ 	p->migrate_disable = 1;
+@@ -6979,12 +6980,15 @@ void migrate_enable(void)
+ 			arg.task = p;
+ 			arg.dest_cpu = dest_cpu;
+ 
++			unpin_current_cpu();
+ 			preempt_enable();
+ 			stop_one_cpu(task_cpu(p), migration_cpu_stop, &arg);
+ 			tlb_migrate_finish(p->mm);
++
+ 			return;
+ 		}
+ 	}
++	unpin_current_cpu();
+ 	preempt_enable();
+ }
+ EXPORT_SYMBOL(migrate_enable);
diff --git a/kernel/patches-4.14.x-rt/0209-ftrace-migrate-disable-tracing.patch b/kernel/patches-4.14.x-rt/0209-ftrace-migrate-disable-tracing.patch
new file mode 100644
index 000000000..28e98df2a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0209-ftrace-migrate-disable-tracing.patch
@@ -0,0 +1,73 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 17 Jul 2011 21:56:42 +0200
+Subject: trace: Add migrate-disabled counter to tracing output
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/trace_events.h |    2 ++
+ kernel/trace/trace.c         |    9 ++++++---
+ kernel/trace/trace_events.c  |    2 ++
+ kernel/trace/trace_output.c  |    5 +++++
+ 4 files changed, 15 insertions(+), 3 deletions(-)
+
+--- a/include/linux/trace_events.h
++++ b/include/linux/trace_events.h
+@@ -62,6 +62,8 @@ struct trace_entry {
+ 	unsigned char		flags;
+ 	unsigned char		preempt_count;
+ 	int			pid;
++	unsigned short		migrate_disable;
++	unsigned short		padding;
+ };
+ 
+ #define TRACE_EVENT_TYPE_MAX						\
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -2141,6 +2141,8 @@ tracing_generic_entry_update(struct trac
+ 		((pc & SOFTIRQ_OFFSET) ? TRACE_FLAG_SOFTIRQ : 0) |
+ 		(tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) |
+ 		(test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0);
++
++	entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0;
+ }
+ EXPORT_SYMBOL_GPL(tracing_generic_entry_update);
+ 
+@@ -3344,9 +3346,10 @@ static void print_lat_help_header(struct
+ 		    "#                | / _----=> need-resched    \n"
+ 		    "#                || / _---=> hardirq/softirq \n"
+ 		    "#                ||| / _--=> preempt-depth   \n"
+-		    "#                |||| /     delay            \n"
+-		    "#  cmd     pid   ||||| time  |   caller      \n"
+-		    "#     \\   /      |||||  \\    |   /         \n");
++		    "#                |||| / _--=> migrate-disable\n"
++		    "#                ||||| /     delay           \n"
++		    "#  cmd     pid   |||||| time  |   caller     \n"
++		    "#     \\   /      |||||  \\   |   /          \n");
+ }
+ 
+ static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
+--- a/kernel/trace/trace_events.c
++++ b/kernel/trace/trace_events.c
+@@ -187,6 +187,8 @@ static int trace_define_common_fields(vo
+ 	__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;
+ }
+--- a/kernel/trace/trace_output.c
++++ b/kernel/trace/trace_output.c
+@@ -493,6 +493,11 @@ int trace_print_lat_fmt(struct trace_seq
+ 	else
+ 		trace_seq_putc(s, '.');
+ 
++	if (entry->migrate_disable)
++		trace_seq_printf(s, "%x", entry->migrate_disable);
++	else
++		trace_seq_putc(s, '.');
++
+ 	return !trace_seq_has_overflowed(s);
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0210-lockdep-no-softirq-accounting-on-rt.patch b/kernel/patches-4.14.x-rt/0210-lockdep-no-softirq-accounting-on-rt.patch
new file mode 100644
index 000000000..c8e0d9646
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0210-lockdep-no-softirq-accounting-on-rt.patch
@@ -0,0 +1,74 @@
+Subject: lockdep: Make it RT aware
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 17 Jul 2011 18:51:23 +0200
+
+teach lockdep that we don't really do softirqs on -RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/irqflags.h |   26 +++++++++++++++-----------
+ kernel/locking/lockdep.c |    2 ++
+ 2 files changed, 17 insertions(+), 11 deletions(-)
+
+--- a/include/linux/irqflags.h
++++ b/include/linux/irqflags.h
+@@ -34,16 +34,6 @@ do {						\
+ 	current->hardirq_context--;		\
+ 	crossrelease_hist_end(XHLOCK_HARD);	\
+ } while (0)
+-# define lockdep_softirq_enter()		\
+-do {						\
+-	current->softirq_context++;		\
+-	crossrelease_hist_start(XHLOCK_SOFT);	\
+-} while (0)
+-# define lockdep_softirq_exit()			\
+-do {						\
+-	current->softirq_context--;		\
+-	crossrelease_hist_end(XHLOCK_SOFT);	\
+-} while (0)
+ # define INIT_TRACE_IRQFLAGS	.softirqs_enabled = 1,
+ #else
+ # define trace_hardirqs_on()		do { } while (0)
+@@ -56,9 +46,23 @@ do {						\
+ # define trace_softirqs_enabled(p)	0
+ # define trace_hardirq_enter()		do { } while (0)
+ # define trace_hardirq_exit()		do { } while (0)
++# define INIT_TRACE_IRQFLAGS
++#endif
++
++#if defined(CONFIG_TRACE_IRQFLAGS) && !defined(CONFIG_PREEMPT_RT_FULL)
++# define lockdep_softirq_enter()		\
++do {						\
++	current->softirq_context++;		\
++	crossrelease_hist_start(XHLOCK_SOFT);	\
++} while (0)
++# define lockdep_softirq_exit()			\
++do {						\
++	current->softirq_context--;		\
++	crossrelease_hist_end(XHLOCK_SOFT);	\
++} while (0)
++#else
+ # define lockdep_softirq_enter()	do { } while (0)
+ # define lockdep_softirq_exit()		do { } while (0)
+-# define INIT_TRACE_IRQFLAGS
+ #endif
+ 
+ #if defined(CONFIG_IRQSOFF_TRACER) || \
+--- a/kernel/locking/lockdep.c
++++ b/kernel/locking/lockdep.c
+@@ -3917,6 +3917,7 @@ static void check_flags(unsigned long fl
+ 		}
+ 	}
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	/*
+ 	 * We dont accurately track softirq state in e.g.
+ 	 * hardirq contexts (such as on 4KSTACKS), so only
+@@ -3931,6 +3932,7 @@ static void check_flags(unsigned long fl
+ 			DEBUG_LOCKS_WARN_ON(!current->softirqs_enabled);
+ 		}
+ 	}
++#endif
+ 
+ 	if (!debug_locks)
+ 		print_irqtrace_events(current);
diff --git a/kernel/patches-4.14.x-rt/0211-lockdep-disable-self-test.patch b/kernel/patches-4.14.x-rt/0211-lockdep-disable-self-test.patch
new file mode 100644
index 000000000..813d2f343
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0211-lockdep-disable-self-test.patch
@@ -0,0 +1,28 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 17 Oct 2017 16:36:18 +0200
+Subject: [PATCH] lockdep: disable self-test
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The self-test wasn't always 100% accurate for RT. We disabled a few
+tests which failed because they had a different semantic for RT. Some
+still reported false positives. Now the selftest locks up the system
+during boot and it needs to be investigated…
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ lib/Kconfig.debug |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lib/Kconfig.debug
++++ b/lib/Kconfig.debug
+@@ -1199,7 +1199,7 @@ config DEBUG_ATOMIC_SLEEP
+ 
+ config DEBUG_LOCKING_API_SELFTESTS
+ 	bool "Locking API boot-time self-tests"
+-	depends on DEBUG_KERNEL
++	depends on DEBUG_KERNEL && !PREEMPT_RT_FULL
+ 	help
+ 	  Say Y here if you want the kernel to run a short self-test during
+ 	  bootup. The self-test checks whether common types of locking bugs
diff --git a/kernel/patches-4.14.x-rt/0212-mutex-no-spin-on-rt.patch b/kernel/patches-4.14.x-rt/0212-mutex-no-spin-on-rt.patch
new file mode 100644
index 000000000..6f7ca0e2e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0212-mutex-no-spin-on-rt.patch
@@ -0,0 +1,28 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 17 Jul 2011 21:51:45 +0200
+Subject: locking: Disable spin on owner for RT
+
+Drop spin on owner for mutex / rwsem. We are most likely not using it
+but…
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/Kconfig.locks |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- 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 && ARCH_SUPPORTS_ATOMIC_RMW
++	depends on SMP && 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/patches-4.14.x-rt/0213-tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch b/kernel/patches-4.14.x-rt/0213-tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch
new file mode 100644
index 000000000..80fac8a32
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0213-tasklet-rt-prevent-tasklets-from-going-into-infinite-spin-in-rt.patch
@@ -0,0 +1,391 @@
+Subject: tasklet: Prevent tasklets from going into infinite spin in RT
+From: Ingo Molnar <mingo@elte.hu>
+Date: Tue Nov 29 20:18:22 2011 -0500
+
+When CONFIG_PREEMPT_RT_FULL is enabled, tasklets run as threads,
+and spinlocks turn are mutexes. But this can cause issues with
+tasks disabling tasklets. A tasklet runs under ksoftirqd, and
+if a tasklets are disabled with tasklet_disable(), the tasklet
+count is increased. When a tasklet runs, it checks this counter
+and if it is set, it adds itself back on the softirq queue and
+returns.
+    
+The problem arises in RT because ksoftirq will see that a softirq
+is ready to run (the tasklet softirq just re-armed itself), and will
+not sleep, but instead run the softirqs again. The tasklet softirq
+will still see that the count is non-zero and will not execute
+the tasklet and requeue itself on the softirq again, which will
+cause ksoftirqd to run it again and again and again.
+    
+It gets worse because ksoftirqd runs as a real-time thread.
+If it preempted the task that disabled tasklets, and that task
+has migration disabled, or can't run for other reasons, the tasklet
+softirq will never run because the count will never be zero, and
+ksoftirqd will go into an infinite loop. As an RT task, it this
+becomes a big problem.
+    
+This is a hack solution to have tasklet_disable stop tasklets, and
+when a tasklet runs, instead of requeueing the tasklet softirqd
+it delays it. When tasklet_enable() is called, and tasklets are
+waiting, then the tasklet_enable() will kick the tasklets to continue.
+This prevents the lock up from ksoftirq going into an infinite loop.
+
+[ rostedt@goodmis.org: ported to 3.0-rt ]
+    
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/interrupt.h |   33 ++++---
+ kernel/softirq.c          |  201 ++++++++++++++++++++++++++++++++--------------
+ 2 files changed, 162 insertions(+), 72 deletions(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -537,8 +537,9 @@ static inline struct task_struct *this_c
+      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.
+-   * If this tasklet is already running on another CPU (or schedule is called
+-     from tasklet itself), it is rescheduled for later.
++   * If this tasklet is already running on another CPU, it is rescheduled
++     for later.
++   * Schedule must not be called from the tasklet itself (a lockup occurs)
+    * Tasklet is strictly serialized wrt itself, but not
+      wrt another tasklets. If client needs some intertask synchronization,
+      he makes it with spinlocks.
+@@ -563,27 +564,36 @@ struct tasklet_struct name = { NULL, 0,
+ enum
+ {
+ 	TASKLET_STATE_SCHED,	/* Tasklet is scheduled for execution */
+-	TASKLET_STATE_RUN	/* Tasklet is running (SMP only) */
++	TASKLET_STATE_RUN,	/* Tasklet is running (SMP only) */
++	TASKLET_STATE_PENDING	/* Tasklet is pending */
+ };
+ 
+-#ifdef CONFIG_SMP
++#define TASKLET_STATEF_SCHED	(1 << TASKLET_STATE_SCHED)
++#define TASKLET_STATEF_RUN	(1 << TASKLET_STATE_RUN)
++#define TASKLET_STATEF_PENDING	(1 << TASKLET_STATE_PENDING)
++
++#if defined(CONFIG_SMP) || defined(CONFIG_PREEMPT_RT_FULL)
+ static inline int tasklet_trylock(struct tasklet_struct *t)
+ {
+ 	return !test_and_set_bit(TASKLET_STATE_RUN, &(t)->state);
+ }
+ 
++static inline int tasklet_tryunlock(struct tasklet_struct *t)
++{
++	return cmpxchg(&t->state, TASKLET_STATEF_RUN, 0) == TASKLET_STATEF_RUN;
++}
++
+ static inline void tasklet_unlock(struct tasklet_struct *t)
+ {
+ 	smp_mb__before_atomic();
+ 	clear_bit(TASKLET_STATE_RUN, &(t)->state);
+ }
+ 
+-static inline void tasklet_unlock_wait(struct tasklet_struct *t)
+-{
+-	while (test_bit(TASKLET_STATE_RUN, &(t)->state)) { barrier(); }
+-}
++extern void tasklet_unlock_wait(struct tasklet_struct *t);
++
+ #else
+ #define tasklet_trylock(t) 1
++#define tasklet_tryunlock(t)	1
+ #define tasklet_unlock_wait(t) do { } while (0)
+ #define tasklet_unlock(t) do { } while (0)
+ #endif
+@@ -632,12 +642,7 @@ static inline void tasklet_disable(struc
+ 	smp_mb();
+ }
+ 
+-static inline void tasklet_enable(struct tasklet_struct *t)
+-{
+-	smp_mb__before_atomic();
+-	atomic_dec(&t->count);
+-}
+-
++extern void tasklet_enable(struct tasklet_struct *t);
+ 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,
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -21,6 +21,7 @@
+ #include <linux/freezer.h>
+ #include <linux/kthread.h>
+ #include <linux/rcupdate.h>
++#include <linux/delay.h>
+ #include <linux/ftrace.h>
+ #include <linux/smp.h>
+ #include <linux/smpboot.h>
+@@ -466,15 +467,45 @@ struct tasklet_head {
+ static DEFINE_PER_CPU(struct tasklet_head, tasklet_vec);
+ static DEFINE_PER_CPU(struct tasklet_head, tasklet_hi_vec);
+ 
++static void inline
++__tasklet_common_schedule(struct tasklet_struct *t, struct tasklet_head *head, unsigned int nr)
++{
++	if (tasklet_trylock(t)) {
++again:
++		/* We may have been preempted before tasklet_trylock
++		 * and __tasklet_action may have already run.
++		 * So double check the sched bit while the takslet
++		 * is locked before adding it to the list.
++		 */
++		if (test_bit(TASKLET_STATE_SCHED, &t->state)) {
++			t->next = NULL;
++			*head->tail = t;
++			head->tail = &(t->next);
++			raise_softirq_irqoff(nr);
++			tasklet_unlock(t);
++		} else {
++			/* This is subtle. If we hit the corner case above
++			 * It is possible that we get preempted right here,
++			 * and another task has successfully called
++			 * tasklet_schedule(), then this function, and
++			 * failed on the trylock. Thus we must be sure
++			 * before releasing the tasklet lock, that the
++			 * SCHED_BIT is clear. Otherwise the tasklet
++			 * may get its SCHED_BIT set, but not added to the
++			 * list
++			 */
++			if (!tasklet_tryunlock(t))
++				goto again;
++		}
++	}
++}
++
+ void __tasklet_schedule(struct tasklet_struct *t)
+ {
+ 	unsigned long flags;
+ 
+ 	local_irq_save(flags);
+-	t->next = NULL;
+-	*__this_cpu_read(tasklet_vec.tail) = t;
+-	__this_cpu_write(tasklet_vec.tail, &(t->next));
+-	raise_softirq_irqoff(TASKLET_SOFTIRQ);
++	__tasklet_common_schedule(t, this_cpu_ptr(&tasklet_vec), TASKLET_SOFTIRQ);
+ 	local_irq_restore(flags);
+ }
+ EXPORT_SYMBOL(__tasklet_schedule);
+@@ -484,10 +515,7 @@ void __tasklet_hi_schedule(struct taskle
+ 	unsigned long flags;
+ 
+ 	local_irq_save(flags);
+-	t->next = NULL;
+-	*__this_cpu_read(tasklet_hi_vec.tail) = t;
+-	__this_cpu_write(tasklet_hi_vec.tail,  &(t->next));
+-	raise_softirq_irqoff(HI_SOFTIRQ);
++	__tasklet_common_schedule(t, this_cpu_ptr(&tasklet_hi_vec), HI_SOFTIRQ);
+ 	local_irq_restore(flags);
+ }
+ EXPORT_SYMBOL(__tasklet_hi_schedule);
+@@ -496,82 +524,122 @@ void __tasklet_hi_schedule_first(struct
+ {
+ 	BUG_ON(!irqs_disabled());
+ 
+-	t->next = __this_cpu_read(tasklet_hi_vec.head);
+-	__this_cpu_write(tasklet_hi_vec.head, t);
+-	__raise_softirq_irqoff(HI_SOFTIRQ);
++	__tasklet_hi_schedule(t);
+ }
+ EXPORT_SYMBOL(__tasklet_hi_schedule_first);
+ 
+-static __latent_entropy void tasklet_action(struct softirq_action *a)
++void  tasklet_enable(struct tasklet_struct *t)
+ {
+-	struct tasklet_struct *list;
++	if (!atomic_dec_and_test(&t->count))
++		return;
++	if (test_and_clear_bit(TASKLET_STATE_PENDING, &t->state))
++		tasklet_schedule(t);
++}
++EXPORT_SYMBOL(tasklet_enable);
+ 
+-	local_irq_disable();
+-	list = __this_cpu_read(tasklet_vec.head);
+-	__this_cpu_write(tasklet_vec.head, NULL);
+-	__this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
+-	local_irq_enable();
++static void __tasklet_action(struct softirq_action *a,
++			     struct tasklet_struct *list)
++{
++	int loops = 1000000;
+ 
+ 	while (list) {
+ 		struct tasklet_struct *t = list;
+ 
+ 		list = list->next;
+ 
+-		if (tasklet_trylock(t)) {
+-			if (!atomic_read(&t->count)) {
+-				if (!test_and_clear_bit(TASKLET_STATE_SCHED,
+-							&t->state))
+-					BUG();
+-				t->func(t->data);
+-				tasklet_unlock(t);
+-				continue;
+-			}
+-			tasklet_unlock(t);
++		/*
++		 * Should always succeed - after a tasklist got on the
++		 * list (after getting the SCHED bit set from 0 to 1),
++		 * nothing but the tasklet softirq it got queued to can
++		 * lock it:
++		 */
++		if (!tasklet_trylock(t)) {
++			WARN_ON(1);
++			continue;
+ 		}
+ 
+-		local_irq_disable();
+ 		t->next = NULL;
+-		*__this_cpu_read(tasklet_vec.tail) = t;
+-		__this_cpu_write(tasklet_vec.tail, &(t->next));
+-		__raise_softirq_irqoff(TASKLET_SOFTIRQ);
+-		local_irq_enable();
++
++		/*
++		 * If we cannot handle the tasklet because it's disabled,
++		 * mark it as pending. tasklet_enable() will later
++		 * re-schedule the tasklet.
++		 */
++		if (unlikely(atomic_read(&t->count))) {
++out_disabled:
++			/* implicit unlock: */
++			wmb();
++			t->state = TASKLET_STATEF_PENDING;
++			continue;
++		}
++
++		/*
++		 * After this point on the tasklet might be rescheduled
++		 * on another CPU, but it can only be added to another
++		 * CPU's tasklet list if we unlock the tasklet (which we
++		 * dont do yet).
++		 */
++		if (!test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
++			WARN_ON(1);
++
++again:
++		t->func(t->data);
++
++		/*
++		 * Try to unlock the tasklet. We must use cmpxchg, because
++		 * another CPU might have scheduled or disabled the tasklet.
++		 * We only allow the STATE_RUN -> 0 transition here.
++		 */
++		while (!tasklet_tryunlock(t)) {
++			/*
++			 * If it got disabled meanwhile, bail out:
++			 */
++			if (atomic_read(&t->count))
++				goto out_disabled;
++			/*
++			 * If it got scheduled meanwhile, re-execute
++			 * the tasklet function:
++			 */
++			if (test_and_clear_bit(TASKLET_STATE_SCHED, &t->state))
++				goto again;
++			if (!--loops) {
++				printk("hm, tasklet state: %08lx\n", t->state);
++				WARN_ON(1);
++				tasklet_unlock(t);
++				break;
++			}
++		}
+ 	}
+ }
+ 
++static void tasklet_action(struct softirq_action *a)
++{
++	struct tasklet_struct *list;
++
++	local_irq_disable();
++
++	list = __this_cpu_read(tasklet_vec.head);
++	__this_cpu_write(tasklet_vec.head, NULL);
++	__this_cpu_write(tasklet_vec.tail, this_cpu_ptr(&tasklet_vec.head));
++
++	local_irq_enable();
++
++	__tasklet_action(a, list);
++}
++
+ static __latent_entropy void tasklet_hi_action(struct softirq_action *a)
+ {
+ 	struct tasklet_struct *list;
+ 
+ 	local_irq_disable();
++
+ 	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();
+-
+-	while (list) {
+-		struct tasklet_struct *t = list;
+ 
+-		list = list->next;
+-
+-		if (tasklet_trylock(t)) {
+-			if (!atomic_read(&t->count)) {
+-				if (!test_and_clear_bit(TASKLET_STATE_SCHED,
+-							&t->state))
+-					BUG();
+-				t->func(t->data);
+-				tasklet_unlock(t);
+-				continue;
+-			}
+-			tasklet_unlock(t);
+-		}
++	local_irq_enable();
+ 
+-		local_irq_disable();
+-		t->next = NULL;
+-		*__this_cpu_read(tasklet_hi_vec.tail) = t;
+-		__this_cpu_write(tasklet_hi_vec.tail, &(t->next));
+-		__raise_softirq_irqoff(HI_SOFTIRQ);
+-		local_irq_enable();
+-	}
++	__tasklet_action(a, list);
+ }
+ 
+ void tasklet_init(struct tasklet_struct *t,
+@@ -592,7 +660,7 @@ void tasklet_kill(struct tasklet_struct
+ 
+ 	while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) {
+ 		do {
+-			yield();
++			msleep(1);
+ 		} while (test_bit(TASKLET_STATE_SCHED, &t->state));
+ 	}
+ 	tasklet_unlock_wait(t);
+@@ -615,6 +683,23 @@ void __init softirq_init(void)
+ 	open_softirq(HI_SOFTIRQ, tasklet_hi_action);
+ }
+ 
++#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();
diff --git a/kernel/patches-4.14.x-rt/0214-softirq-preempt-fix-3-re.patch b/kernel/patches-4.14.x-rt/0214-softirq-preempt-fix-3-re.patch
new file mode 100644
index 000000000..e9c7dd288
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0214-softirq-preempt-fix-3-re.patch
@@ -0,0 +1,168 @@
+Subject: softirq: Check preemption after reenabling interrupts
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 13 Nov 2011 17:17:09 +0100 (CET)
+
+raise_softirq_irqoff() disables interrupts and wakes the softirq
+daemon, but after reenabling interrupts there is no preemption check,
+so the execution of the softirq thread might be delayed arbitrarily.
+
+In principle we could add that check to local_irq_enable/restore, but
+that's overkill as the rasie_softirq_irqoff() sections are the only
+ones which show this behaviour.
+
+Reported-by: Carsten Emde <cbe@osadl.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ block/blk-softirq.c     |    3 +++
+ include/linux/preempt.h |    3 +++
+ lib/irq_poll.c          |    5 +++++
+ net/core/dev.c          |    7 +++++++
+ 4 files changed, 18 insertions(+)
+
+--- a/block/blk-softirq.c
++++ b/block/blk-softirq.c
+@@ -53,6 +53,7 @@ static void trigger_softirq(void *data)
+ 		raise_softirq_irqoff(BLOCK_SOFTIRQ);
+ 
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ }
+ 
+ /*
+@@ -91,6 +92,7 @@ static int blk_softirq_cpu_dead(unsigned
+ 			 this_cpu_ptr(&blk_cpu_done));
+ 	raise_softirq_irqoff(BLOCK_SOFTIRQ);
+ 	local_irq_enable();
++	preempt_check_resched_rt();
+ 
+ 	return 0;
+ }
+@@ -143,6 +145,7 @@ void __blk_complete_request(struct reque
+ 		goto do_local;
+ 
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ }
+ 
+ /**
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -187,8 +187,10 @@ do { \
+ 
+ #ifdef CONFIG_PREEMPT_RT_BASE
+ # define preempt_enable_no_resched() sched_preempt_enable_no_resched()
++# define preempt_check_resched_rt() preempt_check_resched()
+ #else
+ # define preempt_enable_no_resched() preempt_enable()
++# define preempt_check_resched_rt() barrier();
+ #endif
+ 
+ #define preemptible()	(preempt_count() == 0 && !irqs_disabled())
+@@ -275,6 +277,7 @@ do { \
+ #define preempt_disable_notrace()		barrier()
+ #define preempt_enable_no_resched_notrace()	barrier()
+ #define preempt_enable_notrace()		barrier()
++#define preempt_check_resched_rt()		barrier()
+ #define preemptible()				0
+ 
+ #define migrate_disable()			barrier()
+--- a/lib/irq_poll.c
++++ b/lib/irq_poll.c
+@@ -37,6 +37,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);
++	preempt_check_resched_rt();
+ }
+ EXPORT_SYMBOL(irq_poll_sched);
+ 
+@@ -72,6 +73,7 @@ void irq_poll_complete(struct irq_poll *
+ 	local_irq_save(flags);
+ 	__irq_poll_complete(iop);
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ }
+ EXPORT_SYMBOL(irq_poll_complete);
+ 
+@@ -96,6 +98,7 @@ static void __latent_entropy irq_poll_so
+ 		}
+ 
+ 		local_irq_enable();
++		preempt_check_resched_rt();
+ 
+ 		/* Even though interrupts have been re-enabled, this
+ 		 * access is safe because interrupts can only add new
+@@ -133,6 +136,7 @@ static void __latent_entropy irq_poll_so
+ 		__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
+ 
+ 	local_irq_enable();
++	preempt_check_resched_rt();
+ }
+ 
+ /**
+@@ -196,6 +200,7 @@ static int irq_poll_cpu_dead(unsigned in
+ 			 this_cpu_ptr(&blk_cpu_iopoll));
+ 	__raise_softirq_irqoff(IRQ_POLL_SOFTIRQ);
+ 	local_irq_enable();
++	preempt_check_resched_rt();
+ 
+ 	return 0;
+ }
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -2431,6 +2431,7 @@ static void __netif_reschedule(struct Qd
+ 	sd->output_queue_tailp = &q->next_sched;
+ 	raise_softirq_irqoff(NET_TX_SOFTIRQ);
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ }
+ 
+ void __netif_schedule(struct Qdisc *q)
+@@ -2493,6 +2494,7 @@ void __dev_kfree_skb_irq(struct sk_buff
+ 	__this_cpu_write(softnet_data.completion_queue, skb);
+ 	raise_softirq_irqoff(NET_TX_SOFTIRQ);
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ }
+ EXPORT_SYMBOL(__dev_kfree_skb_irq);
+ 
+@@ -3867,6 +3869,7 @@ static int enqueue_to_backlog(struct sk_
+ 	rps_unlock(sd);
+ 
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ 
+ 	atomic_long_inc(&skb->dev->rx_dropped);
+ 	kfree_skb(skb);
+@@ -5116,12 +5119,14 @@ static void net_rps_action_and_irq_enabl
+ 		sd->rps_ipi_list = NULL;
+ 
+ 		local_irq_enable();
++		preempt_check_resched_rt();
+ 
+ 		/* Send pending IPI's to kick RPS processing on remote cpus. */
+ 		net_rps_send_ipi(remsd);
+ 	} else
+ #endif
+ 		local_irq_enable();
++	preempt_check_resched_rt();
+ }
+ 
+ static bool sd_has_rps_ipi_waiting(struct softnet_data *sd)
+@@ -5199,6 +5204,7 @@ void __napi_schedule(struct napi_struct
+ 	local_irq_save(flags);
+ 	____napi_schedule(this_cpu_ptr(&softnet_data), n);
+ 	local_irq_restore(flags);
++	preempt_check_resched_rt();
+ }
+ EXPORT_SYMBOL(__napi_schedule);
+ 
+@@ -8403,6 +8409,7 @@ static int dev_cpu_dead(unsigned int old
+ 
+ 	raise_softirq_irqoff(NET_TX_SOFTIRQ);
+ 	local_irq_enable();
++	preempt_check_resched_rt();
+ 
+ #ifdef CONFIG_RPS
+ 	remsd = oldsd->rps_ipi_list;
diff --git a/kernel/patches-4.14.x-rt/0215-softirq-disable-softirq-stacks-for-rt.patch b/kernel/patches-4.14.x-rt/0215-softirq-disable-softirq-stacks-for-rt.patch
new file mode 100644
index 000000000..1f3cb6684
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0215-softirq-disable-softirq-stacks-for-rt.patch
@@ -0,0 +1,156 @@
+Subject: softirq: Disable softirq stacks for RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 18 Jul 2011 13:59:17 +0200
+
+Disable extra stacks for softirqs. We want to preempt softirqs and
+having them on special IRQ-stack does not make this easier.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/powerpc/kernel/irq.c     |    2 ++
+ arch/powerpc/kernel/misc_32.S |    2 ++
+ arch/powerpc/kernel/misc_64.S |    2 ++
+ arch/sh/kernel/irq.c          |    2 ++
+ arch/sparc/kernel/irq_64.c    |    2 ++
+ arch/x86/entry/entry_64.S     |    2 ++
+ arch/x86/kernel/irq_32.c      |    2 ++
+ include/linux/interrupt.h     |    2 +-
+ 8 files changed, 15 insertions(+), 1 deletion(-)
+
+--- a/arch/powerpc/kernel/irq.c
++++ b/arch/powerpc/kernel/irq.c
+@@ -685,6 +685,7 @@ void irq_ctx_init(void)
+ 	}
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ void do_softirq_own_stack(void)
+ {
+ 	struct thread_info *curtp, *irqtp;
+@@ -702,6 +703,7 @@ void do_softirq_own_stack(void)
+ 	if (irqtp->flags)
+ 		set_bits(irqtp->flags, &curtp->flags);
+ }
++#endif
+ 
+ irq_hw_number_t virq_to_hw(unsigned int virq)
+ {
+--- 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
+  */
++#ifndef CONFIG_PREEMPT_RT_FULL
+ _GLOBAL(call_do_softirq)
+ 	mflr	r0
+ 	stw	r0,4(r1)
+@@ -57,6 +58,7 @@
+ 	stw	r10,THREAD+KSP_LIMIT(r2)
+ 	mtlr	r0
+ 	blr
++#endif
+ 
+ /*
+  * void call_do_irq(struct pt_regs *regs, struct thread_info *irqtp);
+--- a/arch/powerpc/kernel/misc_64.S
++++ b/arch/powerpc/kernel/misc_64.S
+@@ -31,6 +31,7 @@
+ 
+ 	.text
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ _GLOBAL(call_do_softirq)
+ 	mflr	r0
+ 	std	r0,16(r1)
+@@ -41,6 +42,7 @@
+ 	ld	r0,16(r1)
+ 	mtlr	r0
+ 	blr
++#endif
+ 
+ _GLOBAL(call_do_irq)
+ 	mflr	r0
+--- a/arch/sh/kernel/irq.c
++++ b/arch/sh/kernel/irq.c
+@@ -148,6 +148,7 @@ void irq_ctx_exit(int cpu)
+ 	hardirq_ctx[cpu] = NULL;
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ void do_softirq_own_stack(void)
+ {
+ 	struct thread_info *curctx;
+@@ -175,6 +176,7 @@ void do_softirq_own_stack(void)
+ 		  "r5", "r6", "r7", "r8", "r9", "r15", "t", "pr"
+ 	);
+ }
++#endif
+ #else
+ static inline void handle_one_irq(unsigned int irq)
+ {
+--- a/arch/sparc/kernel/irq_64.c
++++ b/arch/sparc/kernel/irq_64.c
+@@ -855,6 +855,7 @@ void __irq_entry handler_irq(int pil, st
+ 	set_irq_regs(old_regs);
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ void do_softirq_own_stack(void)
+ {
+ 	void *orig_sp, *sp = softirq_stack[smp_processor_id()];
+@@ -869,6 +870,7 @@ void do_softirq_own_stack(void)
+ 	__asm__ __volatile__("mov %0, %%sp"
+ 			     : : "r" (orig_sp));
+ }
++#endif
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+ void fixup_irqs(void)
+--- a/arch/x86/entry/entry_64.S
++++ b/arch/x86/entry/entry_64.S
+@@ -1024,6 +1024,7 @@ EXPORT_SYMBOL(native_load_gs_index)
+ 	jmp	2b
+ 	.previous
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /* Call softirq on interrupt stack. Interrupts are off. */
+ ENTRY(do_softirq_own_stack)
+ 	pushq	%rbp
+@@ -1034,6 +1035,7 @@ ENTRY(do_softirq_own_stack)
+ 	leaveq
+ 	ret
+ ENDPROC(do_softirq_own_stack)
++#endif
+ 
+ #ifdef CONFIG_XEN
+ idtentry hypervisor_callback xen_do_hypervisor_callback has_error_code=0
+--- a/arch/x86/kernel/irq_32.c
++++ b/arch/x86/kernel/irq_32.c
+@@ -129,6 +129,7 @@ void irq_ctx_init(int cpu)
+ 	       cpu, per_cpu(hardirq_stack, cpu),  per_cpu(softirq_stack, cpu));
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ void do_softirq_own_stack(void)
+ {
+ 	struct irq_stack *irqstk;
+@@ -145,6 +146,7 @@ void do_softirq_own_stack(void)
+ 
+ 	call_on_stack(__do_softirq, isp);
+ }
++#endif
+ 
+ bool handle_irq(struct irq_desc *desc, struct pt_regs *regs)
+ {
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -501,7 +501,7 @@ struct softirq_action
+ asmlinkage void do_softirq(void);
+ asmlinkage void __do_softirq(void);
+ 
+-#ifdef __ARCH_HAS_DO_SOFTIRQ
++#if defined(__ARCH_HAS_DO_SOFTIRQ) && !defined(CONFIG_PREEMPT_RT_FULL)
+ void do_softirq_own_stack(void);
+ #else
+ static inline void do_softirq_own_stack(void)
diff --git a/kernel/patches-4.14.x-rt/0216-softirq-split-locks.patch b/kernel/patches-4.14.x-rt/0216-softirq-split-locks.patch
new file mode 100644
index 000000000..ce81583dc
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0216-softirq-split-locks.patch
@@ -0,0 +1,832 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 04 Oct 2012 14:20:47 +0100
+Subject: softirq: Split softirq locks
+
+The 3.x RT series removed the split softirq implementation in favour
+of pushing softirq processing into the context of the thread which
+raised it. Though this prevents us from handling the various softirqs
+at different priorities. Now instead of reintroducing the split
+softirq threads we split the locks which serialize the softirq
+processing.
+
+If a softirq is raised in context of a thread, then the softirq is
+noted on a per thread field, if the thread is in a bh disabled
+region. If the softirq is raised from hard interrupt context, then the
+bit is set in the flag field of ksoftirqd and ksoftirqd is invoked.
+When a thread leaves a bh disabled region, then it tries to execute
+the softirqs which have been raised in its own context. It acquires
+the per softirq / per cpu lock for the softirq and then checks,
+whether the softirq is still pending in the per cpu
+local_softirq_pending() field. If yes, it runs the softirq. If no,
+then some other task executed it already. This allows for zero config
+softirq elevation in the context of user space tasks or interrupt
+threads.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/bottom_half.h |   34 +++
+ include/linux/interrupt.h   |   15 +
+ include/linux/preempt.h     |   15 +
+ include/linux/sched.h       |    3 
+ init/main.c                 |    1 
+ kernel/softirq.c            |  492 +++++++++++++++++++++++++++++++++++++-------
+ kernel/time/tick-sched.c    |    9 
+ net/core/dev.c              |    6 
+ 8 files changed, 480 insertions(+), 95 deletions(-)
+
+--- a/include/linux/bottom_half.h
++++ b/include/linux/bottom_half.h
+@@ -4,6 +4,39 @@
+ 
+ #include <linux/preempt.h>
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++
++extern void __local_bh_disable(void);
++extern void _local_bh_enable(void);
++extern void __local_bh_enable(void);
++
++static inline void local_bh_disable(void)
++{
++	__local_bh_disable();
++}
++
++static inline void __local_bh_disable_ip(unsigned long ip, unsigned int cnt)
++{
++	__local_bh_disable();
++}
++
++static inline void local_bh_enable(void)
++{
++	__local_bh_enable();
++}
++
++static inline void __local_bh_enable_ip(unsigned long ip, unsigned int cnt)
++{
++	__local_bh_enable();
++}
++
++static inline void local_bh_enable_ip(unsigned long ip)
++{
++	__local_bh_enable();
++}
++
++#else
++
+ #ifdef CONFIG_TRACE_IRQFLAGS
+ extern void __local_bh_disable_ip(unsigned long ip, unsigned int cnt);
+ #else
+@@ -31,5 +64,6 @@ static inline void local_bh_enable(void)
+ {
+ 	__local_bh_enable_ip(_THIS_IP_, SOFTIRQ_DISABLE_OFFSET);
+ }
++#endif
+ 
+ #endif /* _LINUX_BH_H */
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -498,10 +498,11 @@ struct softirq_action
+ 	void	(*action)(struct softirq_action *);
+ };
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ asmlinkage void do_softirq(void);
+ asmlinkage void __do_softirq(void);
+-
+-#if defined(__ARCH_HAS_DO_SOFTIRQ) && !defined(CONFIG_PREEMPT_RT_FULL)
++static inline void thread_do_softirq(void) { do_softirq(); }
++#ifdef __ARCH_HAS_DO_SOFTIRQ
+ void do_softirq_own_stack(void);
+ #else
+ static inline void do_softirq_own_stack(void)
+@@ -509,6 +510,9 @@ static inline void do_softirq_own_stack(
+ 	__do_softirq();
+ }
+ #endif
++#else
++extern void thread_do_softirq(void);
++#endif
+ 
+ extern void open_softirq(int nr, void (*action)(struct softirq_action *));
+ extern void softirq_init(void);
+@@ -516,6 +520,7 @@ extern void __raise_softirq_irqoff(unsig
+ 
+ extern void raise_softirq_irqoff(unsigned int nr);
+ extern void raise_softirq(unsigned int nr);
++extern void softirq_check_pending_idle(void);
+ 
+ DECLARE_PER_CPU(struct task_struct *, ksoftirqd);
+ 
+@@ -648,6 +653,12 @@ extern void tasklet_kill_immediate(struc
+ extern void tasklet_init(struct tasklet_struct *t,
+ 			 void (*func)(unsigned long), unsigned long data);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++extern void softirq_early_init(void);
++#else
++static inline void softirq_early_init(void) { }
++#endif
++
+ /*
+  * Autoprobing for irqs:
+  *
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -51,7 +51,11 @@
+ #define HARDIRQ_OFFSET	(1UL << HARDIRQ_SHIFT)
+ #define NMI_OFFSET	(1UL << NMI_SHIFT)
+ 
+-#define SOFTIRQ_DISABLE_OFFSET	(2 * SOFTIRQ_OFFSET)
++#ifndef CONFIG_PREEMPT_RT_FULL
++# define SOFTIRQ_DISABLE_OFFSET		(2 * SOFTIRQ_OFFSET)
++#else
++# define SOFTIRQ_DISABLE_OFFSET		(0)
++#endif
+ 
+ /* We use the MSB mostly because its available */
+ #define PREEMPT_NEED_RESCHED	0x80000000
+@@ -81,9 +85,15 @@
+ #include <asm/preempt.h>
+ 
+ #define hardirq_count()	(preempt_count() & HARDIRQ_MASK)
+-#define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
+ #define irq_count()	(preempt_count() & (HARDIRQ_MASK | SOFTIRQ_MASK \
+ 				 | NMI_MASK))
++#ifndef CONFIG_PREEMPT_RT_FULL
++# define softirq_count()	(preempt_count() & SOFTIRQ_MASK)
++# define in_serving_softirq()	(softirq_count() & SOFTIRQ_OFFSET)
++#else
++# define softirq_count()	(0UL)
++extern int in_serving_softirq(void);
++#endif
+ 
+ /*
+  * Are we doing bottom half or hardware interrupt processing?
+@@ -101,7 +111,6 @@
+ #define in_irq()		(hardirq_count())
+ #define in_softirq()		(softirq_count())
+ #define in_interrupt()		(irq_count())
+-#define in_serving_softirq()	(softirq_count() & SOFTIRQ_OFFSET)
+ #define in_nmi()		(preempt_count() & NMI_MASK)
+ #define in_task()		(!(preempt_count() & \
+ 				   (NMI_MASK | HARDIRQ_MASK | SOFTIRQ_OFFSET)))
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1096,6 +1096,8 @@ struct task_struct {
+ #endif
+ #ifdef CONFIG_PREEMPT_RT_BASE
+ 	struct rcu_head			put_rcu;
++	int				softirq_nestcnt;
++	unsigned int			softirqs_raised;
+ #endif
+ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
+ 	unsigned long			task_state_change;
+@@ -1313,6 +1315,7 @@ extern struct pid *cad_pid;
+ /*
+  * Per process flags
+  */
++#define PF_IN_SOFTIRQ		0x00000001      /* Task is serving softirq */
+ #define PF_IDLE			0x00000002	/* I am an IDLE thread */
+ #define PF_EXITING		0x00000004	/* Getting shut down */
+ #define PF_EXITPIDONE		0x00000008	/* PI exit done on shut down */
+--- a/init/main.c
++++ b/init/main.c
+@@ -544,6 +544,7 @@ asmlinkage __visible void __init start_k
+ 	setup_command_line(command_line);
+ 	setup_nr_cpu_ids();
+ 	setup_per_cpu_areas();
++	softirq_early_init();
+ 	boot_cpu_state_init();
+ 	smp_prepare_boot_cpu();	/* arch-specific boot-cpu hooks */
+ 
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -26,6 +26,7 @@
+ #include <linux/smp.h>
+ #include <linux/smpboot.h>
+ #include <linux/tick.h>
++#include <linux/locallock.h>
+ #include <linux/irq.h>
+ 
+ #define CREATE_TRACE_POINTS
+@@ -63,6 +64,98 @@ const char * const softirq_to_name[NR_SO
+ 	"TASKLET", "SCHED", "HRTIMER", "RCU"
+ };
+ 
++#ifdef CONFIG_NO_HZ_COMMON
++# ifdef CONFIG_PREEMPT_RT_FULL
++
++struct softirq_runner {
++	struct task_struct *runner[NR_SOFTIRQS];
++};
++
++static DEFINE_PER_CPU(struct softirq_runner, softirq_runners);
++
++static inline void softirq_set_runner(unsigned int sirq)
++{
++	struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
++
++	sr->runner[sirq] = current;
++}
++
++static inline void softirq_clr_runner(unsigned int sirq)
++{
++	struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
++
++	sr->runner[sirq] = NULL;
++}
++
++/*
++ * On preempt-rt a softirq running context might be blocked on a
++ * lock. There might be no other runnable task on this CPU because the
++ * lock owner runs on some other CPU. So we have to go into idle with
++ * the pending bit set. Therefor we need to check this otherwise we
++ * warn about false positives which confuses users and defeats the
++ * whole purpose of this test.
++ *
++ * This code is called with interrupts disabled.
++ */
++void softirq_check_pending_idle(void)
++{
++	static int rate_limit;
++	struct softirq_runner *sr = this_cpu_ptr(&softirq_runners);
++	u32 warnpending;
++	int i;
++
++	if (rate_limit >= 10)
++		return;
++
++	warnpending = local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK;
++	for (i = 0; i < NR_SOFTIRQS; i++) {
++		struct task_struct *tsk = sr->runner[i];
++
++		/*
++		 * The wakeup code in rtmutex.c wakes up the task
++		 * _before_ it sets pi_blocked_on to NULL under
++		 * tsk->pi_lock. So we need to check for both: state
++		 * and pi_blocked_on.
++		 */
++		if (tsk) {
++			raw_spin_lock(&tsk->pi_lock);
++			if (tsk->pi_blocked_on || tsk->state == TASK_RUNNING) {
++				/* Clear all bits pending in that task */
++				warnpending &= ~(tsk->softirqs_raised);
++				warnpending &= ~(1 << i);
++			}
++			raw_spin_unlock(&tsk->pi_lock);
++		}
++	}
++
++	if (warnpending) {
++		printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
++		       warnpending);
++		rate_limit++;
++	}
++}
++# else
++/*
++ * On !PREEMPT_RT we just printk rate limited:
++ */
++void softirq_check_pending_idle(void)
++{
++	static int rate_limit;
++
++	if (rate_limit < 10 &&
++			(local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
++		printk(KERN_ERR "NOHZ: local_softirq_pending %02x\n",
++		       local_softirq_pending());
++		rate_limit++;
++	}
++}
++# endif
++
++#else /* !CONFIG_NO_HZ_COMMON */
++static inline void softirq_set_runner(unsigned int sirq) { }
++static inline void softirq_clr_runner(unsigned int sirq) { }
++#endif
++
+ /*
+  * we cannot loop indefinitely here to avoid userspace starvation,
+  * but we also don't want to introduce a worst case 1/HZ latency
+@@ -78,6 +171,26 @@ static void wakeup_softirqd(void)
+ 		wake_up_process(tsk);
+ }
+ 
++static void handle_softirq(unsigned int vec_nr)
++{
++	struct softirq_action *h = softirq_vec + vec_nr;
++	int prev_count;
++
++	prev_count = preempt_count();
++
++	kstat_incr_softirqs_this_cpu(vec_nr);
++
++	trace_softirq_entry(vec_nr);
++	h->action(h);
++	trace_softirq_exit(vec_nr);
++	if (unlikely(prev_count != preempt_count())) {
++		pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
++		       vec_nr, softirq_to_name[vec_nr], h->action,
++		       prev_count, preempt_count());
++		preempt_count_set(prev_count);
++	}
++}
++
+ /*
+  * 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.
+@@ -89,6 +202,48 @@ static bool ksoftirqd_running(void)
+ 	return tsk && (tsk->state == TASK_RUNNING);
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++static inline int ksoftirqd_softirq_pending(void)
++{
++	return local_softirq_pending();
++}
++
++static void handle_pending_softirqs(u32 pending)
++{
++	struct softirq_action *h = softirq_vec;
++	int softirq_bit;
++
++	local_irq_enable();
++
++	h = softirq_vec;
++
++	while ((softirq_bit = ffs(pending))) {
++		unsigned int vec_nr;
++
++		h += softirq_bit - 1;
++		vec_nr = h - softirq_vec;
++		handle_softirq(vec_nr);
++
++		h++;
++		pending >>= softirq_bit;
++	}
++
++	rcu_bh_qs();
++	local_irq_disable();
++}
++
++static void run_ksoftirqd(unsigned int cpu)
++{
++	local_irq_disable();
++	if (ksoftirqd_softirq_pending()) {
++		__do_softirq();
++		local_irq_enable();
++		cond_resched_rcu_qs();
++		return;
++	}
++	local_irq_enable();
++}
++
+ /*
+  * preempt_count and SOFTIRQ_OFFSET usage:
+  * - preempt_count is changed by SOFTIRQ_OFFSET on entering or leaving
+@@ -244,10 +399,8 @@ asmlinkage __visible void __softirq_entr
+ 	unsigned long end = jiffies + MAX_SOFTIRQ_TIME;
+ 	unsigned long old_flags = current->flags;
+ 	int max_restart = MAX_SOFTIRQ_RESTART;
+-	struct softirq_action *h;
+ 	bool in_hardirq;
+ 	__u32 pending;
+-	int softirq_bit;
+ 
+ 	/*
+ 	 * Mask out PF_MEMALLOC s current task context is borrowed for the
+@@ -266,36 +419,7 @@ asmlinkage __visible void __softirq_entr
+ 	/* Reset the pending bitmask before enabling irqs */
+ 	set_softirq_pending(0);
+ 
+-	local_irq_enable();
+-
+-	h = softirq_vec;
+-
+-	while ((softirq_bit = ffs(pending))) {
+-		unsigned int vec_nr;
+-		int prev_count;
+-
+-		h += softirq_bit - 1;
+-
+-		vec_nr = h - softirq_vec;
+-		prev_count = preempt_count();
+-
+-		kstat_incr_softirqs_this_cpu(vec_nr);
+-
+-		trace_softirq_entry(vec_nr);
+-		h->action(h);
+-		trace_softirq_exit(vec_nr);
+-		if (unlikely(prev_count != preempt_count())) {
+-			pr_err("huh, entered softirq %u %s %p with preempt_count %08x, exited with %08x?\n",
+-			       vec_nr, softirq_to_name[vec_nr], h->action,
+-			       prev_count, preempt_count());
+-			preempt_count_set(prev_count);
+-		}
+-		h++;
+-		pending >>= softirq_bit;
+-	}
+-
+-	rcu_bh_qs();
+-	local_irq_disable();
++	handle_pending_softirqs(pending);
+ 
+ 	pending = local_softirq_pending();
+ 	if (pending) {
+@@ -332,6 +456,246 @@ asmlinkage __visible void do_softirq(voi
+ }
+ 
+ /*
++ * This function must run with irqs disabled!
++ */
++void raise_softirq_irqoff(unsigned int nr)
++{
++	__raise_softirq_irqoff(nr);
++
++	/*
++	 * If we're in an interrupt or softirq, we're done
++	 * (this also catches softirq-disabled code). We will
++	 * actually run the softirq once we return from
++	 * the irq or softirq.
++	 *
++	 * Otherwise we wake up ksoftirqd to make sure we
++	 * schedule the softirq soon.
++	 */
++	if (!in_interrupt())
++		wakeup_softirqd();
++}
++
++void __raise_softirq_irqoff(unsigned int nr)
++{
++	trace_softirq_raise(nr);
++	or_softirq_pending(1UL << nr);
++}
++
++static inline void local_bh_disable_nort(void) { local_bh_disable(); }
++static inline void _local_bh_enable_nort(void) { _local_bh_enable(); }
++static void ksoftirqd_set_sched_params(unsigned int cpu) { }
++static void ksoftirqd_clr_sched_params(unsigned int cpu, bool online) { }
++
++#else /* !PREEMPT_RT_FULL */
++
++/*
++ * On RT we serialize softirq execution with a cpu local lock per softirq
++ */
++static DEFINE_PER_CPU(struct local_irq_lock [NR_SOFTIRQS], local_softirq_locks);
++
++void __init softirq_early_init(void)
++{
++	int i;
++
++	for (i = 0; i < NR_SOFTIRQS; i++)
++		local_irq_lock_init(local_softirq_locks[i]);
++}
++
++static void lock_softirq(int which)
++{
++	local_lock(local_softirq_locks[which]);
++}
++
++static void unlock_softirq(int which)
++{
++	local_unlock(local_softirq_locks[which]);
++}
++
++static void do_single_softirq(int which)
++{
++	unsigned long old_flags = current->flags;
++
++	current->flags &= ~PF_MEMALLOC;
++	vtime_account_irq_enter(current);
++	current->flags |= PF_IN_SOFTIRQ;
++	lockdep_softirq_enter();
++	local_irq_enable();
++	handle_softirq(which);
++	local_irq_disable();
++	lockdep_softirq_exit();
++	current->flags &= ~PF_IN_SOFTIRQ;
++	vtime_account_irq_enter(current);
++	current_restore_flags(old_flags, PF_MEMALLOC);
++}
++
++/*
++ * Called with interrupts disabled. Process softirqs which were raised
++ * in current context (or on behalf of ksoftirqd).
++ */
++static void do_current_softirqs(void)
++{
++	while (current->softirqs_raised) {
++		int i = __ffs(current->softirqs_raised);
++		unsigned int pending, mask = (1U << i);
++
++		current->softirqs_raised &= ~mask;
++		local_irq_enable();
++
++		/*
++		 * If the lock is contended, we boost the owner to
++		 * process the softirq or leave the critical section
++		 * now.
++		 */
++		lock_softirq(i);
++		local_irq_disable();
++		softirq_set_runner(i);
++		/*
++		 * Check with the local_softirq_pending() bits,
++		 * whether we need to process this still or if someone
++		 * else took care of it.
++		 */
++		pending = local_softirq_pending();
++		if (pending & mask) {
++			set_softirq_pending(pending & ~mask);
++			do_single_softirq(i);
++		}
++		softirq_clr_runner(i);
++		unlock_softirq(i);
++		WARN_ON(current->softirq_nestcnt != 1);
++	}
++}
++
++void __local_bh_disable(void)
++{
++	if (++current->softirq_nestcnt == 1)
++		migrate_disable();
++}
++EXPORT_SYMBOL(__local_bh_disable);
++
++void __local_bh_enable(void)
++{
++	if (WARN_ON(current->softirq_nestcnt == 0))
++		return;
++
++	local_irq_disable();
++	if (current->softirq_nestcnt == 1 && current->softirqs_raised)
++		do_current_softirqs();
++	local_irq_enable();
++
++	if (--current->softirq_nestcnt == 0)
++		migrate_enable();
++}
++EXPORT_SYMBOL(__local_bh_enable);
++
++int in_serving_softirq(void)
++{
++	return current->flags & PF_IN_SOFTIRQ;
++}
++EXPORT_SYMBOL(in_serving_softirq);
++
++/* Called with preemption disabled */
++static void run_ksoftirqd(unsigned int cpu)
++{
++	local_irq_disable();
++	current->softirq_nestcnt++;
++
++	do_current_softirqs();
++	current->softirq_nestcnt--;
++	local_irq_enable();
++	cond_resched_rcu_qs();
++}
++
++/*
++ * Called from netif_rx_ni(). Preemption enabled, but migration
++ * disabled. So the cpu can't go away under us.
++ */
++void thread_do_softirq(void)
++{
++	if (!in_serving_softirq() && current->softirqs_raised) {
++		current->softirq_nestcnt++;
++		do_current_softirqs();
++		current->softirq_nestcnt--;
++	}
++}
++
++static void do_raise_softirq_irqoff(unsigned int nr)
++{
++	trace_softirq_raise(nr);
++	or_softirq_pending(1UL << nr);
++
++	/*
++	 * If we are not in a hard interrupt and inside a bh disabled
++	 * region, we simply raise the flag on current. local_bh_enable()
++	 * will make sure that the softirq is executed. Otherwise we
++	 * delegate it to ksoftirqd.
++	 */
++	if (!in_irq() && current->softirq_nestcnt)
++		current->softirqs_raised |= (1U << nr);
++	else if (__this_cpu_read(ksoftirqd))
++		__this_cpu_read(ksoftirqd)->softirqs_raised |= (1U << nr);
++}
++
++void __raise_softirq_irqoff(unsigned int nr)
++{
++	do_raise_softirq_irqoff(nr);
++	if (!in_irq() && !current->softirq_nestcnt)
++		wakeup_softirqd();
++}
++
++/*
++ * This function must run with irqs disabled!
++ */
++void raise_softirq_irqoff(unsigned int nr)
++{
++	do_raise_softirq_irqoff(nr);
++
++	/*
++	 * If we're in an hard interrupt we let irq return code deal
++	 * with the wakeup of ksoftirqd.
++	 */
++	if (in_irq())
++		return;
++	/*
++	 * If we are in thread context but outside of a bh disabled
++	 * region, we need to wake ksoftirqd as well.
++	 *
++	 * CHECKME: Some of the places which do that could be wrapped
++	 * into local_bh_disable/enable pairs. Though it's unclear
++	 * whether this is worth the effort. To find those places just
++	 * raise a WARN() if the condition is met.
++	 */
++	if (!current->softirq_nestcnt)
++		wakeup_softirqd();
++}
++
++static inline int ksoftirqd_softirq_pending(void)
++{
++	return current->softirqs_raised;
++}
++
++static inline void local_bh_disable_nort(void) { }
++static inline void _local_bh_enable_nort(void) { }
++
++static inline void ksoftirqd_set_sched_params(unsigned int cpu)
++{
++	struct sched_param param = { .sched_priority = 1 };
++
++	sched_setscheduler(current, SCHED_FIFO, &param);
++	/* Take over all pending softirqs when starting */
++	local_irq_disable();
++	current->softirqs_raised = local_softirq_pending();
++	local_irq_enable();
++}
++
++static inline void ksoftirqd_clr_sched_params(unsigned int cpu, bool online)
++{
++	struct sched_param param = { .sched_priority = 0 };
++
++	sched_setscheduler(current, SCHED_NORMAL, &param);
++}
++
++#endif /* PREEMPT_RT_FULL */
++/*
+  * Enter an interrupt context.
+  */
+ void irq_enter(void)
+@@ -342,9 +706,9 @@ void irq_enter(void)
+ 		 * Prevent raise_softirq from needlessly waking up ksoftirqd
+ 		 * here, as softirq will be serviced on return from interrupt.
+ 		 */
+-		local_bh_disable();
++		local_bh_disable_nort();
+ 		tick_irq_enter();
+-		_local_bh_enable();
++		_local_bh_enable_nort();
+ 	}
+ 
+ 	__irq_enter();
+@@ -352,9 +716,13 @@ void irq_enter(void)
+ 
+ static inline void invoke_softirq(void)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	unsigned long flags;
++#endif
++
+ 	if (ksoftirqd_running())
+ 		return;
+-
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	if (!force_irqthreads) {
+ #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
+ 		/*
+@@ -374,6 +742,14 @@ static inline void invoke_softirq(void)
+ 	} else {
+ 		wakeup_softirqd();
+ 	}
++#else /* PREEMPT_RT_FULL */
++
++	local_irq_save(flags);
++	if (__this_cpu_read(ksoftirqd) &&
++			__this_cpu_read(ksoftirqd)->softirqs_raised)
++		wakeup_softirqd();
++	local_irq_restore(flags);
++#endif
+ }
+ 
+ static inline void tick_irq_exit(void)
+@@ -416,26 +792,6 @@ void irq_exit(void)
+ 	trace_hardirq_exit(); /* must be last! */
+ }
+ 
+-/*
+- * This function must run with irqs disabled!
+- */
+-inline void raise_softirq_irqoff(unsigned int nr)
+-{
+-	__raise_softirq_irqoff(nr);
+-
+-	/*
+-	 * If we're in an interrupt or softirq, we're done
+-	 * (this also catches softirq-disabled code). We will
+-	 * actually run the softirq once we return from
+-	 * the irq or softirq.
+-	 *
+-	 * Otherwise we wake up ksoftirqd to make sure we
+-	 * schedule the softirq soon.
+-	 */
+-	if (!in_interrupt())
+-		wakeup_softirqd();
+-}
+-
+ void raise_softirq(unsigned int nr)
+ {
+ 	unsigned long flags;
+@@ -445,12 +801,6 @@ void raise_softirq(unsigned int nr)
+ 	local_irq_restore(flags);
+ }
+ 
+-void __raise_softirq_irqoff(unsigned int nr)
+-{
+-	trace_softirq_raise(nr);
+-	or_softirq_pending(1UL << nr);
+-}
+-
+ void open_softirq(int nr, void (*action)(struct softirq_action *))
+ {
+ 	softirq_vec[nr].action = action;
+@@ -702,23 +1052,7 @@ EXPORT_SYMBOL(tasklet_unlock_wait);
+ 
+ static int ksoftirqd_should_run(unsigned int cpu)
+ {
+-	return local_softirq_pending();
+-}
+-
+-static void run_ksoftirqd(unsigned int cpu)
+-{
+-	local_irq_disable();
+-	if (local_softirq_pending()) {
+-		/*
+-		 * We can safely run softirq on inline stack, as we are not deep
+-		 * in the task stack here.
+-		 */
+-		__do_softirq();
+-		local_irq_enable();
+-		cond_resched_rcu_qs();
+-		return;
+-	}
+-	local_irq_enable();
++	return ksoftirqd_softirq_pending();
+ }
+ 
+ #ifdef CONFIG_HOTPLUG_CPU
+@@ -785,6 +1119,8 @@ static int takeover_tasklets(unsigned in
+ 
+ static struct smp_hotplug_thread softirq_threads = {
+ 	.store			= &ksoftirqd,
++	.setup			= ksoftirqd_set_sched_params,
++	.cleanup		= ksoftirqd_clr_sched_params,
+ 	.thread_should_run	= ksoftirqd_should_run,
+ 	.thread_fn		= run_ksoftirqd,
+ 	.thread_comm		= "ksoftirqd/%u",
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -910,14 +910,7 @@ static bool can_stop_idle_tick(int cpu,
+ 		return false;
+ 
+ 	if (unlikely(local_softirq_pending() && cpu_online(cpu))) {
+-		static int ratelimit;
+-
+-		if (ratelimit < 10 &&
+-		    (local_softirq_pending() & SOFTIRQ_STOP_IDLE_MASK)) {
+-			pr_warn("NOHZ: local_softirq_pending %02x\n",
+-				(unsigned int) local_softirq_pending());
+-			ratelimit++;
+-		}
++		softirq_check_pending_idle();
+ 		return false;
+ 	}
+ 
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -4073,11 +4073,9 @@ int netif_rx_ni(struct sk_buff *skb)
+ 
+ 	trace_netif_rx_ni_entry(skb);
+ 
+-	preempt_disable();
++	local_bh_disable();
+ 	err = netif_rx_internal(skb);
+-	if (local_softirq_pending())
+-		do_softirq();
+-	preempt_enable();
++	local_bh_enable();
+ 
+ 	return err;
+ }
diff --git a/kernel/patches-4.14.x-rt/0217-kernel-softirq-unlock-with-irqs-on.patch b/kernel/patches-4.14.x-rt/0217-kernel-softirq-unlock-with-irqs-on.patch
new file mode 100644
index 000000000..8ad12c5a8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0217-kernel-softirq-unlock-with-irqs-on.patch
@@ -0,0 +1,27 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 9 Feb 2016 18:17:18 +0100
+Subject: kernel: softirq: unlock with irqs on
+
+We unlock the lock while the interrupts are off. This isn't a problem
+now but will get because the migrate_disable() + enable are not
+symmetrical in regard to the status of interrupts.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/softirq.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -560,8 +560,10 @@ static void do_current_softirqs(void)
+ 			do_single_softirq(i);
+ 		}
+ 		softirq_clr_runner(i);
+-		unlock_softirq(i);
+ 		WARN_ON(current->softirq_nestcnt != 1);
++		local_irq_enable();
++		unlock_softirq(i);
++		local_irq_disable();
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0218-irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch b/kernel/patches-4.14.x-rt/0218-irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch
new file mode 100644
index 000000000..a20c8cb10
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0218-irq-allow-disabling-of-softirq-processing-in-irq-thread-context.patch
@@ -0,0 +1,146 @@
+Subject: genirq: Allow disabling of softirq processing in irq thread context
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 31 Jan 2012 13:01:27 +0100
+
+The processing of softirqs in irq thread context is a performance gain
+for the non-rt workloads of a system, but it's counterproductive for
+interrupts which are explicitely related to the realtime
+workload. Allow such interrupts to prevent softirq processing in their
+thread context.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/interrupt.h |    2 ++
+ include/linux/irq.h       |    4 +++-
+ kernel/irq/manage.c       |   13 ++++++++++++-
+ kernel/irq/settings.h     |   12 ++++++++++++
+ kernel/softirq.c          |    9 +++++++++
+ 5 files changed, 38 insertions(+), 2 deletions(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -64,6 +64,7 @@
+  *                interrupt handler after suspending interrupts. For system
+  *                wakeup devices users need to implement wakeup detection in
+  *                their interrupt handlers.
++ * IRQF_NO_SOFTIRQ_CALL - Do not process softirqs in the irq thread context (RT)
+  */
+ #define IRQF_SHARED		0x00000080
+ #define IRQF_PROBE_SHARED	0x00000100
+@@ -77,6 +78,7 @@
+ #define IRQF_NO_THREAD		0x00010000
+ #define IRQF_EARLY_RESUME	0x00020000
+ #define IRQF_COND_SUSPEND	0x00040000
++#define IRQF_NO_SOFTIRQ_CALL	0x00080000
+ 
+ #define IRQF_TIMER		(__IRQF_TIMER | IRQF_NO_SUSPEND | IRQF_NO_THREAD)
+ 
+--- a/include/linux/irq.h
++++ b/include/linux/irq.h
+@@ -74,6 +74,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 {
+@@ -101,13 +102,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)
+ 
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -922,7 +922,15 @@ irq_forced_thread_fn(struct irq_desc *de
+ 	local_bh_disable();
+ 	ret = action->thread_fn(action->irq, action->dev_id);
+ 	irq_finalize_oneshot(desc, action);
+-	local_bh_enable();
++	/*
++	 * Interrupts which have real time requirements can be set up
++	 * to avoid softirq processing in the thread handler. This is
++	 * safe as these interrupts do not raise soft interrupts.
++	 */
++	if (irq_settings_no_softirq_call(desc))
++		_local_bh_enable();
++	else
++		local_bh_enable();
+ 	return ret;
+ }
+ 
+@@ -1410,6 +1418,9 @@ static int
+ 			irqd_set(&desc->irq_data, IRQD_NO_BALANCING);
+ 		}
+ 
++		if (new->flags & IRQF_NO_SOFTIRQ_CALL)
++			irq_settings_set_no_softirq_call(desc);
++
+ 		if (irq_settings_can_autoenable(desc)) {
+ 			irq_startup(desc, IRQ_RESEND, IRQ_START_COND);
+ 		} else {
+--- a/kernel/irq/settings.h
++++ b/kernel/irq/settings.h
+@@ -17,6 +17,7 @@ enum {
+ 	_IRQ_PER_CPU_DEVID	= IRQ_PER_CPU_DEVID,
+ 	_IRQ_IS_POLLED		= IRQ_IS_POLLED,
+ 	_IRQ_DISABLE_UNLAZY	= IRQ_DISABLE_UNLAZY,
++	_IRQ_NO_SOFTIRQ_CALL	= IRQ_NO_SOFTIRQ_CALL,
+ 	_IRQF_MODIFY_MASK	= IRQF_MODIFY_MASK,
+ };
+ 
+@@ -31,6 +32,7 @@ enum {
+ #define IRQ_PER_CPU_DEVID	GOT_YOU_MORON
+ #define IRQ_IS_POLLED		GOT_YOU_MORON
+ #define IRQ_DISABLE_UNLAZY	GOT_YOU_MORON
++#define IRQ_NO_SOFTIRQ_CALL	GOT_YOU_MORON
+ #undef IRQF_MODIFY_MASK
+ #define IRQF_MODIFY_MASK	GOT_YOU_MORON
+ 
+@@ -41,6 +43,16 @@ irq_settings_clr_and_set(struct irq_desc
+ 	desc->status_use_accessors |= (set & _IRQF_MODIFY_MASK);
+ }
+ 
++static inline bool irq_settings_no_softirq_call(struct irq_desc *desc)
++{
++	return desc->status_use_accessors & _IRQ_NO_SOFTIRQ_CALL;
++}
++
++static inline void irq_settings_set_no_softirq_call(struct irq_desc *desc)
++{
++	desc->status_use_accessors |= _IRQ_NO_SOFTIRQ_CALL;
++}
++
+ static inline bool irq_settings_is_per_cpu(struct irq_desc *desc)
+ {
+ 	return desc->status_use_accessors & _IRQ_PER_CPU;
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -589,6 +589,15 @@ void __local_bh_enable(void)
+ }
+ EXPORT_SYMBOL(__local_bh_enable);
+ 
++void _local_bh_enable(void)
++{
++	if (WARN_ON(current->softirq_nestcnt == 0))
++		return;
++	if (--current->softirq_nestcnt == 0)
++		migrate_enable();
++}
++EXPORT_SYMBOL(_local_bh_enable);
++
+ int in_serving_softirq(void)
+ {
+ 	return current->flags & PF_IN_SOFTIRQ;
diff --git a/kernel/patches-4.14.x-rt/0219-softirq-split-timer-softirqs-out-of-ksoftirqd.patch b/kernel/patches-4.14.x-rt/0219-softirq-split-timer-softirqs-out-of-ksoftirqd.patch
new file mode 100644
index 000000000..3ecbe79bf
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0219-softirq-split-timer-softirqs-out-of-ksoftirqd.patch
@@ -0,0 +1,207 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 20 Jan 2016 16:34:17 +0100
+Subject: softirq: split timer softirqs out of ksoftirqd
+
+The softirqd runs in -RT with SCHED_FIFO (prio 1) and deals mostly with
+timer wakeup which can not happen in hardirq context. The prio has been
+risen from the normal SCHED_OTHER so the timer wakeup does not happen
+too late.
+With enough networking load it is possible that the system never goes
+idle and schedules ksoftirqd and everything else with a higher priority.
+One of the tasks left behind is one of RCU's threads and so we see stalls
+and eventually run out of memory.
+This patch moves the TIMER and HRTIMER softirqs out of the `ksoftirqd`
+thread into its own `ktimersoftd`. The former can now run SCHED_OTHER
+(same as mainline) and the latter at SCHED_FIFO due to the wakeups.
+
+From networking point of view: The NAPI callback runs after the network
+interrupt thread completes. If its run time takes too long the NAPI code
+itself schedules the `ksoftirqd`. Here in the thread it can run at
+SCHED_OTHER priority and it won't defer RCU anymore.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/softirq.c |   85 +++++++++++++++++++++++++++++++++++++++++++++++--------
+ 1 file changed, 73 insertions(+), 12 deletions(-)
+
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -58,6 +58,10 @@ EXPORT_SYMBOL(irq_stat);
+ static struct softirq_action softirq_vec[NR_SOFTIRQS] __cacheline_aligned_in_smp;
+ 
+ DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
++#ifdef CONFIG_PREEMPT_RT_FULL
++#define TIMER_SOFTIRQS ((1 << TIMER_SOFTIRQ) | (1 << HRTIMER_SOFTIRQ))
++DEFINE_PER_CPU(struct task_struct *, ktimer_softirqd);
++#endif
+ 
+ const char * const softirq_to_name[NR_SOFTIRQS] = {
+ 	"HI", "TIMER", "NET_TX", "NET_RX", "BLOCK", "IRQ_POLL",
+@@ -171,6 +175,17 @@ static void wakeup_softirqd(void)
+ 		wake_up_process(tsk);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void wakeup_timer_softirqd(void)
++{
++	/* Interrupts are disabled: no need to stop preemption */
++	struct task_struct *tsk = __this_cpu_read(ktimer_softirqd);
++
++	if (tsk && tsk->state != TASK_RUNNING)
++		wake_up_process(tsk);
++}
++#endif
++
+ static void handle_softirq(unsigned int vec_nr)
+ {
+ 	struct softirq_action *h = softirq_vec + vec_nr;
+@@ -484,7 +499,6 @@ void __raise_softirq_irqoff(unsigned int
+ static inline void local_bh_disable_nort(void) { local_bh_disable(); }
+ static inline void _local_bh_enable_nort(void) { _local_bh_enable(); }
+ static void ksoftirqd_set_sched_params(unsigned int cpu) { }
+-static void ksoftirqd_clr_sched_params(unsigned int cpu, bool online) { }
+ 
+ #else /* !PREEMPT_RT_FULL */
+ 
+@@ -631,8 +645,12 @@ void thread_do_softirq(void)
+ 
+ static void do_raise_softirq_irqoff(unsigned int nr)
+ {
++	unsigned int mask;
++
++	mask = 1UL << nr;
++
+ 	trace_softirq_raise(nr);
+-	or_softirq_pending(1UL << nr);
++	or_softirq_pending(mask);
+ 
+ 	/*
+ 	 * If we are not in a hard interrupt and inside a bh disabled
+@@ -641,16 +659,29 @@ static void do_raise_softirq_irqoff(unsi
+ 	 * delegate it to ksoftirqd.
+ 	 */
+ 	if (!in_irq() && current->softirq_nestcnt)
+-		current->softirqs_raised |= (1U << nr);
+-	else if (__this_cpu_read(ksoftirqd))
+-		__this_cpu_read(ksoftirqd)->softirqs_raised |= (1U << nr);
++		current->softirqs_raised |= mask;
++	else if (!__this_cpu_read(ksoftirqd) || !__this_cpu_read(ktimer_softirqd))
++		return;
++
++	if (mask & TIMER_SOFTIRQS)
++		__this_cpu_read(ktimer_softirqd)->softirqs_raised |= mask;
++	else
++		__this_cpu_read(ksoftirqd)->softirqs_raised |= mask;
++}
++
++static void wakeup_proper_softirq(unsigned int nr)
++{
++	if ((1UL << nr) & TIMER_SOFTIRQS)
++		wakeup_timer_softirqd();
++	else
++		wakeup_softirqd();
+ }
+ 
+ void __raise_softirq_irqoff(unsigned int nr)
+ {
+ 	do_raise_softirq_irqoff(nr);
+ 	if (!in_irq() && !current->softirq_nestcnt)
+-		wakeup_softirqd();
++		wakeup_proper_softirq(nr);
+ }
+ 
+ /*
+@@ -676,7 +707,7 @@ void raise_softirq_irqoff(unsigned int n
+ 	 * raise a WARN() if the condition is met.
+ 	 */
+ 	if (!current->softirq_nestcnt)
+-		wakeup_softirqd();
++		wakeup_proper_softirq(nr);
+ }
+ 
+ static inline int ksoftirqd_softirq_pending(void)
+@@ -689,22 +720,37 @@ static inline void _local_bh_enable_nort
+ 
+ static inline void ksoftirqd_set_sched_params(unsigned int cpu)
+ {
++	/* Take over all but timer pending softirqs when starting */
++	local_irq_disable();
++	current->softirqs_raised = local_softirq_pending() & ~TIMER_SOFTIRQS;
++	local_irq_enable();
++}
++
++static inline void ktimer_softirqd_set_sched_params(unsigned int cpu)
++{
+ 	struct sched_param param = { .sched_priority = 1 };
+ 
+ 	sched_setscheduler(current, SCHED_FIFO, &param);
+-	/* Take over all pending softirqs when starting */
++
++	/* Take over timer pending softirqs when starting */
+ 	local_irq_disable();
+-	current->softirqs_raised = local_softirq_pending();
++	current->softirqs_raised = local_softirq_pending() & TIMER_SOFTIRQS;
+ 	local_irq_enable();
+ }
+ 
+-static inline void ksoftirqd_clr_sched_params(unsigned int cpu, bool online)
++static inline void ktimer_softirqd_clr_sched_params(unsigned int cpu,
++						    bool online)
+ {
+ 	struct sched_param param = { .sched_priority = 0 };
+ 
+ 	sched_setscheduler(current, SCHED_NORMAL, &param);
+ }
+ 
++static int ktimer_softirqd_should_run(unsigned int cpu)
++{
++	return current->softirqs_raised;
++}
++
+ #endif /* PREEMPT_RT_FULL */
+ /*
+  * Enter an interrupt context.
+@@ -759,6 +805,9 @@ static inline void invoke_softirq(void)
+ 	if (__this_cpu_read(ksoftirqd) &&
+ 			__this_cpu_read(ksoftirqd)->softirqs_raised)
+ 		wakeup_softirqd();
++	if (__this_cpu_read(ktimer_softirqd) &&
++			__this_cpu_read(ktimer_softirqd)->softirqs_raised)
++		wakeup_timer_softirqd();
+ 	local_irq_restore(flags);
+ #endif
+ }
+@@ -1131,18 +1180,30 @@ static int takeover_tasklets(unsigned in
+ static struct smp_hotplug_thread softirq_threads = {
+ 	.store			= &ksoftirqd,
+ 	.setup			= ksoftirqd_set_sched_params,
+-	.cleanup		= ksoftirqd_clr_sched_params,
+ 	.thread_should_run	= ksoftirqd_should_run,
+ 	.thread_fn		= run_ksoftirqd,
+ 	.thread_comm		= "ksoftirqd/%u",
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static struct smp_hotplug_thread softirq_timer_threads = {
++	.store			= &ktimer_softirqd,
++	.setup			= ktimer_softirqd_set_sched_params,
++	.cleanup		= ktimer_softirqd_clr_sched_params,
++	.thread_should_run	= ktimer_softirqd_should_run,
++	.thread_fn		= run_ksoftirqd,
++	.thread_comm		= "ktimersoftd/%u",
++};
++#endif
++
+ static __init int spawn_ksoftirqd(void)
+ {
+ 	cpuhp_setup_state_nocalls(CPUHP_SOFTIRQ_DEAD, "softirq:dead", NULL,
+ 				  takeover_tasklets);
+ 	BUG_ON(smpboot_register_percpu_thread(&softirq_threads));
+-
++#ifdef CONFIG_PREEMPT_RT_FULL
++	BUG_ON(smpboot_register_percpu_thread(&softirq_timer_threads));
++#endif
+ 	return 0;
+ }
+ early_initcall(spawn_ksoftirqd);
diff --git a/kernel/patches-4.14.x-rt/0220-softirq-wake-the-timer-softirq-if-needed.patch b/kernel/patches-4.14.x-rt/0220-softirq-wake-the-timer-softirq-if-needed.patch
new file mode 100644
index 000000000..0fefa35d9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0220-softirq-wake-the-timer-softirq-if-needed.patch
@@ -0,0 +1,79 @@
+From: Mike Galbraith <efault@gmx.de>
+Date: Fri, 20 Jan 2017 18:10:20 +0100
+Subject: [PATCH] softirq: wake the timer softirq if needed
+
+The irq-exit path only checks the "normal"-softirq thread if it is
+running and ignores the state of the "timer"-softirq thread. It is possible
+that the timer-softirq thread is and has work pending which leads to the
+following warning:
+
+[   84.087571] NOHZ: local_softirq_pending 02
+[   84.087593] NOHZ: local_softirq_pending 02
+[   84.087598] NOHZ: local_softirq_pending 02
+[   84.087904] NOHZ: local_softirq_pending 02
+[   84.088526] NOHZ: local_softirq_pending 02
+[   84.088899] NOHZ: local_softirq_pending 02
+[   84.089463] NOHZ: local_softirq_pending 02
+[  115.013470] NOHZ: local_softirq_pending 02
+[  115.013601] NOHZ: local_softirq_pending 02
+[  115.013709] NOHZ: local_softirq_pending 02
+
+This was introduced during the timer-softirq split.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/softirq.c |   11 +++++------
+ 1 file changed, 5 insertions(+), 6 deletions(-)
+
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -28,6 +28,7 @@
+ #include <linux/tick.h>
+ #include <linux/locallock.h>
+ #include <linux/irq.h>
++#include <linux/sched/types.h>
+ 
+ #define CREATE_TRACE_POINTS
+ #include <trace/events/irq.h>
+@@ -206,6 +207,7 @@ static void handle_softirq(unsigned int
+ 	}
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /*
+  * 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.
+@@ -217,7 +219,6 @@ static bool ksoftirqd_running(void)
+ 	return tsk && (tsk->state == TASK_RUNNING);
+ }
+ 
+-#ifndef CONFIG_PREEMPT_RT_FULL
+ static inline int ksoftirqd_softirq_pending(void)
+ {
+ 	return local_softirq_pending();
+@@ -773,13 +774,10 @@ void irq_enter(void)
+ 
+ static inline void invoke_softirq(void)
+ {
+-#ifdef CONFIG_PREEMPT_RT_FULL
+-	unsigned long flags;
+-#endif
+-
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	if (ksoftirqd_running())
+ 		return;
+-#ifndef CONFIG_PREEMPT_RT_FULL
++
+ 	if (!force_irqthreads) {
+ #ifdef CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK
+ 		/*
+@@ -800,6 +798,7 @@ static inline void invoke_softirq(void)
+ 		wakeup_softirqd();
+ 	}
+ #else /* PREEMPT_RT_FULL */
++	unsigned long flags;
+ 
+ 	local_irq_save(flags);
+ 	if (__this_cpu_read(ksoftirqd) &&
diff --git a/kernel/patches-4.14.x-rt/0221-rtmutex-trylock-is-okay-on-RT.patch b/kernel/patches-4.14.x-rt/0221-rtmutex-trylock-is-okay-on-RT.patch
new file mode 100644
index 000000000..55da027d3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0221-rtmutex-trylock-is-okay-on-RT.patch
@@ -0,0 +1,27 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed 02 Dec 2015 11:34:07 +0100
+Subject: rtmutex: trylock is okay on -RT
+
+non-RT kernel could deadlock on rt_mutex_trylock() in softirq context. On
+-RT we don't run softirqs in IRQ context but in thread context so it is
+not a issue here.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1563,7 +1563,11 @@ int __sched rt_mutex_trylock(struct rt_m
+ {
+ 	int ret;
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (WARN_ON_ONCE(in_irq() || in_nmi()))
++#else
+ 	if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq()))
++#endif
+ 		return 0;
+ 
+ 	ret = rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
diff --git a/kernel/patches-4.14.x-rt/0222-fs-nfs-turn-rmdir_sem-into-a-semaphore.patch b/kernel/patches-4.14.x-rt/0222-fs-nfs-turn-rmdir_sem-into-a-semaphore.patch
new file mode 100644
index 000000000..28bc54ccc
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0222-fs-nfs-turn-rmdir_sem-into-a-semaphore.patch
@@ -0,0 +1,138 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 15 Sep 2016 10:51:27 +0200
+Subject: [PATCH] fs/nfs: turn rmdir_sem into a semaphore
+
+The RW semaphore had a reader side which used the _non_owner version
+because it most likely took the reader lock in one thread and released it
+in another which would cause lockdep to complain if the "regular"
+version was used.
+On -RT we need the owner because the rw lock is turned into a rtmutex.
+The semaphores on the hand are "plain simple" and should work as
+expected. We can't have multiple readers but on -RT we don't allow
+multiple readers anyway so that is not a loss.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/nfs/dir.c           |    8 ++++++++
+ fs/nfs/inode.c         |    4 ++++
+ fs/nfs/unlink.c        |   31 +++++++++++++++++++++++++++----
+ include/linux/nfs_fs.h |    4 ++++
+ 4 files changed, 43 insertions(+), 4 deletions(-)
+
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -1763,7 +1763,11 @@ int nfs_rmdir(struct inode *dir, struct
+ 
+ 	trace_nfs_rmdir_enter(dir, dentry);
+ 	if (d_really_is_positive(dentry)) {
++#ifdef CONFIG_PREEMPT_RT_BASE
++		down(&NFS_I(d_inode(dentry))->rmdir_sem);
++#else
+ 		down_write(&NFS_I(d_inode(dentry))->rmdir_sem);
++#endif
+ 		error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
+ 		/* Ensure the VFS deletes this inode */
+ 		switch (error) {
+@@ -1773,7 +1777,11 @@ int nfs_rmdir(struct inode *dir, struct
+ 		case -ENOENT:
+ 			nfs_dentry_handle_enoent(dentry);
+ 		}
++#ifdef CONFIG_PREEMPT_RT_BASE
++		up(&NFS_I(d_inode(dentry))->rmdir_sem);
++#else
+ 		up_write(&NFS_I(d_inode(dentry))->rmdir_sem);
++#endif
+ 	} else
+ 		error = NFS_PROTO(dir)->rmdir(dir, &dentry->d_name);
+ 	trace_nfs_rmdir_exit(dir, dentry, error);
+--- a/fs/nfs/inode.c
++++ b/fs/nfs/inode.c
+@@ -2014,7 +2014,11 @@ static void init_once(void *foo)
+ 	atomic_long_set(&nfsi->nrequests, 0);
+ 	atomic_long_set(&nfsi->commit_info.ncommit, 0);
+ 	atomic_set(&nfsi->commit_info.rpcs_out, 0);
++#ifdef CONFIG_PREEMPT_RT_BASE
++	sema_init(&nfsi->rmdir_sem, 1);
++#else
+ 	init_rwsem(&nfsi->rmdir_sem);
++#endif
+ 	mutex_init(&nfsi->commit_mutex);
+ 	nfs4_init_once(nfsi);
+ }
+--- a/fs/nfs/unlink.c
++++ b/fs/nfs/unlink.c
+@@ -52,6 +52,29 @@ static void nfs_async_unlink_done(struct
+ 		rpc_restart_call_prepare(task);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++static void nfs_down_anon(struct semaphore *sema)
++{
++	down(sema);
++}
++
++static void nfs_up_anon(struct semaphore *sema)
++{
++	up(sema);
++}
++
++#else
++static void nfs_down_anon(struct rw_semaphore *rwsem)
++{
++	down_read_non_owner(rwsem);
++}
++
++static void nfs_up_anon(struct rw_semaphore *rwsem)
++{
++	up_read_non_owner(rwsem);
++}
++#endif
++
+ /**
+  * nfs_async_unlink_release - Release the sillydelete data.
+  * @task: rpc_task of the sillydelete
+@@ -65,7 +88,7 @@ static void nfs_async_unlink_release(voi
+ 	struct dentry *dentry = data->dentry;
+ 	struct super_block *sb = dentry->d_sb;
+ 
+-	up_read_non_owner(&NFS_I(d_inode(dentry->d_parent))->rmdir_sem);
++	nfs_up_anon(&NFS_I(d_inode(dentry->d_parent))->rmdir_sem);
+ 	d_lookup_done(dentry);
+ 	nfs_free_unlinkdata(data);
+ 	dput(dentry);
+@@ -118,10 +141,10 @@ static int nfs_call_unlink(struct dentry
+ 	struct inode *dir = d_inode(dentry->d_parent);
+ 	struct dentry *alias;
+ 
+-	down_read_non_owner(&NFS_I(dir)->rmdir_sem);
++	nfs_down_anon(&NFS_I(dir)->rmdir_sem);
+ 	alias = d_alloc_parallel(dentry->d_parent, &data->args.name, &data->wq);
+ 	if (IS_ERR(alias)) {
+-		up_read_non_owner(&NFS_I(dir)->rmdir_sem);
++		nfs_up_anon(&NFS_I(dir)->rmdir_sem);
+ 		return 0;
+ 	}
+ 	if (!d_in_lookup(alias)) {
+@@ -143,7 +166,7 @@ static int nfs_call_unlink(struct dentry
+ 			ret = 0;
+ 		spin_unlock(&alias->d_lock);
+ 		dput(alias);
+-		up_read_non_owner(&NFS_I(dir)->rmdir_sem);
++		nfs_up_anon(&NFS_I(dir)->rmdir_sem);
+ 		/*
+ 		 * If we'd displaced old cached devname, free it.  At that
+ 		 * point dentry is definitely not a root, so we won't need
+--- a/include/linux/nfs_fs.h
++++ b/include/linux/nfs_fs.h
+@@ -162,7 +162,11 @@ struct nfs_inode {
+ 
+ 	/* Readers: in-flight sillydelete RPC calls */
+ 	/* Writers: rmdir */
++#ifdef CONFIG_PREEMPT_RT_BASE
++	struct semaphore        rmdir_sem;
++#else
+ 	struct rw_semaphore	rmdir_sem;
++#endif
+ 	struct mutex		commit_mutex;
+ 
+ #if IS_ENABLED(CONFIG_NFS_V4)
diff --git a/kernel/patches-4.14.x-rt/0223-rtmutex-futex-prepare-rt.patch b/kernel/patches-4.14.x-rt/0223-rtmutex-futex-prepare-rt.patch
new file mode 100644
index 000000000..74c3c6ecf
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0223-rtmutex-futex-prepare-rt.patch
@@ -0,0 +1,244 @@
+Subject: rtmutex: Handle the various new futex race conditions
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 10 Jun 2011 11:04:15 +0200
+
+RT opens a few new interesting race conditions in the rtmutex/futex
+combo due to futex hash bucket lock being a 'sleeping' spinlock and
+therefor not disabling preemption.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/futex.c                  |   77 ++++++++++++++++++++++++++++++++--------
+ kernel/locking/rtmutex.c        |   36 +++++++++++++++---
+ kernel/locking/rtmutex_common.h |    2 +
+ 3 files changed, 94 insertions(+), 21 deletions(-)
+
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -2104,6 +2104,16 @@ static int futex_requeue(u32 __user *uad
+ 				requeue_pi_wake_futex(this, &key2, hb2);
+ 				drop_count++;
+ 				continue;
++			} else if (ret == -EAGAIN) {
++				/*
++				 * Waiter was woken by timeout or
++				 * signal and has set pi_blocked_on to
++				 * PI_WAKEUP_INPROGRESS before we
++				 * tried to enqueue it on the rtmutex.
++				 */
++				this->pi_state = NULL;
++				put_pi_state(pi_state);
++				continue;
+ 			} else if (ret) {
+ 				/*
+ 				 * rt_mutex_start_proxy_lock() detected a
+@@ -3144,7 +3154,7 @@ static int futex_wait_requeue_pi(u32 __u
+ 	struct hrtimer_sleeper timeout, *to = NULL;
+ 	struct futex_pi_state *pi_state = NULL;
+ 	struct rt_mutex_waiter rt_waiter;
+-	struct futex_hash_bucket *hb;
++	struct futex_hash_bucket *hb, *hb2;
+ 	union futex_key key2 = FUTEX_KEY_INIT;
+ 	struct futex_q q = futex_q_init;
+ 	int res, ret;
+@@ -3202,20 +3212,55 @@ static int futex_wait_requeue_pi(u32 __u
+ 	/* Queue the futex_q, drop the hb lock, wait for wakeup. */
+ 	futex_wait_queue_me(hb, &q, to);
+ 
+-	spin_lock(&hb->lock);
+-	ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
+-	spin_unlock(&hb->lock);
+-	if (ret)
+-		goto out_put_keys;
++	/*
++	 * On RT we must avoid races with requeue and trying to block
++	 * on two mutexes (hb->lock and uaddr2's rtmutex) by
++	 * serializing access to pi_blocked_on with pi_lock.
++	 */
++	raw_spin_lock_irq(&current->pi_lock);
++	if (current->pi_blocked_on) {
++		/*
++		 * We have been requeued or are in the process of
++		 * being requeued.
++		 */
++		raw_spin_unlock_irq(&current->pi_lock);
++	} else {
++		/*
++		 * Setting pi_blocked_on to PI_WAKEUP_INPROGRESS
++		 * prevents a concurrent requeue from moving us to the
++		 * uaddr2 rtmutex. After that we can safely acquire
++		 * (and possibly block on) hb->lock.
++		 */
++		current->pi_blocked_on = PI_WAKEUP_INPROGRESS;
++		raw_spin_unlock_irq(&current->pi_lock);
++
++		spin_lock(&hb->lock);
++
++		/*
++		 * Clean up pi_blocked_on. We might leak it otherwise
++		 * when we succeeded with the hb->lock in the fast
++		 * path.
++		 */
++		raw_spin_lock_irq(&current->pi_lock);
++		current->pi_blocked_on = NULL;
++		raw_spin_unlock_irq(&current->pi_lock);
++
++		ret = handle_early_requeue_pi_wakeup(hb, &q, &key2, to);
++		spin_unlock(&hb->lock);
++		if (ret)
++			goto out_put_keys;
++	}
+ 
+ 	/*
+-	 * In order for us to be here, we know our q.key == key2, and since
+-	 * we took the hb->lock above, we also know that futex_requeue() has
+-	 * completed and we no longer have to concern ourselves with a wakeup
+-	 * race with the atomic proxy lock acquisition by the requeue code. The
+-	 * futex_requeue dropped our key1 reference and incremented our key2
+-	 * reference count.
++	 * In order to be here, we have either been requeued, are in
++	 * the process of being requeued, or requeue successfully
++	 * acquired uaddr2 on our behalf.  If pi_blocked_on was
++	 * non-null above, we may be racing with a requeue.  Do not
++	 * rely on q->lock_ptr to be hb2->lock until after blocking on
++	 * hb->lock or hb2->lock. The futex_requeue dropped our key1
++	 * reference and incremented our key2 reference count.
+ 	 */
++	hb2 = hash_futex(&key2);
+ 
+ 	/* Check if the requeue code acquired the second futex for us. */
+ 	if (!q.rt_waiter) {
+@@ -3224,7 +3269,8 @@ static int futex_wait_requeue_pi(u32 __u
+ 		 * did a lock-steal - fix up the PI-state in that case.
+ 		 */
+ 		if (q.pi_state && (q.pi_state->owner != current)) {
+-			spin_lock(q.lock_ptr);
++			spin_lock(&hb2->lock);
++			BUG_ON(&hb2->lock != q.lock_ptr);
+ 			ret = fixup_pi_state_owner(uaddr2, &q, current);
+ 			if (ret && rt_mutex_owner(&q.pi_state->pi_mutex) == current) {
+ 				pi_state = q.pi_state;
+@@ -3235,7 +3281,7 @@ static int futex_wait_requeue_pi(u32 __u
+ 			 * the requeue_pi() code acquired for us.
+ 			 */
+ 			put_pi_state(q.pi_state);
+-			spin_unlock(q.lock_ptr);
++			spin_unlock(&hb2->lock);
+ 		}
+ 	} else {
+ 		struct rt_mutex *pi_mutex;
+@@ -3249,7 +3295,8 @@ static int futex_wait_requeue_pi(u32 __u
+ 		pi_mutex = &q.pi_state->pi_mutex;
+ 		ret = rt_mutex_wait_proxy_lock(pi_mutex, to, &rt_waiter);
+ 
+-		spin_lock(q.lock_ptr);
++		spin_lock(&hb2->lock);
++		BUG_ON(&hb2->lock != q.lock_ptr);
+ 		if (ret && !rt_mutex_cleanup_proxy_lock(pi_mutex, &rt_waiter))
+ 			ret = 0;
+ 
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -135,6 +135,11 @@ static void fixup_rt_mutex_waiters(struc
+ 		WRITE_ONCE(*p, owner & ~RT_MUTEX_HAS_WAITERS);
+ }
+ 
++static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter)
++{
++	return waiter && waiter != PI_WAKEUP_INPROGRESS;
++}
++
+ /*
+  * We can speed up the acquire/release, if there's no debugging state to be
+  * set up.
+@@ -379,7 +384,8 @@ int max_lock_depth = 1024;
+ 
+ static inline struct rt_mutex *task_blocked_on_lock(struct task_struct *p)
+ {
+-	return p->pi_blocked_on ? p->pi_blocked_on->lock : NULL;
++	return rt_mutex_real_waiter(p->pi_blocked_on) ?
++		p->pi_blocked_on->lock : NULL;
+ }
+ 
+ /*
+@@ -515,7 +521,7 @@ static int rt_mutex_adjust_prio_chain(st
+ 	 * reached or the state of the chain has changed while we
+ 	 * dropped the locks.
+ 	 */
+-	if (!waiter)
++	if (!rt_mutex_real_waiter(waiter))
+ 		goto out_unlock_pi;
+ 
+ 	/*
+@@ -951,6 +957,22 @@ static int task_blocks_on_rt_mutex(struc
+ 		return -EDEADLK;
+ 
+ 	raw_spin_lock(&task->pi_lock);
++	/*
++	 * In the case of futex requeue PI, this will be a proxy
++	 * lock. The task will wake unaware that it is enqueueed on
++	 * this lock. Avoid blocking on two locks and corrupting
++	 * pi_blocked_on via the PI_WAKEUP_INPROGRESS
++	 * flag. futex_wait_requeue_pi() sets this when it wakes up
++	 * before requeue (due to a signal or timeout). Do not enqueue
++	 * the task if PI_WAKEUP_INPROGRESS is set.
++	 */
++	if (task != current && task->pi_blocked_on == PI_WAKEUP_INPROGRESS) {
++		raw_spin_unlock(&task->pi_lock);
++		return -EAGAIN;
++	}
++
++       BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on));
++
+ 	waiter->task = task;
+ 	waiter->lock = lock;
+ 	waiter->prio = task->prio;
+@@ -974,7 +996,7 @@ static int task_blocks_on_rt_mutex(struc
+ 		rt_mutex_enqueue_pi(owner, waiter);
+ 
+ 		rt_mutex_adjust_prio(owner);
+-		if (owner->pi_blocked_on)
++		if (rt_mutex_real_waiter(owner->pi_blocked_on))
+ 			chain_walk = 1;
+ 	} else if (rt_mutex_cond_detect_deadlock(waiter, chwalk)) {
+ 		chain_walk = 1;
+@@ -1070,7 +1092,7 @@ static void remove_waiter(struct rt_mute
+ {
+ 	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);
+ 
+@@ -1096,7 +1118,8 @@ static void remove_waiter(struct rt_mute
+ 	rt_mutex_adjust_prio(owner);
+ 
+ 	/* 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);
+ 
+@@ -1132,7 +1155,8 @@ void rt_mutex_adjust_pi(struct task_stru
+ 	raw_spin_lock_irqsave(&task->pi_lock, flags);
+ 
+ 	waiter = task->pi_blocked_on;
+-	if (!waiter || rt_mutex_waiter_equal(waiter, task_to_waiter(task))) {
++	if (!rt_mutex_real_waiter(waiter) ||
++	    rt_mutex_waiter_equal(waiter, task_to_waiter(task))) {
+ 		raw_spin_unlock_irqrestore(&task->pi_lock, flags);
+ 		return;
+ 	}
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -129,6 +129,8 @@ enum rtmutex_chainwalk {
+ /*
+  * PI-futex support (proxy locking functions, etc.):
+  */
++#define PI_WAKEUP_INPROGRESS	((struct rt_mutex_waiter *) 1)
++
+ extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
+ extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
+ 				       struct task_struct *proxy_owner);
diff --git a/kernel/patches-4.14.x-rt/0224-futex-requeue-pi-fix.patch b/kernel/patches-4.14.x-rt/0224-futex-requeue-pi-fix.patch
new file mode 100644
index 000000000..5034b3586
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0224-futex-requeue-pi-fix.patch
@@ -0,0 +1,113 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Tue, 14 Jul 2015 14:26:34 +0200
+Subject: futex: Fix bug on when a requeued RT task times out
+
+Requeue with timeout causes a bug with PREEMPT_RT_FULL.
+
+The bug comes from a timed out condition.
+
+
+	TASK 1				TASK 2
+	------				------
+    futex_wait_requeue_pi()
+	futex_wait_queue_me()
+	<timed out>
+
+					double_lock_hb();
+
+	raw_spin_lock(pi_lock);
+	if (current->pi_blocked_on) { 
+	} else {
+	    current->pi_blocked_on = PI_WAKE_INPROGRESS;
+	    run_spin_unlock(pi_lock);
+	    spin_lock(hb->lock); <-- blocked!
+
+
+					plist_for_each_entry_safe(this) {
+					    rt_mutex_start_proxy_lock();
+						task_blocks_on_rt_mutex();
+						BUG_ON(task->pi_blocked_on)!!!!
+
+The BUG_ON() actually has a check for PI_WAKE_INPROGRESS, but the
+problem is that, after TASK 1 sets PI_WAKE_INPROGRESS, it then tries to
+grab the hb->lock, which it fails to do so. As the hb->lock is a mutex,
+it will block and set the "pi_blocked_on" to the hb->lock.
+
+When TASK 2 goes to requeue it, the check for PI_WAKE_INPROGESS fails
+because the task1's pi_blocked_on is no longer set to that, but instead,
+set to the hb->lock.
+
+The fix:
+
+When calling rt_mutex_start_proxy_lock() a check is made to see
+if the proxy tasks pi_blocked_on is set. If so, exit out early.
+Otherwise set it to a new flag PI_REQUEUE_INPROGRESS, which notifies
+the proxy task that it is being requeued, and will handle things
+appropriately.
+
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/locking/rtmutex.c        |   32 +++++++++++++++++++++++++++++++-
+ kernel/locking/rtmutex_common.h |    1 +
+ 2 files changed, 32 insertions(+), 1 deletion(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -137,7 +137,8 @@ static void fixup_rt_mutex_waiters(struc
+ 
+ static int rt_mutex_real_waiter(struct rt_mutex_waiter *waiter)
+ {
+-	return waiter && waiter != PI_WAKEUP_INPROGRESS;
++	return waiter && waiter != PI_WAKEUP_INPROGRESS &&
++		waiter != PI_REQUEUE_INPROGRESS;
+ }
+ 
+ /*
+@@ -1742,6 +1743,35 @@ int __rt_mutex_start_proxy_lock(struct r
+ 	if (try_to_take_rt_mutex(lock, task, NULL))
+ 		return 1;
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	/*
++	 * In PREEMPT_RT there's an added race.
++	 * If the task, that we are about to requeue, times out,
++	 * it can set the PI_WAKEUP_INPROGRESS. This tells the requeue
++	 * to skip this task. But right after the task sets
++	 * its pi_blocked_on to PI_WAKEUP_INPROGRESS it can then
++	 * block on the spin_lock(&hb->lock), which in RT is an rtmutex.
++	 * This will replace the PI_WAKEUP_INPROGRESS with the actual
++	 * lock that it blocks on. We *must not* place this task
++	 * on this proxy lock in that case.
++	 *
++	 * To prevent this race, we first take the task's pi_lock
++	 * and check if it has updated its pi_blocked_on. If it has,
++	 * we assume that it woke up and we return -EAGAIN.
++	 * Otherwise, we set the task's pi_blocked_on to
++	 * PI_REQUEUE_INPROGRESS, so that if the task is waking up
++	 * it will know that we are in the process of requeuing it.
++	 */
++	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 -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);
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -130,6 +130,7 @@ enum rtmutex_chainwalk {
+  * PI-futex support (proxy locking functions, etc.):
+  */
+ #define PI_WAKEUP_INPROGRESS	((struct rt_mutex_waiter *) 1)
++#define PI_REQUEUE_INPROGRESS	((struct rt_mutex_waiter *) 2)
+ 
+ extern struct task_struct *rt_mutex_next_owner(struct rt_mutex *lock);
+ extern void rt_mutex_init_proxy_locked(struct rt_mutex *lock,
diff --git a/kernel/patches-4.14.x-rt/0225-locking-rtmutex-don-t-drop-the-wait_lock-twice.patch b/kernel/patches-4.14.x-rt/0225-locking-rtmutex-don-t-drop-the-wait_lock-twice.patch
new file mode 100644
index 000000000..3cbe9b669
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0225-locking-rtmutex-don-t-drop-the-wait_lock-twice.patch
@@ -0,0 +1,29 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 7 Sep 2017 12:38:47 +0200
+Subject: locking/rtmutex: don't drop the wait_lock twice
+
+Since the futex rework, __rt_mutex_start_proxy_lock() does no longer
+acquire the wait_lock so it must not drop it. Otherwise the lock is not
+only unlocked twice but also the preemption counter is underflown.
+
+It is okay to remove that line because this function does not disable
+interrupts nor does it acquire the ->wait_lock. The caller does this so it is
+wrong do it here (after the futex rework).
+
+Cc: stable-rt@vger.kernel.org #v4.9.18-rt14+
+Reported-by: Gusenleitner Klaus <gus@keba.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1765,7 +1765,6 @@ int __rt_mutex_start_proxy_lock(struct r
+ 	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 -EAGAIN;
+ 	}
+ 	task->pi_blocked_on = PI_REQUEUE_INPROGRESS;
diff --git a/kernel/patches-4.14.x-rt/0226-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch b/kernel/patches-4.14.x-rt/0226-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch
new file mode 100644
index 000000000..77da6fac4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0226-futex-Ensure-lock-unlock-symetry-versus-pi_lock-and-.patch
@@ -0,0 +1,42 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 1 Mar 2013 11:17:42 +0100
+Subject: futex: Ensure lock/unlock symetry versus pi_lock and hash bucket lock
+
+In exit_pi_state_list() we have the following locking construct:
+
+   spin_lock(&hb->lock);
+   raw_spin_lock_irq(&curr->pi_lock);
+
+   ...
+   spin_unlock(&hb->lock);
+
+In !RT this works, but on RT the migrate_enable() function which is
+called from spin_unlock() sees atomic context due to the held pi_lock
+and just decrements the migrate_disable_atomic counter of the
+task. Now the next call to migrate_disable() sees the counter being
+negative and issues a warning. That check should be in
+migrate_enable() already.
+
+Fix this by dropping pi_lock before unlocking hb->lock and reaquire
+pi_lock after that again. This is safe as the loop code reevaluates
+head again under the pi_lock.
+
+Reported-by: Yong Zhang <yong.zhang@windriver.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/futex.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -936,7 +936,9 @@ void exit_pi_state_list(struct task_stru
+ 		if (head->next != next) {
+ 			/* retain curr->pi_lock for the loop invariant */
+ 			raw_spin_unlock(&pi_state->pi_mutex.wait_lock);
++			raw_spin_unlock_irq(&curr->pi_lock);
+ 			spin_unlock(&hb->lock);
++			raw_spin_lock_irq(&curr->pi_lock);
+ 			put_pi_state(pi_state);
+ 			continue;
+ 		}
diff --git a/kernel/patches-4.14.x-rt/0227-pid.h-include-atomic.h.patch b/kernel/patches-4.14.x-rt/0227-pid.h-include-atomic.h.patch
new file mode 100644
index 000000000..9510164b0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0227-pid.h-include-atomic.h.patch
@@ -0,0 +1,36 @@
+From: Grygorii Strashko <Grygorii.Strashko@linaro.org>
+Date: Tue, 21 Jul 2015 19:43:56 +0300
+Subject: pid.h: include atomic.h
+
+This patch fixes build error:
+  CC      kernel/pid_namespace.o
+In file included from kernel/pid_namespace.c:11:0:
+include/linux/pid.h: In function 'get_pid':
+include/linux/pid.h:78:3: error: implicit declaration of function 'atomic_inc' [-Werror=implicit-function-declaration]
+   atomic_inc(&pid->count);
+   ^
+which happens when
+ CONFIG_PROVE_LOCKING=n
+ CONFIG_DEBUG_SPINLOCK=n
+ CONFIG_DEBUG_MUTEXES=n
+ CONFIG_DEBUG_LOCK_ALLOC=n
+ CONFIG_PID_NS=y
+
+Vanilla gets this via spinlock.h.
+
+Signed-off-by: Grygorii Strashko <Grygorii.Strashko@linaro.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/pid.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/pid.h
++++ b/include/linux/pid.h
+@@ -3,6 +3,7 @@
+ #define _LINUX_PID_H
+ 
+ #include <linux/rculist.h>
++#include <linux/atomic.h>
+ 
+ enum pid_type
+ {
diff --git a/kernel/patches-4.14.x-rt/0228-arm-include-definition-for-cpumask_t.patch b/kernel/patches-4.14.x-rt/0228-arm-include-definition-for-cpumask_t.patch
new file mode 100644
index 000000000..4bb2672be
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0228-arm-include-definition-for-cpumask_t.patch
@@ -0,0 +1,24 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 22 Dec 2016 17:28:33 +0100
+Subject: [PATCH] arm: include definition for cpumask_t
+
+This definition gets pulled in by other files. With the (later) split of
+RCU and spinlock.h it won't compile anymore.
+The split is done in ("rbtree: don't include the rcu header").
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/include/asm/irq.h |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/arm/include/asm/irq.h
++++ b/arch/arm/include/asm/irq.h
+@@ -23,6 +23,8 @@
+ #endif
+ 
+ #ifndef __ASSEMBLY__
++#include <linux/cpumask.h>
++
+ struct irqaction;
+ struct pt_regs;
+ extern void migrate_irqs(void);
diff --git a/kernel/patches-4.14.x-rt/0229-locking-locktorture-Do-NOT-include-rwlock.h-directly.patch b/kernel/patches-4.14.x-rt/0229-locking-locktorture-Do-NOT-include-rwlock.h-directly.patch
new file mode 100644
index 000000000..f825a7f49
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0229-locking-locktorture-Do-NOT-include-rwlock.h-directly.patch
@@ -0,0 +1,26 @@
+From: "Wolfgang M. Reimer" <linuxball@gmail.com>
+Date: Tue, 21 Jul 2015 16:20:07 +0200
+Subject: locking: locktorture: Do NOT include rwlock.h directly
+
+Including rwlock.h directly will cause kernel builds to fail
+if CONFIG_PREEMPT_RT_FULL is defined. The correct header file
+(rwlock_rt.h OR rwlock.h) will be included by spinlock.h which
+is included by locktorture.c anyway.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Wolfgang M. Reimer <linuxball@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/locktorture.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/kernel/locking/locktorture.c
++++ b/kernel/locking/locktorture.c
+@@ -26,7 +26,6 @@
+ #include <linux/kthread.h>
+ #include <linux/sched/rt.h>
+ #include <linux/spinlock.h>
+-#include <linux/rwlock.h>
+ #include <linux/mutex.h>
+ #include <linux/rwsem.h>
+ #include <linux/smp.h>
diff --git a/kernel/patches-4.14.x-rt/0230-rtmutex-lock-killable.patch b/kernel/patches-4.14.x-rt/0230-rtmutex-lock-killable.patch
new file mode 100644
index 000000000..dddfc8f28
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0230-rtmutex-lock-killable.patch
@@ -0,0 +1,51 @@
+Subject: rtmutex: Add rtmutex_lock_killable()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 09 Jun 2011 11:43:52 +0200
+
+Add "killable" type to rtmutex. We need this since rtmutex are used as
+"normal" mutexes which do use this type.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/rtmutex.h  |    1 +
+ kernel/locking/rtmutex.c |   19 +++++++++++++++++++
+ 2 files changed, 20 insertions(+)
+
+--- a/include/linux/rtmutex.h
++++ b/include/linux/rtmutex.h
+@@ -108,6 +108,7 @@ extern void rt_mutex_destroy(struct rt_m
+ 
+ extern void rt_mutex_lock(struct rt_mutex *lock);
+ extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
++extern int rt_mutex_lock_killable(struct rt_mutex *lock);
+ extern int rt_mutex_timed_lock(struct rt_mutex *lock,
+ 			       struct hrtimer_sleeper *timeout);
+ 
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1543,6 +1543,25 @@ int __sched __rt_mutex_futex_trylock(str
+ }
+ 
+ /**
++ * rt_mutex_lock_killable - lock a rt_mutex killable
++ *
++ * @lock:              the rt_mutex to be locked
++ * @detect_deadlock:   deadlock detection on/off
++ *
++ * Returns:
++ *  0          on success
++ * -EINTR      when interrupted by a signal
++ * -EDEADLK    when the lock would deadlock (when deadlock detection is on)
++ */
++int __sched rt_mutex_lock_killable(struct rt_mutex *lock)
++{
++	might_sleep();
++
++	return rt_mutex_fastlock(lock, TASK_KILLABLE, rt_mutex_slowlock);
++}
++EXPORT_SYMBOL_GPL(rt_mutex_lock_killable);
++
++/**
+  * rt_mutex_timed_lock - lock a rt_mutex interruptible
+  *			the timeout structure is provided
+  *			by the caller
diff --git a/kernel/patches-4.14.x-rt/0231-rtmutex-Make-lock_killable-work.patch b/kernel/patches-4.14.x-rt/0231-rtmutex-Make-lock_killable-work.patch
new file mode 100644
index 000000000..cc50d7ea5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0231-rtmutex-Make-lock_killable-work.patch
@@ -0,0 +1,44 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 1 Apr 2017 12:50:59 +0200
+Subject: [PATCH] rtmutex: Make lock_killable work
+
+Locking an rt mutex killable does not work because signal handling is
+restricted to TASK_INTERRUPTIBLE.
+
+Use signal_pending_state() unconditionaly.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c |   19 +++++++------------
+ 1 file changed, 7 insertions(+), 12 deletions(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1201,18 +1201,13 @@ static int __sched
+ 		if (try_to_take_rt_mutex(lock, current, waiter))
+ 			break;
+ 
+-		/*
+-		 * TASK_INTERRUPTIBLE checks for signals and
+-		 * timeout. Ignored otherwise.
+-		 */
+-		if (likely(state == TASK_INTERRUPTIBLE)) {
+-			/* Signal pending? */
+-			if (signal_pending(current))
+-				ret = -EINTR;
+-			if (timeout && !timeout->task)
+-				ret = -ETIMEDOUT;
+-			if (ret)
+-				break;
++		if (timeout && !timeout->task) {
++			ret = -ETIMEDOUT;
++			break;
++		}
++		if (signal_pending_state(state, current)) {
++			ret = -EINTR;
++			break;
+ 		}
+ 
+ 		raw_spin_unlock_irq(&lock->wait_lock);
diff --git a/kernel/patches-4.14.x-rt/0232-spinlock-types-separate-raw.patch b/kernel/patches-4.14.x-rt/0232-spinlock-types-separate-raw.patch
new file mode 100644
index 000000000..08761b680
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0232-spinlock-types-separate-raw.patch
@@ -0,0 +1,210 @@
+Subject: spinlock: Split the lock types header
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 29 Jun 2011 19:34:01 +0200
+
+Split raw_spinlock into its own file and the remaining spinlock_t into
+its own non-RT header. The non-RT header will be replaced later by sleeping
+spinlocks.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/rwlock_types.h        |    4 +
+ include/linux/spinlock_types.h      |   74 ------------------------------------
+ include/linux/spinlock_types_nort.h |   33 ++++++++++++++++
+ include/linux/spinlock_types_raw.h  |   58 ++++++++++++++++++++++++++++
+ 4 files changed, 97 insertions(+), 72 deletions(-)
+
+--- 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
+ 
++#if !defined(__LINUX_SPINLOCK_TYPES_H)
++# error "Do not include directly, include spinlock_types.h"
++#endif
++
+ /*
+  * include/linux/rwlock_types.h - generic rwlock type definitions
+  *				  and initializers
+--- a/include/linux/spinlock_types.h
++++ b/include/linux/spinlock_types.h
+@@ -9,79 +9,9 @@
+  * Released under the General Public License (GPL).
+  */
+ 
+-#if defined(CONFIG_SMP)
+-# include <asm/spinlock_types.h>
+-#else
+-# include <linux/spinlock_types_up.h>
+-#endif
++#include <linux/spinlock_types_raw.h>
+ 
+-#include <linux/lockdep.h>
+-
+-typedef struct raw_spinlock {
+-	arch_spinlock_t raw_lock;
+-#ifdef CONFIG_GENERIC_LOCKBREAK
+-	unsigned int break_lock;
+-#endif
+-#ifdef CONFIG_DEBUG_SPINLOCK
+-	unsigned int magic, owner_cpu;
+-	void *owner;
+-#endif
+-#ifdef CONFIG_DEBUG_LOCK_ALLOC
+-	struct lockdep_map dep_map;
+-#endif
+-} raw_spinlock_t;
+-
+-#define SPINLOCK_MAGIC		0xdead4ead
+-
+-#define SPINLOCK_OWNER_INIT	((void *)-1L)
+-
+-#ifdef CONFIG_DEBUG_LOCK_ALLOC
+-# define SPIN_DEP_MAP_INIT(lockname)	.dep_map = { .name = #lockname }
+-#else
+-# define SPIN_DEP_MAP_INIT(lockname)
+-#endif
+-
+-#ifdef CONFIG_DEBUG_SPINLOCK
+-# define SPIN_DEBUG_INIT(lockname)		\
+-	.magic = SPINLOCK_MAGIC,		\
+-	.owner_cpu = -1,			\
+-	.owner = SPINLOCK_OWNER_INIT,
+-#else
+-# define SPIN_DEBUG_INIT(lockname)
+-#endif
+-
+-#define __RAW_SPIN_LOCK_INITIALIZER(lockname)	\
+-	{					\
+-	.raw_lock = __ARCH_SPIN_LOCK_UNLOCKED,	\
+-	SPIN_DEBUG_INIT(lockname)		\
+-	SPIN_DEP_MAP_INIT(lockname) }
+-
+-#define __RAW_SPIN_LOCK_UNLOCKED(lockname)	\
+-	(raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
+-
+-#define DEFINE_RAW_SPINLOCK(x)	raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
+-
+-typedef struct spinlock {
+-	union {
+-		struct raw_spinlock rlock;
+-
+-#ifdef CONFIG_DEBUG_LOCK_ALLOC
+-# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
+-		struct {
+-			u8 __padding[LOCK_PADSIZE];
+-			struct lockdep_map dep_map;
+-		};
+-#endif
+-	};
+-} spinlock_t;
+-
+-#define __SPIN_LOCK_INITIALIZER(lockname) \
+-	{ { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
+-
+-#define __SPIN_LOCK_UNLOCKED(lockname) \
+-	(spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
+-
+-#define DEFINE_SPINLOCK(x)	spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
++#include <linux/spinlock_types_nort.h>
+ 
+ #include <linux/rwlock_types.h>
+ 
+--- /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
++
++#ifndef __LINUX_SPINLOCK_TYPES_H
++#error "Do not include directly. Include spinlock_types.h instead"
++#endif
++
++/*
++ * The non RT version maps spinlocks to raw_spinlocks
++ */
++typedef struct spinlock {
++	union {
++		struct raw_spinlock rlock;
++
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++# define LOCK_PADSIZE (offsetof(struct raw_spinlock, dep_map))
++		struct {
++			u8 __padding[LOCK_PADSIZE];
++			struct lockdep_map dep_map;
++		};
++#endif
++	};
++} spinlock_t;
++
++#define __SPIN_LOCK_INITIALIZER(lockname) \
++	{ { .rlock = __RAW_SPIN_LOCK_INITIALIZER(lockname) } }
++
++#define __SPIN_LOCK_UNLOCKED(lockname) \
++	(spinlock_t ) __SPIN_LOCK_INITIALIZER(lockname)
++
++#define DEFINE_SPINLOCK(x)	spinlock_t x = __SPIN_LOCK_UNLOCKED(x)
++
++#endif
+--- /dev/null
++++ b/include/linux/spinlock_types_raw.h
+@@ -0,0 +1,58 @@
++#ifndef __LINUX_SPINLOCK_TYPES_RAW_H
++#define __LINUX_SPINLOCK_TYPES_RAW_H
++
++#include <linux/types.h>
++
++#if defined(CONFIG_SMP)
++# include <asm/spinlock_types.h>
++#else
++# include <linux/spinlock_types_up.h>
++#endif
++
++#include <linux/lockdep.h>
++
++typedef struct raw_spinlock {
++	arch_spinlock_t raw_lock;
++#ifdef CONFIG_GENERIC_LOCKBREAK
++	unsigned int break_lock;
++#endif
++#ifdef CONFIG_DEBUG_SPINLOCK
++	unsigned int magic, owner_cpu;
++	void *owner;
++#endif
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	struct lockdep_map dep_map;
++#endif
++} raw_spinlock_t;
++
++#define SPINLOCK_MAGIC		0xdead4ead
++
++#define SPINLOCK_OWNER_INIT	((void *)-1L)
++
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++# define SPIN_DEP_MAP_INIT(lockname)	.dep_map = { .name = #lockname }
++#else
++# define SPIN_DEP_MAP_INIT(lockname)
++#endif
++
++#ifdef CONFIG_DEBUG_SPINLOCK
++# define SPIN_DEBUG_INIT(lockname)		\
++	.magic = SPINLOCK_MAGIC,		\
++	.owner_cpu = -1,			\
++	.owner = SPINLOCK_OWNER_INIT,
++#else
++# define SPIN_DEBUG_INIT(lockname)
++#endif
++
++#define __RAW_SPIN_LOCK_INITIALIZER(lockname)	\
++	{					\
++	.raw_lock = __ARCH_SPIN_LOCK_UNLOCKED,	\
++	SPIN_DEBUG_INIT(lockname)		\
++	SPIN_DEP_MAP_INIT(lockname) }
++
++#define __RAW_SPIN_LOCK_UNLOCKED(lockname)	\
++	(raw_spinlock_t) __RAW_SPIN_LOCK_INITIALIZER(lockname)
++
++#define DEFINE_RAW_SPINLOCK(x)	raw_spinlock_t x = __RAW_SPIN_LOCK_UNLOCKED(x)
++
++#endif
diff --git a/kernel/patches-4.14.x-rt/0233-rtmutex-avoid-include-hell.patch b/kernel/patches-4.14.x-rt/0233-rtmutex-avoid-include-hell.patch
new file mode 100644
index 000000000..a3b55f5b7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0233-rtmutex-avoid-include-hell.patch
@@ -0,0 +1,23 @@
+Subject: rtmutex: Avoid include hell
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 29 Jun 2011 20:06:39 +0200
+
+Include only the required raw types. This avoids pulling in the
+complete spinlock header which in turn requires rtmutex.h at some point.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/rtmutex.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/include/linux/rtmutex.h
++++ b/include/linux/rtmutex.h
+@@ -15,7 +15,7 @@
+ 
+ #include <linux/linkage.h>
+ #include <linux/rbtree.h>
+-#include <linux/spinlock_types.h>
++#include <linux/spinlock_types_raw.h>
+ 
+ extern int max_lock_depth; /* for sysctl */
+ 
diff --git a/kernel/patches-4.14.x-rt/0234-rtmutex_dont_include_rcu.patch b/kernel/patches-4.14.x-rt/0234-rtmutex_dont_include_rcu.patch
new file mode 100644
index 000000000..d63e678a0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0234-rtmutex_dont_include_rcu.patch
@@ -0,0 +1,158 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Subject: rbtree: don't include the rcu header
+
+The RCU header pulls in spinlock.h and fails due not yet defined types:
+
+|In file included from include/linux/spinlock.h:275:0,
+|                 from include/linux/rcupdate.h:38,
+|                 from include/linux/rbtree.h:34,
+|                 from include/linux/rtmutex.h:17,
+|                 from include/linux/spinlock_types.h:18,
+|                 from kernel/bounds.c:13:
+|include/linux/rwlock_rt.h:16:38: error: unknown type name ‘rwlock_t’
+| extern void __lockfunc rt_write_lock(rwlock_t *rwlock);
+|                                      ^
+
+This patch moves the required RCU function from the rcupdate.h header file into
+a new header file which can be included by both users.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/rbtree.h             |    2 -
+ include/linux/rcu_assign_pointer.h |   54 +++++++++++++++++++++++++++++++++++++
+ include/linux/rcupdate.h           |   49 ---------------------------------
+ 3 files changed, 56 insertions(+), 49 deletions(-)
+
+--- a/include/linux/rbtree.h
++++ b/include/linux/rbtree.h
+@@ -31,7 +31,7 @@
+ 
+ #include <linux/kernel.h>
+ #include <linux/stddef.h>
+-#include <linux/rcupdate.h>
++#include <linux/rcu_assign_pointer.h>
+ 
+ struct rb_node {
+ 	unsigned long  __rb_parent_color;
+--- /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__
++#include <linux/compiler.h>
++#include <asm/barrier.h>
++
++/**
++ * RCU_INITIALIZER() - statically initialize an RCU-protected global variable
++ * @v: The value to statically initialize with.
++ */
++#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v)
++
++/**
++ * rcu_assign_pointer() - assign to RCU-protected pointer
++ * @p: pointer to assign to
++ * @v: value to assign (publish)
++ *
++ * Assigns the specified value to the specified RCU-protected
++ * pointer, ensuring that any concurrent RCU readers will see
++ * any prior initialization.
++ *
++ * Inserts memory barriers on architectures that require them
++ * (which is most of them), and also prevents the compiler from
++ * reordering the code that initializes the structure after the pointer
++ * assignment.  More importantly, this call documents which pointers
++ * will be dereferenced by RCU read-side code.
++ *
++ * In some special cases, you may use RCU_INIT_POINTER() instead
++ * of rcu_assign_pointer().  RCU_INIT_POINTER() is a bit faster due
++ * to the fact that it does not constrain either the CPU or the compiler.
++ * That said, using RCU_INIT_POINTER() when you should have used
++ * rcu_assign_pointer() is a very bad thing that results in
++ * impossible-to-diagnose memory corruption.  So please be careful.
++ * See the RCU_INIT_POINTER() comment header for details.
++ *
++ * Note that rcu_assign_pointer() evaluates each of its arguments only
++ * once, appearances notwithstanding.  One of the "extra" evaluations
++ * is in typeof() and the other visible only to sparse (__CHECKER__),
++ * neither of which actually execute the argument.  As with most cpp
++ * macros, this execute-arguments-only-once property is important, so
++ * please be careful when making changes to rcu_assign_pointer() and the
++ * other macros that it invokes.
++ */
++#define rcu_assign_pointer(p, v)					      \
++({									      \
++	uintptr_t _r_a_p__v = (uintptr_t)(v);				      \
++									      \
++	if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL)	      \
++		WRITE_ONCE((p), (typeof(p))(_r_a_p__v));		      \
++	else								      \
++		smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
++	_r_a_p__v;							      \
++})
++
++#endif
+--- a/include/linux/rcupdate.h
++++ b/include/linux/rcupdate.h
+@@ -42,6 +42,7 @@
+ #include <linux/lockdep.h>
+ #include <asm/processor.h>
+ #include <linux/cpumask.h>
++#include <linux/rcu_assign_pointer.h>
+ 
+ #define ULONG_CMP_GE(a, b)	(ULONG_MAX / 2 >= (a) - (b))
+ #define ULONG_CMP_LT(a, b)	(ULONG_MAX / 2 < (a) - (b))
+@@ -372,54 +373,6 @@ static inline void rcu_preempt_sleep_che
+ })
+ 
+ /**
+- * RCU_INITIALIZER() - statically initialize an RCU-protected global variable
+- * @v: The value to statically initialize with.
+- */
+-#define RCU_INITIALIZER(v) (typeof(*(v)) __force __rcu *)(v)
+-
+-/**
+- * rcu_assign_pointer() - assign to RCU-protected pointer
+- * @p: pointer to assign to
+- * @v: value to assign (publish)
+- *
+- * Assigns the specified value to the specified RCU-protected
+- * pointer, ensuring that any concurrent RCU readers will see
+- * any prior initialization.
+- *
+- * Inserts memory barriers on architectures that require them
+- * (which is most of them), and also prevents the compiler from
+- * reordering the code that initializes the structure after the pointer
+- * assignment.  More importantly, this call documents which pointers
+- * will be dereferenced by RCU read-side code.
+- *
+- * In some special cases, you may use RCU_INIT_POINTER() instead
+- * of rcu_assign_pointer().  RCU_INIT_POINTER() is a bit faster due
+- * to the fact that it does not constrain either the CPU or the compiler.
+- * That said, using RCU_INIT_POINTER() when you should have used
+- * rcu_assign_pointer() is a very bad thing that results in
+- * impossible-to-diagnose memory corruption.  So please be careful.
+- * See the RCU_INIT_POINTER() comment header for details.
+- *
+- * Note that rcu_assign_pointer() evaluates each of its arguments only
+- * once, appearances notwithstanding.  One of the "extra" evaluations
+- * is in typeof() and the other visible only to sparse (__CHECKER__),
+- * neither of which actually execute the argument.  As with most cpp
+- * macros, this execute-arguments-only-once property is important, so
+- * please be careful when making changes to rcu_assign_pointer() and the
+- * other macros that it invokes.
+- */
+-#define rcu_assign_pointer(p, v)					      \
+-({									      \
+-	uintptr_t _r_a_p__v = (uintptr_t)(v);				      \
+-									      \
+-	if (__builtin_constant_p(v) && (_r_a_p__v) == (uintptr_t)NULL)	      \
+-		WRITE_ONCE((p), (typeof(p))(_r_a_p__v));		      \
+-	else								      \
+-		smp_store_release(&p, RCU_INITIALIZER((typeof(p))_r_a_p__v)); \
+-	_r_a_p__v;							      \
+-})
+-
+-/**
+  * rcu_swap_protected() - swap an RCU and a regular pointer
+  * @rcu_ptr: RCU pointer
+  * @ptr: regular pointer
diff --git a/kernel/patches-4.14.x-rt/0235-rtmutex-Provide-rt_mutex_slowlock_locked.patch b/kernel/patches-4.14.x-rt/0235-rtmutex-Provide-rt_mutex_slowlock_locked.patch
new file mode 100644
index 000000000..c4aae473a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0235-rtmutex-Provide-rt_mutex_slowlock_locked.patch
@@ -0,0 +1,131 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 16:14:22 +0200
+Subject: rtmutex: Provide rt_mutex_slowlock_locked()
+
+This is the inner-part of rt_mutex_slowlock(), required for rwsem-rt.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c        |   70 ++++++++++++++++++++++------------------
+ kernel/locking/rtmutex_common.h |    6 +++
+ 2 files changed, 46 insertions(+), 30 deletions(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1244,35 +1244,16 @@ static void rt_mutex_handle_deadlock(int
+ 	}
+ }
+ 
+-/*
+- * Slow path lock function:
+- */
+-static int __sched
+-rt_mutex_slowlock(struct rt_mutex *lock, int state,
+-		  struct hrtimer_sleeper *timeout,
+-		  enum rtmutex_chainwalk chwalk)
++int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
++				     struct hrtimer_sleeper *timeout,
++				     enum rtmutex_chainwalk chwalk,
++				     struct rt_mutex_waiter *waiter)
+ {
+-	struct rt_mutex_waiter waiter;
+-	unsigned long flags;
+-	int ret = 0;
+-
+-	rt_mutex_init_waiter(&waiter);
+-
+-	/*
+-	 * 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 ret;
+ 
+ 	/* Try to acquire the lock again: */
+-	if (try_to_take_rt_mutex(lock, current, NULL)) {
+-		raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
++	if (try_to_take_rt_mutex(lock, current, NULL))
+ 		return 0;
+-	}
+ 
+ 	set_current_state(state);
+ 
+@@ -1280,17 +1261,18 @@ rt_mutex_slowlock(struct rt_mutex *lock,
+ 	if (unlikely(timeout))
+ 		hrtimer_start_expires(&timeout->timer, HRTIMER_MODE_ABS);
+ 
+-	ret = task_blocks_on_rt_mutex(lock, &waiter, current, chwalk);
++	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);
++		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);
++			remove_waiter(lock, waiter);
++		/* ww_mutex want to report EDEADLK/EALREADY, let them */
+ 	}
+ 
+ 	/*
+@@ -1298,6 +1280,34 @@ rt_mutex_slowlock(struct rt_mutex *lock,
+ 	 * 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,
++		  enum rtmutex_chainwalk chwalk)
++{
++	struct rt_mutex_waiter waiter;
++	unsigned long flags;
++	int ret = 0;
++
++	rt_mutex_init_waiter(&waiter);
++
++	/*
++	 * 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);
++
++	ret = rt_mutex_slowlock_locked(lock, state, timeout, chwalk, &waiter);
+ 
+ 	raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
+ 
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -158,6 +158,12 @@ extern bool __rt_mutex_futex_unlock(stru
+ 				 struct wake_q_head *wqh);
+ 
+ extern void rt_mutex_postunlock(struct wake_q_head *wake_q);
++/* RW semaphore special interface */
++
++int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
++				     struct hrtimer_sleeper *timeout,
++				     enum rtmutex_chainwalk chwalk,
++				     struct rt_mutex_waiter *waiter);
+ 
+ #ifdef CONFIG_DEBUG_RT_MUTEXES
+ # include "rtmutex-debug.h"
diff --git a/kernel/patches-4.14.x-rt/0236-rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch b/kernel/patches-4.14.x-rt/0236-rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch
new file mode 100644
index 000000000..2b5b99ae3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0236-rtmutex-export-lockdep-less-version-of-rt_mutex-s-lo.patch
@@ -0,0 +1,150 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 16:36:39 +0200
+Subject: rtmutex: export lockdep-less version of rt_mutex's lock,
+ trylock and unlock
+
+Required for lock implementation ontop of rtmutex.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c        |   70 +++++++++++++++++++++++++---------------
+ kernel/locking/rtmutex_common.h |    3 +
+ 2 files changed, 47 insertions(+), 26 deletions(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -1496,6 +1496,29 @@ rt_mutex_fastunlock(struct rt_mutex *loc
+ 		rt_mutex_postunlock(&wake_q);
+ }
+ 
++int __sched __rt_mutex_lock_state(struct rt_mutex *lock, int state)
++{
++	might_sleep();
++	return rt_mutex_fastlock(lock, state, NULL, rt_mutex_slowlock);
++}
++
++/**
++ * rt_mutex_lock_state - lock a rt_mutex with a given state
++ *
++ * @lock:      The rt_mutex to be locked
++ * @state:     The state to set when blocking on the rt_mutex
++ */
++static int __sched rt_mutex_lock_state(struct rt_mutex *lock, int state)
++{
++	int ret;
++
++	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
++	ret = __rt_mutex_lock_state(lock, state);
++	if (ret)
++		mutex_release(&lock->dep_map, 1, _RET_IP_);
++	return ret;
++}
++
+ /**
+  * rt_mutex_lock - lock a rt_mutex
+  *
+@@ -1503,10 +1526,7 @@ rt_mutex_fastunlock(struct rt_mutex *loc
+  */
+ void __sched rt_mutex_lock(struct rt_mutex *lock)
+ {
+-	might_sleep();
+-
+-	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+-	rt_mutex_fastlock(lock, TASK_UNINTERRUPTIBLE, rt_mutex_slowlock);
++	rt_mutex_lock_state(lock, TASK_UNINTERRUPTIBLE);
+ }
+ EXPORT_SYMBOL_GPL(rt_mutex_lock);
+ 
+@@ -1521,16 +1541,7 @@ EXPORT_SYMBOL_GPL(rt_mutex_lock);
+  */
+ int __sched rt_mutex_lock_interruptible(struct rt_mutex *lock)
+ {
+-	int ret;
+-
+-	might_sleep();
+-
+-	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+-	ret = rt_mutex_fastlock(lock, TASK_INTERRUPTIBLE, rt_mutex_slowlock);
+-	if (ret)
+-		mutex_release(&lock->dep_map, 1, _RET_IP_);
+-
+-	return ret;
++	return rt_mutex_lock_state(lock, TASK_INTERRUPTIBLE);
+ }
+ EXPORT_SYMBOL_GPL(rt_mutex_lock_interruptible);
+ 
+@@ -1556,13 +1567,10 @@ int __sched __rt_mutex_futex_trylock(str
+  * Returns:
+  *  0          on success
+  * -EINTR      when interrupted by a signal
+- * -EDEADLK    when the lock would deadlock (when deadlock detection is on)
+  */
+ int __sched rt_mutex_lock_killable(struct rt_mutex *lock)
+ {
+-	might_sleep();
+-
+-	return rt_mutex_fastlock(lock, TASK_KILLABLE, rt_mutex_slowlock);
++	return rt_mutex_lock_state(lock, TASK_KILLABLE);
+ }
+ EXPORT_SYMBOL_GPL(rt_mutex_lock_killable);
+ 
+@@ -1597,6 +1605,18 @@ rt_mutex_timed_lock(struct rt_mutex *loc
+ }
+ EXPORT_SYMBOL_GPL(rt_mutex_timed_lock);
+ 
++int __sched __rt_mutex_trylock(struct rt_mutex *lock)
++{
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (WARN_ON_ONCE(in_irq() || in_nmi()))
++#else
++	if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq()))
++#endif
++		return 0;
++
++	return rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
++}
++
+ /**
+  * rt_mutex_trylock - try to lock a rt_mutex
+  *
+@@ -1612,14 +1632,7 @@ int __sched rt_mutex_trylock(struct rt_m
+ {
+ 	int ret;
+ 
+-#ifdef CONFIG_PREEMPT_RT_FULL
+-	if (WARN_ON_ONCE(in_irq() || in_nmi()))
+-#else
+-	if (WARN_ON_ONCE(in_irq() || in_nmi() || in_serving_softirq()))
+-#endif
+-		return 0;
+-
+-	ret = rt_mutex_fasttrylock(lock, rt_mutex_slowtrylock);
++	ret = __rt_mutex_trylock(lock);
+ 	if (ret)
+ 		mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
+ 
+@@ -1627,6 +1640,11 @@ int __sched rt_mutex_trylock(struct rt_m
+ }
+ EXPORT_SYMBOL_GPL(rt_mutex_trylock);
+ 
++void __sched __rt_mutex_unlock(struct rt_mutex *lock)
++{
++	rt_mutex_fastunlock(lock, rt_mutex_slowunlock);
++}
++
+ /**
+  * rt_mutex_unlock - unlock a rt_mutex
+  *
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -160,6 +160,9 @@ extern bool __rt_mutex_futex_unlock(stru
+ extern void rt_mutex_postunlock(struct wake_q_head *wake_q);
+ /* RW semaphore special interface */
+ 
++extern int __rt_mutex_lock_state(struct rt_mutex *lock, int state);
++extern int __rt_mutex_trylock(struct rt_mutex *lock);
++extern void __rt_mutex_unlock(struct rt_mutex *lock);
+ int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
+ 				     struct hrtimer_sleeper *timeout,
+ 				     enum rtmutex_chainwalk chwalk,
diff --git a/kernel/patches-4.14.x-rt/0237-rtmutex-add-sleeping-lock-implementation.patch b/kernel/patches-4.14.x-rt/0237-rtmutex-add-sleeping-lock-implementation.patch
new file mode 100644
index 000000000..a06baa2f8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0237-rtmutex-add-sleeping-lock-implementation.patch
@@ -0,0 +1,1196 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 17:11:19 +0200
+Subject: rtmutex: add sleeping lock implementation
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/kernel.h            |    4 
+ include/linux/rtmutex.h           |   21 +
+ include/linux/sched.h             |    9 
+ include/linux/sched/wake_q.h      |   27 ++
+ include/linux/spinlock_rt.h       |  159 +++++++++++++
+ include/linux/spinlock_types_rt.h |   48 ++++
+ kernel/fork.c                     |    1 
+ kernel/futex.c                    |   11 
+ kernel/locking/rtmutex.c          |  449 ++++++++++++++++++++++++++++++++++----
+ kernel/locking/rtmutex_common.h   |   15 +
+ kernel/sched/core.c               |   28 +-
+ 11 files changed, 713 insertions(+), 59 deletions(-)
+ create mode 100644 include/linux/spinlock_rt.h
+ create mode 100644 include/linux/spinlock_types_rt.h
+
+--- a/include/linux/kernel.h
++++ b/include/linux/kernel.h
+@@ -225,6 +225,9 @@ extern int _cond_resched(void);
+  */
+ # define might_sleep() \
+ 	do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
++
++# define might_sleep_no_state_check() \
++	do { ___might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0)
+ # define sched_annotate_sleep()	(current->task_state_change = 0)
+ #else
+   static inline void ___might_sleep(const char *file, int line,
+@@ -232,6 +235,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)
++# define might_sleep_no_state_check() do { might_resched(); } while (0)
+ # define sched_annotate_sleep() do { } while (0)
+ #endif
+ 
+--- a/include/linux/rtmutex.h
++++ b/include/linux/rtmutex.h
+@@ -14,11 +14,15 @@
+ #define __LINUX_RT_MUTEX_H
+ 
+ #include <linux/linkage.h>
+-#include <linux/rbtree.h>
+ #include <linux/spinlock_types_raw.h>
++#include <linux/rbtree.h>
+ 
+ extern int max_lock_depth; /* for sysctl */
+ 
++#ifdef CONFIG_DEBUG_MUTEXES
++#include <linux/debug_locks.h>
++#endif
++
+ /**
+  * The rt_mutex structure
+  *
+@@ -31,8 +35,8 @@ struct rt_mutex {
+ 	raw_spinlock_t		wait_lock;
+ 	struct rb_root_cached   waiters;
+ 	struct task_struct	*owner;
+-#ifdef CONFIG_DEBUG_RT_MUTEXES
+ 	int			save_state;
++#ifdef CONFIG_DEBUG_RT_MUTEXES
+ 	const char		*name, *file;
+ 	int			line;
+ 	void			*magic;
+@@ -82,16 +86,23 @@ do { \
+ #define __DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)
+ #endif
+ 
+-#define __RT_MUTEX_INITIALIZER(mutexname) \
+-	{ .wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
++#define __RT_MUTEX_INITIALIZER_PLAIN(mutexname) \
++	.wait_lock = __RAW_SPIN_LOCK_UNLOCKED(mutexname.wait_lock) \
+ 	, .waiters = RB_ROOT_CACHED \
+ 	, .owner = NULL \
+ 	__DEBUG_RT_MUTEX_INITIALIZER(mutexname) \
+-	__DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)}
++	__DEP_MAP_RT_MUTEX_INITIALIZER(mutexname)
++
++#define __RT_MUTEX_INITIALIZER(mutexname) \
++	{ __RT_MUTEX_INITIALIZER_PLAIN(mutexname) }
+ 
+ #define DEFINE_RT_MUTEX(mutexname) \
+ 	struct rt_mutex mutexname = __RT_MUTEX_INITIALIZER(mutexname)
+ 
++#define __RT_MUTEX_INITIALIZER_SAVE_STATE(mutexname) \
++	{ __RT_MUTEX_INITIALIZER_PLAIN(mutexname)    \
++		, .save_state = 1 }
++
+ /**
+  * rt_mutex_is_locked - is the mutex locked
+  * @lock: the mutex to be queried
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -123,6 +123,11 @@ struct task_group;
+ 		smp_store_mb(current->state, (state_value));	\
+ 	} while (0)
+ 
++#define __set_current_state_no_track(state_value)		\
++		current->state = (state_value);
++#define set_current_state_no_track(state_value)			\
++		smp_store_mb(current->state, (state_value));
++
+ #else
+ /*
+  * set_current_state() includes a barrier so that the write of current->state
+@@ -160,6 +165,9 @@ struct task_group;
+  */
+ #define __set_current_state(state_value) do { current->state = (state_value); } while (0)
+ #define set_current_state(state_value)	 smp_store_mb(current->state, (state_value))
++
++#define __set_current_state_no_track(state_value)	__set_current_state(state_value)
++#define set_current_state_no_track(state_value)		set_current_state(state_value)
+ #endif
+ 
+ /* Task command name length: */
+@@ -827,6 +835,7 @@ struct task_struct {
+ 	raw_spinlock_t			pi_lock;
+ 
+ 	struct wake_q_node		wake_q;
++	struct wake_q_node		wake_q_sleeper;
+ 
+ #ifdef CONFIG_RT_MUTEXES
+ 	/* PI waiters blocked on a rt_mutex held by this task: */
+--- a/include/linux/sched/wake_q.h
++++ b/include/linux/sched/wake_q.h
+@@ -47,8 +47,29 @@ static inline void wake_q_init(struct wa
+ 	head->lastp = &head->first;
+ }
+ 
+-extern void wake_q_add(struct wake_q_head *head,
+-		       struct task_struct *task);
+-extern void wake_up_q(struct wake_q_head *head);
++extern void __wake_q_add(struct wake_q_head *head,
++			 struct task_struct *task, bool sleeper);
++static inline void wake_q_add(struct wake_q_head *head,
++			      struct task_struct *task)
++{
++	__wake_q_add(head, task, false);
++}
++
++static inline void wake_q_add_sleeper(struct wake_q_head *head,
++				      struct task_struct *task)
++{
++	__wake_q_add(head, task, true);
++}
++
++extern void __wake_up_q(struct wake_q_head *head, bool sleeper);
++static inline void wake_up_q(struct wake_q_head *head)
++{
++	__wake_up_q(head, false);
++}
++
++static inline void wake_up_q_sleeper(struct wake_q_head *head)
++{
++	__wake_up_q(head, true);
++}
+ 
+ #endif /* _LINUX_SCHED_WAKE_Q_H */
+--- /dev/null
++++ b/include/linux/spinlock_rt.h
+@@ -0,0 +1,159 @@
++#ifndef __LINUX_SPINLOCK_RT_H
++#define __LINUX_SPINLOCK_RT_H
++
++#ifndef __LINUX_SPINLOCK_H
++#error Do not include directly. Use spinlock.h
++#endif
++
++#include <linux/bug.h>
++
++extern void
++__rt_spin_lock_init(spinlock_t *lock, const char *name, struct lock_class_key *key);
++
++#define spin_lock_init(slock)				\
++do {							\
++	static struct lock_class_key __key;		\
++							\
++	rt_mutex_init(&(slock)->lock);			\
++	__rt_spin_lock_init(slock, #slock, &__key);	\
++} while (0)
++
++extern void __lockfunc rt_spin_lock(spinlock_t *lock);
++extern unsigned long __lockfunc rt_spin_lock_trace_flags(spinlock_t *lock);
++extern void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass);
++extern void __lockfunc rt_spin_unlock(spinlock_t *lock);
++extern void __lockfunc rt_spin_unlock_wait(spinlock_t *lock);
++extern int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags);
++extern int __lockfunc rt_spin_trylock_bh(spinlock_t *lock);
++extern int __lockfunc rt_spin_trylock(spinlock_t *lock);
++extern int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock);
++
++/*
++ * lockdep-less calls, for derived types like rwlock:
++ * (for trylock they can use rt_mutex_trylock() directly.
++ * Migrate disable handling must be done at the call site.
++ */
++extern void __lockfunc __rt_spin_lock(struct rt_mutex *lock);
++extern void __lockfunc __rt_spin_trylock(struct rt_mutex *lock);
++extern void __lockfunc __rt_spin_unlock(struct rt_mutex *lock);
++
++#define spin_lock(lock)			rt_spin_lock(lock)
++
++#define spin_lock_bh(lock)			\
++	do {					\
++		local_bh_disable();		\
++		rt_spin_lock(lock);		\
++	} while (0)
++
++#define spin_lock_irq(lock)		spin_lock(lock)
++
++#define spin_do_trylock(lock)		__cond_lock(lock, rt_spin_trylock(lock))
++
++#define spin_trylock(lock)			\
++({						\
++	int __locked;				\
++	__locked = spin_do_trylock(lock);	\
++	__locked;				\
++})
++
++#ifdef CONFIG_LOCKDEP
++# define spin_lock_nested(lock, subclass)		\
++	do {						\
++		rt_spin_lock_nested(lock, subclass);	\
++	} while (0)
++
++#define spin_lock_bh_nested(lock, subclass)		\
++	do {						\
++		local_bh_disable();			\
++		rt_spin_lock_nested(lock, subclass);	\
++	} while (0)
++
++# define spin_lock_irqsave_nested(lock, flags, subclass) \
++	do {						 \
++		typecheck(unsigned long, flags);	 \
++		flags = 0;				 \
++		rt_spin_lock_nested(lock, subclass);	 \
++	} while (0)
++#else
++# define spin_lock_nested(lock, subclass)	spin_lock(lock)
++# define spin_lock_bh_nested(lock, subclass)	spin_lock_bh(lock)
++
++# define spin_lock_irqsave_nested(lock, flags, subclass) \
++	do {						 \
++		typecheck(unsigned long, flags);	 \
++		flags = 0;				 \
++		spin_lock(lock);			 \
++	} while (0)
++#endif
++
++#define spin_lock_irqsave(lock, flags)			 \
++	do {						 \
++		typecheck(unsigned long, flags);	 \
++		flags = 0;				 \
++		spin_lock(lock);			 \
++	} while (0)
++
++static inline unsigned long spin_lock_trace_flags(spinlock_t *lock)
++{
++	unsigned long flags = 0;
++#ifdef CONFIG_TRACE_IRQFLAGS
++	flags = rt_spin_lock_trace_flags(lock);
++#else
++	spin_lock(lock); /* lock_local */
++#endif
++	return flags;
++}
++
++/* FIXME: we need rt_spin_lock_nest_lock */
++#define spin_lock_nest_lock(lock, nest_lock) spin_lock_nested(lock, 0)
++
++#define spin_unlock(lock)			rt_spin_unlock(lock)
++
++#define spin_unlock_bh(lock)				\
++	do {						\
++		rt_spin_unlock(lock);			\
++		local_bh_enable();			\
++	} while (0)
++
++#define spin_unlock_irq(lock)		spin_unlock(lock)
++
++#define spin_unlock_irqrestore(lock, flags)		\
++	do {						\
++		typecheck(unsigned long, flags);	\
++		(void) flags;				\
++		spin_unlock(lock);			\
++	} while (0)
++
++#define spin_trylock_bh(lock)	__cond_lock(lock, rt_spin_trylock_bh(lock))
++#define spin_trylock_irq(lock)	spin_trylock(lock)
++
++#define spin_trylock_irqsave(lock, flags)	\
++	rt_spin_trylock_irqsave(lock, &(flags))
++
++#define spin_unlock_wait(lock)		rt_spin_unlock_wait(lock)
++
++#ifdef CONFIG_GENERIC_LOCKBREAK
++# define spin_is_contended(lock)	((lock)->break_lock)
++#else
++# define spin_is_contended(lock)	(((void)(lock), 0))
++#endif
++
++static inline int spin_can_lock(spinlock_t *lock)
++{
++	return !rt_mutex_is_locked(&lock->lock);
++}
++
++static inline int spin_is_locked(spinlock_t *lock)
++{
++	return rt_mutex_is_locked(&lock->lock);
++}
++
++static inline void assert_spin_locked(spinlock_t *lock)
++{
++	BUG_ON(!spin_is_locked(lock));
++}
++
++#define atomic_dec_and_lock(atomic, lock) \
++	atomic_dec_and_spin_lock(atomic, lock)
++
++#endif
+--- /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
++
++#ifndef __LINUX_SPINLOCK_TYPES_H
++#error "Do not include directly. Include spinlock_types.h instead"
++#endif
++
++#include <linux/cache.h>
++
++/*
++ * PREEMPT_RT: spinlocks - an RT mutex plus lock-break field:
++ */
++typedef struct spinlock {
++	struct rt_mutex		lock;
++	unsigned int		break_lock;
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	struct lockdep_map	dep_map;
++#endif
++} spinlock_t;
++
++#ifdef CONFIG_DEBUG_RT_MUTEXES
++# define __RT_SPIN_INITIALIZER(name) \
++	{ \
++	.wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock), \
++	.save_state = 1, \
++	.file = __FILE__, \
++	.line = __LINE__ , \
++	}
++#else
++# define __RT_SPIN_INITIALIZER(name) \
++	{								\
++	.wait_lock = __RAW_SPIN_LOCK_UNLOCKED(name.wait_lock),		\
++	.save_state = 1, \
++	}
++#endif
++
++/*
++.wait_list = PLIST_HEAD_INIT_RAW((name).lock.wait_list, (name).lock.wait_lock)
++*/
++
++#define __SPIN_LOCK_UNLOCKED(name)			\
++	{ .lock = __RT_SPIN_INITIALIZER(name.lock),		\
++	  SPIN_DEP_MAP_INIT(name) }
++
++#define DEFINE_SPINLOCK(name) \
++	spinlock_t name = __SPIN_LOCK_UNLOCKED(name)
++
++#endif
+--- a/kernel/fork.c
++++ b/kernel/fork.c
+@@ -600,6 +600,7 @@ static struct task_struct *dup_task_stru
+ 	tsk->splice_pipe = NULL;
+ 	tsk->task_frag.page = NULL;
+ 	tsk->wake_q.next = NULL;
++	tsk->wake_q_sleeper.next = NULL;
+ 
+ 	account_kernel_stack(tsk, 1);
+ 
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -1432,6 +1432,7 @@ static int wake_futex_pi(u32 __user *uad
+ 	struct task_struct *new_owner;
+ 	bool postunlock = false;
+ 	DEFINE_WAKE_Q(wake_q);
++	DEFINE_WAKE_Q(wake_sleeper_q);
+ 	int ret = 0;
+ 
+ 	new_owner = rt_mutex_next_owner(&pi_state->pi_mutex);
+@@ -1493,13 +1494,13 @@ static int wake_futex_pi(u32 __user *uad
+ 	pi_state->owner = new_owner;
+ 	raw_spin_unlock(&new_owner->pi_lock);
+ 
+-	postunlock = __rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q);
+-
++	postunlock = __rt_mutex_futex_unlock(&pi_state->pi_mutex, &wake_q,
++					     &wake_sleeper_q);
+ out_unlock:
+ 	raw_spin_unlock_irq(&pi_state->pi_mutex.wait_lock);
+ 
+ 	if (postunlock)
+-		rt_mutex_postunlock(&wake_q);
++		rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
+ 
+ 	return ret;
+ }
+@@ -2811,7 +2812,7 @@ static int futex_lock_pi(u32 __user *uad
+ 		goto no_block;
+ 	}
+ 
+-	rt_mutex_init_waiter(&rt_waiter);
++	rt_mutex_init_waiter(&rt_waiter, false);
+ 
+ 	/*
+ 	 * On PREEMPT_RT_FULL, when hb->lock becomes an rt_mutex, we must not
+@@ -3183,7 +3184,7 @@ static int futex_wait_requeue_pi(u32 __u
+ 	 * The waiter is allocated on our stack, manipulated by the requeue
+ 	 * code while we sleep on uaddr.
+ 	 */
+-	rt_mutex_init_waiter(&rt_waiter);
++	rt_mutex_init_waiter(&rt_waiter, false);
+ 
+ 	ret = get_futex_key(uaddr2, flags & FLAGS_SHARED, &key2, VERIFY_WRITE);
+ 	if (unlikely(ret != 0))
+--- 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
+  *  Copyright (C) 2006 Esben Nielsen
++ *  Adaptive Spinlocks:
++ *  Copyright (C) 2008 Novell, Inc., Gregory Haskins, Sven Dietrich,
++ *				     and Peter Morreale,
++ * Adaptive Spinlocks simplification:
++ *  Copyright (C) 2008 Red Hat, Inc., Steven Rostedt <srostedt@redhat.com>
+  *
+  *  See Documentation/locking/rt-mutex-design.txt for details.
+  */
+@@ -234,7 +239,7 @@ static inline bool unlock_rt_mutex_safe(
+  * Only use with rt_mutex_waiter_{less,equal}()
+  */
+ #define task_to_waiter(p)	\
+-	&(struct rt_mutex_waiter){ .prio = (p)->prio, .deadline = (p)->dl.deadline }
++	&(struct rt_mutex_waiter){ .prio = (p)->prio, .deadline = (p)->dl.deadline, .task = (p) }
+ 
+ static inline int
+ rt_mutex_waiter_less(struct rt_mutex_waiter *left,
+@@ -274,6 +279,27 @@ rt_mutex_waiter_equal(struct rt_mutex_wa
+ 	return 1;
+ }
+ 
++#define STEAL_NORMAL  0
++#define STEAL_LATERAL 1
++
++static inline int
++rt_mutex_steal(struct rt_mutex *lock, struct rt_mutex_waiter *waiter, int mode)
++{
++	struct rt_mutex_waiter *top_waiter = rt_mutex_top_waiter(lock);
++
++	if (waiter == top_waiter || rt_mutex_waiter_less(waiter, top_waiter))
++		return 1;
++
++	/*
++	 * Note that RT tasks are excluded from lateral-steals
++	 * to prevent the introduction of an unbounded latency.
++	 */
++	if (mode == STEAL_NORMAL || rt_task(waiter->task))
++		return 0;
++
++	return rt_mutex_waiter_equal(waiter, top_waiter);
++}
++
+ static void
+ rt_mutex_enqueue(struct rt_mutex *lock, struct rt_mutex_waiter *waiter)
+ {
+@@ -378,6 +404,14 @@ static bool rt_mutex_cond_detect_deadloc
+ 	return debug_rt_mutex_detect_deadlock(waiter, chwalk);
+ }
+ 
++static void rt_mutex_wake_waiter(struct rt_mutex_waiter *waiter)
++{
++	if (waiter->savestate)
++		wake_up_lock_sleeper(waiter->task);
++	else
++		wake_up_process(waiter->task);
++}
++
+ /*
+  * Max number of times we'll walk the boosting chain:
+  */
+@@ -703,13 +737,16 @@ static int rt_mutex_adjust_prio_chain(st
+ 	 * follow here. This is the end of the chain we are walking.
+ 	 */
+ 	if (!rt_mutex_owner(lock)) {
++		struct rt_mutex_waiter *lock_top_waiter;
++
+ 		/*
+ 		 * If the requeue [7] above changed the top waiter,
+ 		 * then we need to wake the new top waiter up to try
+ 		 * to get the lock.
+ 		 */
+-		if (prerequeue_top_waiter != rt_mutex_top_waiter(lock))
+-			wake_up_process(rt_mutex_top_waiter(lock)->task);
++		lock_top_waiter = rt_mutex_top_waiter(lock);
++		if (prerequeue_top_waiter != lock_top_waiter)
++			rt_mutex_wake_waiter(lock_top_waiter);
+ 		raw_spin_unlock_irq(&lock->wait_lock);
+ 		return 0;
+ 	}
+@@ -811,9 +848,11 @@ static int rt_mutex_adjust_prio_chain(st
+  * @task:   The task which wants to acquire the lock
+  * @waiter: The waiter that is queued to the lock's wait tree if the
+  *	    callsite called task_blocked_on_lock(), otherwise NULL
++ * @mode:   Lock steal mode (STEAL_NORMAL, STEAL_LATERAL)
+  */
+-static int try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
+-				struct rt_mutex_waiter *waiter)
++static int __try_to_take_rt_mutex(struct rt_mutex *lock,
++				  struct task_struct *task,
++				  struct rt_mutex_waiter *waiter, int mode)
+ {
+ 	lockdep_assert_held(&lock->wait_lock);
+ 
+@@ -849,12 +888,11 @@ static int try_to_take_rt_mutex(struct r
+ 	 */
+ 	if (waiter) {
+ 		/*
+-		 * If waiter is not the highest priority waiter of
+-		 * @lock, give up.
++		 * If waiter is not the highest priority waiter of @lock,
++		 * or its peer when lateral steal is allowed, give up.
+ 		 */
+-		if (waiter != rt_mutex_top_waiter(lock))
++		if (!rt_mutex_steal(lock, waiter, mode))
+ 			return 0;
+-
+ 		/*
+ 		 * We can acquire the lock. Remove the waiter from the
+ 		 * lock waiters tree.
+@@ -872,14 +910,12 @@ static int try_to_take_rt_mutex(struct r
+ 		 */
+ 		if (rt_mutex_has_waiters(lock)) {
+ 			/*
+-			 * If @task->prio is greater than or equal to
+-			 * the top waiter priority (kernel view),
+-			 * @task lost.
++			 * If @task->prio is greater than the top waiter
++			 * priority (kernel view), or equal to it when a
++			 * lateral steal is forbidden, @task lost.
+ 			 */
+-			if (!rt_mutex_waiter_less(task_to_waiter(task),
+-						  rt_mutex_top_waiter(lock)))
++			if (!rt_mutex_steal(lock, task_to_waiter(task), mode))
+ 				return 0;
+-
+ 			/*
+ 			 * The current top waiter stays enqueued. We
+ 			 * don't have to change anything in the lock
+@@ -926,6 +962,309 @@ static int try_to_take_rt_mutex(struct r
+ 	return 1;
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++/*
++ * preemptible spin_lock functions:
++ */
++static inline void rt_spin_lock_fastlock(struct rt_mutex *lock,
++					 void  (*slowfn)(struct rt_mutex *lock))
++{
++	might_sleep_no_state_check();
++
++	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
++		return;
++	else
++		slowfn(lock);
++}
++
++static inline void rt_spin_lock_fastunlock(struct rt_mutex *lock,
++					   void  (*slowfn)(struct rt_mutex *lock))
++{
++	if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
++		return;
++	else
++		slowfn(lock);
++}
++#ifdef CONFIG_SMP
++/*
++ * Note that owner is a speculative pointer and dereferencing relies
++ * on rcu_read_lock() and the check against the lock owner.
++ */
++static int adaptive_wait(struct rt_mutex *lock,
++			 struct task_struct *owner)
++{
++	int res = 0;
++
++	rcu_read_lock();
++	for (;;) {
++		if (owner != rt_mutex_owner(lock))
++			break;
++		/*
++		 * Ensure that owner->on_cpu is dereferenced _after_
++		 * checking the above to be valid.
++		 */
++		barrier();
++		if (!owner->on_cpu) {
++			res = 1;
++			break;
++		}
++		cpu_relax();
++	}
++	rcu_read_unlock();
++	return res;
++}
++#else
++static int adaptive_wait(struct rt_mutex *lock,
++			 struct task_struct *orig_owner)
++{
++	return 1;
++}
++#endif
++
++static int task_blocks_on_rt_mutex(struct rt_mutex *lock,
++				   struct rt_mutex_waiter *waiter,
++				   struct task_struct *task,
++				   enum rtmutex_chainwalk chwalk);
++/*
++ * Slow path lock function spin_lock style: this variant is very
++ * careful not to miss any non-lock wakeups.
++ *
++ * We store the current state under p->pi_lock in p->saved_state and
++ * the try_to_wake_up() code handles this accordingly.
++ */
++void __sched rt_spin_lock_slowlock_locked(struct rt_mutex *lock,
++					  struct rt_mutex_waiter *waiter,
++					  unsigned long flags)
++{
++	struct task_struct *lock_owner, *self = current;
++	struct rt_mutex_waiter *top_waiter;
++	int ret;
++
++	if (__try_to_take_rt_mutex(lock, self, NULL, STEAL_LATERAL))
++		return;
++
++	BUG_ON(rt_mutex_owner(lock) == self);
++
++	/*
++	 * 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().
++	 */
++	raw_spin_lock(&self->pi_lock);
++	self->saved_state = self->state;
++	__set_current_state_no_track(TASK_UNINTERRUPTIBLE);
++	raw_spin_unlock(&self->pi_lock);
++
++	ret = task_blocks_on_rt_mutex(lock, waiter, self, RT_MUTEX_MIN_CHAINWALK);
++	BUG_ON(ret);
++
++	for (;;) {
++		/* Try to acquire the lock again. */
++		if (__try_to_take_rt_mutex(lock, self, waiter, STEAL_LATERAL))
++			break;
++
++		top_waiter = rt_mutex_top_waiter(lock);
++		lock_owner = rt_mutex_owner(lock);
++
++		raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
++
++		debug_rt_mutex_print_deadlock(waiter);
++
++		if (top_waiter != waiter || adaptive_wait(lock, lock_owner))
++			schedule();
++
++		raw_spin_lock_irqsave(&lock->wait_lock, flags);
++
++		raw_spin_lock(&self->pi_lock);
++		__set_current_state_no_track(TASK_UNINTERRUPTIBLE);
++		raw_spin_unlock(&self->pi_lock);
++	}
++
++	/*
++	 * 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
++	 * happened while we were blocked. Clear saved_state so
++	 * try_to_wakeup() does not get confused.
++	 */
++	raw_spin_lock(&self->pi_lock);
++	__set_current_state_no_track(self->saved_state);
++	self->saved_state = TASK_RUNNING;
++	raw_spin_unlock(&self->pi_lock);
++
++	/*
++	 * try_to_take_rt_mutex() sets the waiter bit
++	 * unconditionally. We might have to fix that up:
++	 */
++	fixup_rt_mutex_waiters(lock);
++
++	BUG_ON(rt_mutex_has_waiters(lock) && waiter == rt_mutex_top_waiter(lock));
++	BUG_ON(!RB_EMPTY_NODE(&waiter->tree_entry));
++}
++
++static void noinline __sched rt_spin_lock_slowlock(struct rt_mutex *lock)
++{
++	struct rt_mutex_waiter waiter;
++	unsigned long flags;
++
++	rt_mutex_init_waiter(&waiter, true);
++
++	raw_spin_lock_irqsave(&lock->wait_lock, flags);
++	rt_spin_lock_slowlock_locked(lock, &waiter, flags);
++	raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
++	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);
++/*
++ * Slow path to release a rt_mutex spin_lock style
++ */
++void __sched rt_spin_lock_slowunlock(struct rt_mutex *lock)
++{
++	unsigned long flags;
++	DEFINE_WAKE_Q(wake_q);
++	DEFINE_WAKE_Q(wake_sleeper_q);
++	bool postunlock;
++
++	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);
++
++	if (postunlock)
++		rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
++}
++
++void __lockfunc rt_spin_lock(spinlock_t *lock)
++{
++	migrate_disable();
++	spin_acquire(&lock->dep_map, 0, 0, _RET_IP_);
++	rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock);
++}
++EXPORT_SYMBOL(rt_spin_lock);
++
++void __lockfunc __rt_spin_lock(struct rt_mutex *lock)
++{
++	rt_spin_lock_fastlock(lock, rt_spin_lock_slowlock);
++}
++
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++void __lockfunc rt_spin_lock_nested(spinlock_t *lock, int subclass)
++{
++	migrate_disable();
++	spin_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
++	rt_spin_lock_fastlock(&lock->lock, rt_spin_lock_slowlock);
++}
++EXPORT_SYMBOL(rt_spin_lock_nested);
++#endif
++
++void __lockfunc rt_spin_unlock(spinlock_t *lock)
++{
++	/* NOTE: we always pass in '1' for nested, for simplicity */
++	spin_release(&lock->dep_map, 1, _RET_IP_);
++	rt_spin_lock_fastunlock(&lock->lock, rt_spin_lock_slowunlock);
++	migrate_enable();
++}
++EXPORT_SYMBOL(rt_spin_unlock);
++
++void __lockfunc __rt_spin_unlock(struct rt_mutex *lock)
++{
++	rt_spin_lock_fastunlock(lock, rt_spin_lock_slowunlock);
++}
++EXPORT_SYMBOL(__rt_spin_unlock);
++
++/*
++ * Wait for the lock to get unlocked: instead of polling for an unlock
++ * (like raw spinlocks do), we lock and unlock, to force the kernel to
++ * schedule if there's contention:
++ */
++void __lockfunc rt_spin_unlock_wait(spinlock_t *lock)
++{
++	spin_lock(lock);
++	spin_unlock(lock);
++}
++EXPORT_SYMBOL(rt_spin_unlock_wait);
++
++int __lockfunc rt_spin_trylock(spinlock_t *lock)
++{
++	int ret;
++
++	migrate_disable();
++	ret = __rt_mutex_trylock(&lock->lock);
++	if (ret)
++		spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
++	else
++		migrate_enable();
++	return ret;
++}
++EXPORT_SYMBOL(rt_spin_trylock);
++
++int __lockfunc rt_spin_trylock_bh(spinlock_t *lock)
++{
++	int ret;
++
++	local_bh_disable();
++	ret = __rt_mutex_trylock(&lock->lock);
++	if (ret) {
++		migrate_disable();
++		spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
++	} else
++		local_bh_enable();
++	return ret;
++}
++EXPORT_SYMBOL(rt_spin_trylock_bh);
++
++int __lockfunc rt_spin_trylock_irqsave(spinlock_t *lock, unsigned long *flags)
++{
++	int ret;
++
++	*flags = 0;
++	ret = __rt_mutex_trylock(&lock->lock);
++	if (ret) {
++		migrate_disable();
++		spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
++	}
++	return ret;
++}
++EXPORT_SYMBOL(rt_spin_trylock_irqsave);
++
++int atomic_dec_and_spin_lock(atomic_t *atomic, spinlock_t *lock)
++{
++	/* Subtract 1 from counter unless that drops it to 0 (ie. it was 1) */
++	if (atomic_add_unless(atomic, -1, 1))
++		return 0;
++	rt_spin_lock(lock);
++	if (atomic_dec_and_test(atomic))
++		return 1;
++	rt_spin_unlock(lock);
++	return 0;
++}
++EXPORT_SYMBOL(atomic_dec_and_spin_lock);
++
++void
++__rt_spin_lock_init(spinlock_t *lock, const char *name, struct lock_class_key *key)
++{
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	/*
++	 * Make sure we are not reinitializing a held lock:
++	 */
++	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
++	lockdep_init_map(&lock->dep_map, name, key, 0);
++#endif
++}
++EXPORT_SYMBOL(__rt_spin_lock_init);
++
++#endif /* PREEMPT_RT_FULL */
++
++static inline int
++try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
++		     struct rt_mutex_waiter *waiter)
++{
++	return __try_to_take_rt_mutex(lock, task, waiter, STEAL_NORMAL);
++}
++
+ /*
+  * Task blocks on lock.
+  *
+@@ -1039,6 +1378,7 @@ static int task_blocks_on_rt_mutex(struc
+  * 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;
+@@ -1078,7 +1418,10 @@ static void mark_wakeup_next_waiter(stru
+ 	 * Pairs with preempt_enable() in rt_mutex_postunlock();
+ 	 */
+ 	preempt_disable();
+-	wake_q_add(wake_q, waiter->task);
++	if (waiter->savestate)
++		wake_q_add_sleeper(wake_sleeper_q, waiter->task);
++	else
++		wake_q_add(wake_q, waiter->task);
+ 	raw_spin_unlock(&current->pi_lock);
+ }
+ 
+@@ -1162,21 +1505,22 @@ void rt_mutex_adjust_pi(struct task_stru
+ 		return;
+ 	}
+ 	next_lock = waiter->lock;
+-	raw_spin_unlock_irqrestore(&task->pi_lock, flags);
+ 
+ 	/* gets dropped in rt_mutex_adjust_prio_chain()! */
+ 	get_task_struct(task);
+ 
++	raw_spin_unlock_irqrestore(&task->pi_lock, flags);
+ 	rt_mutex_adjust_prio_chain(task, RT_MUTEX_MIN_CHAINWALK, NULL,
+ 				   next_lock, NULL, task);
+ }
+ 
+-void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter)
++void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter, bool savestate)
+ {
+ 	debug_rt_mutex_init_waiter(waiter);
+ 	RB_CLEAR_NODE(&waiter->pi_tree_entry);
+ 	RB_CLEAR_NODE(&waiter->tree_entry);
+ 	waiter->task = NULL;
++	waiter->savestate = savestate;
+ }
+ 
+ /**
+@@ -1295,7 +1639,7 @@ rt_mutex_slowlock(struct rt_mutex *lock,
+ 	unsigned long flags;
+ 	int ret = 0;
+ 
+-	rt_mutex_init_waiter(&waiter);
++	rt_mutex_init_waiter(&waiter, false);
+ 
+ 	/*
+ 	 * Technically we could use raw_spin_[un]lock_irq() here, but this can
+@@ -1368,7 +1712,8 @@ static inline int rt_mutex_slowtrylock(s
+  * Return whether the current task needs to call rt_mutex_postunlock().
+  */
+ static bool __sched rt_mutex_slowunlock(struct rt_mutex *lock,
+-					struct wake_q_head *wake_q)
++					struct wake_q_head *wake_q,
++					struct wake_q_head *wake_sleeper_q)
+ {
+ 	unsigned long flags;
+ 
+@@ -1422,7 +1767,7 @@ static bool __sched rt_mutex_slowunlock(
+ 	 *
+ 	 * Queue the next waiter for wakeup once we release the wait_lock.
+ 	 */
+-	mark_wakeup_next_waiter(wake_q, lock);
++	mark_wakeup_next_waiter(wake_q, wake_sleeper_q, lock);
+ 	raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
+ 
+ 	return true; /* call rt_mutex_postunlock() */
+@@ -1474,9 +1819,11 @@ rt_mutex_fasttrylock(struct rt_mutex *lo
+ /*
+  * Performs the wakeup of the the top-waiter and re-enables preemption.
+  */
+-void rt_mutex_postunlock(struct wake_q_head *wake_q)
++void rt_mutex_postunlock(struct wake_q_head *wake_q,
++			 struct wake_q_head *wake_sleeper_q)
+ {
+ 	wake_up_q(wake_q);
++	wake_up_q_sleeper(wake_sleeper_q);
+ 
+ 	/* Pairs with preempt_disable() in rt_mutex_slowunlock() */
+ 	preempt_enable();
+@@ -1485,15 +1832,17 @@ void rt_mutex_postunlock(struct wake_q_h
+ static inline void
+ rt_mutex_fastunlock(struct rt_mutex *lock,
+ 		    bool (*slowfn)(struct rt_mutex *lock,
+-				   struct wake_q_head *wqh))
++				   struct wake_q_head *wqh,
++				   struct wake_q_head *wq_sleeper))
+ {
+ 	DEFINE_WAKE_Q(wake_q);
++	DEFINE_WAKE_Q(wake_sleeper_q);
+ 
+ 	if (likely(rt_mutex_cmpxchg_release(lock, current, NULL)))
+ 		return;
+ 
+-	if (slowfn(lock, &wake_q))
+-		rt_mutex_postunlock(&wake_q);
++	if (slowfn(lock, &wake_q, &wake_sleeper_q))
++		rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
+ }
+ 
+ int __sched __rt_mutex_lock_state(struct rt_mutex *lock, int state)
+@@ -1653,16 +2002,13 @@ void __sched __rt_mutex_unlock(struct rt
+ void __sched rt_mutex_unlock(struct rt_mutex *lock)
+ {
+ 	mutex_release(&lock->dep_map, 1, _RET_IP_);
+-	rt_mutex_fastunlock(lock, rt_mutex_slowunlock);
++	__rt_mutex_unlock(lock);
+ }
+ EXPORT_SYMBOL_GPL(rt_mutex_unlock);
+ 
+-/**
+- * 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 *wake_q)
++static bool __sched __rt_mutex_unlock_common(struct rt_mutex *lock,
++					     struct wake_q_head *wake_q,
++					     struct wake_q_head *wq_sleeper)
+ {
+ 	lockdep_assert_held(&lock->wait_lock);
+ 
+@@ -1679,22 +2025,34 @@ bool __sched __rt_mutex_futex_unlock(str
+ 	 * avoid inversion prior to the wakeup.  preempt_disable()
+ 	 * therein pairs with rt_mutex_postunlock().
+ 	 */
+-	mark_wakeup_next_waiter(wake_q, lock);
++	mark_wakeup_next_waiter(wake_q, wq_sleeper, lock);
+ 
+ 	return true; /* call postunlock() */
+ }
+ 
++/**
++ * 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 *wake_q,
++				    struct wake_q_head *wq_sleeper)
++{
++	return __rt_mutex_unlock_common(lock, wake_q, wq_sleeper);
++}
++
+ void __sched rt_mutex_futex_unlock(struct rt_mutex *lock)
+ {
+ 	DEFINE_WAKE_Q(wake_q);
++	DEFINE_WAKE_Q(wake_sleeper_q);
+ 	bool postunlock;
+ 
+ 	raw_spin_lock_irq(&lock->wait_lock);
+-	postunlock = __rt_mutex_futex_unlock(lock, &wake_q);
++	postunlock = __rt_mutex_futex_unlock(lock, &wake_q, &wake_sleeper_q);
+ 	raw_spin_unlock_irq(&lock->wait_lock);
+ 
+ 	if (postunlock)
+-		rt_mutex_postunlock(&wake_q);
++		rt_mutex_postunlock(&wake_q, &wake_sleeper_q);
+ }
+ 
+ /**
+@@ -1733,7 +2091,7 @@ void __rt_mutex_init(struct rt_mutex *lo
+ 	if (name && key)
+ 		debug_rt_mutex_init(lock, name, key);
+ }
+-EXPORT_SYMBOL_GPL(__rt_mutex_init);
++EXPORT_SYMBOL(__rt_mutex_init);
+ 
+ /**
+  * rt_mutex_init_proxy_locked - initialize and lock a rt_mutex on behalf of a
+@@ -1902,6 +2260,7 @@ int rt_mutex_wait_proxy_lock(struct rt_m
+ 			       struct hrtimer_sleeper *to,
+ 			       struct rt_mutex_waiter *waiter)
+ {
++	struct task_struct *tsk = current;
+ 	int ret;
+ 
+ 	raw_spin_lock_irq(&lock->wait_lock);
+@@ -1913,6 +2272,24 @@ int rt_mutex_wait_proxy_lock(struct rt_m
+ 	 * have to fix that up.
+ 	 */
+ 	fixup_rt_mutex_waiters(lock);
++	/*
++	 * 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
++	 * acquire the hash bucket lock when returning from this function.
++	 *
++	 * If the hash bucket lock is contended then the
++	 * BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on)) in
++	 * task_blocks_on_rt_mutex() will trigger. This can be avoided by
++	 * clearing task->pi_blocked_on which removes the task from the
++	 * boosting chain of the rtmutex. That's correct because the task
++	 * is not longer blocked on it.
++	 */
++	if (ret) {
++		raw_spin_lock(&tsk->pi_lock);
++		tsk->pi_blocked_on = NULL;
++		raw_spin_unlock(&tsk->pi_lock);
++	}
++
+ 	raw_spin_unlock_irq(&lock->wait_lock);
+ 
+ 	return ret;
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -15,6 +15,7 @@
+ 
+ #include <linux/rtmutex.h>
+ #include <linux/sched/wake_q.h>
++#include <linux/sched/debug.h>
+ 
+ /*
+  * This is the control structure for tasks blocked on a rt_mutex,
+@@ -29,6 +30,7 @@ struct rt_mutex_waiter {
+ 	struct rb_node          pi_tree_entry;
+ 	struct task_struct	*task;
+ 	struct rt_mutex		*lock;
++	bool			savestate;
+ #ifdef CONFIG_DEBUG_RT_MUTEXES
+ 	unsigned long		ip;
+ 	struct pid		*deadlock_task_pid;
+@@ -137,7 +139,7 @@ extern void rt_mutex_init_proxy_locked(s
+ 				       struct task_struct *proxy_owner);
+ extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
+ 				  struct task_struct *proxy_owner);
+-extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter);
++extern void rt_mutex_init_waiter(struct rt_mutex_waiter *waiter, bool savetate);
+ extern int __rt_mutex_start_proxy_lock(struct rt_mutex *lock,
+ 				     struct rt_mutex_waiter *waiter,
+ 				     struct task_struct *task);
+@@ -155,9 +157,12 @@ extern int __rt_mutex_futex_trylock(stru
+ 
+ extern void rt_mutex_futex_unlock(struct rt_mutex *lock);
+ extern bool __rt_mutex_futex_unlock(struct rt_mutex *lock,
+-				 struct wake_q_head *wqh);
++				 struct wake_q_head *wqh,
++				 struct wake_q_head *wq_sleeper);
++
++extern void rt_mutex_postunlock(struct wake_q_head *wake_q,
++				struct wake_q_head *wake_sleeper_q);
+ 
+-extern void rt_mutex_postunlock(struct wake_q_head *wake_q);
+ /* RW semaphore special interface */
+ 
+ extern int __rt_mutex_lock_state(struct rt_mutex *lock, int state);
+@@ -167,6 +172,10 @@ int __sched rt_mutex_slowlock_locked(str
+ 				     struct hrtimer_sleeper *timeout,
+ 				     enum rtmutex_chainwalk chwalk,
+ 				     struct rt_mutex_waiter *waiter);
++void __sched rt_spin_lock_slowlock_locked(struct rt_mutex *lock,
++					  struct rt_mutex_waiter *waiter,
++					  unsigned long flags);
++void __sched rt_spin_lock_slowunlock(struct rt_mutex *lock);
+ 
+ #ifdef CONFIG_DEBUG_RT_MUTEXES
+ # include "rtmutex-debug.h"
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -427,9 +427,15 @@ static bool set_nr_if_polling(struct tas
+ #endif
+ #endif
+ 
+-void wake_q_add(struct wake_q_head *head, struct task_struct *task)
++void __wake_q_add(struct wake_q_head *head, struct task_struct *task,
++		  bool sleeper)
+ {
+-	struct wake_q_node *node = &task->wake_q;
++	struct wake_q_node *node;
++
++	if (sleeper)
++		node = &task->wake_q_sleeper;
++	else
++		node = &task->wake_q;
+ 
+ 	/*
+ 	 * Atomically grab the task, if ->wake_q is !nil already it means
+@@ -451,24 +457,32 @@ void wake_q_add(struct wake_q_head *head
+ 	head->lastp = &node->next;
+ }
+ 
+-void wake_up_q(struct wake_q_head *head)
++void __wake_up_q(struct wake_q_head *head, bool sleeper)
+ {
+ 	struct wake_q_node *node = head->first;
+ 
+ 	while (node != WAKE_Q_TAIL) {
+ 		struct task_struct *task;
+ 
+-		task = container_of(node, struct task_struct, wake_q);
++		if (sleeper)
++			task = container_of(node, struct task_struct, wake_q_sleeper);
++		else
++			task = container_of(node, struct task_struct, wake_q);
+ 		BUG_ON(!task);
+ 		/* Task can safely be re-inserted now: */
+ 		node = node->next;
+-		task->wake_q.next = NULL;
+-
++		if (sleeper)
++			task->wake_q_sleeper.next = NULL;
++		else
++			task->wake_q.next = NULL;
+ 		/*
+ 		 * wake_up_process() implies a wmb() to pair with the queueing
+ 		 * in wake_q_add() so as not to miss wakeups.
+ 		 */
+-		wake_up_process(task);
++		if (sleeper)
++			wake_up_lock_sleeper(task);
++		else
++			wake_up_process(task);
+ 		put_task_struct(task);
+ 	}
+ }
diff --git a/kernel/patches-4.14.x-rt/0238-rtmutex-add-mutex-implementation-based-on-rtmutex.patch b/kernel/patches-4.14.x-rt/0238-rtmutex-add-mutex-implementation-based-on-rtmutex.patch
new file mode 100644
index 000000000..783831268
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0238-rtmutex-add-mutex-implementation-based-on-rtmutex.patch
@@ -0,0 +1,372 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 17:17:03 +0200
+Subject: rtmutex: add mutex implementation based on rtmutex
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/mutex_rt.h  |  130 ++++++++++++++++++++++++++
+ kernel/locking/mutex-rt.c |  223 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 353 insertions(+)
+ create mode 100644 include/linux/mutex_rt.h
+ create mode 100644 kernel/locking/mutex-rt.c
+
+--- /dev/null
++++ b/include/linux/mutex_rt.h
+@@ -0,0 +1,130 @@
++#ifndef __LINUX_MUTEX_RT_H
++#define __LINUX_MUTEX_RT_H
++
++#ifndef __LINUX_MUTEX_H
++#error "Please include mutex.h"
++#endif
++
++#include <linux/rtmutex.h>
++
++/* FIXME: Just for __lockfunc */
++#include <linux/spinlock.h>
++
++struct mutex {
++	struct rt_mutex		lock;
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	struct lockdep_map	dep_map;
++#endif
++};
++
++#define __MUTEX_INITIALIZER(mutexname)					\
++	{								\
++		.lock = __RT_MUTEX_INITIALIZER(mutexname.lock)		\
++		__DEP_MAP_MUTEX_INITIALIZER(mutexname)			\
++	}
++
++#define DEFINE_MUTEX(mutexname)						\
++	struct mutex mutexname = __MUTEX_INITIALIZER(mutexname)
++
++extern void __mutex_do_init(struct mutex *lock, const char *name, struct lock_class_key *key);
++extern void __lockfunc _mutex_lock(struct mutex *lock);
++extern void __lockfunc _mutex_lock_io(struct mutex *lock);
++extern void __lockfunc _mutex_lock_io_nested(struct mutex *lock, int subclass);
++extern int __lockfunc _mutex_lock_interruptible(struct mutex *lock);
++extern int __lockfunc _mutex_lock_killable(struct mutex *lock);
++extern void __lockfunc _mutex_lock_nested(struct mutex *lock, int subclass);
++extern void __lockfunc _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest_lock);
++extern int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass);
++extern int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass);
++extern int __lockfunc _mutex_trylock(struct mutex *lock);
++extern void __lockfunc _mutex_unlock(struct mutex *lock);
++
++#define mutex_is_locked(l)		rt_mutex_is_locked(&(l)->lock)
++#define mutex_lock(l)			_mutex_lock(l)
++#define mutex_lock_interruptible(l)	_mutex_lock_interruptible(l)
++#define mutex_lock_killable(l)		_mutex_lock_killable(l)
++#define mutex_trylock(l)		_mutex_trylock(l)
++#define mutex_unlock(l)			_mutex_unlock(l)
++#define mutex_lock_io(l)		_mutex_lock_io(l);
++
++#define __mutex_owner(l)		((l)->lock.owner)
++
++#ifdef CONFIG_DEBUG_MUTEXES
++#define mutex_destroy(l)		rt_mutex_destroy(&(l)->lock)
++#else
++static inline void mutex_destroy(struct mutex *lock) {}
++#endif
++
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++# define mutex_lock_nested(l, s)	_mutex_lock_nested(l, s)
++# define mutex_lock_interruptible_nested(l, s) \
++					_mutex_lock_interruptible_nested(l, s)
++# define mutex_lock_killable_nested(l, s) \
++					_mutex_lock_killable_nested(l, s)
++# define mutex_lock_io_nested(l, s)	_mutex_lock_io_nested(l, s)
++
++# define mutex_lock_nest_lock(lock, nest_lock)				\
++do {									\
++	typecheck(struct lockdep_map *, &(nest_lock)->dep_map);		\
++	_mutex_lock_nest_lock(lock, &(nest_lock)->dep_map);		\
++} while (0)
++
++#else
++# define mutex_lock_nested(l, s)	_mutex_lock(l)
++# define mutex_lock_interruptible_nested(l, s) \
++					_mutex_lock_interruptible(l)
++# define mutex_lock_killable_nested(l, s) \
++					_mutex_lock_killable(l)
++# define mutex_lock_nest_lock(lock, nest_lock) mutex_lock(lock)
++# define mutex_lock_io_nested(l, s)	_mutex_lock_io(l)
++#endif
++
++# define mutex_init(mutex)				\
++do {							\
++	static struct lock_class_key __key;		\
++							\
++	rt_mutex_init(&(mutex)->lock);			\
++	__mutex_do_init((mutex), #mutex, &__key);	\
++} while (0)
++
++# define __mutex_init(mutex, name, key)			\
++do {							\
++	rt_mutex_init(&(mutex)->lock);			\
++	__mutex_do_init((mutex), name, key);		\
++} while (0)
++
++/**
++ * These values are chosen such that FAIL and SUCCESS match the
++ * values of the regular mutex_trylock().
++ */
++enum mutex_trylock_recursive_enum {
++	MUTEX_TRYLOCK_FAILED    = 0,
++	MUTEX_TRYLOCK_SUCCESS   = 1,
++	MUTEX_TRYLOCK_RECURSIVE,
++};
++/**
++ * mutex_trylock_recursive - trylock variant that allows recursive locking
++ * @lock: mutex to be locked
++ *
++ * This function should not be used, _ever_. It is purely for hysterical GEM
++ * raisins, and once those are gone this will be removed.
++ *
++ * Returns:
++ *  MUTEX_TRYLOCK_FAILED    - trylock failed,
++ *  MUTEX_TRYLOCK_SUCCESS   - lock acquired,
++ *  MUTEX_TRYLOCK_RECURSIVE - we already owned the lock.
++ */
++int __rt_mutex_owner_current(struct rt_mutex *lock);
++
++static inline /* __deprecated */ __must_check enum mutex_trylock_recursive_enum
++mutex_trylock_recursive(struct mutex *lock)
++{
++	if (unlikely(__rt_mutex_owner_current(&lock->lock)))
++		return MUTEX_TRYLOCK_RECURSIVE;
++
++	return mutex_trylock(lock);
++}
++
++extern int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock);
++
++#endif
+--- /dev/null
++++ b/kernel/locking/mutex-rt.c
+@@ -0,0 +1,223 @@
++/*
++ * kernel/rt.c
++ *
++ * Real-Time Preemption Support
++ *
++ * started by Ingo Molnar:
++ *
++ *  Copyright (C) 2004-2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
++ *  Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
++ *
++ * historic credit for proving that Linux spinlocks can be implemented via
++ * RT-aware mutexes goes to many people: The Pmutex project (Dirk Grambow
++ * and others) who prototyped it on 2.4 and did lots of comparative
++ * research and analysis; TimeSys, for proving that you can implement a
++ * fully preemptible kernel via the use of IRQ threading and mutexes;
++ * Bill Huey for persuasively arguing on lkml that the mutex model is the
++ * right one; and to MontaVista, who ported pmutexes to 2.6.
++ *
++ * This code is a from-scratch implementation and is not based on pmutexes,
++ * but the idea of converting spinlocks to mutexes is used here too.
++ *
++ * lock debugging, locking tree, deadlock detection:
++ *
++ *  Copyright (C) 2004, LynuxWorks, Inc., Igor Manyilov, Bill Huey
++ *  Released under the General Public License (GPL).
++ *
++ * Includes portions of the generic R/W semaphore implementation from:
++ *
++ *  Copyright (c) 2001   David Howells (dhowells@redhat.com).
++ *  - Derived partially from idea by Andrea Arcangeli <andrea@suse.de>
++ *  - Derived also from comments by Linus
++ *
++ * Pending ownership of locks and ownership stealing:
++ *
++ *  Copyright (C) 2005, Kihon Technologies Inc., Steven Rostedt
++ *
++ *   (also by Steven Rostedt)
++ *    - Converted single pi_lock to individual task locks.
++ *
++ * By Esben Nielsen:
++ *    Doing priority inheritance with help of the scheduler.
++ *
++ *  Copyright (C) 2006, Timesys Corp., Thomas Gleixner <tglx@timesys.com>
++ *  - major rework based on Esben Nielsens initial patch
++ *  - replaced thread_info references by task_struct refs
++ *  - removed task->pending_owner dependency
++ *  - BKL drop/reacquire for semaphore style locks to avoid deadlocks
++ *    in the scheduler return path as discussed with Steven Rostedt
++ *
++ *  Copyright (C) 2006, Kihon Technologies Inc.
++ *    Steven Rostedt <rostedt@goodmis.org>
++ *  - debugged and patched Thomas Gleixner's rework.
++ *  - added back the cmpxchg to the rework.
++ *  - turned atomic require back on for SMP.
++ */
++
++#include <linux/spinlock.h>
++#include <linux/rtmutex.h>
++#include <linux/sched.h>
++#include <linux/delay.h>
++#include <linux/module.h>
++#include <linux/kallsyms.h>
++#include <linux/syscalls.h>
++#include <linux/interrupt.h>
++#include <linux/plist.h>
++#include <linux/fs.h>
++#include <linux/futex.h>
++#include <linux/hrtimer.h>
++
++#include "rtmutex_common.h"
++
++/*
++ * struct mutex functions
++ */
++void __mutex_do_init(struct mutex *mutex, const char *name,
++		     struct lock_class_key *key)
++{
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	/*
++	 * Make sure we are not reinitializing a held lock:
++	 */
++	debug_check_no_locks_freed((void *)mutex, sizeof(*mutex));
++	lockdep_init_map(&mutex->dep_map, name, key, 0);
++#endif
++	mutex->lock.save_state = 0;
++}
++EXPORT_SYMBOL(__mutex_do_init);
++
++void __lockfunc _mutex_lock(struct mutex *lock)
++{
++	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
++	__rt_mutex_lock_state(&lock->lock, TASK_UNINTERRUPTIBLE);
++}
++EXPORT_SYMBOL(_mutex_lock);
++
++void __lockfunc _mutex_lock_io(struct mutex *lock)
++{
++	int token;
++
++	token = io_schedule_prepare();
++	_mutex_lock(lock);
++	io_schedule_finish(token);
++}
++EXPORT_SYMBOL_GPL(_mutex_lock_io);
++
++int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
++{
++	int ret;
++
++	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
++	ret = __rt_mutex_lock_state(&lock->lock, TASK_INTERRUPTIBLE);
++	if (ret)
++		mutex_release(&lock->dep_map, 1, _RET_IP_);
++	return ret;
++}
++EXPORT_SYMBOL(_mutex_lock_interruptible);
++
++int __lockfunc _mutex_lock_killable(struct mutex *lock)
++{
++	int ret;
++
++	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
++	ret = __rt_mutex_lock_state(&lock->lock, TASK_KILLABLE);
++	if (ret)
++		mutex_release(&lock->dep_map, 1, _RET_IP_);
++	return ret;
++}
++EXPORT_SYMBOL(_mutex_lock_killable);
++
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++void __lockfunc _mutex_lock_nested(struct mutex *lock, int subclass)
++{
++	mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
++	__rt_mutex_lock_state(&lock->lock, TASK_UNINTERRUPTIBLE);
++}
++EXPORT_SYMBOL(_mutex_lock_nested);
++
++void __lockfunc _mutex_lock_io_nested(struct mutex *lock, int subclass)
++{
++	int token;
++
++	token = io_schedule_prepare();
++
++	mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
++	__rt_mutex_lock_state(&lock->lock, TASK_UNINTERRUPTIBLE);
++
++	io_schedule_finish(token);
++}
++EXPORT_SYMBOL_GPL(_mutex_lock_io_nested);
++
++void __lockfunc _mutex_lock_nest_lock(struct mutex *lock, struct lockdep_map *nest)
++{
++	mutex_acquire_nest(&lock->dep_map, 0, 0, nest, _RET_IP_);
++	__rt_mutex_lock_state(&lock->lock, TASK_UNINTERRUPTIBLE);
++}
++EXPORT_SYMBOL(_mutex_lock_nest_lock);
++
++int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass)
++{
++	int ret;
++
++	mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
++	ret = __rt_mutex_lock_state(&lock->lock, TASK_INTERRUPTIBLE);
++	if (ret)
++		mutex_release(&lock->dep_map, 1, _RET_IP_);
++	return ret;
++}
++EXPORT_SYMBOL(_mutex_lock_interruptible_nested);
++
++int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass)
++{
++	int ret;
++
++	mutex_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
++	ret = __rt_mutex_lock_state(&lock->lock, TASK_KILLABLE);
++	if (ret)
++		mutex_release(&lock->dep_map, 1, _RET_IP_);
++	return ret;
++}
++EXPORT_SYMBOL(_mutex_lock_killable_nested);
++#endif
++
++int __lockfunc _mutex_trylock(struct mutex *lock)
++{
++	int ret = __rt_mutex_trylock(&lock->lock);
++
++	if (ret)
++		mutex_acquire(&lock->dep_map, 0, 1, _RET_IP_);
++
++	return ret;
++}
++EXPORT_SYMBOL(_mutex_trylock);
++
++void __lockfunc _mutex_unlock(struct mutex *lock)
++{
++	mutex_release(&lock->dep_map, 1, _RET_IP_);
++	__rt_mutex_unlock(&lock->lock);
++}
++EXPORT_SYMBOL(_mutex_unlock);
++
++/**
++ * atomic_dec_and_mutex_lock - return holding mutex if we dec to 0
++ * @cnt: the atomic which we are to dec
++ * @lock: the mutex to return holding if we dec to 0
++ *
++ * return true and hold lock if we dec to 0, return false otherwise
++ */
++int atomic_dec_and_mutex_lock(atomic_t *cnt, struct mutex *lock)
++{
++	/* dec if we can't possibly hit 0 */
++	if (atomic_add_unless(cnt, -1, 1))
++		return 0;
++	/* we might hit 0, so take the lock */
++	mutex_lock(lock);
++	if (!atomic_dec_and_test(cnt)) {
++		/* when we actually did the dec, we didn't hit 0 */
++		mutex_unlock(lock);
++		return 0;
++	}
++	/* we hit 0, and we hold the lock */
++	return 1;
++}
++EXPORT_SYMBOL(atomic_dec_and_mutex_lock);
diff --git a/kernel/patches-4.14.x-rt/0239-rtmutex-add-rwsem-implementation-based-on-rtmutex.patch b/kernel/patches-4.14.x-rt/0239-rtmutex-add-rwsem-implementation-based-on-rtmutex.patch
new file mode 100644
index 000000000..39f2284f8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0239-rtmutex-add-rwsem-implementation-based-on-rtmutex.patch
@@ -0,0 +1,391 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 17:28:34 +0200
+Subject: rtmutex: add rwsem implementation based on rtmutex
+
+The RT specific R/W semaphore implementation restricts the number of readers
+to one because a writer cannot block on multiple readers and inherit its
+priority or budget.
+
+The single reader restricting is painful in various ways:
+
+ - Performance bottleneck for multi-threaded applications in the page fault
+   path (mmap sem)
+
+ - Progress blocker for drivers which are carefully crafted to avoid the
+   potential reader/writer deadlock in mainline.
+
+The analysis of the writer code pathes shows, that properly written RT tasks
+should not take them. Syscalls like mmap(), file access which take mmap sem
+write locked have unbound latencies which are completely unrelated to mmap
+sem. Other R/W sem users like graphics drivers are not suitable for RT tasks
+either.
+
+So there is little risk to hurt RT tasks when the RT rwsem implementation is
+changed in the following way:
+
+ - Allow concurrent readers
+
+ - Make writers block until the last reader left the critical section. This
+   blocking is not subject to priority/budget inheritance.
+
+ - Readers blocked on a writer inherit their priority/budget in the normal
+   way.
+
+There is a drawback with this scheme. R/W semaphores become writer unfair
+though the applications which have triggered writer starvation (mostly on
+mmap_sem) in the past are not really the typical workloads running on a RT
+system. So while it's unlikely to hit writer starvation, it's possible. If
+there are unexpected workloads on RT systems triggering it, we need to rethink
+the approach.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/rwsem_rt.h  |   67 +++++++++++
+ kernel/locking/rwsem-rt.c |  269 ++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 336 insertions(+)
+ create mode 100644 include/linux/rwsem_rt.h
+ create mode 100644 kernel/locking/rwsem-rt.c
+
+--- /dev/null
++++ b/include/linux/rwsem_rt.h
+@@ -0,0 +1,67 @@
++#ifndef _LINUX_RWSEM_RT_H
++#define _LINUX_RWSEM_RT_H
++
++#ifndef _LINUX_RWSEM_H
++#error "Include rwsem.h"
++#endif
++
++#include <linux/rtmutex.h>
++#include <linux/swait.h>
++
++#define READER_BIAS		(1U << 31)
++#define WRITER_BIAS		(1U << 30)
++
++struct rw_semaphore {
++	atomic_t		readers;
++	struct rt_mutex		rtmutex;
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	struct lockdep_map	dep_map;
++#endif
++};
++
++#define __RWSEM_INITIALIZER(name)				\
++{								\
++	.readers = ATOMIC_INIT(READER_BIAS),			\
++	.rtmutex = __RT_MUTEX_INITIALIZER(name.rtmutex),	\
++	RW_DEP_MAP_INIT(name)					\
++}
++
++#define DECLARE_RWSEM(lockname) \
++	struct rw_semaphore lockname = __RWSEM_INITIALIZER(lockname)
++
++extern void  __rwsem_init(struct rw_semaphore *rwsem, const char *name,
++			  struct lock_class_key *key);
++
++#define __init_rwsem(sem, name, key)			\
++do {							\
++		rt_mutex_init(&(sem)->rtmutex);		\
++		__rwsem_init((sem), (name), (key));	\
++} while (0)
++
++#define init_rwsem(sem)					\
++do {							\
++	static struct lock_class_key __key;		\
++							\
++	__init_rwsem((sem), #sem, &__key);		\
++} while (0)
++
++static inline int rwsem_is_locked(struct rw_semaphore *sem)
++{
++	return atomic_read(&sem->readers) != READER_BIAS;
++}
++
++static inline int rwsem_is_contended(struct rw_semaphore *sem)
++{
++	return atomic_read(&sem->readers) > 0;
++}
++
++extern void __down_read(struct rw_semaphore *sem);
++extern int __down_read_trylock(struct rw_semaphore *sem);
++extern void __down_write(struct rw_semaphore *sem);
++extern int __must_check __down_write_killable(struct rw_semaphore *sem);
++extern int __down_write_trylock(struct rw_semaphore *sem);
++extern void __up_read(struct rw_semaphore *sem);
++extern void __up_write(struct rw_semaphore *sem);
++extern void __downgrade_write(struct rw_semaphore *sem);
++
++#endif
+--- /dev/null
++++ b/kernel/locking/rwsem-rt.c
+@@ -0,0 +1,269 @@
++/*
++ */
++#include <linux/rwsem.h>
++#include <linux/sched/debug.h>
++#include <linux/sched/signal.h>
++#include <linux/export.h>
++
++#include "rtmutex_common.h"
++
++/*
++ * RT-specific reader/writer semaphores
++ *
++ * down_write()
++ *  1) Lock sem->rtmutex
++ *  2) Remove the reader BIAS to force readers into the slow path
++ *  3) Wait until all readers have left the critical region
++ *  4) Mark it write locked
++ *
++ * up_write()
++ *  1) Remove the write locked marker
++ *  2) Set the reader BIAS so readers can use the fast path again
++ *  3) Unlock sem->rtmutex to release blocked readers
++ *
++ * down_read()
++ *  1) Try fast path acquisition (reader BIAS is set)
++ *  2) Take sem->rtmutex.wait_lock which protects the writelocked flag
++ *  3) If !writelocked, acquire it for read
++ *  4) If writelocked, block on sem->rtmutex
++ *  5) unlock sem->rtmutex, goto 1)
++ *
++ * up_read()
++ *  1) Try fast path release (reader count != 1)
++ *  2) Wake the writer waiting in down_write()#3
++ *
++ * down_read()#3 has the consequence, that rw semaphores on RT are not writer
++ * fair, but writers, which should be avoided in RT tasks (think mmap_sem),
++ * are subject to the rtmutex priority/DL inheritance mechanism.
++ *
++ * It's possible to make the rw semaphores writer fair by keeping a list of
++ * active readers. A blocked writer would force all newly incoming readers to
++ * block on the rtmutex, but the rtmutex would have to be proxy locked for one
++ * reader after the other. We can't use multi-reader inheritance because there
++ * is no way to support that with SCHED_DEADLINE. Implementing the one by one
++ * reader boosting/handover mechanism is a major surgery for a very dubious
++ * value.
++ *
++ * The risk of writer starvation is there, but the pathological use cases
++ * which trigger it are not necessarily the typical RT workloads.
++ */
++
++void __rwsem_init(struct rw_semaphore *sem, const char *name,
++		  struct lock_class_key *key)
++{
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	/*
++	 * Make sure we are not reinitializing a held semaphore:
++	 */
++	debug_check_no_locks_freed((void *)sem, sizeof(*sem));
++	lockdep_init_map(&sem->dep_map, name, key, 0);
++#endif
++	atomic_set(&sem->readers, READER_BIAS);
++}
++EXPORT_SYMBOL(__rwsem_init);
++
++int __down_read_trylock(struct rw_semaphore *sem)
++{
++	int r, old;
++
++	/*
++	 * Increment reader count, if sem->readers < 0, i.e. READER_BIAS is
++	 * set.
++	 */
++	for (r = atomic_read(&sem->readers); r < 0;) {
++		old = atomic_cmpxchg(&sem->readers, r, r + 1);
++		if (likely(old == r))
++			return 1;
++		r = old;
++	}
++	return 0;
++}
++
++void __sched __down_read(struct rw_semaphore *sem)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++	struct rt_mutex_waiter waiter;
++
++	if (__down_read_trylock(sem))
++		return;
++
++	might_sleep();
++	raw_spin_lock_irq(&m->wait_lock);
++	/*
++	 * Allow readers as long as the writer has not completely
++	 * acquired the semaphore for write.
++	 */
++	if (atomic_read(&sem->readers) != WRITER_BIAS) {
++		atomic_inc(&sem->readers);
++		raw_spin_unlock_irq(&m->wait_lock);
++		return;
++	}
++
++	/*
++	 * Call into the slow lock path with the rtmutex->wait_lock
++	 * held, so this can't result in the following race:
++	 *
++	 * Reader1		Reader2		Writer
++	 *			down_read()
++	 *					down_write()
++	 *					rtmutex_lock(m)
++	 *					swait()
++	 * down_read()
++	 * unlock(m->wait_lock)
++	 *			up_read()
++	 *			swake()
++	 *					lock(m->wait_lock)
++	 *					sem->writelocked=true
++	 *					unlock(m->wait_lock)
++	 *
++	 *					up_write()
++	 *					sem->writelocked=false
++	 *					rtmutex_unlock(m)
++	 *			down_read()
++	 *					down_write()
++	 *					rtmutex_lock(m)
++	 *					swait()
++	 * rtmutex_lock(m)
++	 *
++	 * That would put Reader1 behind the writer waiting on
++	 * Reader2 to call up_read() which might be unbound.
++	 */
++	rt_mutex_init_waiter(&waiter, false);
++	rt_mutex_slowlock_locked(m, TASK_UNINTERRUPTIBLE, NULL,
++				 RT_MUTEX_MIN_CHAINWALK,
++				 &waiter);
++	/*
++	 * The slowlock() above is guaranteed to return with the rtmutex is
++	 * now held, so there can't be a writer active. Increment the reader
++	 * count and immediately drop the rtmutex again.
++	 */
++	atomic_inc(&sem->readers);
++	raw_spin_unlock_irq(&m->wait_lock);
++	__rt_mutex_unlock(m);
++
++	debug_rt_mutex_free_waiter(&waiter);
++}
++
++void __up_read(struct rw_semaphore *sem)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++	struct task_struct *tsk;
++
++	/*
++	 * sem->readers can only hit 0 when a writer is waiting for the
++	 * active readers to leave the critical region.
++	 */
++	if (!atomic_dec_and_test(&sem->readers))
++		return;
++
++	might_sleep();
++	raw_spin_lock_irq(&m->wait_lock);
++	/*
++	 * Wake the writer, i.e. the rtmutex owner. It might release the
++	 * rtmutex concurrently in the fast path (due to a signal), but to
++	 * clean up the rwsem it needs to acquire m->wait_lock. The worst
++	 * case which can happen is a spurious wakeup.
++	 */
++	tsk = rt_mutex_owner(m);
++	if (tsk)
++		wake_up_process(tsk);
++
++	raw_spin_unlock_irq(&m->wait_lock);
++}
++
++static void __up_write_unlock(struct rw_semaphore *sem, int bias,
++			      unsigned long flags)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++
++	atomic_add(READER_BIAS - bias, &sem->readers);
++	raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++	__rt_mutex_unlock(m);
++}
++
++static int __sched __down_write_common(struct rw_semaphore *sem, int state)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++	unsigned long flags;
++
++	/* Take the rtmutex as a first step */
++	if (__rt_mutex_lock_state(m, state))
++		return -EINTR;
++
++	/* Force readers into slow path */
++	atomic_sub(READER_BIAS, &sem->readers);
++	might_sleep();
++
++	set_current_state(state);
++	for (;;) {
++		raw_spin_lock_irqsave(&m->wait_lock, flags);
++		/* Have all readers left the critical region? */
++		if (!atomic_read(&sem->readers)) {
++			atomic_set(&sem->readers, WRITER_BIAS);
++			__set_current_state(TASK_RUNNING);
++			raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++			return 0;
++		}
++
++		if (signal_pending_state(state, current)) {
++			__set_current_state(TASK_RUNNING);
++			__up_write_unlock(sem, 0, flags);
++			return -EINTR;
++		}
++		raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++
++		if (atomic_read(&sem->readers) != 0) {
++			schedule();
++			set_current_state(state);
++		}
++	}
++}
++
++void __sched __down_write(struct rw_semaphore *sem)
++{
++	__down_write_common(sem, TASK_UNINTERRUPTIBLE);
++}
++
++int __sched __down_write_killable(struct rw_semaphore *sem)
++{
++	return __down_write_common(sem, TASK_KILLABLE);
++}
++
++int __down_write_trylock(struct rw_semaphore *sem)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++	unsigned long flags;
++
++	if (!__rt_mutex_trylock(m))
++		return 0;
++
++	atomic_sub(READER_BIAS, &sem->readers);
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++	if (!atomic_read(&sem->readers)) {
++		atomic_set(&sem->readers, WRITER_BIAS);
++		raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++		return 1;
++	}
++	__up_write_unlock(sem, 0, flags);
++	return 0;
++}
++
++void __up_write(struct rw_semaphore *sem)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++	unsigned long flags;
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++	__up_write_unlock(sem, WRITER_BIAS, flags);
++}
++
++void __downgrade_write(struct rw_semaphore *sem)
++{
++	struct rt_mutex *m = &sem->rtmutex;
++	unsigned long flags;
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++	/* Release it and account current as reader */
++	__up_write_unlock(sem, WRITER_BIAS - 1, flags);
++}
diff --git a/kernel/patches-4.14.x-rt/0240-rtmutex-add-rwlock-implementation-based-on-rtmutex.patch b/kernel/patches-4.14.x-rt/0240-rtmutex-add-rwlock-implementation-based-on-rtmutex.patch
new file mode 100644
index 000000000..35ac0af12
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0240-rtmutex-add-rwlock-implementation-based-on-rtmutex.patch
@@ -0,0 +1,568 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 17:18:06 +0200
+Subject: rtmutex: add rwlock implementation based on rtmutex
+
+The implementation is bias-based, similar to the rwsem implementation.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/rwlock_rt.h       |  119 ++++++++++++
+ include/linux/rwlock_types_rt.h |   55 +++++
+ kernel/locking/rwlock-rt.c      |  368 ++++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 542 insertions(+)
+ create mode 100644 include/linux/rwlock_rt.h
+ create mode 100644 include/linux/rwlock_types_rt.h
+ create mode 100644 kernel/locking/rwlock-rt.c
+
+--- /dev/null
++++ b/include/linux/rwlock_rt.h
+@@ -0,0 +1,119 @@
++#ifndef __LINUX_RWLOCK_RT_H
++#define __LINUX_RWLOCK_RT_H
++
++#ifndef __LINUX_SPINLOCK_H
++#error Do not include directly. Use spinlock.h
++#endif
++
++extern void __lockfunc rt_write_lock(rwlock_t *rwlock);
++extern void __lockfunc rt_read_lock(rwlock_t *rwlock);
++extern int __lockfunc rt_write_trylock(rwlock_t *rwlock);
++extern int __lockfunc rt_read_trylock(rwlock_t *rwlock);
++extern void __lockfunc rt_write_unlock(rwlock_t *rwlock);
++extern void __lockfunc rt_read_unlock(rwlock_t *rwlock);
++extern int __lockfunc rt_read_can_lock(rwlock_t *rwlock);
++extern int __lockfunc rt_write_can_lock(rwlock_t *rwlock);
++extern void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key *key);
++
++#define read_can_lock(rwlock)		rt_read_can_lock(rwlock)
++#define write_can_lock(rwlock)		rt_write_can_lock(rwlock)
++
++#define read_trylock(lock)	__cond_lock(lock, rt_read_trylock(lock))
++#define write_trylock(lock)	__cond_lock(lock, rt_write_trylock(lock))
++
++static inline int __write_trylock_rt_irqsave(rwlock_t *lock, unsigned long *flags)
++{
++	/* XXX ARCH_IRQ_ENABLED */
++	*flags = 0;
++	return rt_write_trylock(lock);
++}
++
++#define write_trylock_irqsave(lock, flags)		\
++	__cond_lock(lock, __write_trylock_rt_irqsave(lock, &(flags)))
++
++#define read_lock_irqsave(lock, flags)			\
++	do {						\
++		typecheck(unsigned long, flags);	\
++		rt_read_lock(lock);			\
++		flags = 0;				\
++	} while (0)
++
++#define write_lock_irqsave(lock, flags)			\
++	do {						\
++		typecheck(unsigned long, flags);	\
++		rt_write_lock(lock);			\
++		flags = 0;				\
++	} while (0)
++
++#define read_lock(lock)		rt_read_lock(lock)
++
++#define read_lock_bh(lock)				\
++	do {						\
++		local_bh_disable();			\
++		rt_read_lock(lock);			\
++	} while (0)
++
++#define read_lock_irq(lock)	read_lock(lock)
++
++#define write_lock(lock)	rt_write_lock(lock)
++
++#define write_lock_bh(lock)				\
++	do {						\
++		local_bh_disable();			\
++		rt_write_lock(lock);			\
++	} while (0)
++
++#define write_lock_irq(lock)	write_lock(lock)
++
++#define read_unlock(lock)	rt_read_unlock(lock)
++
++#define read_unlock_bh(lock)				\
++	do {						\
++		rt_read_unlock(lock);			\
++		local_bh_enable();			\
++	} while (0)
++
++#define read_unlock_irq(lock)	read_unlock(lock)
++
++#define write_unlock(lock)	rt_write_unlock(lock)
++
++#define write_unlock_bh(lock)				\
++	do {						\
++		rt_write_unlock(lock);			\
++		local_bh_enable();			\
++	} while (0)
++
++#define write_unlock_irq(lock)	write_unlock(lock)
++
++#define read_unlock_irqrestore(lock, flags)		\
++	do {						\
++		typecheck(unsigned long, flags);	\
++		(void) flags;				\
++		rt_read_unlock(lock);			\
++	} while (0)
++
++#define write_unlock_irqrestore(lock, flags) \
++	do {						\
++		typecheck(unsigned long, flags);	\
++		(void) flags;				\
++		rt_write_unlock(lock);			\
++	} while (0)
++
++#define rwlock_init(rwl)				\
++do {							\
++	static struct lock_class_key __key;		\
++							\
++	__rt_rwlock_init(rwl, #rwl, &__key);		\
++} while (0)
++
++/*
++ * Internal functions made global for CPU pinning
++ */
++void __read_rt_lock(struct rt_rw_lock *lock);
++int __read_rt_trylock(struct rt_rw_lock *lock);
++void __write_rt_lock(struct rt_rw_lock *lock);
++int __write_rt_trylock(struct rt_rw_lock *lock);
++void __read_rt_unlock(struct rt_rw_lock *lock);
++void __write_rt_unlock(struct rt_rw_lock *lock);
++
++#endif
+--- /dev/null
++++ b/include/linux/rwlock_types_rt.h
+@@ -0,0 +1,55 @@
++#ifndef __LINUX_RWLOCK_TYPES_RT_H
++#define __LINUX_RWLOCK_TYPES_RT_H
++
++#ifndef __LINUX_SPINLOCK_TYPES_H
++#error "Do not include directly. Include spinlock_types.h instead"
++#endif
++
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++# define RW_DEP_MAP_INIT(lockname)	.dep_map = { .name = #lockname }
++#else
++# define RW_DEP_MAP_INIT(lockname)
++#endif
++
++typedef struct rt_rw_lock rwlock_t;
++
++#define __RW_LOCK_UNLOCKED(name) __RWLOCK_RT_INITIALIZER(name)
++
++#define DEFINE_RWLOCK(name) \
++	rwlock_t name = __RW_LOCK_UNLOCKED(name)
++
++/*
++ * A reader biased implementation primarily for CPU pinning.
++ *
++ * Can be selected as general replacement for the single reader RT rwlock
++ * variant
++ */
++struct rt_rw_lock {
++	struct rt_mutex		rtmutex;
++	atomic_t		readers;
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	struct lockdep_map	dep_map;
++#endif
++};
++
++#define READER_BIAS	(1U << 31)
++#define WRITER_BIAS	(1U << 30)
++
++#define __RWLOCK_RT_INITIALIZER(name)					\
++{									\
++	.readers = ATOMIC_INIT(READER_BIAS),				\
++	.rtmutex = __RT_MUTEX_INITIALIZER_SAVE_STATE(name.rtmutex),	\
++	RW_DEP_MAP_INIT(name)						\
++}
++
++void __rwlock_biased_rt_init(struct rt_rw_lock *lock, const char *name,
++			     struct lock_class_key *key);
++
++#define rwlock_biased_rt_init(rwlock)					\
++	do {								\
++		static struct lock_class_key __key;			\
++									\
++		__rwlock_biased_rt_init((rwlock), #rwlock, &__key);	\
++	} while (0)
++
++#endif
+--- /dev/null
++++ b/kernel/locking/rwlock-rt.c
+@@ -0,0 +1,368 @@
++/*
++ */
++#include <linux/sched/debug.h>
++#include <linux/export.h>
++
++#include "rtmutex_common.h"
++#include <linux/rwlock_types_rt.h>
++
++/*
++ * RT-specific reader/writer locks
++ *
++ * write_lock()
++ *  1) Lock lock->rtmutex
++ *  2) Remove the reader BIAS to force readers into the slow path
++ *  3) Wait until all readers have left the critical region
++ *  4) Mark it write locked
++ *
++ * write_unlock()
++ *  1) Remove the write locked marker
++ *  2) Set the reader BIAS so readers can use the fast path again
++ *  3) Unlock lock->rtmutex to release blocked readers
++ *
++ * read_lock()
++ *  1) Try fast path acquisition (reader BIAS is set)
++ *  2) Take lock->rtmutex.wait_lock which protects the writelocked flag
++ *  3) If !writelocked, acquire it for read
++ *  4) If writelocked, block on lock->rtmutex
++ *  5) unlock lock->rtmutex, goto 1)
++ *
++ * read_unlock()
++ *  1) Try fast path release (reader count != 1)
++ *  2) Wake the writer waiting in write_lock()#3
++ *
++ * read_lock()#3 has the consequence, that rw locks on RT are not writer
++ * fair, but writers, which should be avoided in RT tasks (think tasklist
++ * lock), are subject to the rtmutex priority/DL inheritance mechanism.
++ *
++ * It's possible to make the rw locks writer fair by keeping a list of
++ * active readers. A blocked writer would force all newly incoming readers
++ * to block on the rtmutex, but the rtmutex would have to be proxy locked
++ * for one reader after the other. We can't use multi-reader inheritance
++ * because there is no way to support that with
++ * SCHED_DEADLINE. Implementing the one by one reader boosting/handover
++ * mechanism is a major surgery for a very dubious value.
++ *
++ * The risk of writer starvation is there, but the pathological use cases
++ * which trigger it are not necessarily the typical RT workloads.
++ */
++
++void __rwlock_biased_rt_init(struct rt_rw_lock *lock, const char *name,
++			     struct lock_class_key *key)
++{
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++	/*
++	 * Make sure we are not reinitializing a held semaphore:
++	 */
++	debug_check_no_locks_freed((void *)lock, sizeof(*lock));
++	lockdep_init_map(&lock->dep_map, name, key, 0);
++#endif
++	atomic_set(&lock->readers, READER_BIAS);
++	rt_mutex_init(&lock->rtmutex);
++	lock->rtmutex.save_state = 1;
++}
++
++int __read_rt_trylock(struct rt_rw_lock *lock)
++{
++	int r, old;
++
++	/*
++	 * Increment reader count, if lock->readers < 0, i.e. READER_BIAS is
++	 * set.
++	 */
++	for (r = atomic_read(&lock->readers); r < 0;) {
++		old = atomic_cmpxchg(&lock->readers, r, r + 1);
++		if (likely(old == r))
++			return 1;
++		r = old;
++	}
++	return 0;
++}
++
++void __sched __read_rt_lock(struct rt_rw_lock *lock)
++{
++	struct rt_mutex *m = &lock->rtmutex;
++	struct rt_mutex_waiter waiter;
++	unsigned long flags;
++
++	if (__read_rt_trylock(lock))
++		return;
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++	/*
++	 * Allow readers as long as the writer has not completely
++	 * acquired the semaphore for write.
++	 */
++	if (atomic_read(&lock->readers) != WRITER_BIAS) {
++		atomic_inc(&lock->readers);
++		raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++		return;
++	}
++
++	/*
++	 * Call into the slow lock path with the rtmutex->wait_lock
++	 * held, so this can't result in the following race:
++	 *
++	 * Reader1		Reader2		Writer
++	 *			read_lock()
++	 *					write_lock()
++	 *					rtmutex_lock(m)
++	 *					swait()
++	 * read_lock()
++	 * unlock(m->wait_lock)
++	 *			read_unlock()
++	 *			swake()
++	 *					lock(m->wait_lock)
++	 *					lock->writelocked=true
++	 *					unlock(m->wait_lock)
++	 *
++	 *					write_unlock()
++	 *					lock->writelocked=false
++	 *					rtmutex_unlock(m)
++	 *			read_lock()
++	 *					write_lock()
++	 *					rtmutex_lock(m)
++	 *					swait()
++	 * rtmutex_lock(m)
++	 *
++	 * That would put Reader1 behind the writer waiting on
++	 * Reader2 to call read_unlock() which might be unbound.
++	 */
++	rt_mutex_init_waiter(&waiter, false);
++	rt_spin_lock_slowlock_locked(m, &waiter, flags);
++	/*
++	 * The slowlock() above is guaranteed to return with the rtmutex is
++	 * now held, so there can't be a writer active. Increment the reader
++	 * count and immediately drop the rtmutex again.
++	 */
++	atomic_inc(&lock->readers);
++	raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++	rt_spin_lock_slowunlock(m);
++
++	debug_rt_mutex_free_waiter(&waiter);
++}
++
++void __read_rt_unlock(struct rt_rw_lock *lock)
++{
++	struct rt_mutex *m = &lock->rtmutex;
++	struct task_struct *tsk;
++
++	/*
++	 * sem->readers can only hit 0 when a writer is waiting for the
++	 * active readers to leave the critical region.
++	 */
++	if (!atomic_dec_and_test(&lock->readers))
++		return;
++
++	raw_spin_lock_irq(&m->wait_lock);
++	/*
++	 * Wake the writer, i.e. the rtmutex owner. It might release the
++	 * rtmutex concurrently in the fast path, but to clean up the rw
++	 * lock it needs to acquire m->wait_lock. The worst case which can
++	 * happen is a spurious wakeup.
++	 */
++	tsk = rt_mutex_owner(m);
++	if (tsk)
++		wake_up_process(tsk);
++
++	raw_spin_unlock_irq(&m->wait_lock);
++}
++
++static void __write_unlock_common(struct rt_rw_lock *lock, int bias,
++				  unsigned long flags)
++{
++	struct rt_mutex *m = &lock->rtmutex;
++
++	atomic_add(READER_BIAS - bias, &lock->readers);
++	raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++	rt_spin_lock_slowunlock(m);
++}
++
++void __sched __write_rt_lock(struct rt_rw_lock *lock)
++{
++	struct rt_mutex *m = &lock->rtmutex;
++	struct task_struct *self = current;
++	unsigned long flags;
++
++	/* Take the rtmutex as a first step */
++	__rt_spin_lock(m);
++
++	/* Force readers into slow path */
++	atomic_sub(READER_BIAS, &lock->readers);
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++
++	raw_spin_lock(&self->pi_lock);
++	self->saved_state = self->state;
++	__set_current_state_no_track(TASK_UNINTERRUPTIBLE);
++	raw_spin_unlock(&self->pi_lock);
++
++	for (;;) {
++		/* Have all readers left the critical region? */
++		if (!atomic_read(&lock->readers)) {
++			atomic_set(&lock->readers, WRITER_BIAS);
++			raw_spin_lock(&self->pi_lock);
++			__set_current_state_no_track(self->saved_state);
++			self->saved_state = TASK_RUNNING;
++			raw_spin_unlock(&self->pi_lock);
++			raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++			return;
++		}
++
++		raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++
++		if (atomic_read(&lock->readers) != 0)
++			schedule();
++
++		raw_spin_lock_irqsave(&m->wait_lock, flags);
++
++		raw_spin_lock(&self->pi_lock);
++		__set_current_state_no_track(TASK_UNINTERRUPTIBLE);
++		raw_spin_unlock(&self->pi_lock);
++	}
++}
++
++int __write_rt_trylock(struct rt_rw_lock *lock)
++{
++	struct rt_mutex *m = &lock->rtmutex;
++	unsigned long flags;
++
++	if (!__rt_mutex_trylock(m))
++		return 0;
++
++	atomic_sub(READER_BIAS, &lock->readers);
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++	if (!atomic_read(&lock->readers)) {
++		atomic_set(&lock->readers, WRITER_BIAS);
++		raw_spin_unlock_irqrestore(&m->wait_lock, flags);
++		return 1;
++	}
++	__write_unlock_common(lock, 0, flags);
++	return 0;
++}
++
++void __write_rt_unlock(struct rt_rw_lock *lock)
++{
++	struct rt_mutex *m = &lock->rtmutex;
++	unsigned long flags;
++
++	raw_spin_lock_irqsave(&m->wait_lock, flags);
++	__write_unlock_common(lock, WRITER_BIAS, flags);
++}
++
++/* Map the reader biased implementation */
++static inline int do_read_rt_trylock(rwlock_t *rwlock)
++{
++	return __read_rt_trylock(rwlock);
++}
++
++static inline int do_write_rt_trylock(rwlock_t *rwlock)
++{
++	return __write_rt_trylock(rwlock);
++}
++
++static inline void do_read_rt_lock(rwlock_t *rwlock)
++{
++	__read_rt_lock(rwlock);
++}
++
++static inline void do_write_rt_lock(rwlock_t *rwlock)
++{
++	__write_rt_lock(rwlock);
++}
++
++static inline void do_read_rt_unlock(rwlock_t *rwlock)
++{
++	__read_rt_unlock(rwlock);
++}
++
++static inline void do_write_rt_unlock(rwlock_t *rwlock)
++{
++	__write_rt_unlock(rwlock);
++}
++
++static inline void do_rwlock_rt_init(rwlock_t *rwlock, const char *name,
++				     struct lock_class_key *key)
++{
++	__rwlock_biased_rt_init(rwlock, name, key);
++}
++
++int __lockfunc rt_read_can_lock(rwlock_t *rwlock)
++{
++	return  atomic_read(&rwlock->readers) < 0;
++}
++
++int __lockfunc rt_write_can_lock(rwlock_t *rwlock)
++{
++	return atomic_read(&rwlock->readers) == READER_BIAS;
++}
++
++/*
++ * The common functions which get wrapped into the rwlock API.
++ */
++int __lockfunc rt_read_trylock(rwlock_t *rwlock)
++{
++	int ret;
++
++	migrate_disable();
++	ret = do_read_rt_trylock(rwlock);
++	if (ret)
++		rwlock_acquire_read(&rwlock->dep_map, 0, 1, _RET_IP_);
++	else
++		migrate_enable();
++	return ret;
++}
++EXPORT_SYMBOL(rt_read_trylock);
++
++int __lockfunc rt_write_trylock(rwlock_t *rwlock)
++{
++	int ret;
++
++	migrate_disable();
++	ret = do_write_rt_trylock(rwlock);
++	if (ret)
++		rwlock_acquire(&rwlock->dep_map, 0, 1, _RET_IP_);
++	else
++		migrate_enable();
++	return ret;
++}
++EXPORT_SYMBOL(rt_write_trylock);
++
++void __lockfunc rt_read_lock(rwlock_t *rwlock)
++{
++	migrate_disable();
++	rwlock_acquire_read(&rwlock->dep_map, 0, 0, _RET_IP_);
++	do_read_rt_lock(rwlock);
++}
++EXPORT_SYMBOL(rt_read_lock);
++
++void __lockfunc rt_write_lock(rwlock_t *rwlock)
++{
++	migrate_disable();
++	rwlock_acquire(&rwlock->dep_map, 0, 0, _RET_IP_);
++	do_write_rt_lock(rwlock);
++}
++EXPORT_SYMBOL(rt_write_lock);
++
++void __lockfunc rt_read_unlock(rwlock_t *rwlock)
++{
++	rwlock_release(&rwlock->dep_map, 1, _RET_IP_);
++	do_read_rt_unlock(rwlock);
++	migrate_enable();
++}
++EXPORT_SYMBOL(rt_read_unlock);
++
++void __lockfunc rt_write_unlock(rwlock_t *rwlock)
++{
++	rwlock_release(&rwlock->dep_map, 1, _RET_IP_);
++	do_write_rt_unlock(rwlock);
++	migrate_enable();
++}
++EXPORT_SYMBOL(rt_write_unlock);
++
++void __rt_rwlock_init(rwlock_t *rwlock, char *name, struct lock_class_key *key)
++{
++	do_rwlock_rt_init(rwlock, name, key);
++}
++EXPORT_SYMBOL(__rt_rwlock_init);
diff --git a/kernel/patches-4.14.x-rt/0241-rtmutex-wire-up-RT-s-locking.patch b/kernel/patches-4.14.x-rt/0241-rtmutex-wire-up-RT-s-locking.patch
new file mode 100644
index 000000000..bc1f7264d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0241-rtmutex-wire-up-RT-s-locking.patch
@@ -0,0 +1,248 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 12 Oct 2017 17:31:14 +0200
+Subject: rtmutex: wire up RT's locking
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/mutex.h            |   20 +++++++++++++-------
+ include/linux/rwsem.h            |   11 +++++++++++
+ include/linux/spinlock.h         |   12 +++++++++++-
+ include/linux/spinlock_api_smp.h |    4 +++-
+ include/linux/spinlock_types.h   |   11 ++++++++---
+ kernel/locking/Makefile          |    9 ++++++++-
+ kernel/locking/spinlock.c        |    7 +++++++
+ kernel/locking/spinlock_debug.c  |    5 +++++
+ 8 files changed, 66 insertions(+), 13 deletions(-)
+
+--- a/include/linux/mutex.h
++++ b/include/linux/mutex.h
+@@ -23,6 +23,17 @@
+ 
+ struct ww_acquire_ctx;
+ 
++#ifdef CONFIG_DEBUG_LOCK_ALLOC
++# define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
++		, .dep_map = { .name = #lockname }
++#else
++# define __DEP_MAP_MUTEX_INITIALIZER(lockname)
++#endif
++
++#ifdef CONFIG_PREEMPT_RT_FULL
++# include <linux/mutex_rt.h>
++#else
++
+ /*
+  * Simple, straightforward mutexes with strict semantics:
+  *
+@@ -114,13 +125,6 @@ do {									\
+ 	__mutex_init((mutex), #mutex, &__key);				\
+ } while (0)
+ 
+-#ifdef CONFIG_DEBUG_LOCK_ALLOC
+-# define __DEP_MAP_MUTEX_INITIALIZER(lockname) \
+-		, .dep_map = { .name = #lockname }
+-#else
+-# define __DEP_MAP_MUTEX_INITIALIZER(lockname)
+-#endif
+-
+ #define __MUTEX_INITIALIZER(lockname) \
+ 		{ .owner = ATOMIC_LONG_INIT(0) \
+ 		, .wait_lock = __SPIN_LOCK_UNLOCKED(lockname.wait_lock) \
+@@ -228,4 +232,6 @@ mutex_trylock_recursive(struct mutex *lo
+ 	return mutex_trylock(lock);
+ }
+ 
++#endif /* !PREEMPT_RT_FULL */
++
+ #endif /* __LINUX_MUTEX_H */
+--- a/include/linux/rwsem.h
++++ b/include/linux/rwsem.h
+@@ -20,6 +20,10 @@
+ #include <linux/osq_lock.h>
+ #endif
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++#include <linux/rwsem_rt.h>
++#else /* PREEMPT_RT_FULL */
++
+ struct rw_semaphore;
+ 
+ #ifdef CONFIG_RWSEM_GENERIC_SPINLOCK
+@@ -108,6 +112,13 @@ static inline int rwsem_is_contended(str
+ 	return !list_empty(&sem->wait_list);
+ }
+ 
++#endif /* !PREEMPT_RT_FULL */
++
++/*
++ * The functions below are the same for all rwsem implementations including
++ * the RT specific variant.
++ */
++
+ /*
+  * lock for reading
+  */
+--- a/include/linux/spinlock.h
++++ b/include/linux/spinlock.h
+@@ -286,7 +286,11 @@ static inline void do_raw_spin_unlock(ra
+ #define raw_spin_can_lock(lock)	(!raw_spin_is_locked(lock))
+ 
+ /* Include rwlock functions */
+-#include <linux/rwlock.h>
++#ifdef CONFIG_PREEMPT_RT_FULL
++# include <linux/rwlock_rt.h>
++#else
++# include <linux/rwlock.h>
++#endif
+ 
+ /*
+  * Pull the _spin_*()/_read_*()/_write_*() functions/declarations:
+@@ -297,6 +301,10 @@ static inline void do_raw_spin_unlock(ra
+ # include <linux/spinlock_api_up.h>
+ #endif
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++# include <linux/spinlock_rt.h>
++#else /* PREEMPT_RT_FULL */
++
+ /*
+  * Map the spin_lock functions to the raw variants for PREEMPT_RT=n
+  */
+@@ -421,4 +429,6 @@ extern int _atomic_dec_and_lock(atomic_t
+ #define atomic_dec_and_lock(atomic, lock) \
+ 		__cond_lock(lock, _atomic_dec_and_lock(atomic, lock))
+ 
++#endif /* !PREEMPT_RT_FULL */
++
+ #endif /* __LINUX_SPINLOCK_H */
+--- a/include/linux/spinlock_api_smp.h
++++ b/include/linux/spinlock_api_smp.h
+@@ -187,6 +187,8 @@ static inline int __raw_spin_trylock_bh(
+ 	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 */
+--- a/include/linux/spinlock_types.h
++++ b/include/linux/spinlock_types.h
+@@ -11,8 +11,13 @@
+ 
+ #include <linux/spinlock_types_raw.h>
+ 
+-#include <linux/spinlock_types_nort.h>
+-
+-#include <linux/rwlock_types.h>
++#ifndef CONFIG_PREEMPT_RT_FULL
++# include <linux/spinlock_types_nort.h>
++# include <linux/rwlock_types.h>
++#else
++# include <linux/rtmutex.h>
++# include <linux/spinlock_types_rt.h>
++# include <linux/rwlock_types_rt.h>
++#endif
+ 
+ #endif /* __LINUX_SPINLOCK_TYPES_H */
+--- a/kernel/locking/Makefile
++++ b/kernel/locking/Makefile
+@@ -3,7 +3,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)
+@@ -12,7 +12,11 @@ CFLAGS_REMOVE_mutex-debug.o = $(CC_FLAGS
+ 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
+@@ -25,8 +29,11 @@ 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) += mutex-rt.o rwsem-rt.o rwlock-rt.o
+ obj-$(CONFIG_QUEUED_RWLOCKS) += qrwlock.o
+ obj-$(CONFIG_LOCK_TORTURE_TEST) += locktorture.o
+ obj-$(CONFIG_WW_MUTEX_SELFTEST) += test-ww_mutex.o
+--- a/kernel/locking/spinlock.c
++++ b/kernel/locking/spinlock.c
+@@ -125,8 +125,11 @@ void __lockfunc __raw_##op##_lock_bh(loc
+  *         __[spin|read|write]_lock_bh()
+  */
+ BUILD_LOCK_OPS(spin, raw_spinlock);
++
++#ifndef CONFIG_PREEMPT_RT_FULL
+ BUILD_LOCK_OPS(read, rwlock);
+ BUILD_LOCK_OPS(write, rwlock);
++#endif
+ 
+ #endif
+ 
+@@ -210,6 +213,8 @@ void __lockfunc _raw_spin_unlock_bh(raw_
+ EXPORT_SYMBOL(_raw_spin_unlock_bh);
+ #endif
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ #ifndef CONFIG_INLINE_READ_TRYLOCK
+ int __lockfunc _raw_read_trylock(rwlock_t *lock)
+ {
+@@ -354,6 +359,8 @@ void __lockfunc _raw_write_unlock_bh(rwl
+ EXPORT_SYMBOL(_raw_write_unlock_bh);
+ #endif
+ 
++#endif /* !PREEMPT_RT_FULL */
++
+ #ifdef CONFIG_DEBUG_LOCK_ALLOC
+ 
+ void __lockfunc _raw_spin_lock_nested(raw_spinlock_t *lock, int subclass)
+--- a/kernel/locking/spinlock_debug.c
++++ b/kernel/locking/spinlock_debug.c
+@@ -31,6 +31,7 @@ void __raw_spin_lock_init(raw_spinlock_t
+ 
+ EXPORT_SYMBOL(__raw_spin_lock_init);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ void __rwlock_init(rwlock_t *lock, const char *name,
+ 		   struct lock_class_key *key)
+ {
+@@ -48,6 +49,7 @@ void __rwlock_init(rwlock_t *lock, const
+ }
+ 
+ EXPORT_SYMBOL(__rwlock_init);
++#endif
+ 
+ static void spin_dump(raw_spinlock_t *lock, const char *msg)
+ {
+@@ -135,6 +137,7 @@ void do_raw_spin_unlock(raw_spinlock_t *
+ 	arch_spin_unlock(&lock->raw_lock);
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ static void rwlock_bug(rwlock_t *lock, const char *msg)
+ {
+ 	if (!debug_locks_off())
+@@ -224,3 +227,5 @@ void do_raw_write_unlock(rwlock_t *lock)
+ 	debug_write_unlock(lock);
+ 	arch_write_unlock(&lock->raw_lock);
+ }
++
++#endif
diff --git a/kernel/patches-4.14.x-rt/0242-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch b/kernel/patches-4.14.x-rt/0242-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch
new file mode 100644
index 000000000..9aee46801
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0242-rtmutex-add-ww_mutex-addon-for-mutex-rt.patch
@@ -0,0 +1,422 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 12 Oct 2017 17:34:38 +0200
+Subject: rtmutex: add ww_mutex addon for mutex-rt
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c        |  264 ++++++++++++++++++++++++++++++++++++++--
+ kernel/locking/rtmutex_common.h |    2 
+ kernel/locking/rwsem-rt.c       |    2 
+ 3 files changed, 257 insertions(+), 11 deletions(-)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -23,6 +23,7 @@
+ #include <linux/sched/wake_q.h>
+ #include <linux/sched/debug.h>
+ #include <linux/timer.h>
++#include <linux/ww_mutex.h>
+ 
+ #include "rtmutex_common.h"
+ 
+@@ -1258,6 +1259,40 @@ EXPORT_SYMBOL(__rt_spin_lock_init);
+ 
+ #endif /* PREEMPT_RT_FULL */
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	static inline int __sched
++__mutex_lock_check_stamp(struct rt_mutex *lock, struct ww_acquire_ctx *ctx)
++{
++	struct ww_mutex *ww = container_of(lock, struct ww_mutex, base.lock);
++	struct ww_acquire_ctx *hold_ctx = ACCESS_ONCE(ww->ctx);
++
++	if (!hold_ctx)
++		return 0;
++
++	if (unlikely(ctx == hold_ctx))
++		return -EALREADY;
++
++	if (ctx->stamp - hold_ctx->stamp <= LONG_MAX &&
++	    (ctx->stamp != hold_ctx->stamp || ctx > hold_ctx)) {
++#ifdef CONFIG_DEBUG_MUTEXES
++		DEBUG_LOCKS_WARN_ON(ctx->contending_lock);
++		ctx->contending_lock = ww;
++#endif
++		return -EDEADLK;
++	}
++
++	return 0;
++}
++#else
++	static inline int __sched
++__mutex_lock_check_stamp(struct rt_mutex *lock, struct ww_acquire_ctx *ctx)
++{
++	BUG();
++	return 0;
++}
++
++#endif
++
+ static inline int
+ try_to_take_rt_mutex(struct rt_mutex *lock, struct task_struct *task,
+ 		     struct rt_mutex_waiter *waiter)
+@@ -1536,7 +1571,8 @@ void rt_mutex_init_waiter(struct rt_mute
+ static int __sched
+ __rt_mutex_slowlock(struct rt_mutex *lock, int state,
+ 		    struct hrtimer_sleeper *timeout,
+-		    struct rt_mutex_waiter *waiter)
++		    struct rt_mutex_waiter *waiter,
++		    struct ww_acquire_ctx *ww_ctx)
+ {
+ 	int ret = 0;
+ 
+@@ -1554,6 +1590,12 @@ static int __sched
+ 			break;
+ 		}
+ 
++		if (ww_ctx && ww_ctx->acquired > 0) {
++			ret = __mutex_lock_check_stamp(lock, ww_ctx);
++			if (ret)
++				break;
++		}
++
+ 		raw_spin_unlock_irq(&lock->wait_lock);
+ 
+ 		debug_rt_mutex_print_deadlock(waiter);
+@@ -1588,16 +1630,106 @@ static void rt_mutex_handle_deadlock(int
+ 	}
+ }
+ 
++static __always_inline void ww_mutex_lock_acquired(struct ww_mutex *ww,
++						   struct ww_acquire_ctx *ww_ctx)
++{
++#ifdef CONFIG_DEBUG_MUTEXES
++	/*
++	 * If this WARN_ON triggers, you used ww_mutex_lock to acquire,
++	 * but released with a normal mutex_unlock in this call.
++	 *
++	 * This should never happen, always use ww_mutex_unlock.
++	 */
++	DEBUG_LOCKS_WARN_ON(ww->ctx);
++
++	/*
++	 * Not quite done after calling ww_acquire_done() ?
++	 */
++	DEBUG_LOCKS_WARN_ON(ww_ctx->done_acquire);
++
++	if (ww_ctx->contending_lock) {
++		/*
++		 * After -EDEADLK you tried to
++		 * acquire a different ww_mutex? Bad!
++		 */
++		DEBUG_LOCKS_WARN_ON(ww_ctx->contending_lock != ww);
++
++		/*
++		 * You called ww_mutex_lock after receiving -EDEADLK,
++		 * but 'forgot' to unlock everything else first?
++		 */
++		DEBUG_LOCKS_WARN_ON(ww_ctx->acquired > 0);
++		ww_ctx->contending_lock = NULL;
++	}
++
++	/*
++	 * Naughty, using a different class will lead to undefined behavior!
++	 */
++	DEBUG_LOCKS_WARN_ON(ww_ctx->ww_class != ww->ww_class);
++#endif
++	ww_ctx->acquired++;
++}
++
++#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;
++
++	/*
++	 * This branch gets optimized out for the common case,
++	 * and is only important for ww_mutex_lock.
++	 */
++	ww_mutex_lock_acquired(ww, ww_ctx);
++	ww->ctx = ww_ctx;
++
++	/*
++	 * Give any possible sleeping processes the chance to wake up,
++	 * so they can recheck if they have to back off.
++	 */
++	rbtree_postorder_for_each_entry_safe(waiter, n, &lock->waiters.rb_root,
++					     tree_entry) {
++		/* XXX debug rt mutex waiter wakeup */
++
++		BUG_ON(waiter->lock != lock);
++		rt_mutex_wake_waiter(waiter);
++	}
++}
++
++#else
++
++static void ww_mutex_account_lock(struct rt_mutex *lock,
++				  struct ww_acquire_ctx *ww_ctx)
++{
++	BUG();
++}
++#endif
++
+ int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
+ 				     struct hrtimer_sleeper *timeout,
+ 				     enum rtmutex_chainwalk chwalk,
++				     struct ww_acquire_ctx *ww_ctx,
+ 				     struct rt_mutex_waiter *waiter)
+ {
+ 	int ret;
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (ww_ctx) {
++		struct ww_mutex *ww;
++
++		ww = container_of(lock, struct ww_mutex, base.lock);
++		if (unlikely(ww_ctx == READ_ONCE(ww->ctx)))
++			return -EALREADY;
++	}
++#endif
++
+ 	/* Try to acquire the lock again: */
+-	if (try_to_take_rt_mutex(lock, current, NULL))
++	if (try_to_take_rt_mutex(lock, current, NULL)) {
++		if (ww_ctx)
++			ww_mutex_account_lock(lock, ww_ctx);
+ 		return 0;
++	}
+ 
+ 	set_current_state(state);
+ 
+@@ -1609,7 +1741,12 @@ int __sched rt_mutex_slowlock_locked(str
+ 
+ 	if (likely(!ret)) {
+ 		/* sleep on the mutex */
+-		ret = __rt_mutex_slowlock(lock, state, timeout, waiter);
++		ret = __rt_mutex_slowlock(lock, state, timeout, waiter,
++					  ww_ctx);
++	} else if (ww_ctx) {
++		/* ww_mutex received EDEADLK, let it become EALREADY */
++		ret = __mutex_lock_check_stamp(lock, ww_ctx);
++		BUG_ON(!ret);
+ 	}
+ 
+ 	if (unlikely(ret)) {
+@@ -1617,6 +1754,10 @@ int __sched rt_mutex_slowlock_locked(str
+ 		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);
+ 	}
+ 
+ 	/*
+@@ -1633,7 +1774,8 @@ int __sched rt_mutex_slowlock_locked(str
+ 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;
+@@ -1651,7 +1793,8 @@ rt_mutex_slowlock(struct rt_mutex *lock,
+ 	 */
+ 	raw_spin_lock_irqsave(&lock->wait_lock, flags);
+ 
+-	ret = rt_mutex_slowlock_locked(lock, state, timeout, chwalk, &waiter);
++	ret = rt_mutex_slowlock_locked(lock, state, timeout, chwalk, ww_ctx,
++				       &waiter);
+ 
+ 	raw_spin_unlock_irqrestore(&lock->wait_lock, flags);
+ 
+@@ -1781,29 +1924,33 @@ static bool __sched rt_mutex_slowunlock(
+  */
+ static inline int
+ rt_mutex_fastlock(struct rt_mutex *lock, int state,
++		  struct ww_acquire_ctx *ww_ctx,
+ 		  int (*slowfn)(struct rt_mutex *lock, int state,
+ 				struct hrtimer_sleeper *timeout,
+-				enum rtmutex_chainwalk chwalk))
++				enum rtmutex_chainwalk chwalk,
++				struct ww_acquire_ctx *ww_ctx))
+ {
+ 	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
+ 		return 0;
+ 
+-	return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK);
++	return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK, ww_ctx);
+ }
+ 
+ static inline int
+ rt_mutex_timed_fastlock(struct rt_mutex *lock, int state,
+ 			struct hrtimer_sleeper *timeout,
+ 			enum rtmutex_chainwalk chwalk,
++			struct ww_acquire_ctx *ww_ctx,
+ 			int (*slowfn)(struct rt_mutex *lock, int state,
+ 				      struct hrtimer_sleeper *timeout,
+-				      enum rtmutex_chainwalk chwalk))
++				      enum rtmutex_chainwalk chwalk,
++				      struct ww_acquire_ctx *ww_ctx))
+ {
+ 	if (chwalk == RT_MUTEX_MIN_CHAINWALK &&
+ 	    likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
+ 		return 0;
+ 
+-	return slowfn(lock, state, timeout, chwalk);
++	return slowfn(lock, state, timeout, chwalk, ww_ctx);
+ }
+ 
+ static inline int
+@@ -1946,6 +2093,7 @@ rt_mutex_timed_lock(struct rt_mutex *loc
+ 	mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
+ 	ret = rt_mutex_timed_fastlock(lock, TASK_INTERRUPTIBLE, timeout,
+ 				       RT_MUTEX_MIN_CHAINWALK,
++				       NULL,
+ 				       rt_mutex_slowlock);
+ 	if (ret)
+ 		mutex_release(&lock->dep_map, 1, _RET_IP_);
+@@ -2266,7 +2414,7 @@ int rt_mutex_wait_proxy_lock(struct rt_m
+ 	raw_spin_lock_irq(&lock->wait_lock);
+ 	/* sleep on the mutex */
+ 	set_current_state(TASK_INTERRUPTIBLE);
+-	ret = __rt_mutex_slowlock(lock, TASK_INTERRUPTIBLE, to, waiter);
++	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.
+@@ -2350,3 +2498,99 @@ bool rt_mutex_cleanup_proxy_lock(struct
+ 
+ 	return cleanup;
+ }
++
++static inline int
++ww_mutex_deadlock_injection(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
++{
++#ifdef CONFIG_DEBUG_WW_MUTEX_SLOWPATH
++	unsigned tmp;
++
++	if (ctx->deadlock_inject_countdown-- == 0) {
++		tmp = ctx->deadlock_inject_interval;
++		if (tmp > UINT_MAX/4)
++			tmp = UINT_MAX;
++		else
++			tmp = tmp*2 + tmp + tmp/2;
++
++		ctx->deadlock_inject_interval = tmp;
++		ctx->deadlock_inject_countdown = tmp;
++		ctx->contending_lock = lock;
++
++		ww_mutex_unlock(lock);
++
++		return -EDEADLK;
++	}
++#endif
++
++	return 0;
++}
++
++#ifdef CONFIG_PREEMPT_RT_FULL
++int __sched
++ww_mutex_lock_interruptible(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
++{
++	int ret;
++
++	might_sleep();
++
++	mutex_acquire_nest(&lock->base.dep_map, 0, 0,
++			   ctx ? &ctx->dep_map : NULL, _RET_IP_);
++	ret = rt_mutex_slowlock(&lock->base.lock, TASK_INTERRUPTIBLE, NULL, 0,
++				ctx);
++	if (ret)
++		mutex_release(&lock->base.dep_map, 1, _RET_IP_);
++	else if (!ret && ctx && ctx->acquired > 1)
++		return ww_mutex_deadlock_injection(lock, ctx);
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(ww_mutex_lock_interruptible);
++
++int __sched
++ww_mutex_lock(struct ww_mutex *lock, struct ww_acquire_ctx *ctx)
++{
++	int ret;
++
++	might_sleep();
++
++	mutex_acquire_nest(&lock->base.dep_map, 0, 0,
++			   ctx ? &ctx->dep_map : NULL, _RET_IP_);
++	ret = rt_mutex_slowlock(&lock->base.lock, TASK_UNINTERRUPTIBLE, NULL, 0,
++				ctx);
++	if (ret)
++		mutex_release(&lock->base.dep_map, 1, _RET_IP_);
++	else if (!ret && ctx && ctx->acquired > 1)
++		return ww_mutex_deadlock_injection(lock, ctx);
++
++	return ret;
++}
++EXPORT_SYMBOL_GPL(ww_mutex_lock);
++
++void __sched ww_mutex_unlock(struct ww_mutex *lock)
++{
++	int nest = !!lock->ctx;
++
++	/*
++	 * The unlocking fastpath is the 0->1 transition from 'locked'
++	 * into 'unlocked' state:
++	 */
++	if (nest) {
++#ifdef CONFIG_DEBUG_MUTEXES
++		DEBUG_LOCKS_WARN_ON(!lock->ctx->acquired);
++#endif
++		if (lock->ctx->acquired > 0)
++			lock->ctx->acquired--;
++		lock->ctx = NULL;
++	}
++
++	mutex_release(&lock->base.dep_map, nest, _RET_IP_);
++	__rt_mutex_unlock(&lock->base.lock);
++}
++EXPORT_SYMBOL(ww_mutex_unlock);
++
++int __rt_mutex_owner_current(struct rt_mutex *lock)
++{
++	return rt_mutex_owner(lock) == current;
++}
++EXPORT_SYMBOL(__rt_mutex_owner_current);
++#endif
+--- a/kernel/locking/rtmutex_common.h
++++ b/kernel/locking/rtmutex_common.h
+@@ -164,6 +164,7 @@ extern void rt_mutex_postunlock(struct w
+ 				struct wake_q_head *wake_sleeper_q);
+ 
+ /* RW semaphore special interface */
++struct ww_acquire_ctx;
+ 
+ extern int __rt_mutex_lock_state(struct rt_mutex *lock, int state);
+ extern int __rt_mutex_trylock(struct rt_mutex *lock);
+@@ -171,6 +172,7 @@ extern void __rt_mutex_unlock(struct rt_
+ int __sched rt_mutex_slowlock_locked(struct rt_mutex *lock, int state,
+ 				     struct hrtimer_sleeper *timeout,
+ 				     enum rtmutex_chainwalk chwalk,
++				     struct ww_acquire_ctx *ww_ctx,
+ 				     struct rt_mutex_waiter *waiter);
+ void __sched rt_spin_lock_slowlock_locked(struct rt_mutex *lock,
+ 					  struct rt_mutex_waiter *waiter,
+--- a/kernel/locking/rwsem-rt.c
++++ b/kernel/locking/rwsem-rt.c
+@@ -130,7 +130,7 @@ void __sched __down_read(struct rw_semap
+ 	 */
+ 	rt_mutex_init_waiter(&waiter, false);
+ 	rt_mutex_slowlock_locked(m, TASK_UNINTERRUPTIBLE, NULL,
+-				 RT_MUTEX_MIN_CHAINWALK,
++				 RT_MUTEX_MIN_CHAINWALK, NULL,
+ 				 &waiter);
+ 	/*
+ 	 * The slowlock() above is guaranteed to return with the rtmutex is
diff --git a/kernel/patches-4.14.x-rt/0243-locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch b/kernel/patches-4.14.x-rt/0243-locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
new file mode 100644
index 000000000..65c7a6099
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0243-locking-rt-mutex-fix-deadlock-in-device-mapper-block.patch
@@ -0,0 +1,73 @@
+From: Mikulas Patocka <mpatocka@redhat.com>
+Date: Mon, 13 Nov 2017 12:56:53 -0500
+Subject: [PATCH] locking/rt-mutex: fix deadlock in device mapper / block-IO
+
+When some block device driver creates a bio and submits it to another
+block device driver, the bio is added to current->bio_list (in order to
+avoid unbounded recursion).
+
+However, this queuing of bios can cause deadlocks, in order to avoid them,
+device mapper registers a function flush_current_bio_list. This function
+is called when device mapper driver blocks. It redirects bios queued on
+current->bio_list to helper workqueues, so that these bios can proceed
+even if the driver is blocked.
+
+The problem with CONFIG_PREEMPT_RT_FULL is that when the device mapper
+driver blocks, it won't call flush_current_bio_list (because
+tsk_is_pi_blocked returns true in sched_submit_work), so deadlocks in
+block device stack can happen.
+
+Note that we can't call blk_schedule_flush_plug if tsk_is_pi_blocked
+returns true - that would cause
+BUG_ON(rt_mutex_real_waiter(task->pi_blocked_on)) in
+task_blocks_on_rt_mutex when flush_current_bio_list attempts to take a
+spinlock.
+
+So the proper fix is to call blk_schedule_flush_plug in rt_mutex_fastlock,
+when fast acquire failed and when the task is about to block.
+
+CC: stable-rt@vger.kernel.org
+[bigeasy: The deadlock is not device-mapper specific, it can also occur
+          in plain EXT4]
+Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -24,6 +24,7 @@
+ #include <linux/sched/debug.h>
+ #include <linux/timer.h>
+ #include <linux/ww_mutex.h>
++#include <linux/blkdev.h>
+ 
+ #include "rtmutex_common.h"
+ 
+@@ -1933,6 +1934,15 @@ rt_mutex_fastlock(struct rt_mutex *lock,
+ 	if (likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
+ 		return 0;
+ 
++	/*
++	 * If rt_mutex blocks, the function sched_submit_work will not call
++	 * blk_schedule_flush_plug (because tsk_is_pi_blocked would be true).
++	 * We must call blk_schedule_flush_plug here, if we don't call it,
++	 * a deadlock in device mapper may happen.
++	 */
++	if (unlikely(blk_needs_flush_plug(current)))
++		blk_schedule_flush_plug(current);
++
+ 	return slowfn(lock, state, NULL, RT_MUTEX_MIN_CHAINWALK, ww_ctx);
+ }
+ 
+@@ -1950,6 +1960,9 @@ rt_mutex_timed_fastlock(struct rt_mutex
+ 	    likely(rt_mutex_cmpxchg_acquire(lock, NULL, current)))
+ 		return 0;
+ 
++	if (unlikely(blk_needs_flush_plug(current)))
++		blk_schedule_flush_plug(current);
++
+ 	return slowfn(lock, state, timeout, chwalk, ww_ctx);
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0244-locking-rtmutex-re-init-the-wait_lock-in-rt_mutex_in.patch b/kernel/patches-4.14.x-rt/0244-locking-rtmutex-re-init-the-wait_lock-in-rt_mutex_in.patch
new file mode 100644
index 000000000..c295c4008
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0244-locking-rtmutex-re-init-the-wait_lock-in-rt_mutex_in.patch
@@ -0,0 +1,32 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 16 Nov 2017 16:48:48 +0100
+Subject: [PATCH] locking/rtmutex: re-init the wait_lock in
+ rt_mutex_init_proxy_locked()
+
+We could provide a key-class for the lockdep (and fixup all callers) or
+move the init to all callers (like it was) in order to avoid lockdep
+seeing a double-lock of the wait_lock.
+
+Reported-by: Fernando Lopez-Lezcano <nando@ccrma.Stanford.EDU>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/locking/rtmutex.c |    8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+--- a/kernel/locking/rtmutex.c
++++ b/kernel/locking/rtmutex.c
+@@ -2272,6 +2272,14 @@ void rt_mutex_init_proxy_locked(struct r
+ 				struct task_struct *proxy_owner)
+ {
+ 	__rt_mutex_init(lock, NULL, NULL);
++#ifdef CONFIG_DEBUG_SPINLOCK
++	/*
++	 * get another key class for the wait_lock. LOCK_PI and UNLOCK_PI is
++	 * holding the ->wait_lock of the proxy_lock while unlocking a sleeping
++	 * lock.
++	 */
++	raw_spin_lock_init(&lock->wait_lock);
++#endif
+ 	debug_rt_mutex_proxy_lock(lock, proxy_owner);
+ 	rt_mutex_set_owner(lock, proxy_owner);
+ }
diff --git a/kernel/patches-4.14.x-rt/0245-ptrace-fix-ptrace-vs-tasklist_lock-race.patch b/kernel/patches-4.14.x-rt/0245-ptrace-fix-ptrace-vs-tasklist_lock-race.patch
new file mode 100644
index 000000000..caa839d20
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0245-ptrace-fix-ptrace-vs-tasklist_lock-race.patch
@@ -0,0 +1,155 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 29 Aug 2013 18:21:04 +0200
+Subject: ptrace: fix ptrace vs tasklist_lock race
+
+As explained by Alexander Fyodorov <halcy@yandex.ru>:
+
+|read_lock(&tasklist_lock) in ptrace_stop() is converted to mutex on RT kernel,
+|and it can remove __TASK_TRACED from task->state (by moving  it to
+|task->saved_state). If parent does wait() on child followed by a sys_ptrace
+|call, the following race can happen:
+|
+|- child sets __TASK_TRACED in ptrace_stop()
+|- parent does wait() which eventually calls wait_task_stopped() and returns
+|  child's pid
+|- child blocks on read_lock(&tasklist_lock) in ptrace_stop() and moves
+|  __TASK_TRACED flag to saved_state
+|- parent calls sys_ptrace, which calls ptrace_check_attach() and wait_task_inactive()
+
+The patch is based on his initial patch where an additional check is
+added in case the __TASK_TRACED moved to ->saved_state. The pi_lock is
+taken in case the caller is interrupted between looking into ->state and
+->saved_state.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/sched.h |   49 +++++++++++++++++++++++++++++++++++++++++++++----
+ kernel/ptrace.c       |    9 ++++++++-
+ kernel/sched/core.c   |   17 +++++++++++++++--
+ 3 files changed, 68 insertions(+), 7 deletions(-)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -100,12 +100,8 @@ struct task_group;
+ 					 __TASK_TRACED | EXIT_DEAD | EXIT_ZOMBIE | \
+ 					 TASK_PARKED)
+ 
+-#define task_is_traced(task)		((task->state & __TASK_TRACED) != 0)
+-
+ #define task_is_stopped(task)		((task->state & __TASK_STOPPED) != 0)
+ 
+-#define task_is_stopped_or_traced(task)	((task->state & (__TASK_STOPPED | __TASK_TRACED)) != 0)
+-
+ #define task_contributes_to_load(task)	((task->state & TASK_UNINTERRUPTIBLE) != 0 && \
+ 					 (task->flags & PF_FROZEN) == 0 && \
+ 					 (task->state & TASK_NOLOAD) == 0)
+@@ -1593,6 +1589,51 @@ static inline int test_tsk_need_resched(
+ 	return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
+ }
+ 
++static inline bool __task_is_stopped_or_traced(struct task_struct *task)
++{
++	if (task->state & (__TASK_STOPPED | __TASK_TRACED))
++		return true;
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (task->saved_state & (__TASK_STOPPED | __TASK_TRACED))
++		return true;
++#endif
++	return false;
++}
++
++static inline bool task_is_stopped_or_traced(struct task_struct *task)
++{
++	bool traced_stopped;
++
++#ifdef CONFIG_PREEMPT_RT_FULL
++	unsigned long flags;
++
++	raw_spin_lock_irqsave(&task->pi_lock, flags);
++	traced_stopped = __task_is_stopped_or_traced(task);
++	raw_spin_unlock_irqrestore(&task->pi_lock, flags);
++#else
++	traced_stopped = __task_is_stopped_or_traced(task);
++#endif
++	return traced_stopped;
++}
++
++static inline bool task_is_traced(struct task_struct *task)
++{
++	bool traced = false;
++
++	if (task->state & __TASK_TRACED)
++		return true;
++#ifdef CONFIG_PREEMPT_RT_FULL
++	/* in case the task is sleeping on tasklist_lock */
++	raw_spin_lock_irq(&task->pi_lock);
++	if (task->state & __TASK_TRACED)
++		traced = true;
++	else if (task->saved_state & __TASK_TRACED)
++		traced = true;
++	raw_spin_unlock_irq(&task->pi_lock);
++#endif
++	return traced;
++}
++
+ /*
+  * cond_resched() and cond_resched_lock(): latency reduction via
+  * explicit rescheduling in places that are safe. The return
+--- a/kernel/ptrace.c
++++ b/kernel/ptrace.c
+@@ -175,7 +175,14 @@ static bool ptrace_freeze_traced(struct
+ 
+ 	spin_lock_irq(&task->sighand->siglock);
+ 	if (task_is_traced(task) && !__fatal_signal_pending(task)) {
+-		task->state = __TASK_TRACED;
++		unsigned long flags;
++
++		raw_spin_lock_irqsave(&task->pi_lock, flags);
++		if (task->state & __TASK_TRACED)
++			task->state = __TASK_TRACED;
++		else
++			task->saved_state = __TASK_TRACED;
++		raw_spin_unlock_irqrestore(&task->pi_lock, flags);
+ 		ret = true;
+ 	}
+ 	spin_unlock_irq(&task->sighand->siglock);
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -1358,6 +1358,18 @@ int migrate_swap(struct task_struct *cur
+ 	return ret;
+ }
+ 
++static bool check_task_state(struct task_struct *p, long match_state)
++{
++	bool match = false;
++
++	raw_spin_lock_irq(&p->pi_lock);
++	if (p->state == match_state || p->saved_state == match_state)
++		match = true;
++	raw_spin_unlock_irq(&p->pi_lock);
++
++	return match;
++}
++
+ /*
+  * wait_task_inactive - wait for a thread to unschedule.
+  *
+@@ -1402,7 +1414,7 @@ unsigned long wait_task_inactive(struct
+ 		 * is actually now running somewhere else!
+ 		 */
+ 		while (task_running(rq, p)) {
+-			if (match_state && unlikely(p->state != match_state))
++			if (match_state && !check_task_state(p, match_state))
+ 				return 0;
+ 			cpu_relax();
+ 		}
+@@ -1417,7 +1429,8 @@ unsigned long wait_task_inactive(struct
+ 		running = task_running(rq, p);
+ 		queued = task_on_rq_queued(p);
+ 		ncsw = 0;
+-		if (!match_state || p->state == match_state)
++		if (!match_state || p->state == match_state ||
++		    p->saved_state == match_state)
+ 			ncsw = p->nvcsw | LONG_MIN; /* sets MSB */
+ 		task_rq_unlock(rq, p, &rf);
+ 
diff --git a/kernel/patches-4.14.x-rt/0246-RCU-we-need-to-skip-that-warning-but-only-on-sleepin.patch b/kernel/patches-4.14.x-rt/0246-RCU-we-need-to-skip-that-warning-but-only-on-sleepin.patch
new file mode 100644
index 000000000..28105f496
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0246-RCU-we-need-to-skip-that-warning-but-only-on-sleepin.patch
@@ -0,0 +1,35 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 21 Sep 2017 14:25:13 +0200
+Subject: [PATCH] RCU: we need to skip that warning but only on sleeping
+ locks
+
+This check is okay for upstream. On RT we trigger this while blocking on
+sleeping lock. In this case, it is okay to schedule() within a RCU
+section.
+Since spin_lock() and read_lock() disables migration it should be okay
+to test for this as an indication whether or not a sleeping lock is
+held. The ->pi_blocked_on member won't work becasuse it might also be
+set on regular mutexes.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/tree_plugin.h |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
+@@ -323,9 +323,13 @@ static void rcu_preempt_note_context_swi
+ 	struct task_struct *t = current;
+ 	struct rcu_data *rdp;
+ 	struct rcu_node *rnp;
++	int mg_counter = 0;
+ 
+ 	RCU_LOCKDEP_WARN(!irqs_disabled(), "rcu_preempt_note_context_switch() invoked with interrupts enabled!!!\n");
+-	WARN_ON_ONCE(!preempt && t->rcu_read_lock_nesting > 0);
++#if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
++	mg_counter = t->migrate_disable;
++#endif
++	WARN_ON_ONCE(!preempt && t->rcu_read_lock_nesting > 0 && !mg_counter);
+ 	if (t->rcu_read_lock_nesting > 0 &&
+ 	    !t->rcu_read_unlock_special.b.blocked) {
+ 
diff --git a/kernel/patches-4.14.x-rt/0247-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch b/kernel/patches-4.14.x-rt/0247-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch
new file mode 100644
index 000000000..336a73567
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0247-locking-don-t-check-for-__LINUX_SPINLOCK_TYPES_H-on-.patch
@@ -0,0 +1,227 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 4 Aug 2017 17:40:42 +0200
+Subject: [PATCH 1/2] locking: don't check for __LINUX_SPINLOCK_TYPES_H on -RT
+ archs
+
+Upstream uses arch_spinlock_t within spinlock_t and requests that
+spinlock_types.h header file is included first.
+On -RT we have the rt_mutex with its raw_lock wait_lock which needs
+architectures' spinlock_types.h header file for its definition. However
+we need rt_mutex first because it is used to build the spinlock_t so
+that check does not work for us.
+Therefore I am dropping that check.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/alpha/include/asm/spinlock_types.h    |    4 ----
+ arch/arm/include/asm/spinlock_types.h      |    4 ----
+ arch/arm64/include/asm/spinlock_types.h    |    4 ----
+ arch/blackfin/include/asm/spinlock_types.h |    4 ----
+ arch/hexagon/include/asm/spinlock_types.h  |    4 ----
+ arch/ia64/include/asm/spinlock_types.h     |    4 ----
+ arch/m32r/include/asm/spinlock_types.h     |    4 ----
+ arch/metag/include/asm/spinlock_types.h    |    4 ----
+ arch/mn10300/include/asm/spinlock_types.h  |    4 ----
+ arch/powerpc/include/asm/spinlock_types.h  |    4 ----
+ arch/s390/include/asm/spinlock_types.h     |    4 ----
+ arch/sh/include/asm/spinlock_types.h       |    4 ----
+ arch/tile/include/asm/spinlock_types.h     |    4 ----
+ arch/xtensa/include/asm/spinlock_types.h   |    4 ----
+ include/linux/spinlock_types_up.h          |    4 ----
+ 15 files changed, 60 deletions(-)
+
+--- a/arch/alpha/include/asm/spinlock_types.h
++++ b/arch/alpha/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef _ALPHA_SPINLOCK_TYPES_H
+ #define _ALPHA_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int lock;
+ } arch_spinlock_t;
+--- a/arch/arm/include/asm/spinlock_types.h
++++ b/arch/arm/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef __ASM_SPINLOCK_TYPES_H
+ #define __ASM_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ #define TICKET_SHIFT	16
+ 
+ typedef struct {
+--- a/arch/arm64/include/asm/spinlock_types.h
++++ b/arch/arm64/include/asm/spinlock_types.h
+@@ -16,10 +16,6 @@
+ #ifndef __ASM_SPINLOCK_TYPES_H
+ #define __ASM_SPINLOCK_TYPES_H
+ 
+-#if !defined(__LINUX_SPINLOCK_TYPES_H) && !defined(__ASM_SPINLOCK_H)
+-# error "please don't include this file directly"
+-#endif
+-
+ #include <linux/types.h>
+ 
+ #define TICKET_SHIFT	16
+--- a/arch/blackfin/include/asm/spinlock_types.h
++++ b/arch/blackfin/include/asm/spinlock_types.h
+@@ -7,10 +7,6 @@
+ #ifndef __ASM_SPINLOCK_TYPES_H
+ #define __ASM_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ #include <asm/rwlock.h>
+ 
+ typedef struct {
+--- a/arch/hexagon/include/asm/spinlock_types.h
++++ b/arch/hexagon/include/asm/spinlock_types.h
+@@ -21,10 +21,6 @@
+ #ifndef _ASM_SPINLOCK_TYPES_H
+ #define _ASM_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int lock;
+ } arch_spinlock_t;
+--- a/arch/ia64/include/asm/spinlock_types.h
++++ b/arch/ia64/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef _ASM_IA64_SPINLOCK_TYPES_H
+ #define _ASM_IA64_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int lock;
+ } arch_spinlock_t;
+--- a/arch/m32r/include/asm/spinlock_types.h
++++ b/arch/m32r/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef _ASM_M32R_SPINLOCK_TYPES_H
+ #define _ASM_M32R_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile int slock;
+ } arch_spinlock_t;
+--- a/arch/metag/include/asm/spinlock_types.h
++++ b/arch/metag/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef _ASM_METAG_SPINLOCK_TYPES_H
+ #define _ASM_METAG_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int lock;
+ } arch_spinlock_t;
+--- a/arch/mn10300/include/asm/spinlock_types.h
++++ b/arch/mn10300/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef _ASM_SPINLOCK_TYPES_H
+ #define _ASM_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct arch_spinlock {
+ 	unsigned int slock;
+ } arch_spinlock_t;
+--- a/arch/powerpc/include/asm/spinlock_types.h
++++ b/arch/powerpc/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef _ASM_POWERPC_SPINLOCK_TYPES_H
+ #define _ASM_POWERPC_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int slock;
+ } arch_spinlock_t;
+--- a/arch/s390/include/asm/spinlock_types.h
++++ b/arch/s390/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef __ASM_SPINLOCK_TYPES_H
+ #define __ASM_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	int lock;
+ } __attribute__ ((aligned (4))) arch_spinlock_t;
+--- a/arch/sh/include/asm/spinlock_types.h
++++ b/arch/sh/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef __ASM_SH_SPINLOCK_TYPES_H
+ #define __ASM_SH_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int lock;
+ } arch_spinlock_t;
+--- a/arch/tile/include/asm/spinlock_types.h
++++ b/arch/tile/include/asm/spinlock_types.h
+@@ -15,10 +15,6 @@
+ #ifndef _ASM_TILE_SPINLOCK_TYPES_H
+ #define _ASM_TILE_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ #ifdef __tilegx__
+ 
+ /* Low 15 bits are "next"; high 15 bits are "current". */
+--- a/arch/xtensa/include/asm/spinlock_types.h
++++ b/arch/xtensa/include/asm/spinlock_types.h
+@@ -2,10 +2,6 @@
+ #ifndef __ASM_SPINLOCK_TYPES_H
+ #define __ASM_SPINLOCK_TYPES_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ typedef struct {
+ 	volatile unsigned int slock;
+ } arch_spinlock_t;
+--- a/include/linux/spinlock_types_up.h
++++ b/include/linux/spinlock_types_up.h
+@@ -1,10 +1,6 @@
+ #ifndef __LINUX_SPINLOCK_TYPES_UP_H
+ #define __LINUX_SPINLOCK_TYPES_UP_H
+ 
+-#ifndef __LINUX_SPINLOCK_TYPES_H
+-# error "please don't include this file directly"
+-#endif
+-
+ /*
+  * include/linux/spinlock_types_up.h - spinlock type definitions for UP
+  *
diff --git a/kernel/patches-4.14.x-rt/0248-peter_zijlstra-frob-rcu.patch b/kernel/patches-4.14.x-rt/0248-peter_zijlstra-frob-rcu.patch
new file mode 100644
index 000000000..ff4fb670f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0248-peter_zijlstra-frob-rcu.patch
@@ -0,0 +1,166 @@
+Subject: rcu: Frob softirq test
+From: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Date: Sat Aug 13 00:23:17 CEST 2011
+
+With RT_FULL we get the below wreckage:
+
+[  126.060484] =======================================================
+[  126.060486] [ INFO: possible circular locking dependency detected ]
+[  126.060489] 3.0.1-rt10+ #30
+[  126.060490] -------------------------------------------------------
+[  126.060492] irq/24-eth0/1235 is trying to acquire lock:
+[  126.060495]  (&(lock)->wait_lock#2){+.+...}, at: [<ffffffff81501c81>] rt_mutex_slowunlock+0x16/0x55
+[  126.060503] 
+[  126.060504] but task is already holding lock:
+[  126.060506]  (&p->pi_lock){-...-.}, at: [<ffffffff81074fdc>] try_to_wake_up+0x35/0x429
+[  126.060511] 
+[  126.060511] which lock already depends on the new lock.
+[  126.060513] 
+[  126.060514] 
+[  126.060514] the existing dependency chain (in reverse order) is:
+[  126.060516] 
+[  126.060516] -> #1 (&p->pi_lock){-...-.}:
+[  126.060519]        [<ffffffff810afe9e>] lock_acquire+0x145/0x18a
+[  126.060524]        [<ffffffff8150291e>] _raw_spin_lock_irqsave+0x4b/0x85
+[  126.060527]        [<ffffffff810b5aa4>] task_blocks_on_rt_mutex+0x36/0x20f
+[  126.060531]        [<ffffffff815019bb>] rt_mutex_slowlock+0xd1/0x15a
+[  126.060534]        [<ffffffff81501ae3>] rt_mutex_lock+0x2d/0x2f
+[  126.060537]        [<ffffffff810d9020>] rcu_boost+0xad/0xde
+[  126.060541]        [<ffffffff810d90ce>] rcu_boost_kthread+0x7d/0x9b
+[  126.060544]        [<ffffffff8109a760>] kthread+0x99/0xa1
+[  126.060547]        [<ffffffff81509b14>] kernel_thread_helper+0x4/0x10
+[  126.060551] 
+[  126.060552] -> #0 (&(lock)->wait_lock#2){+.+...}:
+[  126.060555]        [<ffffffff810af1b8>] __lock_acquire+0x1157/0x1816
+[  126.060558]        [<ffffffff810afe9e>] lock_acquire+0x145/0x18a
+[  126.060561]        [<ffffffff8150279e>] _raw_spin_lock+0x40/0x73
+[  126.060564]        [<ffffffff81501c81>] rt_mutex_slowunlock+0x16/0x55
+[  126.060566]        [<ffffffff81501ce7>] rt_mutex_unlock+0x27/0x29
+[  126.060569]        [<ffffffff810d9f86>] rcu_read_unlock_special+0x17e/0x1c4
+[  126.060573]        [<ffffffff810da014>] __rcu_read_unlock+0x48/0x89
+[  126.060576]        [<ffffffff8106847a>] select_task_rq_rt+0xc7/0xd5
+[  126.060580]        [<ffffffff8107511c>] try_to_wake_up+0x175/0x429
+[  126.060583]        [<ffffffff81075425>] wake_up_process+0x15/0x17
+[  126.060585]        [<ffffffff81080a51>] wakeup_softirqd+0x24/0x26
+[  126.060590]        [<ffffffff81081df9>] irq_exit+0x49/0x55
+[  126.060593]        [<ffffffff8150a3bd>] smp_apic_timer_interrupt+0x8a/0x98
+[  126.060597]        [<ffffffff81509793>] apic_timer_interrupt+0x13/0x20
+[  126.060600]        [<ffffffff810d5952>] irq_forced_thread_fn+0x1b/0x44
+[  126.060603]        [<ffffffff810d582c>] irq_thread+0xde/0x1af
+[  126.060606]        [<ffffffff8109a760>] kthread+0x99/0xa1
+[  126.060608]        [<ffffffff81509b14>] kernel_thread_helper+0x4/0x10
+[  126.060611] 
+[  126.060612] other info that might help us debug this:
+[  126.060614] 
+[  126.060615]  Possible unsafe locking scenario:
+[  126.060616] 
+[  126.060617]        CPU0                    CPU1
+[  126.060619]        ----                    ----
+[  126.060620]   lock(&p->pi_lock);
+[  126.060623]                                lock(&(lock)->wait_lock);
+[  126.060625]                                lock(&p->pi_lock);
+[  126.060627]   lock(&(lock)->wait_lock);
+[  126.060629] 
+[  126.060629]  *** DEADLOCK ***
+[  126.060630] 
+[  126.060632] 1 lock held by irq/24-eth0/1235:
+[  126.060633]  #0:  (&p->pi_lock){-...-.}, at: [<ffffffff81074fdc>] try_to_wake_up+0x35/0x429
+[  126.060638] 
+[  126.060638] stack backtrace:
+[  126.060641] Pid: 1235, comm: irq/24-eth0 Not tainted 3.0.1-rt10+ #30
+[  126.060643] Call Trace:
+[  126.060644]  <IRQ>  [<ffffffff810acbde>] print_circular_bug+0x289/0x29a
+[  126.060651]  [<ffffffff810af1b8>] __lock_acquire+0x1157/0x1816
+[  126.060655]  [<ffffffff810ab3aa>] ? trace_hardirqs_off_caller+0x1f/0x99
+[  126.060658]  [<ffffffff81501c81>] ? rt_mutex_slowunlock+0x16/0x55
+[  126.060661]  [<ffffffff810afe9e>] lock_acquire+0x145/0x18a
+[  126.060664]  [<ffffffff81501c81>] ? rt_mutex_slowunlock+0x16/0x55
+[  126.060668]  [<ffffffff8150279e>] _raw_spin_lock+0x40/0x73
+[  126.060671]  [<ffffffff81501c81>] ? rt_mutex_slowunlock+0x16/0x55
+[  126.060674]  [<ffffffff810d9655>] ? rcu_report_qs_rsp+0x87/0x8c
+[  126.060677]  [<ffffffff81501c81>] rt_mutex_slowunlock+0x16/0x55
+[  126.060680]  [<ffffffff810d9ea3>] ? rcu_read_unlock_special+0x9b/0x1c4
+[  126.060683]  [<ffffffff81501ce7>] rt_mutex_unlock+0x27/0x29
+[  126.060687]  [<ffffffff810d9f86>] rcu_read_unlock_special+0x17e/0x1c4
+[  126.060690]  [<ffffffff810da014>] __rcu_read_unlock+0x48/0x89
+[  126.060693]  [<ffffffff8106847a>] select_task_rq_rt+0xc7/0xd5
+[  126.060696]  [<ffffffff810683da>] ? select_task_rq_rt+0x27/0xd5
+[  126.060701]  [<ffffffff810a852a>] ? clockevents_program_event+0x8e/0x90
+[  126.060704]  [<ffffffff8107511c>] try_to_wake_up+0x175/0x429
+[  126.060708]  [<ffffffff810a95dc>] ? tick_program_event+0x1f/0x21
+[  126.060711]  [<ffffffff81075425>] wake_up_process+0x15/0x17
+[  126.060715]  [<ffffffff81080a51>] wakeup_softirqd+0x24/0x26
+[  126.060718]  [<ffffffff81081df9>] irq_exit+0x49/0x55
+[  126.060721]  [<ffffffff8150a3bd>] smp_apic_timer_interrupt+0x8a/0x98
+[  126.060724]  [<ffffffff81509793>] apic_timer_interrupt+0x13/0x20
+[  126.060726]  <EOI>  [<ffffffff81072855>] ? migrate_disable+0x75/0x12d
+[  126.060733]  [<ffffffff81080a61>] ? local_bh_disable+0xe/0x1f
+[  126.060736]  [<ffffffff81080a70>] ? local_bh_disable+0x1d/0x1f
+[  126.060739]  [<ffffffff810d5952>] irq_forced_thread_fn+0x1b/0x44
+[  126.060742]  [<ffffffff81502ac0>] ? _raw_spin_unlock_irq+0x3b/0x59
+[  126.060745]  [<ffffffff810d582c>] irq_thread+0xde/0x1af
+[  126.060748]  [<ffffffff810d5937>] ? irq_thread_fn+0x3a/0x3a
+[  126.060751]  [<ffffffff810d574e>] ? irq_finalize_oneshot+0xd1/0xd1
+[  126.060754]  [<ffffffff810d574e>] ? irq_finalize_oneshot+0xd1/0xd1
+[  126.060757]  [<ffffffff8109a760>] kthread+0x99/0xa1
+[  126.060761]  [<ffffffff81509b14>] kernel_thread_helper+0x4/0x10
+[  126.060764]  [<ffffffff81069ed7>] ? finish_task_switch+0x87/0x10a
+[  126.060768]  [<ffffffff81502ec4>] ? retint_restore_args+0xe/0xe
+[  126.060771]  [<ffffffff8109a6c7>] ? __init_kthread_worker+0x8c/0x8c
+[  126.060774]  [<ffffffff81509b10>] ? gs_change+0xb/0xb
+
+Because irq_exit() does:
+
+void irq_exit(void)
+{
+	account_system_vtime(current);
+	trace_hardirq_exit();
+	sub_preempt_count(IRQ_EXIT_OFFSET);
+	if (!in_interrupt() && local_softirq_pending())
+		invoke_softirq();
+
+	...
+}
+
+Which triggers a wakeup, which uses RCU, now if the interrupted task has
+t->rcu_read_unlock_special set, the rcu usage from the wakeup will end
+up in rcu_read_unlock_special(). rcu_read_unlock_special() will test
+for in_irq(), which will fail as we just decremented preempt_count
+with IRQ_EXIT_OFFSET, and in_sering_softirq(), which for
+PREEMPT_RT_FULL reads:
+
+int in_serving_softirq(void)
+{
+	int res;
+
+	preempt_disable();
+	res = __get_cpu_var(local_softirq_runner) == current;
+	preempt_enable();
+	return res;
+}
+
+Which will thus also fail, resulting in the above wreckage.
+
+The 'somewhat' ugly solution is to open-code the preempt_count() test
+in rcu_read_unlock_special().
+
+Also, we're not at all sure how ->rcu_read_unlock_special gets set
+here... so this is very likely a bandaid and more thought is required.
+
+Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+---
+ kernel/rcu/tree_plugin.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
+@@ -466,7 +466,7 @@ void rcu_read_unlock_special(struct task
+ 	}
+ 
+ 	/* Hardware IRQ handlers cannot block, complain if they get here. */
+-	if (in_irq() || in_serving_softirq()) {
++	if (preempt_count() & (HARDIRQ_MASK | SOFTIRQ_OFFSET)) {
+ 		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",
diff --git a/kernel/patches-4.14.x-rt/0249-rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch b/kernel/patches-4.14.x-rt/0249-rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch
new file mode 100644
index 000000000..839ec219e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0249-rcu-merge-rcu-bh-into-rcu-preempt-for-rt.patch
@@ -0,0 +1,357 @@
+Subject: rcu: Merge RCU-bh into RCU-preempt
+Date: Wed, 5 Oct 2011 11:59:38 -0700
+From: Thomas Gleixner <tglx@linutronix.de>
+
+The Linux kernel has long RCU-bh read-side critical sections that
+intolerably increase scheduling latency under mainline's RCU-bh rules,
+which include RCU-bh read-side critical sections being non-preemptible.
+This patch therefore arranges for RCU-bh to be implemented in terms of
+RCU-preempt for CONFIG_PREEMPT_RT_FULL=y.
+
+This has the downside of defeating the purpose of RCU-bh, namely,
+handling the case where the system is subjected to a network-based
+denial-of-service attack that keeps at least one CPU doing full-time
+softirq processing.  This issue will be fixed by a later commit.
+
+The current commit will need some work to make it appropriate for
+mainline use, for example, it needs to be extended to cover Tiny RCU.
+
+[ paulmck: Added a useful changelog ]
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Link: http://lkml.kernel.org/r/20111005185938.GA20403@linux.vnet.ibm.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/rcupdate.h |   23 +++++++++++++++++++++++
+ include/linux/rcutree.h  |    8 ++++++++
+ kernel/rcu/rcu.h         |   14 +++++++++++---
+ kernel/rcu/rcutorture.c  |    7 +++++++
+ kernel/rcu/tree.c        |   24 ++++++++++++++++++++++++
+ kernel/rcu/tree.h        |    2 ++
+ kernel/rcu/update.c      |    2 ++
+ 7 files changed, 77 insertions(+), 3 deletions(-)
+
+--- a/include/linux/rcupdate.h
++++ b/include/linux/rcupdate.h
+@@ -56,7 +56,11 @@ void call_rcu(struct rcu_head *head, rcu
+ #define	call_rcu	call_rcu_sched
+ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++#define call_rcu_bh	call_rcu
++#else
+ void call_rcu_bh(struct rcu_head *head, rcu_callback_t func);
++#endif
+ void call_rcu_sched(struct rcu_head *head, rcu_callback_t func);
+ void synchronize_sched(void);
+ void rcu_barrier_tasks(void);
+@@ -113,7 +117,11 @@ static inline int rcu_preempt_depth(void
+ void rcu_init(void);
+ extern int rcu_scheduler_active __read_mostly;
+ void rcu_sched_qs(void);
++#ifdef CONFIG_PREEMPT_RT_FULL
++static inline void rcu_bh_qs(void) { }
++#else
+ void rcu_bh_qs(void);
++#endif
+ void rcu_check_callbacks(int user);
+ void rcu_report_dead(unsigned int cpu);
+ void rcu_cpu_starting(unsigned int cpu);
+@@ -263,7 +271,14 @@ extern struct lockdep_map rcu_sched_lock
+ extern struct lockdep_map rcu_callback_map;
+ int debug_lockdep_rcu_enabled(void);
+ int rcu_read_lock_held(void);
++#ifdef CONFIG_PREEMPT_RT_FULL
++static inline int rcu_read_lock_bh_held(void)
++{
++	return rcu_read_lock_held();
++}
++#else
+ int rcu_read_lock_bh_held(void);
++#endif
+ int rcu_read_lock_sched_held(void);
+ 
+ #else /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
+@@ -667,10 +682,14 @@ static inline void rcu_read_unlock(void)
+ static inline void rcu_read_lock_bh(void)
+ {
+ 	local_bh_disable();
++#ifdef CONFIG_PREEMPT_RT_FULL
++	rcu_read_lock();
++#else
+ 	__acquire(RCU_BH);
+ 	rcu_lock_acquire(&rcu_bh_lock_map);
+ 	RCU_LOCKDEP_WARN(!rcu_is_watching(),
+ 			 "rcu_read_lock_bh() used illegally while idle");
++#endif
+ }
+ 
+ /*
+@@ -680,10 +699,14 @@ static inline void rcu_read_lock_bh(void
+  */
+ static inline void rcu_read_unlock_bh(void)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
++	rcu_read_unlock();
++#else
+ 	RCU_LOCKDEP_WARN(!rcu_is_watching(),
+ 			 "rcu_read_unlock_bh() used illegally while idle");
+ 	rcu_lock_release(&rcu_bh_lock_map);
+ 	__release(RCU_BH);
++#endif
+ 	local_bh_enable();
+ }
+ 
+--- a/include/linux/rcutree.h
++++ b/include/linux/rcutree.h
+@@ -44,7 +44,11 @@ static inline void rcu_virt_note_context
+ 	rcu_note_context_switch(false);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++# define synchronize_rcu_bh	synchronize_rcu
++#else
+ void synchronize_rcu_bh(void);
++#endif
+ void synchronize_sched_expedited(void);
+ void synchronize_rcu_expedited(void);
+ 
+@@ -72,7 +76,11 @@ static inline void synchronize_rcu_bh_ex
+ }
+ 
+ void rcu_barrier(void);
++#ifdef CONFIG_PREEMPT_RT_FULL
++# define rcu_barrier_bh                rcu_barrier
++#else
+ void rcu_barrier_bh(void);
++#endif
+ void rcu_barrier_sched(void);
+ unsigned long get_state_synchronize_rcu(void);
+ void cond_synchronize_rcu(unsigned long oldstate);
+--- a/kernel/rcu/rcu.h
++++ b/kernel/rcu/rcu.h
+@@ -462,18 +462,26 @@ static inline void show_rcu_gp_kthreads(
+ extern unsigned long rcutorture_testseq;
+ extern unsigned long rcutorture_vernum;
+ unsigned long rcu_batches_started(void);
+-unsigned long rcu_batches_started_bh(void);
+ unsigned long rcu_batches_started_sched(void);
+ unsigned long rcu_batches_completed(void);
+-unsigned long rcu_batches_completed_bh(void);
+ unsigned long rcu_batches_completed_sched(void);
+ unsigned long rcu_exp_batches_completed(void);
+ unsigned long rcu_exp_batches_completed_sched(void);
+ unsigned long srcu_batches_completed(struct srcu_struct *sp);
+ void show_rcu_gp_kthreads(void);
+ void rcu_force_quiescent_state(void);
+-void rcu_bh_force_quiescent_state(void);
+ void rcu_sched_force_quiescent_state(void);
++
++#ifndef CONFIG_PREEMPT_RT_FULL
++void rcu_bh_force_quiescent_state(void);
++unsigned long rcu_batches_started_bh(void);
++unsigned long rcu_batches_completed_bh(void);
++#else
++# define rcu_bh_force_quiescent_state	rcu_force_quiescent_state
++# define rcu_batches_completed_bh	rcu_batches_completed
++# define rcu_batches_started_bh		rcu_batches_completed
++#endif
++
+ #endif /* #else #ifdef CONFIG_TINY_RCU */
+ 
+ #ifdef CONFIG_RCU_NOCB_CPU
+--- a/kernel/rcu/rcutorture.c
++++ b/kernel/rcu/rcutorture.c
+@@ -417,6 +417,7 @@ static struct rcu_torture_ops rcu_ops =
+ 	.name		= "rcu"
+ };
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /*
+  * Definitions for rcu_bh torture testing.
+  */
+@@ -456,6 +457,12 @@ static struct rcu_torture_ops rcu_bh_ops
+ 	.name		= "rcu_bh"
+ };
+ 
++#else
++static struct rcu_torture_ops rcu_bh_ops = {
++	.ttype		= INVALID_RCU_FLAVOR,
++};
++#endif
++
+ /*
+  * Don't even think about trying any of these in real life!!!
+  * The names includes "busted", and they really means it!
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -243,6 +243,7 @@ void rcu_sched_qs(void)
+ 			   this_cpu_ptr(&rcu_sched_data), true);
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ void rcu_bh_qs(void)
+ {
+ 	RCU_LOCKDEP_WARN(preemptible(), "rcu_bh_qs() invoked with preemption enabled!!!");
+@@ -253,6 +254,7 @@ void rcu_bh_qs(void)
+ 		__this_cpu_write(rcu_bh_data.cpu_no_qs.b.norm, false);
+ 	}
+ }
++#endif
+ 
+ /*
+  * Steal a bit from the bottom of ->dynticks for idle entry/exit
+@@ -564,11 +566,13 @@ EXPORT_SYMBOL_GPL(rcu_batches_started_sc
+ /*
+  * Return the number of RCU BH batches started thus far for debug & stats.
+  */
++#ifndef CONFIG_PREEMPT_RT_FULL
+ unsigned long rcu_batches_started_bh(void)
+ {
+ 	return rcu_bh_state.gpnum;
+ }
+ EXPORT_SYMBOL_GPL(rcu_batches_started_bh);
++#endif
+ 
+ /*
+  * Return the number of RCU batches completed thus far for debug & stats.
+@@ -588,6 +592,7 @@ unsigned long rcu_batches_completed_sche
+ }
+ EXPORT_SYMBOL_GPL(rcu_batches_completed_sched);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /*
+  * Return the number of RCU BH batches completed thus far for debug & stats.
+  */
+@@ -596,6 +601,7 @@ unsigned long rcu_batches_completed_bh(v
+ 	return rcu_bh_state.completed;
+ }
+ EXPORT_SYMBOL_GPL(rcu_batches_completed_bh);
++#endif
+ 
+ /*
+  * Return the number of RCU expedited batches completed thus far for
+@@ -619,6 +625,7 @@ unsigned long rcu_exp_batches_completed_
+ }
+ EXPORT_SYMBOL_GPL(rcu_exp_batches_completed_sched);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /*
+  * Force a quiescent state.
+  */
+@@ -637,6 +644,13 @@ void rcu_bh_force_quiescent_state(void)
+ }
+ EXPORT_SYMBOL_GPL(rcu_bh_force_quiescent_state);
+ 
++#else
++void rcu_force_quiescent_state(void)
++{
++}
++EXPORT_SYMBOL_GPL(rcu_force_quiescent_state);
++#endif
++
+ /*
+  * Force a quiescent state for RCU-sched.
+  */
+@@ -687,9 +701,11 @@ void rcutorture_get_gp_data(enum rcutort
+ 	case RCU_FLAVOR:
+ 		rsp = rcu_state_p;
+ 		break;
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	case RCU_BH_FLAVOR:
+ 		rsp = &rcu_bh_state;
+ 		break;
++#endif
+ 	case RCU_SCHED_FLAVOR:
+ 		rsp = &rcu_sched_state;
+ 		break;
+@@ -3113,6 +3129,7 @@ void call_rcu_sched(struct rcu_head *hea
+ }
+ EXPORT_SYMBOL_GPL(call_rcu_sched);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /**
+  * call_rcu_bh() - Queue an RCU for invocation after a quicker grace period.
+  * @head: structure to be used for queueing the RCU updates.
+@@ -3140,6 +3157,7 @@ void call_rcu_bh(struct rcu_head *head,
+ 	__call_rcu(head, func, &rcu_bh_state, -1, 0);
+ }
+ EXPORT_SYMBOL_GPL(call_rcu_bh);
++#endif
+ 
+ /*
+  * Queue an RCU callback for lazy invocation after a grace period.
+@@ -3225,6 +3243,7 @@ void synchronize_sched(void)
+ }
+ EXPORT_SYMBOL_GPL(synchronize_sched);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /**
+  * synchronize_rcu_bh - wait until an rcu_bh grace period has elapsed.
+  *
+@@ -3251,6 +3270,7 @@ void synchronize_rcu_bh(void)
+ 		wait_rcu_gp(call_rcu_bh);
+ }
+ EXPORT_SYMBOL_GPL(synchronize_rcu_bh);
++#endif
+ 
+ /**
+  * get_state_synchronize_rcu - Snapshot current RCU state
+@@ -3601,6 +3621,7 @@ static void _rcu_barrier(struct rcu_stat
+ 	mutex_unlock(&rsp->barrier_mutex);
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /**
+  * rcu_barrier_bh - Wait until all in-flight call_rcu_bh() callbacks complete.
+  */
+@@ -3609,6 +3630,7 @@ void rcu_barrier_bh(void)
+ 	_rcu_barrier(&rcu_bh_state);
+ }
+ EXPORT_SYMBOL_GPL(rcu_barrier_bh);
++#endif
+ 
+ /**
+  * rcu_barrier_sched - Wait for in-flight call_rcu_sched() callbacks.
+@@ -4184,7 +4206,9 @@ void __init rcu_init(void)
+ 
+ 	rcu_bootup_announce();
+ 	rcu_init_geometry();
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	rcu_init_one(&rcu_bh_state);
++#endif
+ 	rcu_init_one(&rcu_sched_state);
+ 	if (dump_tree)
+ 		rcu_dump_rcu_node_tree(&rcu_sched_state);
+--- a/kernel/rcu/tree.h
++++ b/kernel/rcu/tree.h
+@@ -427,7 +427,9 @@ extern struct list_head rcu_struct_flavo
+  */
+ extern struct rcu_state rcu_sched_state;
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ extern struct rcu_state rcu_bh_state;
++#endif
+ 
+ #ifdef CONFIG_PREEMPT_RCU
+ extern struct rcu_state rcu_preempt_state;
+--- a/kernel/rcu/update.c
++++ b/kernel/rcu/update.c
+@@ -333,6 +333,7 @@ int rcu_read_lock_held(void)
+ }
+ EXPORT_SYMBOL_GPL(rcu_read_lock_held);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /**
+  * rcu_read_lock_bh_held() - might we be in RCU-bh read-side critical section?
+  *
+@@ -359,6 +360,7 @@ int rcu_read_lock_bh_held(void)
+ 	return in_softirq() || irqs_disabled();
+ }
+ EXPORT_SYMBOL_GPL(rcu_read_lock_bh_held);
++#endif
+ 
+ #endif /* #ifdef CONFIG_DEBUG_LOCK_ALLOC */
+ 
diff --git a/kernel/patches-4.14.x-rt/0250-patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch b/kernel/patches-4.14.x-rt/0250-patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
new file mode 100644
index 000000000..f144e5c27
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0250-patch-to-introduce-rcu-bh-qs-where-safe-from-softirq.patch
@@ -0,0 +1,108 @@
+Subject: rcu: Make ksoftirqd do RCU quiescent states
+From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+Date: Wed, 5 Oct 2011 11:45:18 -0700
+
+Implementing RCU-bh in terms of RCU-preempt makes the system vulnerable
+to network-based denial-of-service attacks.  This patch therefore
+makes __do_softirq() invoke rcu_bh_qs(), but only when __do_softirq()
+is running in ksoftirqd context.  A wrapper layer in interposed so that
+other calls to __do_softirq() avoid invoking rcu_bh_qs().  The underlying
+function __do_softirq_common() does the actual work.
+
+The reason that rcu_bh_qs() is bad in these non-ksoftirqd contexts is
+that there might be a local_bh_enable() inside an RCU-preempt read-side
+critical section.  This local_bh_enable() can invoke __do_softirq()
+directly, so if __do_softirq() were to invoke rcu_bh_qs() (which just
+calls rcu_preempt_qs() in the PREEMPT_RT_FULL case), there would be
+an illegal RCU-preempt quiescent state in the middle of an RCU-preempt
+read-side critical section.  Therefore, quiescent states can only happen
+in cases where __do_softirq() is invoked directly from ksoftirqd.
+
+Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Link: http://lkml.kernel.org/r/20111005184518.GA21601@linux.vnet.ibm.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/rcupdate.h |    4 ----
+ kernel/rcu/tree.c        |    9 ++++++++-
+ kernel/rcu/tree_plugin.h |    8 +++++++-
+ 3 files changed, 15 insertions(+), 6 deletions(-)
+
+--- a/include/linux/rcupdate.h
++++ b/include/linux/rcupdate.h
+@@ -117,11 +117,7 @@ static inline int rcu_preempt_depth(void
+ void rcu_init(void);
+ extern int rcu_scheduler_active __read_mostly;
+ void rcu_sched_qs(void);
+-#ifdef CONFIG_PREEMPT_RT_FULL
+-static inline void rcu_bh_qs(void) { }
+-#else
+ void rcu_bh_qs(void);
+-#endif
+ void rcu_check_callbacks(int user);
+ void rcu_report_dead(unsigned int cpu);
+ void rcu_cpu_starting(unsigned int cpu);
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -243,7 +243,14 @@ void rcu_sched_qs(void)
+ 			   this_cpu_ptr(&rcu_sched_data), true);
+ }
+ 
+-#ifndef CONFIG_PREEMPT_RT_FULL
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void rcu_preempt_qs(void);
++
++void rcu_bh_qs(void)
++{
++	rcu_preempt_qs();
++}
++#else
+ void rcu_bh_qs(void)
+ {
+ 	RCU_LOCKDEP_WARN(preemptible(), "rcu_bh_qs() invoked with preemption enabled!!!");
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
+@@ -29,6 +29,7 @@
+ #include <linux/oom.h>
+ #include <linux/sched/debug.h>
+ #include <linux/smpboot.h>
++#include <linux/jiffies.h>
+ #include <uapi/linux/sched/types.h>
+ #include "../time/tick-internal.h"
+ #include "../locking/rtmutex_common.h"
+@@ -1299,7 +1300,7 @@ static void rcu_prepare_kthreads(int cpu
+ 
+ #endif /* #else #ifdef CONFIG_RCU_BOOST */
+ 
+-#if !defined(CONFIG_RCU_FAST_NO_HZ)
++#if !defined(CONFIG_RCU_FAST_NO_HZ) || defined(CONFIG_PREEMPT_RT_FULL)
+ 
+ /*
+  * Check to see if any future RCU-related work will need to be done
+@@ -1315,7 +1316,9 @@ int rcu_needs_cpu(u64 basemono, u64 *nex
+ 	*nextevt = KTIME_MAX;
+ 	return rcu_cpu_has_callbacks(NULL);
+ }
++#endif /* !defined(CONFIG_RCU_FAST_NO_HZ) || defined(CONFIG_PREEMPT_RT_FULL) */
+ 
++#if !defined(CONFIG_RCU_FAST_NO_HZ)
+ /*
+  * Because we do not have RCU_FAST_NO_HZ, don't bother cleaning up
+  * after it.
+@@ -1411,6 +1414,8 @@ static bool __maybe_unused rcu_try_advan
+ 	return cbs_ready;
+ }
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ /*
+  * 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
+@@ -1453,6 +1458,7 @@ int rcu_needs_cpu(u64 basemono, u64 *nex
+ 	*nextevt = basemono + dj * TICK_NSEC;
+ 	return 0;
+ }
++#endif /* #ifndef CONFIG_PREEMPT_RT_FULL */
+ 
+ /*
+  * Prepare a CPU for idle from an RCU perspective.  The first major task
diff --git a/kernel/patches-4.14.x-rt/0251-rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch b/kernel/patches-4.14.x-rt/0251-rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch
new file mode 100644
index 000000000..a781890ab
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0251-rcutree-rcu_bh_qs-disable-irq-while-calling-rcu_pree.patch
@@ -0,0 +1,48 @@
+From: Tiejun Chen <tiejun.chen@windriver.com>
+Date: Wed, 18 Dec 2013 17:51:49 +0800
+Subject: rcutree/rcu_bh_qs: Disable irq while calling rcu_preempt_qs()
+
+Any callers to the function rcu_preempt_qs() must disable irqs in
+order to protect the assignment to ->rcu_read_unlock_special. In
+RT case, rcu_bh_qs() as the wrapper of rcu_preempt_qs() is called
+in some scenarios where irq is enabled, like this path,
+
+do_single_softirq()
+    |
+    + local_irq_enable();
+    + handle_softirq()
+    |    |
+    |    + rcu_bh_qs()
+    |        |
+    |        + rcu_preempt_qs()
+    |
+    + local_irq_disable()
+
+So here we'd better disable irq directly inside of rcu_bh_qs() to
+fix this, otherwise the kernel may be freezable sometimes as
+observed. And especially this way is also kind and safe for the
+potential rcu_bh_qs() usage elsewhere in the future.
+
+
+Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com>
+Signed-off-by: Bin Jiang <bin.jiang@windriver.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/tree.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -248,7 +248,12 @@ static void rcu_preempt_qs(void);
+ 
+ void rcu_bh_qs(void)
+ {
++	unsigned long flags;
++
++	/* Callers to this function, rcu_preempt_qs(), must disable irqs. */
++	local_irq_save(flags);
+ 	rcu_preempt_qs();
++	local_irq_restore(flags);
+ }
+ #else
+ void rcu_bh_qs(void)
diff --git a/kernel/patches-4.14.x-rt/0252-drivers-tty-fix-omap-lock-crap.patch b/kernel/patches-4.14.x-rt/0252-drivers-tty-fix-omap-lock-crap.patch
new file mode 100644
index 000000000..e204ae10a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0252-drivers-tty-fix-omap-lock-crap.patch
@@ -0,0 +1,42 @@
+Subject: tty/serial/omap: Make the locking RT aware
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 28 Jul 2011 13:32:57 +0200
+
+The lock is a sleeping lock and local_irq_save() is not the
+optimsation we are looking for. Redo it to make it work on -RT and
+non-RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/tty/serial/omap-serial.c |   12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+--- a/drivers/tty/serial/omap-serial.c
++++ b/drivers/tty/serial/omap-serial.c
+@@ -1311,13 +1311,10 @@ serial_omap_console_write(struct console
+ 
+ 	pm_runtime_get_sync(up->dev);
+ 
+-	local_irq_save(flags);
+-	if (up->port.sysrq)
+-		locked = 0;
+-	else if (oops_in_progress)
+-		locked = spin_trylock(&up->port.lock);
++	if (up->port.sysrq || oops_in_progress)
++		locked = spin_trylock_irqsave(&up->port.lock, flags);
+ 	else
+-		spin_lock(&up->port.lock);
++		spin_lock_irqsave(&up->port.lock, flags);
+ 
+ 	/*
+ 	 * First save the IER then disable the interrupts
+@@ -1346,8 +1343,7 @@ serial_omap_console_write(struct console
+ 	pm_runtime_mark_last_busy(up->dev);
+ 	pm_runtime_put_autosuspend(up->dev);
+ 	if (locked)
+-		spin_unlock(&up->port.lock);
+-	local_irq_restore(flags);
++		spin_unlock_irqrestore(&up->port.lock, flags);
+ }
+ 
+ static int __init
diff --git a/kernel/patches-4.14.x-rt/0253-drivers-tty-pl011-irq-disable-madness.patch b/kernel/patches-4.14.x-rt/0253-drivers-tty-pl011-irq-disable-madness.patch
new file mode 100644
index 000000000..7ee9fe704
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0253-drivers-tty-pl011-irq-disable-madness.patch
@@ -0,0 +1,47 @@
+Subject: tty/serial/pl011: Make the locking work on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 08 Jan 2013 21:36:51 +0100
+
+The lock is a sleeping lock and local_irq_save() is not the optimsation
+we are looking for. Redo it to make it work on -RT and non-RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/tty/serial/amba-pl011.c |   15 ++++++++++-----
+ 1 file changed, 10 insertions(+), 5 deletions(-)
+
+--- a/drivers/tty/serial/amba-pl011.c
++++ b/drivers/tty/serial/amba-pl011.c
+@@ -2220,13 +2220,19 @@ pl011_console_write(struct console *co,
+ 
+ 	clk_enable(uap->clk);
+ 
+-	local_irq_save(flags);
++	/*
++	 * local_irq_save(flags);
++	 *
++	 * This local_irq_save() is nonsense. If we come in via sysrq
++	 * handling then interrupts are already disabled. Aside of
++	 * that the port.sysrq check is racy on SMP regardless.
++	*/
+ 	if (uap->port.sysrq)
+ 		locked = 0;
+ 	else if (oops_in_progress)
+-		locked = spin_trylock(&uap->port.lock);
++		locked = spin_trylock_irqsave(&uap->port.lock, flags);
+ 	else
+-		spin_lock(&uap->port.lock);
++		spin_lock_irqsave(&uap->port.lock, flags);
+ 
+ 	/*
+ 	 *	First save the CR then disable the interrupts
+@@ -2252,8 +2258,7 @@ pl011_console_write(struct console *co,
+ 		pl011_write(old_cr, uap, REG_CR);
+ 
+ 	if (locked)
+-		spin_unlock(&uap->port.lock);
+-	local_irq_restore(flags);
++		spin_unlock_irqrestore(&uap->port.lock, flags);
+ 
+ 	clk_disable(uap->clk);
+ }
diff --git a/kernel/patches-4.14.x-rt/0254-rt-serial-warn-fix.patch b/kernel/patches-4.14.x-rt/0254-rt-serial-warn-fix.patch
new file mode 100644
index 000000000..da9b5306f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0254-rt-serial-warn-fix.patch
@@ -0,0 +1,37 @@
+Subject: rt: Improve the serial console PASS_LIMIT
+From: Ingo Molnar <mingo@elte.hu>
+Date: Wed Dec 14 13:05:54 CET 2011
+
+Beyond the warning:
+
+ drivers/tty/serial/8250/8250.c:1613:6: warning: unused variable ‘pass_counter’ [-Wunused-variable]
+
+the solution of just looping infinitely was ugly - up it to 1 million to
+give it a chance to continue in some really ugly situation.
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/tty/serial/8250/8250_core.c |   11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+--- 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 */
+ 
+-#define PASS_LIMIT	512
++/*
++ * On -rt we can have a more delays, and legitimately
++ * so - so don't drop work spuriously and spam the
++ * syslog:
++ */
++#ifdef CONFIG_PREEMPT_RT_FULL
++# define PASS_LIMIT	1000000
++#else
++# define PASS_LIMIT	512
++#endif
+ 
+ #include <asm/serial.h>
+ /*
diff --git a/kernel/patches-4.14.x-rt/0255-tty-serial-8250-don-t-take-the-trylock-during-oops.patch b/kernel/patches-4.14.x-rt/0255-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
new file mode 100644
index 000000000..4f824abb2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0255-tty-serial-8250-don-t-take-the-trylock-during-oops.patch
@@ -0,0 +1,28 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 11 Apr 2016 16:55:02 +0200
+Subject: [PATCH] tty: serial: 8250: don't take the trylock during oops
+
+An oops with irqs off (panic() from irqsafe hrtimer like the watchdog
+timer) will lead to a lockdep warning on each invocation and as such
+never completes.
+Therefore we skip the trylock in the oops case.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/tty/serial/8250/8250_port.c |    4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/tty/serial/8250/8250_port.c
++++ b/drivers/tty/serial/8250/8250_port.c
+@@ -3217,10 +3217,8 @@ void serial8250_console_write(struct uar
+ 
+ 	serial8250_rpm_get(up);
+ 
+-	if (port->sysrq)
++	if (port->sysrq || oops_in_progress)
+ 		locked = 0;
+-	else if (oops_in_progress)
+-		locked = spin_trylock_irqsave(&port->lock, flags);
+ 	else
+ 		spin_lock_irqsave(&port->lock, flags);
+ 
diff --git a/kernel/patches-4.14.x-rt/0256-peterz-percpu-rwsem-rt.patch b/kernel/patches-4.14.x-rt/0256-peterz-percpu-rwsem-rt.patch
new file mode 100644
index 000000000..d01b42da6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0256-peterz-percpu-rwsem-rt.patch
@@ -0,0 +1,218 @@
+Subject: locking/percpu-rwsem: Remove preempt_disable variants
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Wed Nov 23 16:29:32 CET 2016
+
+Effective revert commit:
+
+  87709e28dc7c ("fs/locks: Use percpu_down_read_preempt_disable()")
+
+This is causing major pain for PREEMPT_RT and is only a very small
+performance issue for PREEMPT=y.
+
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+---
+---
+ fs/locks.c                   |   32 ++++++++++++++++----------------
+ include/linux/percpu-rwsem.h |   24 ++++--------------------
+ 2 files changed, 20 insertions(+), 36 deletions(-)
+
+--- a/fs/locks.c
++++ b/fs/locks.c
+@@ -945,7 +945,7 @@ static int flock_lock_inode(struct inode
+ 			return -ENOMEM;
+ 	}
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 	if (request->fl_flags & FL_ACCESS)
+ 		goto find_conflict;
+@@ -986,7 +986,7 @@ static int flock_lock_inode(struct inode
+ 
+ out:
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 	if (new_fl)
+ 		locks_free_lock(new_fl);
+ 	locks_dispose_list(&dispose);
+@@ -1023,7 +1023,7 @@ static int posix_lock_inode(struct inode
+ 		new_fl2 = locks_alloc_lock();
+ 	}
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 	/*
+ 	 * New lock request. Walk all POSIX locks and look for conflicts. If
+@@ -1195,7 +1195,7 @@ static int posix_lock_inode(struct inode
+ 	}
+  out:
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 	/*
+ 	 * Free any unused locks.
+ 	 */
+@@ -1470,7 +1470,7 @@ int __break_lease(struct inode *inode, u
+ 		return error;
+ 	}
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 
+ 	time_out_leases(inode, &dispose);
+@@ -1522,13 +1522,13 @@ int __break_lease(struct inode *inode, u
+ 	locks_insert_block(fl, new_fl);
+ 	trace_break_lease_block(inode, new_fl);
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 
+ 	locks_dispose_list(&dispose);
+ 	error = wait_event_interruptible_timeout(new_fl->fl_wait,
+ 						!new_fl->fl_next, break_time);
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 	trace_break_lease_unblock(inode, new_fl);
+ 	locks_delete_block(new_fl);
+@@ -1545,7 +1545,7 @@ int __break_lease(struct inode *inode, u
+ 	}
+ out:
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 	locks_dispose_list(&dispose);
+ 	locks_free_lock(new_fl);
+ 	return error;
+@@ -1619,7 +1619,7 @@ int fcntl_getlease(struct file *filp)
+ 
+ 	ctx = smp_load_acquire(&inode->i_flctx);
+ 	if (ctx && !list_empty_careful(&ctx->flc_lease)) {
+-		percpu_down_read_preempt_disable(&file_rwsem);
++		percpu_down_read(&file_rwsem);
+ 		spin_lock(&ctx->flc_lock);
+ 		time_out_leases(inode, &dispose);
+ 		list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
+@@ -1629,7 +1629,7 @@ int fcntl_getlease(struct file *filp)
+ 			break;
+ 		}
+ 		spin_unlock(&ctx->flc_lock);
+-		percpu_up_read_preempt_enable(&file_rwsem);
++		percpu_up_read(&file_rwsem);
+ 
+ 		locks_dispose_list(&dispose);
+ 	}
+@@ -1704,7 +1704,7 @@ generic_add_lease(struct file *filp, lon
+ 		return -EINVAL;
+ 	}
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 	time_out_leases(inode, &dispose);
+ 	error = check_conflicting_open(dentry, arg, lease->fl_flags);
+@@ -1775,7 +1775,7 @@ generic_add_lease(struct file *filp, lon
+ 		lease->fl_lmops->lm_setup(lease, priv);
+ out:
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 	locks_dispose_list(&dispose);
+ 	if (is_deleg)
+ 		inode_unlock(inode);
+@@ -1798,7 +1798,7 @@ static int generic_delete_lease(struct f
+ 		return error;
+ 	}
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 	list_for_each_entry(fl, &ctx->flc_lease, fl_list) {
+ 		if (fl->fl_file == filp &&
+@@ -1811,7 +1811,7 @@ static int generic_delete_lease(struct f
+ 	if (victim)
+ 		error = fl->fl_lmops->lm_change(victim, F_UNLCK, &dispose);
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 	locks_dispose_list(&dispose);
+ 	return error;
+ }
+@@ -2535,13 +2535,13 @@ locks_remove_lease(struct file *filp, st
+ 	if (list_empty(&ctx->flc_lease))
+ 		return;
+ 
+-	percpu_down_read_preempt_disable(&file_rwsem);
++	percpu_down_read(&file_rwsem);
+ 	spin_lock(&ctx->flc_lock);
+ 	list_for_each_entry_safe(fl, tmp, &ctx->flc_lease, fl_list)
+ 		if (filp == fl->fl_file)
+ 			lease_modify(fl, F_UNLCK, &dispose);
+ 	spin_unlock(&ctx->flc_lock);
+-	percpu_up_read_preempt_enable(&file_rwsem);
++	percpu_up_read(&file_rwsem);
+ 
+ 	locks_dispose_list(&dispose);
+ }
+--- a/include/linux/percpu-rwsem.h
++++ b/include/linux/percpu-rwsem.h
+@@ -29,7 +29,7 @@ static struct percpu_rw_semaphore name =
+ extern int __percpu_down_read(struct percpu_rw_semaphore *, int);
+ extern void __percpu_up_read(struct percpu_rw_semaphore *);
+ 
+-static inline void percpu_down_read_preempt_disable(struct percpu_rw_semaphore *sem)
++static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
+ {
+ 	might_sleep();
+ 
+@@ -47,16 +47,10 @@ static inline void percpu_down_read_pree
+ 	__this_cpu_inc(*sem->read_count);
+ 	if (unlikely(!rcu_sync_is_idle(&sem->rss)))
+ 		__percpu_down_read(sem, false); /* Unconditional memory barrier */
+-	barrier();
+ 	/*
+-	 * The barrier() prevents the compiler from
++	 * The preempt_enable() prevents the compiler from
+ 	 * bleeding the critical section out.
+ 	 */
+-}
+-
+-static inline void percpu_down_read(struct percpu_rw_semaphore *sem)
+-{
+-	percpu_down_read_preempt_disable(sem);
+ 	preempt_enable();
+ }
+ 
+@@ -83,13 +77,9 @@ static inline int percpu_down_read_trylo
+ 	return ret;
+ }
+ 
+-static inline void percpu_up_read_preempt_enable(struct percpu_rw_semaphore *sem)
++static inline void percpu_up_read(struct percpu_rw_semaphore *sem)
+ {
+-	/*
+-	 * The barrier() prevents the compiler from
+-	 * bleeding the critical section out.
+-	 */
+-	barrier();
++	preempt_disable();
+ 	/*
+ 	 * Same as in percpu_down_read().
+ 	 */
+@@ -102,12 +92,6 @@ static inline void percpu_up_read_preemp
+ 	rwsem_release(&sem->rw_sem.dep_map, 1, _RET_IP_);
+ }
+ 
+-static inline void percpu_up_read(struct percpu_rw_semaphore *sem)
+-{
+-	preempt_disable();
+-	percpu_up_read_preempt_enable(sem);
+-}
+-
+ extern void percpu_down_write(struct percpu_rw_semaphore *);
+ extern void percpu_up_write(struct percpu_rw_semaphore *);
+ 
diff --git a/kernel/patches-4.14.x-rt/0257-fs-namespace-preemption-fix.patch b/kernel/patches-4.14.x-rt/0257-fs-namespace-preemption-fix.patch
new file mode 100644
index 000000000..405111933
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0257-fs-namespace-preemption-fix.patch
@@ -0,0 +1,30 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 19 Jul 2009 08:44:27 -0500
+Subject: fs: namespace preemption fix
+
+On RT we cannot loop with preemption disabled here as
+mnt_make_readonly() might have been preempted. We can safely enable
+preemption while waiting for MNT_WRITE_HOLD to be cleared. Safe on !RT
+as well.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ fs/namespace.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -353,8 +353,11 @@ int __mnt_want_write(struct vfsmount *m)
+ 	 * incremented count after it has set MNT_WRITE_HOLD.
+ 	 */
+ 	smp_mb();
+-	while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD)
++	while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) {
++		preempt_enable();
+ 		cpu_relax();
++		preempt_disable();
++	}
+ 	/*
+ 	 * 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 --git a/kernel/patches-4.14.x-rt/0258-mm-protect-activate-switch-mm.patch b/kernel/patches-4.14.x-rt/0258-mm-protect-activate-switch-mm.patch
new file mode 100644
index 000000000..16cc40ca0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0258-mm-protect-activate-switch-mm.patch
@@ -0,0 +1,71 @@
+From: Yong Zhang <yong.zhang0@gmail.com>
+Date: Tue, 15 May 2012 13:53:56 +0800
+Subject: mm: Protect activate_mm() by preempt_[disable&enable]_rt()
+
+User preempt_*_rt instead of local_irq_*_rt or otherwise there will be
+warning on ARM like below:
+
+WARNING: at build/linux/kernel/smp.c:459 smp_call_function_many+0x98/0x264()
+Modules linked in:
+[<c0013bb4>] (unwind_backtrace+0x0/0xe4) from [<c001be94>] (warn_slowpath_common+0x4c/0x64)
+[<c001be94>] (warn_slowpath_common+0x4c/0x64) from [<c001bec4>] (warn_slowpath_null+0x18/0x1c)
+[<c001bec4>] (warn_slowpath_null+0x18/0x1c) from [<c0053ff8>](smp_call_function_many+0x98/0x264)
+[<c0053ff8>] (smp_call_function_many+0x98/0x264) from [<c0054364>] (smp_call_function+0x44/0x6c)
+[<c0054364>] (smp_call_function+0x44/0x6c) from [<c0017d50>] (__new_context+0xbc/0x124)
+[<c0017d50>] (__new_context+0xbc/0x124) from [<c009e49c>] (flush_old_exec+0x460/0x5e4)
+[<c009e49c>] (flush_old_exec+0x460/0x5e4) from [<c00d61ac>] (load_elf_binary+0x2e0/0x11ac)
+[<c00d61ac>] (load_elf_binary+0x2e0/0x11ac) from [<c009d060>] (search_binary_handler+0x94/0x2a4)
+[<c009d060>] (search_binary_handler+0x94/0x2a4) from [<c009e8fc>] (do_execve+0x254/0x364)
+[<c009e8fc>] (do_execve+0x254/0x364) from [<c0010e84>] (sys_execve+0x34/0x54)
+[<c0010e84>] (sys_execve+0x34/0x54) from [<c000da00>] (ret_fast_syscall+0x0/0x30)
+---[ end trace 0000000000000002 ]---
+
+The reason is that ARM need irq enabled when doing activate_mm().
+According to mm-protect-activate-switch-mm.patch, actually
+preempt_[disable|enable]_rt() is sufficient.
+
+Inspired-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Link: http://lkml.kernel.org/r/1337061236-1766-1-git-send-email-yong.zhang0@gmail.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ fs/exec.c        |    2 ++
+ mm/mmu_context.c |    2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/fs/exec.c
++++ b/fs/exec.c
+@@ -1024,12 +1024,14 @@ static int exec_mmap(struct mm_struct *m
+ 		}
+ 	}
+ 	task_lock(tsk);
++	preempt_disable_rt();
+ 	active_mm = tsk->active_mm;
+ 	tsk->mm = mm;
+ 	tsk->active_mm = mm;
+ 	activate_mm(active_mm, mm);
+ 	tsk->mm->vmacache_seqnum = 0;
+ 	vmacache_flush(tsk);
++	preempt_enable_rt();
+ 	task_unlock(tsk);
+ 	if (old_mm) {
+ 		up_read(&old_mm->mmap_sem);
+--- a/mm/mmu_context.c
++++ b/mm/mmu_context.c
+@@ -25,6 +25,7 @@ void use_mm(struct mm_struct *mm)
+ 	struct task_struct *tsk = current;
+ 
+ 	task_lock(tsk);
++	preempt_disable_rt();
+ 	active_mm = tsk->active_mm;
+ 	if (active_mm != mm) {
+ 		mmgrab(mm);
+@@ -32,6 +33,7 @@ void use_mm(struct mm_struct *mm)
+ 	}
+ 	tsk->mm = mm;
+ 	switch_mm(active_mm, mm, tsk);
++	preempt_enable_rt();
+ 	task_unlock(tsk);
+ #ifdef finish_arch_post_lock_switch
+ 	finish_arch_post_lock_switch();
diff --git a/kernel/patches-4.14.x-rt/0259-fs-block-rt-support.patch b/kernel/patches-4.14.x-rt/0259-fs-block-rt-support.patch
new file mode 100644
index 000000000..78f9980d4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0259-fs-block-rt-support.patch
@@ -0,0 +1,22 @@
+Subject: block: Turn off warning which is bogus on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 14 Jun 2011 17:05:09 +0200
+
+On -RT the context is always with IRQs enabled. Ignore this warning on -RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ block/blk-core.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -280,7 +280,7 @@ EXPORT_SYMBOL(blk_start_queue_async);
+ void blk_start_queue(struct request_queue *q)
+ {
+ 	lockdep_assert_held(q->queue_lock);
+-	WARN_ON(!in_interrupt() && !irqs_disabled());
++	WARN_ON_NONRT(!in_interrupt() && !irqs_disabled());
+ 	WARN_ON_ONCE(q->mq_ops);
+ 
+ 	queue_flag_clear(QUEUE_FLAG_STOPPED, q);
diff --git a/kernel/patches-4.14.x-rt/0260-fs-ntfs-disable-interrupt-non-rt.patch b/kernel/patches-4.14.x-rt/0260-fs-ntfs-disable-interrupt-non-rt.patch
new file mode 100644
index 000000000..0363487b0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0260-fs-ntfs-disable-interrupt-non-rt.patch
@@ -0,0 +1,75 @@
+From: Mike Galbraith <efault@gmx.de>
+Date: Fri, 3 Jul 2009 08:44:12 -0500
+Subject: fs: ntfs: disable interrupt only on !RT
+
+On Sat, 2007-10-27 at 11:44 +0200, Ingo Molnar wrote:
+> * Nick Piggin <nickpiggin@yahoo.com.au> wrote:
+>
+> > > [10138.175796]  [<c0105de3>] show_trace+0x12/0x14
+> > > [10138.180291]  [<c0105dfb>] dump_stack+0x16/0x18
+> > > [10138.184769]  [<c011609f>] native_smp_call_function_mask+0x138/0x13d
+> > > [10138.191117]  [<c0117606>] smp_call_function+0x1e/0x24
+> > > [10138.196210]  [<c012f85c>] on_each_cpu+0x25/0x50
+> > > [10138.200807]  [<c0115c74>] flush_tlb_all+0x1e/0x20
+> > > [10138.205553]  [<c016caaf>] kmap_high+0x1b6/0x417
+> > > [10138.210118]  [<c011ec88>] kmap+0x4d/0x4f
+> > > [10138.214102]  [<c026a9d8>] ntfs_end_buffer_async_read+0x228/0x2f9
+> > > [10138.220163]  [<c01a0e9e>] end_bio_bh_io_sync+0x26/0x3f
+> > > [10138.225352]  [<c01a2b09>] bio_endio+0x42/0x6d
+> > > [10138.229769]  [<c02c2a08>] __end_that_request_first+0x115/0x4ac
+> > > [10138.235682]  [<c02c2da7>] end_that_request_chunk+0x8/0xa
+> > > [10138.241052]  [<c0365943>] ide_end_request+0x55/0x10a
+> > > [10138.246058]  [<c036dae3>] ide_dma_intr+0x6f/0xac
+> > > [10138.250727]  [<c0366d83>] ide_intr+0x93/0x1e0
+> > > [10138.255125]  [<c015afb4>] handle_IRQ_event+0x5c/0xc9
+> >
+> > Looks like ntfs is kmap()ing from interrupt context. Should be using
+> > kmap_atomic instead, I think.
+>
+> it's not atomic interrupt context but irq thread context - and -rt
+> remaps kmap_atomic() to kmap() internally.
+
+Hm.  Looking at the change to mm/bounce.c, perhaps I should do this
+instead?
+
+Signed-off-by: Ingo Molnar <mingo@elte.hu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ fs/ntfs/aops.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/fs/ntfs/aops.c
++++ b/fs/ntfs/aops.c
+@@ -93,13 +93,13 @@ static void ntfs_end_buffer_async_read(s
+ 			ofs = 0;
+ 			if (file_ofs < init_size)
+ 				ofs = init_size - file_ofs;
+-			local_irq_save(flags);
++			local_irq_save_nort(flags);
+ 			kaddr = kmap_atomic(page);
+ 			memset(kaddr + bh_offset(bh) + ofs, 0,
+ 					bh->b_size - ofs);
+ 			flush_dcache_page(page);
+ 			kunmap_atomic(kaddr);
+-			local_irq_restore(flags);
++			local_irq_restore_nort(flags);
+ 		}
+ 	} else {
+ 		clear_buffer_uptodate(bh);
+@@ -144,13 +144,13 @@ static void ntfs_end_buffer_async_read(s
+ 		recs = PAGE_SIZE / rec_size;
+ 		/* Should have been verified before we got here... */
+ 		BUG_ON(!recs);
+-		local_irq_save(flags);
++		local_irq_save_nort(flags);
+ 		kaddr = kmap_atomic(page);
+ 		for (i = 0; i < recs; i++)
+ 			post_read_mst_fixup((NTFS_RECORD*)(kaddr +
+ 					i * rec_size), rec_size);
+ 		kunmap_atomic(kaddr);
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ 		flush_dcache_page(page);
+ 		if (likely(page_uptodate && !PageError(page)))
+ 			SetPageUptodate(page);
diff --git a/kernel/patches-4.14.x-rt/0261-fs-jbd2-pull-your-plug-when-waiting-for-space.patch b/kernel/patches-4.14.x-rt/0261-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
new file mode 100644
index 000000000..600ade5dd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0261-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
@@ -0,0 +1,31 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 17 Feb 2014 17:30:03 +0100
+Subject: fs: jbd2: pull your plug when waiting for space
+
+Two cps in parallel managed to stall the the ext4 fs. It seems that
+journal code is either waiting for locks or sleeping waiting for
+something to happen. This seems similar to what Mike observed on ext3,
+here is his description:
+
+|With an -rt kernel, and a heavy sync IO load, tasks can jam
+|up on journal locks without unplugging, which can lead to
+|terminal IO starvation.  Unplug and schedule when waiting
+|for space.
+
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/jbd2/checkpoint.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/jbd2/checkpoint.c
++++ b/fs/jbd2/checkpoint.c
+@@ -116,6 +116,8 @@ void __jbd2_log_wait_for_space(journal_t
+ 	nblocks = jbd2_space_needed(journal);
+ 	while (jbd2_log_space_left(journal) < nblocks) {
+ 		write_unlock(&journal->j_state_lock);
++		if (current->plug)
++			io_schedule();
+ 		mutex_lock(&journal->j_checkpoint_mutex);
+ 
+ 		/*
diff --git a/kernel/patches-4.14.x-rt/0262-Revert-fs-jbd2-pull-your-plug-when-waiting-for-space.patch b/kernel/patches-4.14.x-rt/0262-Revert-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
new file mode 100644
index 000000000..967c9fcb5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0262-Revert-fs-jbd2-pull-your-plug-when-waiting-for-space.patch
@@ -0,0 +1,25 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 23 Nov 2017 17:51:51 +0100
+Subject: [PATCH] Revert "fs: jbd2: pull your plug when waiting for space"
+
+This reverts commit "fs: jbd2: pull your plug when waiting for space".
+This was a duct-tape fix which shouldn't be needed since commit
+"locking/rt-mutex: fix deadlock in device mapper / block-IO".
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/jbd2/checkpoint.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/fs/jbd2/checkpoint.c
++++ b/fs/jbd2/checkpoint.c
+@@ -116,8 +116,6 @@ void __jbd2_log_wait_for_space(journal_t
+ 	nblocks = jbd2_space_needed(journal);
+ 	while (jbd2_log_space_left(journal) < nblocks) {
+ 		write_unlock(&journal->j_state_lock);
+-		if (current->plug)
+-			io_schedule();
+ 		mutex_lock(&journal->j_checkpoint_mutex);
+ 
+ 		/*
diff --git a/kernel/patches-4.14.x-rt/0263-fs-dcache-bringt-back-explicit-INIT_HLIST_BL_HEAD-in.patch b/kernel/patches-4.14.x-rt/0263-fs-dcache-bringt-back-explicit-INIT_HLIST_BL_HEAD-in.patch
new file mode 100644
index 000000000..423ab2412
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0263-fs-dcache-bringt-back-explicit-INIT_HLIST_BL_HEAD-in.patch
@@ -0,0 +1,51 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 13 Sep 2017 12:32:34 +0200
+Subject: [PATCH] fs/dcache: bringt back explicit INIT_HLIST_BL_HEAD init
+
+Commit 3d375d78593c ("mm: update callers to use HASH_ZERO flag") removed
+INIT_HLIST_BL_HEAD and uses the ZERO flag instead for the init. However
+on RT we have also a spinlock which needs an init call so we can't use
+that.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/dcache.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -3578,6 +3578,8 @@ static int __init set_dhash_entries(char
+ 
+ static void __init dcache_init_early(void)
+ {
++	unsigned int loop;
++
+ 	/* If hashes are distributed across NUMA nodes, defer
+ 	 * hash allocation until vmalloc space is available.
+ 	 */
+@@ -3594,10 +3596,14 @@ static void __init dcache_init_early(voi
+ 					&d_hash_mask,
+ 					0,
+ 					0);
++
++	for (loop = 0; loop < (1U << d_hash_shift); loop++)
++		INIT_HLIST_BL_HEAD(dentry_hashtable + loop);
+ }
+ 
+ static void __init dcache_init(void)
+ {
++	unsigned int loop;
+ 	/*
+ 	 * A constructor could be added for stable state like the lists,
+ 	 * but it is probably not worth it because of the cache nature
+@@ -3620,6 +3626,10 @@ static void __init dcache_init(void)
+ 					&d_hash_mask,
+ 					0,
+ 					0);
++
++	for (loop = 0; loop < (1U << d_hash_shift); loop++)
++		INIT_HLIST_BL_HEAD(dentry_hashtable + loop);
++
+ }
+ 
+ /* SLAB cache for __getname() consumers */
diff --git a/kernel/patches-4.14.x-rt/0264-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch b/kernel/patches-4.14.x-rt/0264-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch
new file mode 100644
index 000000000..68808ecef
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0264-fs-dcache-disable-preemption-on-i_dir_seq-s-write-si.patch
@@ -0,0 +1,118 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 20 Oct 2017 11:29:53 +0200
+Subject: [PATCH] fs/dcache: disable preemption on i_dir_seq's write side
+
+i_dir_seq is an opencoded seqcounter. Based on the code it looks like we
+could have two writers in parallel despite the fact that the d_lock is
+held. The problem is that during the write process on RT the preemption
+is still enabled and if this process is interrupted by a reader with RT
+priority then we lock up.
+To avoid that lock up I am disabling the preemption during the update.
+The rename of i_dir_seq is here to ensure to catch new write sides in
+future.
+
+Cc: stable-rt@vger.kernel.org
+Reported-by: Oleg.Karfich@wago.com
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/dcache.c        |   12 +++++++-----
+ fs/inode.c         |    2 +-
+ fs/libfs.c         |    6 ++++--
+ include/linux/fs.h |    2 +-
+ 4 files changed, 13 insertions(+), 9 deletions(-)
+
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -2405,9 +2405,10 @@ EXPORT_SYMBOL(d_rehash);
+ static inline unsigned start_dir_add(struct inode *dir)
+ {
+ 
++	preempt_disable_rt();
+ 	for (;;) {
+-		unsigned n = dir->i_dir_seq;
+-		if (!(n & 1) && cmpxchg(&dir->i_dir_seq, n, n + 1) == n)
++		unsigned n = dir->__i_dir_seq;
++		if (!(n & 1) && cmpxchg(&dir->__i_dir_seq, n, n + 1) == n)
+ 			return n;
+ 		cpu_relax();
+ 	}
+@@ -2415,7 +2416,8 @@ static inline unsigned start_dir_add(str
+ 
+ static inline void end_dir_add(struct inode *dir, unsigned n)
+ {
+-	smp_store_release(&dir->i_dir_seq, n + 2);
++	smp_store_release(&dir->__i_dir_seq, n + 2);
++	preempt_enable_rt();
+ }
+ 
+ static void d_wait_lookup(struct dentry *dentry)
+@@ -2448,7 +2450,7 @@ struct dentry *d_alloc_parallel(struct d
+ 
+ retry:
+ 	rcu_read_lock();
+-	seq = smp_load_acquire(&parent->d_inode->i_dir_seq) & ~1;
++	seq = smp_load_acquire(&parent->d_inode->__i_dir_seq) & ~1;
+ 	r_seq = read_seqbegin(&rename_lock);
+ 	dentry = __d_lookup_rcu(parent, name, &d_seq);
+ 	if (unlikely(dentry)) {
+@@ -2470,7 +2472,7 @@ struct dentry *d_alloc_parallel(struct d
+ 		goto retry;
+ 	}
+ 	hlist_bl_lock(b);
+-	if (unlikely(parent->d_inode->i_dir_seq != seq)) {
++	if (unlikely(parent->d_inode->__i_dir_seq != seq)) {
+ 		hlist_bl_unlock(b);
+ 		rcu_read_unlock();
+ 		goto retry;
+--- a/fs/inode.c
++++ b/fs/inode.c
+@@ -154,7 +154,7 @@ int inode_init_always(struct super_block
+ 	inode->i_bdev = NULL;
+ 	inode->i_cdev = NULL;
+ 	inode->i_link = NULL;
+-	inode->i_dir_seq = 0;
++	inode->__i_dir_seq = 0;
+ 	inode->i_rdev = 0;
+ 	inode->dirtied_when = 0;
+ 
+--- a/fs/libfs.c
++++ b/fs/libfs.c
+@@ -90,7 +90,7 @@ static struct dentry *next_positive(stru
+ 				    struct list_head *from,
+ 				    int count)
+ {
+-	unsigned *seq = &parent->d_inode->i_dir_seq, n;
++	unsigned *seq = &parent->d_inode->__i_dir_seq, n;
+ 	struct dentry *res;
+ 	struct list_head *p;
+ 	bool skipped;
+@@ -123,8 +123,9 @@ static struct dentry *next_positive(stru
+ static void move_cursor(struct dentry *cursor, struct list_head *after)
+ {
+ 	struct dentry *parent = cursor->d_parent;
+-	unsigned n, *seq = &parent->d_inode->i_dir_seq;
++	unsigned n, *seq = &parent->d_inode->__i_dir_seq;
+ 	spin_lock(&parent->d_lock);
++	preempt_disable_rt();
+ 	for (;;) {
+ 		n = *seq;
+ 		if (!(n & 1) && cmpxchg(seq, n, n + 1) == n)
+@@ -137,6 +138,7 @@ static void move_cursor(struct dentry *c
+ 	else
+ 		list_add_tail(&cursor->d_child, &parent->d_subdirs);
+ 	smp_store_release(seq, n + 2);
++	preempt_enable_rt();
+ 	spin_unlock(&parent->d_lock);
+ }
+ 
+--- a/include/linux/fs.h
++++ b/include/linux/fs.h
+@@ -655,7 +655,7 @@ struct inode {
+ 		struct block_device	*i_bdev;
+ 		struct cdev		*i_cdev;
+ 		char			*i_link;
+-		unsigned		i_dir_seq;
++		unsigned		__i_dir_seq;
+ 	};
+ 
+ 	__u32			i_generation;
diff --git a/kernel/patches-4.14.x-rt/0265-x86-mce-timer-hrtimer.patch b/kernel/patches-4.14.x-rt/0265-x86-mce-timer-hrtimer.patch
new file mode 100644
index 000000000..248a77750
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0265-x86-mce-timer-hrtimer.patch
@@ -0,0 +1,167 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 13 Dec 2010 16:33:39 +0100
+Subject: x86: Convert mce timer to hrtimer
+
+mce_timer is started in atomic contexts of cpu bringup. This results
+in might_sleep() warnings on RT. Convert mce_timer to a hrtimer to
+avoid this.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+fold in:
+|From: Mike Galbraith <bitbucket@online.de>
+|Date: Wed, 29 May 2013 13:52:13 +0200
+|Subject: [PATCH] x86/mce: fix mce timer interval
+|
+|Seems mce timer fire at the wrong frequency in -rt kernels since roughly
+|forever due to 32 bit overflow.  3.8-rt is also missing a multiplier.
+|
+|Add missing us -> ns conversion and 32 bit overflow prevention.
+|
+|Signed-off-by: Mike Galbraith <bitbucket@online.de>
+|[bigeasy: use ULL instead of u64 cast]
+|Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/kernel/cpu/mcheck/mce.c |   54 ++++++++++++++++++---------------------
+ 1 file changed, 26 insertions(+), 28 deletions(-)
+
+--- a/arch/x86/kernel/cpu/mcheck/mce.c
++++ b/arch/x86/kernel/cpu/mcheck/mce.c
+@@ -42,6 +42,7 @@
+ #include <linux/debugfs.h>
+ #include <linux/irq_work.h>
+ #include <linux/export.h>
++#include <linux/jiffies.h>
+ #include <linux/jump_label.h>
+ 
+ #include <asm/intel-family.h>
+@@ -1345,7 +1346,7 @@ int memory_failure(unsigned long pfn, in
+ static unsigned long check_interval = INITIAL_CHECK_INTERVAL;
+ 
+ static DEFINE_PER_CPU(unsigned long, mce_next_interval); /* in jiffies */
+-static DEFINE_PER_CPU(struct timer_list, mce_timer);
++static DEFINE_PER_CPU(struct hrtimer, mce_timer);
+ 
+ static unsigned long mce_adjust_timer_default(unsigned long interval)
+ {
+@@ -1354,27 +1355,19 @@ static unsigned long mce_adjust_timer_de
+ 
+ static unsigned long (*mce_adjust_timer)(unsigned long interval) = mce_adjust_timer_default;
+ 
+-static void __start_timer(struct timer_list *t, unsigned long interval)
++static void __start_timer(struct hrtimer *t, unsigned long iv)
+ {
+-	unsigned long when = jiffies + interval;
+-	unsigned long flags;
+-
+-	local_irq_save(flags);
+-
+-	if (!timer_pending(t) || time_before(when, t->expires))
+-		mod_timer(t, round_jiffies(when));
++	if (!iv)
++		return;
+ 
+-	local_irq_restore(flags);
++	hrtimer_start_range_ns(t, ns_to_ktime(jiffies_to_usecs(iv) * 1000ULL),
++			       0, HRTIMER_MODE_REL_PINNED);
+ }
+ 
+-static void mce_timer_fn(unsigned long data)
++static  enum hrtimer_restart mce_timer_fn(struct hrtimer *timer)
+ {
+-	struct timer_list *t = this_cpu_ptr(&mce_timer);
+-	int cpu = smp_processor_id();
+ 	unsigned long iv;
+ 
+-	WARN_ON(cpu != data);
+-
+ 	iv = __this_cpu_read(mce_next_interval);
+ 
+ 	if (mce_available(this_cpu_ptr(&cpu_info))) {
+@@ -1397,7 +1390,11 @@ static void mce_timer_fn(unsigned long d
+ 
+ done:
+ 	__this_cpu_write(mce_next_interval, iv);
+-	__start_timer(t, iv);
++	if (!iv)
++		return HRTIMER_NORESTART;
++
++	hrtimer_forward_now(timer, ns_to_ktime(jiffies_to_nsecs(iv)));
++	return HRTIMER_RESTART;
+ }
+ 
+ /*
+@@ -1405,7 +1402,7 @@ static void mce_timer_fn(unsigned long d
+  */
+ void mce_timer_kick(unsigned long interval)
+ {
+-	struct timer_list *t = this_cpu_ptr(&mce_timer);
++	struct hrtimer *t = this_cpu_ptr(&mce_timer);
+ 	unsigned long iv = __this_cpu_read(mce_next_interval);
+ 
+ 	__start_timer(t, interval);
+@@ -1420,7 +1417,7 @@ static void mce_timer_delete_all(void)
+ 	int cpu;
+ 
+ 	for_each_online_cpu(cpu)
+-		del_timer_sync(&per_cpu(mce_timer, cpu));
++		hrtimer_cancel(&per_cpu(mce_timer, cpu));
+ }
+ 
+ /*
+@@ -1749,7 +1746,7 @@ static void __mcheck_cpu_clear_vendor(st
+ 	}
+ }
+ 
+-static void mce_start_timer(struct timer_list *t)
++static void mce_start_timer(struct hrtimer *t)
+ {
+ 	unsigned long iv = check_interval * HZ;
+ 
+@@ -1762,18 +1759,19 @@ static void mce_start_timer(struct timer
+ 
+ static void __mcheck_cpu_setup_timer(void)
+ {
+-	struct timer_list *t = this_cpu_ptr(&mce_timer);
+-	unsigned int cpu = smp_processor_id();
++	struct hrtimer *t = this_cpu_ptr(&mce_timer);
+ 
+-	setup_pinned_timer(t, mce_timer_fn, cpu);
++	hrtimer_init(t, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	t->function = mce_timer_fn;
+ }
+ 
+ static void __mcheck_cpu_init_timer(void)
+ {
+-	struct timer_list *t = this_cpu_ptr(&mce_timer);
+-	unsigned int cpu = smp_processor_id();
++	struct hrtimer *t = this_cpu_ptr(&mce_timer);
++
++	hrtimer_init(t, CLOCK_MONOTONIC, HRTIMER_MODE_REL);
++	t->function = mce_timer_fn;
+ 
+-	setup_pinned_timer(t, mce_timer_fn, cpu);
+ 	mce_start_timer(t);
+ }
+ 
+@@ -2275,7 +2273,7 @@ static int mce_cpu_dead(unsigned int cpu
+ 
+ static int mce_cpu_online(unsigned int cpu)
+ {
+-	struct timer_list *t = this_cpu_ptr(&mce_timer);
++	struct hrtimer *t = this_cpu_ptr(&mce_timer);
+ 	int ret;
+ 
+ 	mce_device_create(cpu);
+@@ -2292,10 +2290,10 @@ static int mce_cpu_online(unsigned int c
+ 
+ static int mce_cpu_pre_down(unsigned int cpu)
+ {
+-	struct timer_list *t = this_cpu_ptr(&mce_timer);
++	struct hrtimer *t = this_cpu_ptr(&mce_timer);
+ 
+ 	mce_disable_cpu();
+-	del_timer_sync(t);
++	hrtimer_cancel(t);
+ 	mce_threshold_remove_device(cpu);
+ 	mce_device_remove(cpu);
+ 	return 0;
diff --git a/kernel/patches-4.14.x-rt/0266-x86-mce-use-swait-queue-for-mce-wakeups.patch b/kernel/patches-4.14.x-rt/0266-x86-mce-use-swait-queue-for-mce-wakeups.patch
new file mode 100644
index 000000000..14962b438
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0266-x86-mce-use-swait-queue-for-mce-wakeups.patch
@@ -0,0 +1,125 @@
+Subject: x86/mce: use swait queue for mce wakeups
+From: Steven Rostedt <rostedt@goodmis.org>
+Date:	Fri, 27 Feb 2015 15:20:37 +0100
+
+We had a customer report a lockup on a 3.0-rt kernel that had the
+following backtrace:
+
+[ffff88107fca3e80] rt_spin_lock_slowlock at ffffffff81499113
+[ffff88107fca3f40] rt_spin_lock at ffffffff81499a56
+[ffff88107fca3f50] __wake_up at ffffffff81043379
+[ffff88107fca3f80] mce_notify_irq at ffffffff81017328
+[ffff88107fca3f90] intel_threshold_interrupt at ffffffff81019508
+[ffff88107fca3fa0] smp_threshold_interrupt at ffffffff81019fc1
+[ffff88107fca3fb0] threshold_interrupt at ffffffff814a1853
+
+It actually bugged because the lock was taken by the same owner that
+already had that lock. What happened was the thread that was setting
+itself on a wait queue had the lock when an MCE triggered. The MCE
+interrupt does a wake up on its wait list and grabs the same lock.
+
+NOTE: THIS IS NOT A BUG ON MAINLINE
+
+Sorry for yelling, but as I Cc'd mainline maintainers I want them to
+know that this is an PREEMPT_RT bug only. I only Cc'd them for advice.
+
+On PREEMPT_RT the wait queue locks are converted from normal
+"spin_locks" into an rt_mutex (see the rt_spin_lock_slowlock above).
+These are not to be taken by hard interrupt context. This usually isn't
+a problem as most all interrupts in PREEMPT_RT are converted into
+schedulable threads. Unfortunately that's not the case with the MCE irq.
+
+As wait queue locks are notorious for long hold times, we can not
+convert them to raw_spin_locks without causing issues with -rt. But
+Thomas has created a "simple-wait" structure that uses raw spin locks
+which may have been a good fit.
+
+Unfortunately, wait queues are not the only issue, as the mce_notify_irq
+also does a schedule_work(), which grabs the workqueue spin locks that
+have the exact same issue.
+
+Thus, this patch I'm proposing is to move the actual work of the MCE
+interrupt into a helper thread that gets woken up on the MCE interrupt
+and does the work in a schedulable context.
+
+NOTE: THIS PATCH ONLY CHANGES THE BEHAVIOR WHEN PREEMPT_RT IS SET
+
+Oops, sorry for yelling again, but I want to stress that I keep the same
+behavior of mainline when PREEMPT_RT is not set. Thus, this only changes
+the MCE behavior when PREEMPT_RT is configured.
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+[bigeasy@linutronix: make mce_notify_work() a proper prototype, use
+		     kthread_run()]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+[wagi: use work-simple framework to defer work to a kthread]
+Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
+---
+ arch/x86/kernel/cpu/mcheck/dev-mcelog.c |   37 +++++++++++++++++++++++++++++---
+ 1 file changed, 34 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
++++ b/arch/x86/kernel/cpu/mcheck/dev-mcelog.c
+@@ -14,6 +14,7 @@
+ #include <linux/slab.h>
+ #include <linux/kmod.h>
+ #include <linux/poll.h>
++#include <linux/swork.h>
+ 
+ #include "mce-internal.h"
+ 
+@@ -86,13 +87,43 @@ static void mce_do_trigger(struct work_s
+ 
+ static DECLARE_WORK(mce_trigger_work, mce_do_trigger);
+ 
+-
+-void mce_work_trigger(void)
++static void __mce_work_trigger(struct swork_event *event)
+ {
+ 	if (mce_helper[0])
+ 		schedule_work(&mce_trigger_work);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static bool notify_work_ready __read_mostly;
++static struct swork_event notify_work;
++
++static int mce_notify_work_init(void)
++{
++	int err;
++
++	err = swork_get();
++	if (err)
++		return err;
++
++	INIT_SWORK(&notify_work, __mce_work_trigger);
++	notify_work_ready = true;
++	return 0;
++}
++
++void mce_work_trigger(void)
++{
++	if (notify_work_ready)
++		swork_queue(&notify_work);
++}
++
++#else
++void mce_work_trigger(void)
++{
++	__mce_work_trigger(NULL);
++}
++static inline int mce_notify_work_init(void) { return 0; }
++#endif
++
+ static ssize_t
+ show_trigger(struct device *s, struct device_attribute *attr, char *buf)
+ {
+@@ -356,7 +387,7 @@ static __init int dev_mcelog_init_device
+ 
+ 		return err;
+ 	}
+-
++	mce_notify_work_init();
+ 	mce_register_decode_chain(&dev_mcelog_nb);
+ 	return 0;
+ }
diff --git a/kernel/patches-4.14.x-rt/0267-x86-stackprot-no-random-on-rt.patch b/kernel/patches-4.14.x-rt/0267-x86-stackprot-no-random-on-rt.patch
new file mode 100644
index 000000000..66c2ecf59
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0267-x86-stackprot-no-random-on-rt.patch
@@ -0,0 +1,45 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 16 Dec 2010 14:25:18 +0100
+Subject: x86: stackprotector: Avoid random pool on rt
+
+CPU bringup calls into the random pool to initialize the stack
+canary. During boot that works nicely even on RT as the might sleep
+checks are disabled. During CPU hotplug the might sleep checks
+trigger. Making the locks in random raw is a major PITA, so avoid the
+call on RT is the only sensible solution. This is basically the same
+randomness which we get during boot where the random pool has no
+entropy and we rely on the TSC randomnness.
+
+Reported-by: Carsten Emde <carsten.emde@osadl.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ arch/x86/include/asm/stackprotector.h |    8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/include/asm/stackprotector.h
++++ b/arch/x86/include/asm/stackprotector.h
+@@ -60,7 +60,7 @@
+  */
+ static __always_inline void boot_init_stack_canary(void)
+ {
+-	u64 canary;
++	u64 uninitialized_var(canary);
+ 	u64 tsc;
+ 
+ #ifdef CONFIG_X86_64
+@@ -71,8 +71,14 @@ static __always_inline void boot_init_st
+ 	 * 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.
++	 * For preempt-rt we need to weaken the randomness a bit, as
++	 * we can't call into the random generator from atomic context
++	 * due to locking constraints. We just leave canary
++	 * uninitialized and use the TSC based randomness on top of it.
+ 	 */
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	get_random_bytes(&canary, sizeof(canary));
++#endif
+ 	tsc = rdtsc();
+ 	canary += tsc + (tsc << 32UL);
+ 	canary &= CANARY_MASK;
diff --git a/kernel/patches-4.14.x-rt/0268-x86-use-gen-rwsem-spinlocks-rt.patch b/kernel/patches-4.14.x-rt/0268-x86-use-gen-rwsem-spinlocks-rt.patch
new file mode 100644
index 000000000..b5e67d112
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0268-x86-use-gen-rwsem-spinlocks-rt.patch
@@ -0,0 +1,28 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 26 Jul 2009 02:21:32 +0200
+Subject: x86: Use generic rwsem_spinlocks on -rt
+
+Simplifies the separation of anon_rw_semaphores and rw_semaphores for
+-rt.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ arch/x86/Kconfig |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -256,8 +256,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
diff --git a/kernel/patches-4.14.x-rt/0269-x86-UV-raw_spinlock-conversion.patch b/kernel/patches-4.14.x-rt/0269-x86-UV-raw_spinlock-conversion.patch
new file mode 100644
index 000000000..33a21cb8f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0269-x86-UV-raw_spinlock-conversion.patch
@@ -0,0 +1,219 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Sun, 2 Nov 2014 08:31:37 +0100
+Subject: x86: UV: raw_spinlock conversion
+
+Shrug.  Lots of hobbyists have a beast in their basement, right?
+
+
+Signed-off-by: Mike Galbraith <mgalbraith@suse.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/include/asm/uv/uv_bau.h |   14 +++++++-------
+ arch/x86/platform/uv/tlb_uv.c    |   26 +++++++++++++-------------
+ arch/x86/platform/uv/uv_time.c   |   20 ++++++++++++--------
+ 3 files changed, 32 insertions(+), 28 deletions(-)
+
+--- a/arch/x86/include/asm/uv/uv_bau.h
++++ b/arch/x86/include/asm/uv/uv_bau.h
+@@ -643,9 +643,9 @@ struct bau_control {
+ 	cycles_t		send_message;
+ 	cycles_t		period_end;
+ 	cycles_t		period_time;
+-	spinlock_t		uvhub_lock;
+-	spinlock_t		queue_lock;
+-	spinlock_t		disable_lock;
++	raw_spinlock_t		uvhub_lock;
++	raw_spinlock_t		queue_lock;
++	raw_spinlock_t		disable_lock;
+ 	/* tunables */
+ 	int			max_concurr;
+ 	int			max_concurr_const;
+@@ -847,15 +847,15 @@ static inline int atom_asr(short i, stru
+  * to be lowered below the current 'v'.  atomic_add_unless can only stop
+  * on equal.
+  */
+-static inline int atomic_inc_unless_ge(spinlock_t *lock, atomic_t *v, int u)
++static inline int atomic_inc_unless_ge(raw_spinlock_t *lock, atomic_t *v, int u)
+ {
+-	spin_lock(lock);
++	raw_spin_lock(lock);
+ 	if (atomic_read(v) >= u) {
+-		spin_unlock(lock);
++		raw_spin_unlock(lock);
+ 		return 0;
+ 	}
+ 	atomic_inc(v);
+-	spin_unlock(lock);
++	raw_spin_unlock(lock);
+ 	return 1;
+ }
+ 
+--- a/arch/x86/platform/uv/tlb_uv.c
++++ b/arch/x86/platform/uv/tlb_uv.c
+@@ -740,9 +740,9 @@ static void destination_plugged(struct b
+ 
+ 		quiesce_local_uvhub(hmaster);
+ 
+-		spin_lock(&hmaster->queue_lock);
++		raw_spin_lock(&hmaster->queue_lock);
+ 		reset_with_ipi(&bau_desc->distribution, bcp);
+-		spin_unlock(&hmaster->queue_lock);
++		raw_spin_unlock(&hmaster->queue_lock);
+ 
+ 		end_uvhub_quiesce(hmaster);
+ 
+@@ -762,9 +762,9 @@ static void destination_timeout(struct b
+ 
+ 		quiesce_local_uvhub(hmaster);
+ 
+-		spin_lock(&hmaster->queue_lock);
++		raw_spin_lock(&hmaster->queue_lock);
+ 		reset_with_ipi(&bau_desc->distribution, bcp);
+-		spin_unlock(&hmaster->queue_lock);
++		raw_spin_unlock(&hmaster->queue_lock);
+ 
+ 		end_uvhub_quiesce(hmaster);
+ 
+@@ -785,7 +785,7 @@ static void disable_for_period(struct ba
+ 	cycles_t tm1;
+ 
+ 	hmaster = bcp->uvhub_master;
+-	spin_lock(&hmaster->disable_lock);
++	raw_spin_lock(&hmaster->disable_lock);
+ 	if (!bcp->baudisabled) {
+ 		stat->s_bau_disabled++;
+ 		tm1 = get_cycles();
+@@ -798,7 +798,7 @@ static void disable_for_period(struct ba
+ 			}
+ 		}
+ 	}
+-	spin_unlock(&hmaster->disable_lock);
++	raw_spin_unlock(&hmaster->disable_lock);
+ }
+ 
+ static void count_max_concurr(int stat, struct bau_control *bcp,
+@@ -861,7 +861,7 @@ static void record_send_stats(cycles_t t
+  */
+ static void uv1_throttle(struct bau_control *hmaster, struct ptc_stats *stat)
+ {
+-	spinlock_t *lock = &hmaster->uvhub_lock;
++	raw_spinlock_t *lock = &hmaster->uvhub_lock;
+ 	atomic_t *v;
+ 
+ 	v = &hmaster->active_descriptor_count;
+@@ -995,7 +995,7 @@ static int check_enable(struct bau_contr
+ 	struct bau_control *hmaster;
+ 
+ 	hmaster = bcp->uvhub_master;
+-	spin_lock(&hmaster->disable_lock);
++	raw_spin_lock(&hmaster->disable_lock);
+ 	if (bcp->baudisabled && (get_cycles() >= bcp->set_bau_on_time)) {
+ 		stat->s_bau_reenabled++;
+ 		for_each_present_cpu(tcpu) {
+@@ -1007,10 +1007,10 @@ static int check_enable(struct bau_contr
+ 				tbcp->period_giveups = 0;
+ 			}
+ 		}
+-		spin_unlock(&hmaster->disable_lock);
++		raw_spin_unlock(&hmaster->disable_lock);
+ 		return 0;
+ 	}
+-	spin_unlock(&hmaster->disable_lock);
++	raw_spin_unlock(&hmaster->disable_lock);
+ 	return -1;
+ }
+ 
+@@ -1941,9 +1941,9 @@ static void __init init_per_cpu_tunables
+ 		bcp->cong_reps			= congested_reps;
+ 		bcp->disabled_period		= sec_2_cycles(disabled_period);
+ 		bcp->giveup_limit		= giveup_limit;
+-		spin_lock_init(&bcp->queue_lock);
+-		spin_lock_init(&bcp->uvhub_lock);
+-		spin_lock_init(&bcp->disable_lock);
++		raw_spin_lock_init(&bcp->queue_lock);
++		raw_spin_lock_init(&bcp->uvhub_lock);
++		raw_spin_lock_init(&bcp->disable_lock);
+ 	}
+ }
+ 
+--- 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
+ 
+ /* There is one of these allocated per node */
+ struct uv_rtc_timer_head {
+-	spinlock_t	lock;
++	raw_spinlock_t	lock;
+ 	/* next cpu waiting for timer, local node relative: */
+ 	int		next_cpu;
+ 	/* number of cpus on this node: */
+@@ -177,7 +177,7 @@ static __init int uv_rtc_allocate_timers
+ 				uv_rtc_deallocate_timers();
+ 				return -ENOMEM;
+ 			}
+-			spin_lock_init(&head->lock);
++			raw_spin_lock_init(&head->lock);
+ 			head->ncpus = uv_blade_nr_possible_cpus(bid);
+ 			head->next_cpu = -1;
+ 			blade_info[bid] = head;
+@@ -231,7 +231,7 @@ static int uv_rtc_set_timer(int cpu, u64
+ 	unsigned long flags;
+ 	int next_cpu;
+ 
+-	spin_lock_irqsave(&head->lock, flags);
++	raw_spin_lock_irqsave(&head->lock, flags);
+ 
+ 	next_cpu = head->next_cpu;
+ 	*t = expires;
+@@ -243,12 +243,12 @@ static int uv_rtc_set_timer(int cpu, u64
+ 		if (uv_setup_intr(cpu, expires)) {
+ 			*t = ULLONG_MAX;
+ 			uv_rtc_find_next_timer(head, pnode);
+-			spin_unlock_irqrestore(&head->lock, flags);
++			raw_spin_unlock_irqrestore(&head->lock, flags);
+ 			return -ETIME;
+ 		}
+ 	}
+ 
+-	spin_unlock_irqrestore(&head->lock, flags);
++	raw_spin_unlock_irqrestore(&head->lock, flags);
+ 	return 0;
+ }
+ 
+@@ -267,7 +267,7 @@ static int uv_rtc_unset_timer(int cpu, i
+ 	unsigned long flags;
+ 	int rc = 0;
+ 
+-	spin_lock_irqsave(&head->lock, flags);
++	raw_spin_lock_irqsave(&head->lock, flags);
+ 
+ 	if ((head->next_cpu == bcpu && uv_read_rtc(NULL) >= *t) || force)
+ 		rc = 1;
+@@ -279,7 +279,7 @@ static int uv_rtc_unset_timer(int cpu, i
+ 			uv_rtc_find_next_timer(head, pnode);
+ 	}
+ 
+-	spin_unlock_irqrestore(&head->lock, flags);
++	raw_spin_unlock_irqrestore(&head->lock, flags);
+ 
+ 	return rc;
+ }
+@@ -299,13 +299,17 @@ static int uv_rtc_unset_timer(int cpu, i
+ static u64 uv_read_rtc(struct clocksource *cs)
+ {
+ 	unsigned long offset;
++	u64 cycles;
+ 
++	preempt_disable();
+ 	if (uv_get_min_hub_revision_id() == 1)
+ 		offset = 0;
+ 	else
+ 		offset = (uv_blade_processor_id() * L1_CACHE_BYTES) % PAGE_SIZE;
+ 
+-	return (u64)uv_read_local_mmr(UVH_RTC | offset);
++	cycles = (u64)uv_read_local_mmr(UVH_RTC | offset);
++	preempt_enable();
++	return cycles;
+ }
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0270-thermal-Defer-thermal-wakups-to-threads.patch b/kernel/patches-4.14.x-rt/0270-thermal-Defer-thermal-wakups-to-threads.patch
new file mode 100644
index 000000000..72faa3db2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0270-thermal-Defer-thermal-wakups-to-threads.patch
@@ -0,0 +1,129 @@
+From: Daniel Wagner <wagi@monom.org>
+Date: Tue, 17 Feb 2015 09:37:44 +0100
+Subject: thermal: Defer thermal wakups to threads
+
+On RT the spin lock in pkg_temp_thermal_platfrom_thermal_notify will
+call schedule while we run in irq context.
+
+[<ffffffff816850ac>] dump_stack+0x4e/0x8f
+[<ffffffff81680f7d>] __schedule_bug+0xa6/0xb4
+[<ffffffff816896b4>] __schedule+0x5b4/0x700
+[<ffffffff8168982a>] schedule+0x2a/0x90
+[<ffffffff8168a8b5>] rt_spin_lock_slowlock+0xe5/0x2d0
+[<ffffffff8168afd5>] rt_spin_lock+0x25/0x30
+[<ffffffffa03a7b75>] pkg_temp_thermal_platform_thermal_notify+0x45/0x134 [x86_pkg_temp_thermal]
+[<ffffffff8103d4db>] ? therm_throt_process+0x1b/0x160
+[<ffffffff8103d831>] intel_thermal_interrupt+0x211/0x250
+[<ffffffff8103d8c1>] smp_thermal_interrupt+0x21/0x40
+[<ffffffff8169415d>] thermal_interrupt+0x6d/0x80
+
+Let's defer the work to a kthread.
+
+Signed-off-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
+[bigeasy: reoder init/denit position. TODO: flush swork on exit]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/thermal/x86_pkg_temp_thermal.c |   52 +++++++++++++++++++++++++++++++--
+ 1 file changed, 49 insertions(+), 3 deletions(-)
+
+--- 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>
+ #include <linux/debugfs.h>
++#include <linux/swork.h>
+ #include <asm/cpu_device_id.h>
+ #include <asm/mce.h>
+ 
+@@ -329,7 +330,7 @@ static void pkg_thermal_schedule_work(in
+ 	schedule_delayed_work_on(cpu, work, ms);
+ }
+ 
+-static int pkg_thermal_notify(u64 msr_val)
++static void pkg_thermal_notify_work(struct swork_event *event)
+ {
+ 	int cpu = smp_processor_id();
+ 	struct pkg_device *pkgdev;
+@@ -348,9 +349,47 @@ static int pkg_thermal_notify(u64 msr_va
+ 	}
+ 
+ 	spin_unlock_irqrestore(&pkg_temp_lock, flags);
++}
++
++#ifdef CONFIG_PREEMPT_RT_FULL
++static struct swork_event notify_work;
++
++static int pkg_thermal_notify_work_init(void)
++{
++	int err;
++
++	err = swork_get();
++	if (err)
++		return err;
++
++	INIT_SWORK(&notify_work, pkg_thermal_notify_work);
+ 	return 0;
+ }
+ 
++static void pkg_thermal_notify_work_cleanup(void)
++{
++	swork_put();
++}
++
++static int pkg_thermal_notify(u64 msr_val)
++{
++	swork_queue(&notify_work);
++	return 0;
++}
++
++#else  /* !CONFIG_PREEMPT_RT_FULL */
++
++static int pkg_thermal_notify_work_init(void) { return 0; }
++
++static void pkg_thermal_notify_work_cleanup(void) {  }
++
++static int pkg_thermal_notify(u64 msr_val)
++{
++	pkg_thermal_notify_work(NULL);
++	return 0;
++}
++#endif /* CONFIG_PREEMPT_RT_FULL */
++
+ static int pkg_temp_thermal_device_add(unsigned int cpu)
+ {
+ 	int pkgid = topology_logical_package_id(cpu);
+@@ -515,10 +554,15 @@ static int __init pkg_temp_thermal_init(
+ 	if (!x86_match_cpu(pkg_temp_thermal_ids))
+ 		return -ENODEV;
+ 
++	if (!pkg_thermal_notify_work_init())
++		return -ENODEV;
++
+ 	max_packages = topology_max_packages();
+ 	packages = kzalloc(max_packages * sizeof(struct pkg_device *), GFP_KERNEL);
+-	if (!packages)
+-		return -ENOMEM;
++	if (!packages) {
++		ret = -ENOMEM;
++		goto err;
++	}
+ 
+ 	ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "thermal/x86_pkg:online",
+ 				pkg_thermal_cpu_online,	pkg_thermal_cpu_offline);
+@@ -536,6 +580,7 @@ static int __init pkg_temp_thermal_init(
+ 	return 0;
+ 
+ err:
++	pkg_thermal_notify_work_cleanup();
+ 	kfree(packages);
+ 	return ret;
+ }
+@@ -549,6 +594,7 @@ static void __exit pkg_temp_thermal_exit
+ 	cpuhp_remove_state(pkg_thermal_hp_state);
+ 	debugfs_remove_recursive(debugfs);
+ 	kfree(packages);
++	pkg_thermal_notify_work_cleanup();
+ }
+ module_exit(pkg_temp_thermal_exit)
+ 
diff --git a/kernel/patches-4.14.x-rt/0271-epoll-use-get-cpu-light.patch b/kernel/patches-4.14.x-rt/0271-epoll-use-get-cpu-light.patch
new file mode 100644
index 000000000..7dfa6c5b3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0271-epoll-use-get-cpu-light.patch
@@ -0,0 +1,30 @@
+Subject: fs/epoll: Do not disable preemption on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 08 Jul 2011 16:35:35 +0200
+
+ep_call_nested() takes a sleeping lock so we can't disable preemption.
+The light version is enough since ep_call_nested() doesn't mind beeing
+invoked twice on the same CPU.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ fs/eventpoll.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/fs/eventpoll.c
++++ b/fs/eventpoll.c
+@@ -587,12 +587,12 @@ static int ep_poll_wakeup_proc(void *pri
+  */
+ static void ep_poll_safewake(wait_queue_head_t *wq)
+ {
+-	int this_cpu = get_cpu();
++	int this_cpu = get_cpu_light();
+ 
+ 	ep_call_nested(&poll_safewake_ncalls, EP_MAX_NESTS,
+ 		       ep_poll_wakeup_proc, NULL, wq, (void *) (long) this_cpu);
+ 
+-	put_cpu();
++	put_cpu_light();
+ }
+ 
+ static void ep_remove_wait_queue(struct eppoll_entry *pwq)
diff --git a/kernel/patches-4.14.x-rt/0272-mm-vmalloc-use-get-cpu-light.patch b/kernel/patches-4.14.x-rt/0272-mm-vmalloc-use-get-cpu-light.patch
new file mode 100644
index 000000000..0690a5e46
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0272-mm-vmalloc-use-get-cpu-light.patch
@@ -0,0 +1,65 @@
+Subject: mm/vmalloc: Another preempt disable region which sucks
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 12 Jul 2011 11:39:36 +0200
+
+Avoid the preempt disable version of get_cpu_var(). The inner-lock should
+provide enough serialisation.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ mm/vmalloc.c |   13 ++++++++-----
+ 1 file changed, 8 insertions(+), 5 deletions(-)
+
+--- a/mm/vmalloc.c
++++ b/mm/vmalloc.c
+@@ -865,7 +865,7 @@ static void *new_vmap_block(unsigned int
+ 	struct vmap_block *vb;
+ 	struct vmap_area *va;
+ 	unsigned long vb_idx;
+-	int node, err;
++	int node, err, cpu;
+ 	void *vaddr;
+ 
+ 	node = numa_node_id();
+@@ -908,11 +908,12 @@ static void *new_vmap_block(unsigned int
+ 	BUG_ON(err);
+ 	radix_tree_preload_end();
+ 
+-	vbq = &get_cpu_var(vmap_block_queue);
++	cpu = get_cpu_light();
++	vbq = this_cpu_ptr(&vmap_block_queue);
+ 	spin_lock(&vbq->lock);
+ 	list_add_tail_rcu(&vb->free_list, &vbq->free);
+ 	spin_unlock(&vbq->lock);
+-	put_cpu_var(vmap_block_queue);
++	put_cpu_light();
+ 
+ 	return vaddr;
+ }
+@@ -981,6 +982,7 @@ static void *vb_alloc(unsigned long size
+ 	struct vmap_block *vb;
+ 	void *vaddr = NULL;
+ 	unsigned int order;
++	int cpu;
+ 
+ 	BUG_ON(offset_in_page(size));
+ 	BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
+@@ -995,7 +997,8 @@ static void *vb_alloc(unsigned long size
+ 	order = get_order(size);
+ 
+ 	rcu_read_lock();
+-	vbq = &get_cpu_var(vmap_block_queue);
++	cpu = get_cpu_light();
++	vbq = this_cpu_ptr(&vmap_block_queue);
+ 	list_for_each_entry_rcu(vb, &vbq->free, free_list) {
+ 		unsigned long pages_off;
+ 
+@@ -1018,7 +1021,7 @@ static void *vb_alloc(unsigned long size
+ 		break;
+ 	}
+ 
+-	put_cpu_var(vmap_block_queue);
++	put_cpu_light();
+ 	rcu_read_unlock();
+ 
+ 	/* Allocate new block if nothing was found */
diff --git a/kernel/patches-4.14.x-rt/0273-block-mq-use-cpu_light.patch b/kernel/patches-4.14.x-rt/0273-block-mq-use-cpu_light.patch
new file mode 100644
index 000000000..6c14c233f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0273-block-mq-use-cpu_light.patch
@@ -0,0 +1,29 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 9 Apr 2014 10:37:23 +0200
+Subject: block: mq: use cpu_light()
+
+there is a might sleep splat because get_cpu() disables preemption and
+later we grab a lock. As a workaround for this we use get_cpu_light().
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ block/blk-mq.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/block/blk-mq.h
++++ b/block/blk-mq.h
+@@ -98,12 +98,12 @@ static inline struct blk_mq_ctx *__blk_m
+  */
+ static inline struct blk_mq_ctx *blk_mq_get_ctx(struct request_queue *q)
+ {
+-	return __blk_mq_get_ctx(q, get_cpu());
++	return __blk_mq_get_ctx(q, get_cpu_light());
+ }
+ 
+ static inline void blk_mq_put_ctx(struct blk_mq_ctx *ctx)
+ {
+-	put_cpu();
++	put_cpu_light();
+ }
+ 
+ struct blk_mq_alloc_data {
diff --git a/kernel/patches-4.14.x-rt/0274-block-mq-drop-preempt-disable.patch b/kernel/patches-4.14.x-rt/0274-block-mq-drop-preempt-disable.patch
new file mode 100644
index 000000000..9510f6363
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0274-block-mq-drop-preempt-disable.patch
@@ -0,0 +1,51 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 14 Jul 2015 14:26:34 +0200
+Subject: block/mq: do not invoke preempt_disable()
+
+preempt_disable() and get_cpu() don't play well together with the sleeping
+locks it tries to allocate later.
+It seems to be enough to replace it with get_cpu_light() and migrate_disable().
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ block/blk-mq.c |   10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+--- a/block/blk-mq.c
++++ b/block/blk-mq.c
+@@ -537,7 +537,7 @@ static void __blk_mq_complete_request(st
+ 		return;
+ 	}
+ 
+-	cpu = get_cpu();
++	cpu = get_cpu_light();
+ 	if (!test_bit(QUEUE_FLAG_SAME_FORCE, &rq->q->queue_flags))
+ 		shared = cpus_share_cache(cpu, ctx->cpu);
+ 
+@@ -549,7 +549,7 @@ static void __blk_mq_complete_request(st
+ 	} else {
+ 		rq->q->softirq_done_fn(rq);
+ 	}
+-	put_cpu();
++	put_cpu_light();
+ }
+ 
+ /**
+@@ -1197,14 +1197,14 @@ static void __blk_mq_delay_run_hw_queue(
+ 		return;
+ 
+ 	if (!async && !(hctx->flags & BLK_MQ_F_BLOCKING)) {
+-		int cpu = get_cpu();
++		int cpu = get_cpu_light();
+ 		if (cpumask_test_cpu(cpu, hctx->cpumask)) {
+ 			__blk_mq_run_hw_queue(hctx);
+-			put_cpu();
++			put_cpu_light();
+ 			return;
+ 		}
+ 
+-		put_cpu();
++		put_cpu_light();
+ 	}
+ 
+ 	kblockd_schedule_delayed_work_on(blk_mq_hctx_next_cpu(hctx),
diff --git a/kernel/patches-4.14.x-rt/0275-block-mq-don-t-complete-requests-via-IPI.patch b/kernel/patches-4.14.x-rt/0275-block-mq-don-t-complete-requests-via-IPI.patch
new file mode 100644
index 000000000..972154802
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0275-block-mq-don-t-complete-requests-via-IPI.patch
@@ -0,0 +1,106 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 29 Jan 2015 15:10:08 +0100
+Subject: block/mq: don't complete requests via IPI
+
+The IPI runs in hardirq context and there are sleeping locks. This patch
+moves the completion into a workqueue.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ block/blk-core.c       |    3 +++
+ block/blk-mq.c         |   23 +++++++++++++++++++++++
+ include/linux/blk-mq.h |    2 +-
+ include/linux/blkdev.h |    3 +++
+ 4 files changed, 30 insertions(+), 1 deletion(-)
+
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -116,6 +116,9 @@ void blk_rq_init(struct request_queue *q
+ 
+ 	INIT_LIST_HEAD(&rq->queuelist);
+ 	INIT_LIST_HEAD(&rq->timeout_list);
++#ifdef CONFIG_PREEMPT_RT_FULL
++	INIT_WORK(&rq->work, __blk_mq_complete_request_remote_work);
++#endif
+ 	rq->cpu = -1;
+ 	rq->q = q;
+ 	rq->__sector = (sector_t) -1;
+--- a/block/blk-mq.c
++++ b/block/blk-mq.c
+@@ -318,6 +318,9 @@ static struct request *blk_mq_rq_ctx_ini
+ 	/* tag was already set */
+ 	rq->extra_len = 0;
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++	INIT_WORK(&rq->work, __blk_mq_complete_request_remote_work);
++#endif
+ 	INIT_LIST_HEAD(&rq->timeout_list);
+ 	rq->timeout = 0;
+ 
+@@ -512,12 +515,24 @@ void blk_mq_end_request(struct request *
+ }
+ EXPORT_SYMBOL(blk_mq_end_request);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++
++void __blk_mq_complete_request_remote_work(struct work_struct *work)
++{
++	struct request *rq = container_of(work, struct request, work);
++
++	rq->q->softirq_done_fn(rq);
++}
++
++#else
++
+ static void __blk_mq_complete_request_remote(void *data)
+ {
+ 	struct request *rq = data;
+ 
+ 	rq->q->softirq_done_fn(rq);
+ }
++#endif
+ 
+ static void __blk_mq_complete_request(struct request *rq)
+ {
+@@ -542,10 +557,18 @@ static void __blk_mq_complete_request(st
+ 		shared = cpus_share_cache(cpu, ctx->cpu);
+ 
+ 	if (cpu != ctx->cpu && !shared && cpu_online(ctx->cpu)) {
++#ifdef CONFIG_PREEMPT_RT_FULL
++		/*
++		 * We could force QUEUE_FLAG_SAME_FORCE then we would not get in
++		 * here. But we could try to invoke it one the CPU like this.
++		 */
++		schedule_work_on(ctx->cpu, &rq->work);
++#else
+ 		rq->csd.func = __blk_mq_complete_request_remote;
+ 		rq->csd.info = rq;
+ 		rq->csd.flags = 0;
+ 		smp_call_function_single_async(ctx->cpu, &rq->csd);
++#endif
+ 	} else {
+ 		rq->q->softirq_done_fn(rq);
+ 	}
+--- a/include/linux/blk-mq.h
++++ b/include/linux/blk-mq.h
+@@ -226,7 +226,7 @@ static inline u16 blk_mq_unique_tag_to_t
+ 	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, blk_status_t error);
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -134,6 +134,9 @@ typedef __u32 __bitwise req_flags_t;
+  */
+ struct request {
+ 	struct list_head queuelist;
++#ifdef CONFIG_PREEMPT_RT_FULL
++	struct work_struct work;
++#endif
+ 	union {
+ 		struct __call_single_data csd;
+ 		u64 fifo_time;
diff --git a/kernel/patches-4.14.x-rt/0276-md-raid5-percpu-handling-rt-aware.patch b/kernel/patches-4.14.x-rt/0276-md-raid5-percpu-handling-rt-aware.patch
new file mode 100644
index 000000000..c6b65b27a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0276-md-raid5-percpu-handling-rt-aware.patch
@@ -0,0 +1,69 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 6 Apr 2010 16:51:31 +0200
+Subject: md: raid5: Make raid5_percpu handling RT aware
+
+__raid_run_ops() disables preemption with get_cpu() around the access
+to the raid5_percpu variables. That causes scheduling while atomic
+spews on RT.
+
+Serialize the access to the percpu data with a lock and keep the code
+preemptible.
+
+Reported-by: Udo van den Heuvel <udovdh@xs4all.nl>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Udo van den Heuvel <udovdh@xs4all.nl>
+
+---
+ drivers/md/raid5.c |    8 +++++---
+ drivers/md/raid5.h |    1 +
+ 2 files changed, 6 insertions(+), 3 deletions(-)
+
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -2067,8 +2067,9 @@ static void raid_run_ops(struct stripe_h
+ 	struct raid5_percpu *percpu;
+ 	unsigned long cpu;
+ 
+-	cpu = get_cpu();
++	cpu = get_cpu_light();
+ 	percpu = per_cpu_ptr(conf->percpu, cpu);
++	spin_lock(&percpu->lock);
+ 	if (test_bit(STRIPE_OP_BIOFILL, &ops_request)) {
+ 		ops_run_biofill(sh);
+ 		overlap_clear++;
+@@ -2127,7 +2128,8 @@ static void raid_run_ops(struct stripe_h
+ 			if (test_and_clear_bit(R5_Overlap, &dev->flags))
+ 				wake_up(&sh->raid_conf->wait_for_overlap);
+ 		}
+-	put_cpu();
++	spin_unlock(&percpu->lock);
++	put_cpu_light();
+ }
+ 
+ static void free_stripe(struct kmem_cache *sc, struct stripe_head *sh)
+@@ -6796,6 +6798,7 @@ static int raid456_cpu_up_prepare(unsign
+ 			__func__, cpu);
+ 		return -ENOMEM;
+ 	}
++	spin_lock_init(&per_cpu_ptr(conf->percpu, cpu)->lock);
+ 	return 0;
+ }
+ 
+@@ -6806,7 +6809,6 @@ static int raid5_alloc_percpu(struct r5c
+ 	conf->percpu = alloc_percpu(struct raid5_percpu);
+ 	if (!conf->percpu)
+ 		return -ENOMEM;
+-
+ 	err = cpuhp_state_add_instance(CPUHP_MD_RAID5_PREPARE, &conf->node);
+ 	if (!err) {
+ 		conf->scribble_disks = max(conf->raid_disks,
+--- a/drivers/md/raid5.h
++++ b/drivers/md/raid5.h
+@@ -624,6 +624,7 @@ struct r5conf {
+ 	int			recovery_disabled;
+ 	/* per cpu variables */
+ 	struct raid5_percpu {
++		spinlock_t	lock;		/* Protection for -RT */
+ 		struct page	*spare_page; /* Used when checking P/Q in raid6 */
+ 		struct flex_array *scribble;   /* space for constructing buffer
+ 					      * lists and performing address
diff --git a/kernel/patches-4.14.x-rt/0277-md-raid5-do-not-disable-interrupts.patch b/kernel/patches-4.14.x-rt/0277-md-raid5-do-not-disable-interrupts.patch
new file mode 100644
index 000000000..79464e43c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0277-md-raid5-do-not-disable-interrupts.patch
@@ -0,0 +1,54 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 17 Nov 2017 16:21:00 +0100
+Subject: [PATCH] md/raid5: do not disable interrupts
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:974
+|in_atomic(): 0, irqs_disabled(): 1, pid: 2992, name: lvm
+|CPU: 2 PID: 2992 Comm: lvm Not tainted 4.13.10-rt3+ #54
+|Call Trace:
+| dump_stack+0x4f/0x65
+| ___might_sleep+0xfc/0x150
+| atomic_dec_and_spin_lock+0x3c/0x80
+| raid5_release_stripe+0x73/0x110
+| grow_one_stripe+0xce/0xf0
+| setup_conf+0x841/0xaa0
+| raid5_run+0x7e7/0xa40
+| md_run+0x515/0xaf0
+| raid_ctr+0x147d/0x25e0
+| dm_table_add_target+0x155/0x320
+| table_load+0x103/0x320
+| ctl_ioctl+0x1d9/0x510
+| dm_ctl_ioctl+0x9/0x10
+| do_vfs_ioctl+0x8e/0x670
+| SyS_ioctl+0x3c/0x70
+| entry_SYSCALL_64_fastpath+0x17/0x98
+
+The interrupts were disabled because ->device_lock is taken with
+interrupts disabled.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/md/raid5.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/md/raid5.c
++++ b/drivers/md/raid5.c
+@@ -410,7 +410,7 @@ void raid5_release_stripe(struct stripe_
+ 		md_wakeup_thread(conf->mddev->thread);
+ 	return;
+ slow_path:
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	/* we are ok here if STRIPE_ON_RELEASE_LIST is set or not */
+ 	if (atomic_dec_and_lock(&sh->count, &conf->device_lock)) {
+ 		INIT_LIST_HEAD(&list);
+@@ -419,7 +419,7 @@ void raid5_release_stripe(struct stripe_
+ 		spin_unlock(&conf->device_lock);
+ 		release_inactive_stripe_list(conf, &list, hash);
+ 	}
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ }
+ 
+ static inline void remove_hash(struct stripe_head *sh)
diff --git a/kernel/patches-4.14.x-rt/0278-rt-introduce-cpu-chill.patch b/kernel/patches-4.14.x-rt/0278-rt-introduce-cpu-chill.patch
new file mode 100644
index 000000000..078f933f6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0278-rt-introduce-cpu-chill.patch
@@ -0,0 +1,128 @@
+Subject: rt: Introduce cpu_chill()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 07 Mar 2012 20:51:03 +0100
+
+Retry loops on RT might loop forever when the modifying side was
+preempted. Add cpu_chill() to replace cpu_relax(). cpu_chill()
+defaults to cpu_relax() for non RT. On RT it puts the looping task to
+sleep for a tick so the preempted task can make progress.
+
+Steven Rostedt changed it to use a hrtimer instead of msleep():
+|
+|Ulrich Obergfell pointed out that cpu_chill() calls msleep() which is woken
+|up by the ksoftirqd running the TIMER softirq. But as the cpu_chill() is
+|called from softirq context, it may block the ksoftirqd() from running, in
+|which case, it may never wake up the msleep() causing the deadlock.
+|
+|I checked the vmcore, and irq/74-qla2xxx is stuck in the msleep() call,
+|running on CPU 8. The one ksoftirqd that is stuck, happens to be the one that
+|runs on CPU 8, and it is blocked on a lock held by irq/74-qla2xxx. As that
+|ksoftirqd is the one that will wake up irq/74-qla2xxx, and it happens to be
+|blocked on a lock that irq/74-qla2xxx holds, we have our deadlock.
+|
+|The solution is not to convert the cpu_chill() back to a cpu_relax() as that
+|will re-create a possible live lock that the cpu_chill() fixed earlier, and may
+|also leave this bug open on other softirqs. The fix is to remove the
+|dependency on ksoftirqd from cpu_chill(). That is, instead of calling
+|msleep() that requires ksoftirqd to wake it up, use the
+|hrtimer_nanosleep() code that does the wakeup from hard irq context.
+|
+||Looks to be the lock of the block softirq. I don't have the core dump
+||anymore, but from what I could tell the ksoftirqd was blocked on the
+||block softirq lock, where the block softirq handler did a msleep
+||(called by the qla2xxx interrupt handler).
+||
+||Looking at trigger_softirq() in block/blk-softirq.c, it can do a
+||smp_callfunction() to another cpu to run the block softirq. If that
+||happens to be the cpu where the qla2xx irq handler is doing the block
+||softirq and is in a middle of a msleep(), I believe the ksoftirqd will
+||try to run the softirq. If it does that, then BOOM, it's deadlocked
+||because the ksoftirqd will never run the timer softirq either.
+|
+||I should have also stated that it was only one lock that was involved.
+||But the lock owner was doing a msleep() that requires a wakeup by
+||ksoftirqd to continue. If ksoftirqd happens to be blocked on a lock
+||held by the msleep() caller, then you have your deadlock.
+||
+||It's best not to have any softirqs going to sleep requiring another
+||softirq to wake it up. Note, if we ever require a timer softirq to do a
+||cpu_chill() it will most definitely hit this deadlock.
+
++ bigeasy: add PF_NOFREEZE:
+| [....] Waiting for /dev to be fully populated...
+| =====================================
+| [ BUG: udevd/229 still has locks held! ]
+| 3.12.11-rt17 #23 Not tainted
+| -------------------------------------
+| 1 lock held by udevd/229:
+|  #0:  (&type->i_mutex_dir_key#2){+.+.+.}, at: lookup_slow+0x28/0x98
+|
+| stack backtrace:
+| CPU: 0 PID: 229 Comm: udevd Not tainted 3.12.11-rt17 #23
+| (unwind_backtrace+0x0/0xf8) from (show_stack+0x10/0x14)
+| (show_stack+0x10/0x14) from (dump_stack+0x74/0xbc)
+| (dump_stack+0x74/0xbc) from (do_nanosleep+0x120/0x160)
+| (do_nanosleep+0x120/0x160) from (hrtimer_nanosleep+0x90/0x110)
+| (hrtimer_nanosleep+0x90/0x110) from (cpu_chill+0x30/0x38)
+| (cpu_chill+0x30/0x38) from (dentry_kill+0x158/0x1ec)
+| (dentry_kill+0x158/0x1ec) from (dput+0x74/0x15c)
+| (dput+0x74/0x15c) from (lookup_real+0x4c/0x50)
+| (lookup_real+0x4c/0x50) from (__lookup_hash+0x34/0x44)
+| (__lookup_hash+0x34/0x44) from (lookup_slow+0x38/0x98)
+| (lookup_slow+0x38/0x98) from (path_lookupat+0x208/0x7fc)
+| (path_lookupat+0x208/0x7fc) from (filename_lookup+0x20/0x60)
+| (filename_lookup+0x20/0x60) from (user_path_at_empty+0x50/0x7c)
+| (user_path_at_empty+0x50/0x7c) from (user_path_at+0x14/0x1c)
+| (user_path_at+0x14/0x1c) from (vfs_fstatat+0x48/0x94)
+| (vfs_fstatat+0x48/0x94) from (SyS_stat64+0x14/0x30)
+| (SyS_stat64+0x14/0x30) from (ret_fast_syscall+0x0/0x48)
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/delay.h |    6 ++++++
+ kernel/time/hrtimer.c |   19 +++++++++++++++++++
+ 2 files changed, 25 insertions(+)
+
+--- a/include/linux/delay.h
++++ b/include/linux/delay.h
+@@ -64,4 +64,10 @@ static inline void ssleep(unsigned int s
+ 	msleep(seconds * 1000);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++extern void cpu_chill(void);
++#else
++# define cpu_chill()	cpu_relax()
++#endif
++
+ #endif /* defined(_LINUX_DELAY_H) */
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1858,6 +1858,25 @@ COMPAT_SYSCALL_DEFINE2(nanosleep, struct
+ }
+ #endif
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++/*
++ * Sleep for 1 ms in hope whoever holds what we want will let it go.
++ */
++void cpu_chill(void)
++{
++	struct timespec64 tu = {
++		.tv_nsec = NSEC_PER_MSEC,
++	};
++	unsigned int freeze_flag = current->flags & PF_NOFREEZE;
++
++	current->flags |= PF_NOFREEZE;
++	hrtimer_nanosleep(&tu, HRTIMER_MODE_REL_HARD, CLOCK_MONOTONIC);
++	if (!freeze_flag)
++		current->flags &= ~PF_NOFREEZE;
++}
++EXPORT_SYMBOL(cpu_chill);
++#endif
++
+ /*
+  * Functions related to boot-time initialization:
+  */
diff --git a/kernel/patches-4.14.x-rt/0279-cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch b/kernel/patches-4.14.x-rt/0279-cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
new file mode 100644
index 000000000..bd71d8051
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0279-cpu_chill-Add-a-UNINTERRUPTIBLE-hrtimer_nanosleep.patch
@@ -0,0 +1,102 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Tue, 4 Mar 2014 12:28:32 -0500
+Subject: cpu_chill: Add a UNINTERRUPTIBLE hrtimer_nanosleep
+
+We hit another bug that was caused by switching cpu_chill() from
+msleep() to hrtimer_nanosleep().
+
+This time it is a livelock. The problem is that hrtimer_nanosleep()
+calls schedule with the state == TASK_INTERRUPTIBLE. But these means
+that if a signal is pending, the scheduler wont schedule, and will
+simply change the current task state back to TASK_RUNNING. This
+nullifies the whole point of cpu_chill() in the first place. That is,
+if a task is spinning on a try_lock() and it preempted the owner of the
+lock, if it has a signal pending, it will never give up the CPU to let
+the owner of the lock run.
+
+I made a static function __hrtimer_nanosleep() that takes a fifth
+parameter "state", which determines the task state of that the
+nanosleep() will be in. The normal hrtimer_nanosleep() will act the
+same, but cpu_chill() will call the __hrtimer_nanosleep() directly with
+the TASK_UNINTERRUPTIBLE state.
+
+cpu_chill() only cares that the first sleep happens, and does not care
+about the state of the restart schedule (in hrtimer_nanosleep_restart).
+
+
+Reported-by: Ulrich Obergfell <uobergfe@redhat.com>
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/hrtimer.c |   24 +++++++++++++++++-------
+ 1 file changed, 17 insertions(+), 7 deletions(-)
+
+--- a/kernel/time/hrtimer.c
++++ b/kernel/time/hrtimer.c
+@@ -1742,12 +1742,13 @@ int nanosleep_copyout(struct restart_blo
+ 	return -ERESTART_RESTARTBLOCK;
+ }
+ 
+-static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode)
++static int __sched do_nanosleep(struct hrtimer_sleeper *t, enum hrtimer_mode mode,
++				unsigned long state)
+ {
+ 	struct restart_block *restart;
+ 
+ 	do {
+-		set_current_state(TASK_INTERRUPTIBLE);
++		set_current_state(state);
+ 		hrtimer_start_expires(&t->timer, mode);
+ 
+ 		if (likely(t->task))
+@@ -1785,13 +1786,15 @@ static long __sched hrtimer_nanosleep_re
+ 	hrtimer_init_sleeper_on_stack(&t, restart->nanosleep.clockid,
+ 				      HRTIMER_MODE_ABS, current);
+ 	hrtimer_set_expires_tv64(&t.timer, restart->nanosleep.expires);
+-	ret = do_nanosleep(&t, HRTIMER_MODE_ABS);
++	/* cpu_chill() does not care about restart state. */
++	ret = do_nanosleep(&t, HRTIMER_MODE_ABS, TASK_INTERRUPTIBLE);
+ 	destroy_hrtimer_on_stack(&t.timer);
+ 	return ret;
+ }
+ 
+-long hrtimer_nanosleep(const struct timespec64 *rqtp,
+-		       const enum hrtimer_mode mode, const clockid_t clockid)
++static long __hrtimer_nanosleep(const struct timespec64 *rqtp,
++				const enum hrtimer_mode mode, const clockid_t clockid,
++				unsigned long state)
+ {
+ 	struct restart_block *restart;
+ 	struct hrtimer_sleeper t;
+@@ -1804,7 +1807,7 @@ long hrtimer_nanosleep(const struct time
+ 
+ 	hrtimer_init_sleeper_on_stack(&t, clockid, mode, current);
+ 	hrtimer_set_expires_range_ns(&t.timer, timespec64_to_ktime(*rqtp), slack);
+-	ret = do_nanosleep(&t, mode);
++	ret = do_nanosleep(&t, mode, state);
+ 	if (ret != -ERESTART_RESTARTBLOCK)
+ 		goto out;
+ 
+@@ -1823,6 +1826,12 @@ long hrtimer_nanosleep(const struct time
+ 	return ret;
+ }
+ 
++long hrtimer_nanosleep(const struct timespec64 *rqtp,
++		       const enum hrtimer_mode mode, const clockid_t clockid)
++{
++	return __hrtimer_nanosleep(rqtp, mode, clockid, TASK_INTERRUPTIBLE);
++}
++
+ SYSCALL_DEFINE2(nanosleep, struct timespec __user *, rqtp,
+ 		struct timespec __user *, rmtp)
+ {
+@@ -1870,7 +1879,8 @@ void cpu_chill(void)
+ 	unsigned int freeze_flag = current->flags & PF_NOFREEZE;
+ 
+ 	current->flags |= PF_NOFREEZE;
+-	hrtimer_nanosleep(&tu, HRTIMER_MODE_REL_HARD, CLOCK_MONOTONIC);
++	__hrtimer_nanosleep(&tu, HRTIMER_MODE_REL_HARD, CLOCK_MONOTONIC,
++			    TASK_UNINTERRUPTIBLE);
+ 	if (!freeze_flag)
+ 		current->flags &= ~PF_NOFREEZE;
+ }
diff --git a/kernel/patches-4.14.x-rt/0280-block-blk-mq-use-swait.patch b/kernel/patches-4.14.x-rt/0280-block-blk-mq-use-swait.patch
new file mode 100644
index 000000000..50602b10d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0280-block-blk-mq-use-swait.patch
@@ -0,0 +1,122 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 13 Feb 2015 11:01:26 +0100
+Subject: block: blk-mq: Use swait
+
+| BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:914
+| in_atomic(): 1, irqs_disabled(): 0, pid: 255, name: kworker/u257:6
+| 5 locks held by kworker/u257:6/255:
+|  #0:  ("events_unbound"){.+.+.+}, at: [<ffffffff8108edf1>] process_one_work+0x171/0x5e0
+|  #1:  ((&entry->work)){+.+.+.}, at: [<ffffffff8108edf1>] process_one_work+0x171/0x5e0
+|  #2:  (&shost->scan_mutex){+.+.+.}, at: [<ffffffffa000faa3>] __scsi_add_device+0xa3/0x130 [scsi_mod]
+|  #3:  (&set->tag_list_lock){+.+...}, at: [<ffffffff812f09fa>] blk_mq_init_queue+0x96a/0xa50
+|  #4:  (rcu_read_lock_sched){......}, at: [<ffffffff8132887d>] percpu_ref_kill_and_confirm+0x1d/0x120
+| Preemption disabled at:[<ffffffff812eff76>] blk_mq_freeze_queue_start+0x56/0x70
+|
+| CPU: 2 PID: 255 Comm: kworker/u257:6 Not tainted 3.18.7-rt0+ #1
+| Workqueue: events_unbound async_run_entry_fn
+|  0000000000000003 ffff8800bc29f998 ffffffff815b3a12 0000000000000000
+|  0000000000000000 ffff8800bc29f9b8 ffffffff8109aa16 ffff8800bc29fa28
+|  ffff8800bc5d1bc8 ffff8800bc29f9e8 ffffffff815b8dd4 ffff880000000000
+| Call Trace:
+|  [<ffffffff815b3a12>] dump_stack+0x4f/0x7c
+|  [<ffffffff8109aa16>] __might_sleep+0x116/0x190
+|  [<ffffffff815b8dd4>] rt_spin_lock+0x24/0x60
+|  [<ffffffff810b6089>] __wake_up+0x29/0x60
+|  [<ffffffff812ee06e>] blk_mq_usage_counter_release+0x1e/0x20
+|  [<ffffffff81328966>] percpu_ref_kill_and_confirm+0x106/0x120
+|  [<ffffffff812eff76>] blk_mq_freeze_queue_start+0x56/0x70
+|  [<ffffffff812f0000>] blk_mq_update_tag_set_depth+0x40/0xd0
+|  [<ffffffff812f0a1c>] blk_mq_init_queue+0x98c/0xa50
+|  [<ffffffffa000dcf0>] scsi_mq_alloc_queue+0x20/0x60 [scsi_mod]
+|  [<ffffffffa000ea35>] scsi_alloc_sdev+0x2f5/0x370 [scsi_mod]
+|  [<ffffffffa000f494>] scsi_probe_and_add_lun+0x9e4/0xdd0 [scsi_mod]
+|  [<ffffffffa000fb26>] __scsi_add_device+0x126/0x130 [scsi_mod]
+|  [<ffffffffa013033f>] ata_scsi_scan_host+0xaf/0x200 [libata]
+|  [<ffffffffa012b5b6>] async_port_probe+0x46/0x60 [libata]
+|  [<ffffffff810978fb>] async_run_entry_fn+0x3b/0xf0
+|  [<ffffffff8108ee81>] process_one_work+0x201/0x5e0
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ block/blk-core.c       |    6 +++---
+ block/blk-mq.c         |    8 ++++----
+ include/linux/blkdev.h |    2 +-
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+--- a/block/blk-core.c
++++ b/block/blk-core.c
+@@ -785,7 +785,7 @@ int blk_queue_enter(struct request_queue
+ 		 */
+ 		smp_rmb();
+ 
+-		ret = wait_event_interruptible(q->mq_freeze_wq,
++		ret = swait_event_interruptible(q->mq_freeze_wq,
+ 				!atomic_read(&q->mq_freeze_depth) ||
+ 				blk_queue_dying(q));
+ 		if (blk_queue_dying(q))
+@@ -805,7 +805,7 @@ static void blk_queue_usage_counter_rele
+ 	struct request_queue *q =
+ 		container_of(ref, struct request_queue, q_usage_counter);
+ 
+-	wake_up_all(&q->mq_freeze_wq);
++	swake_up_all(&q->mq_freeze_wq);
+ }
+ 
+ static void blk_rq_timed_out_timer(unsigned long data)
+@@ -881,7 +881,7 @@ struct request_queue *blk_alloc_queue_no
+ 	q->bypass_depth = 1;
+ 	__set_bit(QUEUE_FLAG_BYPASS, &q->queue_flags);
+ 
+-	init_waitqueue_head(&q->mq_freeze_wq);
++	init_swait_queue_head(&q->mq_freeze_wq);
+ 
+ 	/*
+ 	 * Init percpu_ref in atomic mode so that it's faster to shutdown.
+--- a/block/blk-mq.c
++++ b/block/blk-mq.c
+@@ -132,14 +132,14 @@ EXPORT_SYMBOL_GPL(blk_freeze_queue_start
+ 
+ void blk_mq_freeze_queue_wait(struct request_queue *q)
+ {
+-	wait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
++	swait_event(q->mq_freeze_wq, percpu_ref_is_zero(&q->q_usage_counter));
+ }
+ EXPORT_SYMBOL_GPL(blk_mq_freeze_queue_wait);
+ 
+ int blk_mq_freeze_queue_wait_timeout(struct request_queue *q,
+ 				     unsigned long timeout)
+ {
+-	return wait_event_timeout(q->mq_freeze_wq,
++	return swait_event_timeout(q->mq_freeze_wq,
+ 					percpu_ref_is_zero(&q->q_usage_counter),
+ 					timeout);
+ }
+@@ -180,7 +180,7 @@ void blk_mq_unfreeze_queue(struct reques
+ 	WARN_ON_ONCE(freeze_depth < 0);
+ 	if (!freeze_depth) {
+ 		percpu_ref_reinit(&q->q_usage_counter);
+-		wake_up_all(&q->mq_freeze_wq);
++		swake_up_all(&q->mq_freeze_wq);
+ 	}
+ }
+ EXPORT_SYMBOL_GPL(blk_mq_unfreeze_queue);
+@@ -261,7 +261,7 @@ void blk_mq_wake_waiters(struct request_
+ 	 * dying, we need to ensure that processes currently waiting on
+ 	 * the queue are notified as well.
+ 	 */
+-	wake_up_all(&q->mq_freeze_wq);
++	swake_up_all(&q->mq_freeze_wq);
+ }
+ 
+ bool blk_mq_can_queue(struct blk_mq_hw_ctx *hctx)
+--- a/include/linux/blkdev.h
++++ b/include/linux/blkdev.h
+@@ -598,7 +598,7 @@ struct request_queue {
+ 	struct throtl_data *td;
+ #endif
+ 	struct rcu_head		rcu_head;
+-	wait_queue_head_t	mq_freeze_wq;
++	struct swait_queue_head	mq_freeze_wq;
+ 	struct percpu_ref	q_usage_counter;
+ 	struct list_head	all_q_node;
+ 
diff --git a/kernel/patches-4.14.x-rt/0281-block-use-cpu-chill.patch b/kernel/patches-4.14.x-rt/0281-block-use-cpu-chill.patch
new file mode 100644
index 000000000..83b2351bd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0281-block-use-cpu-chill.patch
@@ -0,0 +1,45 @@
+Subject: block: Use cpu_chill() for retry loops
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 20 Dec 2012 18:28:26 +0100
+
+Retry loops on RT might loop forever when the modifying side was
+preempted. Steven also observed a live lock when there was a
+concurrent priority boosting going on.
+
+Use cpu_chill() instead of cpu_relax() to let the system
+make progress.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ block/blk-ioc.c |    5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/block/blk-ioc.c
++++ b/block/blk-ioc.c
+@@ -9,6 +9,7 @@
+ #include <linux/blkdev.h>
+ #include <linux/slab.h>
+ #include <linux/sched/task.h>
++#include <linux/delay.h>
+ 
+ #include "blk.h"
+ 
+@@ -118,7 +119,7 @@ static void ioc_release_fn(struct work_s
+ 			spin_unlock(q->queue_lock);
+ 		} else {
+ 			spin_unlock_irqrestore(&ioc->lock, flags);
+-			cpu_relax();
++			cpu_chill();
+ 			spin_lock_irqsave_nested(&ioc->lock, flags, 1);
+ 		}
+ 	}
+@@ -202,7 +203,7 @@ void put_io_context_active(struct io_con
+ 				spin_unlock(icq->q->queue_lock);
+ 			} else {
+ 				spin_unlock_irqrestore(&ioc->lock, flags);
+-				cpu_relax();
++				cpu_chill();
+ 				goto retry;
+ 			}
+ 		}
diff --git a/kernel/patches-4.14.x-rt/0282-fs-dcache-use-cpu-chill-in-trylock-loops.patch b/kernel/patches-4.14.x-rt/0282-fs-dcache-use-cpu-chill-in-trylock-loops.patch
new file mode 100644
index 000000000..8f93cfbc8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0282-fs-dcache-use-cpu-chill-in-trylock-loops.patch
@@ -0,0 +1,107 @@
+Subject: fs: dcache: Use cpu_chill() in trylock loops
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 07 Mar 2012 21:00:34 +0100
+
+Retry loops on RT might loop forever when the modifying side was
+preempted. Use cpu_chill() instead of cpu_relax() to let the system
+make progress.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ fs/autofs4/autofs_i.h |    1 +
+ fs/autofs4/expire.c   |    2 +-
+ fs/dcache.c           |   20 ++++++++++++++++----
+ fs/namespace.c        |    3 ++-
+ 4 files changed, 20 insertions(+), 6 deletions(-)
+
+--- a/fs/autofs4/autofs_i.h
++++ b/fs/autofs4/autofs_i.h
+@@ -20,6 +20,7 @@
+ #include <linux/sched.h>
+ #include <linux/mount.h>
+ #include <linux/namei.h>
++#include <linux/delay.h>
+ #include <linux/uaccess.h>
+ #include <linux/mutex.h>
+ #include <linux/spinlock.h>
+--- a/fs/autofs4/expire.c
++++ b/fs/autofs4/expire.c
+@@ -148,7 +148,7 @@ static struct dentry *get_next_positive_
+ 			parent = p->d_parent;
+ 			if (!spin_trylock(&parent->d_lock)) {
+ 				spin_unlock(&p->d_lock);
+-				cpu_relax();
++				cpu_chill();
+ 				goto relock;
+ 			}
+ 			spin_unlock(&p->d_lock);
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -19,6 +19,7 @@
+ #include <linux/mm.h>
+ #include <linux/fs.h>
+ #include <linux/fsnotify.h>
++#include <linux/delay.h>
+ #include <linux/slab.h>
+ #include <linux/init.h>
+ #include <linux/hash.h>
+@@ -784,6 +785,8 @@ static inline bool fast_dput(struct dent
+  */
+ void dput(struct dentry *dentry)
+ {
++	struct dentry *parent;
++
+ 	if (unlikely(!dentry))
+ 		return;
+ 
+@@ -820,9 +823,18 @@ void dput(struct dentry *dentry)
+ 	return;
+ 
+ kill_it:
+-	dentry = dentry_kill(dentry);
+-	if (dentry) {
+-		cond_resched();
++	parent = dentry_kill(dentry);
++	if (parent) {
++		int r;
++
++		if (parent == dentry) {
++			/* the task with the highest priority won't schedule */
++			r = cond_resched();
++			if (!r)
++				cpu_chill();
++		} else {
++			dentry = parent;
++		}
+ 		goto repeat;
+ 	}
+ }
+@@ -2360,7 +2372,7 @@ void d_delete(struct dentry * dentry)
+ 	if (dentry->d_lockref.count == 1) {
+ 		if (!spin_trylock(&inode->i_lock)) {
+ 			spin_unlock(&dentry->d_lock);
+-			cpu_relax();
++			cpu_chill();
+ 			goto again;
+ 		}
+ 		dentry->d_flags &= ~DCACHE_CANT_MOUNT;
+--- a/fs/namespace.c
++++ b/fs/namespace.c
+@@ -14,6 +14,7 @@
+ #include <linux/mnt_namespace.h>
+ #include <linux/user_namespace.h>
+ #include <linux/namei.h>
++#include <linux/delay.h>
+ #include <linux/security.h>
+ #include <linux/cred.h>
+ #include <linux/idr.h>
+@@ -355,7 +356,7 @@ int __mnt_want_write(struct vfsmount *m)
+ 	smp_mb();
+ 	while (ACCESS_ONCE(mnt->mnt.mnt_flags) & MNT_WRITE_HOLD) {
+ 		preempt_enable();
+-		cpu_relax();
++		cpu_chill();
+ 		preempt_disable();
+ 	}
+ 	/*
diff --git a/kernel/patches-4.14.x-rt/0283-net-use-cpu-chill.patch b/kernel/patches-4.14.x-rt/0283-net-use-cpu-chill.patch
new file mode 100644
index 000000000..ffe94af5b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0283-net-use-cpu-chill.patch
@@ -0,0 +1,62 @@
+Subject: net: Use cpu_chill() instead of cpu_relax()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 07 Mar 2012 21:10:04 +0100
+
+Retry loops on RT might loop forever when the modifying side was
+preempted. Use cpu_chill() instead of cpu_relax() to let the system
+make progress.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ net/packet/af_packet.c |    5 +++--
+ net/rds/ib_rdma.c      |    3 ++-
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+--- 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>
+ #include <linux/kernel.h>
++#include <linux/delay.h>
+ #include <linux/kmod.h>
+ #include <linux/slab.h>
+ #include <linux/vmalloc.h>
+@@ -700,7 +701,7 @@ static void prb_retire_rx_blk_timer_expi
+ 	if (BLOCK_NUM_PKTS(pbd)) {
+ 		while (atomic_read(&pkc->blk_fill_in_prog)) {
+ 			/* Waiting for skb_copy_bits to finish... */
+-			cpu_relax();
++			cpu_chill();
+ 		}
+ 	}
+ 
+@@ -962,7 +963,7 @@ static void prb_retire_current_block(str
+ 		if (!(status & TP_STATUS_BLK_TMO)) {
+ 			while (atomic_read(&pkc->blk_fill_in_prog)) {
+ 				/* Waiting for skb_copy_bits to finish... */
+-				cpu_relax();
++				cpu_chill();
+ 			}
+ 		}
+ 		prb_close_block(pkc, pbd, po, status);
+--- a/net/rds/ib_rdma.c
++++ b/net/rds/ib_rdma.c
+@@ -34,6 +34,7 @@
+ #include <linux/slab.h>
+ #include <linux/rculist.h>
+ #include <linux/llist.h>
++#include <linux/delay.h>
+ 
+ #include "rds_single_path.h"
+ #include "ib_mr.h"
+@@ -210,7 +211,7 @@ static inline void wait_clean_list_grace
+ 	for_each_online_cpu(cpu) {
+ 		flag = &per_cpu(clean_list_grace, cpu);
+ 		while (test_bit(CLEAN_LIST_BUSY_BIT, flag))
+-			cpu_relax();
++			cpu_chill();
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0284-fs-dcache-use-swait_queue-instead-of-waitqueue.patch b/kernel/patches-4.14.x-rt/0284-fs-dcache-use-swait_queue-instead-of-waitqueue.patch
new file mode 100644
index 000000000..3ed590283
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0284-fs-dcache-use-swait_queue-instead-of-waitqueue.patch
@@ -0,0 +1,214 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 14 Sep 2016 14:35:49 +0200
+Subject: [PATCH] fs/dcache: use swait_queue instead of waitqueue
+
+__d_lookup_done() invokes wake_up_all() while holding a hlist_bl_lock()
+which disables preemption. As a workaround convert it to swait.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ fs/cifs/readdir.c       |    2 +-
+ fs/dcache.c             |   27 +++++++++++++++------------
+ fs/fuse/dir.c           |    2 +-
+ fs/namei.c              |    4 ++--
+ fs/nfs/dir.c            |    4 ++--
+ fs/nfs/unlink.c         |    4 ++--
+ fs/proc/base.c          |    2 +-
+ fs/proc/proc_sysctl.c   |    2 +-
+ include/linux/dcache.h  |    4 ++--
+ include/linux/nfs_xdr.h |    2 +-
+ kernel/sched/swait.c    |    1 +
+ 11 files changed, 29 insertions(+), 25 deletions(-)
+
+--- a/fs/cifs/readdir.c
++++ b/fs/cifs/readdir.c
+@@ -80,7 +80,7 @@ cifs_prime_dcache(struct dentry *parent,
+ 	struct inode *inode;
+ 	struct super_block *sb = parent->d_sb;
+ 	struct cifs_sb_info *cifs_sb = CIFS_SB(sb);
+-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++	DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 
+ 	cifs_dbg(FYI, "%s: for %s\n", __func__, name->name);
+ 
+--- a/fs/dcache.c
++++ b/fs/dcache.c
+@@ -2434,21 +2434,24 @@ static inline void end_dir_add(struct in
+ 
+ static void d_wait_lookup(struct dentry *dentry)
+ {
+-	if (d_in_lookup(dentry)) {
+-		DECLARE_WAITQUEUE(wait, current);
+-		add_wait_queue(dentry->d_wait, &wait);
+-		do {
+-			set_current_state(TASK_UNINTERRUPTIBLE);
+-			spin_unlock(&dentry->d_lock);
+-			schedule();
+-			spin_lock(&dentry->d_lock);
+-		} while (d_in_lookup(dentry));
+-	}
++	struct swait_queue __wait;
++
++	if (!d_in_lookup(dentry))
++		return;
++
++	INIT_LIST_HEAD(&__wait.task_list);
++	do {
++		prepare_to_swait(dentry->d_wait, &__wait, TASK_UNINTERRUPTIBLE);
++		spin_unlock(&dentry->d_lock);
++		schedule();
++		spin_lock(&dentry->d_lock);
++	} while (d_in_lookup(dentry));
++	finish_swait(dentry->d_wait, &__wait);
+ }
+ 
+ struct dentry *d_alloc_parallel(struct dentry *parent,
+ 				const struct qstr *name,
+-				wait_queue_head_t *wq)
++				struct swait_queue_head *wq)
+ {
+ 	unsigned int hash = name->hash;
+ 	struct hlist_bl_head *b = in_lookup_hash(parent, hash);
+@@ -2557,7 +2560,7 @@ void __d_lookup_done(struct dentry *dent
+ 	hlist_bl_lock(b);
+ 	dentry->d_flags &= ~DCACHE_PAR_LOOKUP;
+ 	__hlist_bl_del(&dentry->d_u.d_in_lookup_hash);
+-	wake_up_all(dentry->d_wait);
++	swake_up_all(dentry->d_wait);
+ 	dentry->d_wait = NULL;
+ 	hlist_bl_unlock(b);
+ 	INIT_HLIST_NODE(&dentry->d_u.d_alias);
+--- a/fs/fuse/dir.c
++++ b/fs/fuse/dir.c
+@@ -1187,7 +1187,7 @@ static int fuse_direntplus_link(struct f
+ 	struct inode *dir = d_inode(parent);
+ 	struct fuse_conn *fc;
+ 	struct inode *inode;
+-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++	DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 
+ 	if (!o->nodeid) {
+ 		/*
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -1628,7 +1628,7 @@ static struct dentry *lookup_slow(const
+ {
+ 	struct dentry *dentry = ERR_PTR(-ENOENT), *old;
+ 	struct inode *inode = dir->d_inode;
+-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++	DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 
+ 	inode_lock_shared(inode);
+ 	/* Don't go there if it's already dead */
+@@ -3101,7 +3101,7 @@ static int lookup_open(struct nameidata
+ 	struct dentry *dentry;
+ 	int error, create_error = 0;
+ 	umode_t mode = op->mode;
+-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++	DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 
+ 	if (unlikely(IS_DEADDIR(dir_inode)))
+ 		return -ENOENT;
+--- a/fs/nfs/dir.c
++++ b/fs/nfs/dir.c
+@@ -452,7 +452,7 @@ static
+ void nfs_prime_dcache(struct dentry *parent, struct nfs_entry *entry)
+ {
+ 	struct qstr filename = QSTR_INIT(entry->name, entry->len);
+-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++	DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 	struct dentry *dentry;
+ 	struct dentry *alias;
+ 	struct inode *dir = d_inode(parent);
+@@ -1443,7 +1443,7 @@ int nfs_atomic_open(struct inode *dir, s
+ 		    struct file *file, unsigned open_flags,
+ 		    umode_t mode, int *opened)
+ {
+-	DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++	DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 	struct nfs_open_context *ctx;
+ 	struct dentry *res;
+ 	struct iattr attr = { .ia_valid = ATTR_OPEN };
+--- a/fs/nfs/unlink.c
++++ b/fs/nfs/unlink.c
+@@ -13,7 +13,7 @@
+ #include <linux/sunrpc/clnt.h>
+ #include <linux/nfs_fs.h>
+ #include <linux/sched.h>
+-#include <linux/wait.h>
++#include <linux/swait.h>
+ #include <linux/namei.h>
+ #include <linux/fsnotify.h>
+ 
+@@ -206,7 +206,7 @@ nfs_async_unlink(struct dentry *dentry,
+ 		goto out_free_name;
+ 	}
+ 	data->res.dir_attr = &data->dir_attr;
+-	init_waitqueue_head(&data->wq);
++	init_swait_queue_head(&data->wq);
+ 
+ 	status = -EBUSY;
+ 	spin_lock(&dentry->d_lock);
+--- a/fs/proc/base.c
++++ b/fs/proc/base.c
+@@ -1878,7 +1878,7 @@ bool proc_fill_cache(struct file *file,
+ 
+ 	child = d_hash_and_lookup(dir, &qname);
+ 	if (!child) {
+-		DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++		DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 		child = d_alloc_parallel(dir, &qname, &wq);
+ 		if (IS_ERR(child))
+ 			goto end_instantiate;
+--- a/fs/proc/proc_sysctl.c
++++ b/fs/proc/proc_sysctl.c
+@@ -679,7 +679,7 @@ static bool proc_sys_fill_cache(struct f
+ 
+ 	child = d_lookup(dir, &qname);
+ 	if (!child) {
+-		DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wq);
++		DECLARE_SWAIT_QUEUE_HEAD_ONSTACK(wq);
+ 		child = d_alloc_parallel(dir, &qname, &wq);
+ 		if (IS_ERR(child))
+ 			return false;
+--- a/include/linux/dcache.h
++++ b/include/linux/dcache.h
+@@ -107,7 +107,7 @@ struct dentry {
+ 
+ 	union {
+ 		struct list_head d_lru;		/* LRU list */
+-		wait_queue_head_t *d_wait;	/* in-lookup ones only */
++		struct swait_queue_head *d_wait;	/* in-lookup ones only */
+ 	};
+ 	struct list_head d_child;	/* child of parent list */
+ 	struct list_head d_subdirs;	/* our children */
+@@ -237,7 +237,7 @@ extern void d_set_d_op(struct dentry *de
+ 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 *,
+-					wait_queue_head_t *);
++					struct swait_queue_head *);
+ 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 *);
+--- a/include/linux/nfs_xdr.h
++++ b/include/linux/nfs_xdr.h
+@@ -1530,7 +1530,7 @@ struct nfs_unlinkdata {
+ 	struct nfs_removeargs args;
+ 	struct nfs_removeres res;
+ 	struct dentry *dentry;
+-	wait_queue_head_t wq;
++	struct swait_queue_head wq;
+ 	struct rpc_cred	*cred;
+ 	struct nfs_fattr dir_attr;
+ 	long timeout;
+--- a/kernel/sched/swait.c
++++ b/kernel/sched/swait.c
+@@ -69,6 +69,7 @@ void swake_up_all(struct swait_queue_hea
+ 	struct swait_queue *curr;
+ 	LIST_HEAD(tmp);
+ 
++	WARN_ON(irqs_disabled());
+ 	raw_spin_lock_irq(&q->lock);
+ 	list_splice_init(&q->task_list, &tmp);
+ 	while (!list_empty(&tmp)) {
diff --git a/kernel/patches-4.14.x-rt/0285-workqueue-use-rcu.patch b/kernel/patches-4.14.x-rt/0285-workqueue-use-rcu.patch
new file mode 100644
index 000000000..ecf8e886a
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0285-workqueue-use-rcu.patch
@@ -0,0 +1,353 @@
+Subject: workqueue: Use normal rcu
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 24 Jul 2013 15:26:54 +0200
+
+There is no need for sched_rcu. The undocumented reason why sched_rcu
+is used is to avoid a few explicit rcu_read_lock()/unlock() pairs by
+abusing the fact that sched_rcu reader side critical sections are also
+protected by preempt or irq disabled regions.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/workqueue.c |   95 +++++++++++++++++++++++++++++------------------------
+ 1 file changed, 52 insertions(+), 43 deletions(-)
+
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -127,7 +127,7 @@ enum {
+  *
+  * PL: wq_pool_mutex protected.
+  *
+- * PR: wq_pool_mutex protected for writes.  Sched-RCU protected for reads.
++ * PR: wq_pool_mutex protected for writes.  RCU protected for reads.
+  *
+  * PW: wq_pool_mutex and wq->mutex protected for writes.  Either for reads.
+  *
+@@ -136,7 +136,7 @@ enum {
+  *
+  * WQ: wq->mutex protected.
+  *
+- * WR: wq->mutex protected for writes.  Sched-RCU protected for reads.
++ * WR: wq->mutex protected for writes.  RCU protected for reads.
+  *
+  * MD: wq_mayday_lock protected.
+  */
+@@ -186,7 +186,7 @@ struct worker_pool {
+ 	atomic_t		nr_running ____cacheline_aligned_in_smp;
+ 
+ 	/*
+-	 * Destruction of pool is sched-RCU protected to allow dereferences
++	 * Destruction of pool is RCU protected to allow dereferences
+ 	 * from get_work_pool().
+ 	 */
+ 	struct rcu_head		rcu;
+@@ -215,7 +215,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
+-	 * itself is also sched-RCU protected so that the first pwq can be
++	 * itself is also RCU protected so that the first pwq can be
+ 	 * determined without grabbing wq->mutex.
+ 	 */
+ 	struct work_struct	unbound_release_work;
+@@ -359,20 +359,20 @@ static void workqueue_sysfs_unregister(s
+ #include <trace/events/workqueue.h>
+ 
+ #define assert_rcu_or_pool_mutex()					\
+-	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() &&			\
++	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&			\
+ 			 !lockdep_is_held(&wq_pool_mutex),		\
+-			 "sched RCU or wq_pool_mutex should be held")
++			 "RCU or wq_pool_mutex should be held")
+ 
+ #define assert_rcu_or_wq_mutex(wq)					\
+-	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() &&			\
++	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&			\
+ 			 !lockdep_is_held(&wq->mutex),			\
+-			 "sched RCU or wq->mutex should be held")
++			 "RCU or wq->mutex should be held")
+ 
+ #define assert_rcu_or_wq_mutex_or_pool_mutex(wq)			\
+-	RCU_LOCKDEP_WARN(!rcu_read_lock_sched_held() &&			\
++	RCU_LOCKDEP_WARN(!rcu_read_lock_held() &&			\
+ 			 !lockdep_is_held(&wq->mutex) &&		\
+ 			 !lockdep_is_held(&wq_pool_mutex),		\
+-			 "sched RCU, wq->mutex or wq_pool_mutex should be held")
++			 "RCU, wq->mutex or wq_pool_mutex should be held")
+ 
+ #define for_each_cpu_worker_pool(pool, cpu)				\
+ 	for ((pool) = &per_cpu(cpu_worker_pools, cpu)[0];		\
+@@ -384,7 +384,7 @@ static void workqueue_sysfs_unregister(s
+  * @pool: iteration cursor
+  * @pi: integer used for iteration
+  *
+- * This must be called either with wq_pool_mutex held or sched RCU read
++ * This must be called either with wq_pool_mutex held or RCU read
+  * locked.  If the pool needs to be used beyond the locking in effect, the
+  * caller is responsible for guaranteeing that the pool stays online.
+  *
+@@ -416,7 +416,7 @@ static void workqueue_sysfs_unregister(s
+  * @pwq: iteration cursor
+  * @wq: the target workqueue
+  *
+- * This must be called either with wq->mutex held or sched RCU read locked.
++ * This must be called either with wq->mutex held or RCU 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.
+  *
+@@ -552,7 +552,7 @@ static int worker_pool_assign_id(struct
+  * @wq: the target workqueue
+  * @node: the node ID
+  *
+- * This must be called with any of wq_pool_mutex, wq->mutex or sched RCU
++ * This must be called with any of wq_pool_mutex, wq->mutex or RCU
+  * 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.
+@@ -696,8 +696,8 @@ static struct pool_workqueue *get_work_p
+  * @work: the work item of interest
+  *
+  * Pools are created and destroyed under wq_pool_mutex, and allows read
+- * access under sched-RCU read lock.  As such, this function should be
+- * called under wq_pool_mutex or with preemption disabled.
++ * access under RCU read lock.  As such, this function should be
++ * called under wq_pool_mutex or inside of a rcu_read_lock() region.
+  *
+  * 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
+@@ -1102,7 +1102,7 @@ static void put_pwq_unlocked(struct pool
+ {
+ 	if (pwq) {
+ 		/*
+-		 * As both pwqs and pools are sched-RCU protected, the
++		 * As both pwqs and pools are RCU protected, the
+ 		 * following lock operations are safe.
+ 		 */
+ 		spin_lock_irq(&pwq->pool->lock);
+@@ -1230,6 +1230,7 @@ static int try_to_grab_pending(struct wo
+ 	if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work)))
+ 		return 0;
+ 
++	rcu_read_lock();
+ 	/*
+ 	 * The queueing is in progress, or it is already queued. Try to
+ 	 * steal it from ->worklist without clearing WORK_STRUCT_PENDING.
+@@ -1268,10 +1269,12 @@ static int try_to_grab_pending(struct wo
+ 		set_work_pool_and_keep_pending(work, pool->id);
+ 
+ 		spin_unlock(&pool->lock);
++		rcu_read_unlock();
+ 		return 1;
+ 	}
+ 	spin_unlock(&pool->lock);
+ fail:
++	rcu_read_unlock();
+ 	local_irq_restore(*flags);
+ 	if (work_is_canceling(work))
+ 		return -ENOENT;
+@@ -1385,6 +1388,7 @@ static void __queue_work(int cpu, struct
+ 	if (unlikely(wq->flags & __WQ_DRAINING) &&
+ 	    WARN_ON_ONCE(!is_chained_work(wq)))
+ 		return;
++	rcu_read_lock();
+ retry:
+ 	if (req_cpu == WORK_CPU_UNBOUND)
+ 		cpu = wq_select_unbound_cpu(raw_smp_processor_id());
+@@ -1441,10 +1445,8 @@ static void __queue_work(int cpu, struct
+ 	/* pwq determined, queue */
+ 	trace_workqueue_queue_work(req_cpu, pwq, work);
+ 
+-	if (WARN_ON(!list_empty(&work->entry))) {
+-		spin_unlock(&pwq->pool->lock);
+-		return;
+-	}
++	if (WARN_ON(!list_empty(&work->entry)))
++		goto out;
+ 
+ 	pwq->nr_in_flight[pwq->work_color]++;
+ 	work_flags = work_color_to_flags(pwq->work_color);
+@@ -1462,7 +1464,9 @@ static void __queue_work(int cpu, struct
+ 
+ 	insert_work(pwq, work, worklist, work_flags);
+ 
++out:
+ 	spin_unlock(&pwq->pool->lock);
++	rcu_read_unlock();
+ }
+ 
+ /**
+@@ -2815,14 +2819,14 @@ static bool start_flush_work(struct work
+ 
+ 	might_sleep();
+ 
+-	local_irq_disable();
++	rcu_read_lock();
+ 	pool = get_work_pool(work);
+ 	if (!pool) {
+-		local_irq_enable();
++		rcu_read_unlock();
+ 		return false;
+ 	}
+ 
+-	spin_lock(&pool->lock);
++	spin_lock_irq(&pool->lock);
+ 	/* see the comment in try_to_grab_pending() with the same code */
+ 	pwq = get_work_pwq(work);
+ 	if (pwq) {
+@@ -2853,10 +2857,11 @@ static bool start_flush_work(struct work
+ 		lock_map_acquire(&pwq->wq->lockdep_map);
+ 		lock_map_release(&pwq->wq->lockdep_map);
+ 	}
+-
++	rcu_read_unlock();
+ 	return true;
+ already_gone:
+ 	spin_unlock_irq(&pool->lock);
++	rcu_read_unlock();
+ 	return false;
+ }
+ 
+@@ -3284,7 +3289,7 @@ static void rcu_free_pool(struct rcu_hea
+  * put_unbound_pool - put a worker_pool
+  * @pool: worker_pool to put
+  *
+- * Put @pool.  If its refcnt reaches zero, it gets destroyed in sched-RCU
++ * Put @pool.  If its refcnt reaches zero, it gets destroyed in RCU
+  * 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().
+@@ -3338,8 +3343,8 @@ static void put_unbound_pool(struct work
+ 	del_timer_sync(&pool->idle_timer);
+ 	del_timer_sync(&pool->mayday_timer);
+ 
+-	/* sched-RCU protected to allow dereferences from get_work_pool() */
+-	call_rcu_sched(&pool->rcu, rcu_free_pool);
++	/* RCU protected to allow dereferences from get_work_pool() */
++	call_rcu(&pool->rcu, rcu_free_pool);
+ }
+ 
+ /**
+@@ -3446,14 +3451,14 @@ static void pwq_unbound_release_workfn(s
+ 	put_unbound_pool(pool);
+ 	mutex_unlock(&wq_pool_mutex);
+ 
+-	call_rcu_sched(&pwq->rcu, rcu_free_pwq);
++	call_rcu(&pwq->rcu, rcu_free_pwq);
+ 
+ 	/*
+ 	 * If we're the last pwq going away, @wq is already dead and no one
+ 	 * is gonna access it anymore.  Schedule RCU free.
+ 	 */
+ 	if (is_last)
+-		call_rcu_sched(&wq->rcu, rcu_free_wq);
++		call_rcu(&wq->rcu, rcu_free_wq);
+ }
+ 
+ /**
+@@ -4128,7 +4133,7 @@ void destroy_workqueue(struct workqueue_
+ 		 * The base ref is never dropped on per-cpu pwqs.  Directly
+ 		 * schedule RCU free.
+ 		 */
+-		call_rcu_sched(&wq->rcu, rcu_free_wq);
++		call_rcu(&wq->rcu, rcu_free_wq);
+ 	} else {
+ 		/*
+ 		 * We're the sole accessor of @wq at this point.  Directly
+@@ -4222,7 +4227,8 @@ bool workqueue_congested(int cpu, struct
+ 	struct pool_workqueue *pwq;
+ 	bool ret;
+ 
+-	rcu_read_lock_sched();
++	rcu_read_lock();
++	preempt_disable();
+ 
+ 	if (cpu == WORK_CPU_UNBOUND)
+ 		cpu = smp_processor_id();
+@@ -4233,7 +4239,8 @@ bool workqueue_congested(int cpu, struct
+ 		pwq = unbound_pwq_by_node(wq, cpu_to_node(cpu));
+ 
+ 	ret = !list_empty(&pwq->delayed_works);
+-	rcu_read_unlock_sched();
++	preempt_enable();
++	rcu_read_unlock();
+ 
+ 	return ret;
+ }
+@@ -4259,15 +4266,15 @@ unsigned int work_busy(struct work_struc
+ 	if (work_pending(work))
+ 		ret |= WORK_BUSY_PENDING;
+ 
+-	local_irq_save(flags);
++	rcu_read_lock();
+ 	pool = get_work_pool(work);
+ 	if (pool) {
+-		spin_lock(&pool->lock);
++		spin_lock_irqsave(&pool->lock, flags);
+ 		if (find_worker_executing_work(pool, work))
+ 			ret |= WORK_BUSY_RUNNING;
+-		spin_unlock(&pool->lock);
++		spin_unlock_irqrestore(&pool->lock, flags);
+ 	}
+-	local_irq_restore(flags);
++	rcu_read_unlock();
+ 
+ 	return ret;
+ }
+@@ -4456,7 +4463,7 @@ void show_workqueue_state(void)
+ 	unsigned long flags;
+ 	int pi;
+ 
+-	rcu_read_lock_sched();
++	rcu_read_lock();
+ 
+ 	pr_info("Showing busy workqueues and worker pools:\n");
+ 
+@@ -4521,7 +4528,7 @@ void show_workqueue_state(void)
+ 		touch_nmi_watchdog();
+ 	}
+ 
+-	rcu_read_unlock_sched();
++	rcu_read_unlock();
+ }
+ 
+ /*
+@@ -4882,16 +4889,16 @@ bool freeze_workqueues_busy(void)
+ 		 * nr_active is monotonically decreasing.  It's safe
+ 		 * to peek without lock.
+ 		 */
+-		rcu_read_lock_sched();
++		rcu_read_lock();
+ 		for_each_pwq(pwq, wq) {
+ 			WARN_ON_ONCE(pwq->nr_active < 0);
+ 			if (pwq->nr_active) {
+ 				busy = true;
+-				rcu_read_unlock_sched();
++				rcu_read_unlock();
+ 				goto out_unlock;
+ 			}
+ 		}
+-		rcu_read_unlock_sched();
++		rcu_read_unlock();
+ 	}
+ out_unlock:
+ 	mutex_unlock(&wq_pool_mutex);
+@@ -5081,7 +5088,8 @@ static ssize_t wq_pool_ids_show(struct d
+ 	const char *delim = "";
+ 	int node, written = 0;
+ 
+-	rcu_read_lock_sched();
++	get_online_cpus();
++	rcu_read_lock();
+ 	for_each_node(node) {
+ 		written += scnprintf(buf + written, PAGE_SIZE - written,
+ 				     "%s%d:%d", delim, node,
+@@ -5089,7 +5097,8 @@ static ssize_t wq_pool_ids_show(struct d
+ 		delim = " ";
+ 	}
+ 	written += scnprintf(buf + written, PAGE_SIZE - written, "\n");
+-	rcu_read_unlock_sched();
++	rcu_read_unlock();
++	put_online_cpus();
+ 
+ 	return written;
+ }
diff --git a/kernel/patches-4.14.x-rt/0286-workqueue-use-locallock.patch b/kernel/patches-4.14.x-rt/0286-workqueue-use-locallock.patch
new file mode 100644
index 000000000..70b26e001
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0286-workqueue-use-locallock.patch
@@ -0,0 +1,158 @@
+Subject: workqueue: Use local irq lock instead of irq disable regions
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 17 Jul 2011 21:42:26 +0200
+
+Use a local_irq_lock as a replacement for irq off regions. We keep the
+semantic of irq-off in regard to the pool->lock and remain preemptible.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/workqueue.c |   36 ++++++++++++++++++++++--------------
+ 1 file changed, 22 insertions(+), 14 deletions(-)
+
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -49,6 +49,7 @@
+ #include <linux/moduleparam.h>
+ #include <linux/uaccess.h>
+ #include <linux/nmi.h>
++#include <linux/locallock.h>
+ 
+ #include "workqueue_internal.h"
+ 
+@@ -352,6 +353,8 @@ EXPORT_SYMBOL_GPL(system_power_efficient
+ struct workqueue_struct *system_freezable_power_efficient_wq __read_mostly;
+ EXPORT_SYMBOL_GPL(system_freezable_power_efficient_wq);
+ 
++static DEFINE_LOCAL_IRQ_LOCK(pendingb_lock);
++
+ static int worker_thread(void *__worker);
+ static void workqueue_sysfs_unregister(struct workqueue_struct *wq);
+ 
+@@ -1105,9 +1108,11 @@ static void put_pwq_unlocked(struct pool
+ 		 * As both pwqs and pools are RCU protected, the
+ 		 * following lock operations are safe.
+ 		 */
+-		spin_lock_irq(&pwq->pool->lock);
++		rcu_read_lock();
++		local_spin_lock_irq(pendingb_lock, &pwq->pool->lock);
+ 		put_pwq(pwq);
+-		spin_unlock_irq(&pwq->pool->lock);
++		local_spin_unlock_irq(pendingb_lock, &pwq->pool->lock);
++		rcu_read_unlock();
+ 	}
+ }
+ 
+@@ -1211,7 +1216,7 @@ static int try_to_grab_pending(struct wo
+ 	struct worker_pool *pool;
+ 	struct pool_workqueue *pwq;
+ 
+-	local_irq_save(*flags);
++	local_lock_irqsave(pendingb_lock, *flags);
+ 
+ 	/* try to steal the timer if it exists */
+ 	if (is_dwork) {
+@@ -1275,7 +1280,7 @@ static int try_to_grab_pending(struct wo
+ 	spin_unlock(&pool->lock);
+ fail:
+ 	rcu_read_unlock();
+-	local_irq_restore(*flags);
++	local_unlock_irqrestore(pendingb_lock, *flags);
+ 	if (work_is_canceling(work))
+ 		return -ENOENT;
+ 	cpu_relax();
+@@ -1380,7 +1385,7 @@ static void __queue_work(int cpu, struct
+ 	 * queued or lose PENDING.  Grabbing PENDING and queueing should
+ 	 * happen with IRQ disabled.
+ 	 */
+-	WARN_ON_ONCE(!irqs_disabled());
++	WARN_ON_ONCE_NONRT(!irqs_disabled());
+ 
+ 	debug_work_activate(work);
+ 
+@@ -1486,14 +1491,14 @@ bool queue_work_on(int cpu, struct workq
+ 	bool ret = false;
+ 	unsigned long flags;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(pendingb_lock,flags);
+ 
+ 	if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) {
+ 		__queue_work(cpu, wq, work);
+ 		ret = true;
+ 	}
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pendingb_lock, flags);
+ 	return ret;
+ }
+ EXPORT_SYMBOL(queue_work_on);
+@@ -1502,8 +1507,11 @@ void delayed_work_timer_fn(unsigned long
+ {
+ 	struct delayed_work *dwork = (struct delayed_work *)__data;
+ 
++	/* XXX */
++	/* local_lock(pendingb_lock); */
+ 	/* should have been called from irqsafe timer with irq already off */
+ 	__queue_work(dwork->cpu, dwork->wq, &dwork->work);
++	/* local_unlock(pendingb_lock); */
+ }
+ EXPORT_SYMBOL(delayed_work_timer_fn);
+ 
+@@ -1559,14 +1567,14 @@ bool queue_delayed_work_on(int cpu, stru
+ 	unsigned long flags;
+ 
+ 	/* read the comment in __queue_work() */
+-	local_irq_save(flags);
++	local_lock_irqsave(pendingb_lock, flags);
+ 
+ 	if (!test_and_set_bit(WORK_STRUCT_PENDING_BIT, work_data_bits(work))) {
+ 		__queue_delayed_work(cpu, wq, dwork, delay);
+ 		ret = true;
+ 	}
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pendingb_lock, flags);
+ 	return ret;
+ }
+ EXPORT_SYMBOL(queue_delayed_work_on);
+@@ -1601,7 +1609,7 @@ bool mod_delayed_work_on(int cpu, struct
+ 
+ 	if (likely(ret >= 0)) {
+ 		__queue_delayed_work(cpu, wq, dwork, delay);
+-		local_irq_restore(flags);
++		local_unlock_irqrestore(pendingb_lock, flags);
+ 	}
+ 
+ 	/* -ENOENT from try_to_grab_pending() becomes %true */
+@@ -2951,7 +2959,7 @@ static bool __cancel_work_timer(struct w
+ 
+ 	/* tell other tasks trying to grab @work to back off */
+ 	mark_work_canceling(work);
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pendingb_lock, flags);
+ 
+ 	/*
+ 	 * This allows canceling during early boot.  We know that @work
+@@ -3012,10 +3020,10 @@ EXPORT_SYMBOL_GPL(cancel_work_sync);
+  */
+ bool flush_delayed_work(struct delayed_work *dwork)
+ {
+-	local_irq_disable();
++	local_lock_irq(pendingb_lock);
+ 	if (del_timer_sync(&dwork->timer))
+ 		__queue_work(dwork->cpu, dwork->wq, &dwork->work);
+-	local_irq_enable();
++	local_unlock_irq(pendingb_lock);
+ 	return flush_work(&dwork->work);
+ }
+ EXPORT_SYMBOL(flush_delayed_work);
+@@ -3033,7 +3041,7 @@ static bool __cancel_work(struct work_st
+ 		return false;
+ 
+ 	set_work_pool_and_clear_pending(work, get_work_pool_id(work));
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(pendingb_lock, flags);
+ 	return ret;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0287-work-queue-work-around-irqsafe-timer-optimization.patch b/kernel/patches-4.14.x-rt/0287-work-queue-work-around-irqsafe-timer-optimization.patch
new file mode 100644
index 000000000..8687fb723
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0287-work-queue-work-around-irqsafe-timer-optimization.patch
@@ -0,0 +1,132 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 01 Jul 2013 11:02:42 +0200
+Subject: workqueue: Prevent workqueue versus ata-piix livelock
+
+An Intel i7 system regularly detected rcu_preempt stalls after the kernel
+was upgraded from 3.6-rt to 3.8-rt. When the stall happened, disk I/O was no
+longer possible, unless the system was restarted.
+
+The kernel message was:
+INFO: rcu_preempt self-detected stall on CPU { 6}
+[..]
+NMI backtrace for cpu 6
+CPU 6
+Pid: 119, comm: irq/19-ata_piix Not tainted 3.8.13-rt13 #11 Shuttle Inc. SX58/SX58
+RIP: 0010:[<ffffffff8124ca60>]  [<ffffffff8124ca60>] ip_compute_csum+0x30/0x30
+RSP: 0018:ffff880333303cb0  EFLAGS: 00000002
+RAX: 0000000000000006 RBX: 00000000000003e9 RCX: 0000000000000034
+RDX: 0000000000000000 RSI: ffffffff81aa16d0 RDI: 0000000000000001
+RBP: ffff880333303ce8 R08: ffffffff81aa16d0 R09: ffffffff81c1b8cc
+R10: 0000000000000000 R11: 0000000000000000 R12: 000000000005161f
+R13: 0000000000000006 R14: ffffffff81aa16d0 R15: 0000000000000002
+FS:  0000000000000000(0000) GS:ffff880333300000(0000) knlGS:0000000000000000
+CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
+CR2: 0000003c1b2bb420 CR3: 0000000001a0f000 CR4: 00000000000007e0
+DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
+DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
+Process irq/19-ata_piix (pid: 119, threadinfo ffff88032d88a000, task ffff88032df80000)
+Stack:
+ffffffff8124cb32 000000000005161e 00000000000003e9 0000000000001000
+0000000000009022 ffffffff81aa16d0 0000000000000002 ffff880333303cf8
+ffffffff8124caa9 ffff880333303d08 ffffffff8124cad2 ffff880333303d28
+Call Trace:
+<IRQ>
+[<ffffffff8124cb32>] ? delay_tsc+0x33/0xe3
+[<ffffffff8124caa9>] __delay+0xf/0x11
+[<ffffffff8124cad2>] __const_udelay+0x27/0x29
+[<ffffffff8102d1fa>] native_safe_apic_wait_icr_idle+0x39/0x45
+[<ffffffff8102dc9b>] __default_send_IPI_dest_field.constprop.0+0x1e/0x58
+[<ffffffff8102dd1e>] default_send_IPI_mask_sequence_phys+0x49/0x7d
+[<ffffffff81030326>] physflat_send_IPI_all+0x17/0x19
+[<ffffffff8102de53>] arch_trigger_all_cpu_backtrace+0x50/0x79
+[<ffffffff810b21d0>] rcu_check_callbacks+0x1cb/0x568
+[<ffffffff81048c9c>] ? raise_softirq+0x2e/0x35
+[<ffffffff81086be0>] ? tick_sched_do_timer+0x38/0x38
+[<ffffffff8104f653>] update_process_times+0x44/0x55
+[<ffffffff81086866>] tick_sched_handle+0x4a/0x59
+[<ffffffff81086c1c>] tick_sched_timer+0x3c/0x5b
+[<ffffffff81062845>] __run_hrtimer+0x9b/0x158
+[<ffffffff810631d8>] hrtimer_interrupt+0x172/0x2aa
+[<ffffffff8102d498>] smp_apic_timer_interrupt+0x76/0x89
+[<ffffffff814d881d>] apic_timer_interrupt+0x6d/0x80
+<EOI>
+[<ffffffff81057cd2>] ? __local_lock_irqsave+0x17/0x4a
+[<ffffffff81059336>] try_to_grab_pending+0x42/0x17e
+[<ffffffff8105a699>] mod_delayed_work_on+0x32/0x88
+[<ffffffff8105a70b>] mod_delayed_work+0x1c/0x1e
+[<ffffffff8122ae84>] blk_run_queue_async+0x37/0x39
+[<ffffffff81230985>] flush_end_io+0xf1/0x107
+[<ffffffff8122e0da>] blk_finish_request+0x21e/0x264
+[<ffffffff8122e162>] blk_end_bidi_request+0x42/0x60
+[<ffffffff8122e1ba>] blk_end_request+0x10/0x12
+[<ffffffff8132de46>] scsi_io_completion+0x1bf/0x492
+[<ffffffff81335cec>] ? sd_done+0x298/0x2ef
+[<ffffffff81325a02>] scsi_finish_command+0xe9/0xf2
+[<ffffffff8132dbcb>] scsi_softirq_done+0x106/0x10f
+[<ffffffff812333d3>] blk_done_softirq+0x77/0x87
+[<ffffffff8104826f>] do_current_softirqs+0x172/0x2e1
+[<ffffffff810aa820>] ? irq_thread_fn+0x3a/0x3a
+[<ffffffff81048466>] local_bh_enable+0x43/0x72
+[<ffffffff810aa866>] irq_forced_thread_fn+0x46/0x52
+[<ffffffff810ab089>] irq_thread+0x8c/0x17c
+[<ffffffff810ab179>] ? irq_thread+0x17c/0x17c
+[<ffffffff810aaffd>] ? wake_threads_waitq+0x44/0x44
+[<ffffffff8105eb18>] kthread+0x8d/0x95
+[<ffffffff8105ea8b>] ? __kthread_parkme+0x65/0x65
+[<ffffffff814d7b7c>] ret_from_fork+0x7c/0xb0
+[<ffffffff8105ea8b>] ? __kthread_parkme+0x65/0x65
+
+The state of softirqd of this CPU at the time of the crash was:
+ksoftirqd/6     R  running task        0    53      2 0x00000000
+ffff88032fc39d18 0000000000000046 ffff88033330c4c0 ffff8803303f4710
+ffff88032fc39fd8 ffff88032fc39fd8 0000000000000000 0000000000062500
+ffff88032df88000 ffff8803303f4710 0000000000000000 ffff88032fc38000
+Call Trace:
+[<ffffffff8105a3ae>] ? __queue_work+0x27c/0x27c
+[<ffffffff814d178c>] preempt_schedule+0x61/0x76
+[<ffffffff8106cccf>] migrate_enable+0xe5/0x1df
+[<ffffffff8105a3ae>] ? __queue_work+0x27c/0x27c
+[<ffffffff8104ef52>] run_timer_softirq+0x161/0x1d6
+[<ffffffff8104826f>] do_current_softirqs+0x172/0x2e1
+[<ffffffff8104840b>] run_ksoftirqd+0x2d/0x45
+[<ffffffff8106658a>] smpboot_thread_fn+0x2ea/0x308
+[<ffffffff810662a0>] ? test_ti_thread_flag+0xc/0xc
+[<ffffffff810662a0>] ? test_ti_thread_flag+0xc/0xc
+[<ffffffff8105eb18>] kthread+0x8d/0x95
+[<ffffffff8105ea8b>] ? __kthread_parkme+0x65/0x65
+[<ffffffff814d7afc>] ret_from_fork+0x7c/0xb0
+[<ffffffff8105ea8b>] ? __kthread_parkme+0x65/0x65
+
+Apparently, the softirq demon and the ata_piix IRQ handler were waiting
+for each other to finish ending up in a livelock. After the below patch
+was applied, the system no longer crashes.
+
+Reported-by: Carsten Emde <C.Emde@osadl.org>
+Proposed-by: Thomas Gleixner <tglx@linutronix.de>
+Tested by: Carsten Emde <C.Emde@osadl.org>
+Signed-off-by: Carsten Emde <C.Emde@osadl.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/workqueue.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -50,6 +50,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/nmi.h>
+ #include <linux/locallock.h>
++#include <linux/delay.h>
+ 
+ #include "workqueue_internal.h"
+ 
+@@ -1283,7 +1284,7 @@ static int try_to_grab_pending(struct wo
+ 	local_unlock_irqrestore(pendingb_lock, *flags);
+ 	if (work_is_canceling(work))
+ 		return -ENOENT;
+-	cpu_relax();
++	cpu_chill();
+ 	return -EAGAIN;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0288-workqueue-distangle-from-rq-lock.patch b/kernel/patches-4.14.x-rt/0288-workqueue-distangle-from-rq-lock.patch
new file mode 100644
index 000000000..1a30c9a71
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0288-workqueue-distangle-from-rq-lock.patch
@@ -0,0 +1,272 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed Jun 22 19:47:03 2011 +0200
+Subject: sched: Distangle worker accounting from rqlock
+    
+The worker accounting for cpu bound workers is plugged into the core
+scheduler code and the wakeup code. This is not a hard requirement and
+can be avoided by keeping track of the state in the workqueue code
+itself.
+    
+Keep track of the sleeping state in the worker itself and call the
+notifier before entering the core scheduler. There might be false
+positives when the task is woken between that call and actually
+scheduling, but that's not really different from scheduling and being
+woken immediately after switching away. There is also no harm from
+updating nr_running when the task returns from scheduling instead of
+accounting it in the wakeup code.
+    
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Tejun Heo <tj@kernel.org>
+Cc: Jens Axboe <axboe@kernel.dk>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Link: http://lkml.kernel.org/r/20110622174919.135236139@linutronix.de
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/sched/core.c         |   84 +++++++-------------------------------------
+ kernel/workqueue.c          |   52 ++++++++++++---------------
+ kernel/workqueue_internal.h |    5 +-
+ 3 files changed, 41 insertions(+), 100 deletions(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -1715,10 +1715,6 @@ static inline void ttwu_activate(struct
+ {
+ 	activate_task(rq, p, en_flags);
+ 	p->on_rq = TASK_ON_RQ_QUEUED;
+-
+-	/* If a worker is waking up, notify the workqueue: */
+-	if (p->flags & PF_WQ_WORKER)
+-		wq_worker_waking_up(p, cpu_of(rq));
+ }
+ 
+ /*
+@@ -2159,56 +2155,6 @@ try_to_wake_up(struct task_struct *p, un
+ }
+ 
+ /**
+- * try_to_wake_up_local - try to wake up a local task with rq lock held
+- * @p: the thread to be awakened
+- * @rf: request-queue flags for pinning
+- *
+- * Put @p on the run-queue if it's not already there. The caller must
+- * ensure that this_rq() is locked, @p is bound to this_rq() and not
+- * the current task.
+- */
+-static void try_to_wake_up_local(struct task_struct *p, struct rq_flags *rf)
+-{
+-	struct rq *rq = task_rq(p);
+-
+-	if (WARN_ON_ONCE(rq != this_rq()) ||
+-	    WARN_ON_ONCE(p == current))
+-		return;
+-
+-	lockdep_assert_held(&rq->lock);
+-
+-	if (!raw_spin_trylock(&p->pi_lock)) {
+-		/*
+-		 * This is OK, because current is on_cpu, which avoids it being
+-		 * picked for load-balance and preemption/IRQs are still
+-		 * disabled avoiding further scheduler activity on it and we've
+-		 * not yet picked a replacement task.
+-		 */
+-		rq_unlock(rq, rf);
+-		raw_spin_lock(&p->pi_lock);
+-		rq_relock(rq, rf);
+-	}
+-
+-	if (!(p->state & TASK_NORMAL))
+-		goto out;
+-
+-	trace_sched_waking(p);
+-
+-	if (!task_on_rq_queued(p)) {
+-		if (p->in_iowait) {
+-			delayacct_blkio_end(p);
+-			atomic_dec(&rq->nr_iowait);
+-		}
+-		ttwu_activate(rq, p, ENQUEUE_WAKEUP | ENQUEUE_NOCLOCK);
+-	}
+-
+-	ttwu_do_wakeup(rq, p, 0, rf);
+-	ttwu_stat(p, smp_processor_id(), 0);
+-out:
+-	raw_spin_unlock(&p->pi_lock);
+-}
+-
+-/**
+  * wake_up_process - Wake up a specific process
+  * @p: The process to be woken up.
+  *
+@@ -3409,21 +3355,6 @@ static void __sched notrace __schedule(b
+ 				atomic_inc(&rq->nr_iowait);
+ 				delayacct_blkio_start();
+ 			}
+-
+-			/*
+-			 * If a worker went to sleep, notify and ask workqueue
+-			 * whether it wants to wake up a task to maintain
+-			 * concurrency.
+-			 * Only call wake up if prev isn't blocked on a sleeping
+-			 * spin lock.
+-			 */
+-			if (prev->flags & PF_WQ_WORKER && !prev->saved_state) {
+-				struct task_struct *to_wakeup;
+-
+-				to_wakeup = wq_worker_sleeping(prev);
+-				if (to_wakeup)
+-					try_to_wake_up_local(to_wakeup, &rf);
+-			}
+ 		}
+ 		switch_count = &prev->nvcsw;
+ 	}
+@@ -3499,6 +3430,14 @@ static inline void sched_submit_work(str
+ {
+ 	if (!tsk->state || tsk_is_pi_blocked(tsk))
+ 		return;
++
++	/*
++	 * If a worker went to sleep, notify and ask workqueue whether
++	 * it wants to wake up a task to maintain concurrency.
++	 */
++	if (tsk->flags & PF_WQ_WORKER)
++		wq_worker_sleeping(tsk);
++
+ 	/*
+ 	 * If we are going to sleep and we have plugged IO queued,
+ 	 * make sure to submit it to avoid deadlocks.
+@@ -3507,6 +3446,12 @@ static inline void sched_submit_work(str
+ 		blk_schedule_flush_plug(tsk);
+ }
+ 
++static void sched_update_worker(struct task_struct *tsk)
++{
++	if (tsk->flags & PF_WQ_WORKER)
++		wq_worker_running(tsk);
++}
++
+ asmlinkage __visible void __sched schedule(void)
+ {
+ 	struct task_struct *tsk = current;
+@@ -3517,6 +3462,7 @@ asmlinkage __visible void __sched schedu
+ 		__schedule(false);
+ 		sched_preempt_enable_no_resched();
+ 	} while (need_resched());
++	sched_update_worker(tsk);
+ }
+ EXPORT_SYMBOL(schedule);
+ 
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -845,43 +845,32 @@ static void wake_up_worker(struct worker
+ }
+ 
+ /**
+- * wq_worker_waking_up - a worker is waking up
++ * 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()
+  */
+-void wq_worker_waking_up(struct task_struct *task, int cpu)
++void wq_worker_running(struct task_struct *task)
+ {
+ 	struct worker *worker = kthread_data(task);
+ 
+-	if (!(worker->flags & WORKER_NOT_RUNNING)) {
+-		WARN_ON_ONCE(worker->pool->cpu != cpu);
++	if (!worker->sleeping)
++		return;
++	if (!(worker->flags & WORKER_NOT_RUNNING))
+ 		atomic_inc(&worker->pool->nr_running);
+-	}
++	worker->sleeping = 0;
+ }
+ 
+ /**
+  * wq_worker_sleeping - a worker is going to sleep
+  * @task: task going to sleep
+  *
+- * This function is called during schedule() when a busy worker is
+- * going to sleep.  Worker on the same cpu can be woken up by
+- * returning pointer to its task.
+- *
+- * CONTEXT:
+- * spin_lock_irq(rq->lock)
+- *
+- * Return:
+- * Worker task on @cpu to wake up, %NULL if none.
++ * This function is called from schedule() when a busy worker is
++ * going to sleep.
+  */
+-struct task_struct *wq_worker_sleeping(struct task_struct *task)
++void wq_worker_sleeping(struct task_struct *task)
+ {
+-	struct worker *worker = kthread_data(task), *to_wakeup = NULL;
++	struct worker *next, *worker = kthread_data(task);
+ 	struct worker_pool *pool;
+ 
+ 	/*
+@@ -890,13 +879,15 @@ struct task_struct *wq_worker_sleeping(s
+ 	 * checking NOT_RUNNING.
+ 	 */
+ 	if (worker->flags & WORKER_NOT_RUNNING)
+-		return NULL;
++		return;
+ 
+ 	pool = worker->pool;
+ 
+-	/* this can only happen on the local cpu */
+-	if (WARN_ON_ONCE(pool->cpu != raw_smp_processor_id()))
+-		return NULL;
++	if (WARN_ON_ONCE(worker->sleeping))
++		return;
++
++	worker->sleeping = 1;
++	spin_lock_irq(&pool->lock);
+ 
+ 	/*
+ 	 * The counterpart of the following dec_and_test, implied mb,
+@@ -910,9 +901,12 @@ struct task_struct *wq_worker_sleeping(s
+ 	 * lock is safe.
+ 	 */
+ 	if (atomic_dec_and_test(&pool->nr_running) &&
+-	    !list_empty(&pool->worklist))
+-		to_wakeup = first_idle_worker(pool);
+-	return to_wakeup ? to_wakeup->task : NULL;
++	    !list_empty(&pool->worklist)) {
++		next = first_idle_worker(pool);
++		if (next)
++			wake_up_process(next->task);
++	}
++	spin_unlock_irq(&pool->lock);
+ }
+ 
+ /**
+--- a/kernel/workqueue_internal.h
++++ b/kernel/workqueue_internal.h
+@@ -45,6 +45,7 @@ struct worker {
+ 	unsigned long		last_active;	/* L: last active timestamp */
+ 	unsigned int		flags;		/* X: flags */
+ 	int			id;		/* I: worker id */
++	int			sleeping;	/* None */
+ 
+ 	/*
+ 	 * Opaque string set with work_set_desc().  Printed out with task
+@@ -70,7 +71,7 @@ static inline struct worker *current_wq_
+  * Scheduler hooks for concurrency managed workqueue.  Only to be used from
+  * sched/core.c and workqueue.c.
+  */
+-void wq_worker_waking_up(struct task_struct *task, int cpu);
+-struct task_struct *wq_worker_sleeping(struct task_struct *task);
++void wq_worker_running(struct task_struct *task);
++void wq_worker_sleeping(struct task_struct *task);
+ 
+ #endif /* _KERNEL_WORKQUEUE_INTERNAL_H */
diff --git a/kernel/patches-4.14.x-rt/0289-percpu_ida-use-locklocks.patch b/kernel/patches-4.14.x-rt/0289-percpu_ida-use-locklocks.patch
new file mode 100644
index 000000000..9e4a3c38c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0289-percpu_ida-use-locklocks.patch
@@ -0,0 +1,101 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 9 Apr 2014 11:58:17 +0200
+Subject: percpu_ida: Use local locks
+
+the local_irq_save() + spin_lock() does not work that well on -RT
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ lib/percpu_ida.c |   20 ++++++++++++--------
+ 1 file changed, 12 insertions(+), 8 deletions(-)
+
+--- a/lib/percpu_ida.c
++++ b/lib/percpu_ida.c
+@@ -27,6 +27,9 @@
+ #include <linux/string.h>
+ #include <linux/spinlock.h>
+ #include <linux/percpu_ida.h>
++#include <linux/locallock.h>
++
++static DEFINE_LOCAL_IRQ_LOCK(irq_off_lock);
+ 
+ struct percpu_ida_cpu {
+ 	/*
+@@ -149,13 +152,13 @@ int percpu_ida_alloc(struct percpu_ida *
+ 	unsigned long flags;
+ 	int tag;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(irq_off_lock, flags);
+ 	tags = this_cpu_ptr(pool->tag_cpu);
+ 
+ 	/* Fastpath */
+ 	tag = alloc_local_tag(tags);
+ 	if (likely(tag >= 0)) {
+-		local_irq_restore(flags);
++		local_unlock_irqrestore(irq_off_lock, flags);
+ 		return tag;
+ 	}
+ 
+@@ -174,6 +177,7 @@ int percpu_ida_alloc(struct percpu_ida *
+ 
+ 		if (!tags->nr_free)
+ 			alloc_global_tags(pool, tags);
++
+ 		if (!tags->nr_free)
+ 			steal_tags(pool, tags);
+ 
+@@ -185,7 +189,7 @@ int percpu_ida_alloc(struct percpu_ida *
+ 		}
+ 
+ 		spin_unlock(&pool->lock);
+-		local_irq_restore(flags);
++		local_unlock_irqrestore(irq_off_lock, flags);
+ 
+ 		if (tag >= 0 || state == TASK_RUNNING)
+ 			break;
+@@ -197,7 +201,7 @@ int percpu_ida_alloc(struct percpu_ida *
+ 
+ 		schedule();
+ 
+-		local_irq_save(flags);
++		local_lock_irqsave(irq_off_lock, flags);
+ 		tags = this_cpu_ptr(pool->tag_cpu);
+ 	}
+ 	if (state != TASK_RUNNING)
+@@ -222,7 +226,7 @@ void percpu_ida_free(struct percpu_ida *
+ 
+ 	BUG_ON(tag >= pool->nr_tags);
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(irq_off_lock, flags);
+ 	tags = this_cpu_ptr(pool->tag_cpu);
+ 
+ 	spin_lock(&tags->lock);
+@@ -254,7 +258,7 @@ void percpu_ida_free(struct percpu_ida *
+ 		spin_unlock(&pool->lock);
+ 	}
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(irq_off_lock, flags);
+ }
+ EXPORT_SYMBOL_GPL(percpu_ida_free);
+ 
+@@ -346,7 +350,7 @@ int percpu_ida_for_each_free(struct perc
+ 	struct percpu_ida_cpu *remote;
+ 	unsigned cpu, i, err = 0;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(irq_off_lock, flags);
+ 	for_each_possible_cpu(cpu) {
+ 		remote = per_cpu_ptr(pool->tag_cpu, cpu);
+ 		spin_lock(&remote->lock);
+@@ -368,7 +372,7 @@ int percpu_ida_for_each_free(struct perc
+ 	}
+ 	spin_unlock(&pool->lock);
+ out:
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(irq_off_lock, flags);
+ 	return err;
+ }
+ EXPORT_SYMBOL_GPL(percpu_ida_for_each_free);
diff --git a/kernel/patches-4.14.x-rt/0290-debugobjects-rt.patch b/kernel/patches-4.14.x-rt/0290-debugobjects-rt.patch
new file mode 100644
index 000000000..dd32133de
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0290-debugobjects-rt.patch
@@ -0,0 +1,25 @@
+Subject: debugobjects: Make RT aware
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 17 Jul 2011 21:41:35 +0200
+
+Avoid filling the pool / allocating memory with irqs off().
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ lib/debugobjects.c |    5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/lib/debugobjects.c
++++ b/lib/debugobjects.c
+@@ -336,7 +336,10 @@ static void
+ 	struct debug_obj *obj;
+ 	unsigned long flags;
+ 
+-	fill_pool();
++#ifdef CONFIG_PREEMPT_RT_FULL
++	if (preempt_count() == 0 && !irqs_disabled())
++#endif
++		fill_pool();
+ 
+ 	db = get_bucket((unsigned long) addr);
+ 
diff --git a/kernel/patches-4.14.x-rt/0291-jump-label-rt.patch b/kernel/patches-4.14.x-rt/0291-jump-label-rt.patch
new file mode 100644
index 000000000..782de0c79
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0291-jump-label-rt.patch
@@ -0,0 +1,35 @@
+Subject: jump-label: disable if stop_machine() is used
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 08 Jul 2015 17:14:48 +0200
+
+Some architectures are using stop_machine() while switching the opcode which
+leads to latency spikes.
+The architectures which use stop_machine() atm:
+- ARM stop machine
+- s390 stop machine
+
+The architecures which use other sorcery:
+- MIPS
+- X86
+- powerpc
+- sparc
+- arm64
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+[bigeasy: only ARM for now]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -45,7 +45,7 @@ config ARM
+ 	select HARDIRQS_SW_RESEND
+ 	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)
+ 	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6
+-	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)
diff --git a/kernel/patches-4.14.x-rt/0292-seqlock-prevent-rt-starvation.patch b/kernel/patches-4.14.x-rt/0292-seqlock-prevent-rt-starvation.patch
new file mode 100644
index 000000000..3fd3d955e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0292-seqlock-prevent-rt-starvation.patch
@@ -0,0 +1,187 @@
+Subject: seqlock: Prevent rt starvation
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 22 Feb 2012 12:03:30 +0100
+
+If a low prio writer gets preempted while holding the seqlock write
+locked, a high prio reader spins forever on RT.
+
+To prevent this let the reader grab the spinlock, so it blocks and
+eventually boosts the writer. This way the writer can proceed and
+endless spinning is prevented.
+
+For seqcount writers we disable preemption over the update code
+path. Thanks to Al Viro for distangling some VFS code to make that
+possible.
+
+Nicholas Mc Guire:
+- spin_lock+unlock => spin_unlock_wait
+- __write_seqcount_begin => __raw_write_seqcount_begin
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+
+---
+ include/linux/seqlock.h |   56 +++++++++++++++++++++++++++++++++++++-----------
+ include/net/neighbour.h |    6 ++---
+ 2 files changed, 47 insertions(+), 15 deletions(-)
+
+--- a/include/linux/seqlock.h
++++ b/include/linux/seqlock.h
+@@ -221,20 +221,30 @@ static inline int read_seqcount_retry(co
+ 	return __read_seqcount_retry(s, start);
+ }
+ 
+-
+-
+-static inline void raw_write_seqcount_begin(seqcount_t *s)
++static inline void __raw_write_seqcount_begin(seqcount_t *s)
+ {
+ 	s->sequence++;
+ 	smp_wmb();
+ }
+ 
+-static inline void raw_write_seqcount_end(seqcount_t *s)
++static inline void raw_write_seqcount_begin(seqcount_t *s)
++{
++	preempt_disable_rt();
++	__raw_write_seqcount_begin(s);
++}
++
++static inline void __raw_write_seqcount_end(seqcount_t *s)
+ {
+ 	smp_wmb();
+ 	s->sequence++;
+ }
+ 
++static inline void raw_write_seqcount_end(seqcount_t *s)
++{
++	__raw_write_seqcount_end(s);
++	preempt_enable_rt();
++}
++
+ /**
+  * raw_write_seqcount_barrier - do a seq write barrier
+  * @s: pointer to seqcount_t
+@@ -429,10 +439,32 @@ typedef struct {
+ /*
+  * Read side functions for starting and finalizing a read side section.
+  */
++#ifndef CONFIG_PREEMPT_RT_FULL
+ static inline unsigned read_seqbegin(const seqlock_t *sl)
+ {
+ 	return read_seqcount_begin(&sl->seqcount);
+ }
++#else
++/*
++ * Starvation safe read side for RT
++ */
++static inline unsigned read_seqbegin(seqlock_t *sl)
++{
++	unsigned ret;
++
++repeat:
++	ret = ACCESS_ONCE(sl->seqcount.sequence);
++	if (unlikely(ret & 1)) {
++		/*
++		 * Take the lock and let the writer proceed (i.e. evtl
++		 * boost it), otherwise we could loop here forever.
++		 */
++		spin_unlock_wait(&sl->lock);
++		goto repeat;
++	}
++	return ret;
++}
++#endif
+ 
+ static inline unsigned read_seqretry(const seqlock_t *sl, unsigned start)
+ {
+@@ -447,36 +479,36 @@ static inline unsigned read_seqretry(con
+ static inline void write_seqlock(seqlock_t *sl)
+ {
+ 	spin_lock(&sl->lock);
+-	write_seqcount_begin(&sl->seqcount);
++	__raw_write_seqcount_begin(&sl->seqcount);
+ }
+ 
+ static inline void write_sequnlock(seqlock_t *sl)
+ {
+-	write_seqcount_end(&sl->seqcount);
++	__raw_write_seqcount_end(&sl->seqcount);
+ 	spin_unlock(&sl->lock);
+ }
+ 
+ static inline void write_seqlock_bh(seqlock_t *sl)
+ {
+ 	spin_lock_bh(&sl->lock);
+-	write_seqcount_begin(&sl->seqcount);
++	__raw_write_seqcount_begin(&sl->seqcount);
+ }
+ 
+ static inline void write_sequnlock_bh(seqlock_t *sl)
+ {
+-	write_seqcount_end(&sl->seqcount);
++	__raw_write_seqcount_end(&sl->seqcount);
+ 	spin_unlock_bh(&sl->lock);
+ }
+ 
+ static inline void write_seqlock_irq(seqlock_t *sl)
+ {
+ 	spin_lock_irq(&sl->lock);
+-	write_seqcount_begin(&sl->seqcount);
++	__raw_write_seqcount_begin(&sl->seqcount);
+ }
+ 
+ static inline void write_sequnlock_irq(seqlock_t *sl)
+ {
+-	write_seqcount_end(&sl->seqcount);
++	__raw_write_seqcount_end(&sl->seqcount);
+ 	spin_unlock_irq(&sl->lock);
+ }
+ 
+@@ -485,7 +517,7 @@ static inline unsigned long __write_seql
+ 	unsigned long flags;
+ 
+ 	spin_lock_irqsave(&sl->lock, flags);
+-	write_seqcount_begin(&sl->seqcount);
++	__raw_write_seqcount_begin(&sl->seqcount);
+ 	return flags;
+ }
+ 
+@@ -495,7 +527,7 @@ static inline unsigned long __write_seql
+ static inline void
+ write_sequnlock_irqrestore(seqlock_t *sl, unsigned long flags)
+ {
+-	write_seqcount_end(&sl->seqcount);
++	__raw_write_seqcount_end(&sl->seqcount);
+ 	spin_unlock_irqrestore(&sl->lock, flags);
+ }
+ 
+--- a/include/net/neighbour.h
++++ b/include/net/neighbour.h
+@@ -450,7 +450,7 @@ static inline int neigh_hh_bridge(struct
+ }
+ #endif
+ 
+-static inline int neigh_hh_output(const struct hh_cache *hh, struct sk_buff *skb)
++static inline int neigh_hh_output(struct hh_cache *hh, struct sk_buff *skb)
+ {
+ 	unsigned int seq;
+ 	unsigned int hh_len;
+@@ -474,7 +474,7 @@ static inline int neigh_hh_output(const
+ 
+ static inline int neigh_output(struct neighbour *n, struct sk_buff *skb)
+ {
+-	const struct hh_cache *hh = &n->hh;
++	struct hh_cache *hh = &n->hh;
+ 
+ 	if ((n->nud_state & NUD_CONNECTED) && hh->hh_len)
+ 		return neigh_hh_output(hh, skb);
+@@ -515,7 +515,7 @@ struct neighbour_cb {
+ 
+ #define NEIGH_CB(skb)	((struct neighbour_cb *)(skb)->cb)
+ 
+-static inline void neigh_ha_snapshot(char *dst, const struct neighbour *n,
++static inline void neigh_ha_snapshot(char *dst, struct neighbour *n,
+ 				     const struct net_device *dev)
+ {
+ 	unsigned int seq;
diff --git a/kernel/patches-4.14.x-rt/0293-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch b/kernel/patches-4.14.x-rt/0293-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch
new file mode 100644
index 000000000..c248ca0aa
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0293-sunrpc-make-svc_xprt_do_enqueue-use-get_cpu_light.patch
@@ -0,0 +1,62 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Wed, 18 Feb 2015 16:05:28 +0100
+Subject: sunrpc: Make svc_xprt_do_enqueue() use get_cpu_light()
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:915
+|in_atomic(): 1, irqs_disabled(): 0, pid: 3194, name: rpc.nfsd
+|Preemption disabled at:[<ffffffffa06bf0bb>] svc_xprt_received+0x4b/0xc0 [sunrpc]
+|CPU: 6 PID: 3194 Comm: rpc.nfsd Not tainted 3.18.7-rt1 #9
+|Hardware name: MEDION MS-7848/MS-7848, BIOS M7848W08.404 11/06/2014
+| ffff880409630000 ffff8800d9a33c78 ffffffff815bdeb5 0000000000000002
+| 0000000000000000 ffff8800d9a33c98 ffffffff81073c86 ffff880408dd6008
+| ffff880408dd6000 ffff8800d9a33cb8 ffffffff815c3d84 ffff88040b3ac000
+|Call Trace:
+| [<ffffffff815bdeb5>] dump_stack+0x4f/0x9e
+| [<ffffffff81073c86>] __might_sleep+0xe6/0x150
+| [<ffffffff815c3d84>] rt_spin_lock+0x24/0x50
+| [<ffffffffa06beec0>] svc_xprt_do_enqueue+0x80/0x230 [sunrpc]
+| [<ffffffffa06bf0bb>] svc_xprt_received+0x4b/0xc0 [sunrpc]
+| [<ffffffffa06c03ed>] svc_add_new_perm_xprt+0x6d/0x80 [sunrpc]
+| [<ffffffffa06b2693>] svc_addsock+0x143/0x200 [sunrpc]
+| [<ffffffffa072e69c>] write_ports+0x28c/0x340 [nfsd]
+| [<ffffffffa072d2ac>] nfsctl_transaction_write+0x4c/0x80 [nfsd]
+| [<ffffffff8117ee83>] vfs_write+0xb3/0x1d0
+| [<ffffffff8117f889>] SyS_write+0x49/0xb0
+| [<ffffffff815c4556>] system_call_fastpath+0x16/0x1b
+
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/sunrpc/svc_xprt.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/net/sunrpc/svc_xprt.c
++++ b/net/sunrpc/svc_xprt.c
+@@ -396,7 +396,7 @@ void svc_xprt_do_enqueue(struct svc_xprt
+ 		goto out;
+ 	}
+ 
+-	cpu = get_cpu();
++	cpu = get_cpu_light();
+ 	pool = svc_pool_for_cpu(xprt->xpt_server, cpu);
+ 
+ 	atomic_long_inc(&pool->sp_stats.packets);
+@@ -432,7 +432,7 @@ void svc_xprt_do_enqueue(struct svc_xprt
+ 
+ 		atomic_long_inc(&pool->sp_stats.threads_woken);
+ 		wake_up_process(rqstp->rq_task);
+-		put_cpu();
++		put_cpu_light();
+ 		goto out;
+ 	}
+ 	rcu_read_unlock();
+@@ -453,7 +453,7 @@ void svc_xprt_do_enqueue(struct svc_xprt
+ 		goto redo_search;
+ 	}
+ 	rqstp = NULL;
+-	put_cpu();
++	put_cpu_light();
+ out:
+ 	trace_svc_xprt_do_enqueue(xprt, rqstp);
+ }
diff --git a/kernel/patches-4.14.x-rt/0294-skbufhead-raw-lock.patch b/kernel/patches-4.14.x-rt/0294-skbufhead-raw-lock.patch
new file mode 100644
index 000000000..99b332e4f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0294-skbufhead-raw-lock.patch
@@ -0,0 +1,157 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 12 Jul 2011 15:38:34 +0200
+Subject: net: Use skbufhead with raw lock
+
+Use the rps lock as rawlock so we can keep irq-off regions. It looks low
+latency. However we can't kfree() from this context therefore we defer this
+to the softirq and use the tofree_queue list for it (similar to process_queue).
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/netdevice.h |    1 +
+ include/linux/skbuff.h    |    7 +++++++
+ net/core/dev.c            |   31 ++++++++++++++++++++++++-------
+ 3 files changed, 32 insertions(+), 7 deletions(-)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -2772,6 +2772,7 @@ struct softnet_data {
+ 	unsigned int		dropped;
+ 	struct sk_buff_head	input_pkt_queue;
+ 	struct napi_struct	backlog;
++	struct sk_buff_head	tofree_queue;
+ 
+ };
+ 
+--- a/include/linux/skbuff.h
++++ b/include/linux/skbuff.h
+@@ -288,6 +288,7 @@ struct sk_buff_head {
+ 
+ 	__u32		qlen;
+ 	spinlock_t	lock;
++	raw_spinlock_t	raw_lock;
+ };
+ 
+ struct sk_buff;
+@@ -1670,6 +1671,12 @@ static inline void skb_queue_head_init(s
+ 	__skb_queue_head_init(list);
+ }
+ 
++static inline void skb_queue_head_init_raw(struct sk_buff_head *list)
++{
++	raw_spin_lock_init(&list->raw_lock);
++	__skb_queue_head_init(list);
++}
++
+ static inline void skb_queue_head_init_class(struct sk_buff_head *list,
+ 		struct lock_class_key *class)
+ {
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -217,14 +217,14 @@ static inline struct hlist_head *dev_ind
+ static inline void rps_lock(struct softnet_data *sd)
+ {
+ #ifdef CONFIG_RPS
+-	spin_lock(&sd->input_pkt_queue.lock);
++	raw_spin_lock(&sd->input_pkt_queue.raw_lock);
+ #endif
+ }
+ 
+ static inline void rps_unlock(struct softnet_data *sd)
+ {
+ #ifdef CONFIG_RPS
+-	spin_unlock(&sd->input_pkt_queue.lock);
++	raw_spin_unlock(&sd->input_pkt_queue.raw_lock);
+ #endif
+ }
+ 
+@@ -4593,7 +4593,7 @@ static void flush_backlog(struct work_st
+ 	skb_queue_walk_safe(&sd->input_pkt_queue, skb, tmp) {
+ 		if (skb->dev->reg_state == NETREG_UNREGISTERING) {
+ 			__skb_unlink(skb, &sd->input_pkt_queue);
+-			kfree_skb(skb);
++			__skb_queue_tail(&sd->tofree_queue, skb);
+ 			input_queue_head_incr(sd);
+ 		}
+ 	}
+@@ -4603,11 +4603,14 @@ static void flush_backlog(struct work_st
+ 	skb_queue_walk_safe(&sd->process_queue, skb, tmp) {
+ 		if (skb->dev->reg_state == NETREG_UNREGISTERING) {
+ 			__skb_unlink(skb, &sd->process_queue);
+-			kfree_skb(skb);
++			__skb_queue_tail(&sd->tofree_queue, skb);
+ 			input_queue_head_incr(sd);
+ 		}
+ 	}
++	if (!skb_queue_empty(&sd->tofree_queue))
++		raise_softirq_irqoff(NET_RX_SOFTIRQ);
+ 	local_bh_enable();
++
+ }
+ 
+ static void flush_all_backlogs(void)
+@@ -5154,7 +5157,9 @@ static int process_backlog(struct napi_s
+ 	while (again) {
+ 		struct sk_buff *skb;
+ 
++		local_irq_disable();
+ 		while ((skb = __skb_dequeue(&sd->process_queue))) {
++			local_irq_enable();
+ 			rcu_read_lock();
+ 			__netif_receive_skb(skb);
+ 			rcu_read_unlock();
+@@ -5162,9 +5167,9 @@ static int process_backlog(struct napi_s
+ 			if (++work >= quota)
+ 				return work;
+ 
++			local_irq_disable();
+ 		}
+ 
+-		local_irq_disable();
+ 		rps_lock(sd);
+ 		if (skb_queue_empty(&sd->input_pkt_queue)) {
+ 			/*
+@@ -5604,13 +5609,21 @@ static __latent_entropy void net_rx_acti
+ 	unsigned long time_limit = jiffies +
+ 		usecs_to_jiffies(netdev_budget_usecs);
+ 	int budget = netdev_budget;
++	struct sk_buff_head tofree_q;
++	struct sk_buff *skb;
+ 	LIST_HEAD(list);
+ 	LIST_HEAD(repoll);
+ 
++	__skb_queue_head_init(&tofree_q);
++
+ 	local_irq_disable();
++	skb_queue_splice_init(&sd->tofree_queue, &tofree_q);
+ 	list_splice_init(&sd->poll_list, &list);
+ 	local_irq_enable();
+ 
++	while ((skb = __skb_dequeue(&tofree_q)))
++		kfree_skb(skb);
++
+ 	for (;;) {
+ 		struct napi_struct *n;
+ 
+@@ -8425,6 +8438,9 @@ static int dev_cpu_dead(unsigned int old
+ 		netif_rx_ni(skb);
+ 		input_queue_head_incr(oldsd);
+ 	}
++	while ((skb = __skb_dequeue(&oldsd->tofree_queue))) {
++		kfree_skb(skb);
++	}
+ 
+ 	return 0;
+ }
+@@ -8728,8 +8744,9 @@ static int __init net_dev_init(void)
+ 
+ 		INIT_WORK(flush, flush_backlog);
+ 
+-		skb_queue_head_init(&sd->input_pkt_queue);
+-		skb_queue_head_init(&sd->process_queue);
++		skb_queue_head_init_raw(&sd->input_pkt_queue);
++		skb_queue_head_init_raw(&sd->process_queue);
++		skb_queue_head_init_raw(&sd->tofree_queue);
+ 		INIT_LIST_HEAD(&sd->poll_list);
+ 		sd->output_queue_tailp = &sd->output_queue;
+ #ifdef CONFIG_RPS
diff --git a/kernel/patches-4.14.x-rt/0295-net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch b/kernel/patches-4.14.x-rt/0295-net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch
new file mode 100644
index 000000000..72f7f344f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0295-net-core-cpuhotplug-drain-input_pkt_queue-lockless.patch
@@ -0,0 +1,46 @@
+Subject: net/core/cpuhotplug: Drain input_pkt_queue lockless
+From: Grygorii Strashko <grygorii.strashko@ti.com>
+Date: Fri, 9 Oct 2015 09:25:49 -0500
+
+I can constantly see below error report with 4.1 RT-kernel on TI ARM dra7-evm 
+if I'm trying to unplug cpu1:
+
+[   57.737589] CPU1: shutdown
+[   57.767537] BUG: spinlock bad magic on CPU#0, sh/137
+[   57.767546]  lock: 0xee994730, .magic: 00000000, .owner: <none>/-1, .owner_cpu: 0
+[   57.767552] CPU: 0 PID: 137 Comm: sh Not tainted 4.1.10-rt8-01700-g2c38702-dirty #55
+[   57.767555] Hardware name: Generic DRA74X (Flattened Device Tree)
+[   57.767568] [<c001acd0>] (unwind_backtrace) from [<c001534c>] (show_stack+0x20/0x24)
+[   57.767579] [<c001534c>] (show_stack) from [<c075560c>] (dump_stack+0x84/0xa0)
+[   57.767593] [<c075560c>] (dump_stack) from [<c00aca48>] (spin_dump+0x84/0xac)
+[   57.767603] [<c00aca48>] (spin_dump) from [<c00acaa4>] (spin_bug+0x34/0x38)
+[   57.767614] [<c00acaa4>] (spin_bug) from [<c00acc10>] (do_raw_spin_lock+0x168/0x1c0)
+[   57.767624] [<c00acc10>] (do_raw_spin_lock) from [<c075b4cc>] (_raw_spin_lock+0x4c/0x54)
+[   57.767631] [<c075b4cc>] (_raw_spin_lock) from [<c07599fc>] (rt_spin_lock_slowlock+0x5c/0x374)
+[   57.767638] [<c07599fc>] (rt_spin_lock_slowlock) from [<c075bcf4>] (rt_spin_lock+0x38/0x70)
+[   57.767649] [<c075bcf4>] (rt_spin_lock) from [<c06333c0>] (skb_dequeue+0x28/0x7c)
+[   57.767662] [<c06333c0>] (skb_dequeue) from [<c06476ec>] (dev_cpu_callback+0x1b8/0x240)
+[   57.767673] [<c06476ec>] (dev_cpu_callback) from [<c007566c>] (notifier_call_chain+0x3c/0xb4)
+
+The reason is that skb_dequeue is taking skb->lock, but RT changed the
+core code to use a raw spinlock. The non-raw lock is not initialized
+on purpose to catch exactly this kind of problem.
+
+Fixes: 91df05da13a6 'net: Use skbufhead with raw lock'
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: stable-rt@vger.kernel.org
+---
+ net/core/dev.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -8434,7 +8434,7 @@ static int dev_cpu_dead(unsigned int old
+ 		netif_rx_ni(skb);
+ 		input_queue_head_incr(oldsd);
+ 	}
+-	while ((skb = skb_dequeue(&oldsd->input_pkt_queue))) {
++	while ((skb = __skb_dequeue(&oldsd->input_pkt_queue))) {
+ 		netif_rx_ni(skb);
+ 		input_queue_head_incr(oldsd);
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0296-net-move-xmit_recursion-to-per-task-variable-on-RT.patch b/kernel/patches-4.14.x-rt/0296-net-move-xmit_recursion-to-per-task-variable-on-RT.patch
new file mode 100644
index 000000000..53857925e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0296-net-move-xmit_recursion-to-per-task-variable-on-RT.patch
@@ -0,0 +1,150 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 13 Jan 2016 15:55:02 +0100
+Subject: net: move xmit_recursion to per-task variable on -RT
+
+A softirq on -RT can be preempted. That means one task is in
+__dev_queue_xmit(), gets preempted and another task may enter
+__dev_queue_xmit() aw well. netperf together with a bridge device
+will then trigger the `recursion alert` because each task increments
+the xmit_recursion variable which is per-CPU.
+A virtual device like br0 is required to trigger this warning.
+
+This patch moves the counter to per task instead per-CPU so it counts
+the recursion properly on -RT.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/netdevice.h |   41 ++++++++++++++++++++++++++++++++++++++++-
+ include/linux/sched.h     |    3 +++
+ net/core/dev.c            |    9 +++++----
+ net/core/filter.c         |    6 +++---
+ 4 files changed, 51 insertions(+), 8 deletions(-)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -2433,14 +2433,53 @@ void netdev_freemem(struct net_device *d
+ void synchronize_net(void);
+ int init_dummy_netdev(struct net_device *dev);
+ 
+-DECLARE_PER_CPU(int, xmit_recursion);
+ #define XMIT_RECURSION_LIMIT	10
++#ifdef CONFIG_PREEMPT_RT_FULL
++static inline int dev_recursion_level(void)
++{
++	return current->xmit_recursion;
++}
++
++static inline int xmit_rec_read(void)
++{
++	return current->xmit_recursion;
++}
++
++static inline void xmit_rec_inc(void)
++{
++	current->xmit_recursion++;
++}
++
++static inline void xmit_rec_dec(void)
++{
++	current->xmit_recursion--;
++}
++
++#else
++
++DECLARE_PER_CPU(int, xmit_recursion);
+ 
+ static inline int dev_recursion_level(void)
+ {
+ 	return this_cpu_read(xmit_recursion);
+ }
+ 
++static inline int xmit_rec_read(void)
++{
++	return __this_cpu_read(xmit_recursion);
++}
++
++static inline void xmit_rec_inc(void)
++{
++	__this_cpu_inc(xmit_recursion);
++}
++
++static inline void xmit_rec_dec(void)
++{
++	__this_cpu_dec(xmit_recursion);
++}
++#endif
++
+ 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);
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1107,6 +1107,9 @@ struct task_struct {
+ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
+ 	unsigned long			task_state_change;
+ #endif
++#ifdef CONFIG_PREEMPT_RT_FULL
++	int				xmit_recursion;
++#endif
+ 	int				pagefault_disabled;
+ #ifdef CONFIG_MMU
+ 	struct task_struct		*oom_reaper_list;
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -3233,8 +3233,10 @@ static void skb_update_prio(struct sk_bu
+ #define skb_update_prio(skb)
+ #endif
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ DEFINE_PER_CPU(int, xmit_recursion);
+ EXPORT_SYMBOL(xmit_recursion);
++#endif
+ 
+ /**
+  *	dev_loopback_xmit - loop back @skb
+@@ -3475,8 +3477,7 @@ static int __dev_queue_xmit(struct sk_bu
+ 		int cpu = smp_processor_id(); /* ok because BHs are off */
+ 
+ 		if (txq->xmit_lock_owner != cpu) {
+-			if (unlikely(__this_cpu_read(xmit_recursion) >
+-				     XMIT_RECURSION_LIMIT))
++			if (unlikely(xmit_rec_read() > XMIT_RECURSION_LIMIT))
+ 				goto recursion_alert;
+ 
+ 			skb = validate_xmit_skb(skb, dev);
+@@ -3486,9 +3487,9 @@ static int __dev_queue_xmit(struct sk_bu
+ 			HARD_TX_LOCK(dev, txq, cpu);
+ 
+ 			if (!netif_xmit_stopped(txq)) {
+-				__this_cpu_inc(xmit_recursion);
++				xmit_rec_inc();
+ 				skb = dev_hard_start_xmit(skb, dev, txq, &rc);
+-				__this_cpu_dec(xmit_recursion);
++				xmit_rec_dec();
+ 				if (dev_xmit_complete(rc)) {
+ 					HARD_TX_UNLOCK(dev, txq);
+ 					goto out;
+--- a/net/core/filter.c
++++ b/net/core/filter.c
+@@ -1696,7 +1696,7 @@ static inline int __bpf_tx_skb(struct ne
+ {
+ 	int ret;
+ 
+-	if (unlikely(__this_cpu_read(xmit_recursion) > XMIT_RECURSION_LIMIT)) {
++	if (unlikely(xmit_rec_read() > XMIT_RECURSION_LIMIT)) {
+ 		net_crit_ratelimited("bpf: recursion limit reached on datapath, buggy bpf program?\n");
+ 		kfree_skb(skb);
+ 		return -ENETDOWN;
+@@ -1704,9 +1704,9 @@ static inline int __bpf_tx_skb(struct ne
+ 
+ 	skb->dev = dev;
+ 
+-	__this_cpu_inc(xmit_recursion);
++	xmit_rec_inc();
+ 	ret = dev_queue_xmit(skb);
+-	__this_cpu_dec(xmit_recursion);
++	xmit_rec_dec();
+ 
+ 	return ret;
+ }
diff --git a/kernel/patches-4.14.x-rt/0297-net-provide-a-way-to-delegate-processing-a-softirq-t.patch b/kernel/patches-4.14.x-rt/0297-net-provide-a-way-to-delegate-processing-a-softirq-t.patch
new file mode 100644
index 000000000..e53a9c5a6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0297-net-provide-a-way-to-delegate-processing-a-softirq-t.patch
@@ -0,0 +1,78 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 20 Jan 2016 15:39:05 +0100
+Subject: net: provide a way to delegate processing a softirq to
+ ksoftirqd
+
+If the NET_RX uses up all of his budget it moves the following NAPI
+invocations into the `ksoftirqd`. On -RT it does not do so. Instead it
+rises the NET_RX softirq in its current context again.
+
+In order to get closer to mainline's behaviour this patch provides
+__raise_softirq_irqoff_ksoft() which raises the softirq in the ksoftird.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/interrupt.h |    8 ++++++++
+ kernel/softirq.c          |   21 +++++++++++++++++++++
+ net/core/dev.c            |    2 +-
+ 3 files changed, 30 insertions(+), 1 deletion(-)
+
+--- a/include/linux/interrupt.h
++++ b/include/linux/interrupt.h
+@@ -519,6 +519,14 @@ extern void thread_do_softirq(void);
+ extern void open_softirq(int nr, void (*action)(struct softirq_action *));
+ extern void softirq_init(void);
+ extern void __raise_softirq_irqoff(unsigned int nr);
++#ifdef CONFIG_PREEMPT_RT_FULL
++extern void __raise_softirq_irqoff_ksoft(unsigned int nr);
++#else
++static inline void __raise_softirq_irqoff_ksoft(unsigned int nr)
++{
++	__raise_softirq_irqoff(nr);
++}
++#endif
+ 
+ extern void raise_softirq_irqoff(unsigned int nr);
+ extern void raise_softirq(unsigned int nr);
+--- a/kernel/softirq.c
++++ b/kernel/softirq.c
+@@ -686,6 +686,27 @@ void __raise_softirq_irqoff(unsigned int
+ }
+ 
+ /*
++ * Same as __raise_softirq_irqoff() but will process them in ksoftirqd
++ */
++void __raise_softirq_irqoff_ksoft(unsigned int nr)
++{
++	unsigned int mask;
++
++	if (WARN_ON_ONCE(!__this_cpu_read(ksoftirqd) ||
++			 !__this_cpu_read(ktimer_softirqd)))
++		return;
++	mask = 1UL << nr;
++
++	trace_softirq_raise(nr);
++	or_softirq_pending(mask);
++	if (mask & TIMER_SOFTIRQS)
++		__this_cpu_read(ktimer_softirqd)->softirqs_raised |= mask;
++	else
++		__this_cpu_read(ksoftirqd)->softirqs_raised |= mask;
++	wakeup_proper_softirq(nr);
++}
++
++/*
+  * This function must run with irqs disabled!
+  */
+ void raise_softirq_irqoff(unsigned int nr)
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -5654,7 +5654,7 @@ static __latent_entropy void net_rx_acti
+ 	list_splice_tail(&repoll, &list);
+ 	list_splice(&list, &sd->poll_list);
+ 	if (!list_empty(&sd->poll_list))
+-		__raise_softirq_irqoff(NET_RX_SOFTIRQ);
++		__raise_softirq_irqoff_ksoft(NET_RX_SOFTIRQ);
+ 
+ 	net_rps_action_and_irq_enable(sd);
+ out:
diff --git a/kernel/patches-4.14.x-rt/0298-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch b/kernel/patches-4.14.x-rt/0298-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch
new file mode 100644
index 000000000..a449002d5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0298-net-dev-always-take-qdisc-s-busylock-in-__dev_xmit_s.patch
@@ -0,0 +1,34 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 30 Mar 2016 13:36:29 +0200
+Subject: [PATCH] net: dev: always take qdisc's busylock in __dev_xmit_skb()
+
+The root-lock is dropped before dev_hard_start_xmit() is invoked and after
+setting the __QDISC___STATE_RUNNING bit. If this task is now pushed away
+by a task with a higher priority then the task with the higher priority
+won't be able to submit packets to the NIC directly instead they will be
+enqueued into the Qdisc. The NIC will remain idle until the task(s) with
+higher priority leave the CPU and the task with lower priority gets back
+and finishes the job.
+
+If we take always the busylock we ensure that the RT task can boost the
+low-prio task and submit the packet.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/core/dev.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -3170,7 +3170,11 @@ static inline int __dev_xmit_skb(struct
+ 	 * This permits qdisc->running owner to get the lock more
+ 	 * often and dequeue packets faster.
+ 	 */
++#ifdef CONFIG_PREEMPT_RT_FULL
++	contended = true;
++#else
+ 	contended = qdisc_is_running(q);
++#endif
+ 	if (unlikely(contended))
+ 		spin_lock(&q->busylock);
+ 
diff --git a/kernel/patches-4.14.x-rt/0299-net-Qdisc-use-a-seqlock-instead-seqcount.patch b/kernel/patches-4.14.x-rt/0299-net-Qdisc-use-a-seqlock-instead-seqcount.patch
new file mode 100644
index 000000000..27645fc30
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0299-net-Qdisc-use-a-seqlock-instead-seqcount.patch
@@ -0,0 +1,272 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 14 Sep 2016 17:36:35 +0200
+Subject: [PATCH] net/Qdisc: use a seqlock instead seqcount
+
+The seqcount disables preemption on -RT while it is held which can't
+remove. Also we don't want the reader to spin for ages if the writer is
+scheduled out. The seqlock on the other hand will serialize / sleep on
+the lock while writer is active.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/seqlock.h    |    9 +++++++++
+ include/net/gen_stats.h    |    9 +++++----
+ include/net/net_seq_lock.h |   15 +++++++++++++++
+ include/net/sch_generic.h  |   21 ++++++++++++++++++---
+ net/core/gen_estimator.c   |    6 +++---
+ net/core/gen_stats.c       |    8 ++++----
+ net/sched/sch_api.c        |    2 +-
+ net/sched/sch_generic.c    |   12 ++++++++++++
+ 8 files changed, 67 insertions(+), 15 deletions(-)
+ create mode 100644 include/net/net_seq_lock.h
+
+--- a/include/linux/seqlock.h
++++ b/include/linux/seqlock.h
+@@ -482,6 +482,15 @@ static inline void write_seqlock(seqlock
+ 	__raw_write_seqcount_begin(&sl->seqcount);
+ }
+ 
++static inline int try_write_seqlock(seqlock_t *sl)
++{
++	if (spin_trylock(&sl->lock)) {
++		__raw_write_seqcount_begin(&sl->seqcount);
++		return 1;
++	}
++	return 0;
++}
++
+ static inline void write_sequnlock(seqlock_t *sl)
+ {
+ 	__raw_write_seqcount_end(&sl->seqcount);
+--- a/include/net/gen_stats.h
++++ b/include/net/gen_stats.h
+@@ -6,6 +6,7 @@
+ #include <linux/socket.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/pkt_sched.h>
++#include <net/net_seq_lock.h>
+ 
+ struct gnet_stats_basic_cpu {
+ 	struct gnet_stats_basic_packed bstats;
+@@ -36,11 +37,11 @@ int gnet_stats_start_copy_compat(struct
+ 				 spinlock_t *lock, struct gnet_dump *d,
+ 				 int padattr);
+ 
+-int gnet_stats_copy_basic(const seqcount_t *running,
++int gnet_stats_copy_basic(net_seqlock_t *running,
+ 			  struct gnet_dump *d,
+ 			  struct gnet_stats_basic_cpu __percpu *cpu,
+ 			  struct gnet_stats_basic_packed *b);
+-void __gnet_stats_copy_basic(const seqcount_t *running,
++void __gnet_stats_copy_basic(net_seqlock_t *running,
+ 			     struct gnet_stats_basic_packed *bstats,
+ 			     struct gnet_stats_basic_cpu __percpu *cpu,
+ 			     struct gnet_stats_basic_packed *b);
+@@ -57,13 +58,13 @@ int gen_new_estimator(struct gnet_stats_
+ 		      struct gnet_stats_basic_cpu __percpu *cpu_bstats,
+ 		      struct net_rate_estimator __rcu **rate_est,
+ 		      spinlock_t *stats_lock,
+-		      seqcount_t *running, struct nlattr *opt);
++		      net_seqlock_t *running, struct nlattr *opt);
+ void gen_kill_estimator(struct net_rate_estimator __rcu **ptr);
+ int gen_replace_estimator(struct gnet_stats_basic_packed *bstats,
+ 			  struct gnet_stats_basic_cpu __percpu *cpu_bstats,
+ 			  struct net_rate_estimator __rcu **ptr,
+ 			  spinlock_t *stats_lock,
+-			  seqcount_t *running, struct nlattr *opt);
++			  net_seqlock_t *running, struct nlattr *opt);
+ bool gen_estimator_active(struct net_rate_estimator __rcu **ptr);
+ bool gen_estimator_read(struct net_rate_estimator __rcu **ptr,
+ 			struct gnet_stats_rate_est64 *sample);
+--- /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__
++
++#ifdef CONFIG_PREEMPT_RT_BASE
++# define net_seqlock_t			seqlock_t
++# define net_seq_begin(__r)		read_seqbegin(__r)
++# define net_seq_retry(__r, __s)	read_seqretry(__r, __s)
++
++#else
++# define net_seqlock_t			seqcount_t
++# define net_seq_begin(__r)		read_seqcount_begin(__r)
++# define net_seq_retry(__r, __s)	read_seqcount_retry(__r, __s)
++#endif
++
++#endif
+--- a/include/net/sch_generic.h
++++ b/include/net/sch_generic.h
+@@ -10,6 +10,7 @@
+ #include <linux/percpu.h>
+ #include <linux/dynamic_queue_limits.h>
+ #include <linux/list.h>
++#include <net/net_seq_lock.h>
+ #include <linux/refcount.h>
+ #include <linux/workqueue.h>
+ #include <net/gen_stats.h>
+@@ -90,7 +91,7 @@ struct Qdisc {
+ 	struct sk_buff		*gso_skb ____cacheline_aligned_in_smp;
+ 	struct qdisc_skb_head	q;
+ 	struct gnet_stats_basic_packed bstats;
+-	seqcount_t		running;
++	net_seqlock_t		running;
+ 	struct gnet_stats_queue	qstats;
+ 	unsigned long		state;
+ 	struct Qdisc            *next_sched;
+@@ -109,13 +110,22 @@ static inline void qdisc_refcount_inc(st
+ 	refcount_inc(&qdisc->refcnt);
+ }
+ 
+-static inline bool qdisc_is_running(const struct Qdisc *qdisc)
++static inline bool qdisc_is_running(struct Qdisc *qdisc)
+ {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	return spin_is_locked(&qdisc->running.lock) ? true : false;
++#else
+ 	return (raw_read_seqcount(&qdisc->running) & 1) ? true : false;
++#endif
+ }
+ 
+ static inline bool qdisc_run_begin(struct Qdisc *qdisc)
+ {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	if (try_write_seqlock(&qdisc->running))
++		return true;
++	return false;
++#else
+ 	if (qdisc_is_running(qdisc))
+ 		return false;
+ 	/* Variant of write_seqcount_begin() telling lockdep a trylock
+@@ -124,11 +134,16 @@ static inline bool qdisc_run_begin(struc
+ 	raw_write_seqcount_begin(&qdisc->running);
+ 	seqcount_acquire(&qdisc->running.dep_map, 0, 1, _RET_IP_);
+ 	return true;
++#endif
+ }
+ 
+ static inline void qdisc_run_end(struct Qdisc *qdisc)
+ {
++#ifdef CONFIG_PREEMPT_RT_BASE
++	write_sequnlock(&qdisc->running);
++#else
+ 	write_seqcount_end(&qdisc->running);
++#endif
+ }
+ 
+ static inline bool qdisc_may_bulk(const struct Qdisc *qdisc)
+@@ -338,7 +353,7 @@ static inline spinlock_t *qdisc_root_sle
+ 	return qdisc_lock(root);
+ }
+ 
+-static inline seqcount_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
++static inline net_seqlock_t *qdisc_root_sleeping_running(const struct Qdisc *qdisc)
+ {
+ 	struct Qdisc *root = qdisc_root_sleeping(qdisc);
+ 
+--- a/net/core/gen_estimator.c
++++ b/net/core/gen_estimator.c
+@@ -46,7 +46,7 @@
+ struct net_rate_estimator {
+ 	struct gnet_stats_basic_packed	*bstats;
+ 	spinlock_t		*stats_lock;
+-	seqcount_t		*running;
++	net_seqlock_t		*running;
+ 	struct gnet_stats_basic_cpu __percpu *cpu_bstats;
+ 	u8			ewma_log;
+ 	u8			intvl_log; /* period : (250ms << intvl_log) */
+@@ -128,7 +128,7 @@ int gen_new_estimator(struct gnet_stats_
+ 		      struct gnet_stats_basic_cpu __percpu *cpu_bstats,
+ 		      struct net_rate_estimator __rcu **rate_est,
+ 		      spinlock_t *stats_lock,
+-		      seqcount_t *running,
++		      net_seqlock_t *running,
+ 		      struct nlattr *opt)
+ {
+ 	struct gnet_estimator *parm = nla_data(opt);
+@@ -217,7 +217,7 @@ int gen_replace_estimator(struct gnet_st
+ 			  struct gnet_stats_basic_cpu __percpu *cpu_bstats,
+ 			  struct net_rate_estimator __rcu **rate_est,
+ 			  spinlock_t *stats_lock,
+-			  seqcount_t *running, struct nlattr *opt)
++			  net_seqlock_t *running, struct nlattr *opt)
+ {
+ 	return gen_new_estimator(bstats, cpu_bstats, rate_est,
+ 				 stats_lock, running, opt);
+--- a/net/core/gen_stats.c
++++ b/net/core/gen_stats.c
+@@ -130,7 +130,7 @@ static void
+ }
+ 
+ void
+-__gnet_stats_copy_basic(const seqcount_t *running,
++__gnet_stats_copy_basic(net_seqlock_t *running,
+ 			struct gnet_stats_basic_packed *bstats,
+ 			struct gnet_stats_basic_cpu __percpu *cpu,
+ 			struct gnet_stats_basic_packed *b)
+@@ -143,10 +143,10 @@ void
+ 	}
+ 	do {
+ 		if (running)
+-			seq = read_seqcount_begin(running);
++			seq = net_seq_begin(running);
+ 		bstats->bytes = b->bytes;
+ 		bstats->packets = b->packets;
+-	} while (running && read_seqcount_retry(running, seq));
++	} while (running && net_seq_retry(running, seq));
+ }
+ EXPORT_SYMBOL(__gnet_stats_copy_basic);
+ 
+@@ -164,7 +164,7 @@ EXPORT_SYMBOL(__gnet_stats_copy_basic);
+  * if the room in the socket buffer was not sufficient.
+  */
+ int
+-gnet_stats_copy_basic(const seqcount_t *running,
++gnet_stats_copy_basic(net_seqlock_t *running,
+ 		      struct gnet_dump *d,
+ 		      struct gnet_stats_basic_cpu __percpu *cpu,
+ 		      struct gnet_stats_basic_packed *b)
+--- a/net/sched/sch_api.c
++++ b/net/sched/sch_api.c
+@@ -1081,7 +1081,7 @@ static struct Qdisc *qdisc_create(struct
+ 			rcu_assign_pointer(sch->stab, stab);
+ 		}
+ 		if (tca[TCA_RATE]) {
+-			seqcount_t *running;
++			net_seqlock_t *running;
+ 
+ 			err = -EOPNOTSUPP;
+ 			if (sch->flags & TCQ_F_MQROOT)
+--- a/net/sched/sch_generic.c
++++ b/net/sched/sch_generic.c
+@@ -429,7 +429,11 @@ struct Qdisc noop_qdisc = {
+ 	.ops		=	&noop_qdisc_ops,
+ 	.q.lock		=	__SPIN_LOCK_UNLOCKED(noop_qdisc.q.lock),
+ 	.dev_queue	=	&noop_netdev_queue,
++#ifdef CONFIG_PREEMPT_RT_BASE
++	.running	=	__SEQLOCK_UNLOCKED(noop_qdisc.running),
++#else
+ 	.running	=	SEQCNT_ZERO(noop_qdisc.running),
++#endif
+ 	.busylock	=	__SPIN_LOCK_UNLOCKED(noop_qdisc.busylock),
+ };
+ EXPORT_SYMBOL(noop_qdisc);
+@@ -628,9 +632,17 @@ struct Qdisc *qdisc_alloc(struct netdev_
+ 	lockdep_set_class(&sch->busylock,
+ 			  dev->qdisc_tx_busylock ?: &qdisc_tx_busylock);
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++	seqlock_init(&sch->running);
++	lockdep_set_class(&sch->running.seqcount,
++			  dev->qdisc_running_key ?: &qdisc_running_key);
++	lockdep_set_class(&sch->running.lock,
++			  dev->qdisc_running_key ?: &qdisc_running_key);
++#else
+ 	seqcount_init(&sch->running);
+ 	lockdep_set_class(&sch->running,
+ 			  dev->qdisc_running_key ?: &qdisc_running_key);
++#endif
+ 
+ 	sch->ops = ops;
+ 	sch->enqueue = ops->enqueue;
diff --git a/kernel/patches-4.14.x-rt/0300-net-add-back-the-missing-serialization-in-ip_send_un.patch b/kernel/patches-4.14.x-rt/0300-net-add-back-the-missing-serialization-in-ip_send_un.patch
new file mode 100644
index 000000000..0dc9f7f2f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0300-net-add-back-the-missing-serialization-in-ip_send_un.patch
@@ -0,0 +1,92 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 31 Aug 2016 17:21:56 +0200
+Subject: [PATCH] net: add back the missing serialization in
+ ip_send_unicast_reply()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Some time ago Sami Pietikäinen reported a crash on -RT in
+ip_send_unicast_reply() which was later fixed by Nicholas Mc Guire
+(v3.12.8-rt11). Later (v3.18.8) the code was reworked and I dropped the
+patch. As it turns out it was mistake.
+I have reports that the same crash is possible with a similar backtrace.
+It seems that vanilla protects access to this_cpu_ptr() via
+local_bh_disable(). This does not work the on -RT since we can have
+NET_RX and NET_TX running in parallel on the same CPU.
+This is brings back the old locks.
+
+|Unable to handle kernel NULL pointer dereference at virtual address 00000010
+|PC is at __ip_make_skb+0x198/0x3e8
+|[<c04e39d8>] (__ip_make_skb) from [<c04e3ca8>] (ip_push_pending_frames+0x20/0x40)
+|[<c04e3ca8>] (ip_push_pending_frames) from [<c04e3ff0>] (ip_send_unicast_reply+0x210/0x22c)
+|[<c04e3ff0>] (ip_send_unicast_reply) from [<c04fbb54>] (tcp_v4_send_reset+0x190/0x1c0)
+|[<c04fbb54>] (tcp_v4_send_reset) from [<c04fcc1c>] (tcp_v4_do_rcv+0x22c/0x288)
+|[<c04fcc1c>] (tcp_v4_do_rcv) from [<c0474364>] (release_sock+0xb4/0x150)
+|[<c0474364>] (release_sock) from [<c04ed904>] (tcp_close+0x240/0x454)
+|[<c04ed904>] (tcp_close) from [<c0511408>] (inet_release+0x74/0x7c)
+|[<c0511408>] (inet_release) from [<c0470728>] (sock_release+0x30/0xb0)
+|[<c0470728>] (sock_release) from [<c0470abc>] (sock_close+0x1c/0x24)
+|[<c0470abc>] (sock_close) from [<c0115ec4>] (__fput+0xe8/0x20c)
+|[<c0115ec4>] (__fput) from [<c0116050>] (____fput+0x18/0x1c)
+|[<c0116050>] (____fput) from [<c0058138>] (task_work_run+0xa4/0xb8)
+|[<c0058138>] (task_work_run) from [<c0011478>] (do_work_pending+0xd0/0xe4)
+|[<c0011478>] (do_work_pending) from [<c000e740>] (work_pending+0xc/0x20)
+|Code: e3530001 8a000001 e3a00040 ea000011 (e5973010)
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/ipv4/tcp_ipv4.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/net/ipv4/tcp_ipv4.c
++++ b/net/ipv4/tcp_ipv4.c
+@@ -62,6 +62,7 @@
+ #include <linux/init.h>
+ #include <linux/times.h>
+ #include <linux/slab.h>
++#include <linux/locallock.h>
+ 
+ #include <net/net_namespace.h>
+ #include <net/icmp.h>
+@@ -580,6 +581,7 @@ void tcp_v4_send_check(struct sock *sk,
+ }
+ EXPORT_SYMBOL(tcp_v4_send_check);
+ 
++static DEFINE_LOCAL_IRQ_LOCK(tcp_sk_lock);
+ /*
+  *	This routine will send an RST to the other tcp.
+  *
+@@ -709,6 +711,7 @@ static void tcp_v4_send_reset(const stru
+ 
+ 	arg.tos = ip_hdr(skb)->tos;
+ 	arg.uid = sock_net_uid(net, sk && sk_fullsock(sk) ? sk : NULL);
++	local_lock(tcp_sk_lock);
+ 	local_bh_disable();
+ 	ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
+ 			      skb, &TCP_SKB_CB(skb)->header.h4.opt,
+@@ -718,6 +721,7 @@ static void tcp_v4_send_reset(const stru
+ 	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
+ 	__TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
+ 	local_bh_enable();
++	local_unlock(tcp_sk_lock);
+ 
+ #ifdef CONFIG_TCP_MD5SIG
+ out:
+@@ -795,6 +799,7 @@ static void tcp_v4_send_ack(const struct
+ 		arg.bound_dev_if = oif;
+ 	arg.tos = tos;
+ 	arg.uid = sock_net_uid(net, sk_fullsock(sk) ? sk : NULL);
++	local_lock(tcp_sk_lock);
+ 	local_bh_disable();
+ 	ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
+ 			      skb, &TCP_SKB_CB(skb)->header.h4.opt,
+@@ -803,6 +808,7 @@ static void tcp_v4_send_ack(const struct
+ 
+ 	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
+ 	local_bh_enable();
++	local_unlock(tcp_sk_lock);
+ }
+ 
+ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
diff --git a/kernel/patches-4.14.x-rt/0301-net-take-the-tcp_sk_lock-lock-with-BH-disabled.patch b/kernel/patches-4.14.x-rt/0301-net-take-the-tcp_sk_lock-lock-with-BH-disabled.patch
new file mode 100644
index 000000000..47e284763
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0301-net-take-the-tcp_sk_lock-lock-with-BH-disabled.patch
@@ -0,0 +1,67 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 21 Aug 2017 15:09:13 +0200
+Subject: [PATCH] net: take the tcp_sk_lock lock with BH disabled
+
+Lockdep may complain about an unsafe locking scenario:
+|      CPU0                    CPU1
+|      ----                    ----
+| lock((tcp_sk_lock).lock);
+|                              lock(&per_cpu(local_softirq_locks[i], __cpu).lock);
+|                              lock((tcp_sk_lock).lock);
+| lock(&per_cpu(local_softirq_locks[i], __cpu).lock);
+
+in the call paths:
+	do_current_softirqs -> tcp_v4_send_ack()
+vs
+	tcp_v4_send_reset -> do_current_softirqs().
+
+This should not happen since local_softirq_locks is per CPU. Reversing
+the order makes lockdep happy.
+
+Reported-by: Jacek Konieczny <jajcus@jajcus.net>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/ipv4/tcp_ipv4.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/net/ipv4/tcp_ipv4.c
++++ b/net/ipv4/tcp_ipv4.c
+@@ -711,8 +711,8 @@ static void tcp_v4_send_reset(const stru
+ 
+ 	arg.tos = ip_hdr(skb)->tos;
+ 	arg.uid = sock_net_uid(net, sk && sk_fullsock(sk) ? sk : NULL);
+-	local_lock(tcp_sk_lock);
+ 	local_bh_disable();
++	local_lock(tcp_sk_lock);
+ 	ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
+ 			      skb, &TCP_SKB_CB(skb)->header.h4.opt,
+ 			      ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+@@ -720,8 +720,8 @@ static void tcp_v4_send_reset(const stru
+ 
+ 	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
+ 	__TCP_INC_STATS(net, TCP_MIB_OUTRSTS);
+-	local_bh_enable();
+ 	local_unlock(tcp_sk_lock);
++	local_bh_enable();
+ 
+ #ifdef CONFIG_TCP_MD5SIG
+ out:
+@@ -799,16 +799,16 @@ static void tcp_v4_send_ack(const struct
+ 		arg.bound_dev_if = oif;
+ 	arg.tos = tos;
+ 	arg.uid = sock_net_uid(net, sk_fullsock(sk) ? sk : NULL);
+-	local_lock(tcp_sk_lock);
+ 	local_bh_disable();
++	local_lock(tcp_sk_lock);
+ 	ip_send_unicast_reply(*this_cpu_ptr(net->ipv4.tcp_sk),
+ 			      skb, &TCP_SKB_CB(skb)->header.h4.opt,
+ 			      ip_hdr(skb)->saddr, ip_hdr(skb)->daddr,
+ 			      &arg, arg.iov[0].iov_len);
+ 
+ 	__TCP_INC_STATS(net, TCP_MIB_OUTSEGS);
+-	local_bh_enable();
+ 	local_unlock(tcp_sk_lock);
++	local_bh_enable();
+ }
+ 
+ static void tcp_v4_timewait_ack(struct sock *sk, struct sk_buff *skb)
diff --git a/kernel/patches-4.14.x-rt/0302-net-add-a-lock-around-icmp_sk.patch b/kernel/patches-4.14.x-rt/0302-net-add-a-lock-around-icmp_sk.patch
new file mode 100644
index 000000000..4d552af76
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0302-net-add-a-lock-around-icmp_sk.patch
@@ -0,0 +1,65 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 31 Aug 2016 17:54:09 +0200
+Subject: [PATCH] net: add a lock around icmp_sk()
+
+It looks like the this_cpu_ptr() access in icmp_sk() is protected with
+local_bh_disable(). To avoid missing serialization in -RT I am adding
+here a local lock. No crash has been observed, this is just precaution.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/ipv4/icmp.c |    7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/net/ipv4/icmp.c
++++ b/net/ipv4/icmp.c
+@@ -77,6 +77,7 @@
+ #include <linux/string.h>
+ #include <linux/netfilter_ipv4.h>
+ #include <linux/slab.h>
++#include <linux/locallock.h>
+ #include <net/snmp.h>
+ #include <net/ip.h>
+ #include <net/route.h>
+@@ -204,6 +205,8 @@ static const struct icmp_control icmp_po
+  *
+  *	On SMP we have one ICMP socket per-cpu.
+  */
++static DEFINE_LOCAL_IRQ_LOCK(icmp_sk_lock);
++
+ static struct sock *icmp_sk(struct net *net)
+ {
+ 	return *this_cpu_ptr(net->ipv4.icmp_sk);
+@@ -417,6 +420,7 @@ static void icmp_reply(struct icmp_bxm *
+ 
+ 	/* Needed by both icmp_global_allow and icmp_xmit_lock */
+ 	local_bh_disable();
++	local_lock(icmp_sk_lock);
+ 
+ 	/* global icmp_msgs_per_sec */
+ 	if (!icmpv4_global_allow(net, type, code))
+@@ -461,6 +465,7 @@ static void icmp_reply(struct icmp_bxm *
+ out_unlock:
+ 	icmp_xmit_unlock(sk);
+ out_bh_enable:
++	local_unlock(icmp_sk_lock);
+ 	local_bh_enable();
+ }
+ 
+@@ -656,6 +661,7 @@ void icmp_send(struct sk_buff *skb_in, i
+ 
+ 	/* Needed by both icmp_global_allow and icmp_xmit_lock */
+ 	local_bh_disable();
++	local_lock(icmp_sk_lock);
+ 
+ 	/* Check global sysctl_icmp_msgs_per_sec ratelimit, unless
+ 	 * incoming dev is loopback.  If outgoing dev change to not be
+@@ -744,6 +750,7 @@ void icmp_send(struct sk_buff *skb_in, i
+ out_unlock:
+ 	icmp_xmit_unlock(sk);
+ out_bh_enable:
++	local_unlock(icmp_sk_lock);
+ 	local_bh_enable();
+ out:;
+ }
diff --git a/kernel/patches-4.14.x-rt/0303-net-use-trylock-in-icmp_sk.patch b/kernel/patches-4.14.x-rt/0303-net-use-trylock-in-icmp_sk.patch
new file mode 100644
index 000000000..509c71aa8
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0303-net-use-trylock-in-icmp_sk.patch
@@ -0,0 +1,73 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 21 Sep 2017 14:42:04 +0200
+Subject: net: use trylock in icmp_sk
+
+The locking path can be recursive (same as for sk->sk_lock.slock) and
+therefore we need a trylock version for the locallock, too.
+
+Cc: stable-rt@vger.kernel.org
+Reported-by: Jacek Konieczny <jajcus@jajcus.net>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/ipv4/icmp.c |    9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+--- a/net/ipv4/icmp.c
++++ b/net/ipv4/icmp.c
+@@ -217,12 +217,16 @@ static inline struct sock *icmp_xmit_loc
+ {
+ 	struct sock *sk;
+ 
++	if (!local_trylock(icmp_sk_lock))
++		return NULL;
++
+ 	sk = icmp_sk(net);
+ 
+ 	if (unlikely(!spin_trylock(&sk->sk_lock.slock))) {
+ 		/* This can happen if the output path signals a
+ 		 * dst_link_failure() for an outgoing ICMP packet.
+ 		 */
++		local_unlock(icmp_sk_lock);
+ 		return NULL;
+ 	}
+ 	return sk;
+@@ -231,6 +235,7 @@ static inline struct sock *icmp_xmit_loc
+ static inline void icmp_xmit_unlock(struct sock *sk)
+ {
+ 	spin_unlock(&sk->sk_lock.slock);
++	local_unlock(icmp_sk_lock);
+ }
+ 
+ int sysctl_icmp_msgs_per_sec __read_mostly = 1000;
+@@ -420,7 +425,6 @@ static void icmp_reply(struct icmp_bxm *
+ 
+ 	/* Needed by both icmp_global_allow and icmp_xmit_lock */
+ 	local_bh_disable();
+-	local_lock(icmp_sk_lock);
+ 
+ 	/* global icmp_msgs_per_sec */
+ 	if (!icmpv4_global_allow(net, type, code))
+@@ -465,7 +469,6 @@ static void icmp_reply(struct icmp_bxm *
+ out_unlock:
+ 	icmp_xmit_unlock(sk);
+ out_bh_enable:
+-	local_unlock(icmp_sk_lock);
+ 	local_bh_enable();
+ }
+ 
+@@ -661,7 +664,6 @@ void icmp_send(struct sk_buff *skb_in, i
+ 
+ 	/* Needed by both icmp_global_allow and icmp_xmit_lock */
+ 	local_bh_disable();
+-	local_lock(icmp_sk_lock);
+ 
+ 	/* Check global sysctl_icmp_msgs_per_sec ratelimit, unless
+ 	 * incoming dev is loopback.  If outgoing dev change to not be
+@@ -750,7 +752,6 @@ void icmp_send(struct sk_buff *skb_in, i
+ out_unlock:
+ 	icmp_xmit_unlock(sk);
+ out_bh_enable:
+-	local_unlock(icmp_sk_lock);
+ 	local_bh_enable();
+ out:;
+ }
diff --git a/kernel/patches-4.14.x-rt/0304-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch b/kernel/patches-4.14.x-rt/0304-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
new file mode 100644
index 000000000..3df60de33
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0304-net-Have-__napi_schedule_irqoff-disable-interrupts-o.patch
@@ -0,0 +1,68 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Tue, 6 Dec 2016 17:50:30 -0500
+Subject: [PATCH] net: Have __napi_schedule_irqoff() disable interrupts on
+ RT
+
+A customer hit a crash where the napi sd->poll_list became corrupted.
+The customer had the bnx2x driver, which does a
+__napi_schedule_irqoff() in its interrupt handler. Unfortunately, when
+running with CONFIG_PREEMPT_RT_FULL, this interrupt handler is run as a
+thread and is preemptable. The call to ____napi_schedule() must be done
+with interrupts disabled to protect the per cpu softnet_data's
+"poll_list, which is protected by disabling interrupts (disabling
+preemption is enough when all interrupts are threaded and
+local_bh_disable() can't preempt)."
+
+As bnx2x isn't the only driver that does this, the safest thing to do
+is to make __napi_schedule_irqoff() call __napi_schedule() instead when
+CONFIG_PREEMPT_RT_FULL is enabled, which will call local_irq_save()
+before calling ____napi_schedule().
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Steven Rostedt (Red Hat) <rostedt@goodmis.org>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/netdevice.h |   12 ++++++++++++
+ net/core/dev.c            |    2 ++
+ 2 files changed, 14 insertions(+)
+
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h
+@@ -409,7 +409,19 @@ typedef enum rx_handler_result rx_handle
+ typedef rx_handler_result_t rx_handler_func_t(struct sk_buff **pskb);
+ 
+ void __napi_schedule(struct napi_struct *n);
++
++/*
++ * When PREEMPT_RT_FULL is defined, all device interrupt handlers
++ * run as threads, and they can also be preempted (without PREEMPT_RT
++ * interrupt threads can not be preempted). Which means that calling
++ * __napi_schedule_irqoff() from an interrupt handler can be preempted
++ * and can corrupt the napi->poll_list.
++ */
++#ifdef CONFIG_PREEMPT_RT_FULL
++#define __napi_schedule_irqoff(n) __napi_schedule(n)
++#else
+ void __napi_schedule_irqoff(struct napi_struct *n);
++#endif
+ 
+ static inline bool napi_disable_pending(struct napi_struct *n)
+ {
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -5249,6 +5249,7 @@ bool napi_schedule_prep(struct napi_stru
+ }
+ EXPORT_SYMBOL(napi_schedule_prep);
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /**
+  * __napi_schedule_irqoff - schedule for receive
+  * @n: entry to schedule
+@@ -5260,6 +5261,7 @@ void __napi_schedule_irqoff(struct napi_
+ 	____napi_schedule(this_cpu_ptr(&softnet_data), n);
+ }
+ EXPORT_SYMBOL(__napi_schedule_irqoff);
++#endif
+ 
+ bool napi_complete_done(struct napi_struct *n, int work_done)
+ {
diff --git a/kernel/patches-4.14.x-rt/0305-irqwork-push_most_work_into_softirq_context.patch b/kernel/patches-4.14.x-rt/0305-irqwork-push_most_work_into_softirq_context.patch
new file mode 100644
index 000000000..ab16d1de4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0305-irqwork-push_most_work_into_softirq_context.patch
@@ -0,0 +1,184 @@
+Subject: irqwork: push most work into softirq context
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 23 Jun 2015 15:32:51 +0200
+
+Initially we defered all irqwork into softirq because we didn't want the
+latency spikes if perf or another user was busy and delayed the RT task.
+The NOHZ trigger (nohz_full_kick_work) was the first user that did not work
+as expected if it did not run in the original irqwork context so we had to
+bring it back somehow for it. push_irq_work_func is the second one that
+requires this.
+
+This patch adds the IRQ_WORK_HARD_IRQ which makes sure the callback runs
+in raw-irq context. Everything else is defered into softirq context. Without
+-RT we have the orignal behavior.
+
+This patch incorporates tglx orignal work which revoked a little bringing back
+the arch_irq_work_raise() if possible and a few fixes from Steven Rostedt and
+Mike Galbraith,
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/irq_work.h |    1 +
+ kernel/irq_work.c        |   47 ++++++++++++++++++++++++++++++++++-------------
+ kernel/sched/topology.c  |    1 +
+ kernel/time/tick-sched.c |    1 +
+ kernel/time/timer.c      |    5 ++++-
+ 5 files changed, 41 insertions(+), 14 deletions(-)
+
+--- a/include/linux/irq_work.h
++++ b/include/linux/irq_work.h
+@@ -17,6 +17,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;
+--- a/kernel/irq_work.c
++++ b/kernel/irq_work.c
+@@ -17,6 +17,7 @@
+ #include <linux/cpu.h>
+ #include <linux/notifier.h>
+ #include <linux/smp.h>
++#include <linux/interrupt.h>
+ #include <asm/processor.h>
+ 
+ 
+@@ -65,6 +66,8 @@ void __weak arch_irq_work_raise(void)
+  */
+ bool irq_work_queue_on(struct irq_work *work, int cpu)
+ {
++	struct llist_head *list;
++
+ 	/* All work should have been flushed before going offline */
+ 	WARN_ON_ONCE(cpu_is_offline(cpu));
+ 
+@@ -75,7 +78,12 @@ bool irq_work_queue_on(struct irq_work *
+ 	if (!irq_work_claim(work))
+ 		return false;
+ 
+-	if (llist_add(&work->llnode, &per_cpu(raised_list, cpu)))
++	if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL) && !(work->flags & IRQ_WORK_HARD_IRQ))
++		list = &per_cpu(lazy_list, cpu);
++	else
++		list = &per_cpu(raised_list, cpu);
++
++	if (llist_add(&work->llnode, list))
+ 		arch_send_call_function_single_ipi(cpu);
+ 
+ 	return true;
+@@ -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)
+ {
++	struct llist_head *list;
++	bool lazy_work, realtime = IS_ENABLED(CONFIG_PREEMPT_RT_FULL);
++
+ 	/* Only queue if not already pending */
+ 	if (!irq_work_claim(work))
+ 		return false;
+@@ -93,13 +104,15 @@ bool irq_work_queue(struct irq_work *wor
+ 	/* Queue the entry and raise the IPI if needed. */
+ 	preempt_disable();
+ 
+-	/* If the work is "lazy", handle it from next tick if any */
+-	if (work->flags & IRQ_WORK_LAZY) {
+-		if (llist_add(&work->llnode, this_cpu_ptr(&lazy_list)) &&
+-		    tick_nohz_tick_stopped())
+-			arch_irq_work_raise();
+-	} else {
+-		if (llist_add(&work->llnode, this_cpu_ptr(&raised_list)))
++	lazy_work = work->flags & IRQ_WORK_LAZY;
++
++	if (lazy_work || (realtime && !(work->flags & IRQ_WORK_HARD_IRQ)))
++		list = this_cpu_ptr(&lazy_list);
++	else
++		list = this_cpu_ptr(&raised_list);
++
++	if (llist_add(&work->llnode, list)) {
++		if (!lazy_work || tick_nohz_tick_stopped())
+ 			arch_irq_work_raise();
+ 	}
+ 
+@@ -116,9 +129,8 @@ bool irq_work_needs_cpu(void)
+ 	raised = this_cpu_ptr(&raised_list);
+ 	lazy = this_cpu_ptr(&lazy_list);
+ 
+-	if (llist_empty(raised) || arch_irq_work_has_interrupt())
+-		if (llist_empty(lazy))
+-			return false;
++	if (llist_empty(raised) && llist_empty(lazy))
++		return false;
+ 
+ 	/* All work should have been flushed before going offline */
+ 	WARN_ON_ONCE(cpu_is_offline(smp_processor_id()));
+@@ -132,7 +144,7 @@ static void irq_work_run_list(struct lli
+ 	struct irq_work *work;
+ 	struct llist_node *llnode;
+ 
+-	BUG_ON(!irqs_disabled());
++	BUG_ON_NONRT(!irqs_disabled());
+ 
+ 	if (llist_empty(list))
+ 		return;
+@@ -169,7 +181,16 @@ static void irq_work_run_list(struct lli
+ void irq_work_run(void)
+ {
+ 	irq_work_run_list(this_cpu_ptr(&raised_list));
+-	irq_work_run_list(this_cpu_ptr(&lazy_list));
++	if (IS_ENABLED(CONFIG_PREEMPT_RT_FULL)) {
++		/*
++		 * NOTE: we raise softirq via IPI for safety,
++		 * and execute in irq_work_tick() to move the
++		 * overhead from hard to soft irq context.
++		 */
++		if (!llist_empty(this_cpu_ptr(&lazy_list)))
++			raise_softirq(TIMER_SOFTIRQ);
++	} else
++		irq_work_run_list(this_cpu_ptr(&lazy_list));
+ }
+ EXPORT_SYMBOL_GPL(irq_work_run);
+ 
+--- a/kernel/sched/topology.c
++++ b/kernel/sched/topology.c
+@@ -273,6 +273,7 @@ static int init_rootdomain(struct root_d
+ 	rd->rto_cpu = -1;
+ 	raw_spin_lock_init(&rd->rto_lock);
+ 	init_irq_work(&rd->rto_push_work, rto_push_irq_work_func);
++	rd->rto_push_work.flags |= IRQ_WORK_HARD_IRQ;
+ #endif
+ 
+ 	init_dl_bw(&rd->dl_bw);
+--- a/kernel/time/tick-sched.c
++++ b/kernel/time/tick-sched.c
+@@ -230,6 +230,7 @@ static void nohz_full_kick_func(struct i
+ 
+ static DEFINE_PER_CPU(struct irq_work, nohz_full_kick_work) = {
+ 	.func = nohz_full_kick_func,
++	.flags = IRQ_WORK_HARD_IRQ,
+ };
+ 
+ /*
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1638,7 +1638,7 @@ void update_process_times(int user_tick)
+ 	scheduler_tick();
+ 	run_local_timers();
+ 	rcu_check_callbacks(user_tick);
+-#ifdef CONFIG_IRQ_WORK
++#if defined(CONFIG_IRQ_WORK) && !defined(CONFIG_PREEMPT_RT_FULL)
+ 	if (in_irq())
+ 		irq_work_tick();
+ #endif
+@@ -1679,6 +1679,9 @@ static __latent_entropy void run_timer_s
+ {
+ 	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
+ 
++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
++	irq_work_tick();
++#endif
+ 	/*
+ 	 * must_forward_clk must be cleared before running timers so that any
+ 	 * timer functions that call mod_timer will not try to forward the
diff --git a/kernel/patches-4.14.x-rt/0306-irqwork-Move-irq-safe-work-to-irq-context.patch b/kernel/patches-4.14.x-rt/0306-irqwork-Move-irq-safe-work-to-irq-context.patch
new file mode 100644
index 000000000..f97b004fb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0306-irqwork-Move-irq-safe-work-to-irq-context.patch
@@ -0,0 +1,77 @@
+Subject: irqwork: Move irq safe work to irq context
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 15 Nov 2015 18:40:17 +0100
+
+On architectures where arch_irq_work_has_interrupt() returns false, we
+end up running the irq safe work from the softirq context. That
+results in a potential deadlock in the scheduler irq work which
+expects that function to be called with interrupts disabled.
+
+Split the irq_work_tick() function into a hard and soft variant. Call
+the hard variant from the tick interrupt and add the soft variant to
+the timer softirq.
+
+Reported-and-tested-by: Yanjiang Jin <yanjiang.jin@windriver.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Cc: stable-rt@vger.kernel.org
+---
+ include/linux/irq_work.h |    6 ++++++
+ kernel/irq_work.c        |    9 +++++++++
+ kernel/time/timer.c      |    6 ++----
+ 3 files changed, 17 insertions(+), 4 deletions(-)
+
+--- a/include/linux/irq_work.h
++++ b/include/linux/irq_work.h
+@@ -53,4 +53,10 @@ static inline bool irq_work_needs_cpu(vo
+ 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 */
+--- a/kernel/irq_work.c
++++ b/kernel/irq_work.c
+@@ -200,8 +200,17 @@ void irq_work_tick(void)
+ 
+ 	if (!llist_empty(raised) && !arch_irq_work_has_interrupt())
+ 		irq_work_run_list(raised);
++
++	if (!IS_ENABLED(CONFIG_PREEMPT_RT_FULL))
++		irq_work_run_list(this_cpu_ptr(&lazy_list));
++}
++
++#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
++void irq_work_tick_soft(void)
++{
+ 	irq_work_run_list(this_cpu_ptr(&lazy_list));
+ }
++#endif
+ 
+ /*
+  * Synchronize against the irq_work @entry, ensures the entry is not
+--- a/kernel/time/timer.c
++++ b/kernel/time/timer.c
+@@ -1638,7 +1638,7 @@ void update_process_times(int user_tick)
+ 	scheduler_tick();
+ 	run_local_timers();
+ 	rcu_check_callbacks(user_tick);
+-#if defined(CONFIG_IRQ_WORK) && !defined(CONFIG_PREEMPT_RT_FULL)
++#if defined(CONFIG_IRQ_WORK)
+ 	if (in_irq())
+ 		irq_work_tick();
+ #endif
+@@ -1679,9 +1679,7 @@ static __latent_entropy void run_timer_s
+ {
+ 	struct timer_base *base = this_cpu_ptr(&timer_bases[BASE_STD]);
+ 
+-#if defined(CONFIG_IRQ_WORK) && defined(CONFIG_PREEMPT_RT_FULL)
+-	irq_work_tick();
+-#endif
++	irq_work_tick_soft();
+ 	/*
+ 	 * must_forward_clk must be cleared before running timers so that any
+ 	 * timer functions that call mod_timer will not try to forward the
diff --git a/kernel/patches-4.14.x-rt/0307-snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch b/kernel/patches-4.14.x-rt/0307-snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch
new file mode 100644
index 000000000..b8329c157
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0307-snd-pcm-fix-snd_pcm_stream_lock-irqs_disabled-splats.patch
@@ -0,0 +1,69 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Wed, 18 Feb 2015 15:09:23 +0100
+Subject: snd/pcm: fix snd_pcm_stream_lock*() irqs_disabled() splats
+
+Locking functions previously using read_lock_irq()/read_lock_irqsave() were
+changed to local_irq_disable/save(), leading to gripes.  Use nort variants.
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:915
+|in_atomic(): 0, irqs_disabled(): 1, pid: 5947, name: alsa-sink-ALC88
+|CPU: 5 PID: 5947 Comm: alsa-sink-ALC88 Not tainted 3.18.7-rt1 #9
+|Hardware name: MEDION MS-7848/MS-7848, BIOS M7848W08.404 11/06/2014
+| ffff880409316240 ffff88040866fa38 ffffffff815bdeb5 0000000000000002
+| 0000000000000000 ffff88040866fa58 ffffffff81073c86 ffffffffa03b2640
+| ffff88040239ec00 ffff88040866fa78 ffffffff815c3d34 ffffffffa03b2640
+|Call Trace:
+| [<ffffffff815bdeb5>] dump_stack+0x4f/0x9e
+| [<ffffffff81073c86>] __might_sleep+0xe6/0x150
+| [<ffffffff815c3d34>] __rt_spin_lock+0x24/0x50
+| [<ffffffff815c4044>] rt_read_lock+0x34/0x40
+| [<ffffffffa03a2979>] snd_pcm_stream_lock+0x29/0x70 [snd_pcm]
+| [<ffffffffa03a355d>] snd_pcm_playback_poll+0x5d/0x120 [snd_pcm]
+| [<ffffffff811937a2>] do_sys_poll+0x322/0x5b0
+| [<ffffffff81193d48>] SyS_ppoll+0x1a8/0x1c0
+| [<ffffffff815c4556>] system_call_fastpath+0x16/0x1b
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ sound/core/pcm_native.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/sound/core/pcm_native.c
++++ b/sound/core/pcm_native.c
+@@ -148,7 +148,7 @@ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock)
+ void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream)
+ {
+ 	if (!substream->pcm->nonatomic)
+-		local_irq_disable();
++		local_irq_disable_nort();
+ 	snd_pcm_stream_lock(substream);
+ }
+ EXPORT_SYMBOL_GPL(snd_pcm_stream_lock_irq);
+@@ -163,7 +163,7 @@ void snd_pcm_stream_unlock_irq(struct sn
+ {
+ 	snd_pcm_stream_unlock(substream);
+ 	if (!substream->pcm->nonatomic)
+-		local_irq_enable();
++		local_irq_enable_nort();
+ }
+ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irq);
+ 
+@@ -171,7 +171,7 @@ unsigned long _snd_pcm_stream_lock_irqsa
+ {
+ 	unsigned long flags = 0;
+ 	if (!substream->pcm->nonatomic)
+-		local_irq_save(flags);
++		local_irq_save_nort(flags);
+ 	snd_pcm_stream_lock(substream);
+ 	return flags;
+ }
+@@ -189,7 +189,7 @@ void snd_pcm_stream_unlock_irqrestore(st
+ {
+ 	snd_pcm_stream_unlock(substream);
+ 	if (!substream->pcm->nonatomic)
+-		local_irq_restore(flags);
++		local_irq_restore_nort(flags);
+ }
+ EXPORT_SYMBOL_GPL(snd_pcm_stream_unlock_irqrestore);
+ 
diff --git a/kernel/patches-4.14.x-rt/0308-printk-rt-aware.patch b/kernel/patches-4.14.x-rt/0308-printk-rt-aware.patch
new file mode 100644
index 000000000..fab124dd2
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0308-printk-rt-aware.patch
@@ -0,0 +1,70 @@
+Subject: printk: Make rt aware
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 19 Sep 2012 14:50:37 +0200
+
+Drop the lock before calling the console driver and do not disable
+interrupts while printing to a serial console.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ kernel/printk/printk.c |   19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -1617,6 +1617,7 @@ static void call_console_drivers(const c
+ 	if (!console_drivers)
+ 		return;
+ 
++	migrate_disable();
+ 	for_each_console(con) {
+ 		if (exclusive_console && con != exclusive_console)
+ 			continue;
+@@ -1632,6 +1633,7 @@ static void call_console_drivers(const c
+ 		else
+ 			con->write(con, text, len);
+ 	}
++	migrate_enable();
+ }
+ 
+ int printk_delay_msec __read_mostly;
+@@ -1814,12 +1816,22 @@ asmlinkage int vprintk_emit(int facility
+ 
+ 	/* If called from the scheduler, we can not call up(). */
+ 	if (!in_sched) {
++		int may_trylock = 1;
++
++#ifdef CONFIG_PREEMPT_RT_FULL
++		/*
++		 * we can't take a sleeping lock with IRQs or preeption disabled
++		 * so we can't print in these contexts
++		 */
++		if (!(preempt_count() == 0 && !irqs_disabled()))
++			may_trylock = 0;
++#endif
+ 		/*
+ 		 * Try to acquire and then immediately release the console
+ 		 * semaphore.  The release will print out buffers and wake up
+ 		 * /dev/kmsg and syslog() users.
+ 		 */
+-		if (console_trylock())
++		if (may_trylock && console_trylock())
+ 			console_unlock();
+ 	}
+ 
+@@ -2275,10 +2287,15 @@ void console_unlock(void)
+ 		console_seq++;
+ 		raw_spin_unlock(&logbuf_lock);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++		printk_safe_exit_irqrestore(flags);
++		call_console_drivers(ext_text, ext_len, text, len);
++#else
+ 		stop_critical_timings();	/* don't trace print latency */
+ 		call_console_drivers(ext_text, ext_len, text, len);
+ 		start_critical_timings();
+ 		printk_safe_exit_irqrestore(flags);
++#endif
+ 
+ 		if (do_cond_resched)
+ 			cond_resched();
diff --git a/kernel/patches-4.14.x-rt/0309-kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch b/kernel/patches-4.14.x-rt/0309-kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch
new file mode 100644
index 000000000..139b70086
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0309-kernel-printk-Don-t-try-to-print-from-IRQ-NMI-region.patch
@@ -0,0 +1,41 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 19 May 2016 17:45:27 +0200
+Subject: [PATCH] kernel/printk: Don't try to print from IRQ/NMI region
+
+On -RT we try to acquire sleeping locks which might lead to warnings
+from lockdep or a warn_on() from spin_try_lock() (which is a rtmutex on
+RT).
+We don't print in general from a IRQ off region so we should not try
+this via console_unblank() / bust_spinlocks() as well.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/printk/printk.c |   10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -1617,6 +1617,11 @@ static void call_console_drivers(const c
+ 	if (!console_drivers)
+ 		return;
+ 
++	if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) {
++		if (in_irq() || in_nmi())
++			return;
++	}
++
+ 	migrate_disable();
+ 	for_each_console(con) {
+ 		if (exclusive_console && con != exclusive_console)
+@@ -2349,6 +2354,11 @@ void console_unblank(void)
+ {
+ 	struct console *c;
+ 
++	if (IS_ENABLED(CONFIG_PREEMPT_RT_BASE)) {
++		if (in_irq() || in_nmi())
++			return;
++	}
++
+ 	/*
+ 	 * console_unblank can no longer be called in interrupt context unless
+ 	 * oops_in_progress is set to 1..
diff --git a/kernel/patches-4.14.x-rt/0310-HACK-printk-drop-the-logbuf_lock-more-often.patch b/kernel/patches-4.14.x-rt/0310-HACK-printk-drop-the-logbuf_lock-more-often.patch
new file mode 100644
index 000000000..578878355
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0310-HACK-printk-drop-the-logbuf_lock-more-often.patch
@@ -0,0 +1,76 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 21 Mar 2013 19:01:05 +0100
+Subject: printk: Drop the logbuf_lock more often
+
+The lock is hold with irgs off. The latency drops 500us+ on my arm bugs
+with a "full" buffer after executing "dmesg" on the shell.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/printk/printk.c |   27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+--- a/kernel/printk/printk.c
++++ b/kernel/printk/printk.c
+@@ -1407,6 +1407,8 @@ static int syslog_print_all(char __user
+ {
+ 	char *text;
+ 	int len = 0;
++	int attempts = 0;
++	int num_msg;
+ 
+ 	text = kmalloc(LOG_LINE_MAX + PREFIX_MAX, GFP_KERNEL);
+ 	if (!text)
+@@ -1418,6 +1420,14 @@ static int syslog_print_all(char __user
+ 		u64 seq;
+ 		u32 idx;
+ 
++try_again:
++		attempts++;
++		if (attempts > 10) {
++			len = -EBUSY;
++			goto out;
++		}
++		num_msg = 0;
++
+ 		/*
+ 		 * Find first record that fits, including all following records,
+ 		 * into the user-provided buffer for this dump.
+@@ -1430,6 +1440,14 @@ static int syslog_print_all(char __user
+ 			len += msg_print_text(msg, true, NULL, 0);
+ 			idx = log_next(idx);
+ 			seq++;
++			num_msg++;
++			if (num_msg > 5) {
++				num_msg = 0;
++				logbuf_unlock_irq();
++				logbuf_lock_irq();
++				if (clear_seq < log_first_seq)
++					goto try_again;
++			}
+ 		}
+ 
+ 		/* move first record forward until length fits into the buffer */
+@@ -1441,6 +1459,14 @@ static int syslog_print_all(char __user
+ 			len -= msg_print_text(msg, true, NULL, 0);
+ 			idx = log_next(idx);
+ 			seq++;
++			num_msg++;
++			if (num_msg > 5) {
++				num_msg = 0;
++				logbuf_unlock_irq();
++				logbuf_lock_irq();
++				if (clear_seq < log_first_seq)
++					goto try_again;
++			}
+ 		}
+ 
+ 		/* last message fitting into this dump */
+@@ -1479,6 +1505,7 @@ static int syslog_print_all(char __user
+ 		clear_seq = log_next_seq;
+ 		clear_idx = log_next_idx;
+ 	}
++out:
+ 	logbuf_unlock_irq();
+ 
+ 	kfree(text);
diff --git a/kernel/patches-4.14.x-rt/0311-power-use-generic-rwsem-on-rt.patch b/kernel/patches-4.14.x-rt/0311-power-use-generic-rwsem-on-rt.patch
new file mode 100644
index 000000000..d1d414f54
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0311-power-use-generic-rwsem-on-rt.patch
@@ -0,0 +1,26 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 14 Jul 2015 14:26:34 +0200
+Subject: powerpc: Use generic rwsem on RT
+
+Use generic code which uses rtmutex
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/powerpc/Kconfig |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -111,10 +111,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
diff --git a/kernel/patches-4.14.x-rt/0312-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch b/kernel/patches-4.14.x-rt/0312-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch
new file mode 100644
index 000000000..913bb4bcc
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0312-powerpc-kvm-Disable-in-kernel-MPIC-emulation-for-PRE.patch
@@ -0,0 +1,37 @@
+From: Bogdan Purcareata <bogdan.purcareata@freescale.com>
+Date: Fri, 24 Apr 2015 15:53:13 +0000
+Subject: powerpc/kvm: Disable in-kernel MPIC emulation for PREEMPT_RT_FULL
+
+While converting the openpic emulation code to use a raw_spinlock_t enables
+guests to run on RT, there's still a performance issue. For interrupts sent in
+directed delivery mode with a multiple CPU mask, the emulated openpic will loop
+through all of the VCPUs, and for each VCPUs, it call IRQ_check, which will loop
+through all the pending interrupts for that VCPU. This is done while holding the
+raw_lock, meaning that in all this time the interrupts and preemption are
+disabled on the host Linux. A malicious user app can max both these number and
+cause a DoS.
+
+This temporary fix is sent for two reasons. First is so that users who want to
+use the in-kernel MPIC emulation are aware of the potential latencies, thus
+making sure that the hardware MPIC and their usage scenario does not involve
+interrupts sent in directed delivery mode, and the number of possible pending
+interrupts is kept small. Secondly, this should incentivize the development of a
+proper openpic emulation that would be better suited for RT.
+
+Acked-by: Scott Wood <scottwood@freescale.com>
+Signed-off-by: Bogdan Purcareata <bogdan.purcareata@freescale.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/powerpc/kvm/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/powerpc/kvm/Kconfig
++++ b/arch/powerpc/kvm/Kconfig
+@@ -177,6 +177,7 @@ config KVM_E500MC
+ config KVM_MPIC
+ 	bool "KVM in-kernel MPIC emulation"
+ 	depends on KVM && E500
++	depends on !PREEMPT_RT_FULL
+ 	select HAVE_KVM_IRQCHIP
+ 	select HAVE_KVM_IRQFD
+ 	select HAVE_KVM_IRQ_ROUTING
diff --git a/kernel/patches-4.14.x-rt/0313-powerpc-ps3-device-init.c-adapt-to-completions-using.patch b/kernel/patches-4.14.x-rt/0313-powerpc-ps3-device-init.c-adapt-to-completions-using.patch
new file mode 100644
index 000000000..a153e1cf0
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0313-powerpc-ps3-device-init.c-adapt-to-completions-using.patch
@@ -0,0 +1,31 @@
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Sun, 31 May 2015 14:44:42 -0400
+Subject: powerpc: ps3/device-init.c - adapt to completions using swait vs wait
+
+To fix:
+
+  cc1: warnings being treated as errors
+  arch/powerpc/platforms/ps3/device-init.c: In function 'ps3_notification_read_write':
+  arch/powerpc/platforms/ps3/device-init.c:755:2: error: passing argument 1 of 'prepare_to_wait_event' from incompatible pointer type
+  arch/powerpc/platforms/ps3/device-init.c:755:2: error: passing argument 1 of 'abort_exclusive_wait' from incompatible pointer type
+  arch/powerpc/platforms/ps3/device-init.c:755:2: error: passing argument 1 of 'finish_wait' from incompatible pointer type
+  arch/powerpc/platforms/ps3/device-init.o] Error 1
+  make[3]: *** Waiting for unfinished jobs....
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/powerpc/platforms/ps3/device-init.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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(s
+ 	}
+ 	pr_debug("%s:%u: notification %s issued\n", __func__, __LINE__, op);
+ 
+-	res = wait_event_interruptible(dev->done.wait,
++	res = swait_event_interruptible(dev->done.wait,
+ 				       dev->done.done || kthread_should_stop());
+ 	if (kthread_should_stop())
+ 		res = -EINTR;
diff --git a/kernel/patches-4.14.x-rt/0314-arm-at91-tclib-default-to-tclib-timer-for-rt.patch b/kernel/patches-4.14.x-rt/0314-arm-at91-tclib-default-to-tclib-timer-for-rt.patch
new file mode 100644
index 000000000..f81c2037b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0314-arm-at91-tclib-default-to-tclib-timer-for-rt.patch
@@ -0,0 +1,32 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 1 May 2010 18:29:35 +0200
+Subject: ARM: at91: tclib: Default to tclib timer for RT
+
+RT is not too happy about the shared timer interrupt in AT91
+devices. Default to tclib timer for RT.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/misc/Kconfig |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- 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)
++	default y if PREEMPT_RT_FULL
+ 	help
+ 	  Select this if you want a library to allocate the Timer/Counter
+ 	  blocks found on many Atmel processors.  This facilitates using
+@@ -86,7 +87,7 @@ config ATMEL_TCB_CLKSRC_BLOCK
+ config ATMEL_TCB_CLKSRC_USE_SLOW_CLOCK
+ 	bool "TC Block use 32 KiHz clock"
+ 	depends on ATMEL_TCB_CLKSRC
+-	default y
++	default y if !PREEMPT_RT_FULL
+ 	help
+ 	  Select this to use 32 KiHz base clock rate as TC block clock
+ 	  source for clock events.
diff --git a/kernel/patches-4.14.x-rt/0315-arm-unwind-use_raw_lock.patch b/kernel/patches-4.14.x-rt/0315-arm-unwind-use_raw_lock.patch
new file mode 100644
index 000000000..9c10dd91c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0315-arm-unwind-use_raw_lock.patch
@@ -0,0 +1,83 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 20 Sep 2013 14:31:54 +0200
+Subject: arm/unwind: use a raw_spin_lock
+
+Mostly unwind is done with irqs enabled however SLUB may call it with
+irqs disabled while creating a new SLUB cache.
+
+I had system freeze while loading a module which called
+kmem_cache_create() on init. That means SLUB's __slab_alloc() disabled
+interrupts and then
+
+->new_slab_objects()
+ ->new_slab()
+  ->setup_object()
+   ->setup_object_debug()
+    ->init_tracking()
+     ->set_track()
+      ->save_stack_trace()
+       ->save_stack_trace_tsk()
+        ->walk_stackframe()
+         ->unwind_frame()
+          ->unwind_find_idx()
+           =>spin_lock_irqsave(&unwind_lock);
+
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/kernel/unwind.c |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/arch/arm/kernel/unwind.c
++++ b/arch/arm/kernel/unwind.c
+@@ -93,7 +93,7 @@ extern const struct unwind_idx __start_u
+ static const struct unwind_idx *__origin_unwind_idx;
+ extern const struct unwind_idx __stop_unwind_idx[];
+ 
+-static DEFINE_SPINLOCK(unwind_lock);
++static DEFINE_RAW_SPINLOCK(unwind_lock);
+ static LIST_HEAD(unwind_tables);
+ 
+ /* Convert a prel31 symbol to an absolute address */
+@@ -201,7 +201,7 @@ static const struct unwind_idx *unwind_f
+ 		/* module unwind tables */
+ 		struct unwind_table *table;
+ 
+-		spin_lock_irqsave(&unwind_lock, flags);
++		raw_spin_lock_irqsave(&unwind_lock, flags);
+ 		list_for_each_entry(table, &unwind_tables, list) {
+ 			if (addr >= table->begin_addr &&
+ 			    addr < table->end_addr) {
+@@ -213,7 +213,7 @@ static const struct unwind_idx *unwind_f
+ 				break;
+ 			}
+ 		}
+-		spin_unlock_irqrestore(&unwind_lock, flags);
++		raw_spin_unlock_irqrestore(&unwind_lock, flags);
+ 	}
+ 
+ 	pr_debug("%s: idx = %p\n", __func__, idx);
+@@ -529,9 +529,9 @@ struct unwind_table *unwind_table_add(un
+ 	tab->begin_addr = text_addr;
+ 	tab->end_addr = text_addr + text_size;
+ 
+-	spin_lock_irqsave(&unwind_lock, flags);
++	raw_spin_lock_irqsave(&unwind_lock, flags);
+ 	list_add_tail(&tab->list, &unwind_tables);
+-	spin_unlock_irqrestore(&unwind_lock, flags);
++	raw_spin_unlock_irqrestore(&unwind_lock, flags);
+ 
+ 	return tab;
+ }
+@@ -543,9 +543,9 @@ void unwind_table_del(struct unwind_tabl
+ 	if (!tab)
+ 		return;
+ 
+-	spin_lock_irqsave(&unwind_lock, flags);
++	raw_spin_lock_irqsave(&unwind_lock, flags);
+ 	list_del(&tab->list);
+-	spin_unlock_irqrestore(&unwind_lock, flags);
++	raw_spin_unlock_irqrestore(&unwind_lock, flags);
+ 
+ 	kfree(tab);
+ }
diff --git a/kernel/patches-4.14.x-rt/0316-ARM-enable-irq-in-translation-section-permission-fau.patch b/kernel/patches-4.14.x-rt/0316-ARM-enable-irq-in-translation-section-permission-fau.patch
new file mode 100644
index 000000000..d90d23403
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0316-ARM-enable-irq-in-translation-section-permission-fau.patch
@@ -0,0 +1,85 @@
+From: "Yadi.hu" <yadi.hu@windriver.com>
+Date: Wed, 10 Dec 2014 10:32:09 +0800
+Subject: ARM: enable irq in translation/section permission fault handlers
+
+Probably happens on all ARM, with
+CONFIG_PREEMPT_RT_FULL
+CONFIG_DEBUG_ATOMIC_SLEEP
+
+This simple program....
+
+int main() {
+   *((char*)0xc0001000) = 0;
+};
+
+[ 512.742724] BUG: sleeping function called from invalid context at kernel/rtmutex.c:658
+[ 512.743000] in_atomic(): 0, irqs_disabled(): 128, pid: 994, name: a
+[ 512.743217] INFO: lockdep is turned off.
+[ 512.743360] irq event stamp: 0
+[ 512.743482] hardirqs last enabled at (0): [< (null)>] (null)
+[ 512.743714] hardirqs last disabled at (0): [<c0426370>] copy_process+0x3b0/0x11c0
+[ 512.744013] softirqs last enabled at (0): [<c0426370>] copy_process+0x3b0/0x11c0
+[ 512.744303] softirqs last disabled at (0): [< (null)>] (null)
+[ 512.744631] [<c041872c>] (unwind_backtrace+0x0/0x104)
+[ 512.745001] [<c09af0c4>] (dump_stack+0x20/0x24)
+[ 512.745355] [<c0462490>] (__might_sleep+0x1dc/0x1e0)
+[ 512.745717] [<c09b6770>] (rt_spin_lock+0x34/0x6c)
+[ 512.746073] [<c0441bf0>] (do_force_sig_info+0x34/0xf0)
+[ 512.746457] [<c0442668>] (force_sig_info+0x18/0x1c)
+[ 512.746829] [<c041d880>] (__do_user_fault+0x9c/0xd8)
+[ 512.747185] [<c041d938>] (do_bad_area+0x7c/0x94)
+[ 512.747536] [<c041d990>] (do_sect_fault+0x40/0x48)
+[ 512.747898] [<c040841c>] (do_DataAbort+0x40/0xa0)
+[ 512.748181] Exception stack(0xecaa1fb0 to 0xecaa1ff8)
+
+Oxc0000000 belongs to kernel address space, user task can not be
+allowed to access it. For above condition, correct result is that
+test case should receive a “segment fault” and exits but not stacks.
+
+the root cause is commit 02fe2845d6a8 ("avoid enabling interrupts in
+prefetch/data abort handlers"),it deletes irq enable block in Data
+abort assemble code and move them into page/breakpiont/alignment fault
+handlers instead. But author does not enable irq in translation/section
+permission fault handlers. ARM disables irq when it enters exception/
+interrupt mode, if kernel doesn't enable irq, it would be still disabled
+during translation/section permission fault.
+
+We see the above splat because do_force_sig_info is still called with
+IRQs off, and that code eventually does a:
+
+        spin_lock_irqsave(&t->sighand->siglock, flags);
+
+As this is architecture independent code, and we've not seen any other
+need for other arch to have the siglock converted to raw lock, we can
+conclude that we should enable irq for ARM translation/section
+permission exception.
+
+
+Signed-off-by: Yadi.hu <yadi.hu@windriver.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/mm/fault.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/arch/arm/mm/fault.c
++++ b/arch/arm/mm/fault.c
+@@ -434,6 +434,9 @@ do_translation_fault(unsigned long addr,
+ 	if (addr < TASK_SIZE)
+ 		return do_page_fault(addr, fsr, regs);
+ 
++	if (interrupts_enabled(regs))
++		local_irq_enable();
++
+ 	if (user_mode(regs))
+ 		goto bad_area;
+ 
+@@ -501,6 +504,9 @@ do_translation_fault(unsigned long addr,
+ static int
+ do_sect_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
+ {
++	if (interrupts_enabled(regs))
++		local_irq_enable();
++
+ 	do_bad_area(addr, fsr, regs);
+ 	return 0;
+ }
diff --git a/kernel/patches-4.14.x-rt/0317-genirq-update-irq_set_irqchip_state-documentation.patch b/kernel/patches-4.14.x-rt/0317-genirq-update-irq_set_irqchip_state-documentation.patch
new file mode 100644
index 000000000..f997f28f3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0317-genirq-update-irq_set_irqchip_state-documentation.patch
@@ -0,0 +1,25 @@
+From: Josh Cartwright <joshc@ni.com>
+Date: Thu, 11 Feb 2016 11:54:00 -0600
+Subject: genirq: update irq_set_irqchip_state documentation
+
+On -rt kernels, the use of migrate_disable()/migrate_enable() is
+sufficient to guarantee a task isn't moved to another CPU.  Update the
+irq_set_irqchip_state() documentation to reflect this.
+
+Signed-off-by: Josh Cartwright <joshc@ni.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/irq/manage.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -2202,7 +2202,7 @@ EXPORT_SYMBOL_GPL(irq_get_irqchip_state)
+  *	This call sets the internal irqchip state of an interrupt,
+  *	depending on the value of @which.
+  *
+- *	This function should be called with preemption disabled if the
++ *	This function should be called with migration disabled if the
+  *	interrupt controller has per-cpu registers.
+  */
+ int irq_set_irqchip_state(unsigned int irq, enum irqchip_irq_state which,
diff --git a/kernel/patches-4.14.x-rt/0318-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch b/kernel/patches-4.14.x-rt/0318-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch
new file mode 100644
index 000000000..b5984a998
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0318-KVM-arm-arm64-downgrade-preempt_disable-d-region-to-.patch
@@ -0,0 +1,51 @@
+From: Josh Cartwright <joshc@ni.com>
+Date: Thu, 11 Feb 2016 11:54:01 -0600
+Subject: KVM: arm/arm64: downgrade preempt_disable()d region to migrate_disable()
+
+kvm_arch_vcpu_ioctl_run() disables the use of preemption when updating
+the vgic and timer states to prevent the calling task from migrating to
+another CPU.  It does so to prevent the task from writing to the
+incorrect per-CPU GIC distributor registers.
+
+On -rt kernels, it's possible to maintain the same guarantee with the
+use of migrate_{disable,enable}(), with the added benefit that the
+migrate-disabled region is preemptible.  Update
+kvm_arch_vcpu_ioctl_run() to do so.
+
+Cc: Christoffer Dall <christoffer.dall@linaro.org>
+Reported-by: Manish Jaggi <Manish.Jaggi@caviumnetworks.com>
+Signed-off-by: Josh Cartwright <joshc@ni.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ virt/kvm/arm/arm.c |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/virt/kvm/arm/arm.c
++++ b/virt/kvm/arm/arm.c
+@@ -648,7 +648,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v
+ 		 * involves poking the GIC, which must be done in a
+ 		 * non-preemptible context.
+ 		 */
+-		preempt_disable();
++		migrate_disable();
+ 
+ 		kvm_pmu_flush_hwstate(vcpu);
+ 
+@@ -685,7 +685,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v
+ 			kvm_pmu_sync_hwstate(vcpu);
+ 			kvm_timer_sync_hwstate(vcpu);
+ 			kvm_vgic_sync_hwstate(vcpu);
+-			preempt_enable();
++			migrate_enable();
+ 			continue;
+ 		}
+ 
+@@ -740,7 +740,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_v
+ 
+ 		kvm_vgic_sync_hwstate(vcpu);
+ 
+-		preempt_enable();
++		migrate_enable();
+ 
+ 		ret = handle_exit(vcpu, run, ret);
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0319-arm64-xen--Make-XEN-depend-on-non-rt.patch b/kernel/patches-4.14.x-rt/0319-arm64-xen--Make-XEN-depend-on-non-rt.patch
new file mode 100644
index 000000000..85237d715
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0319-arm64-xen--Make-XEN-depend-on-non-rt.patch
@@ -0,0 +1,23 @@
+Subject: arm64/xen: Make XEN depend on !RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 12 Oct 2015 11:18:40 +0200
+
+It's not ready and probably never will be, unless xen folks have a
+look at it.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/arm64/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -774,7 +774,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/kernel/patches-4.14.x-rt/0320-kgb-serial-hackaround.patch b/kernel/patches-4.14.x-rt/0320-kgb-serial-hackaround.patch
new file mode 100644
index 000000000..14d79d202
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0320-kgb-serial-hackaround.patch
@@ -0,0 +1,76 @@
+From: Jason Wessel <jason.wessel@windriver.com>
+Date: Thu, 28 Jul 2011 12:42:23 -0500
+Subject: kgdb/serial: Short term workaround
+
+On 07/27/2011 04:37 PM, Thomas Gleixner wrote:
+>  - KGDB (not yet disabled) is reportedly unusable on -rt right now due
+>    to missing hacks in the console locking which I dropped on purpose.
+>
+
+To work around this in the short term you can use this patch, in
+addition to the clocksource watchdog patch that Thomas brewed up.
+
+Comments are welcome of course.  Ultimately the right solution is to
+change separation between the console and the HW to have a polled mode
++ work queue so as not to introduce any kind of latency.
+
+Thanks,
+Jason.
+
+---
+ drivers/tty/serial/8250/8250_port.c |    3 +++
+ include/linux/kdb.h                 |    2 ++
+ kernel/debug/kdb/kdb_io.c           |    2 ++
+ 3 files changed, 7 insertions(+)
+
+--- 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>
+ #include <linux/slab.h>
++#include <linux/kdb.h>
+ #include <linux/uaccess.h>
+ #include <linux/pm_runtime.h>
+ #include <linux/ktime.h>
+@@ -3219,6 +3220,8 @@ void serial8250_console_write(struct uar
+ 
+ 	if (port->sysrq || oops_in_progress)
+ 		locked = 0;
++	else if (in_kdb_printk())
++		locked = spin_trylock_irqsave(&port->lock, flags);
+ 	else
+ 		spin_lock_irqsave(&port->lock, flags);
+ 
+--- a/include/linux/kdb.h
++++ b/include/linux/kdb.h
+@@ -167,6 +167,7 @@ extern __printf(2, 0) int vkdb_printf(en
+ extern __printf(1, 2) int kdb_printf(const char *, ...);
+ typedef __printf(1, 2) int (*kdb_printf_t)(const char *, ...);
+ 
++#define in_kdb_printk()	(kdb_trap_printk)
+ extern void kdb_init(int level);
+ 
+ /* Access to kdb specific polling devices */
+@@ -201,6 +202,7 @@ extern int kdb_register_flags(char *, kd
+ extern int kdb_unregister(char *);
+ #else /* ! CONFIG_KGDB_KDB */
+ static inline __printf(1, 2) int kdb_printf(const char *fmt, ...) { return 0; }
++#define in_kdb_printk() (0)
+ 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; }
+--- a/kernel/debug/kdb/kdb_io.c
++++ b/kernel/debug/kdb/kdb_io.c
+@@ -854,9 +854,11 @@ int kdb_printf(const char *fmt, ...)
+ 	va_list ap;
+ 	int r;
+ 
++	kdb_trap_printk++;
+ 	va_start(ap, fmt);
+ 	r = vkdb_printf(KDB_MSGSRC_INTERNAL, fmt, ap);
+ 	va_end(ap);
++	kdb_trap_printk--;
+ 
+ 	return r;
+ }
diff --git a/kernel/patches-4.14.x-rt/0321-sysfs-realtime-entry.patch b/kernel/patches-4.14.x-rt/0321-sysfs-realtime-entry.patch
new file mode 100644
index 000000000..85c90149d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0321-sysfs-realtime-entry.patch
@@ -0,0 +1,47 @@
+Subject: sysfs: Add /sys/kernel/realtime entry
+From: Clark Williams <williams@redhat.com>
+Date: Sat Jul 30 21:55:53 2011 -0500
+
+Add a /sys/kernel entry to indicate that the kernel is a
+realtime kernel.
+
+Clark says that he needs this for udev rules, udev needs to evaluate
+if its a PREEMPT_RT kernel a few thousand times and parsing uname
+output is too slow or so.
+
+Are there better solutions? Should it exist and return 0 on !-rt?
+
+Signed-off-by: Clark Williams <williams@redhat.com>
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+---
+ kernel/ksysfs.c |   12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/kernel/ksysfs.c
++++ b/kernel/ksysfs.c
+@@ -140,6 +140,15 @@ KERNEL_ATTR_RO(vmcoreinfo);
+ 
+ #endif /* CONFIG_CRASH_CORE */
+ 
++#if defined(CONFIG_PREEMPT_RT_FULL)
++static ssize_t realtime_show(struct kobject *kobj,
++			     struct kobj_attribute *attr, char *buf)
++{
++	return sprintf(buf, "%d\n", 1);
++}
++KERNEL_ATTR_RO(realtime);
++#endif
++
+ /* whether file capabilities are enabled */
+ static ssize_t fscaps_show(struct kobject *kobj,
+ 				  struct kobj_attribute *attr, char *buf)
+@@ -231,6 +240,9 @@ static struct attribute * kernel_attrs[]
+ 	&rcu_expedited_attr.attr,
+ 	&rcu_normal_attr.attr,
+ #endif
++#ifdef CONFIG_PREEMPT_RT_FULL
++	&realtime_attr.attr,
++#endif
+ 	NULL
+ };
+ 
diff --git a/kernel/patches-4.14.x-rt/0322-power-disable-highmem-on-rt.patch b/kernel/patches-4.14.x-rt/0322-power-disable-highmem-on-rt.patch
new file mode 100644
index 000000000..db3c1ee9d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0322-power-disable-highmem-on-rt.patch
@@ -0,0 +1,22 @@
+Subject: powerpc: Disable highmem on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 18 Jul 2011 17:08:34 +0200
+
+The current highmem handling on -RT is not compatible and needs fixups.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/powerpc/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -391,7 +391,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/kernel/patches-4.14.x-rt/0323-mips-disable-highmem-on-rt.patch b/kernel/patches-4.14.x-rt/0323-mips-disable-highmem-on-rt.patch
new file mode 100644
index 000000000..503ff8c2b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0323-mips-disable-highmem-on-rt.patch
@@ -0,0 +1,22 @@
+Subject: mips: Disable highmem on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 18 Jul 2011 17:10:12 +0200
+
+The current highmem handling on -RT is not compatible and needs fixups.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/mips/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/mips/Kconfig
++++ b/arch/mips/Kconfig
+@@ -2519,7 +2519,7 @@ config MIPS_ASID_BITS_VARIABLE
+ #
+ config HIGHMEM
+ 	bool "High Memory Support"
+-	depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA
++	depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA && !PREEMPT_RT_FULL
+ 
+ config CPU_SUPPORTS_HIGHMEM
+ 	bool
diff --git a/kernel/patches-4.14.x-rt/0324-mm-rt-kmap-atomic-scheduling.patch b/kernel/patches-4.14.x-rt/0324-mm-rt-kmap-atomic-scheduling.patch
new file mode 100644
index 000000000..064e4f9d4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0324-mm-rt-kmap-atomic-scheduling.patch
@@ -0,0 +1,288 @@
+Subject: mm, rt: kmap_atomic scheduling
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Thu, 28 Jul 2011 10:43:51 +0200
+
+In fact, with migrate_disable() existing one could play games with
+kmap_atomic. You could save/restore the kmap_atomic slots on context
+switch (if there are any in use of course), this should be esp easy now
+that we have a kmap_atomic stack.
+
+Something like the below.. it wants replacing all the preempt_disable()
+stuff with pagefault_disable() && migrate_disable() of course, but then
+you can flip kmaps around like below.
+
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+[dvhart@linux.intel.com: build fix]
+Link: http://lkml.kernel.org/r/1311842631.5890.208.camel@twins
+
+[tglx@linutronix.de: Get rid of the per cpu variable and store the idx
+		     and the pte content right away in the task struct.
+		     Shortens the context switch code. ]
+---
+ arch/x86/kernel/process_32.c |   32 ++++++++++++++++++++++++++++++++
+ arch/x86/mm/highmem_32.c     |   13 ++++++++++---
+ arch/x86/mm/iomap_32.c       |    9 ++++++++-
+ include/linux/highmem.h      |   27 +++++++++++++++++++++++----
+ include/linux/sched.h        |    7 +++++++
+ include/linux/uaccess.h      |    2 ++
+ mm/highmem.c                 |    6 ++++--
+ 7 files changed, 86 insertions(+), 10 deletions(-)
+
+--- a/arch/x86/kernel/process_32.c
++++ b/arch/x86/kernel/process_32.c
+@@ -38,6 +38,7 @@
+ #include <linux/io.h>
+ #include <linux/kdebug.h>
+ #include <linux/syscalls.h>
++#include <linux/highmem.h>
+ 
+ #include <asm/pgtable.h>
+ #include <asm/ldt.h>
+@@ -198,6 +199,35 @@ start_thread(struct pt_regs *regs, unsig
+ }
+ EXPORT_SYMBOL_GPL(start_thread);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
++{
++	int i;
++
++	/*
++	 * Clear @prev's kmap_atomic mappings
++	 */
++	for (i = 0; i < prev_p->kmap_idx; i++) {
++		int idx = i + KM_TYPE_NR * smp_processor_id();
++		pte_t *ptep = kmap_pte - idx;
++
++		kpte_clear_flush(ptep, __fix_to_virt(FIX_KMAP_BEGIN + idx));
++	}
++	/*
++	 * Restore @next_p's kmap_atomic mappings
++	 */
++	for (i = 0; i < next_p->kmap_idx; i++) {
++		int idx = i + KM_TYPE_NR * smp_processor_id();
++
++		if (!pte_none(next_p->kmap_pte[i]))
++			set_pte(kmap_pte - idx, next_p->kmap_pte[i]);
++	}
++}
++#else
++static inline void
++switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
++#endif
++
+ 
+ /*
+  *	switch_to(x,y) should switch tasks from x to y.
+@@ -273,6 +303,8 @@ EXPORT_SYMBOL_GPL(start_thread);
+ 		     task_thread_info(next_p)->flags & _TIF_WORK_CTXSW_NEXT))
+ 		__switch_to_xtra(prev_p, next_p, tss);
+ 
++	switch_kmaps(prev_p, next_p);
++
+ 	/*
+ 	 * Leave lazy mode, flushing any hypercalls made here.
+ 	 * This must be done before restoring TLS segments so
+--- 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)
+ {
++	pte_t pte = mk_pte(page, prot);
+ 	unsigned long vaddr;
+ 	int idx, type;
+ 
+-	preempt_disable();
++	preempt_disable_nort();
+ 	pagefault_disable();
+ 
+ 	if (!PageHighMem(page))
+@@ -45,7 +46,10 @@ void *kmap_atomic_prot(struct page *page
+ 	idx = type + KM_TYPE_NR*smp_processor_id();
+ 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+ 	BUG_ON(!pte_none(*(kmap_pte-idx)));
+-	set_pte(kmap_pte-idx, mk_pte(page, prot));
++#ifdef CONFIG_PREEMPT_RT_FULL
++	current->kmap_pte[type] = pte;
++#endif
++	set_pte(kmap_pte-idx, pte);
+ 	arch_flush_lazy_mmu_mode();
+ 
+ 	return (void *)vaddr;
+@@ -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.
+ 		 */
++#ifdef CONFIG_PREEMPT_RT_FULL
++		current->kmap_pte[type] = __pte(0);
++#endif
+ 		kpte_clear_flush(kmap_pte-idx, vaddr);
+ 		kmap_atomic_idx_pop();
+ 		arch_flush_lazy_mmu_mode();
+@@ -100,7 +107,7 @@ void __kunmap_atomic(void *kvaddr)
+ #endif
+ 
+ 	pagefault_enable();
+-	preempt_enable();
++	preempt_enable_nort();
+ }
+ EXPORT_SYMBOL(__kunmap_atomic);
+ 
+--- 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)
+ {
++	pte_t pte = pfn_pte(pfn, prot);
+ 	unsigned long vaddr;
+ 	int idx, type;
+ 
+@@ -65,7 +66,10 @@ void *kmap_atomic_prot_pfn(unsigned long
+ 	type = kmap_atomic_idx_push();
+ 	idx = type + KM_TYPE_NR * smp_processor_id();
+ 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
+-	set_pte(kmap_pte - idx, pfn_pte(pfn, prot));
++#ifdef CONFIG_PREEMPT_RT_FULL
++	current->kmap_pte[type] = pte;
++#endif
++	set_pte(kmap_pte - idx, pte);
+ 	arch_flush_lazy_mmu_mode();
+ 
+ 	return (void *)vaddr;
+@@ -113,6 +117,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.
+ 		 */
++#ifdef CONFIG_PREEMPT_RT_FULL
++		current->kmap_pte[type] = __pte(0);
++#endif
+ 		kpte_clear_flush(kmap_pte-idx, vaddr);
+ 		kmap_atomic_idx_pop();
+ 	}
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
+@@ -87,32 +87,51 @@ static inline void __kunmap_atomic(void
+ 
+ #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ DECLARE_PER_CPU(int, __kmap_atomic_idx);
++#endif
+ 
+ static inline int kmap_atomic_idx_push(void)
+ {
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	int idx = __this_cpu_inc_return(__kmap_atomic_idx) - 1;
+ 
+-#ifdef CONFIG_DEBUG_HIGHMEM
++# ifdef CONFIG_DEBUG_HIGHMEM
+ 	WARN_ON_ONCE(in_irq() && !irqs_disabled());
+ 	BUG_ON(idx >= KM_TYPE_NR);
+-#endif
++# endif
+ 	return idx;
++#else
++	current->kmap_idx++;
++	BUG_ON(current->kmap_idx > KM_TYPE_NR);
++	return current->kmap_idx - 1;
++#endif
+ }
+ 
+ static inline int kmap_atomic_idx(void)
+ {
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	return __this_cpu_read(__kmap_atomic_idx) - 1;
++#else
++	return current->kmap_idx - 1;
++#endif
+ }
+ 
+ static inline void kmap_atomic_idx_pop(void)
+ {
+-#ifdef CONFIG_DEBUG_HIGHMEM
++#ifndef CONFIG_PREEMPT_RT_FULL
++# ifdef CONFIG_DEBUG_HIGHMEM
+ 	int idx = __this_cpu_dec_return(__kmap_atomic_idx);
+ 
+ 	BUG_ON(idx < 0);
+-#else
++# else
+ 	__this_cpu_dec(__kmap_atomic_idx);
++# endif
++#else
++	current->kmap_idx--;
++# ifdef CONFIG_DEBUG_HIGHMEM
++	BUG_ON(current->kmap_idx < 0);
++# endif
+ #endif
+ }
+ 
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -27,6 +27,7 @@
+ #include <linux/signal_types.h>
+ #include <linux/mm_types_task.h>
+ #include <linux/task_io_accounting.h>
++#include <asm/kmap_types.h>
+ 
+ /* task_struct member predeclarations (sorted alphabetically): */
+ struct audit_context;
+@@ -1104,6 +1105,12 @@ struct task_struct {
+ 	int				softirq_nestcnt;
+ 	unsigned int			softirqs_raised;
+ #endif
++#ifdef CONFIG_PREEMPT_RT_FULL
++# if defined CONFIG_HIGHMEM || defined CONFIG_X86_32
++	int				kmap_idx;
++	pte_t				kmap_pte[KM_TYPE_NR];
++# endif
++#endif
+ #ifdef CONFIG_DEBUG_ATOMIC_SLEEP
+ 	unsigned long			task_state_change;
+ #endif
+--- a/include/linux/uaccess.h
++++ b/include/linux/uaccess.h
+@@ -185,6 +185,7 @@ static __always_inline void pagefault_di
+  */
+ static inline void pagefault_disable(void)
+ {
++	migrate_disable();
+ 	pagefault_disabled_inc();
+ 	/*
+ 	 * make sure to have issued the store before a pagefault
+@@ -201,6 +202,7 @@ static inline void pagefault_enable(void
+ 	 */
+ 	barrier();
+ 	pagefault_disabled_dec();
++	migrate_enable();
+ }
+ 
+ /*
+--- a/mm/highmem.c
++++ b/mm/highmem.c
+@@ -30,10 +30,11 @@
+ #include <linux/kgdb.h>
+ #include <asm/tlbflush.h>
+ 
+-
++#ifndef CONFIG_PREEMPT_RT_FULL
+ #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32)
+ DEFINE_PER_CPU(int, __kmap_atomic_idx);
+ #endif
++#endif
+ 
+ /*
+  * Virtual_count is not a pure "count".
+@@ -108,8 +109,9 @@ static inline wait_queue_head_t *get_pkm
+ unsigned long totalhigh_pages __read_mostly;
+ EXPORT_SYMBOL(totalhigh_pages);
+ 
+-
++#ifndef CONFIG_PREEMPT_RT_FULL
+ EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx);
++#endif
+ 
+ unsigned int nr_free_highpages (void)
+ {
diff --git a/kernel/patches-4.14.x-rt/0325-mm--rt--Fix-generic-kmap_atomic-for-RT.patch b/kernel/patches-4.14.x-rt/0325-mm--rt--Fix-generic-kmap_atomic-for-RT.patch
new file mode 100644
index 000000000..3549e58fd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0325-mm--rt--Fix-generic-kmap_atomic-for-RT.patch
@@ -0,0 +1,40 @@
+Subject: mm: rt: Fix generic kmap_atomic for RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 19 Sep 2015 10:15:00 +0200
+
+The update to 4.1 brought in the mainline variant of the pagefault
+disable distangling from preempt count. That introduced a
+preempt_disable/enable pair in the generic kmap_atomic/kunmap_atomic
+implementations which got not converted to the _nort() variant.
+
+That results in massive 'scheduling while atomic/sleeping function
+called from invalid context' splats.
+
+Fix that up.
+
+Reported-and-tested-by: Juergen Borleis <jbe@pengutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/highmem.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
+@@ -66,7 +66,7 @@ static inline void kunmap(struct page *p
+ 
+ static inline void *kmap_atomic(struct page *page)
+ {
+-	preempt_disable();
++	preempt_disable_nort();
+ 	pagefault_disable();
+ 	return page_address(page);
+ }
+@@ -75,7 +75,7 @@ static inline void *kmap_atomic(struct p
+ static inline void __kunmap_atomic(void *addr)
+ {
+ 	pagefault_enable();
+-	preempt_enable();
++	preempt_enable_nort();
+ }
+ 
+ #define kmap_atomic_pfn(pfn)	kmap_atomic(pfn_to_page(pfn))
diff --git a/kernel/patches-4.14.x-rt/0326-x86-highmem-add-a-already-used-pte-check.patch b/kernel/patches-4.14.x-rt/0326-x86-highmem-add-a-already-used-pte-check.patch
new file mode 100644
index 000000000..a3493efae
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0326-x86-highmem-add-a-already-used-pte-check.patch
@@ -0,0 +1,22 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 11 Mar 2013 17:09:55 +0100
+Subject: x86/highmem: Add a "already used pte" check
+
+This is a copy from kmap_atomic_prot().
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/mm/iomap_32.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/arch/x86/mm/iomap_32.c
++++ b/arch/x86/mm/iomap_32.c
+@@ -66,6 +66,8 @@ void *kmap_atomic_prot_pfn(unsigned long
+ 	type = kmap_atomic_idx_push();
+ 	idx = type + KM_TYPE_NR * smp_processor_id();
+ 	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
++	WARN_ON(!pte_none(*(kmap_pte - idx)));
++
+ #ifdef CONFIG_PREEMPT_RT_FULL
+ 	current->kmap_pte[type] = pte;
+ #endif
diff --git a/kernel/patches-4.14.x-rt/0327-arm-highmem-flush-tlb-on-unmap.patch b/kernel/patches-4.14.x-rt/0327-arm-highmem-flush-tlb-on-unmap.patch
new file mode 100644
index 000000000..08e17cab7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0327-arm-highmem-flush-tlb-on-unmap.patch
@@ -0,0 +1,27 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Mon, 11 Mar 2013 21:37:27 +0100
+Subject: arm/highmem: Flush tlb on unmap
+
+The tlb should be flushed on unmap and thus make the mapping entry
+invalid. This is only done in the non-debug case which does not look
+right.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/mm/highmem.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm/mm/highmem.c
++++ b/arch/arm/mm/highmem.c
+@@ -112,10 +112,10 @@ void __kunmap_atomic(void *kvaddr)
+ 			__cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
+ #ifdef CONFIG_DEBUG_HIGHMEM
+ 		BUG_ON(vaddr != __fix_to_virt(idx));
+-		set_fixmap_pte(idx, __pte(0));
+ #else
+ 		(void) idx;  /* to kill a warning */
+ #endif
++		set_fixmap_pte(idx, __pte(0));
+ 		kmap_atomic_idx_pop();
+ 	} else if (vaddr >= PKMAP_ADDR(0) && vaddr < PKMAP_ADDR(LAST_PKMAP)) {
+ 		/* this address was obtained through kmap_high_get() */
diff --git a/kernel/patches-4.14.x-rt/0328-arm-enable-highmem-for-rt.patch b/kernel/patches-4.14.x-rt/0328-arm-enable-highmem-for-rt.patch
new file mode 100644
index 000000000..3891177cb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0328-arm-enable-highmem-for-rt.patch
@@ -0,0 +1,173 @@
+Subject: arm: Enable highmem for rt
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 13 Feb 2013 11:03:11 +0100
+
+fixup highmem for ARM.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/arm/include/asm/switch_to.h |    8 +++++
+ arch/arm/mm/highmem.c            |   56 +++++++++++++++++++++++++++++++++------
+ include/linux/highmem.h          |    1 
+ 3 files changed, 57 insertions(+), 8 deletions(-)
+
+--- a/arch/arm/include/asm/switch_to.h
++++ b/arch/arm/include/asm/switch_to.h
+@@ -4,6 +4,13 @@
+ 
+ #include <linux/thread_info.h>
+ 
++#if defined CONFIG_PREEMPT_RT_FULL && defined CONFIG_HIGHMEM
++void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p);
++#else
++static inline void
++switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p) { }
++#endif
++
+ /*
+  * For v7 SMP cores running a preemptible kernel we may be pre-empted
+  * during a TLB maintenance operation, so execute an inner-shareable dsb
+@@ -26,6 +33,7 @@ extern struct task_struct *__switch_to(s
+ #define switch_to(prev,next,last)					\
+ do {									\
+ 	__complete_pending_tlbi();					\
++	switch_kmaps(prev, next);					\
+ 	last = __switch_to(prev,task_thread_info(prev), task_thread_info(next));	\
+ } while (0)
+ 
+--- a/arch/arm/mm/highmem.c
++++ b/arch/arm/mm/highmem.c
+@@ -34,6 +34,11 @@ static inline pte_t get_fixmap_pte(unsig
+ 	return *ptep;
+ }
+ 
++static unsigned int fixmap_idx(int type)
++{
++	return FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
++}
++
+ void *kmap(struct page *page)
+ {
+ 	might_sleep();
+@@ -54,12 +59,13 @@ EXPORT_SYMBOL(kunmap);
+ 
+ void *kmap_atomic(struct page *page)
+ {
++	pte_t pte = mk_pte(page, kmap_prot);
+ 	unsigned int idx;
+ 	unsigned long vaddr;
+ 	void *kmap;
+ 	int type;
+ 
+-	preempt_disable();
++	preempt_disable_nort();
+ 	pagefault_disable();
+ 	if (!PageHighMem(page))
+ 		return page_address(page);
+@@ -79,7 +85,7 @@ void *kmap_atomic(struct page *page)
+ 
+ 	type = kmap_atomic_idx_push();
+ 
+-	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
++	idx = fixmap_idx(type);
+ 	vaddr = __fix_to_virt(idx);
+ #ifdef CONFIG_DEBUG_HIGHMEM
+ 	/*
+@@ -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.
+ 	 */
+-	set_fixmap_pte(idx, mk_pte(page, kmap_prot));
++#ifdef CONFIG_PREEMPT_RT_FULL
++	current->kmap_pte[type] = pte;
++#endif
++	set_fixmap_pte(idx, pte);
+ 
+ 	return (void *)vaddr;
+ }
+@@ -106,10 +115,13 @@ void __kunmap_atomic(void *kvaddr)
+ 
+ 	if (kvaddr >= (void *)FIXADDR_START) {
+ 		type = kmap_atomic_idx();
+-		idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
++		idx = fixmap_idx(type);
+ 
+ 		if (cache_is_vivt())
+ 			__cpuc_flush_dcache_area((void *)vaddr, PAGE_SIZE);
++#ifdef CONFIG_PREEMPT_RT_FULL
++		current->kmap_pte[type] = __pte(0);
++#endif
+ #ifdef CONFIG_DEBUG_HIGHMEM
+ 		BUG_ON(vaddr != __fix_to_virt(idx));
+ #else
+@@ -122,28 +134,56 @@ void __kunmap_atomic(void *kvaddr)
+ 		kunmap_high(pte_page(pkmap_page_table[PKMAP_NR(vaddr)]));
+ 	}
+ 	pagefault_enable();
+-	preempt_enable();
++	preempt_enable_nort();
+ }
+ EXPORT_SYMBOL(__kunmap_atomic);
+ 
+ void *kmap_atomic_pfn(unsigned long pfn)
+ {
++	pte_t pte = pfn_pte(pfn, kmap_prot);
+ 	unsigned long vaddr;
+ 	int idx, type;
+ 	struct page *page = pfn_to_page(pfn);
+ 
+-	preempt_disable();
++	preempt_disable_nort();
+ 	pagefault_disable();
+ 	if (!PageHighMem(page))
+ 		return page_address(page);
+ 
+ 	type = kmap_atomic_idx_push();
+-	idx = FIX_KMAP_BEGIN + type + KM_TYPE_NR * smp_processor_id();
++	idx = fixmap_idx(type);
+ 	vaddr = __fix_to_virt(idx);
+ #ifdef CONFIG_DEBUG_HIGHMEM
+ 	BUG_ON(!pte_none(get_fixmap_pte(vaddr)));
+ #endif
+-	set_fixmap_pte(idx, pfn_pte(pfn, kmap_prot));
++#ifdef CONFIG_PREEMPT_RT_FULL
++	current->kmap_pte[type] = pte;
++#endif
++	set_fixmap_pte(idx, pte);
+ 
+ 	return (void *)vaddr;
+ }
++#if defined CONFIG_PREEMPT_RT_FULL
++void switch_kmaps(struct task_struct *prev_p, struct task_struct *next_p)
++{
++	int i;
++
++	/*
++	 * Clear @prev's kmap_atomic mappings
++	 */
++	for (i = 0; i < prev_p->kmap_idx; i++) {
++		int idx = fixmap_idx(i);
++
++		set_fixmap_pte(idx, __pte(0));
++	}
++	/*
++	 * Restore @next_p's kmap_atomic mappings
++	 */
++	for (i = 0; i < next_p->kmap_idx; i++) {
++		int idx = fixmap_idx(i);
++
++		if (!pte_none(next_p->kmap_pte[i]))
++			set_fixmap_pte(idx, next_p->kmap_pte[i]);
++	}
++}
++#endif
+--- a/include/linux/highmem.h
++++ b/include/linux/highmem.h
+@@ -8,6 +8,7 @@
+ #include <linux/mm.h>
+ #include <linux/uaccess.h>
+ #include <linux/hardirq.h>
++#include <linux/sched.h>
+ 
+ #include <asm/cacheflush.h>
+ 
diff --git a/kernel/patches-4.14.x-rt/0329-scsi-fcoe-rt-aware.patch b/kernel/patches-4.14.x-rt/0329-scsi-fcoe-rt-aware.patch
new file mode 100644
index 000000000..f5f4bd62d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0329-scsi-fcoe-rt-aware.patch
@@ -0,0 +1,105 @@
+Subject: scsi/fcoe: Make RT aware.
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sat, 12 Nov 2011 14:00:48 +0100
+
+Do not disable preemption while taking sleeping locks. All user look safe
+for migrate_diable() only.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/scsi/fcoe/fcoe.c      |   16 ++++++++--------
+ drivers/scsi/fcoe/fcoe_ctlr.c |    4 ++--
+ drivers/scsi/libfc/fc_exch.c  |    4 ++--
+ 3 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/drivers/scsi/fcoe/fcoe.c
++++ b/drivers/scsi/fcoe/fcoe.c
+@@ -1464,11 +1464,11 @@ static int fcoe_rcv(struct sk_buff *skb,
+ static int fcoe_alloc_paged_crc_eof(struct sk_buff *skb, int tlen)
+ {
+ 	struct fcoe_percpu_s *fps;
+-	int rc;
++	int rc, cpu = get_cpu_light();
+ 
+-	fps = &get_cpu_var(fcoe_percpu);
++	fps = &per_cpu(fcoe_percpu, cpu);
+ 	rc = fcoe_get_paged_crc_eof(skb, tlen, fps);
+-	put_cpu_var(fcoe_percpu);
++	put_cpu_light();
+ 
+ 	return rc;
+ }
+@@ -1655,11 +1655,11 @@ static inline int fcoe_filter_frames(str
+ 		return 0;
+ 	}
+ 
+-	stats = per_cpu_ptr(lport->stats, get_cpu());
++	stats = per_cpu_ptr(lport->stats, get_cpu_light());
+ 	stats->InvalidCRCCount++;
+ 	if (stats->InvalidCRCCount < 5)
+ 		printk(KERN_WARNING "fcoe: dropping frame with CRC error\n");
+-	put_cpu();
++	put_cpu_light();
+ 	return -EINVAL;
+ }
+ 
+@@ -1702,7 +1702,7 @@ static void fcoe_recv_frame(struct sk_bu
+ 	 */
+ 	hp = (struct fcoe_hdr *) skb_network_header(skb);
+ 
+-	stats = per_cpu_ptr(lport->stats, get_cpu());
++	stats = per_cpu_ptr(lport->stats, get_cpu_light());
+ 	if (unlikely(FC_FCOE_DECAPS_VER(hp) != FC_FCOE_VER)) {
+ 		if (stats->ErrorFrames < 5)
+ 			printk(KERN_WARNING "fcoe: FCoE version "
+@@ -1734,13 +1734,13 @@ static void fcoe_recv_frame(struct sk_bu
+ 		goto drop;
+ 
+ 	if (!fcoe_filter_frames(lport, fp)) {
+-		put_cpu();
++		put_cpu_light();
+ 		fc_exch_recv(lport, fp);
+ 		return;
+ 	}
+ drop:
+ 	stats->ErrorFrames++;
+-	put_cpu();
++	put_cpu_light();
+ 	kfree_skb(skb);
+ }
+ 
+--- a/drivers/scsi/fcoe/fcoe_ctlr.c
++++ b/drivers/scsi/fcoe/fcoe_ctlr.c
+@@ -835,7 +835,7 @@ static unsigned long fcoe_ctlr_age_fcfs(
+ 
+ 	INIT_LIST_HEAD(&del_list);
+ 
+-	stats = per_cpu_ptr(fip->lp->stats, get_cpu());
++	stats = per_cpu_ptr(fip->lp->stats, get_cpu_light());
+ 
+ 	list_for_each_entry_safe(fcf, next, &fip->fcfs, list) {
+ 		deadline = fcf->time + fcf->fka_period + fcf->fka_period / 2;
+@@ -871,7 +871,7 @@ static unsigned long fcoe_ctlr_age_fcfs(
+ 				sel_time = fcf->time;
+ 		}
+ 	}
+-	put_cpu();
++	put_cpu_light();
+ 
+ 	list_for_each_entry_safe(fcf, next, &del_list, list) {
+ 		/* Removes fcf from current list */
+--- a/drivers/scsi/libfc/fc_exch.c
++++ b/drivers/scsi/libfc/fc_exch.c
+@@ -833,10 +833,10 @@ static struct fc_exch *fc_exch_em_alloc(
+ 	}
+ 	memset(ep, 0, sizeof(*ep));
+ 
+-	cpu = get_cpu();
++	cpu = get_cpu_light();
+ 	pool = per_cpu_ptr(mp->pool, cpu);
+ 	spin_lock_bh(&pool->lock);
+-	put_cpu();
++	put_cpu_light();
+ 
+ 	/* peek cache of free slot */
+ 	if (pool->left != FC_XID_UNKNOWN) {
diff --git a/kernel/patches-4.14.x-rt/0330-sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch b/kernel/patches-4.14.x-rt/0330-sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch
new file mode 100644
index 000000000..1774c4cef
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0330-sas-ata-isci-dont-t-disable-interrupts-in-qc_issue-h.patch
@@ -0,0 +1,78 @@
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Sat, 14 Feb 2015 11:01:16 -0500
+Subject: sas-ata/isci: dont't disable interrupts in qc_issue handler
+
+On 3.14-rt we see the following trace on Canoe Pass for
+SCSI_ISCI "Intel(R) C600 Series Chipset SAS Controller"
+when the sas qc_issue handler is run:
+
+ BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:905
+ in_atomic(): 0, irqs_disabled(): 1, pid: 432, name: udevd
+ CPU: 11 PID: 432 Comm: udevd Not tainted 3.14.28-rt22 #2
+ Hardware name: Intel Corporation S2600CP/S2600CP, BIOS SE5C600.86B.02.01.0002.082220131453 08/22/2013
+ ffff880fab500000 ffff880fa9f239c0 ffffffff81a2d273 0000000000000000
+ ffff880fa9f239d8 ffffffff8107f023 ffff880faac23dc0 ffff880fa9f239f0
+ ffffffff81a33cc0 ffff880faaeb1400 ffff880fa9f23a40 ffffffff815de891
+ Call Trace:
+ [<ffffffff81a2d273>] dump_stack+0x4e/0x7a
+ [<ffffffff8107f023>] __might_sleep+0xe3/0x160
+ [<ffffffff81a33cc0>] rt_spin_lock+0x20/0x50
+ [<ffffffff815de891>] isci_task_execute_task+0x171/0x2f0  <-----
+ [<ffffffff815cfecb>] sas_ata_qc_issue+0x25b/0x2a0
+ [<ffffffff81606363>] ata_qc_issue+0x1f3/0x370
+ [<ffffffff8160c600>] ? ata_scsi_invalid_field+0x40/0x40
+ [<ffffffff8160c8f5>] ata_scsi_translate+0xa5/0x1b0
+ [<ffffffff8160efc6>] ata_sas_queuecmd+0x86/0x280
+ [<ffffffff815ce446>] sas_queuecommand+0x196/0x230
+ [<ffffffff81081fad>] ? get_parent_ip+0xd/0x50
+ [<ffffffff815b05a4>] scsi_dispatch_cmd+0xb4/0x210
+ [<ffffffff815b7744>] scsi_request_fn+0x314/0x530
+
+and gdb shows:
+
+(gdb) list * isci_task_execute_task+0x171
+0xffffffff815ddfb1 is in isci_task_execute_task (drivers/scsi/isci/task.c:138).
+133             dev_dbg(&ihost->pdev->dev, "%s: num=%d\n", __func__, num);
+134
+135             for_each_sas_task(num, task) {
+136                     enum sci_status status = SCI_FAILURE;
+137
+138                     spin_lock_irqsave(&ihost->scic_lock, flags);    <-----
+139                     idev = isci_lookup_device(task->dev);
+140                     io_ready = isci_device_io_ready(idev, task);
+141                     tag = isci_alloc_tag(ihost);
+142                     spin_unlock_irqrestore(&ihost->scic_lock, flags);
+(gdb)
+
+In addition to the scic_lock, the function also contains locking of
+the task_state_lock -- which is clearly not a candidate for raw lock
+conversion.  As can be seen by the comment nearby, we really should
+be running the qc_issue code with interrupts enabled anyway.
+
+
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/scsi/libsas/sas_ata.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- 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(str
+ 	/* TODO: audit callers to ensure they are ready for qc_issue to
+ 	 * unconditionally re-enable interrupts
+ 	 */
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	spin_unlock(ap->lock);
+ 
+ 	/* If the device fell off, no sense in issuing commands */
+@@ -252,7 +252,7 @@ static unsigned int sas_ata_qc_issue(str
+ 
+  out:
+ 	spin_lock(ap->lock);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ 	return ret;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0331-x86-crypto-reduce-preempt-disabled-regions.patch b/kernel/patches-4.14.x-rt/0331-x86-crypto-reduce-preempt-disabled-regions.patch
new file mode 100644
index 000000000..16a3506d4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0331-x86-crypto-reduce-preempt-disabled-regions.patch
@@ -0,0 +1,111 @@
+Subject: x86: crypto: Reduce preempt disabled regions
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Mon, 14 Nov 2011 18:19:27 +0100
+
+Restrict the preempt disabled regions to the actual floating point
+operations and enable preemption for the administrative actions.
+
+This is necessary on RT to avoid that kfree and other operations are
+called with preemption disabled.
+
+Reported-and-tested-by: Carsten Emde <cbe@osadl.org>
+Signed-off-by: Peter Zijlstra <peterz@infradead.org>
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/x86/crypto/aesni-intel_glue.c |   22 ++++++++++++----------
+ 1 file changed, 12 insertions(+), 10 deletions(-)
+
+--- a/arch/x86/crypto/aesni-intel_glue.c
++++ b/arch/x86/crypto/aesni-intel_glue.c
+@@ -387,14 +387,14 @@ static int ecb_encrypt(struct skcipher_r
+ 
+ 	err = skcipher_walk_virt(&walk, req, true);
+ 
+-	kernel_fpu_begin();
+ 	while ((nbytes = walk.nbytes)) {
++		kernel_fpu_begin();
+ 		aesni_ecb_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,
+ 			      nbytes & AES_BLOCK_MASK);
++		kernel_fpu_end();
+ 		nbytes &= AES_BLOCK_SIZE - 1;
+ 		err = skcipher_walk_done(&walk, nbytes);
+ 	}
+-	kernel_fpu_end();
+ 
+ 	return err;
+ }
+@@ -409,14 +409,14 @@ static int ecb_decrypt(struct skcipher_r
+ 
+ 	err = skcipher_walk_virt(&walk, req, true);
+ 
+-	kernel_fpu_begin();
+ 	while ((nbytes = walk.nbytes)) {
++		kernel_fpu_begin();
+ 		aesni_ecb_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,
+ 			      nbytes & AES_BLOCK_MASK);
++		kernel_fpu_end();
+ 		nbytes &= AES_BLOCK_SIZE - 1;
+ 		err = skcipher_walk_done(&walk, nbytes);
+ 	}
+-	kernel_fpu_end();
+ 
+ 	return err;
+ }
+@@ -431,14 +431,14 @@ static int cbc_encrypt(struct skcipher_r
+ 
+ 	err = skcipher_walk_virt(&walk, req, true);
+ 
+-	kernel_fpu_begin();
+ 	while ((nbytes = walk.nbytes)) {
++		kernel_fpu_begin();
+ 		aesni_cbc_enc(ctx, walk.dst.virt.addr, walk.src.virt.addr,
+ 			      nbytes & AES_BLOCK_MASK, walk.iv);
++		kernel_fpu_end();
+ 		nbytes &= AES_BLOCK_SIZE - 1;
+ 		err = skcipher_walk_done(&walk, nbytes);
+ 	}
+-	kernel_fpu_end();
+ 
+ 	return err;
+ }
+@@ -453,14 +453,14 @@ static int cbc_decrypt(struct skcipher_r
+ 
+ 	err = skcipher_walk_virt(&walk, req, true);
+ 
+-	kernel_fpu_begin();
+ 	while ((nbytes = walk.nbytes)) {
++		kernel_fpu_begin();
+ 		aesni_cbc_dec(ctx, walk.dst.virt.addr, walk.src.virt.addr,
+ 			      nbytes & AES_BLOCK_MASK, walk.iv);
++		kernel_fpu_end();
+ 		nbytes &= AES_BLOCK_SIZE - 1;
+ 		err = skcipher_walk_done(&walk, nbytes);
+ 	}
+-	kernel_fpu_end();
+ 
+ 	return err;
+ }
+@@ -510,18 +510,20 @@ static int ctr_crypt(struct skcipher_req
+ 
+ 	err = skcipher_walk_virt(&walk, req, true);
+ 
+-	kernel_fpu_begin();
+ 	while ((nbytes = walk.nbytes) >= AES_BLOCK_SIZE) {
++		kernel_fpu_begin();
+ 		aesni_ctr_enc_tfm(ctx, walk.dst.virt.addr, walk.src.virt.addr,
+ 			              nbytes & AES_BLOCK_MASK, walk.iv);
++		kernel_fpu_end();
+ 		nbytes &= AES_BLOCK_SIZE - 1;
+ 		err = skcipher_walk_done(&walk, nbytes);
+ 	}
+ 	if (walk.nbytes) {
++		kernel_fpu_begin();
+ 		ctr_crypt_final(ctx, &walk);
++		kernel_fpu_end();
+ 		err = skcipher_walk_done(&walk, 0);
+ 	}
+-	kernel_fpu_end();
+ 
+ 	return err;
+ }
diff --git a/kernel/patches-4.14.x-rt/0332-crypto-Reduce-preempt-disabled-regions-more-algos.patch b/kernel/patches-4.14.x-rt/0332-crypto-Reduce-preempt-disabled-regions-more-algos.patch
new file mode 100644
index 000000000..db318a657
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0332-crypto-Reduce-preempt-disabled-regions-more-algos.patch
@@ -0,0 +1,241 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 21 Feb 2014 17:24:04 +0100
+Subject: crypto: Reduce preempt disabled regions, more algos
+
+Don Estabrook reported
+| kernel: WARNING: CPU: 2 PID: 858 at kernel/sched/core.c:2428 migrate_disable+0xed/0x100()
+| kernel: WARNING: CPU: 2 PID: 858 at kernel/sched/core.c:2462 migrate_enable+0x17b/0x200()
+| kernel: WARNING: CPU: 3 PID: 865 at kernel/sched/core.c:2428 migrate_disable+0xed/0x100()
+
+and his backtrace showed some crypto functions which looked fine.
+
+The problem is the following sequence:
+
+glue_xts_crypt_128bit()
+{
+	blkcipher_walk_virt(); /* normal migrate_disable() */
+
+	glue_fpu_begin(); /* get atomic */
+
+	while (nbytes) {
+		__glue_xts_crypt_128bit();
+		blkcipher_walk_done(); /* with nbytes = 0, migrate_enable()
+					* while we are atomic */
+	};
+	glue_fpu_end() /* no longer atomic */
+}
+
+and this is why the counter get out of sync and the warning is printed.
+The other problem is that we are non-preemptible between
+glue_fpu_begin() and glue_fpu_end() and the latency grows. To fix this,
+I shorten the FPU off region and ensure blkcipher_walk_done() is called
+with preemption enabled. This might hurt the performance because we now
+enable/disable the FPU state more often but we gain lower latency and
+the bug is gone.
+
+
+Reported-by: Don Estabrook <don.estabrook@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/crypto/cast5_avx_glue.c |   21 +++++++++------------
+ arch/x86/crypto/glue_helper.c    |   31 +++++++++++++++----------------
+ 2 files changed, 24 insertions(+), 28 deletions(-)
+
+--- 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 fp
+ static int ecb_crypt(struct blkcipher_desc *desc, struct blkcipher_walk *walk,
+ 		     bool enc)
+ {
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	struct cast5_ctx *ctx = crypto_blkcipher_ctx(desc->tfm);
+ 	const unsigned int bsize = CAST5_BLOCK_SIZE;
+ 	unsigned int nbytes;
+@@ -75,7 +75,7 @@ static int ecb_crypt(struct blkcipher_de
+ 		u8 *wsrc = walk->src.virt.addr;
+ 		u8 *wdst = walk->dst.virt.addr;
+ 
+-		fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
++		fpu_enabled = cast5_fpu_begin(false, nbytes);
+ 
+ 		/* Process multi-block batch */
+ 		if (nbytes >= bsize * CAST5_PARALLEL_BLOCKS) {
+@@ -103,10 +103,9 @@ static int ecb_crypt(struct blkcipher_de
+ 		} while (nbytes >= bsize);
+ 
+ done:
++		cast5_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, walk, nbytes);
+ 	}
+-
+-	cast5_fpu_end(fpu_enabled);
+ 	return err;
+ }
+ 
+@@ -227,7 +226,7 @@ static unsigned int __cbc_decrypt(struct
+ static int cbc_decrypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+ 		       struct scatterlist *src, unsigned int nbytes)
+ {
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	struct blkcipher_walk walk;
+ 	int err;
+ 
+@@ -236,12 +235,11 @@ static int cbc_decrypt(struct blkcipher_
+ 	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
+ 
+ 	while ((nbytes = walk.nbytes)) {
+-		fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
++		fpu_enabled = cast5_fpu_begin(false, nbytes);
+ 		nbytes = __cbc_decrypt(desc, &walk);
++		cast5_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, &walk, nbytes);
+ 	}
+-
+-	cast5_fpu_end(fpu_enabled);
+ 	return err;
+ }
+ 
+@@ -310,7 +308,7 @@ static unsigned int __ctr_crypt(struct b
+ static int ctr_crypt(struct blkcipher_desc *desc, struct scatterlist *dst,
+ 		     struct scatterlist *src, unsigned int nbytes)
+ {
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	struct blkcipher_walk walk;
+ 	int err;
+ 
+@@ -319,13 +317,12 @@ static int ctr_crypt(struct blkcipher_de
+ 	desc->flags &= ~CRYPTO_TFM_REQ_MAY_SLEEP;
+ 
+ 	while ((nbytes = walk.nbytes) >= CAST5_BLOCK_SIZE) {
+-		fpu_enabled = cast5_fpu_begin(fpu_enabled, nbytes);
++		fpu_enabled = cast5_fpu_begin(false, nbytes);
+ 		nbytes = __ctr_crypt(desc, &walk);
++		cast5_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, &walk, nbytes);
+ 	}
+ 
+-	cast5_fpu_end(fpu_enabled);
+-
+ 	if (walk.nbytes) {
+ 		ctr_crypt_final(desc, &walk);
+ 		err = blkcipher_walk_done(desc, &walk, 0);
+--- a/arch/x86/crypto/glue_helper.c
++++ b/arch/x86/crypto/glue_helper.c
+@@ -40,7 +40,7 @@ static int __glue_ecb_crypt_128bit(const
+ 	void *ctx = crypto_blkcipher_ctx(desc->tfm);
+ 	const unsigned int bsize = 128 / 8;
+ 	unsigned int nbytes, i, func_bytes;
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	int err;
+ 
+ 	err = blkcipher_walk_virt(desc, walk);
+@@ -50,7 +50,7 @@ static int __glue_ecb_crypt_128bit(const
+ 		u8 *wdst = walk->dst.virt.addr;
+ 
+ 		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
+-					     desc, fpu_enabled, nbytes);
++					     desc, false, nbytes);
+ 
+ 		for (i = 0; i < gctx->num_funcs; i++) {
+ 			func_bytes = bsize * gctx->funcs[i].num_blocks;
+@@ -72,10 +72,10 @@ static int __glue_ecb_crypt_128bit(const
+ 		}
+ 
+ done:
++		glue_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, walk, nbytes);
+ 	}
+ 
+-	glue_fpu_end(fpu_enabled);
+ 	return err;
+ }
+ 
+@@ -192,7 +192,7 @@ int glue_cbc_decrypt_128bit(const struct
+ 			    struct scatterlist *src, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = 128 / 8;
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	struct blkcipher_walk walk;
+ 	int err;
+ 
+@@ -201,12 +201,12 @@ int glue_cbc_decrypt_128bit(const struct
+ 
+ 	while ((nbytes = walk.nbytes)) {
+ 		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
+-					     desc, fpu_enabled, nbytes);
++					     desc, false, nbytes);
+ 		nbytes = __glue_cbc_decrypt_128bit(gctx, desc, &walk);
++		glue_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, &walk, nbytes);
+ 	}
+ 
+-	glue_fpu_end(fpu_enabled);
+ 	return err;
+ }
+ EXPORT_SYMBOL_GPL(glue_cbc_decrypt_128bit);
+@@ -275,7 +275,7 @@ int glue_ctr_crypt_128bit(const struct c
+ 			  struct scatterlist *src, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = 128 / 8;
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	struct blkcipher_walk walk;
+ 	int err;
+ 
+@@ -284,13 +284,12 @@ int glue_ctr_crypt_128bit(const struct c
+ 
+ 	while ((nbytes = walk.nbytes) >= bsize) {
+ 		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
+-					     desc, fpu_enabled, nbytes);
++					     desc, false, nbytes);
+ 		nbytes = __glue_ctr_crypt_128bit(gctx, desc, &walk);
++		glue_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, &walk, nbytes);
+ 	}
+ 
+-	glue_fpu_end(fpu_enabled);
+-
+ 	if (walk.nbytes) {
+ 		glue_ctr_crypt_final_128bit(
+ 			gctx->funcs[gctx->num_funcs - 1].fn_u.ctr, desc, &walk);
+@@ -380,7 +379,7 @@ int glue_xts_crypt_128bit(const struct c
+ 			  void *tweak_ctx, void *crypt_ctx)
+ {
+ 	const unsigned int bsize = 128 / 8;
+-	bool fpu_enabled = false;
++	bool fpu_enabled;
+ 	struct blkcipher_walk walk;
+ 	int err;
+ 
+@@ -393,21 +392,21 @@ int glue_xts_crypt_128bit(const struct c
+ 
+ 	/* set minimum length to bsize, for tweak_fn */
+ 	fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
+-				     desc, fpu_enabled,
++				     desc, false,
+ 				     nbytes < bsize ? bsize : nbytes);
+-
+ 	/* calculate first value of T */
+ 	tweak_fn(tweak_ctx, walk.iv, walk.iv);
++	glue_fpu_end(fpu_enabled);
+ 
+ 	while (nbytes) {
++		fpu_enabled = glue_fpu_begin(bsize, gctx->fpu_blocks_limit,
++				desc, false, nbytes);
+ 		nbytes = __glue_xts_crypt_128bit(gctx, crypt_ctx, desc, &walk);
+ 
++		glue_fpu_end(fpu_enabled);
+ 		err = blkcipher_walk_done(desc, &walk, nbytes);
+ 		nbytes = walk.nbytes;
+ 	}
+-
+-	glue_fpu_end(fpu_enabled);
+-
+ 	return err;
+ }
+ EXPORT_SYMBOL_GPL(glue_xts_crypt_128bit);
diff --git a/kernel/patches-4.14.x-rt/0333-crypto-limit-more-FPU-enabled-sections.patch b/kernel/patches-4.14.x-rt/0333-crypto-limit-more-FPU-enabled-sections.patch
new file mode 100644
index 000000000..561716bec
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0333-crypto-limit-more-FPU-enabled-sections.patch
@@ -0,0 +1,476 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 30 Nov 2017 13:40:10 +0100
+Subject: [PATCH] crypto: limit more FPU-enabled sections
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Those crypto drivers use SSE/AVX/… for their crypto work and in order to
+do so in kernel they need to enable the "FPU" in kernel mode which
+disables preemption.
+There are two problems with the way they are used:
+- the while loop which processes X bytes may create latency spikes and
+  should be avoided or limited.
+- the cipher-walk-next part may allocate/free memory and may use
+  kmap_atomic().
+
+The whole kernel_fpu_begin()/end() processing isn't probably that cheap.
+It most likely makes sense to process as much of those as possible in one
+go. The new *_fpu_sched_rt() schedules only if a RT task is pending.
+
+Probably we should measure the performance those ciphers in pure SW
+mode and with this optimisations to see if it makes sense to keep them
+for RT.
+
+This kernel_fpu_resched() makes the code more preemptible which might hurt
+performance.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/x86/crypto/camellia_aesni_avx2_glue.c |   20 ++++++++++++++++++++
+ arch/x86/crypto/camellia_aesni_avx_glue.c  |   19 +++++++++++++++++++
+ arch/x86/crypto/cast6_avx_glue.c           |   24 +++++++++++++++++++-----
+ arch/x86/crypto/chacha20_glue.c            |    9 +++++----
+ arch/x86/crypto/serpent_avx2_glue.c        |   19 +++++++++++++++++++
+ arch/x86/crypto/serpent_avx_glue.c         |   23 +++++++++++++++++++----
+ arch/x86/crypto/serpent_sse2_glue.c        |   23 +++++++++++++++++++----
+ arch/x86/crypto/twofish_avx_glue.c         |   27 +++++++++++++++++++++++++--
+ arch/x86/include/asm/fpu/api.h             |    1 +
+ arch/x86/kernel/fpu/core.c                 |   12 ++++++++++++
+ 10 files changed, 158 insertions(+), 19 deletions(-)
+
+--- a/arch/x86/crypto/camellia_aesni_avx2_glue.c
++++ b/arch/x86/crypto/camellia_aesni_avx2_glue.c
+@@ -206,6 +206,20 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void camellia_fpu_end_rt(struct crypt_priv *ctx)
++{
++       bool fpu_enabled = ctx->fpu_enabled;
++
++       if (!fpu_enabled)
++               return;
++       camellia_fpu_end(fpu_enabled);
++       ctx->fpu_enabled = false;
++}
++#else
++static void camellia_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+@@ -221,16 +235,19 @@ static void encrypt_callback(void *priv,
+ 	}
+ 
+ 	if (nbytes >= CAMELLIA_AESNI_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		camellia_ecb_enc_16way(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;
+ 	}
+ 
+ 	while (nbytes >= CAMELLIA_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		camellia_enc_blk_2way(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 	}
++	camellia_fpu_end_rt(ctx);
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		camellia_enc_blk(ctx->ctx, srcdst, srcdst);
+@@ -251,16 +268,19 @@ static void decrypt_callback(void *priv,
+ 	}
+ 
+ 	if (nbytes >= CAMELLIA_AESNI_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		camellia_ecb_dec_16way(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * CAMELLIA_AESNI_PARALLEL_BLOCKS;
+ 	}
+ 
+ 	while (nbytes >= CAMELLIA_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		camellia_dec_blk_2way(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 	}
++	camellia_fpu_end_rt(ctx);
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		camellia_dec_blk(ctx->ctx, srcdst, srcdst);
+--- a/arch/x86/crypto/camellia_aesni_avx_glue.c
++++ b/arch/x86/crypto/camellia_aesni_avx_glue.c
+@@ -210,6 +210,21 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void camellia_fpu_end_rt(struct crypt_priv *ctx)
++{
++	bool fpu_enabled = ctx->fpu_enabled;
++
++	if (!fpu_enabled)
++		return;
++	camellia_fpu_end(fpu_enabled);
++	ctx->fpu_enabled = false;
++}
++
++#else
++static void camellia_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = CAMELLIA_BLOCK_SIZE;
+@@ -225,10 +240,12 @@ static void encrypt_callback(void *priv,
+ 	}
+ 
+ 	while (nbytes >= CAMELLIA_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		camellia_enc_blk_2way(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 	}
++	camellia_fpu_end_rt(ctx);
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		camellia_enc_blk(ctx->ctx, srcdst, srcdst);
+@@ -249,10 +266,12 @@ static void decrypt_callback(void *priv,
+ 	}
+ 
+ 	while (nbytes >= CAMELLIA_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		camellia_dec_blk_2way(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * CAMELLIA_PARALLEL_BLOCKS;
+ 	}
++	camellia_fpu_end_rt(ctx);
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		camellia_dec_blk(ctx->ctx, srcdst, srcdst);
+--- a/arch/x86/crypto/cast6_avx_glue.c
++++ b/arch/x86/crypto/cast6_avx_glue.c
+@@ -205,19 +205,33 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void cast6_fpu_end_rt(struct crypt_priv *ctx)
++{
++	bool fpu_enabled = ctx->fpu_enabled;
++
++	if (!fpu_enabled)
++		return;
++	cast6_fpu_end(fpu_enabled);
++	ctx->fpu_enabled = false;
++}
++
++#else
++static void cast6_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = CAST6_BLOCK_SIZE;
+ 	struct crypt_priv *ctx = priv;
+ 	int i;
+ 
+-	ctx->fpu_enabled = cast6_fpu_begin(ctx->fpu_enabled, nbytes);
+-
+ 	if (nbytes == bsize * CAST6_PARALLEL_BLOCKS) {
++		ctx->fpu_enabled = cast6_fpu_begin(ctx->fpu_enabled, nbytes);
+ 		cast6_ecb_enc_8way(ctx->ctx, srcdst, srcdst);
++		cast6_fpu_end_rt(ctx);
+ 		return;
+ 	}
+-
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		__cast6_encrypt(ctx->ctx, srcdst, srcdst);
+ }
+@@ -228,10 +242,10 @@ static void decrypt_callback(void *priv,
+ 	struct crypt_priv *ctx = priv;
+ 	int i;
+ 
+-	ctx->fpu_enabled = cast6_fpu_begin(ctx->fpu_enabled, nbytes);
+-
+ 	if (nbytes == bsize * CAST6_PARALLEL_BLOCKS) {
++		ctx->fpu_enabled = cast6_fpu_begin(ctx->fpu_enabled, nbytes);
+ 		cast6_ecb_dec_8way(ctx->ctx, srcdst, srcdst);
++		cast6_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+--- a/arch/x86/crypto/chacha20_glue.c
++++ b/arch/x86/crypto/chacha20_glue.c
+@@ -81,23 +81,24 @@ static int chacha20_simd(struct skcipher
+ 
+ 	crypto_chacha20_init(state, ctx, walk.iv);
+ 
+-	kernel_fpu_begin();
+-
+ 	while (walk.nbytes >= CHACHA20_BLOCK_SIZE) {
++		kernel_fpu_begin();
++
+ 		chacha20_dosimd(state, walk.dst.virt.addr, walk.src.virt.addr,
+ 				rounddown(walk.nbytes, CHACHA20_BLOCK_SIZE));
++		kernel_fpu_end();
+ 		err = skcipher_walk_done(&walk,
+ 					 walk.nbytes % CHACHA20_BLOCK_SIZE);
+ 	}
+ 
+ 	if (walk.nbytes) {
++		kernel_fpu_begin();
+ 		chacha20_dosimd(state, walk.dst.virt.addr, walk.src.virt.addr,
+ 				walk.nbytes);
++		kernel_fpu_end();
+ 		err = skcipher_walk_done(&walk, 0);
+ 	}
+ 
+-	kernel_fpu_end();
+-
+ 	return err;
+ }
+ 
+--- a/arch/x86/crypto/serpent_avx2_glue.c
++++ b/arch/x86/crypto/serpent_avx2_glue.c
+@@ -184,6 +184,21 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void serpent_fpu_end_rt(struct crypt_priv *ctx)
++{
++       bool fpu_enabled = ctx->fpu_enabled;
++
++       if (!fpu_enabled)
++               return;
++       serpent_fpu_end(fpu_enabled);
++       ctx->fpu_enabled = false;
++}
++
++#else
++static void serpent_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = SERPENT_BLOCK_SIZE;
+@@ -199,10 +214,12 @@ static void encrypt_callback(void *priv,
+ 	}
+ 
+ 	while (nbytes >= SERPENT_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		serpent_ecb_enc_8way_avx(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * SERPENT_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * SERPENT_PARALLEL_BLOCKS;
+ 	}
++	serpent_fpu_end_rt(ctx);
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		__serpent_encrypt(ctx->ctx, srcdst, srcdst);
+@@ -223,10 +240,12 @@ static void decrypt_callback(void *priv,
+ 	}
+ 
+ 	while (nbytes >= SERPENT_PARALLEL_BLOCKS * bsize) {
++		kernel_fpu_resched();
+ 		serpent_ecb_dec_8way_avx(ctx->ctx, srcdst, srcdst);
+ 		srcdst += bsize * SERPENT_PARALLEL_BLOCKS;
+ 		nbytes -= bsize * SERPENT_PARALLEL_BLOCKS;
+ 	}
++	serpent_fpu_end_rt(ctx);
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+ 		__serpent_decrypt(ctx->ctx, srcdst, srcdst);
+--- a/arch/x86/crypto/serpent_avx_glue.c
++++ b/arch/x86/crypto/serpent_avx_glue.c
+@@ -218,16 +218,31 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void serpent_fpu_end_rt(struct crypt_priv *ctx)
++{
++	bool fpu_enabled = ctx->fpu_enabled;
++
++	if (!fpu_enabled)
++		return;
++	serpent_fpu_end(fpu_enabled);
++	ctx->fpu_enabled = false;
++}
++
++#else
++static void serpent_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = SERPENT_BLOCK_SIZE;
+ 	struct crypt_priv *ctx = priv;
+ 	int i;
+ 
+-	ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+-
+ 	if (nbytes == bsize * SERPENT_PARALLEL_BLOCKS) {
++		ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+ 		serpent_ecb_enc_8way_avx(ctx->ctx, srcdst, srcdst);
++		serpent_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+@@ -241,10 +256,10 @@ static void decrypt_callback(void *priv,
+ 	struct crypt_priv *ctx = priv;
+ 	int i;
+ 
+-	ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+-
+ 	if (nbytes == bsize * SERPENT_PARALLEL_BLOCKS) {
++		ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+ 		serpent_ecb_dec_8way_avx(ctx->ctx, srcdst, srcdst);
++		serpent_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+--- a/arch/x86/crypto/serpent_sse2_glue.c
++++ b/arch/x86/crypto/serpent_sse2_glue.c
+@@ -187,16 +187,31 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void serpent_fpu_end_rt(struct crypt_priv *ctx)
++{
++	bool fpu_enabled = ctx->fpu_enabled;
++
++	if (!fpu_enabled)
++		return;
++	serpent_fpu_end(fpu_enabled);
++	ctx->fpu_enabled = false;
++}
++
++#else
++static void serpent_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = SERPENT_BLOCK_SIZE;
+ 	struct crypt_priv *ctx = priv;
+ 	int i;
+ 
+-	ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+-
+ 	if (nbytes == bsize * SERPENT_PARALLEL_BLOCKS) {
++		ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+ 		serpent_enc_blk_xway(ctx->ctx, srcdst, srcdst);
++		serpent_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+@@ -210,10 +225,10 @@ static void decrypt_callback(void *priv,
+ 	struct crypt_priv *ctx = priv;
+ 	int i;
+ 
+-	ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+-
+ 	if (nbytes == bsize * SERPENT_PARALLEL_BLOCKS) {
++		ctx->fpu_enabled = serpent_fpu_begin(ctx->fpu_enabled, nbytes);
+ 		serpent_dec_blk_xway(ctx->ctx, srcdst, srcdst);
++		serpent_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+--- a/arch/x86/crypto/twofish_avx_glue.c
++++ b/arch/x86/crypto/twofish_avx_glue.c
+@@ -218,6 +218,21 @@ struct crypt_priv {
+ 	bool fpu_enabled;
+ };
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++static void twofish_fpu_end_rt(struct crypt_priv *ctx)
++{
++	bool fpu_enabled = ctx->fpu_enabled;
++
++	if (!fpu_enabled)
++		return;
++	twofish_fpu_end(fpu_enabled);
++	ctx->fpu_enabled = false;
++}
++
++#else
++static void twofish_fpu_end_rt(struct crypt_priv *ctx) { }
++#endif
++
+ static void encrypt_callback(void *priv, u8 *srcdst, unsigned int nbytes)
+ {
+ 	const unsigned int bsize = TF_BLOCK_SIZE;
+@@ -228,12 +243,16 @@ static void encrypt_callback(void *priv,
+ 
+ 	if (nbytes == bsize * TWOFISH_PARALLEL_BLOCKS) {
+ 		twofish_ecb_enc_8way(ctx->ctx, srcdst, srcdst);
++		twofish_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+-	for (i = 0; i < nbytes / (bsize * 3); i++, srcdst += bsize * 3)
++	for (i = 0; i < nbytes / (bsize * 3); i++, srcdst += bsize * 3) {
++		kernel_fpu_resched();
+ 		twofish_enc_blk_3way(ctx->ctx, srcdst, srcdst);
++	}
+ 
++	twofish_fpu_end_rt(ctx);
+ 	nbytes %= bsize * 3;
+ 
+ 	for (i = 0; i < nbytes / bsize; i++, srcdst += bsize)
+@@ -250,11 +269,15 @@ static void decrypt_callback(void *priv,
+ 
+ 	if (nbytes == bsize * TWOFISH_PARALLEL_BLOCKS) {
+ 		twofish_ecb_dec_8way(ctx->ctx, srcdst, srcdst);
++		twofish_fpu_end_rt(ctx);
+ 		return;
+ 	}
+ 
+-	for (i = 0; i < nbytes / (bsize * 3); i++, srcdst += bsize * 3)
++	for (i = 0; i < nbytes / (bsize * 3); i++, srcdst += bsize * 3) {
++		kernel_fpu_resched();
+ 		twofish_dec_blk_3way(ctx->ctx, srcdst, srcdst);
++	}
++	twofish_fpu_end_rt(ctx);
+ 
+ 	nbytes %= bsize * 3;
+ 
+--- a/arch/x86/include/asm/fpu/api.h
++++ b/arch/x86/include/asm/fpu/api.h
+@@ -25,6 +25,7 @@ extern void __kernel_fpu_begin(void);
+ extern void __kernel_fpu_end(void);
+ extern void kernel_fpu_begin(void);
+ extern void kernel_fpu_end(void);
++extern void kernel_fpu_resched(void);
+ extern bool irq_fpu_usable(void);
+ 
+ /*
+--- a/arch/x86/kernel/fpu/core.c
++++ b/arch/x86/kernel/fpu/core.c
+@@ -137,6 +137,18 @@ void kernel_fpu_end(void)
+ }
+ EXPORT_SYMBOL_GPL(kernel_fpu_end);
+ 
++void kernel_fpu_resched(void)
++{
++	WARN_ON_FPU(!this_cpu_read(in_kernel_fpu));
++
++	if (should_resched(PREEMPT_OFFSET)) {
++		kernel_fpu_end();
++		cond_resched();
++		kernel_fpu_begin();
++	}
++}
++EXPORT_SYMBOL_GPL(kernel_fpu_resched);
++
+ /*
+  * Save the FPU state (mark it for reload if necessary):
+  *
diff --git a/kernel/patches-4.14.x-rt/0334-arm-disable-NEON-in-kernel-mode.patch b/kernel/patches-4.14.x-rt/0334-arm-disable-NEON-in-kernel-mode.patch
new file mode 100644
index 000000000..869e1ce1e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0334-arm-disable-NEON-in-kernel-mode.patch
@@ -0,0 +1,127 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 1 Dec 2017 10:42:03 +0100
+Subject: [PATCH] arm*: disable NEON in kernel mode
+
+NEON in kernel mode is used by the crypto algorithms and raid6 code.
+While the raid6 code looks okay, the crypto algorithms do not: NEON
+is enabled on first invocation and may allocate/free/map memory before
+the NEON mode is disabled again.
+This needs to be changed until it can be enabled.
+On ARM NEON in kernel mode can be simply disabled. on ARM64 it needs to
+stay on due to possible EFI callbacks so here I disable each algorithm.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ arch/arm/Kconfig                  |    2 +-
+ arch/arm64/crypto/Kconfig         |   20 ++++++++++----------
+ arch/arm64/crypto/crc32-ce-glue.c |    3 ++-
+ 3 files changed, 13 insertions(+), 12 deletions(-)
+
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -2164,7 +2164,7 @@ config NEON
+ 
+ config KERNEL_MODE_NEON
+ 	bool "Support for NEON in kernel mode"
+-	depends on NEON && AEABI
++	depends on NEON && AEABI && !PREEMPT_RT_BASE
+ 	help
+ 	  Say Y to include support for NEON in kernel mode.
+ 
+--- a/arch/arm64/crypto/Kconfig
++++ b/arch/arm64/crypto/Kconfig
+@@ -19,19 +19,19 @@ config CRYPTO_SHA512_ARM64
+ 
+ config CRYPTO_SHA1_ARM64_CE
+ 	tristate "SHA-1 digest algorithm (ARMv8 Crypto Extensions)"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_HASH
+ 	select CRYPTO_SHA1
+ 
+ config CRYPTO_SHA2_ARM64_CE
+ 	tristate "SHA-224/SHA-256 digest algorithm (ARMv8 Crypto Extensions)"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_HASH
+ 	select CRYPTO_SHA256_ARM64
+ 
+ config CRYPTO_GHASH_ARM64_CE
+ 	tristate "GHASH/AES-GCM using ARMv8 Crypto Extensions"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_HASH
+ 	select CRYPTO_GF128MUL
+ 	select CRYPTO_AES
+@@ -39,7 +39,7 @@ config CRYPTO_GHASH_ARM64_CE
+ 
+ config CRYPTO_CRCT10DIF_ARM64_CE
+ 	tristate "CRCT10DIF digest algorithm using PMULL instructions"
+-	depends on KERNEL_MODE_NEON && CRC_T10DIF
++	depends on KERNEL_MODE_NEON && CRC_T10DIF && !PREEMPT_RT_BASE
+ 	select CRYPTO_HASH
+ 
+ config CRYPTO_CRC32_ARM64_CE
+@@ -53,13 +53,13 @@ config CRYPTO_AES_ARM64
+ 
+ config CRYPTO_AES_ARM64_CE
+ 	tristate "AES core cipher using ARMv8 Crypto Extensions"
+-	depends on ARM64 && KERNEL_MODE_NEON
++	depends on ARM64 && KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES_ARM64
+ 
+ config CRYPTO_AES_ARM64_CE_CCM
+ 	tristate "AES in CCM mode using ARMv8 Crypto Extensions"
+-	depends on ARM64 && KERNEL_MODE_NEON
++	depends on ARM64 && KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_ALGAPI
+ 	select CRYPTO_AES_ARM64_CE
+ 	select CRYPTO_AES_ARM64
+@@ -67,7 +67,7 @@ config CRYPTO_AES_ARM64_CE_CCM
+ 
+ config CRYPTO_AES_ARM64_CE_BLK
+ 	tristate "AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_BLKCIPHER
+ 	select CRYPTO_AES_ARM64_CE
+ 	select CRYPTO_AES_ARM64
+@@ -75,7 +75,7 @@ config CRYPTO_AES_ARM64_CE_BLK
+ 
+ config CRYPTO_AES_ARM64_NEON_BLK
+ 	tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_BLKCIPHER
+ 	select CRYPTO_AES_ARM64
+ 	select CRYPTO_AES
+@@ -83,13 +83,13 @@ config CRYPTO_AES_ARM64_NEON_BLK
+ 
+ config CRYPTO_CHACHA20_NEON
+ 	tristate "NEON accelerated ChaCha20 symmetric cipher"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_BLKCIPHER
+ 	select CRYPTO_CHACHA20
+ 
+ config CRYPTO_AES_ARM64_BS
+ 	tristate "AES in ECB/CBC/CTR/XTS modes using bit-sliced NEON algorithm"
+-	depends on KERNEL_MODE_NEON
++	depends on KERNEL_MODE_NEON && !PREEMPT_RT_BASE
+ 	select CRYPTO_BLKCIPHER
+ 	select CRYPTO_AES_ARM64_NEON_BLK
+ 	select CRYPTO_AES_ARM64
+--- a/arch/arm64/crypto/crc32-ce-glue.c
++++ b/arch/arm64/crypto/crc32-ce-glue.c
+@@ -206,7 +206,8 @@ static struct shash_alg crc32_pmull_algs
+ 
+ static int __init crc32_pmull_mod_init(void)
+ {
+-	if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) && (elf_hwcap & HWCAP_PMULL)) {
++	if (IS_ENABLED(CONFIG_KERNEL_MODE_NEON) &&
++	    !IS_ENABLED(CONFIG_PREEMPT_RT_BASE) && (elf_hwcap & HWCAP_PMULL)) {
+ 		crc32_pmull_algs[0].update = crc32_pmull_update;
+ 		crc32_pmull_algs[1].update = crc32c_pmull_update;
+ 
diff --git a/kernel/patches-4.14.x-rt/0335-dm-make-rt-aware.patch b/kernel/patches-4.14.x-rt/0335-dm-make-rt-aware.patch
new file mode 100644
index 000000000..6f8e3e635
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0335-dm-make-rt-aware.patch
@@ -0,0 +1,26 @@
+Subject: dm: Make rt aware
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Mon, 14 Nov 2011 23:06:09 +0100
+
+Use the BUG_ON_NORT variant for the irq_disabled() checks. RT has
+interrupts legitimately enabled here as we cant deadlock against the
+irq thread due to the "sleeping spinlocks" conversion.
+
+Reported-by: Luis Claudio R. Goncalves <lclaudio@uudg.org>
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/md/dm-rq.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/md/dm-rq.c
++++ b/drivers/md/dm-rq.c
+@@ -671,7 +671,7 @@ static void dm_old_request_fn(struct req
+ 		/* Establish tio->ti before queuing work (map_tio_request) */
+ 		tio->ti = ti;
+ 		kthread_queue_work(&md->kworker, &tio->work);
+-		BUG_ON(!irqs_disabled());
++		BUG_ON_NONRT(!irqs_disabled());
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0336-acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch b/kernel/patches-4.14.x-rt/0336-acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch
new file mode 100644
index 000000000..1e8bce7fd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0336-acpi-rt-Convert-acpi_gbl_hardware-lock-back-to-a-raw.patch
@@ -0,0 +1,173 @@
+From: Steven Rostedt <rostedt@goodmis.org>
+Date: Wed, 13 Feb 2013 09:26:05 -0500
+Subject: acpi/rt: Convert acpi_gbl_hardware lock back to a raw_spinlock_t
+
+We hit the following bug with 3.6-rt:
+
+[    5.898990] BUG: scheduling while atomic: swapper/3/0/0x00000002
+[    5.898991] no locks held by swapper/3/0.
+[    5.898993] Modules linked in:
+[    5.898996] Pid: 0, comm: swapper/3 Not tainted 3.6.11-rt28.19.el6rt.x86_64.debug #1
+[    5.898997] Call Trace:
+[    5.899011]  [<ffffffff810804e7>] __schedule_bug+0x67/0x90
+[    5.899028]  [<ffffffff81577923>] __schedule+0x793/0x7a0
+[    5.899032]  [<ffffffff810b4e40>] ? debug_rt_mutex_print_deadlock+0x50/0x200
+[    5.899034]  [<ffffffff81577b89>] schedule+0x29/0x70
+[    5.899036] BUG: scheduling while atomic: swapper/7/0/0x00000002
+[    5.899037] no locks held by swapper/7/0.
+[    5.899039]  [<ffffffff81578525>] rt_spin_lock_slowlock+0xe5/0x2f0
+[    5.899040] Modules linked in:
+[    5.899041]
+[    5.899045]  [<ffffffff81579a58>] ? _raw_spin_unlock_irqrestore+0x38/0x90
+[    5.899046] Pid: 0, comm: swapper/7 Not tainted 3.6.11-rt28.19.el6rt.x86_64.debug #1
+[    5.899047] Call Trace:
+[    5.899049]  [<ffffffff81578bc6>] rt_spin_lock+0x16/0x40
+[    5.899052]  [<ffffffff810804e7>] __schedule_bug+0x67/0x90
+[    5.899054]  [<ffffffff8157d3f0>] ? notifier_call_chain+0x80/0x80
+[    5.899056]  [<ffffffff81577923>] __schedule+0x793/0x7a0
+[    5.899059]  [<ffffffff812f2034>] acpi_os_acquire_lock+0x1f/0x23
+[    5.899062]  [<ffffffff810b4e40>] ? debug_rt_mutex_print_deadlock+0x50/0x200
+[    5.899068]  [<ffffffff8130be64>] acpi_write_bit_register+0x33/0xb0
+[    5.899071]  [<ffffffff81577b89>] schedule+0x29/0x70
+[    5.899072]  [<ffffffff8130be13>] ? acpi_read_bit_register+0x33/0x51
+[    5.899074]  [<ffffffff81578525>] rt_spin_lock_slowlock+0xe5/0x2f0
+[    5.899077]  [<ffffffff8131d1fc>] acpi_idle_enter_bm+0x8a/0x28e
+[    5.899079]  [<ffffffff81579a58>] ? _raw_spin_unlock_irqrestore+0x38/0x90
+[    5.899081]  [<ffffffff8107e5da>] ? this_cpu_load+0x1a/0x30
+[    5.899083]  [<ffffffff81578bc6>] rt_spin_lock+0x16/0x40
+[    5.899087]  [<ffffffff8144c759>] cpuidle_enter+0x19/0x20
+[    5.899088]  [<ffffffff8157d3f0>] ? notifier_call_chain+0x80/0x80
+[    5.899090]  [<ffffffff8144c777>] cpuidle_enter_state+0x17/0x50
+[    5.899092]  [<ffffffff812f2034>] acpi_os_acquire_lock+0x1f/0x23
+[    5.899094]  [<ffffffff8144d1a1>] cpuidle899101]  [<ffffffff8130be13>] ?
+
+As the acpi code disables interrupts in acpi_idle_enter_bm, and calls
+code that grabs the acpi lock, it causes issues as the lock is currently
+in RT a sleeping lock.
+
+The lock was converted from a raw to a sleeping lock due to some
+previous issues, and tests that showed it didn't seem to matter.
+Unfortunately, it did matter for one of our boxes.
+
+This patch converts the lock back to a raw lock. I've run this code on a
+few of my own machines, one being my laptop that uses the acpi quite
+extensively. I've been able to suspend and resume without issues.
+
+[ tglx: Made the change exclusive for acpi_gbl_hardware_lock ]
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+Cc: John Kacur <jkacur@gmail.com>
+Cc: Clark Williams <clark@redhat.com>
+Link: http://lkml.kernel.org/r/1360765565.23152.5.camel@gandalf.local.home
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/acpi/acpica/acglobal.h  |    2 +-
+ drivers/acpi/acpica/hwregs.c    |    4 ++--
+ drivers/acpi/acpica/hwxface.c   |    4 ++--
+ drivers/acpi/acpica/utmutex.c   |    4 ++--
+ include/acpi/platform/aclinux.h |   15 +++++++++++++++
+ 5 files changed, 22 insertions(+), 7 deletions(-)
+
+--- a/drivers/acpi/acpica/acglobal.h
++++ b/drivers/acpi/acpica/acglobal.h
+@@ -116,7 +116,7 @@ ACPI_GLOBAL(u8, acpi_gbl_global_lock_pen
+  * interrupt level
+  */
+ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_gpe_lock);	/* For GPE data structs and registers */
+-ACPI_GLOBAL(acpi_spinlock, acpi_gbl_hardware_lock);	/* For ACPI H/W except GPE registers */
++ACPI_GLOBAL(acpi_raw_spinlock, acpi_gbl_hardware_lock);	/* For ACPI H/W except GPE registers */
+ ACPI_GLOBAL(acpi_spinlock, acpi_gbl_reference_count_lock);
+ 
+ /* Mutex for _OSI support */
+--- a/drivers/acpi/acpica/hwregs.c
++++ b/drivers/acpi/acpica/hwregs.c
+@@ -428,14 +428,14 @@ acpi_status acpi_hw_clear_acpi_status(vo
+ 			  ACPI_BITMASK_ALL_FIXED_STATUS,
+ 			  ACPI_FORMAT_UINT64(acpi_gbl_xpm1a_status.address)));
+ 
+-	lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
++	raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
+ 
+ 	/* Clear the fixed events in PM1 A/B */
+ 
+ 	status = acpi_hw_register_write(ACPI_REGISTER_PM1_STATUS,
+ 					ACPI_BITMASK_ALL_FIXED_STATUS);
+ 
+-	acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
++	raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
+ 
+ 	if (ACPI_FAILURE(status)) {
+ 		goto exit;
+--- a/drivers/acpi/acpica/hwxface.c
++++ b/drivers/acpi/acpica/hwxface.c
+@@ -373,7 +373,7 @@ acpi_status acpi_write_bit_register(u32
+ 		return_ACPI_STATUS(AE_BAD_PARAMETER);
+ 	}
+ 
+-	lock_flags = acpi_os_acquire_lock(acpi_gbl_hardware_lock);
++	raw_spin_lock_irqsave(acpi_gbl_hardware_lock, lock_flags);
+ 
+ 	/*
+ 	 * At this point, we know that the parent register is one of the
+@@ -434,7 +434,7 @@ acpi_status acpi_write_bit_register(u32
+ 
+ unlock_and_exit:
+ 
+-	acpi_os_release_lock(acpi_gbl_hardware_lock, lock_flags);
++	raw_spin_unlock_irqrestore(acpi_gbl_hardware_lock, lock_flags);
+ 	return_ACPI_STATUS(status);
+ }
+ 
+--- a/drivers/acpi/acpica/utmutex.c
++++ b/drivers/acpi/acpica/utmutex.c
+@@ -88,7 +88,7 @@ acpi_status acpi_ut_mutex_initialize(voi
+ 		return_ACPI_STATUS (status);
+ 	}
+ 
+-	status = acpi_os_create_lock (&acpi_gbl_hardware_lock);
++	status = acpi_os_create_raw_lock (&acpi_gbl_hardware_lock);
+ 	if (ACPI_FAILURE (status)) {
+ 		return_ACPI_STATUS (status);
+ 	}
+@@ -145,7 +145,7 @@ void acpi_ut_mutex_terminate(void)
+ 	/* Delete the spinlocks */
+ 
+ 	acpi_os_delete_lock(acpi_gbl_gpe_lock);
+-	acpi_os_delete_lock(acpi_gbl_hardware_lock);
++	acpi_os_delete_raw_lock(acpi_gbl_hardware_lock);
+ 	acpi_os_delete_lock(acpi_gbl_reference_count_lock);
+ 
+ 	/* Delete the reader/writer lock */
+--- a/include/acpi/platform/aclinux.h
++++ b/include/acpi/platform/aclinux.h
+@@ -134,6 +134,7 @@
+ 
+ #define acpi_cache_t                        struct kmem_cache
+ #define acpi_spinlock                       spinlock_t *
++#define acpi_raw_spinlock		raw_spinlock_t *
+ #define acpi_cpu_flags                      unsigned long
+ 
+ /* Use native linux version of acpi_os_allocate_zeroed */
+@@ -152,6 +153,20 @@
+ #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_get_thread_id
+ #define ACPI_USE_ALTERNATE_PROTOTYPE_acpi_os_create_lock
+ 
++#define acpi_os_create_raw_lock(__handle)			\
++({								\
++	 raw_spinlock_t *lock = ACPI_ALLOCATE(sizeof(*lock));	\
++								\
++	 if (lock) {						\
++		*(__handle) = lock;				\
++		raw_spin_lock_init(*(__handle));		\
++	 }							\
++	 lock ? AE_OK : AE_NO_MEMORY;				\
++ })
++
++#define acpi_os_delete_raw_lock(__handle)	kfree(__handle)
++
++
+ /*
+  * OSL interfaces used by debugger/disassembler
+  */
diff --git a/kernel/patches-4.14.x-rt/0337-cpumask-disable-offstack-on-rt.patch b/kernel/patches-4.14.x-rt/0337-cpumask-disable-offstack-on-rt.patch
new file mode 100644
index 000000000..09681f54d
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0337-cpumask-disable-offstack-on-rt.patch
@@ -0,0 +1,67 @@
+Subject: cpumask: Disable CONFIG_CPUMASK_OFFSTACK for RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 14 Dec 2011 01:03:49 +0100
+
+There are "valid" GFP_ATOMIC allocations such as
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:931
+|in_atomic(): 1, irqs_disabled(): 0, pid: 2130, name: tar
+|1 lock held by tar/2130:
+| #0:  (&mm->mmap_sem){++++++}, at: [<ffffffff811d4e89>] SyS_brk+0x39/0x190
+|Preemption disabled at:[<ffffffff81063048>] flush_tlb_mm_range+0x28/0x350
+|
+|CPU: 1 PID: 2130 Comm: tar Tainted: G        W       4.8.2-rt2+ #747
+|Call Trace:
+| [<ffffffff814d52dc>] dump_stack+0x86/0xca
+| [<ffffffff810a26fb>] ___might_sleep+0x14b/0x240
+| [<ffffffff819bc1d4>] rt_spin_lock+0x24/0x60
+| [<ffffffff81194fba>] get_page_from_freelist+0x83a/0x11b0
+| [<ffffffff81195e8b>] __alloc_pages_nodemask+0x15b/0x1190
+| [<ffffffff811f0b81>] alloc_pages_current+0xa1/0x1f0
+| [<ffffffff811f7df5>] new_slab+0x3e5/0x690
+| [<ffffffff811fb0d5>] ___slab_alloc+0x495/0x660
+| [<ffffffff811fb311>] __slab_alloc.isra.79+0x71/0xc0
+| [<ffffffff811fb447>] __kmalloc_node+0xe7/0x240
+| [<ffffffff814d4ee0>] alloc_cpumask_var_node+0x20/0x50
+| [<ffffffff814d4f3e>] alloc_cpumask_var+0xe/0x10
+| [<ffffffff810430c1>] native_send_call_func_ipi+0x21/0x130
+| [<ffffffff8111c13f>] smp_call_function_many+0x22f/0x370
+| [<ffffffff81062b64>] native_flush_tlb_others+0x1a4/0x3a0
+| [<ffffffff8106309b>] flush_tlb_mm_range+0x7b/0x350
+| [<ffffffff811c88e2>] tlb_flush_mmu_tlbonly+0x62/0xd0
+| [<ffffffff811c9af4>] tlb_finish_mmu+0x14/0x50
+| [<ffffffff811d1c84>] unmap_region+0xe4/0x110
+| [<ffffffff811d3db3>] do_munmap+0x293/0x470
+| [<ffffffff811d4f8c>] SyS_brk+0x13c/0x190
+| [<ffffffff810032e2>] do_fast_syscall_32+0xb2/0x2f0
+| [<ffffffff819be181>] entry_SYSENTER_compat+0x51/0x60
+
+which forbid allocations at run-time.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/x86/Kconfig |    2 +-
+ lib/Kconfig      |    1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -934,7 +934,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.
+--- a/lib/Kconfig
++++ b/lib/Kconfig
+@@ -428,6 +428,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/kernel/patches-4.14.x-rt/0338-random-make-it-work-on-rt.patch b/kernel/patches-4.14.x-rt/0338-random-make-it-work-on-rt.patch
new file mode 100644
index 000000000..950e102bf
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0338-random-make-it-work-on-rt.patch
@@ -0,0 +1,132 @@
+Subject: random: Make it work on rt
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Tue, 21 Aug 2012 20:38:50 +0200
+
+Delegate the random insertion to the forced threaded interrupt
+handler. Store the return IP of the hard interrupt handler in the irq
+descriptor and feed it into the random generator as a source of
+entropy.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ drivers/char/random.c   |   11 +++++------
+ drivers/hv/vmbus_drv.c  |    4 +++-
+ include/linux/irqdesc.h |    1 +
+ include/linux/random.h  |    2 +-
+ kernel/irq/handle.c     |    8 +++++++-
+ kernel/irq/manage.c     |    6 ++++++
+ 6 files changed, 23 insertions(+), 9 deletions(-)
+
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -1113,28 +1113,27 @@ static __u32 get_reg(struct fast_pool *f
+ 	return *ptr;
+ }
+ 
+-void add_interrupt_randomness(int irq, int irq_flags)
++void add_interrupt_randomness(int irq, int irq_flags, __u64 ip)
+ {
+ 	struct entropy_store	*r;
+ 	struct fast_pool	*fast_pool = this_cpu_ptr(&irq_randomness);
+-	struct pt_regs		*regs = get_irq_regs();
+ 	unsigned long		now = jiffies;
+ 	cycles_t		cycles = random_get_entropy();
+ 	__u32			c_high, j_high;
+-	__u64			ip;
+ 	unsigned long		seed;
+ 	int			credit = 0;
+ 
+ 	if (cycles == 0)
+-		cycles = get_reg(fast_pool, regs);
++		cycles = get_reg(fast_pool, NULL);
+ 	c_high = (sizeof(cycles) > 4) ? cycles >> 32 : 0;
+ 	j_high = (sizeof(now) > 4) ? now >> 32 : 0;
+ 	fast_pool->pool[0] ^= cycles ^ j_high ^ irq;
+ 	fast_pool->pool[1] ^= now ^ c_high;
+-	ip = regs ? instruction_pointer(regs) : _RET_IP_;
++	if (!ip)
++		ip = _RET_IP_;
+ 	fast_pool->pool[2] ^= ip;
+ 	fast_pool->pool[3] ^= (sizeof(ip) > 4) ? ip >> 32 :
+-		get_reg(fast_pool, regs);
++		get_reg(fast_pool, NULL);
+ 
+ 	fast_mix(fast_pool);
+ 	add_interrupt_bench(cycles);
+--- a/drivers/hv/vmbus_drv.c
++++ b/drivers/hv/vmbus_drv.c
+@@ -966,6 +966,8 @@ static void vmbus_isr(void)
+ 	void *page_addr = hv_cpu->synic_event_page;
+ 	struct hv_message *msg;
+ 	union hv_synic_event_flags *event;
++	struct pt_regs *regs = get_irq_regs();
++	u64 ip = regs ? instruction_pointer(regs) : 0;
+ 	bool handled = false;
+ 
+ 	if (unlikely(page_addr == NULL))
+@@ -1009,7 +1011,7 @@ static void vmbus_isr(void)
+ 			tasklet_schedule(&hv_cpu->msg_dpc);
+ 	}
+ 
+-	add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0);
++	add_interrupt_randomness(HYPERVISOR_CALLBACK_VECTOR, 0, ip);
+ }
+ 
+ 
+--- a/include/linux/irqdesc.h
++++ b/include/linux/irqdesc.h
+@@ -70,6 +70,7 @@ struct irq_desc {
+ 	unsigned int		irqs_unhandled;
+ 	atomic_t		threads_handled;
+ 	int			threads_handled_last;
++	u64			random_ip;
+ 	raw_spinlock_t		lock;
+ 	struct cpumask		*percpu_enabled;
+ 	const struct cpumask	*percpu_affinity;
+--- a/include/linux/random.h
++++ b/include/linux/random.h
+@@ -32,7 +32,7 @@ static inline void add_latent_entropy(vo
+ 
+ extern void add_input_randomness(unsigned int type, unsigned int code,
+ 				 unsigned int value) __latent_entropy;
+-extern void add_interrupt_randomness(int irq, int irq_flags) __latent_entropy;
++extern void add_interrupt_randomness(int irq, int irq_flags, __u64 ip) __latent_entropy;
+ 
+ extern void get_random_bytes(void *buf, int nbytes);
+ extern int wait_for_random_bytes(void);
+--- a/kernel/irq/handle.c
++++ b/kernel/irq/handle.c
+@@ -183,10 +183,16 @@ irqreturn_t handle_irq_event_percpu(stru
+ {
+ 	irqreturn_t retval;
+ 	unsigned int flags = 0;
++	struct pt_regs *regs = get_irq_regs();
++	u64 ip = regs ? instruction_pointer(regs) : 0;
+ 
+ 	retval = __handle_irq_event_percpu(desc, &flags);
+ 
+-	add_interrupt_randomness(desc->irq_data.irq, flags);
++#ifdef CONFIG_PREEMPT_RT_FULL
++	desc->random_ip = ip;
++#else
++	add_interrupt_randomness(desc->irq_data.irq, flags, ip);
++#endif
+ 
+ 	if (!noirqdebug)
+ 		note_interrupt(desc, retval);
+--- a/kernel/irq/manage.c
++++ b/kernel/irq/manage.c
+@@ -1027,6 +1027,12 @@ static int irq_thread(void *data)
+ 		if (action_ret == IRQ_WAKE_THREAD)
+ 			irq_wake_secondary(desc, action);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++		migrate_disable();
++		add_interrupt_randomness(action->irq, 0,
++				 desc->random_ip ^ (unsigned long) action);
++		migrate_enable();
++#endif
+ 		wake_threads_waitq(desc);
+ 	}
+ 
diff --git a/kernel/patches-4.14.x-rt/0339-random-avoid-preempt_disable-ed-section.patch b/kernel/patches-4.14.x-rt/0339-random-avoid-preempt_disable-ed-section.patch
new file mode 100644
index 000000000..e8599cf4e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0339-random-avoid-preempt_disable-ed-section.patch
@@ -0,0 +1,74 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 12 May 2017 15:46:17 +0200
+Subject: [PATCH] random: avoid preempt_disable()ed section
+
+extract_crng() will use sleeping locks while in a preempt_disable()
+section due to get_cpu_var().
+Work around it with local_locks.
+
+Cc: stable-rt@vger.kernel.org # where it applies to
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/char/random.c |   11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -265,6 +265,7 @@
+ #include <linux/syscalls.h>
+ #include <linux/completion.h>
+ #include <linux/uuid.h>
++#include <linux/locallock.h>
+ #include <crypto/chacha20.h>
+ 
+ #include <asm/processor.h>
+@@ -2087,6 +2088,7 @@ static rwlock_t batched_entropy_reset_lo
+  * at any point prior.
+  */
+ static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u64);
++static DEFINE_LOCAL_IRQ_LOCK(batched_entropy_u64_lock);
+ u64 get_random_u64(void)
+ {
+ 	u64 ret;
+@@ -2107,7 +2109,7 @@ u64 get_random_u64(void)
+ 	warn_unseeded_randomness(&previous);
+ 
+ 	use_lock = READ_ONCE(crng_init) < 2;
+-	batch = &get_cpu_var(batched_entropy_u64);
++	batch = &get_locked_var(batched_entropy_u64_lock, batched_entropy_u64);
+ 	if (use_lock)
+ 		read_lock_irqsave(&batched_entropy_reset_lock, flags);
+ 	if (batch->position % ARRAY_SIZE(batch->entropy_u64) == 0) {
+@@ -2117,12 +2119,13 @@ u64 get_random_u64(void)
+ 	ret = batch->entropy_u64[batch->position++];
+ 	if (use_lock)
+ 		read_unlock_irqrestore(&batched_entropy_reset_lock, flags);
+-	put_cpu_var(batched_entropy_u64);
++	put_locked_var(batched_entropy_u64_lock, batched_entropy_u64);
+ 	return ret;
+ }
+ EXPORT_SYMBOL(get_random_u64);
+ 
+ static DEFINE_PER_CPU(struct batched_entropy, batched_entropy_u32);
++static DEFINE_LOCAL_IRQ_LOCK(batched_entropy_u32_lock);
+ u32 get_random_u32(void)
+ {
+ 	u32 ret;
+@@ -2137,7 +2140,7 @@ u32 get_random_u32(void)
+ 	warn_unseeded_randomness(&previous);
+ 
+ 	use_lock = READ_ONCE(crng_init) < 2;
+-	batch = &get_cpu_var(batched_entropy_u32);
++	batch = &get_locked_var(batched_entropy_u32_lock, batched_entropy_u32);
+ 	if (use_lock)
+ 		read_lock_irqsave(&batched_entropy_reset_lock, flags);
+ 	if (batch->position % ARRAY_SIZE(batch->entropy_u32) == 0) {
+@@ -2147,7 +2150,7 @@ u32 get_random_u32(void)
+ 	ret = batch->entropy_u32[batch->position++];
+ 	if (use_lock)
+ 		read_unlock_irqrestore(&batched_entropy_reset_lock, flags);
+-	put_cpu_var(batched_entropy_u32);
++	put_locked_var(batched_entropy_u32_lock, batched_entropy_u32);
+ 	return ret;
+ }
+ EXPORT_SYMBOL(get_random_u32);
diff --git a/kernel/patches-4.14.x-rt/0340-char-random-don-t-print-that-the-init-is-done.patch b/kernel/patches-4.14.x-rt/0340-char-random-don-t-print-that-the-init-is-done.patch
new file mode 100644
index 000000000..970b88193
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0340-char-random-don-t-print-that-the-init-is-done.patch
@@ -0,0 +1,166 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Tue, 30 May 2017 16:39:01 +0200
+Subject: char/random: don't print that the init is done
+
+On RT we run into circular locking with pendingb_lock (workqueue),
+port_lock_key (uart) and the primary_crng (random):
+
+ ======================================================
+ [ INFO: possible circular locking dependency detected ]
+ -------------------------------------------------------
+ irq/4-serial/512 is trying to acquire lock:
+  ((pendingb_lock).lock){+.+...}, at: [<ffffffff8108d48d>] queue_work_on+0x5d/0x190
+
+ but task is already holding lock:
+  (&port_lock_key){+.+...}, at: [<ffffffff815b4bb6>] serial8250_handle_irq.part.27+0x16/0xb0
+
+ which lock already depends on the new lock.
+
+ the existing dependency chain (in reverse order) is:
+
+ -> #3 (&port_lock_key){+.+...}:
+        lock_acquire+0xac/0x240
+        rt_spin_lock+0x46/0x50
+        serial8250_console_write+0x211/0x220
+        univ8250_console_write+0x1c/0x20
+        console_unlock+0x563/0x5c0
+        vprintk_emit+0x277/0x320
+        vprintk_default+0x1a/0x20
+        vprintk_func+0x20/0x80
+        printk+0x3e/0x46
+        crng_fast_load+0xde/0xe0
+        add_interrupt_randomness+0x16c/0x1a0
+        irq_thread+0x15c/0x1e0
+        kthread+0x112/0x150
+        ret_from_fork+0x31/0x40
+
+ -> #2 (primary_crng.lock){+.+...}:
+        lock_acquire+0xac/0x240
+        rt_spin_lock+0x46/0x50
+        _extract_crng+0x39/0xa0
+        extract_crng+0x3a/0x40
+        get_random_u32+0x120/0x190
+        new_slab+0x1d6/0x7c0
+        ___slab_alloc+0x30b/0x6f0
+        __slab_alloc.isra.78+0x6c/0xc0
+        __kmalloc+0x254/0x3a0
+        pcpu_mem_zalloc+0x3a/0x70
+        percpu_init_late+0x4f/0x8a
+        start_kernel+0x1ec/0x3b8
+        x86_64_start_reservations+0x2a/0x2c
+        x86_64_start_kernel+0x13d/0x14c
+        verify_cpu+0x0/0xfc
+
+ -> #1 ((batched_entropy_u32_lock).lock){+.+...}:
+        lock_acquire+0xac/0x240
+        rt_spin_lock__no_mg+0x41/0x50
+        get_random_u32+0x64/0x190
+        new_slab+0x1d6/0x7c0
+        ___slab_alloc+0x30b/0x6f0
+        __slab_alloc.isra.78+0x6c/0xc0
+        kmem_cache_alloc+0x26a/0x370
+        __debug_object_init+0x325/0x460
+        debug_object_activate+0x11c/0x1f0
+        __queue_work+0x2c/0x770
+        queue_work_on+0x12a/0x190
+        serio_queue_event+0xd3/0x140
+        __serio_register_port+0x17e/0x1a0
+        i8042_probe+0x623/0x687
+        platform_drv_probe+0x36/0x90
+        driver_probe_device+0x1f8/0x2e0
+        __driver_attach+0x96/0xa0
+        bus_for_each_dev+0x5d/0x90
+        driver_attach+0x19/0x20
+        bus_add_driver+0x125/0x220
+        driver_register+0x5b/0xd0
+        __platform_driver_probe+0x5b/0x120
+        __platform_create_bundle+0xaa/0xd0
+        i8042_init+0x3f1/0x430
+        do_one_initcall+0x3e/0x180
+        kernel_init_freeable+0x212/0x295
+        kernel_init+0x9/0x100
+        ret_from_fork+0x31/0x40
+
+ -> #0 ((pendingb_lock).lock){+.+...}:
+        __lock_acquire+0x11b4/0x1320
+        lock_acquire+0xac/0x240
+        rt_spin_lock+0x46/0x50
+        queue_work_on+0x5d/0x190
+        tty_flip_buffer_push+0x26/0x30
+        serial8250_rx_chars+0x120/0x1f0
+        serial8250_handle_irq.part.27+0x58/0xb0
+        serial8250_default_handle_irq+0x4b/0x60
+        serial8250_interrupt+0x5f/0xd0
+        irq_forced_thread_fn+0x1e/0x70
+        irq_thread+0x137/0x1e0
+        kthread+0x112/0x150
+        ret_from_fork+0x31/0x40
+
+ other info that might help us debug this:
+
+ Chain exists of:
+   (pendingb_lock).lock --> primary_crng.lock --> &port_lock_key
+
+  Possible unsafe locking scenario:
+
+        CPU0                    CPU1
+        ----                    ----
+   lock(&port_lock_key);
+                                lock(primary_crng.lock);
+                                lock(&port_lock_key);
+   lock((pendingb_lock).lock);
+
+  *** DEADLOCK ***
+
+ 2 locks held by irq/4-serial/512:
+  #0:  (&i->lock){+.+...}, at: [<ffffffff815b0400>] serial8250_interrupt+0x30/0xd0
+  #1:  (&port_lock_key){+.+...}, at: [<ffffffff815b4bb6>] serial8250_handle_irq.part.27+0x16/0xb0
+
+ stack backtrace:
+ CPU: 4 PID: 512 Comm: irq/4-serial Not tainted 4.11.3-rt0+ #101
+ Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.10.2-1 04/01/2014
+ Call Trace:
+  dump_stack+0x86/0xc1
+  print_circular_bug+0x1be/0x210
+  __lock_acquire+0x11b4/0x1320
+  lock_acquire+0xac/0x240
+  rt_spin_lock+0x46/0x50
+  queue_work_on+0x5d/0x190
+  tty_flip_buffer_push+0x26/0x30
+  serial8250_rx_chars+0x120/0x1f0
+  serial8250_handle_irq.part.27+0x58/0xb0
+  serial8250_default_handle_irq+0x4b/0x60
+  serial8250_interrupt+0x5f/0xd0
+  irq_forced_thread_fn+0x1e/0x70
+  irq_thread+0x137/0x1e0
+  kthread+0x112/0x150
+  ret_from_fork+0x31/0x40
+
+It should work if we delay that printk after dropping the lock but we
+also could skip it.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/char/random.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/char/random.c
++++ b/drivers/char/random.c
+@@ -809,7 +809,7 @@ static int crng_fast_load(const char *cp
+ 		invalidate_batched_entropy();
+ 		crng_init = 1;
+ 		wake_up_interruptible(&crng_init_wait);
+-		pr_notice("random: fast init done\n");
++		/* pr_notice("random: fast init done\n"); */
+ 	}
+ 	return 1;
+ }
+@@ -848,7 +848,7 @@ static void crng_reseed(struct crng_stat
+ 		crng_init = 2;
+ 		process_random_ready_list();
+ 		wake_up_interruptible(&crng_init_wait);
+-		pr_notice("random: crng init done\n");
++		/* pr_notice("random: crng init done\n"); */
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0341-cpu-hotplug--Implement-CPU-pinning.patch b/kernel/patches-4.14.x-rt/0341-cpu-hotplug--Implement-CPU-pinning.patch
new file mode 100644
index 000000000..54ca45d0e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0341-cpu-hotplug--Implement-CPU-pinning.patch
@@ -0,0 +1,110 @@
+Subject: cpu/hotplug: Implement CPU pinning
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 19 Jul 2017 17:31:20 +0200
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/sched.h |    1 +
+ kernel/cpu.c          |   40 ++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 41 insertions(+)
+
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -589,6 +589,7 @@ struct task_struct {
+ #if defined(CONFIG_PREEMPT_COUNT) && defined(CONFIG_SMP)
+ 	int				migrate_disable;
+ 	int				migrate_disable_update;
++	int				pinned_on_cpu;
+ # ifdef CONFIG_SCHED_DEBUG
+ 	int				migrate_disable_atomic;
+ # endif
+--- a/kernel/cpu.c
++++ b/kernel/cpu.c
+@@ -73,6 +73,11 @@ static DEFINE_PER_CPU(struct cpuhp_cpu_s
+ 	.fail = CPUHP_INVALID,
+ };
+ 
++#ifdef CONFIG_HOTPLUG_CPU
++static DEFINE_PER_CPU(struct rt_rw_lock, cpuhp_pin_lock) = \
++	__RWLOCK_RT_INITIALIZER(cpuhp_pin_lock);
++#endif
++
+ #if defined(CONFIG_LOCKDEP) && defined(CONFIG_SMP)
+ static struct lockdep_map cpuhp_state_up_map =
+ 	STATIC_LOCKDEP_MAP_INIT("cpuhp_state-up", &cpuhp_state_up_map);
+@@ -291,7 +296,30 @@ static int cpu_hotplug_disabled;
+  */
+ void pin_current_cpu(void)
+ {
++	struct rt_rw_lock *cpuhp_pin;
++	unsigned int cpu;
++	int ret;
+ 
++again:
++	cpuhp_pin = this_cpu_ptr(&cpuhp_pin_lock);
++	ret = __read_rt_trylock(cpuhp_pin);
++	if (ret) {
++		current->pinned_on_cpu = smp_processor_id();
++		return;
++	}
++	cpu = smp_processor_id();
++	preempt_lazy_enable();
++	preempt_enable();
++
++	__read_rt_lock(cpuhp_pin);
++
++	preempt_disable();
++	preempt_lazy_disable();
++	if (cpu != smp_processor_id()) {
++		__read_rt_unlock(cpuhp_pin);
++		goto again;
++	}
++	current->pinned_on_cpu = cpu;
+ }
+ 
+ /**
+@@ -299,6 +327,13 @@ void pin_current_cpu(void)
+  */
+ void unpin_current_cpu(void)
+ {
++	struct rt_rw_lock *cpuhp_pin = this_cpu_ptr(&cpuhp_pin_lock);
++
++	if (WARN_ON(current->pinned_on_cpu != smp_processor_id()))
++		cpuhp_pin = per_cpu_ptr(&cpuhp_pin_lock, current->pinned_on_cpu);
++
++	current->pinned_on_cpu = -1;
++	__read_rt_unlock(cpuhp_pin);
+ }
+ 
+ DEFINE_STATIC_PERCPU_RWSEM(cpu_hotplug_lock);
+@@ -768,6 +803,7 @@ static int take_cpu_down(void *_param)
+ 
+ static int takedown_cpu(unsigned int cpu)
+ {
++	struct rt_rw_lock *cpuhp_pin = per_cpu_ptr(&cpuhp_pin_lock, cpu);
+ 	struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
+ 	int err;
+ 
+@@ -781,11 +817,14 @@ static int takedown_cpu(unsigned int cpu
+ 	 */
+ 	irq_lock_sparse();
+ 
++	__write_rt_lock(cpuhp_pin);
++
+ 	/*
+ 	 * So now all preempt/rcu users must observe !cpu_active().
+ 	 */
+ 	err = stop_machine_cpuslocked(take_cpu_down, NULL, cpumask_of(cpu));
+ 	if (err) {
++		__write_rt_unlock(cpuhp_pin);
+ 		/* CPU refused to die */
+ 		irq_unlock_sparse();
+ 		/* Unpark the hotplug thread so we can rollback there */
+@@ -804,6 +843,7 @@ static int takedown_cpu(unsigned int cpu
+ 	wait_for_ap_thread(st, false);
+ 	BUG_ON(st->state != CPUHP_AP_IDLE_DEAD);
+ 
++	__write_rt_unlock(cpuhp_pin);
+ 	/* Interrupts are moved away from the dying cpu, reenable alloc/free */
+ 	irq_unlock_sparse();
+ 
diff --git a/kernel/patches-4.14.x-rt/0342-hotplug-duct-tape-RT-rwlock-usage-for-non-RT.patch b/kernel/patches-4.14.x-rt/0342-hotplug-duct-tape-RT-rwlock-usage-for-non-RT.patch
new file mode 100644
index 000000000..ad8ba4623
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0342-hotplug-duct-tape-RT-rwlock-usage-for-non-RT.patch
@@ -0,0 +1,95 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 4 Aug 2017 18:31:00 +0200
+Subject: [PATCH] hotplug: duct-tape RT-rwlock usage for non-RT
+
+This type is only available on -RT. We need to craft something for
+non-RT. Since the only migrate_disable() user is -RT only, there is no
+damage.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/cpu.c |   14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+--- a/kernel/cpu.c
++++ b/kernel/cpu.c
+@@ -73,7 +73,7 @@ static DEFINE_PER_CPU(struct cpuhp_cpu_s
+ 	.fail = CPUHP_INVALID,
+ };
+ 
+-#ifdef CONFIG_HOTPLUG_CPU
++#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_PREEMPT_RT_FULL)
+ static DEFINE_PER_CPU(struct rt_rw_lock, cpuhp_pin_lock) = \
+ 	__RWLOCK_RT_INITIALIZER(cpuhp_pin_lock);
+ #endif
+@@ -296,6 +296,7 @@ static int cpu_hotplug_disabled;
+  */
+ void pin_current_cpu(void)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
+ 	struct rt_rw_lock *cpuhp_pin;
+ 	unsigned int cpu;
+ 	int ret;
+@@ -320,6 +321,7 @@ void pin_current_cpu(void)
+ 		goto again;
+ 	}
+ 	current->pinned_on_cpu = cpu;
++#endif
+ }
+ 
+ /**
+@@ -327,6 +329,7 @@ void pin_current_cpu(void)
+  */
+ void unpin_current_cpu(void)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
+ 	struct rt_rw_lock *cpuhp_pin = this_cpu_ptr(&cpuhp_pin_lock);
+ 
+ 	if (WARN_ON(current->pinned_on_cpu != smp_processor_id()))
+@@ -334,6 +337,7 @@ void unpin_current_cpu(void)
+ 
+ 	current->pinned_on_cpu = -1;
+ 	__read_rt_unlock(cpuhp_pin);
++#endif
+ }
+ 
+ DEFINE_STATIC_PERCPU_RWSEM(cpu_hotplug_lock);
+@@ -803,7 +807,9 @@ static int take_cpu_down(void *_param)
+ 
+ static int takedown_cpu(unsigned int cpu)
+ {
++#ifdef CONFIG_PREEMPT_RT_FULL
+ 	struct rt_rw_lock *cpuhp_pin = per_cpu_ptr(&cpuhp_pin_lock, cpu);
++#endif
+ 	struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
+ 	int err;
+ 
+@@ -817,14 +823,18 @@ static int takedown_cpu(unsigned int cpu
+ 	 */
+ 	irq_lock_sparse();
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
+ 	__write_rt_lock(cpuhp_pin);
++#endif
+ 
+ 	/*
+ 	 * So now all preempt/rcu users must observe !cpu_active().
+ 	 */
+ 	err = stop_machine_cpuslocked(take_cpu_down, NULL, cpumask_of(cpu));
+ 	if (err) {
++#ifdef CONFIG_PREEMPT_RT_FULL
+ 		__write_rt_unlock(cpuhp_pin);
++#endif
+ 		/* CPU refused to die */
+ 		irq_unlock_sparse();
+ 		/* Unpark the hotplug thread so we can rollback there */
+@@ -843,7 +853,9 @@ static int takedown_cpu(unsigned int cpu
+ 	wait_for_ap_thread(st, false);
+ 	BUG_ON(st->state != CPUHP_AP_IDLE_DEAD);
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
+ 	__write_rt_unlock(cpuhp_pin);
++#endif
+ 	/* Interrupts are moved away from the dying cpu, reenable alloc/free */
+ 	irq_unlock_sparse();
+ 
diff --git a/kernel/patches-4.14.x-rt/0343-scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch b/kernel/patches-4.14.x-rt/0343-scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch
new file mode 100644
index 000000000..64a759685
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0343-scsi-qla2xxx-fix-bug-sleeping-function-called-from-invalid-context.patch
@@ -0,0 +1,47 @@
+Subject: scsi: qla2xxx: Use local_irq_save_nort() in qla2x00_poll
+From: John Kacur <jkacur@redhat.com>
+Date: Fri, 27 Apr 2012 12:48:46 +0200
+
+RT triggers the following:
+
+[   11.307652]  [<ffffffff81077b27>] __might_sleep+0xe7/0x110
+[   11.307663]  [<ffffffff8150e524>] rt_spin_lock+0x24/0x60
+[   11.307670]  [<ffffffff8150da78>] ? rt_spin_lock_slowunlock+0x78/0x90
+[   11.307703]  [<ffffffffa0272d83>] qla24xx_intr_handler+0x63/0x2d0 [qla2xxx]
+[   11.307736]  [<ffffffffa0262307>] qla2x00_poll+0x67/0x90 [qla2xxx]
+
+Function qla2x00_poll does local_irq_save() before calling qla24xx_intr_handler
+which has a spinlock. Since spinlocks are sleepable on rt, it is not allowed
+to call them with interrupts disabled. Therefore we use local_irq_save_nort()
+instead which saves flags without disabling interrupts.
+
+This fix needs to be applied to v3.0-rt, v3.2-rt and v3.4-rt
+
+Suggested-by: Thomas Gleixner
+Signed-off-by: John Kacur <jkacur@redhat.com>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+Cc: David Sommerseth <davids@redhat.com>
+Link: http://lkml.kernel.org/r/1335523726-10024-1-git-send-email-jkacur@redhat.com
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/scsi/qla2xxx/qla_inline.h |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- 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;
+-	local_irq_save(flags);
++	local_irq_save_nort(flags);
+ 	if (IS_P3P_TYPE(ha))
+ 		qla82xx_poll(0, rsp);
+ 	else
+ 		ha->isp_ops->intr_handler(0, rsp);
+-	local_irq_restore(flags);
++	local_irq_restore_nort(flags);
+ }
+ 
+ static inline uint8_t *
diff --git a/kernel/patches-4.14.x-rt/0344-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch b/kernel/patches-4.14.x-rt/0344-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch
new file mode 100644
index 000000000..b79d26545
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0344-upstream-net-rt-remove-preemption-disabling-in-netif_rx.patch
@@ -0,0 +1,66 @@
+Subject: net: Remove preemption disabling in netif_rx()
+From: Priyanka Jain <Priyanka.Jain@freescale.com>
+Date: Thu, 17 May 2012 09:35:11 +0530
+
+1)enqueue_to_backlog() (called from netif_rx) should be
+  bind to a particluar CPU. This can be achieved by
+  disabling migration. No need to disable preemption
+
+2)Fixes crash "BUG: scheduling while atomic: ksoftirqd"
+  in case of RT.
+  If preemption is disabled, enqueue_to_backog() is called
+  in atomic context. And if backlog exceeds its count,
+  kfree_skb() is called. But in RT, kfree_skb() might
+  gets scheduled out, so it expects non atomic context.
+
+3)When CONFIG_PREEMPT_RT_FULL is not defined,
+ migrate_enable(), migrate_disable() maps to
+ preempt_enable() and preempt_disable(), so no
+ change in functionality in case of non-RT.
+
+-Replace preempt_enable(), preempt_disable() with
+ migrate_enable(), migrate_disable() respectively
+-Replace get_cpu(), put_cpu() with get_cpu_light(),
+ put_cpu_light() respectively
+
+Signed-off-by: Priyanka Jain <Priyanka.Jain@freescale.com>
+Acked-by: Rajan Srivastava <Rajan.Srivastava@freescale.com>
+Cc: <rostedt@goodmis.orgn>
+Link: http://lkml.kernel.org/r/1337227511-2271-1-git-send-email-Priyanka.Jain@freescale.com
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ Testing: Tested successfully on p4080ds(8-core SMP system)  
+
+ net/core/dev.c |    8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -4027,7 +4027,7 @@ static int netif_rx_internal(struct sk_b
+ 		struct rps_dev_flow voidflow, *rflow = &voidflow;
+ 		int cpu;
+ 
+-		preempt_disable();
++		migrate_disable();
+ 		rcu_read_lock();
+ 
+ 		cpu = get_rps_cpu(skb->dev, skb, &rflow);
+@@ -4037,14 +4037,14 @@ static int netif_rx_internal(struct sk_b
+ 		ret = enqueue_to_backlog(skb, cpu, &rflow->last_qtail);
+ 
+ 		rcu_read_unlock();
+-		preempt_enable();
++		migrate_enable();
+ 	} else
+ #endif
+ 	{
+ 		unsigned int qtail;
+ 
+-		ret = enqueue_to_backlog(skb, get_cpu(), &qtail);
+-		put_cpu();
++		ret = enqueue_to_backlog(skb, get_cpu_light(), &qtail);
++		put_cpu_light();
+ 	}
+ 	return ret;
+ }
diff --git a/kernel/patches-4.14.x-rt/0345-net-another-local-irq-disable-alloc-atomic-headache.patch b/kernel/patches-4.14.x-rt/0345-net-another-local-irq-disable-alloc-atomic-headache.patch
new file mode 100644
index 000000000..6f1eaf0b7
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0345-net-another-local-irq-disable-alloc-atomic-headache.patch
@@ -0,0 +1,58 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 26 Sep 2012 16:21:08 +0200
+Subject: net: Another local_irq_disable/kmalloc headache
+
+Replace it by a local lock. Though that's pretty inefficient :(
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ net/core/skbuff.c |   10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -64,6 +64,7 @@
+ #include <linux/errqueue.h>
+ #include <linux/prefetch.h>
+ #include <linux/if_vlan.h>
++#include <linux/locallock.h>
+ 
+ #include <net/protocol.h>
+ #include <net/dst.h>
+@@ -334,6 +335,7 @@ 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);
++static DEFINE_LOCAL_IRQ_LOCK(netdev_alloc_lock);
+ 
+ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
+ {
+@@ -341,10 +343,10 @@ static void *__netdev_alloc_frag(unsigne
+ 	unsigned long flags;
+ 	void *data;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(netdev_alloc_lock, flags);
+ 	nc = this_cpu_ptr(&netdev_alloc_cache);
+ 	data = page_frag_alloc(nc, fragsz, gfp_mask);
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(netdev_alloc_lock, flags);
+ 	return data;
+ }
+ 
+@@ -412,13 +414,13 @@ struct sk_buff *__netdev_alloc_skb(struc
+ 	if (sk_memalloc_socks())
+ 		gfp_mask |= __GFP_MEMALLOC;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(netdev_alloc_lock, flags);
+ 
+ 	nc = this_cpu_ptr(&netdev_alloc_cache);
+ 	data = page_frag_alloc(nc, len, gfp_mask);
+ 	pfmemalloc = nc->pfmemalloc;
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(netdev_alloc_lock, flags);
+ 
+ 	if (unlikely(!data))
+ 		return NULL;
diff --git a/kernel/patches-4.14.x-rt/0346-net-core-protect-users-of-napi_alloc_cache-against-r.patch b/kernel/patches-4.14.x-rt/0346-net-core-protect-users-of-napi_alloc_cache-against-r.patch
new file mode 100644
index 000000000..22997993e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0346-net-core-protect-users-of-napi_alloc_cache-against-r.patch
@@ -0,0 +1,112 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 15 Jan 2016 16:33:34 +0100
+Subject: net/core: protect users of napi_alloc_cache against
+ reentrance
+
+On -RT the code running in BH can not be moved to another CPU so CPU
+local variable remain local. However the code can be preempted
+and another task may enter BH accessing the same CPU using the same
+napi_alloc_cache variable.
+This patch ensures that each user of napi_alloc_cache uses a local lock.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ net/core/skbuff.c |   25 +++++++++++++++++++------
+ 1 file changed, 19 insertions(+), 6 deletions(-)
+
+--- a/net/core/skbuff.c
++++ b/net/core/skbuff.c
+@@ -336,6 +336,7 @@ 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);
+ static DEFINE_LOCAL_IRQ_LOCK(netdev_alloc_lock);
++static DEFINE_LOCAL_IRQ_LOCK(napi_alloc_cache_lock);
+ 
+ static void *__netdev_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
+ {
+@@ -365,9 +366,13 @@ EXPORT_SYMBOL(netdev_alloc_frag);
+ 
+ static void *__napi_alloc_frag(unsigned int fragsz, gfp_t gfp_mask)
+ {
+-	struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
++	struct napi_alloc_cache *nc;
++	void *data;
+ 
+-	return page_frag_alloc(&nc->page, fragsz, gfp_mask);
++	nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
++	data =  page_frag_alloc(&nc->page, fragsz, gfp_mask);
++	put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
++	return data;
+ }
+ 
+ void *napi_alloc_frag(unsigned int fragsz)
+@@ -461,9 +466,10 @@ EXPORT_SYMBOL(__netdev_alloc_skb);
+ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len,
+ 				 gfp_t gfp_mask)
+ {
+-	struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
++	struct napi_alloc_cache *nc;
+ 	struct sk_buff *skb;
+ 	void *data;
++	bool pfmemalloc;
+ 
+ 	len += NET_SKB_PAD + NET_IP_ALIGN;
+ 
+@@ -481,7 +487,10 @@ struct sk_buff *__napi_alloc_skb(struct
+ 	if (sk_memalloc_socks())
+ 		gfp_mask |= __GFP_MEMALLOC;
+ 
++	nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
+ 	data = page_frag_alloc(&nc->page, len, gfp_mask);
++	pfmemalloc = nc->page.pfmemalloc;
++	put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
+ 	if (unlikely(!data))
+ 		return NULL;
+ 
+@@ -492,7 +501,7 @@ struct sk_buff *__napi_alloc_skb(struct
+ 	}
+ 
+ 	/* use OR instead of assignment to avoid clearing of bits in mask */
+-	if (nc->page.pfmemalloc)
++	if (pfmemalloc)
+ 		skb->pfmemalloc = 1;
+ 	skb->head_frag = 1;
+ 
+@@ -724,23 +733,26 @@ void __consume_stateless_skb(struct sk_b
+ 
+ void __kfree_skb_flush(void)
+ {
+-	struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
++	struct napi_alloc_cache *nc;
+ 
++	nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
+ 	/* flush skb_cache if containing objects */
+ 	if (nc->skb_count) {
+ 		kmem_cache_free_bulk(skbuff_head_cache, nc->skb_count,
+ 				     nc->skb_cache);
+ 		nc->skb_count = 0;
+ 	}
++	put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
+ }
+ 
+ static inline void _kfree_skb_defer(struct sk_buff *skb)
+ {
+-	struct napi_alloc_cache *nc = this_cpu_ptr(&napi_alloc_cache);
++	struct napi_alloc_cache *nc;
+ 
+ 	/* drop skb->head and call any destructors for packet */
+ 	skb_release_all(skb);
+ 
++	nc = &get_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
+ 	/* record skb to CPU local list */
+ 	nc->skb_cache[nc->skb_count++] = skb;
+ 
+@@ -755,6 +767,7 @@ static inline void _kfree_skb_defer(stru
+ 				     nc->skb_cache);
+ 		nc->skb_count = 0;
+ 	}
++	put_locked_var(napi_alloc_cache_lock, napi_alloc_cache);
+ }
+ void __kfree_skb_defer(struct sk_buff *skb)
+ {
diff --git a/kernel/patches-4.14.x-rt/0347-net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch b/kernel/patches-4.14.x-rt/0347-net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch
new file mode 100644
index 000000000..c15a395b3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0347-net-fix-iptable-xt-write-recseq-begin-rt-fallout.patch
@@ -0,0 +1,75 @@
+Subject: net: netfilter: Serialize xt_write_recseq sections on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 28 Oct 2012 11:18:08 +0100
+
+The netfilter code relies only on the implicit semantics of
+local_bh_disable() for serializing wt_write_recseq sections. RT breaks
+that and needs explicit serialization here.
+
+Reported-by: Peter LaDow <petela@gocougs.wsu.edu>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ include/linux/netfilter/x_tables.h |    7 +++++++
+ net/netfilter/core.c               |    6 ++++++
+ 2 files changed, 13 insertions(+)
+
+--- a/include/linux/netfilter/x_tables.h
++++ b/include/linux/netfilter/x_tables.h
+@@ -6,6 +6,7 @@
+ #include <linux/netdevice.h>
+ #include <linux/static_key.h>
+ #include <linux/netfilter.h>
++#include <linux/locallock.h>
+ #include <uapi/linux/netfilter/x_tables.h>
+ 
+ /* Test a struct->invflags and a boolean for inequality */
+@@ -338,6 +339,8 @@ void xt_free_table_info(struct xt_table_
+  */
+ DECLARE_PER_CPU(seqcount_t, xt_recseq);
+ 
++DECLARE_LOCAL_IRQ_LOCK(xt_write_lock);
++
+ /* 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.
+@@ -358,6 +361,9 @@ static inline unsigned int xt_write_recs
+ {
+ 	unsigned int addend;
+ 
++	/* RT protection */
++	local_lock(xt_write_lock);
++
+ 	/*
+ 	 * Low order bit of sequence is set if we already
+ 	 * called xt_write_recseq_begin().
+@@ -388,6 +394,7 @@ static inline void xt_write_recseq_end(u
+ 	/* this is kind of a write_seqcount_end(), but addend is 0 or 1 */
+ 	smp_wmb();
+ 	__this_cpu_add(xt_recseq.sequence, addend);
++	local_unlock(xt_write_lock);
+ }
+ 
+ /*
+--- a/net/netfilter/core.c
++++ b/net/netfilter/core.c
+@@ -21,6 +21,7 @@
+ #include <linux/inetdevice.h>
+ #include <linux/proc_fs.h>
+ #include <linux/mutex.h>
++#include <linux/locallock.h>
+ #include <linux/mm.h>
+ #include <linux/rcupdate.h>
+ #include <net/net_namespace.h>
+@@ -28,6 +29,11 @@
+ 
+ #include "nf_internals.h"
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++DEFINE_LOCAL_IRQ_LOCK(xt_write_lock);
++EXPORT_PER_CPU_SYMBOL(xt_write_lock);
++#endif
++
+ static DEFINE_MUTEX(afinfo_mutex);
+ 
+ const struct nf_afinfo __rcu *nf_afinfo[NFPROTO_NUMPROTO] __read_mostly;
diff --git a/kernel/patches-4.14.x-rt/0348-net-make-devnet_rename_seq-a-mutex.patch b/kernel/patches-4.14.x-rt/0348-net-make-devnet_rename_seq-a-mutex.patch
new file mode 100644
index 000000000..122cd3459
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0348-net-make-devnet_rename_seq-a-mutex.patch
@@ -0,0 +1,106 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 20 Mar 2013 18:06:20 +0100
+Subject: net: Add a mutex around devnet_rename_seq
+
+On RT write_seqcount_begin() disables preemption and device_rename()
+allocates memory with GFP_KERNEL and grabs later the sysfs_mutex
+mutex. Serialize with a mutex and add use the non preemption disabling
+__write_seqcount_begin().
+
+To avoid writer starvation, let the reader grab the mutex and release
+it when it detects a writer in progress. This keeps the normal case
+(no reader on the fly) fast.
+
+[ tglx: Instead of replacing the seqcount by a mutex, add the mutex ]
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ net/core/dev.c |   34 ++++++++++++++++++++--------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+--- a/net/core/dev.c
++++ b/net/core/dev.c
+@@ -195,6 +195,7 @@ static unsigned int napi_gen_id = NR_CPU
+ static DEFINE_READ_MOSTLY_HASHTABLE(napi_hash, 8);
+ 
+ static seqcount_t devnet_rename_seq;
++static DEFINE_MUTEX(devnet_rename_mutex);
+ 
+ static inline void dev_base_seq_inc(struct net *net)
+ {
+@@ -920,7 +921,8 @@ int netdev_get_name(struct net *net, cha
+ 	strcpy(name, dev->name);
+ 	rcu_read_unlock();
+ 	if (read_seqcount_retry(&devnet_rename_seq, seq)) {
+-		cond_resched();
++		mutex_lock(&devnet_rename_mutex);
++		mutex_unlock(&devnet_rename_mutex);
+ 		goto retry;
+ 	}
+ 
+@@ -1189,20 +1191,17 @@ int dev_change_name(struct net_device *d
+ 	if (dev->flags & IFF_UP)
+ 		return -EBUSY;
+ 
+-	write_seqcount_begin(&devnet_rename_seq);
++	mutex_lock(&devnet_rename_mutex);
++	__raw_write_seqcount_begin(&devnet_rename_seq);
+ 
+-	if (strncmp(newname, dev->name, IFNAMSIZ) == 0) {
+-		write_seqcount_end(&devnet_rename_seq);
+-		return 0;
+-	}
++	if (strncmp(newname, dev->name, IFNAMSIZ) == 0)
++		goto outunlock;
+ 
+ 	memcpy(oldname, dev->name, IFNAMSIZ);
+ 
+ 	err = dev_get_valid_name(net, dev, newname);
+-	if (err < 0) {
+-		write_seqcount_end(&devnet_rename_seq);
+-		return err;
+-	}
++	if (err < 0)
++		goto outunlock;
+ 
+ 	if (oldname[0] && !strchr(oldname, '%'))
+ 		netdev_info(dev, "renamed from %s\n", oldname);
+@@ -1215,11 +1214,12 @@ int dev_change_name(struct net_device *d
+ 	if (ret) {
+ 		memcpy(dev->name, oldname, IFNAMSIZ);
+ 		dev->name_assign_type = old_assign_type;
+-		write_seqcount_end(&devnet_rename_seq);
+-		return ret;
++		err = ret;
++		goto outunlock;
+ 	}
+ 
+-	write_seqcount_end(&devnet_rename_seq);
++	__raw_write_seqcount_end(&devnet_rename_seq);
++	mutex_unlock(&devnet_rename_mutex);
+ 
+ 	netdev_adjacent_rename_links(dev, oldname);
+ 
+@@ -1240,7 +1240,8 @@ int dev_change_name(struct net_device *d
+ 		/* err >= 0 after dev_alloc_name() or stores the first errno */
+ 		if (err >= 0) {
+ 			err = ret;
+-			write_seqcount_begin(&devnet_rename_seq);
++			mutex_lock(&devnet_rename_mutex);
++			__raw_write_seqcount_begin(&devnet_rename_seq);
+ 			memcpy(dev->name, oldname, IFNAMSIZ);
+ 			memcpy(oldname, newname, IFNAMSIZ);
+ 			dev->name_assign_type = old_assign_type;
+@@ -1253,6 +1254,11 @@ int dev_change_name(struct net_device *d
+ 	}
+ 
+ 	return err;
++
++outunlock:
++	__raw_write_seqcount_end(&devnet_rename_seq);
++	mutex_unlock(&devnet_rename_mutex);
++	return err;
+ }
+ 
+ /**
diff --git a/kernel/patches-4.14.x-rt/0349-peterz-srcu-crypto-chain.patch b/kernel/patches-4.14.x-rt/0349-peterz-srcu-crypto-chain.patch
new file mode 100644
index 000000000..a61836256
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0349-peterz-srcu-crypto-chain.patch
@@ -0,0 +1,182 @@
+Subject: crypto: Convert crypto notifier chain to SRCU
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Fri, 05 Oct 2012 09:03:24 +0100
+
+The crypto notifier deadlocks on RT. Though this can be a real deadlock
+on mainline as well due to fifo fair rwsems.
+
+The involved parties here are:
+
+[   82.172678] swapper/0       S 0000000000000001     0     1      0 0x00000000
+[   82.172682]  ffff88042f18fcf0 0000000000000046 ffff88042f18fc80 ffffffff81491238
+[   82.172685]  0000000000011cc0 0000000000011cc0 ffff88042f18c040 ffff88042f18ffd8
+[   82.172688]  0000000000011cc0 0000000000011cc0 ffff88042f18ffd8 0000000000011cc0
+[   82.172689] Call Trace:
+[   82.172697]  [<ffffffff81491238>] ? _raw_spin_unlock_irqrestore+0x6c/0x7a
+[   82.172701]  [<ffffffff8148fd3f>] schedule+0x64/0x66
+[   82.172704]  [<ffffffff8148ec6b>] schedule_timeout+0x27/0xd0
+[   82.172708]  [<ffffffff81043c0c>] ? unpin_current_cpu+0x1a/0x6c
+[   82.172713]  [<ffffffff8106e491>] ? migrate_enable+0x12f/0x141
+[   82.172716]  [<ffffffff8148fbbd>] wait_for_common+0xbb/0x11f
+[   82.172719]  [<ffffffff810709f2>] ? try_to_wake_up+0x182/0x182
+[   82.172722]  [<ffffffff8148fc96>] wait_for_completion_interruptible+0x1d/0x2e
+[   82.172726]  [<ffffffff811debfd>] crypto_wait_for_test+0x49/0x6b
+[   82.172728]  [<ffffffff811ded32>] crypto_register_alg+0x53/0x5a
+[   82.172730]  [<ffffffff811ded6c>] crypto_register_algs+0x33/0x72
+[   82.172734]  [<ffffffff81ad7686>] ? aes_init+0x12/0x12
+[   82.172737]  [<ffffffff81ad76ea>] aesni_init+0x64/0x66
+[   82.172741]  [<ffffffff81000318>] do_one_initcall+0x7f/0x13b
+[   82.172744]  [<ffffffff81ac4d34>] kernel_init+0x199/0x22c
+[   82.172747]  [<ffffffff81ac44ef>] ? loglevel+0x31/0x31
+[   82.172752]  [<ffffffff814987c4>] kernel_thread_helper+0x4/0x10
+[   82.172755]  [<ffffffff81491574>] ? retint_restore_args+0x13/0x13
+[   82.172759]  [<ffffffff81ac4b9b>] ? start_kernel+0x3ca/0x3ca
+[   82.172761]  [<ffffffff814987c0>] ? gs_change+0x13/0x13
+
+[   82.174186] cryptomgr_test  S 0000000000000001     0    41      2 0x00000000
+[   82.174189]  ffff88042c971980 0000000000000046 ffffffff81d74830 0000000000000292
+[   82.174192]  0000000000011cc0 0000000000011cc0 ffff88042c96eb80 ffff88042c971fd8
+[   82.174195]  0000000000011cc0 0000000000011cc0 ffff88042c971fd8 0000000000011cc0
+[   82.174195] Call Trace:
+[   82.174198]  [<ffffffff8148fd3f>] schedule+0x64/0x66
+[   82.174201]  [<ffffffff8148ec6b>] schedule_timeout+0x27/0xd0
+[   82.174204]  [<ffffffff81043c0c>] ? unpin_current_cpu+0x1a/0x6c
+[   82.174206]  [<ffffffff8106e491>] ? migrate_enable+0x12f/0x141
+[   82.174209]  [<ffffffff8148fbbd>] wait_for_common+0xbb/0x11f
+[   82.174212]  [<ffffffff810709f2>] ? try_to_wake_up+0x182/0x182
+[   82.174215]  [<ffffffff8148fc96>] wait_for_completion_interruptible+0x1d/0x2e
+[   82.174218]  [<ffffffff811e4883>] cryptomgr_notify+0x280/0x385
+[   82.174221]  [<ffffffff814943de>] notifier_call_chain+0x6b/0x98
+[   82.174224]  [<ffffffff8108a11c>] ? rt_down_read+0x10/0x12
+[   82.174227]  [<ffffffff810677cd>] __blocking_notifier_call_chain+0x70/0x8d
+[   82.174230]  [<ffffffff810677fe>] blocking_notifier_call_chain+0x14/0x16
+[   82.174234]  [<ffffffff811dd272>] crypto_probing_notify+0x24/0x50
+[   82.174236]  [<ffffffff811dd7a1>] crypto_alg_mod_lookup+0x3e/0x74
+[   82.174238]  [<ffffffff811dd949>] crypto_alloc_base+0x36/0x8f
+[   82.174241]  [<ffffffff811e9408>] cryptd_alloc_ablkcipher+0x6e/0xb5
+[   82.174243]  [<ffffffff811dd591>] ? kzalloc.clone.5+0xe/0x10
+[   82.174246]  [<ffffffff8103085d>] ablk_init_common+0x1d/0x38
+[   82.174249]  [<ffffffff8103852a>] ablk_ecb_init+0x15/0x17
+[   82.174251]  [<ffffffff811dd8c6>] __crypto_alloc_tfm+0xc7/0x114
+[   82.174254]  [<ffffffff811e0caa>] ? crypto_lookup_skcipher+0x1f/0xe4
+[   82.174256]  [<ffffffff811e0dcf>] crypto_alloc_ablkcipher+0x60/0xa5
+[   82.174258]  [<ffffffff811e5bde>] alg_test_skcipher+0x24/0x9b
+[   82.174261]  [<ffffffff8106d96d>] ? finish_task_switch+0x3f/0xfa
+[   82.174263]  [<ffffffff811e6b8e>] alg_test+0x16f/0x1d7
+[   82.174267]  [<ffffffff811e45ac>] ? cryptomgr_probe+0xac/0xac
+[   82.174269]  [<ffffffff811e45d8>] cryptomgr_test+0x2c/0x47
+[   82.174272]  [<ffffffff81061161>] kthread+0x7e/0x86
+[   82.174275]  [<ffffffff8106d9dd>] ? finish_task_switch+0xaf/0xfa
+[   82.174278]  [<ffffffff814987c4>] kernel_thread_helper+0x4/0x10
+[   82.174281]  [<ffffffff81491574>] ? retint_restore_args+0x13/0x13
+[   82.174284]  [<ffffffff810610e3>] ? __init_kthread_worker+0x8c/0x8c
+[   82.174287]  [<ffffffff814987c0>] ? gs_change+0x13/0x13
+
+[   82.174329] cryptomgr_probe D 0000000000000002     0    47      2 0x00000000
+[   82.174332]  ffff88042c991b70 0000000000000046 ffff88042c991bb0 0000000000000006
+[   82.174335]  0000000000011cc0 0000000000011cc0 ffff88042c98ed00 ffff88042c991fd8
+[   82.174338]  0000000000011cc0 0000000000011cc0 ffff88042c991fd8 0000000000011cc0
+[   82.174338] Call Trace:
+[   82.174342]  [<ffffffff8148fd3f>] schedule+0x64/0x66
+[   82.174344]  [<ffffffff814901ad>] __rt_mutex_slowlock+0x85/0xbe
+[   82.174347]  [<ffffffff814902d2>] rt_mutex_slowlock+0xec/0x159
+[   82.174351]  [<ffffffff81089c4d>] rt_mutex_fastlock.clone.8+0x29/0x2f
+[   82.174353]  [<ffffffff81490372>] rt_mutex_lock+0x33/0x37
+[   82.174356]  [<ffffffff8108a0f2>] __rt_down_read+0x50/0x5a
+[   82.174358]  [<ffffffff8108a11c>] ? rt_down_read+0x10/0x12
+[   82.174360]  [<ffffffff8108a11c>] rt_down_read+0x10/0x12
+[   82.174363]  [<ffffffff810677b5>] __blocking_notifier_call_chain+0x58/0x8d
+[   82.174366]  [<ffffffff810677fe>] blocking_notifier_call_chain+0x14/0x16
+[   82.174369]  [<ffffffff811dd272>] crypto_probing_notify+0x24/0x50
+[   82.174372]  [<ffffffff811debd6>] crypto_wait_for_test+0x22/0x6b
+[   82.174374]  [<ffffffff811decd3>] crypto_register_instance+0xb4/0xc0
+[   82.174377]  [<ffffffff811e9b76>] cryptd_create+0x378/0x3b6
+[   82.174379]  [<ffffffff811de512>] ? __crypto_lookup_template+0x5b/0x63
+[   82.174382]  [<ffffffff811e4545>] cryptomgr_probe+0x45/0xac
+[   82.174385]  [<ffffffff811e4500>] ? crypto_alloc_pcomp+0x1b/0x1b
+[   82.174388]  [<ffffffff81061161>] kthread+0x7e/0x86
+[   82.174391]  [<ffffffff8106d9dd>] ? finish_task_switch+0xaf/0xfa
+[   82.174394]  [<ffffffff814987c4>] kernel_thread_helper+0x4/0x10
+[   82.174398]  [<ffffffff81491574>] ? retint_restore_args+0x13/0x13
+[   82.174401]  [<ffffffff810610e3>] ? __init_kthread_worker+0x8c/0x8c
+[   82.174403]  [<ffffffff814987c0>] ? gs_change+0x13/0x13
+
+cryptomgr_test spawns the cryptomgr_probe thread from the notifier
+call. The probe thread fires the same notifier as the test thread and
+deadlocks on the rwsem on RT.
+
+Now this is a potential deadlock in mainline as well, because we have
+fifo fair rwsems. If another thread blocks with a down_write() on the
+notifier chain before the probe thread issues the down_read() it will
+block the probe thread and the whole party is dead locked.
+
+Signed-off-by: Peter Zijlstra <peterz@infradead.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ crypto/algapi.c   |    4 ++--
+ crypto/api.c      |    6 +++---
+ crypto/internal.h |    4 ++--
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/crypto/algapi.c
++++ b/crypto/algapi.c
+@@ -731,13 +731,13 @@ EXPORT_SYMBOL_GPL(crypto_spawn_tfm2);
+ 
+ int crypto_register_notifier(struct notifier_block *nb)
+ {
+-	return blocking_notifier_chain_register(&crypto_chain, nb);
++	return srcu_notifier_chain_register(&crypto_chain, nb);
+ }
+ EXPORT_SYMBOL_GPL(crypto_register_notifier);
+ 
+ int crypto_unregister_notifier(struct notifier_block *nb)
+ {
+-	return blocking_notifier_chain_unregister(&crypto_chain, nb);
++	return srcu_notifier_chain_unregister(&crypto_chain, nb);
+ }
+ EXPORT_SYMBOL_GPL(crypto_unregister_notifier);
+ 
+--- 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);
+ 
+-BLOCKING_NOTIFIER_HEAD(crypto_chain);
++SRCU_NOTIFIER_HEAD(crypto_chain);
+ EXPORT_SYMBOL_GPL(crypto_chain);
+ 
+ static struct crypto_alg *crypto_larval_wait(struct crypto_alg *alg);
+@@ -236,10 +236,10 @@ int crypto_probing_notify(unsigned long
+ {
+ 	int ok;
+ 
+-	ok = blocking_notifier_call_chain(&crypto_chain, val, v);
++	ok = srcu_notifier_call_chain(&crypto_chain, val, v);
+ 	if (ok == NOTIFY_DONE) {
+ 		request_module("cryptomgr");
+-		ok = blocking_notifier_call_chain(&crypto_chain, val, v);
++		ok = srcu_notifier_call_chain(&crypto_chain, val, v);
+ 	}
+ 
+ 	return ok;
+--- 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;
+-extern struct blocking_notifier_head crypto_chain;
++extern struct srcu_notifier_head crypto_chain;
+ 
+ #ifdef CONFIG_PROC_FS
+ void __init crypto_init_proc(void);
+@@ -143,7 +143,7 @@ static inline int crypto_is_moribund(str
+ 
+ static inline void crypto_notify(unsigned long val, void *v)
+ {
+-	blocking_notifier_call_chain(&crypto_chain, val, v);
++	srcu_notifier_call_chain(&crypto_chain, val, v);
+ }
+ 
+ #endif	/* _CRYPTO_INTERNAL_H */
diff --git a/kernel/patches-4.14.x-rt/0350-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch b/kernel/patches-4.14.x-rt/0350-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch
new file mode 100644
index 000000000..6162cd2da
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0350-lockdep-selftest-only-do-hardirq-context-test-for-raw-spinlock.patch
@@ -0,0 +1,56 @@
+Subject: lockdep: selftest: Only do hardirq context test for raw spinlock
+From: Yong Zhang <yong.zhang0@gmail.com>
+Date: Mon, 16 Apr 2012 15:01:56 +0800
+
+From: Yong Zhang <yong.zhang@windriver.com>
+
+On -rt there is no softirq context any more and rwlock is sleepable,
+disable softirq context test and rwlock+irq test.
+
+Signed-off-by: Yong Zhang <yong.zhang0@gmail.com>
+Cc: Yong Zhang <yong.zhang@windriver.com>
+Link: http://lkml.kernel.org/r/1334559716-18447-3-git-send-email-yong.zhang0@gmail.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ lib/locking-selftest.c |   23 +++++++++++++++++++++++
+ 1 file changed, 23 insertions(+)
+
+--- a/lib/locking-selftest.c
++++ b/lib/locking-selftest.c
+@@ -2057,6 +2057,7 @@ void locking_selftest(void)
+ 
+ 	printk("  --------------------------------------------------------------------------\n");
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ 	/*
+ 	 * irq-context testcases:
+ 	 */
+@@ -2069,6 +2070,28 @@ void locking_selftest(void)
+ 
+ 	DO_TESTCASE_6x2("irq read-recursion", irq_read_recursion);
+ //	DO_TESTCASE_6x2B("irq read-recursion #2", irq_read_recursion2);
++#else
++	/* On -rt, we only do hardirq context test for raw spinlock */
++	DO_TESTCASE_1B("hard-irqs-on + irq-safe-A", irqsafe1_hard_spin, 12);
++	DO_TESTCASE_1B("hard-irqs-on + irq-safe-A", irqsafe1_hard_spin, 21);
++
++	DO_TESTCASE_1B("hard-safe-A + irqs-on", irqsafe2B_hard_spin, 12);
++	DO_TESTCASE_1B("hard-safe-A + irqs-on", irqsafe2B_hard_spin, 21);
++
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 123);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 132);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 213);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 231);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 312);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #1", irqsafe3_hard_spin, 321);
++
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 123);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 132);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 213);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 231);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 312);
++	DO_TESTCASE_1B("hard-safe-A + unsafe-B #2", irqsafe4_hard_spin, 321);
++#endif
+ 
+ 	ww_tests();
+ 
diff --git a/kernel/patches-4.14.x-rt/0351-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch b/kernel/patches-4.14.x-rt/0351-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch
new file mode 100644
index 000000000..01cc757dd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0351-lockdep-selftest-fix-warnings-due-to-missing-PREEMPT.patch
@@ -0,0 +1,141 @@
+From: Josh Cartwright <josh.cartwright@ni.com>
+Date: Wed, 28 Jan 2015 13:08:45 -0600
+Subject: lockdep: selftest: fix warnings due to missing PREEMPT_RT conditionals
+
+"lockdep: Selftest: Only do hardirq context test for raw spinlock"
+disabled the execution of certain tests with PREEMPT_RT_FULL, but did
+not prevent the tests from still being defined.  This leads to warnings
+like:
+
+  ./linux/lib/locking-selftest.c:574:1: warning: 'irqsafe1_hard_rlock_12' defined but not used [-Wunused-function]
+  ./linux/lib/locking-selftest.c:574:1: warning: 'irqsafe1_hard_rlock_21' defined but not used [-Wunused-function]
+  ./linux/lib/locking-selftest.c:577:1: warning: 'irqsafe1_hard_wlock_12' defined but not used [-Wunused-function]
+  ./linux/lib/locking-selftest.c:577:1: warning: 'irqsafe1_hard_wlock_21' defined but not used [-Wunused-function]
+  ./linux/lib/locking-selftest.c:580:1: warning: 'irqsafe1_soft_spin_12' defined but not used [-Wunused-function]
+  ...
+
+Fixed by wrapping the test definitions in #ifndef CONFIG_PREEMPT_RT_FULL
+conditionals.
+
+
+Signed-off-by: Josh Cartwright <josh.cartwright@ni.com>
+Signed-off-by: Xander Huff <xander.huff@ni.com>
+Acked-by: Gratian Crisan <gratian.crisan@ni.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ lib/locking-selftest.c |   27 +++++++++++++++++++++++++++
+ 1 file changed, 27 insertions(+)
+
+--- a/lib/locking-selftest.c
++++ b/lib/locking-selftest.c
+@@ -742,6 +742,8 @@ GENERATE_TESTCASE(init_held_rtmutex);
+ #include "locking-selftest-spin-hardirq.h"
+ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_spin)
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ #include "locking-selftest-rlock-hardirq.h"
+ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_hard_rlock)
+ 
+@@ -757,9 +759,12 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_
+ #include "locking-selftest-wlock-softirq.h"
+ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe1_soft_wlock)
+ 
++#endif
++
+ #undef E1
+ #undef E2
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
+ /*
+  * Enabling hardirqs with a softirq-safe lock held:
+  */
+@@ -792,6 +797,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A
+ #undef E1
+ #undef E2
+ 
++#endif
++
+ /*
+  * Enabling irqs with an irq-safe lock held:
+  */
+@@ -815,6 +822,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2A
+ #include "locking-selftest-spin-hardirq.h"
+ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_spin)
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ #include "locking-selftest-rlock-hardirq.h"
+ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_hard_rlock)
+ 
+@@ -830,6 +839,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B
+ #include "locking-selftest-wlock-softirq.h"
+ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B_soft_wlock)
+ 
++#endif
++
+ #undef E1
+ #undef E2
+ 
+@@ -861,6 +872,8 @@ GENERATE_PERMUTATIONS_2_EVENTS(irqsafe2B
+ #include "locking-selftest-spin-hardirq.h"
+ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_spin)
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ #include "locking-selftest-rlock-hardirq.h"
+ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_hard_rlock)
+ 
+@@ -876,6 +889,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_
+ #include "locking-selftest-wlock-softirq.h"
+ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_soft_wlock)
+ 
++#endif
++
+ #undef E1
+ #undef E2
+ #undef E3
+@@ -909,6 +924,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe3_
+ #include "locking-selftest-spin-hardirq.h"
+ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_spin)
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ #include "locking-selftest-rlock-hardirq.h"
+ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_hard_rlock)
+ 
+@@ -924,10 +941,14 @@ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_
+ #include "locking-selftest-wlock-softirq.h"
+ GENERATE_PERMUTATIONS_3_EVENTS(irqsafe4_soft_wlock)
+ 
++#endif
++
+ #undef E1
+ #undef E2
+ #undef E3
+ 
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ /*
+  * read-lock / write-lock irq inversion.
+  *
+@@ -990,6 +1011,10 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_inver
+ #undef E2
+ #undef E3
+ 
++#endif
++
++#ifndef CONFIG_PREEMPT_RT_FULL
++
+ /*
+  * read-lock / write-lock recursion that is actually safe.
+  */
+@@ -1028,6 +1053,8 @@ GENERATE_PERMUTATIONS_3_EVENTS(irq_read_
+ #undef E2
+ #undef E3
+ 
++#endif
++
+ /*
+  * read-lock / write-lock recursion that is unsafe.
+  */
diff --git a/kernel/patches-4.14.x-rt/0352-srcu-use-cpu_online-instead-custom-check.patch b/kernel/patches-4.14.x-rt/0352-srcu-use-cpu_online-instead-custom-check.patch
new file mode 100644
index 000000000..2fe2b226e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0352-srcu-use-cpu_online-instead-custom-check.patch
@@ -0,0 +1,99 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 13 Sep 2017 14:43:41 +0200
+Subject: [PATCH] srcu: use cpu_online() instead custom check
+
+The current check via srcu_online is slightly racy because after looking
+at srcu_online there could be an interrupt that interrupted us long
+enough until the CPU we checked against went offline.
+An alternative would be to hold the hotplug rwsem (so the CPUs don't
+change their state) and then check based on cpu_online() if we queue it
+on a specific CPU or not. queue_work_on() itself can handle if something
+is enqueued on an offline CPU but a timer which is enqueued on an offline
+CPU won't fire until the CPU is back online.
+
+I am not sure if the removal in rcu_init() is okay or not. I assume that
+SRCU won't enqueue a work item before SRCU is up and ready.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/srcutree.c |   22 ++++------------------
+ kernel/rcu/tree.c     |    6 ------
+ 2 files changed, 4 insertions(+), 24 deletions(-)
+
+--- a/kernel/rcu/srcutree.c
++++ b/kernel/rcu/srcutree.c
+@@ -36,6 +36,7 @@
+ #include <linux/delay.h>
+ #include <linux/module.h>
+ #include <linux/srcu.h>
++#include <linux/cpu.h>
+ 
+ #include "rcu.h"
+ #include "rcu_segcblist.h"
+@@ -425,21 +426,6 @@ static void srcu_gp_start(struct srcu_st
+ }
+ 
+ /*
+- * Track online CPUs to guide callback workqueue placement.
+- */
+-DEFINE_PER_CPU(bool, srcu_online);
+-
+-void srcu_online_cpu(unsigned int cpu)
+-{
+-	WRITE_ONCE(per_cpu(srcu_online, cpu), true);
+-}
+-
+-void srcu_offline_cpu(unsigned int cpu)
+-{
+-	WRITE_ONCE(per_cpu(srcu_online, cpu), false);
+-}
+-
+-/*
+  * Place the workqueue handler on the specified CPU if online, otherwise
+  * just run it whereever.  This is useful for placing workqueue handlers
+  * that are to invoke the specified CPU's callbacks.
+@@ -450,12 +436,12 @@ static bool srcu_queue_delayed_work_on(i
+ {
+ 	bool ret;
+ 
+-	preempt_disable();
+-	if (READ_ONCE(per_cpu(srcu_online, cpu)))
++	cpus_read_lock();
++	if (cpu_online(cpu))
+ 		ret = queue_delayed_work_on(cpu, wq, dwork, delay);
+ 	else
+ 		ret = queue_delayed_work(wq, dwork, delay);
+-	preempt_enable();
++	cpus_read_unlock();
+ 	return ret;
+ }
+ 
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -3775,8 +3775,6 @@ int rcutree_online_cpu(unsigned int cpu)
+ {
+ 	sync_sched_exp_online_cleanup(cpu);
+ 	rcutree_affinity_setting(cpu, -1);
+-	if (IS_ENABLED(CONFIG_TREE_SRCU))
+-		srcu_online_cpu(cpu);
+ 	return 0;
+ }
+ 
+@@ -3787,8 +3785,6 @@ int rcutree_online_cpu(unsigned int cpu)
+ int rcutree_offline_cpu(unsigned int cpu)
+ {
+ 	rcutree_affinity_setting(cpu, cpu);
+-	if (IS_ENABLED(CONFIG_TREE_SRCU))
+-		srcu_offline_cpu(cpu);
+ 	return 0;
+ }
+ 
+@@ -4236,8 +4232,6 @@ void __init rcu_init(void)
+ 	for_each_online_cpu(cpu) {
+ 		rcutree_prepare_cpu(cpu);
+ 		rcu_cpu_starting(cpu);
+-		if (IS_ENABLED(CONFIG_TREE_SRCU))
+-			srcu_online_cpu(cpu);
+ 	}
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0353-srcu-Prohibit-call_srcu-use-under-raw-spinlocks.patch b/kernel/patches-4.14.x-rt/0353-srcu-Prohibit-call_srcu-use-under-raw-spinlocks.patch
new file mode 100644
index 000000000..44d638795
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0353-srcu-Prohibit-call_srcu-use-under-raw-spinlocks.patch
@@ -0,0 +1,402 @@
+From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+Date: Tue, 10 Oct 2017 13:52:30 -0700
+Subject: srcu: Prohibit call_srcu() use under raw spinlocks
+
+Upstream commit 08265b8f1a139c1cff052b35ab7cf929528f88bb
+
+Invoking queue_delayed_work() while holding a raw spinlock is forbidden
+in -rt kernels, which is exactly what __call_srcu() does, indirectly via
+srcu_funnel_gp_start().  This commit therefore downgrades Tree SRCU's
+locking from raw to non-raw spinlocks, which works because call_srcu()
+is not ever called while holding a raw spinlock.
+
+Reported-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+---
+ include/linux/srcutree.h |    8 +--
+ kernel/rcu/srcutree.c    |  109 +++++++++++++++++++++++++++++------------------
+ 2 files changed, 72 insertions(+), 45 deletions(-)
+
+--- a/include/linux/srcutree.h
++++ b/include/linux/srcutree.h
+@@ -40,7 +40,7 @@ struct srcu_data {
+ 	unsigned long srcu_unlock_count[2];	/* Unlocks per CPU. */
+ 
+ 	/* Update-side state. */
+-	raw_spinlock_t __private lock ____cacheline_internodealigned_in_smp;
++	spinlock_t __private lock ____cacheline_internodealigned_in_smp;
+ 	struct rcu_segcblist srcu_cblist;	/* List of callbacks.*/
+ 	unsigned long srcu_gp_seq_needed;	/* Furthest future GP needed. */
+ 	unsigned long srcu_gp_seq_needed_exp;	/* Furthest future exp GP. */
+@@ -58,7 +58,7 @@ struct srcu_data {
+  * Node in SRCU combining tree, similar in function to rcu_data.
+  */
+ struct srcu_node {
+-	raw_spinlock_t __private lock;
++	spinlock_t __private lock;
+ 	unsigned long srcu_have_cbs[4];		/* GP seq for children */
+ 						/*  having CBs, but only */
+ 						/*  is > ->srcu_gq_seq. */
+@@ -78,7 +78,7 @@ struct srcu_struct {
+ 	struct srcu_node *level[RCU_NUM_LVLS + 1];
+ 						/* First node at each level. */
+ 	struct mutex srcu_cb_mutex;		/* Serialize CB preparation. */
+-	raw_spinlock_t __private lock;		/* Protect counters */
++	spinlock_t __private lock;		/* Protect counters */
+ 	struct mutex srcu_gp_mutex;		/* Serialize GP work. */
+ 	unsigned int srcu_idx;			/* Current rdr array element. */
+ 	unsigned long srcu_gp_seq;		/* Grace-period seq #. */
+@@ -107,7 +107,7 @@ struct srcu_struct {
+ #define __SRCU_STRUCT_INIT(name, pcpu_name)				\
+ 	{								\
+ 		.sda = &pcpu_name,					\
+-		.lock = __RAW_SPIN_LOCK_UNLOCKED(name.lock),		\
++		.lock = __SPIN_LOCK_UNLOCKED(name.lock),		\
+ 		.srcu_gp_seq_needed = 0 - 1,				\
+ 		__SRCU_DEP_MAP_INIT(name)				\
+ 	}
+--- a/kernel/rcu/srcutree.c
++++ b/kernel/rcu/srcutree.c
+@@ -54,6 +54,33 @@ static void srcu_invoke_callbacks(struct
+ static void srcu_reschedule(struct srcu_struct *sp, unsigned long delay);
+ static void process_srcu(struct work_struct *work);
+ 
++/* Wrappers for lock acquisition and release, see raw_spin_lock_rcu_node(). */
++#define spin_lock_rcu_node(p)					\
++do {									\
++	spin_lock(&ACCESS_PRIVATE(p, lock));			\
++	smp_mb__after_unlock_lock();					\
++} while (0)
++
++#define spin_unlock_rcu_node(p) spin_unlock(&ACCESS_PRIVATE(p, lock))
++
++#define spin_lock_irq_rcu_node(p)					\
++do {									\
++	spin_lock_irq(&ACCESS_PRIVATE(p, lock));			\
++	smp_mb__after_unlock_lock();					\
++} while (0)
++
++#define spin_unlock_irq_rcu_node(p)					\
++	spin_unlock_irq(&ACCESS_PRIVATE(p, lock))
++
++#define spin_lock_irqsave_rcu_node(p, flags)			\
++do {									\
++	spin_lock_irqsave(&ACCESS_PRIVATE(p, lock), flags);	\
++	smp_mb__after_unlock_lock();					\
++} while (0)
++
++#define spin_unlock_irqrestore_rcu_node(p, flags)			\
++	spin_unlock_irqrestore(&ACCESS_PRIVATE(p, lock), flags)	\
++
+ /*
+  * Initialize SRCU combining tree.  Note that statically allocated
+  * srcu_struct structures might already have srcu_read_lock() and
+@@ -78,7 +105,7 @@ static void init_srcu_struct_nodes(struc
+ 
+ 	/* Each pass through this loop initializes one srcu_node structure. */
+ 	rcu_for_each_node_breadth_first(sp, snp) {
+-		raw_spin_lock_init(&ACCESS_PRIVATE(snp, lock));
++		spin_lock_init(&ACCESS_PRIVATE(snp, lock));
+ 		WARN_ON_ONCE(ARRAY_SIZE(snp->srcu_have_cbs) !=
+ 			     ARRAY_SIZE(snp->srcu_data_have_cbs));
+ 		for (i = 0; i < ARRAY_SIZE(snp->srcu_have_cbs); i++) {
+@@ -112,7 +139,7 @@ static void init_srcu_struct_nodes(struc
+ 	snp_first = sp->level[level];
+ 	for_each_possible_cpu(cpu) {
+ 		sdp = per_cpu_ptr(sp->sda, cpu);
+-		raw_spin_lock_init(&ACCESS_PRIVATE(sdp, lock));
++		spin_lock_init(&ACCESS_PRIVATE(sdp, lock));
+ 		rcu_segcblist_init(&sdp->srcu_cblist);
+ 		sdp->srcu_cblist_invoking = false;
+ 		sdp->srcu_gp_seq_needed = sp->srcu_gp_seq;
+@@ -171,7 +198,7 @@ int __init_srcu_struct(struct srcu_struc
+ 	/* Don't re-initialize a lock while it is held. */
+ 	debug_check_no_locks_freed((void *)sp, sizeof(*sp));
+ 	lockdep_init_map(&sp->dep_map, name, key, 0);
+-	raw_spin_lock_init(&ACCESS_PRIVATE(sp, lock));
++	spin_lock_init(&ACCESS_PRIVATE(sp, lock));
+ 	return init_srcu_struct_fields(sp, false);
+ }
+ EXPORT_SYMBOL_GPL(__init_srcu_struct);
+@@ -188,7 +215,7 @@ EXPORT_SYMBOL_GPL(__init_srcu_struct);
+  */
+ int init_srcu_struct(struct srcu_struct *sp)
+ {
+-	raw_spin_lock_init(&ACCESS_PRIVATE(sp, lock));
++	spin_lock_init(&ACCESS_PRIVATE(sp, lock));
+ 	return init_srcu_struct_fields(sp, false);
+ }
+ EXPORT_SYMBOL_GPL(init_srcu_struct);
+@@ -211,13 +238,13 @@ static void check_init_srcu_struct(struc
+ 	/* The smp_load_acquire() pairs with the smp_store_release(). */
+ 	if (!rcu_seq_state(smp_load_acquire(&sp->srcu_gp_seq_needed))) /*^^^*/
+ 		return; /* Already initialized. */
+-	raw_spin_lock_irqsave_rcu_node(sp, flags);
++	spin_lock_irqsave_rcu_node(sp, flags);
+ 	if (!rcu_seq_state(sp->srcu_gp_seq_needed)) {
+-		raw_spin_unlock_irqrestore_rcu_node(sp, flags);
++		spin_unlock_irqrestore_rcu_node(sp, flags);
+ 		return;
+ 	}
+ 	init_srcu_struct_fields(sp, true);
+-	raw_spin_unlock_irqrestore_rcu_node(sp, flags);
++	spin_unlock_irqrestore_rcu_node(sp, flags);
+ }
+ 
+ /*
+@@ -499,7 +526,7 @@ static void srcu_gp_end(struct srcu_stru
+ 	mutex_lock(&sp->srcu_cb_mutex);
+ 
+ 	/* End the current grace period. */
+-	raw_spin_lock_irq_rcu_node(sp);
++	spin_lock_irq_rcu_node(sp);
+ 	idx = rcu_seq_state(sp->srcu_gp_seq);
+ 	WARN_ON_ONCE(idx != SRCU_STATE_SCAN2);
+ 	cbdelay = srcu_get_delay(sp);
+@@ -508,7 +535,7 @@ static void srcu_gp_end(struct srcu_stru
+ 	gpseq = rcu_seq_current(&sp->srcu_gp_seq);
+ 	if (ULONG_CMP_LT(sp->srcu_gp_seq_needed_exp, gpseq))
+ 		sp->srcu_gp_seq_needed_exp = gpseq;
+-	raw_spin_unlock_irq_rcu_node(sp);
++	spin_unlock_irq_rcu_node(sp);
+ 	mutex_unlock(&sp->srcu_gp_mutex);
+ 	/* A new grace period can start at this point.  But only one. */
+ 
+@@ -516,7 +543,7 @@ static void srcu_gp_end(struct srcu_stru
+ 	idx = rcu_seq_ctr(gpseq) % ARRAY_SIZE(snp->srcu_have_cbs);
+ 	idxnext = (idx + 1) % ARRAY_SIZE(snp->srcu_have_cbs);
+ 	rcu_for_each_node_breadth_first(sp, snp) {
+-		raw_spin_lock_irq_rcu_node(snp);
++		spin_lock_irq_rcu_node(snp);
+ 		cbs = false;
+ 		if (snp >= sp->level[rcu_num_lvls - 1])
+ 			cbs = snp->srcu_have_cbs[idx] == gpseq;
+@@ -526,7 +553,7 @@ static void srcu_gp_end(struct srcu_stru
+ 			snp->srcu_gp_seq_needed_exp = gpseq;
+ 		mask = snp->srcu_data_have_cbs[idx];
+ 		snp->srcu_data_have_cbs[idx] = 0;
+-		raw_spin_unlock_irq_rcu_node(snp);
++		spin_unlock_irq_rcu_node(snp);
+ 		if (cbs)
+ 			srcu_schedule_cbs_snp(sp, snp, mask, cbdelay);
+ 
+@@ -534,11 +561,11 @@ static void srcu_gp_end(struct srcu_stru
+ 		if (!(gpseq & counter_wrap_check))
+ 			for (cpu = snp->grplo; cpu <= snp->grphi; cpu++) {
+ 				sdp = per_cpu_ptr(sp->sda, cpu);
+-				raw_spin_lock_irqsave_rcu_node(sdp, flags);
++				spin_lock_irqsave_rcu_node(sdp, flags);
+ 				if (ULONG_CMP_GE(gpseq,
+ 						 sdp->srcu_gp_seq_needed + 100))
+ 					sdp->srcu_gp_seq_needed = gpseq;
+-				raw_spin_unlock_irqrestore_rcu_node(sdp, flags);
++				spin_unlock_irqrestore_rcu_node(sdp, flags);
+ 			}
+ 	}
+ 
+@@ -546,17 +573,17 @@ static void srcu_gp_end(struct srcu_stru
+ 	mutex_unlock(&sp->srcu_cb_mutex);
+ 
+ 	/* Start a new grace period if needed. */
+-	raw_spin_lock_irq_rcu_node(sp);
++	spin_lock_irq_rcu_node(sp);
+ 	gpseq = rcu_seq_current(&sp->srcu_gp_seq);
+ 	if (!rcu_seq_state(gpseq) &&
+ 	    ULONG_CMP_LT(gpseq, sp->srcu_gp_seq_needed)) {
+ 		srcu_gp_start(sp);
+-		raw_spin_unlock_irq_rcu_node(sp);
++		spin_unlock_irq_rcu_node(sp);
+ 		/* Throttle expedited grace periods: Should be rare! */
+ 		srcu_reschedule(sp, rcu_seq_ctr(gpseq) & 0x3ff
+ 				    ? 0 : SRCU_INTERVAL);
+ 	} else {
+-		raw_spin_unlock_irq_rcu_node(sp);
++		spin_unlock_irq_rcu_node(sp);
+ 	}
+ }
+ 
+@@ -576,18 +603,18 @@ static void srcu_funnel_exp_start(struct
+ 		if (rcu_seq_done(&sp->srcu_gp_seq, s) ||
+ 		    ULONG_CMP_GE(READ_ONCE(snp->srcu_gp_seq_needed_exp), s))
+ 			return;
+-		raw_spin_lock_irqsave_rcu_node(snp, flags);
++		spin_lock_irqsave_rcu_node(snp, flags);
+ 		if (ULONG_CMP_GE(snp->srcu_gp_seq_needed_exp, s)) {
+-			raw_spin_unlock_irqrestore_rcu_node(snp, flags);
++			spin_unlock_irqrestore_rcu_node(snp, flags);
+ 			return;
+ 		}
+ 		WRITE_ONCE(snp->srcu_gp_seq_needed_exp, s);
+-		raw_spin_unlock_irqrestore_rcu_node(snp, flags);
++		spin_unlock_irqrestore_rcu_node(snp, flags);
+ 	}
+-	raw_spin_lock_irqsave_rcu_node(sp, flags);
++	spin_lock_irqsave_rcu_node(sp, flags);
+ 	if (!ULONG_CMP_LT(sp->srcu_gp_seq_needed_exp, s))
+ 		sp->srcu_gp_seq_needed_exp = s;
+-	raw_spin_unlock_irqrestore_rcu_node(sp, flags);
++	spin_unlock_irqrestore_rcu_node(sp, flags);
+ }
+ 
+ /*
+@@ -609,12 +636,12 @@ static void srcu_funnel_gp_start(struct
+ 	for (; snp != NULL; snp = snp->srcu_parent) {
+ 		if (rcu_seq_done(&sp->srcu_gp_seq, s) && snp != sdp->mynode)
+ 			return; /* GP already done and CBs recorded. */
+-		raw_spin_lock_irqsave_rcu_node(snp, flags);
++		spin_lock_irqsave_rcu_node(snp, flags);
+ 		if (ULONG_CMP_GE(snp->srcu_have_cbs[idx], s)) {
+ 			snp_seq = snp->srcu_have_cbs[idx];
+ 			if (snp == sdp->mynode && snp_seq == s)
+ 				snp->srcu_data_have_cbs[idx] |= sdp->grpmask;
+-			raw_spin_unlock_irqrestore_rcu_node(snp, flags);
++			spin_unlock_irqrestore_rcu_node(snp, flags);
+ 			if (snp == sdp->mynode && snp_seq != s) {
+ 				srcu_schedule_cbs_sdp(sdp, do_norm
+ 							   ? SRCU_INTERVAL
+@@ -630,11 +657,11 @@ static void srcu_funnel_gp_start(struct
+ 			snp->srcu_data_have_cbs[idx] |= sdp->grpmask;
+ 		if (!do_norm && ULONG_CMP_LT(snp->srcu_gp_seq_needed_exp, s))
+ 			snp->srcu_gp_seq_needed_exp = s;
+-		raw_spin_unlock_irqrestore_rcu_node(snp, flags);
++		spin_unlock_irqrestore_rcu_node(snp, flags);
+ 	}
+ 
+ 	/* Top of tree, must ensure the grace period will be started. */
+-	raw_spin_lock_irqsave_rcu_node(sp, flags);
++	spin_lock_irqsave_rcu_node(sp, flags);
+ 	if (ULONG_CMP_LT(sp->srcu_gp_seq_needed, s)) {
+ 		/*
+ 		 * Record need for grace period s.  Pair with load
+@@ -653,7 +680,7 @@ static void srcu_funnel_gp_start(struct
+ 		queue_delayed_work(system_power_efficient_wq, &sp->work,
+ 				   srcu_get_delay(sp));
+ 	}
+-	raw_spin_unlock_irqrestore_rcu_node(sp, flags);
++	spin_unlock_irqrestore_rcu_node(sp, flags);
+ }
+ 
+ /*
+@@ -816,7 +843,7 @@ void __call_srcu(struct srcu_struct *sp,
+ 	rhp->func = func;
+ 	local_irq_save(flags);
+ 	sdp = this_cpu_ptr(sp->sda);
+-	raw_spin_lock_rcu_node(sdp);
++	spin_lock_rcu_node(sdp);
+ 	rcu_segcblist_enqueue(&sdp->srcu_cblist, rhp, false);
+ 	rcu_segcblist_advance(&sdp->srcu_cblist,
+ 			      rcu_seq_current(&sp->srcu_gp_seq));
+@@ -830,7 +857,7 @@ void __call_srcu(struct srcu_struct *sp,
+ 		sdp->srcu_gp_seq_needed_exp = s;
+ 		needexp = true;
+ 	}
+-	raw_spin_unlock_irqrestore_rcu_node(sdp, flags);
++	spin_unlock_irqrestore_rcu_node(sdp, flags);
+ 	if (needgp)
+ 		srcu_funnel_gp_start(sp, sdp, s, do_norm);
+ 	else if (needexp)
+@@ -886,7 +913,7 @@ static void __synchronize_srcu(struct sr
+ 
+ 	/*
+ 	 * Make sure that later code is ordered after the SRCU grace
+-	 * period.  This pairs with the raw_spin_lock_irq_rcu_node()
++	 * period.  This pairs with the spin_lock_irq_rcu_node()
+ 	 * in srcu_invoke_callbacks().  Unlike Tree RCU, this is needed
+ 	 * because the current CPU might have been totally uninvolved with
+ 	 * (and thus unordered against) that grace period.
+@@ -1010,7 +1037,7 @@ void srcu_barrier(struct srcu_struct *sp
+ 	 */
+ 	for_each_possible_cpu(cpu) {
+ 		sdp = per_cpu_ptr(sp->sda, cpu);
+-		raw_spin_lock_irq_rcu_node(sdp);
++		spin_lock_irq_rcu_node(sdp);
+ 		atomic_inc(&sp->srcu_barrier_cpu_cnt);
+ 		sdp->srcu_barrier_head.func = srcu_barrier_cb;
+ 		debug_rcu_head_queue(&sdp->srcu_barrier_head);
+@@ -1019,7 +1046,7 @@ void srcu_barrier(struct srcu_struct *sp
+ 			debug_rcu_head_unqueue(&sdp->srcu_barrier_head);
+ 			atomic_dec(&sp->srcu_barrier_cpu_cnt);
+ 		}
+-		raw_spin_unlock_irq_rcu_node(sdp);
++		spin_unlock_irq_rcu_node(sdp);
+ 	}
+ 
+ 	/* Remove the initial count, at which point reaching zero can happen. */
+@@ -1068,17 +1095,17 @@ static void srcu_advance_state(struct sr
+ 	 */
+ 	idx = rcu_seq_state(smp_load_acquire(&sp->srcu_gp_seq)); /* ^^^ */
+ 	if (idx == SRCU_STATE_IDLE) {
+-		raw_spin_lock_irq_rcu_node(sp);
++		spin_lock_irq_rcu_node(sp);
+ 		if (ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)) {
+ 			WARN_ON_ONCE(rcu_seq_state(sp->srcu_gp_seq));
+-			raw_spin_unlock_irq_rcu_node(sp);
++			spin_unlock_irq_rcu_node(sp);
+ 			mutex_unlock(&sp->srcu_gp_mutex);
+ 			return;
+ 		}
+ 		idx = rcu_seq_state(READ_ONCE(sp->srcu_gp_seq));
+ 		if (idx == SRCU_STATE_IDLE)
+ 			srcu_gp_start(sp);
+-		raw_spin_unlock_irq_rcu_node(sp);
++		spin_unlock_irq_rcu_node(sp);
+ 		if (idx != SRCU_STATE_IDLE) {
+ 			mutex_unlock(&sp->srcu_gp_mutex);
+ 			return; /* Someone else started the grace period. */
+@@ -1127,19 +1154,19 @@ static void srcu_invoke_callbacks(struct
+ 	sdp = container_of(work, struct srcu_data, work.work);
+ 	sp = sdp->sp;
+ 	rcu_cblist_init(&ready_cbs);
+-	raw_spin_lock_irq_rcu_node(sdp);
++	spin_lock_irq_rcu_node(sdp);
+ 	rcu_segcblist_advance(&sdp->srcu_cblist,
+ 			      rcu_seq_current(&sp->srcu_gp_seq));
+ 	if (sdp->srcu_cblist_invoking ||
+ 	    !rcu_segcblist_ready_cbs(&sdp->srcu_cblist)) {
+-		raw_spin_unlock_irq_rcu_node(sdp);
++		spin_unlock_irq_rcu_node(sdp);
+ 		return;  /* Someone else on the job or nothing to do. */
+ 	}
+ 
+ 	/* We are on the job!  Extract and invoke ready callbacks. */
+ 	sdp->srcu_cblist_invoking = true;
+ 	rcu_segcblist_extract_done_cbs(&sdp->srcu_cblist, &ready_cbs);
+-	raw_spin_unlock_irq_rcu_node(sdp);
++	spin_unlock_irq_rcu_node(sdp);
+ 	rhp = rcu_cblist_dequeue(&ready_cbs);
+ 	for (; rhp != NULL; rhp = rcu_cblist_dequeue(&ready_cbs)) {
+ 		debug_rcu_head_unqueue(rhp);
+@@ -1152,13 +1179,13 @@ static void srcu_invoke_callbacks(struct
+ 	 * Update counts, accelerate new callbacks, and if needed,
+ 	 * schedule another round of callback invocation.
+ 	 */
+-	raw_spin_lock_irq_rcu_node(sdp);
++	spin_lock_irq_rcu_node(sdp);
+ 	rcu_segcblist_insert_count(&sdp->srcu_cblist, &ready_cbs);
+ 	(void)rcu_segcblist_accelerate(&sdp->srcu_cblist,
+ 				       rcu_seq_snap(&sp->srcu_gp_seq));
+ 	sdp->srcu_cblist_invoking = false;
+ 	more = rcu_segcblist_ready_cbs(&sdp->srcu_cblist);
+-	raw_spin_unlock_irq_rcu_node(sdp);
++	spin_unlock_irq_rcu_node(sdp);
+ 	if (more)
+ 		srcu_schedule_cbs_sdp(sdp, 0);
+ }
+@@ -1171,7 +1198,7 @@ static void srcu_reschedule(struct srcu_
+ {
+ 	bool pushgp = true;
+ 
+-	raw_spin_lock_irq_rcu_node(sp);
++	spin_lock_irq_rcu_node(sp);
+ 	if (ULONG_CMP_GE(sp->srcu_gp_seq, sp->srcu_gp_seq_needed)) {
+ 		if (!WARN_ON_ONCE(rcu_seq_state(sp->srcu_gp_seq))) {
+ 			/* All requests fulfilled, time to go idle. */
+@@ -1181,7 +1208,7 @@ static void srcu_reschedule(struct srcu_
+ 		/* Outstanding request and no GP.  Start one. */
+ 		srcu_gp_start(sp);
+ 	}
+-	raw_spin_unlock_irq_rcu_node(sp);
++	spin_unlock_irq_rcu_node(sp);
+ 
+ 	if (pushgp)
+ 		queue_delayed_work(system_power_efficient_wq, &sp->work, delay);
diff --git a/kernel/patches-4.14.x-rt/0354-srcu-replace-local_irqsave-with-a-locallock.patch b/kernel/patches-4.14.x-rt/0354-srcu-replace-local_irqsave-with-a-locallock.patch
new file mode 100644
index 000000000..086c46783
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0354-srcu-replace-local_irqsave-with-a-locallock.patch
@@ -0,0 +1,70 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 12 Oct 2017 18:37:12 +0200
+Subject: [PATCH] srcu: replace local_irqsave() with a locallock
+
+There are two instances which disable interrupts in order to become a
+stable this_cpu_ptr() pointer. The restore part is coupled with
+spin_unlock_irqrestore() which does not work on RT.
+Replace the local_irq_save() call with the appropriate local_lock()
+version of it.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/srcutree.c |   14 +++++++++-----
+ 1 file changed, 9 insertions(+), 5 deletions(-)
+
+--- a/kernel/rcu/srcutree.c
++++ b/kernel/rcu/srcutree.c
+@@ -37,6 +37,7 @@
+ #include <linux/module.h>
+ #include <linux/srcu.h>
+ #include <linux/cpu.h>
++#include <linux/locallock.h>
+ 
+ #include "rcu.h"
+ #include "rcu_segcblist.h"
+@@ -749,6 +750,8 @@ static void srcu_flip(struct srcu_struct
+  * negligible when amoritized over that time period, and the extra latency
+  * of a needlessly non-expedited grace period is similarly negligible.
+  */
++static DEFINE_LOCAL_IRQ_LOCK(sp_llock);
++
+ static bool srcu_might_be_idle(struct srcu_struct *sp)
+ {
+ 	unsigned long curseq;
+@@ -757,13 +760,13 @@ static bool srcu_might_be_idle(struct sr
+ 	unsigned long t;
+ 
+ 	/* If the local srcu_data structure has callbacks, not idle.  */
+-	local_irq_save(flags);
++	local_lock_irqsave(sp_llock, flags);
+ 	sdp = this_cpu_ptr(sp->sda);
+ 	if (rcu_segcblist_pend_cbs(&sdp->srcu_cblist)) {
+-		local_irq_restore(flags);
++		local_unlock_irqrestore(sp_llock, flags);
+ 		return false; /* Callbacks already present, so not idle. */
+ 	}
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(sp_llock, flags);
+ 
+ 	/*
+ 	 * No local callbacks, so probabalistically probe global state.
+@@ -841,7 +844,7 @@ void __call_srcu(struct srcu_struct *sp,
+ 		return;
+ 	}
+ 	rhp->func = func;
+-	local_irq_save(flags);
++	local_lock_irqsave(sp_llock, flags);
+ 	sdp = this_cpu_ptr(sp->sda);
+ 	spin_lock_rcu_node(sdp);
+ 	rcu_segcblist_enqueue(&sdp->srcu_cblist, rhp, false);
+@@ -857,7 +860,8 @@ void __call_srcu(struct srcu_struct *sp,
+ 		sdp->srcu_gp_seq_needed_exp = s;
+ 		needexp = true;
+ 	}
+-	spin_unlock_irqrestore_rcu_node(sdp, flags);
++	spin_unlock_rcu_node(sdp);
++	local_unlock_irqrestore(sp_llock, flags);
+ 	if (needgp)
+ 		srcu_funnel_gp_start(sp, sdp, s, do_norm);
+ 	else if (needexp)
diff --git a/kernel/patches-4.14.x-rt/0355-rcu-disable-rcu-fast-no-hz-on-rt.patch b/kernel/patches-4.14.x-rt/0355-rcu-disable-rcu-fast-no-hz-on-rt.patch
new file mode 100644
index 000000000..13b4e6beb
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0355-rcu-disable-rcu-fast-no-hz-on-rt.patch
@@ -0,0 +1,24 @@
+Subject: rcu: Disable RCU_FAST_NO_HZ on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Sun, 28 Oct 2012 13:26:09 +0000
+
+This uses a timer_list timer from the irq disabled guts of the idle
+code. Disable it for now to prevent wreckage.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+
+---
+ kernel/rcu/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/rcu/Kconfig
++++ b/kernel/rcu/Kconfig
+@@ -172,7 +172,7 @@ config RCU_FANOUT_LEAF
+ 
+ config RCU_FAST_NO_HZ
+ 	bool "Accelerate last non-dyntick-idle CPU's grace periods"
+-	depends on NO_HZ_COMMON && SMP && RCU_EXPERT
++	depends on NO_HZ_COMMON && SMP && RCU_EXPERT && !PREEMPT_RT_FULL
+ 	default n
+ 	help
+ 	  This option permits CPUs to enter dynticks-idle state even if
diff --git a/kernel/patches-4.14.x-rt/0356-rcu-Eliminate-softirq-processing-from-rcutree.patch b/kernel/patches-4.14.x-rt/0356-rcu-Eliminate-softirq-processing-from-rcutree.patch
new file mode 100644
index 000000000..8afe96b18
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0356-rcu-Eliminate-softirq-processing-from-rcutree.patch
@@ -0,0 +1,428 @@
+From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
+Date: Mon, 4 Nov 2013 13:21:10 -0800
+Subject: rcu: Eliminate softirq processing from rcutree
+
+Running RCU out of softirq is a problem for some workloads that would
+like to manage RCU core processing independently of other softirq work,
+for example, setting kthread priority.  This commit therefore moves the
+RCU core work from softirq to a per-CPU/per-flavor SCHED_OTHER kthread
+named rcuc.  The SCHED_OTHER approach avoids the scalability problems
+that appeared with the earlier attempt to move RCU core processing to
+from softirq to kthreads.  That said, kernels built with RCU_BOOST=y
+will run the rcuc kthreads at the RCU-boosting priority.
+
+Reported-by: Thomas Gleixner <tglx@linutronix.de>
+Tested-by: Mike Galbraith <bitbucket@online.de>
+Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/tree.c        |  110 ++++++++++++++++++++++++++++++----
+ kernel/rcu/tree.h        |    5 -
+ kernel/rcu/tree_plugin.h |  152 ++++-------------------------------------------
+ 3 files changed, 114 insertions(+), 153 deletions(-)
+
+--- a/kernel/rcu/tree.c
++++ b/kernel/rcu/tree.c
+@@ -58,6 +58,11 @@
+ #include <linux/trace_events.h>
+ #include <linux/suspend.h>
+ #include <linux/ftrace.h>
++#include <linux/delay.h>
++#include <linux/gfp.h>
++#include <linux/oom.h>
++#include <linux/smpboot.h>
++#include "../time/tick-internal.h"
+ 
+ #include "tree.h"
+ #include "rcu.h"
+@@ -2946,18 +2951,17 @@ static void
+ /*
+  * Do RCU core processing for the current CPU.
+  */
+-static __latent_entropy void rcu_process_callbacks(struct softirq_action *unused)
++static __latent_entropy void rcu_process_callbacks(void)
+ {
+ 	struct rcu_state *rsp;
+ 
+ 	if (cpu_is_offline(smp_processor_id()))
+ 		return;
+-	trace_rcu_utilization(TPS("Start RCU core"));
+ 	for_each_rcu_flavor(rsp)
+ 		__rcu_process_callbacks(rsp);
+-	trace_rcu_utilization(TPS("End RCU core"));
+ }
+ 
++static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);
+ /*
+  * Schedule RCU callback invocation.  If the specified type of RCU
+  * does not support RCU priority boosting, just do a direct call,
+@@ -2969,18 +2973,105 @@ static void invoke_rcu_callbacks(struct
+ {
+ 	if (unlikely(!READ_ONCE(rcu_scheduler_fully_active)))
+ 		return;
+-	if (likely(!rsp->boost)) {
+-		rcu_do_batch(rsp, rdp);
++	rcu_do_batch(rsp, rdp);
++}
++
++static void rcu_wake_cond(struct task_struct *t, int status)
++{
++	/*
++	 * If the thread is yielding, only wake it when this
++	 * is invoked from idle
++	 */
++	if (t && (status != RCU_KTHREAD_YIELDING || is_idle_task(current)))
++		wake_up_process(t);
++}
++
++/*
++ * Wake up this CPU's rcuc kthread to do RCU core processing.
++ */
++static void invoke_rcu_core(void)
++{
++	unsigned long flags;
++	struct task_struct *t;
++
++	if (!cpu_online(smp_processor_id()))
+ 		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;
++}
++
++static int rcu_cpu_kthread_should_run(unsigned int cpu)
++{
++	return __this_cpu_read(rcu_cpu_has_work);
++}
++
++/*
++ * Per-CPU kernel thread that invokes RCU callbacks.  This replaces the
++ * RCU softirq used in flavors and configurations of RCU that do not
++ * support RCU priority boosting.
++ */
++static void rcu_cpu_kthread(unsigned int cpu)
++{
++	unsigned int *statusp = this_cpu_ptr(&rcu_cpu_kthread_status);
++	char work, *workp = this_cpu_ptr(&rcu_cpu_has_work);
++	int spincnt;
++
++	for (spincnt = 0; spincnt < 10; spincnt++) {
++		trace_rcu_utilization(TPS("Start CPU kthread@rcu_wait"));
++		local_bh_disable();
++		*statusp = RCU_KTHREAD_RUNNING;
++		this_cpu_inc(rcu_cpu_kthread_loops);
++		local_irq_disable();
++		work = *workp;
++		*workp = 0;
++		local_irq_enable();
++		if (work)
++			rcu_process_callbacks();
++		local_bh_enable();
++		if (*workp == 0) {
++			trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
++			*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,
++	.thread_fn		= rcu_cpu_kthread,
++	.thread_comm		= "rcuc/%u",
++	.setup			= rcu_cpu_kthread_setup,
++	.park			= rcu_cpu_kthread_park,
++};
++
++/*
++ * 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.
+@@ -4221,7 +4312,6 @@ void __init rcu_init(void)
+ 	if (dump_tree)
+ 		rcu_dump_rcu_node_tree(&rcu_sched_state);
+ 	__rcu_init_preempt();
+-	open_softirq(RCU_SOFTIRQ, rcu_process_callbacks);
+ 
+ 	/*
+ 	 * We don't need protection against CPU-hotplug here because
+--- a/kernel/rcu/tree.h
++++ b/kernel/rcu/tree.h
+@@ -438,12 +438,10 @@ extern struct rcu_state rcu_preempt_stat
+ int rcu_dynticks_snap(struct rcu_dynticks *rdtp);
+ bool rcu_eqs_special_set(int cpu);
+ 
+-#ifdef CONFIG_RCU_BOOST
+ DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
+ DECLARE_PER_CPU(int, rcu_cpu_kthread_cpu);
+ DECLARE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
+ DECLARE_PER_CPU(char, rcu_cpu_has_work);
+-#endif /* #ifdef CONFIG_RCU_BOOST */
+ 
+ #ifndef RCU_TREE_NONCORE
+ 
+@@ -463,10 +461,9 @@ void call_rcu(struct rcu_head *head, rcu
+ 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);
+-static void invoke_rcu_callbacks_kthread(void);
+ static bool rcu_is_callbacks_kthread(void);
++static void rcu_cpu_kthread_setup(unsigned int cpu);
+ #ifdef CONFIG_RCU_BOOST
+-static void rcu_preempt_do_callbacks(void);
+ static int rcu_spawn_one_boost_kthread(struct rcu_state *rsp,
+ 						 struct rcu_node *rnp);
+ #endif /* #ifdef CONFIG_RCU_BOOST */
+--- a/kernel/rcu/tree_plugin.h
++++ b/kernel/rcu/tree_plugin.h
+@@ -24,39 +24,16 @@
+  *	   Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+  */
+ 
+-#include <linux/delay.h>
+-#include <linux/gfp.h>
+-#include <linux/oom.h>
+-#include <linux/sched/debug.h>
+-#include <linux/smpboot.h>
+-#include <linux/jiffies.h>
+-#include <uapi/linux/sched/types.h>
+-#include "../time/tick-internal.h"
+ #include "../locking/rtmutex_common.h"
+ 
+-#ifdef CONFIG_RCU_BOOST
+-
+ /*
+  * Control variables for per-CPU and per-rcu_node kthreads.  These
+  * handle all flavors of RCU.
+  */
+-static DEFINE_PER_CPU(struct task_struct *, rcu_cpu_kthread_task);
+ DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_status);
+ DEFINE_PER_CPU(unsigned int, rcu_cpu_kthread_loops);
+ DEFINE_PER_CPU(char, rcu_cpu_has_work);
+ 
+-#else /* #ifdef CONFIG_RCU_BOOST */
+-
+-/*
+- * Some architectures do not define rt_mutexes, but if !CONFIG_RCU_BOOST,
+- * all uses are in dead code.  Provide a definition to keep the compiler
+- * happy, but add WARN_ON_ONCE() to complain if used in the wrong place.
+- * This probably needs to be excluded from -rt builds.
+- */
+-#define rt_mutex_owner(a) ({ WARN_ON_ONCE(1); NULL; })
+-
+-#endif /* #else #ifdef CONFIG_RCU_BOOST */
+-
+ #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? */
+@@ -682,15 +659,6 @@ static void rcu_preempt_check_callbacks(
+ 		t->rcu_read_unlock_special.b.need_qs = true;
+ }
+ 
+-#ifdef CONFIG_RCU_BOOST
+-
+-static void rcu_preempt_do_callbacks(void)
+-{
+-	rcu_do_batch(rcu_state_p, this_cpu_ptr(rcu_data_p));
+-}
+-
+-#endif /* #ifdef CONFIG_RCU_BOOST */
+-
+ /**
+  * call_rcu() - Queue an RCU callback for invocation after a grace period.
+  * @head: structure to be used for queueing the RCU updates.
+@@ -913,20 +881,23 @@ void exit_rcu(void)
+ 
+ #endif /* #else #ifdef CONFIG_PREEMPT_RCU */
+ 
++/*
++ * If boosting, set rcuc kthreads to realtime priority.
++ */
++static void rcu_cpu_kthread_setup(unsigned int cpu)
++{
+ #ifdef CONFIG_RCU_BOOST
++	struct sched_param sp;
+ 
+-#include "../locking/rtmutex_common.h"
+-
+-static void rcu_wake_cond(struct task_struct *t, int status)
+-{
+-	/*
+-	 * If the thread is yielding, only wake it when this
+-	 * is invoked from idle
+-	 */
+-	if (status != RCU_KTHREAD_YIELDING || is_idle_task(current))
+-		wake_up_process(t);
++	sp.sched_priority = kthread_prio;
++	sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
++#endif /* #ifdef CONFIG_RCU_BOOST */
+ }
+ 
++#ifdef CONFIG_RCU_BOOST
++
++#include "../locking/rtmutex_common.h"
++
+ /*
+  * Carry out RCU priority boosting on the task indicated by ->exp_tasks
+  * or ->boost_tasks, advancing the pointer to the next task in the
+@@ -1069,23 +1040,6 @@ static void rcu_initiate_boost(struct rc
+ }
+ 
+ /*
+- * Wake up the per-CPU kthread to invoke RCU callbacks.
+- */
+-static void invoke_rcu_callbacks_kthread(void)
+-{
+-	unsigned long flags;
+-
+-	local_irq_save(flags);
+-	__this_cpu_write(rcu_cpu_has_work, 1);
+-	if (__this_cpu_read(rcu_cpu_kthread_task) != NULL &&
+-	    current != __this_cpu_read(rcu_cpu_kthread_task)) {
+-		rcu_wake_cond(__this_cpu_read(rcu_cpu_kthread_task),
+-			      __this_cpu_read(rcu_cpu_kthread_status));
+-	}
+-	local_irq_restore(flags);
+-}
+-
+-/*
+  * Is the current CPU running the RCU-callbacks kthread?
+  * Caller must have preemption disabled.
+  */
+@@ -1139,67 +1093,6 @@ static int rcu_spawn_one_boost_kthread(s
+ 	return 0;
+ }
+ 
+-static void rcu_kthread_do_work(void)
+-{
+-	rcu_do_batch(&rcu_sched_state, this_cpu_ptr(&rcu_sched_data));
+-	rcu_do_batch(&rcu_bh_state, this_cpu_ptr(&rcu_bh_data));
+-	rcu_preempt_do_callbacks();
+-}
+-
+-static void rcu_cpu_kthread_setup(unsigned int cpu)
+-{
+-	struct sched_param sp;
+-
+-	sp.sched_priority = kthread_prio;
+-	sched_setscheduler_nocheck(current, SCHED_FIFO, &sp);
+-}
+-
+-static void rcu_cpu_kthread_park(unsigned int cpu)
+-{
+-	per_cpu(rcu_cpu_kthread_status, cpu) = RCU_KTHREAD_OFFCPU;
+-}
+-
+-static int rcu_cpu_kthread_should_run(unsigned int cpu)
+-{
+-	return __this_cpu_read(rcu_cpu_has_work);
+-}
+-
+-/*
+- * Per-CPU kernel thread that invokes RCU callbacks.  This replaces the
+- * RCU softirq used in flavors and configurations of RCU that do not
+- * support RCU priority boosting.
+- */
+-static void rcu_cpu_kthread(unsigned int cpu)
+-{
+-	unsigned int *statusp = this_cpu_ptr(&rcu_cpu_kthread_status);
+-	char work, *workp = this_cpu_ptr(&rcu_cpu_has_work);
+-	int spincnt;
+-
+-	for (spincnt = 0; spincnt < 10; spincnt++) {
+-		trace_rcu_utilization(TPS("Start CPU kthread@rcu_wait"));
+-		local_bh_disable();
+-		*statusp = RCU_KTHREAD_RUNNING;
+-		this_cpu_inc(rcu_cpu_kthread_loops);
+-		local_irq_disable();
+-		work = *workp;
+-		*workp = 0;
+-		local_irq_enable();
+-		if (work)
+-			rcu_kthread_do_work();
+-		local_bh_enable();
+-		if (*workp == 0) {
+-			trace_rcu_utilization(TPS("End CPU kthread@rcu_wait"));
+-			*statusp = RCU_KTHREAD_WAITING;
+-			return;
+-		}
+-	}
+-	*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;
+-}
+-
+ /*
+  * 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
+@@ -1230,26 +1123,12 @@ static void rcu_boost_kthread_setaffinit
+ 	free_cpumask_var(cm);
+ }
+ 
+-static struct smp_hotplug_thread rcu_cpu_thread_spec = {
+-	.store			= &rcu_cpu_kthread_task,
+-	.thread_should_run	= rcu_cpu_kthread_should_run,
+-	.thread_fn		= rcu_cpu_kthread,
+-	.thread_comm		= "rcuc/%u",
+-	.setup			= rcu_cpu_kthread_setup,
+-	.park			= rcu_cpu_kthread_park,
+-};
+-
+ /*
+  * Spawn boost kthreads -- called as soon as the scheduler is running.
+  */
+ static void __init rcu_spawn_boost_kthreads(void)
+ {
+ 	struct rcu_node *rnp;
+-	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));
+ 	rcu_for_each_leaf_node(rcu_state_p, rnp)
+ 		(void)rcu_spawn_one_boost_kthread(rcu_state_p, rnp);
+ }
+@@ -1272,11 +1151,6 @@ static void rcu_initiate_boost(struct rc
+ 	raw_spin_unlock_irqrestore_rcu_node(rnp, flags);
+ }
+ 
+-static void invoke_rcu_callbacks_kthread(void)
+-{
+-	WARN_ON_ONCE(1);
+-}
+-
+ static bool rcu_is_callbacks_kthread(void)
+ {
+ 	return false;
diff --git a/kernel/patches-4.14.x-rt/0357-rcu-make-RCU_BOOST-default-on-RT.patch b/kernel/patches-4.14.x-rt/0357-rcu-make-RCU_BOOST-default-on-RT.patch
new file mode 100644
index 000000000..bda5c6289
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0357-rcu-make-RCU_BOOST-default-on-RT.patch
@@ -0,0 +1,34 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 21 Mar 2014 20:19:05 +0100
+Subject: rcu: make RCU_BOOST default on RT
+
+Since it is no longer invoked from the softirq people run into OOM more
+often if the priority of the RCU thread is too low. Making boosting
+default on RT should help in those case and it can be switched off if
+someone knows better.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/Kconfig |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/rcu/Kconfig
++++ b/kernel/rcu/Kconfig
+@@ -36,7 +36,7 @@ config TINY_RCU
+ 
+ config RCU_EXPERT
+ 	bool "Make expert-level adjustments to RCU configuration"
+-	default n
++	default y if PREEMPT_RT_FULL
+ 	help
+ 	  This option needs to be enabled if you wish to make
+ 	  expert-level adjustments to RCU configuration.  By default,
+@@ -191,7 +191,7 @@ config RCU_FAST_NO_HZ
+ config RCU_BOOST
+ 	bool "Enable RCU priority boosting"
+ 	depends on RT_MUTEXES && PREEMPT_RCU && RCU_EXPERT
+-	default n
++	default y if PREEMPT_RT_FULL
+ 	help
+ 	  This option boosts the priority of preempted RCU readers that
+ 	  block the current preemptible RCU grace period for too long.
diff --git a/kernel/patches-4.14.x-rt/0358-rcu-enable-rcu_normal_after_boot-by-default-for-RT.patch b/kernel/patches-4.14.x-rt/0358-rcu-enable-rcu_normal_after_boot-by-default-for-RT.patch
new file mode 100644
index 000000000..ad00b652f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0358-rcu-enable-rcu_normal_after_boot-by-default-for-RT.patch
@@ -0,0 +1,29 @@
+From: Julia Cartwright <julia@ni.com>
+Date: Wed, 12 Oct 2016 11:21:14 -0500
+Subject: [PATCH] rcu: enable rcu_normal_after_boot by default for RT
+
+The forcing of an expedited grace period is an expensive and very
+RT-application unfriendly operation, as it forcibly preempts all running
+tasks on CPUs which are preventing the gp from expiring.
+
+By default, as a policy decision, disable the expediting of grace
+periods (after boot) on configurations which enable PREEMPT_RT_FULL.
+
+Suggested-by: Luiz Capitulino <lcapitulino@redhat.com>
+Signed-off-by: Julia Cartwright <julia@ni.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/rcu/update.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/kernel/rcu/update.c
++++ b/kernel/rcu/update.c
+@@ -66,7 +66,7 @@ extern int rcu_expedited; /* from sysctl
+ module_param(rcu_expedited, int, 0);
+ extern int rcu_normal; /* from sysctl */
+ module_param(rcu_normal, int, 0);
+-static int rcu_normal_after_boot;
++static int rcu_normal_after_boot = IS_ENABLED(CONFIG_PREEMPT_RT_FULL);
+ module_param(rcu_normal_after_boot, int, 0);
+ #endif /* #ifndef CONFIG_TINY_RCU */
+ 
diff --git a/kernel/patches-4.14.x-rt/0359-preempt-lazy-support.patch b/kernel/patches-4.14.x-rt/0359-preempt-lazy-support.patch
new file mode 100644
index 000000000..301bf59a4
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0359-preempt-lazy-support.patch
@@ -0,0 +1,623 @@
+Subject: sched: Add support for lazy preemption
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 26 Oct 2012 18:50:54 +0100
+
+It has become an obsession to mitigate the determinism vs. throughput
+loss of RT. Looking at the mainline semantics of preemption points
+gives a hint why RT sucks throughput wise for ordinary SCHED_OTHER
+tasks. One major issue is the wakeup of tasks which are right away
+preempting the waking task while the waking task holds a lock on which
+the woken task will block right after having preempted the wakee. In
+mainline this is prevented due to the implicit preemption disable of
+spin/rw_lock held regions. On RT this is not possible due to the fully
+preemptible nature of sleeping spinlocks.
+
+Though for a SCHED_OTHER task preempting another SCHED_OTHER task this
+is really not a correctness issue. RT folks are concerned about
+SCHED_FIFO/RR tasks preemption and not about the purely fairness
+driven SCHED_OTHER preemption latencies.
+
+So I introduced a lazy preemption mechanism which only applies to
+SCHED_OTHER tasks preempting another SCHED_OTHER task. Aside of the
+existing preempt_count each tasks sports now a preempt_lazy_count
+which is manipulated on lock acquiry and release. This is slightly
+incorrect as for lazyness reasons I coupled this on
+migrate_disable/enable so some other mechanisms get the same treatment
+(e.g. get_cpu_light).
+
+Now on the scheduler side instead of setting NEED_RESCHED this sets
+NEED_RESCHED_LAZY in case of a SCHED_OTHER/SCHED_OTHER preemption and
+therefor allows to exit the waking task the lock held region before
+the woken task preempts. That also works better for cross CPU wakeups
+as the other side can stay in the adaptive spinning loop.
+
+For RT class preemption there is no change. This simply sets
+NEED_RESCHED and forgoes the lazy preemption counter.
+
+ Initial test do not expose any observable latency increasement, but
+history shows that I've been proven wrong before :)
+
+The lazy preemption mode is per default on, but with
+CONFIG_SCHED_DEBUG enabled it can be disabled via:
+
+ # echo NO_PREEMPT_LAZY >/sys/kernel/debug/sched_features
+
+and reenabled via
+
+ # echo PREEMPT_LAZY >/sys/kernel/debug/sched_features
+
+The test results so far are very machine and workload dependent, but
+there is a clear trend that it enhances the non RT workload
+performance.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ include/linux/preempt.h      |   35 +++++++++++++++++-
+ include/linux/sched.h        |   38 +++++++++++++++++++
+ include/linux/thread_info.h  |   12 +++++-
+ include/linux/trace_events.h |    1 
+ kernel/Kconfig.preempt       |    6 +++
+ kernel/sched/core.c          |   83 +++++++++++++++++++++++++++++++++++++++++--
+ kernel/sched/fair.c          |   16 ++++----
+ kernel/sched/features.h      |    3 +
+ kernel/sched/sched.h         |    9 ++++
+ kernel/trace/trace.c         |   36 ++++++++++--------
+ kernel/trace/trace.h         |    2 +
+ kernel/trace/trace_output.c  |   14 ++++++-
+ 12 files changed, 226 insertions(+), 29 deletions(-)
+
+--- a/include/linux/preempt.h
++++ b/include/linux/preempt.h
+@@ -180,6 +180,20 @@ extern void preempt_count_sub(int val);
+ #define preempt_count_inc() preempt_count_add(1)
+ #define preempt_count_dec() preempt_count_sub(1)
+ 
++#ifdef CONFIG_PREEMPT_LAZY
++#define add_preempt_lazy_count(val)	do { preempt_lazy_count() += (val); } while (0)
++#define sub_preempt_lazy_count(val)	do { preempt_lazy_count() -= (val); } while (0)
++#define inc_preempt_lazy_count()	add_preempt_lazy_count(1)
++#define dec_preempt_lazy_count()	sub_preempt_lazy_count(1)
++#define preempt_lazy_count()		(current_thread_info()->preempt_lazy_count)
++#else
++#define add_preempt_lazy_count(val)	do { } while (0)
++#define sub_preempt_lazy_count(val)	do { } while (0)
++#define inc_preempt_lazy_count()	do { } while (0)
++#define dec_preempt_lazy_count()	do { } while (0)
++#define preempt_lazy_count()		(0)
++#endif
++
+ #ifdef CONFIG_PREEMPT_COUNT
+ 
+ #define preempt_disable() \
+@@ -188,6 +202,12 @@ do { \
+ 	barrier(); \
+ } while (0)
+ 
++#define preempt_lazy_disable() \
++do { \
++	inc_preempt_lazy_count(); \
++	barrier(); \
++} while (0)
++
+ #define sched_preempt_enable_no_resched() \
+ do { \
+ 	barrier(); \
+@@ -241,6 +261,13 @@ do { \
+ 		__preempt_schedule(); \
+ } while (0)
+ 
++#define preempt_lazy_enable() \
++do { \
++	dec_preempt_lazy_count(); \
++	barrier(); \
++	preempt_check_resched(); \
++} while (0)
++
+ #else /* !CONFIG_PREEMPT */
+ #define preempt_enable() \
+ do { \
+@@ -248,6 +275,12 @@ do { \
+ 	preempt_count_dec(); \
+ } while (0)
+ 
++#define preempt_lazy_enable() \
++do { \
++	dec_preempt_lazy_count(); \
++	barrier(); \
++} while (0)
++
+ #define preempt_enable_notrace() \
+ do { \
+ 	barrier(); \
+@@ -314,7 +347,7 @@ do { \
+ } while (0)
+ #define preempt_fold_need_resched() \
+ do { \
+-	if (tif_need_resched()) \
++	if (tif_need_resched_now()) \
+ 		set_preempt_need_resched(); \
+ } while (0)
+ 
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1600,6 +1600,44 @@ static inline int test_tsk_need_resched(
+ 	return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED));
+ }
+ 
++#ifdef CONFIG_PREEMPT_LAZY
++static inline void set_tsk_need_resched_lazy(struct task_struct *tsk)
++{
++	set_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY);
++}
++
++static inline void clear_tsk_need_resched_lazy(struct task_struct *tsk)
++{
++	clear_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY);
++}
++
++static inline int test_tsk_need_resched_lazy(struct task_struct *tsk)
++{
++	return unlikely(test_tsk_thread_flag(tsk,TIF_NEED_RESCHED_LAZY));
++}
++
++static inline int need_resched_lazy(void)
++{
++	return test_thread_flag(TIF_NEED_RESCHED_LAZY);
++}
++
++static inline int need_resched_now(void)
++{
++	return test_thread_flag(TIF_NEED_RESCHED);
++}
++
++#else
++static inline void clear_tsk_need_resched_lazy(struct task_struct *tsk) { }
++static inline int need_resched_lazy(void) { return 0; }
++
++static inline int need_resched_now(void)
++{
++	return test_thread_flag(TIF_NEED_RESCHED);
++}
++
++#endif
++
++
+ static inline bool __task_is_stopped_or_traced(struct task_struct *task)
+ {
+ 	if (task->state & (__TASK_STOPPED | __TASK_TRACED))
+--- a/include/linux/thread_info.h
++++ b/include/linux/thread_info.h
+@@ -91,7 +91,17 @@ static inline int test_ti_thread_flag(st
+ #define test_thread_flag(flag) \
+ 	test_ti_thread_flag(current_thread_info(), flag)
+ 
+-#define tif_need_resched() test_thread_flag(TIF_NEED_RESCHED)
++#ifdef CONFIG_PREEMPT_LAZY
++#define tif_need_resched()	(test_thread_flag(TIF_NEED_RESCHED) || \
++				 test_thread_flag(TIF_NEED_RESCHED_LAZY))
++#define tif_need_resched_now()	(test_thread_flag(TIF_NEED_RESCHED))
++#define tif_need_resched_lazy()	test_thread_flag(TIF_NEED_RESCHED_LAZY))
++
++#else
++#define tif_need_resched()	test_thread_flag(TIF_NEED_RESCHED)
++#define tif_need_resched_now()	test_thread_flag(TIF_NEED_RESCHED)
++#define tif_need_resched_lazy()	0
++#endif
+ 
+ #ifndef CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES
+ static inline int arch_within_stack_frames(const void * const stack,
+--- a/include/linux/trace_events.h
++++ b/include/linux/trace_events.h
+@@ -64,6 +64,7 @@ struct trace_entry {
+ 	int			pid;
+ 	unsigned short		migrate_disable;
+ 	unsigned short		padding;
++	unsigned char		preempt_lazy_count;
+ };
+ 
+ #define TRACE_EVENT_TYPE_MAX						\
+--- a/kernel/Kconfig.preempt
++++ b/kernel/Kconfig.preempt
+@@ -6,6 +6,12 @@ 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"
+ 	default PREEMPT_NONE
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -518,6 +518,48 @@ void resched_curr(struct rq *rq)
+ 		trace_sched_wake_idle_without_ipi(cpu);
+ }
+ 
++#ifdef CONFIG_PREEMPT_LAZY
++
++static int tsk_is_polling(struct task_struct *p)
++{
++#ifdef TIF_POLLING_NRFLAG
++	return test_tsk_thread_flag(p, TIF_POLLING_NRFLAG);
++#else
++	return 0;
++#endif
++}
++
++void resched_curr_lazy(struct rq *rq)
++{
++	struct task_struct *curr = rq->curr;
++	int cpu;
++
++	if (!sched_feat(PREEMPT_LAZY)) {
++		resched_curr(rq);
++		return;
++	}
++
++	lockdep_assert_held(&rq->lock);
++
++	if (test_tsk_need_resched(curr))
++		return;
++
++	if (test_tsk_need_resched_lazy(curr))
++		return;
++
++	set_tsk_need_resched_lazy(curr);
++
++	cpu = cpu_of(rq);
++	if (cpu == smp_processor_id())
++		return;
++
++	/* NEED_RESCHED_LAZY must be visible before we test polling */
++	smp_mb();
++	if (!tsk_is_polling(curr))
++		smp_send_reschedule(cpu);
++}
++#endif
++
+ void resched_cpu(int cpu)
+ {
+ 	struct rq *rq = cpu_rq(cpu);
+@@ -2444,6 +2486,9 @@ int sched_fork(unsigned long clone_flags
+ 	p->on_cpu = 0;
+ #endif
+ 	init_task_preempt_count(p);
++#ifdef CONFIG_HAVE_PREEMPT_LAZY
++	task_thread_info(p)->preempt_lazy_count = 0;
++#endif
+ #ifdef CONFIG_SMP
+ 	plist_node_init(&p->pushable_tasks, MAX_PRIO);
+ 	RB_CLEAR_NODE(&p->pushable_dl_tasks);
+@@ -3361,6 +3406,7 @@ static void __sched notrace __schedule(b
+ 
+ 	next = pick_next_task(rq, prev, &rf);
+ 	clear_tsk_need_resched(prev);
++	clear_tsk_need_resched_lazy(prev);
+ 	clear_preempt_need_resched();
+ 
+ 	if (likely(prev != next)) {
+@@ -3551,6 +3597,30 @@ static void __sched notrace preempt_sche
+ 	} while (need_resched());
+ }
+ 
++#ifdef CONFIG_PREEMPT_LAZY
++/*
++ * If TIF_NEED_RESCHED is then we allow to be scheduled away since this is
++ * set by a RT task. Oterwise we try to avoid beeing scheduled out as long as
++ * preempt_lazy_count counter >0.
++ */
++static __always_inline int preemptible_lazy(void)
++{
++	if (test_thread_flag(TIF_NEED_RESCHED))
++		return 1;
++	if (current_thread_info()->preempt_lazy_count)
++		return 0;
++	return 1;
++}
++
++#else
++
++static inline int preemptible_lazy(void)
++{
++	return 1;
++}
++
++#endif
++
+ #ifdef CONFIG_PREEMPT
+ /*
+  * this is the entry point to schedule() from in-kernel preemption
+@@ -3565,7 +3635,8 @@ asmlinkage __visible void __sched notrac
+ 	 */
+ 	if (likely(!preemptible()))
+ 		return;
+-
++	if (!preemptible_lazy())
++		return;
+ 	preempt_schedule_common();
+ }
+ NOKPROBE_SYMBOL(preempt_schedule);
+@@ -3592,6 +3663,9 @@ asmlinkage __visible void __sched notrac
+ 	if (likely(!preemptible()))
+ 		return;
+ 
++	if (!preemptible_lazy())
++		return;
++
+ 	do {
+ 		/*
+ 		 * Because the function tracer can trace preempt_count_sub()
+@@ -5331,7 +5405,9 @@ void init_idle(struct task_struct *idle,
+ 
+ 	/* Set the preempt count _outside_ the spinlocks! */
+ 	init_idle_preempt_count(idle, cpu);
+-
++#ifdef CONFIG_HAVE_PREEMPT_LAZY
++	task_thread_info(idle)->preempt_lazy_count = 0;
++#endif
+ 	/*
+ 	 * The idle tasks have their own, simple scheduling class:
+ 	 */
+@@ -6887,6 +6963,7 @@ void migrate_disable(void)
+ 	}
+ 
+ 	preempt_disable();
++	preempt_lazy_disable();
+ 	pin_current_cpu();
+ 
+ 	migrate_disable_update_cpus_allowed(p);
+@@ -6954,6 +7031,7 @@ void migrate_enable(void)
+ 			arg.dest_cpu = dest_cpu;
+ 
+ 			unpin_current_cpu();
++			preempt_lazy_enable();
+ 			preempt_enable();
+ 			stop_one_cpu(task_cpu(p), migration_cpu_stop, &arg);
+ 			tlb_migrate_finish(p->mm);
+@@ -6962,6 +7040,7 @@ void migrate_enable(void)
+ 		}
+ 	}
+ 	unpin_current_cpu();
++	preempt_lazy_enable();
+ 	preempt_enable();
+ }
+ EXPORT_SYMBOL(migrate_enable);
+--- a/kernel/sched/fair.c
++++ b/kernel/sched/fair.c
+@@ -3840,7 +3840,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq
+ 	ideal_runtime = sched_slice(cfs_rq, curr);
+ 	delta_exec = curr->sum_exec_runtime - curr->prev_sum_exec_runtime;
+ 	if (delta_exec > ideal_runtime) {
+-		resched_curr(rq_of(cfs_rq));
++		resched_curr_lazy(rq_of(cfs_rq));
+ 		/*
+ 		 * The current task ran long enough, ensure it doesn't get
+ 		 * re-elected due to buddy favours.
+@@ -3864,7 +3864,7 @@ check_preempt_tick(struct cfs_rq *cfs_rq
+ 		return;
+ 
+ 	if (delta > ideal_runtime)
+-		resched_curr(rq_of(cfs_rq));
++		resched_curr_lazy(rq_of(cfs_rq));
+ }
+ 
+ static void
+@@ -4006,7 +4006,7 @@ entity_tick(struct cfs_rq *cfs_rq, struc
+ 	 * validating it and just reschedule.
+ 	 */
+ 	if (queued) {
+-		resched_curr(rq_of(cfs_rq));
++		resched_curr_lazy(rq_of(cfs_rq));
+ 		return;
+ 	}
+ 	/*
+@@ -4188,7 +4188,7 @@ static void __account_cfs_rq_runtime(str
+ 	 * hierarchy can be throttled
+ 	 */
+ 	if (!assign_cfs_rq_runtime(cfs_rq) && likely(cfs_rq->curr))
+-		resched_curr(rq_of(cfs_rq));
++		resched_curr_lazy(rq_of(cfs_rq));
+ }
+ 
+ static __always_inline
+@@ -4837,7 +4837,7 @@ static void hrtick_start_fair(struct rq
+ 
+ 		if (delta < 0) {
+ 			if (rq->curr == p)
+-				resched_curr(rq);
++				resched_curr_lazy(rq);
+ 			return;
+ 		}
+ 		hrtick_start(rq, delta);
+@@ -6230,7 +6230,7 @@ static void check_preempt_wakeup(struct
+ 	return;
+ 
+ preempt:
+-	resched_curr(rq);
++	resched_curr_lazy(rq);
+ 	/*
+ 	 * Only set the backward buddy when the current task is still
+ 	 * on the rq. This can happen when a wakeup gets interleaved
+@@ -9084,7 +9084,7 @@ static void task_fork_fair(struct task_s
+ 		 * 'current' within the tree based on its new key value.
+ 		 */
+ 		swap(curr->vruntime, se->vruntime);
+-		resched_curr(rq);
++		resched_curr_lazy(rq);
+ 	}
+ 
+ 	se->vruntime -= cfs_rq->min_vruntime;
+@@ -9108,7 +9108,7 @@ prio_changed_fair(struct rq *rq, struct
+ 	 */
+ 	if (rq->curr == p) {
+ 		if (p->prio > oldprio)
+-			resched_curr(rq);
++			resched_curr_lazy(rq);
+ 	} else
+ 		check_preempt_curr(rq, p, 0);
+ }
+--- a/kernel/sched/features.h
++++ b/kernel/sched/features.h
+@@ -48,6 +48,9 @@ SCHED_FEAT(NONTASK_CAPACITY, true)
+ 
+ #ifdef CONFIG_PREEMPT_RT_FULL
+ SCHED_FEAT(TTWU_QUEUE, false)
++# ifdef CONFIG_PREEMPT_LAZY
++SCHED_FEAT(PREEMPT_LAZY, true)
++# endif
+ #else
+ 
+ /*
+--- a/kernel/sched/sched.h
++++ b/kernel/sched/sched.h
+@@ -1544,6 +1544,15 @@ extern void init_sched_fair_class(void);
+ extern void resched_curr(struct rq *rq);
+ extern void resched_cpu(int cpu);
+ 
++#ifdef CONFIG_PREEMPT_LAZY
++extern void resched_curr_lazy(struct rq *rq);
++#else
++static inline void resched_curr_lazy(struct rq *rq)
++{
++	resched_curr(rq);
++}
++#endif
++
+ extern struct rt_bandwidth def_rt_bandwidth;
+ extern void init_rt_bandwidth(struct rt_bandwidth *rt_b, u64 period, u64 runtime);
+ 
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -2129,6 +2129,7 @@ tracing_generic_entry_update(struct trac
+ 	struct task_struct *tsk = current;
+ 
+ 	entry->preempt_count		= pc & 0xff;
++	entry->preempt_lazy_count	= preempt_lazy_count();
+ 	entry->pid			= (tsk) ? tsk->pid : 0;
+ 	entry->flags =
+ #ifdef CONFIG_TRACE_IRQFLAGS_SUPPORT
+@@ -2139,7 +2140,8 @@ tracing_generic_entry_update(struct trac
+ 		((pc & NMI_MASK    ) ? TRACE_FLAG_NMI     : 0) |
+ 		((pc & HARDIRQ_MASK) ? TRACE_FLAG_HARDIRQ : 0) |
+ 		((pc & SOFTIRQ_OFFSET) ? TRACE_FLAG_SOFTIRQ : 0) |
+-		(tif_need_resched() ? TRACE_FLAG_NEED_RESCHED : 0) |
++		(tif_need_resched_now() ? TRACE_FLAG_NEED_RESCHED : 0) |
++		(need_resched_lazy() ? TRACE_FLAG_NEED_RESCHED_LAZY : 0) |
+ 		(test_preempt_need_resched() ? TRACE_FLAG_PREEMPT_RESCHED : 0);
+ 
+ 	entry->migrate_disable = (tsk) ? __migrate_disabled(tsk) & 0xFF : 0;
+@@ -3341,15 +3343,17 @@ get_total_entries(struct trace_buffer *b
+ 
+ static void print_lat_help_header(struct seq_file *m)
+ {
+-	seq_puts(m, "#                  _------=> CPU#            \n"
+-		    "#                 / _-----=> irqs-off        \n"
+-		    "#                | / _----=> need-resched    \n"
+-		    "#                || / _---=> hardirq/softirq \n"
+-		    "#                ||| / _--=> preempt-depth   \n"
+-		    "#                |||| / _--=> migrate-disable\n"
+-		    "#                ||||| /     delay           \n"
+-		    "#  cmd     pid   |||||| time  |   caller     \n"
+-		    "#     \\   /      |||||  \\   |   /          \n");
++	seq_puts(m, "#                   _--------=> CPU#              \n"
++		    "#                  / _-------=> irqs-off          \n"
++		    "#                 | / _------=> need-resched      \n"
++		    "#                 || / _-----=> need-resched_lazy \n"
++		    "#                 ||| / _----=> hardirq/softirq   \n"
++		    "#                 |||| / _---=> preempt-depth     \n"
++		    "#                 ||||| / _--=> preempt-lazy-depth\n"
++		    "#                 |||||| / _-=> migrate-disable   \n"
++		    "#                 ||||||| /     delay             \n"
++		    "#  cmd     pid    |||||||| time  |   caller       \n"
++		    "#     \\   /      ||||||||  \\   |   /            \n");
+ }
+ 
+ static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
+@@ -3385,15 +3389,17 @@ static void print_func_help_header_irq(s
+ 		   tgid ? tgid_space : space);
+ 	seq_printf(m, "#                          %s / _----=> need-resched\n",
+ 		   tgid ? tgid_space : space);
+-	seq_printf(m, "#                          %s| / _---=> hardirq/softirq\n",
++	seq_printf(m, "#                          %s| /  _----=> need-resched_lazy\n",
+ 		   tgid ? tgid_space : space);
+-	seq_printf(m, "#                          %s|| / _--=> preempt-depth\n",
++	seq_printf(m, "#                          %s|| / _---=> hardirq/softirq\n",
+ 		   tgid ? tgid_space : space);
+-	seq_printf(m, "#                          %s||| /     delay\n",
++	seq_printf(m, "#                          %s||| / _--=> preempt-depth\n",
+ 		   tgid ? tgid_space : space);
+-	seq_printf(m, "#           TASK-PID   CPU#%s||||    TIMESTAMP  FUNCTION\n",
++	seq_printf(m, "#                          %s|||| /     delay\n",
++		   tgid ? tgid_space : space);
++	seq_printf(m, "#           TASK-PID   CPU#%s|||||    TIMESTAMP  FUNCTION\n",
+ 		   tgid ? "   TGID   " : space);
+-	seq_printf(m, "#              | |       | %s||||       |         |\n",
++	seq_printf(m, "#              | |       | %s|||||       |         |\n",
+ 		   tgid ? "     |    " : space);
+ }
+ 
+--- a/kernel/trace/trace.h
++++ b/kernel/trace/trace.h
+@@ -127,6 +127,7 @@ struct kretprobe_trace_entry_head {
+  *  NEED_RESCHED	- reschedule is requested
+  *  HARDIRQ		- inside an interrupt handler
+  *  SOFTIRQ		- inside a softirq handler
++ *  NEED_RESCHED_LAZY	- lazy reschedule is requested
+  */
+ enum trace_flag_type {
+ 	TRACE_FLAG_IRQS_OFF		= 0x01,
+@@ -136,6 +137,7 @@ enum trace_flag_type {
+ 	TRACE_FLAG_SOFTIRQ		= 0x10,
+ 	TRACE_FLAG_PREEMPT_RESCHED	= 0x20,
+ 	TRACE_FLAG_NMI			= 0x40,
++	TRACE_FLAG_NEED_RESCHED_LAZY	= 0x80,
+ };
+ 
+ #define TRACE_BUF_SIZE		1024
+--- a/kernel/trace/trace_output.c
++++ b/kernel/trace/trace_output.c
+@@ -447,6 +447,7 @@ int trace_print_lat_fmt(struct trace_seq
+ {
+ 	char hardsoft_irq;
+ 	char need_resched;
++	char need_resched_lazy;
+ 	char irqs_off;
+ 	int hardirq;
+ 	int softirq;
+@@ -477,6 +478,9 @@ int trace_print_lat_fmt(struct trace_seq
+ 		break;
+ 	}
+ 
++	need_resched_lazy =
++		(entry->flags & TRACE_FLAG_NEED_RESCHED_LAZY) ? 'L' : '.';
++
+ 	hardsoft_irq =
+ 		(nmi && hardirq)     ? 'Z' :
+ 		nmi                  ? 'z' :
+@@ -485,14 +489,20 @@ int trace_print_lat_fmt(struct trace_seq
+ 		softirq              ? 's' :
+ 		                       '.' ;
+ 
+-	trace_seq_printf(s, "%c%c%c",
+-			 irqs_off, need_resched, hardsoft_irq);
++	trace_seq_printf(s, "%c%c%c%c",
++			 irqs_off, need_resched, need_resched_lazy,
++			 hardsoft_irq);
+ 
+ 	if (entry->preempt_count)
+ 		trace_seq_printf(s, "%x", entry->preempt_count);
+ 	else
+ 		trace_seq_putc(s, '.');
+ 
++	if (entry->preempt_lazy_count)
++		trace_seq_printf(s, "%x", entry->preempt_lazy_count);
++	else
++		trace_seq_putc(s, '.');
++
+ 	if (entry->migrate_disable)
+ 		trace_seq_printf(s, "%x", entry->migrate_disable);
+ 	else
diff --git a/kernel/patches-4.14.x-rt/0360-ftrace-Fix-trace-header-alignment.patch b/kernel/patches-4.14.x-rt/0360-ftrace-Fix-trace-header-alignment.patch
new file mode 100644
index 000000000..7ecf9031c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0360-ftrace-Fix-trace-header-alignment.patch
@@ -0,0 +1,45 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Sun, 16 Oct 2016 05:08:30 +0200
+Subject: [PATCH] ftrace: Fix trace header alignment
+
+Line up helper arrows to the right column.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+[bigeasy: fixup function tracer header]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/trace/trace.c |   22 +++++++++++-----------
+ 1 file changed, 11 insertions(+), 11 deletions(-)
+
+--- a/kernel/trace/trace.c
++++ b/kernel/trace/trace.c
+@@ -3343,17 +3343,17 @@ get_total_entries(struct trace_buffer *b
+ 
+ static void print_lat_help_header(struct seq_file *m)
+ {
+-	seq_puts(m, "#                   _--------=> CPU#              \n"
+-		    "#                  / _-------=> irqs-off          \n"
+-		    "#                 | / _------=> need-resched      \n"
+-		    "#                 || / _-----=> need-resched_lazy \n"
+-		    "#                 ||| / _----=> hardirq/softirq   \n"
+-		    "#                 |||| / _---=> preempt-depth     \n"
+-		    "#                 ||||| / _--=> preempt-lazy-depth\n"
+-		    "#                 |||||| / _-=> migrate-disable   \n"
+-		    "#                 ||||||| /     delay             \n"
+-		    "#  cmd     pid    |||||||| time  |   caller       \n"
+-		    "#     \\   /      ||||||||  \\   |   /            \n");
++	seq_puts(m, "#                  _--------=> CPU#              \n"
++		    "#                 / _-------=> irqs-off          \n"
++		    "#                | / _------=> need-resched      \n"
++		    "#                || / _-----=> need-resched_lazy \n"
++		    "#                ||| / _----=> hardirq/softirq   \n"
++		    "#                |||| / _---=> preempt-depth     \n"
++		    "#                ||||| / _--=> preempt-lazy-depth\n"
++		    "#                |||||| / _-=> migrate-disable   \n"
++		    "#                ||||||| /     delay             \n"
++		    "# cmd     pid    |||||||| time   |  caller       \n"
++		    "#     \\   /      ||||||||   \\    |  /            \n");
+ }
+ 
+ static void print_event_info(struct trace_buffer *buf, struct seq_file *m)
diff --git a/kernel/patches-4.14.x-rt/0361-x86-preempt-lazy.patch b/kernel/patches-4.14.x-rt/0361-x86-preempt-lazy.patch
new file mode 100644
index 000000000..30c505d5c
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0361-x86-preempt-lazy.patch
@@ -0,0 +1,222 @@
+Subject: x86: Support for lazy preemption
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 01 Nov 2012 11:03:47 +0100
+
+Implement the x86 pieces for lazy preempt.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/x86/Kconfig                   |    1 +
+ arch/x86/entry/common.c            |    4 ++--
+ arch/x86/entry/entry_32.S          |   17 +++++++++++++++++
+ arch/x86/entry/entry_64.S          |   16 ++++++++++++++++
+ arch/x86/include/asm/preempt.h     |   31 ++++++++++++++++++++++++++++++-
+ arch/x86/include/asm/thread_info.h |   11 +++++++++++
+ arch/x86/kernel/asm-offsets.c      |    2 ++
+ 7 files changed, 79 insertions(+), 3 deletions(-)
+
+--- a/arch/x86/Kconfig
++++ b/arch/x86/Kconfig
+@@ -170,6 +170,7 @@ config X86
+ 	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+ 	select HAVE_PERF_REGS
+ 	select HAVE_PERF_USER_STACK_DUMP
++	select HAVE_PREEMPT_LAZY
+ 	select HAVE_RCU_TABLE_FREE
+ 	select HAVE_REGS_AND_STACK_ACCESS_API
+ 	select HAVE_RELIABLE_STACKTRACE		if X86_64 && UNWINDER_FRAME_POINTER && STACK_VALIDATION
+--- a/arch/x86/entry/common.c
++++ b/arch/x86/entry/common.c
+@@ -133,7 +133,7 @@ static long syscall_trace_enter(struct p
+ 
+ #define EXIT_TO_USERMODE_LOOP_FLAGS				\
+ 	(_TIF_SIGPENDING | _TIF_NOTIFY_RESUME | _TIF_UPROBE |	\
+-	 _TIF_NEED_RESCHED | _TIF_USER_RETURN_NOTIFY | _TIF_PATCH_PENDING)
++	 _TIF_NEED_RESCHED_MASK | _TIF_USER_RETURN_NOTIFY | _TIF_PATCH_PENDING)
+ 
+ static void exit_to_usermode_loop(struct pt_regs *regs, u32 cached_flags)
+ {
+@@ -148,7 +148,7 @@ static void exit_to_usermode_loop(struct
+ 		/* We have work to do. */
+ 		local_irq_enable();
+ 
+-		if (cached_flags & _TIF_NEED_RESCHED)
++		if (cached_flags & _TIF_NEED_RESCHED_MASK)
+ 			schedule();
+ 
+ #ifdef ARCH_RT_DELAYS_SIGNAL_SEND
+--- a/arch/x86/entry/entry_32.S
++++ b/arch/x86/entry/entry_32.S
+@@ -351,8 +351,25 @@ END(ret_from_exception)
+ ENTRY(resume_kernel)
+ 	DISABLE_INTERRUPTS(CLBR_ANY)
+ .Lneed_resched:
++	# preempt count == 0 + NEED_RS set?
+ 	cmpl	$0, PER_CPU_VAR(__preempt_count)
++#ifndef CONFIG_PREEMPT_LAZY
+ 	jnz	restore_all
++#else
++	jz test_int_off
++
++	# atleast preempt count == 0 ?
++	cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
++	jne restore_all
++
++	movl	PER_CPU_VAR(current_task), %ebp
++	cmpl	$0,TASK_TI_preempt_lazy_count(%ebp)	# non-zero preempt_lazy_count ?
++	jnz	restore_all
++
++	testl	$_TIF_NEED_RESCHED_LAZY, TASK_TI_flags(%ebp)
++	jz	restore_all
++test_int_off:
++#endif
+ 	testl	$X86_EFLAGS_IF, PT_EFLAGS(%esp)	# interrupts off (exception path) ?
+ 	jz	restore_all
+ 	call	preempt_schedule_irq
+--- a/arch/x86/entry/entry_64.S
++++ b/arch/x86/entry/entry_64.S
+@@ -666,7 +666,23 @@ GLOBAL(swapgs_restore_regs_and_return_to
+ 	bt	$9, EFLAGS(%rsp)		/* were interrupts off? */
+ 	jnc	1f
+ 0:	cmpl	$0, PER_CPU_VAR(__preempt_count)
++#ifndef CONFIG_PREEMPT_LAZY
+ 	jnz	1f
++#else
++	jz	do_preempt_schedule_irq
++
++	# atleast preempt count == 0 ?
++	cmpl $_PREEMPT_ENABLED,PER_CPU_VAR(__preempt_count)
++	jnz	1f
++
++	movq	PER_CPU_VAR(current_task), %rcx
++	cmpl	$0, TASK_TI_preempt_lazy_count(%rcx)
++	jnz	1f
++
++	bt	$TIF_NEED_RESCHED_LAZY,TASK_TI_flags(%rcx)
++	jnc	1f
++do_preempt_schedule_irq:
++#endif
+ 	call	preempt_schedule_irq
+ 	jmp	0b
+ 1:
+--- a/arch/x86/include/asm/preempt.h
++++ b/arch/x86/include/asm/preempt.h
+@@ -86,17 +86,46 @@ static __always_inline void __preempt_co
+  * a decrement which hits zero means we have no preempt_count and should
+  * reschedule.
+  */
+-static __always_inline bool __preempt_count_dec_and_test(void)
++static __always_inline bool ____preempt_count_dec_and_test(void)
+ {
+ 	GEN_UNARY_RMWcc("decl", __preempt_count, __percpu_arg(0), e);
+ }
+ 
++static __always_inline bool __preempt_count_dec_and_test(void)
++{
++	if (____preempt_count_dec_and_test())
++		return true;
++#ifdef CONFIG_PREEMPT_LAZY
++	if (current_thread_info()->preempt_lazy_count)
++		return false;
++	return test_thread_flag(TIF_NEED_RESCHED_LAZY);
++#else
++	return false;
++#endif
++}
++
+ /*
+  * Returns true when we need to resched and can (barring IRQ state).
+  */
+ static __always_inline bool should_resched(int preempt_offset)
+ {
++#ifdef CONFIG_PREEMPT_LAZY
++	u32 tmp;
++
++	tmp = raw_cpu_read_4(__preempt_count);
++	if (tmp == preempt_offset)
++		return true;
++
++	/* preempt count == 0 ? */
++	tmp &= ~PREEMPT_NEED_RESCHED;
++	if (tmp)
++		return false;
++	if (current_thread_info()->preempt_lazy_count)
++		return false;
++	return test_thread_flag(TIF_NEED_RESCHED_LAZY);
++#else
+ 	return unlikely(raw_cpu_read_4(__preempt_count) == preempt_offset);
++#endif
+ }
+ 
+ #ifdef CONFIG_PREEMPT
+--- a/arch/x86/include/asm/thread_info.h
++++ b/arch/x86/include/asm/thread_info.h
+@@ -56,11 +56,14 @@ struct task_struct;
+ struct thread_info {
+ 	unsigned long		flags;		/* low level flags */
+ 	u32			status;		/* thread synchronous flags */
++	int			preempt_lazy_count;	/* 0 => lazy preemptable
++							  <0 => BUG */
+ };
+ 
+ #define INIT_THREAD_INFO(tsk)			\
+ {						\
+ 	.flags		= 0,			\
++	.preempt_lazy_count = 0,		\
+ }
+ 
+ #define init_stack		(init_thread_union.stack)
+@@ -69,6 +72,10 @@ struct thread_info {
+ 
+ #include <asm/asm-offsets.h>
+ 
++#define GET_THREAD_INFO(reg) \
++	_ASM_MOV PER_CPU_VAR(cpu_current_top_of_stack),reg ; \
++	_ASM_SUB $(THREAD_SIZE),reg ;
++
+ #endif
+ 
+ /*
+@@ -84,6 +91,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 */
++#define TIF_NEED_RESCHED_LAZY	9	/* lazy rescheduling necessary */
+ #define TIF_USER_RETURN_NOTIFY	11	/* notify kernel of userspace return */
+ #define TIF_UPROBE		12	/* breakpointed or singlestepping */
+ #define TIF_PATCH_PENDING	13	/* pending live patching update */
+@@ -110,6 +118,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)
++#define _TIF_NEED_RESCHED_LAZY	(1 << TIF_NEED_RESCHED_LAZY)
+ #define _TIF_USER_RETURN_NOTIFY	(1 << TIF_USER_RETURN_NOTIFY)
+ #define _TIF_UPROBE		(1 << TIF_UPROBE)
+ #define _TIF_PATCH_PENDING	(1 << TIF_PATCH_PENDING)
+@@ -151,6 +160,8 @@ struct thread_info {
+ #define _TIF_WORK_CTXSW_PREV (_TIF_WORK_CTXSW|_TIF_USER_RETURN_NOTIFY)
+ #define _TIF_WORK_CTXSW_NEXT (_TIF_WORK_CTXSW)
+ 
++#define _TIF_NEED_RESCHED_MASK	(_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
++
+ #define STACK_WARN		(THREAD_SIZE/8)
+ 
+ /*
+--- a/arch/x86/kernel/asm-offsets.c
++++ b/arch/x86/kernel/asm-offsets.c
+@@ -38,6 +38,7 @@ void common(void) {
+ 
+ 	BLANK();
+ 	OFFSET(TASK_TI_flags, task_struct, thread_info.flags);
++	OFFSET(TASK_TI_preempt_lazy_count, task_struct, thread_info.preempt_lazy_count);
+ 	OFFSET(TASK_addr_limit, task_struct, thread.addr_limit);
+ 
+ 	BLANK();
+@@ -94,6 +95,7 @@ void common(void) {
+ 
+ 	BLANK();
+ 	DEFINE(PTREGS_SIZE, sizeof(struct pt_regs));
++	DEFINE(_PREEMPT_ENABLED, PREEMPT_ENABLED);
+ 
+ 	/* TLB state for the entry code */
+ 	OFFSET(TLB_STATE_user_pcid_flush_mask, tlb_state, user_pcid_flush_mask);
diff --git a/kernel/patches-4.14.x-rt/0362-arm-preempt-lazy-support.patch b/kernel/patches-4.14.x-rt/0362-arm-preempt-lazy-support.patch
new file mode 100644
index 000000000..52faabe2e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0362-arm-preempt-lazy-support.patch
@@ -0,0 +1,151 @@
+Subject: arm: Add support for lazy preemption
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 31 Oct 2012 12:04:11 +0100
+
+Implement the arm pieces for lazy preempt.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/arm/Kconfig                   |    1 +
+ arch/arm/include/asm/thread_info.h |    8 ++++++--
+ arch/arm/kernel/asm-offsets.c      |    1 +
+ arch/arm/kernel/entry-armv.S       |   19 ++++++++++++++++---
+ arch/arm/kernel/entry-common.S     |    9 +++++++--
+ arch/arm/kernel/signal.c           |    3 ++-
+ 6 files changed, 33 insertions(+), 8 deletions(-)
+
+--- a/arch/arm/Kconfig
++++ b/arch/arm/Kconfig
+@@ -85,6 +85,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
+--- 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 */
++	int			preempt_lazy_count; /* 0 => preemptable, <0 => bug */
+ 	mm_segment_t		addr_limit;	/* address limit */
+ 	struct task_struct	*task;		/* main task structure */
+ 	__u32			cpu;		/* cpu */
+@@ -142,7 +143,8 @@ extern int vfp_restore_user_hwstate(stru
+ #define TIF_SYSCALL_TRACE	4	/* syscall trace active */
+ #define TIF_SYSCALL_AUDIT	5	/* syscall auditing active */
+ #define TIF_SYSCALL_TRACEPOINT	6	/* syscall tracepoint instrumentation */
+-#define TIF_SECCOMP		7	/* seccomp syscall filtering active */
++#define TIF_SECCOMP		8	/* seccomp syscall filtering active */
++#define TIF_NEED_RESCHED_LAZY	7
+ 
+ #define TIF_NOHZ		12	/* in adaptive nohz mode */
+ #define TIF_USING_IWMMXT	17
+@@ -152,6 +154,7 @@ extern int vfp_restore_user_hwstate(stru
+ #define _TIF_SIGPENDING		(1 << TIF_SIGPENDING)
+ #define _TIF_NEED_RESCHED	(1 << TIF_NEED_RESCHED)
+ #define _TIF_NOTIFY_RESUME	(1 << TIF_NOTIFY_RESUME)
++#define _TIF_NEED_RESCHED_LAZY	(1 << TIF_NEED_RESCHED_LAZY)
+ #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 @@ extern int vfp_restore_user_hwstate(stru
+  * Change these and you break ASM code in entry-common.S
+  */
+ #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
+-				 _TIF_NOTIFY_RESUME | _TIF_UPROBE)
++				 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
++				 _TIF_NEED_RESCHED_LAZY)
+ 
+ #endif /* __KERNEL__ */
+ #endif /* __ASM_ARM_THREAD_INFO_H */
+--- 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));
++  DEFINE(TI_PREEMPT_LAZY,	offsetof(struct thread_info, preempt_lazy_count));
+   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));
+--- 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
+-	ldr	r0, [tsk, #TI_FLAGS]		@ get flags
+ 	teq	r8, #0				@ if preempt count != 0
++	bne	1f				@ return from exeption
++	ldr	r0, [tsk, #TI_FLAGS]		@ get flags
++	tst	r0, #_TIF_NEED_RESCHED		@ if NEED_RESCHED is set
++	blne	svc_preempt			@ preempt!
++
++	ldr	r8, [tsk, #TI_PREEMPT_LAZY]	@ get preempt lazy count
++	teq	r8, #0				@ if preempt lazy count != 0
+ 	movne	r0, #0				@ force flags to 0
+-	tst	r0, #_TIF_NEED_RESCHED
++	tst	r0, #_TIF_NEED_RESCHED_LAZY
+ 	blne	svc_preempt
++1:
+ #endif
+ 
+ 	svc_exit r5, irq = 1			@ return from exception
+@@ -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
++	bne	1b
++	tst	r0, #_TIF_NEED_RESCHED_LAZY
+ 	reteq	r8				@ go again
+-	b	1b
++	ldr	r0, [tsk, #TI_PREEMPT_LAZY]	@ get preempt lazy count
++	teq	r0, #0				@ if preempt lazy count != 0
++	beq	1b
++	ret	r8				@ go again
++
+ #endif
+ 
+ __und_fault:
+--- a/arch/arm/kernel/entry-common.S
++++ b/arch/arm/kernel/entry-common.S
+@@ -53,7 +53,9 @@ saved_pc	.req	lr
+ 	cmp	r2, #TASK_SIZE
+ 	blne	addr_limit_check_failed
+ 	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
+-	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
++	tst	r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
++	bne	fast_work_pending
++	tst	r1, #_TIF_SECCOMP
+ 	bne	fast_work_pending
+ 
+ 
+@@ -83,8 +85,11 @@ ENDPROC(ret_fast_syscall)
+ 	cmp	r2, #TASK_SIZE
+ 	blne	addr_limit_check_failed
+ 	ldr	r1, [tsk, #TI_FLAGS]		@ re-check for syscall tracing
+-	tst	r1, #_TIF_SYSCALL_WORK | _TIF_WORK_MASK
++	tst	r1, #((_TIF_SYSCALL_WORK | _TIF_WORK_MASK) & ~_TIF_SECCOMP)
++	bne	do_slower_path
++	tst	r1, #_TIF_SECCOMP
+ 	beq	no_work_pending
++do_slower_path:
+  UNWIND(.fnend		)
+ ENDPROC(ret_fast_syscall)
+ 
+--- a/arch/arm/kernel/signal.c
++++ b/arch/arm/kernel/signal.c
+@@ -615,7 +615,8 @@ do_work_pending(struct pt_regs *regs, un
+ 	 */
+ 	trace_hardirqs_off();
+ 	do {
+-		if (likely(thread_flags & _TIF_NEED_RESCHED)) {
++		if (likely(thread_flags & (_TIF_NEED_RESCHED |
++					   _TIF_NEED_RESCHED_LAZY))) {
+ 			schedule();
+ 		} else {
+ 			if (unlikely(!user_mode(regs)))
diff --git a/kernel/patches-4.14.x-rt/0363-powerpc-preempt-lazy-support.patch b/kernel/patches-4.14.x-rt/0363-powerpc-preempt-lazy-support.patch
new file mode 100644
index 000000000..ae6a746dd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0363-powerpc-preempt-lazy-support.patch
@@ -0,0 +1,173 @@
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Thu, 1 Nov 2012 10:14:11 +0100
+Subject: powerpc: Add support for lazy preemption
+
+Implement the powerpc pieces for lazy preempt.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ arch/powerpc/Kconfig                   |    1 +
+ arch/powerpc/include/asm/thread_info.h |   11 ++++++++---
+ arch/powerpc/kernel/asm-offsets.c      |    1 +
+ arch/powerpc/kernel/entry_32.S         |   17 ++++++++++++-----
+ arch/powerpc/kernel/entry_64.S         |   14 +++++++++++---
+ 5 files changed, 33 insertions(+), 11 deletions(-)
+
+--- a/arch/powerpc/Kconfig
++++ b/arch/powerpc/Kconfig
+@@ -216,6 +216,7 @@ config PPC
+ 	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI && !HAVE_HARDLOCKUP_DETECTOR_ARCH
+ 	select HAVE_PERF_REGS
+ 	select HAVE_PERF_USER_STACK_DUMP
++	select HAVE_PREEMPT_LAZY
+ 	select HAVE_RCU_TABLE_FREE		if SMP
+ 	select HAVE_REGS_AND_STACK_ACCESS_API
+ 	select HAVE_SYSCALL_TRACEPOINTS
+--- a/arch/powerpc/include/asm/thread_info.h
++++ b/arch/powerpc/include/asm/thread_info.h
+@@ -36,6 +36,8 @@ struct thread_info {
+ 	int		cpu;			/* cpu we're on */
+ 	int		preempt_count;		/* 0 => preemptable,
+ 						   <0 => BUG */
++	int		preempt_lazy_count;	/* 0 => preemptable,
++						   <0 => BUG */
+ 	unsigned long	local_flags;		/* private flags for thread */
+ #ifdef CONFIG_LIVEPATCH
+ 	unsigned long *livepatch_sp;
+@@ -81,8 +83,7 @@ static inline struct thread_info *curren
+ #define TIF_SYSCALL_TRACE	0	/* syscall trace active */
+ #define TIF_SIGPENDING		1	/* signal pending */
+ #define TIF_NEED_RESCHED	2	/* rescheduling necessary */
+-#define TIF_POLLING_NRFLAG	3	/* true if poll_idle() is polling
+-					   TIF_NEED_RESCHED */
++#define TIF_NEED_RESCHED_LAZY	3	/* lazy rescheduling necessary */
+ #define TIF_32BIT		4	/* 32 bit binary */
+ #define TIF_RESTORE_TM		5	/* need to restore TM FP/VEC/VSX */
+ #define TIF_PATCH_PENDING	6	/* pending live patching update */
+@@ -101,6 +102,8 @@ static inline struct thread_info *curren
+ #if defined(CONFIG_PPC64)
+ #define TIF_ELF2ABI		18	/* function descriptors must die! */
+ #endif
++#define TIF_POLLING_NRFLAG	19	/* true if poll_idle() is polling
++					   TIF_NEED_RESCHED */
+ 
+ /* as above, but as bit values */
+ #define _TIF_SYSCALL_TRACE	(1<<TIF_SYSCALL_TRACE)
+@@ -120,14 +123,16 @@ static inline struct thread_info *curren
+ #define _TIF_SYSCALL_TRACEPOINT	(1<<TIF_SYSCALL_TRACEPOINT)
+ #define _TIF_EMULATE_STACK_STORE	(1<<TIF_EMULATE_STACK_STORE)
+ #define _TIF_NOHZ		(1<<TIF_NOHZ)
++#define _TIF_NEED_RESCHED_LAZY	(1<<TIF_NEED_RESCHED_LAZY)
+ #define _TIF_SYSCALL_DOTRACE	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
+ 				 _TIF_SECCOMP | _TIF_SYSCALL_TRACEPOINT | \
+ 				 _TIF_NOHZ)
+ 
+ #define _TIF_USER_WORK_MASK	(_TIF_SIGPENDING | _TIF_NEED_RESCHED | \
+ 				 _TIF_NOTIFY_RESUME | _TIF_UPROBE | \
+-				 _TIF_RESTORE_TM | _TIF_PATCH_PENDING)
++				 _TIF_RESTORE_TM | _TIF_PATCH_PENDING | _TIF_NEED_RESCHED_LAZY)
+ #define _TIF_PERSYSCALL_MASK	(_TIF_RESTOREALL|_TIF_NOERROR)
++#define _TIF_NEED_RESCHED_MASK	(_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
+ 
+ /* Bits in local_flags */
+ /* Don't move TLF_NAPPING without adjusting the code in entry_32.S */
+--- a/arch/powerpc/kernel/asm-offsets.c
++++ b/arch/powerpc/kernel/asm-offsets.c
+@@ -156,6 +156,7 @@ int main(void)
+ 	OFFSET(TI_FLAGS, thread_info, flags);
+ 	OFFSET(TI_LOCAL_FLAGS, thread_info, local_flags);
+ 	OFFSET(TI_PREEMPT, thread_info, preempt_count);
++	OFFSET(TI_PREEMPT_LAZY, thread_info, preempt_lazy_count);
+ 	OFFSET(TI_TASK, thread_info, task);
+ 	OFFSET(TI_CPU, thread_info, cpu);
+ 
+--- a/arch/powerpc/kernel/entry_32.S
++++ b/arch/powerpc/kernel/entry_32.S
+@@ -866,7 +866,14 @@ user_exc_return:		/* r10 contains MSR_KE
+ 	cmpwi	0,r0,0		/* if non-zero, just restore regs and return */
+ 	bne	restore
+ 	andi.	r8,r8,_TIF_NEED_RESCHED
++	bne+	1f
++	lwz	r0,TI_PREEMPT_LAZY(r9)
++	cmpwi	0,r0,0		/* if non-zero, just restore regs and return */
++	bne	restore
++	lwz	r0,TI_FLAGS(r9)
++	andi.	r0,r0,_TIF_NEED_RESCHED_LAZY
+ 	beq+	restore
++1:
+ 	lwz	r3,_MSR(r1)
+ 	andi.	r0,r3,MSR_EE	/* interrupts off? */
+ 	beq	restore		/* don't schedule if so */
+@@ -877,11 +884,11 @@ user_exc_return:		/* r10 contains MSR_KE
+ 	 */
+ 	bl	trace_hardirqs_off
+ #endif
+-1:	bl	preempt_schedule_irq
++2:	bl	preempt_schedule_irq
+ 	CURRENT_THREAD_INFO(r9, r1)
+ 	lwz	r3,TI_FLAGS(r9)
+-	andi.	r0,r3,_TIF_NEED_RESCHED
+-	bne-	1b
++	andi.	r0,r3,_TIF_NEED_RESCHED_MASK
++	bne-	2b
+ #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
+@@ -1204,7 +1211,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRE
+ #endif /* !(CONFIG_4xx || CONFIG_BOOKE) */
+ 
+ do_work:			/* r10 contains MSR_KERNEL here */
+-	andi.	r0,r9,_TIF_NEED_RESCHED
++	andi.	r0,r9,_TIF_NEED_RESCHED_MASK
+ 	beq	do_user_signal
+ 
+ do_resched:			/* r10 contains MSR_KERNEL here */
+@@ -1225,7 +1232,7 @@ do_resched:			/* r10 contains MSR_KERNEL
+ 	MTMSRD(r10)		/* disable interrupts */
+ 	CURRENT_THREAD_INFO(r9, r1)
+ 	lwz	r9,TI_FLAGS(r9)
+-	andi.	r0,r9,_TIF_NEED_RESCHED
++	andi.	r0,r9,_TIF_NEED_RESCHED_MASK
+ 	bne-	do_resched
+ 	andi.	r0,r9,_TIF_USER_WORK_MASK
+ 	beq	restore_user
+--- a/arch/powerpc/kernel/entry_64.S
++++ b/arch/powerpc/kernel/entry_64.S
+@@ -689,7 +689,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEG
+ 	bl	restore_math
+ 	b	restore
+ #endif
+-1:	andi.	r0,r4,_TIF_NEED_RESCHED
++1:	andi.	r0,r4,_TIF_NEED_RESCHED_MASK
+ 	beq	2f
+ 	bl	restore_interrupts
+ 	SCHEDULE_USER
+@@ -751,10 +751,18 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEG
+ 
+ #ifdef CONFIG_PREEMPT
+ 	/* Check if we need to preempt */
++	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
++	bne+	check_count
++
++	andi.	r0,r4,_TIF_NEED_RESCHED_LAZY
+ 	beq+	restore
++	lwz	r8,TI_PREEMPT_LAZY(r9)
++
+ 	/* Check that preempt_count() == 0 and interrupts are enabled */
+-	lwz	r8,TI_PREEMPT(r9)
++check_count:
+ 	cmpwi	cr1,r8,0
+ 	ld	r0,SOFTE(r1)
+ 	cmpdi	r0,0
+@@ -771,7 +779,7 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEG
+ 	/* Re-test flags and eventually loop */
+ 	CURRENT_THREAD_INFO(r9, r1)
+ 	ld	r4,TI_FLAGS(r9)
+-	andi.	r0,r4,_TIF_NEED_RESCHED
++	andi.	r0,r4,_TIF_NEED_RESCHED_MASK
+ 	bne	1b
+ 
+ 	/*
diff --git a/kernel/patches-4.14.x-rt/0364-arch-arm64-Add-lazy-preempt-support.patch b/kernel/patches-4.14.x-rt/0364-arch-arm64-Add-lazy-preempt-support.patch
new file mode 100644
index 000000000..8661fc7be
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0364-arch-arm64-Add-lazy-preempt-support.patch
@@ -0,0 +1,118 @@
+From: Anders Roxell <anders.roxell@linaro.org>
+Date: Thu, 14 May 2015 17:52:17 +0200
+Subject: arch/arm64: Add lazy preempt support
+
+arm64 is missing support for PREEMPT_RT. The main feature which is
+lacking is support for lazy preemption. The arch-specific entry code,
+thread information structure definitions, and associated data tables
+have to be extended to provide this support. Then the Kconfig file has
+to be extended to indicate the support is available, and also to
+indicate that support for full RT preemption is now available.
+
+Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
+---
+ arch/arm64/Kconfig                   |    1 +
+ arch/arm64/include/asm/thread_info.h |    6 +++++-
+ arch/arm64/kernel/asm-offsets.c      |    1 +
+ arch/arm64/kernel/entry.S            |   12 +++++++++---
+ arch/arm64/kernel/signal.c           |    2 +-
+ 5 files changed, 17 insertions(+), 5 deletions(-)
+
+--- a/arch/arm64/Kconfig
++++ b/arch/arm64/Kconfig
+@@ -103,6 +103,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
+--- a/arch/arm64/include/asm/thread_info.h
++++ b/arch/arm64/include/asm/thread_info.h
+@@ -43,6 +43,7 @@ struct thread_info {
+ 	u64			ttbr0;		/* saved TTBR0_EL1 */
+ #endif
+ 	int			preempt_count;	/* 0 => preemptable, <0 => bug */
++	int			preempt_lazy_count; /* 0 => preemptable, <0 => bug */
+ };
+ 
+ #define INIT_THREAD_INFO(tsk)						\
+@@ -82,6 +83,7 @@ void arch_setup_new_exec(void);
+ #define TIF_FOREIGN_FPSTATE	3	/* CPU's FP state is not current's */
+ #define TIF_UPROBE		4	/* uprobe breakpoint or singlestep */
+ #define TIF_FSCHECK		5	/* Check FS is USER_DS on return */
++#define TIF_NEED_RESCHED_LAZY	6
+ #define TIF_NOHZ		7
+ #define TIF_SYSCALL_TRACE	8
+ #define TIF_SYSCALL_AUDIT	9
+@@ -97,6 +99,7 @@ void arch_setup_new_exec(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)
++#define _TIF_NEED_RESCHED_LAZY	(1 << TIF_NEED_RESCHED_LAZY)
+ #define _TIF_NOHZ		(1 << TIF_NOHZ)
+ #define _TIF_SYSCALL_TRACE	(1 << TIF_SYSCALL_TRACE)
+ #define _TIF_SYSCALL_AUDIT	(1 << TIF_SYSCALL_AUDIT)
+@@ -108,8 +111,9 @@ void arch_setup_new_exec(void);
+ 
+ #define _TIF_WORK_MASK		(_TIF_NEED_RESCHED | _TIF_SIGPENDING | \
+ 				 _TIF_NOTIFY_RESUME | _TIF_FOREIGN_FPSTATE | \
+-				 _TIF_UPROBE | _TIF_FSCHECK)
++				 _TIF_UPROBE | _TIF_FSCHECK | _TIF_NEED_RESCHED_LAZY)
+ 
++#define _TIF_NEED_RESCHED_MASK	(_TIF_NEED_RESCHED | _TIF_NEED_RESCHED_LAZY)
+ #define _TIF_SYSCALL_WORK	(_TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT | \
+ 				 _TIF_SYSCALL_TRACEPOINT | _TIF_SECCOMP | \
+ 				 _TIF_NOHZ)
+--- a/arch/arm64/kernel/asm-offsets.c
++++ b/arch/arm64/kernel/asm-offsets.c
+@@ -38,6 +38,7 @@ int main(void)
+   BLANK();
+   DEFINE(TSK_TI_FLAGS,		offsetof(struct task_struct, thread_info.flags));
+   DEFINE(TSK_TI_PREEMPT,	offsetof(struct task_struct, thread_info.preempt_count));
++  DEFINE(TSK_TI_PREEMPT_LAZY,	offsetof(struct task_struct, thread_info.preempt_lazy_count));
+   DEFINE(TSK_TI_ADDR_LIMIT,	offsetof(struct task_struct, thread_info.addr_limit));
+ #ifdef CONFIG_ARM64_SW_TTBR0_PAN
+   DEFINE(TSK_TI_TTBR0,		offsetof(struct task_struct, thread_info.ttbr0));
+--- a/arch/arm64/kernel/entry.S
++++ b/arch/arm64/kernel/entry.S
+@@ -570,11 +570,16 @@ ENDPROC(el1_sync)
+ 
+ #ifdef CONFIG_PREEMPT
+ 	ldr	w24, [tsk, #TSK_TI_PREEMPT]	// get preempt count
+-	cbnz	w24, 1f				// preempt count != 0
++	cbnz	w24, 2f				// preempt count != 0
+ 	ldr	x0, [tsk, #TSK_TI_FLAGS]	// get flags
+-	tbz	x0, #TIF_NEED_RESCHED, 1f	// needs rescheduling?
+-	bl	el1_preempt
++	tbnz	x0, #TIF_NEED_RESCHED, 1f	// needs rescheduling?
++
++	ldr	w24, [tsk, #TSK_TI_PREEMPT_LAZY] // get preempt lazy count
++	cbnz	w24, 2f				// preempt lazy count != 0
++	tbz	x0, #TIF_NEED_RESCHED_LAZY, 2f	// needs rescheduling?
+ 1:
++	bl	el1_preempt
++2:
+ #endif
+ #ifdef CONFIG_TRACE_IRQFLAGS
+ 	bl	trace_hardirqs_on
+@@ -588,6 +593,7 @@ ENDPROC(el1_irq)
+ 1:	bl	preempt_schedule_irq		// irq en/disable is done inside
+ 	ldr	x0, [tsk, #TSK_TI_FLAGS]	// get new tasks TI_FLAGS
+ 	tbnz	x0, #TIF_NEED_RESCHED, 1b	// needs rescheduling?
++	tbnz	x0, #TIF_NEED_RESCHED_LAZY, 1b	// needs rescheduling?
+ 	ret	x24
+ #endif
+ 
+--- a/arch/arm64/kernel/signal.c
++++ b/arch/arm64/kernel/signal.c
+@@ -755,7 +755,7 @@ asmlinkage void do_notify_resume(struct
+ 		/* Check valid user FS if needed */
+ 		addr_limit_user_check();
+ 
+-		if (thread_flags & _TIF_NEED_RESCHED) {
++		if (thread_flags & _TIF_NEED_RESCHED_MASK) {
+ 			schedule();
+ 		} else {
+ 			local_irq_enable();
diff --git a/kernel/patches-4.14.x-rt/0365-leds-trigger-disable-CPU-trigger-on-RT.patch b/kernel/patches-4.14.x-rt/0365-leds-trigger-disable-CPU-trigger-on-RT.patch
new file mode 100644
index 000000000..e59b96299
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0365-leds-trigger-disable-CPU-trigger-on-RT.patch
@@ -0,0 +1,35 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 23 Jan 2014 14:45:59 +0100
+Subject: leds: trigger: disable CPU trigger on -RT
+
+as it triggers:
+|CPU: 0 PID: 0 Comm: swapper Not tainted 3.12.8-rt10 #141
+|[<c0014aa4>] (unwind_backtrace+0x0/0xf8) from [<c0012788>] (show_stack+0x1c/0x20)
+|[<c0012788>] (show_stack+0x1c/0x20) from [<c043c8dc>] (dump_stack+0x20/0x2c)
+|[<c043c8dc>] (dump_stack+0x20/0x2c) from [<c004c5e8>] (__might_sleep+0x13c/0x170)
+|[<c004c5e8>] (__might_sleep+0x13c/0x170) from [<c043f270>] (__rt_spin_lock+0x28/0x38)
+|[<c043f270>] (__rt_spin_lock+0x28/0x38) from [<c043fa00>] (rt_read_lock+0x68/0x7c)
+|[<c043fa00>] (rt_read_lock+0x68/0x7c) from [<c036cf74>] (led_trigger_event+0x2c/0x5c)
+|[<c036cf74>] (led_trigger_event+0x2c/0x5c) from [<c036e0bc>] (ledtrig_cpu+0x54/0x5c)
+|[<c036e0bc>] (ledtrig_cpu+0x54/0x5c) from [<c000ffd8>] (arch_cpu_idle_exit+0x18/0x1c)
+|[<c000ffd8>] (arch_cpu_idle_exit+0x18/0x1c) from [<c00590b8>] (cpu_startup_entry+0xa8/0x234)
+|[<c00590b8>] (cpu_startup_entry+0xa8/0x234) from [<c043b2cc>] (rest_init+0xb8/0xe0)
+|[<c043b2cc>] (rest_init+0xb8/0xe0) from [<c061ebe0>] (start_kernel+0x2c4/0x380)
+
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/leds/trigger/Kconfig |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- 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"
+-	depends on LEDS_TRIGGERS
++	depends on LEDS_TRIGGERS && !PREEMPT_RT_BASE
+ 	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 --git a/kernel/patches-4.14.x-rt/0366-mmci-remove-bogus-irq-save.patch b/kernel/patches-4.14.x-rt/0366-mmci-remove-bogus-irq-save.patch
new file mode 100644
index 000000000..f7f4487ae
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0366-mmci-remove-bogus-irq-save.patch
@@ -0,0 +1,39 @@
+Subject: mmci: Remove bogus local_irq_save()
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Wed, 09 Jan 2013 12:11:12 +0100
+
+On !RT interrupt runs with interrupts disabled. On RT it's in a
+thread, so no need to disable interrupts at all.
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/mmc/host/mmci.c |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/drivers/mmc/host/mmci.c
++++ b/drivers/mmc/host/mmci.c
+@@ -1200,15 +1200,12 @@ static irqreturn_t mmci_pio_irq(int irq,
+ 	struct sg_mapping_iter *sg_miter = &host->sg_miter;
+ 	struct variant_data *variant = host->variant;
+ 	void __iomem *base = host->base;
+-	unsigned long flags;
+ 	u32 status;
+ 
+ 	status = readl(base + MMCISTATUS);
+ 
+ 	dev_dbg(mmc_dev(host->mmc), "irq1 (pio) %08x\n", status);
+ 
+-	local_irq_save(flags);
+-
+ 	do {
+ 		unsigned int remain, len;
+ 		char *buffer;
+@@ -1248,8 +1245,6 @@ static irqreturn_t mmci_pio_irq(int irq,
+ 
+ 	sg_miter_stop(sg_miter);
+ 
+-	local_irq_restore(flags);
+-
+ 	/*
+ 	 * If we have less than the fifo 'half-full' threshold to transfer,
+ 	 * trigger a PIO interrupt as soon as any data is available.
diff --git a/kernel/patches-4.14.x-rt/0367-cpufreq-drop-K8-s-driver-from-beeing-selected.patch b/kernel/patches-4.14.x-rt/0367-cpufreq-drop-K8-s-driver-from-beeing-selected.patch
new file mode 100644
index 000000000..6b60722a5
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0367-cpufreq-drop-K8-s-driver-from-beeing-selected.patch
@@ -0,0 +1,32 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 9 Apr 2015 15:23:01 +0200
+Subject: cpufreq: drop K8's driver from beeing selected
+
+Ralf posted a picture of a backtrace from
+
+| powernowk8_target_fn() -> transition_frequency_fidvid() and then at the
+| end:
+| 932         policy = cpufreq_cpu_get(smp_processor_id());
+| 933         cpufreq_cpu_put(policy);
+
+crashing the system on -RT. I assumed that policy was a NULL pointer but
+was rulled out. Since Ralf can't do any more investigations on this and
+I have no machine with this, I simply switch it off.
+
+Reported-by:  Ralf Mardorf <ralf.mardorf@alice-dsl.net>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/cpufreq/Kconfig.x86 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/cpufreq/Kconfig.x86
++++ b/drivers/cpufreq/Kconfig.x86
+@@ -125,7 +125,7 @@ config X86_POWERNOW_K7_ACPI
+ 
+ config X86_POWERNOW_K8
+ 	tristate "AMD Opteron/Athlon64 PowerNow!"
+-	depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ
++	depends on ACPI && ACPI_PROCESSOR && X86_ACPI_CPUFREQ && !PREEMPT_RT_BASE
+ 	help
+ 	  This adds the CPUFreq driver for K8/early Opteron/Athlon64 processors.
+ 	  Support for K10 and newer processors is now in acpi-cpufreq.
diff --git a/kernel/patches-4.14.x-rt/0368-connector-cn_proc-Protect-send_msg-with-a-local-lock.patch b/kernel/patches-4.14.x-rt/0368-connector-cn_proc-Protect-send_msg-with-a-local-lock.patch
new file mode 100644
index 000000000..f91af26e9
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0368-connector-cn_proc-Protect-send_msg-with-a-local-lock.patch
@@ -0,0 +1,67 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Sun, 16 Oct 2016 05:11:54 +0200
+Subject: [PATCH] connector/cn_proc: Protect send_msg() with a local lock
+ on RT
+
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:931
+|in_atomic(): 1, irqs_disabled(): 0, pid: 31807, name: sleep
+|Preemption disabled at:[<ffffffff8148019b>] proc_exit_connector+0xbb/0x140
+|
+|CPU: 4 PID: 31807 Comm: sleep Tainted: G        W   E   4.8.0-rt11-rt #106
+|Call Trace:
+| [<ffffffff813436cd>] dump_stack+0x65/0x88
+| [<ffffffff8109c425>] ___might_sleep+0xf5/0x180
+| [<ffffffff816406b0>] __rt_spin_lock+0x20/0x50
+| [<ffffffff81640978>] rt_read_lock+0x28/0x30
+| [<ffffffff8156e209>] netlink_broadcast_filtered+0x49/0x3f0
+| [<ffffffff81522621>] ? __kmalloc_reserve.isra.33+0x31/0x90
+| [<ffffffff8156e5cd>] netlink_broadcast+0x1d/0x20
+| [<ffffffff8147f57a>] cn_netlink_send_mult+0x19a/0x1f0
+| [<ffffffff8147f5eb>] cn_netlink_send+0x1b/0x20
+| [<ffffffff814801d8>] proc_exit_connector+0xf8/0x140
+| [<ffffffff81077f71>] do_exit+0x5d1/0xba0
+| [<ffffffff810785cc>] do_group_exit+0x4c/0xc0
+| [<ffffffff81078654>] SyS_exit_group+0x14/0x20
+| [<ffffffff81640a72>] entry_SYSCALL_64_fastpath+0x1a/0xa4
+
+Since ab8ed951080e ("connector: fix out-of-order cn_proc netlink message
+delivery") which is v4.7-rc6.
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/connector/cn_proc.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/drivers/connector/cn_proc.c
++++ b/drivers/connector/cn_proc.c
+@@ -32,6 +32,7 @@
+ #include <linux/pid_namespace.h>
+ 
+ #include <linux/cn_proc.h>
++#include <linux/locallock.h>
+ 
+ /*
+  * Size of a cn_msg followed by a proc_event structure.  Since the
+@@ -54,10 +55,11 @@ static struct cb_id cn_proc_event_id = {
+ 
+ /* proc_event_counts is used as the sequence number of the netlink message */
+ static DEFINE_PER_CPU(__u32, proc_event_counts) = { 0 };
++static DEFINE_LOCAL_IRQ_LOCK(send_msg_lock);
+ 
+ static inline void send_msg(struct cn_msg *msg)
+ {
+-	preempt_disable();
++	local_lock(send_msg_lock);
+ 
+ 	msg->seq = __this_cpu_inc_return(proc_event_counts) - 1;
+ 	((struct proc_event *)msg->data)->cpu = smp_processor_id();
+@@ -70,7 +72,7 @@ static inline void send_msg(struct cn_ms
+ 	 */
+ 	cn_netlink_send(msg, 0, CN_IDX_PROC, GFP_NOWAIT);
+ 
+-	preempt_enable();
++	local_unlock(send_msg_lock);
+ }
+ 
+ void proc_fork_connector(struct task_struct *task)
diff --git a/kernel/patches-4.14.x-rt/0369-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch b/kernel/patches-4.14.x-rt/0369-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch
new file mode 100644
index 000000000..3f0fb4e9b
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0369-drivers-block-zram-Replace-bit-spinlocks-with-rtmute.patch
@@ -0,0 +1,76 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Thu, 31 Mar 2016 04:08:28 +0200
+Subject: [PATCH] drivers/block/zram: Replace bit spinlocks with rtmutex
+ for -rt
+
+They're nondeterministic, and lead to ___might_sleep() splats in -rt.
+OTOH, they're a lot less wasteful than an rtmutex per page.
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/block/zram/zram_drv.c |   26 ++++++++++++++++++++++++++
+ drivers/block/zram/zram_drv.h |    3 +++
+ 2 files changed, 29 insertions(+)
+
+--- a/drivers/block/zram/zram_drv.c
++++ b/drivers/block/zram/zram_drv.c
+@@ -756,6 +756,30 @@ static DEVICE_ATTR_RO(io_stat);
+ static DEVICE_ATTR_RO(mm_stat);
+ static DEVICE_ATTR_RO(debug_stat);
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++static void zram_meta_init_table_locks(struct zram *zram, size_t num_pages)
++{
++	size_t index;
++
++	for (index = 0; index < num_pages; index++)
++		spin_lock_init(&zram->table[index].lock);
++}
++
++static void zram_slot_lock(struct zram *zram, u32 index)
++{
++	spin_lock(&zram->table[index].lock);
++	__set_bit(ZRAM_ACCESS, &zram->table[index].value);
++}
++
++static void zram_slot_unlock(struct zram *zram, u32 index)
++{
++	__clear_bit(ZRAM_ACCESS, &zram->table[index].value);
++	spin_unlock(&zram->table[index].lock);
++}
++
++#else
++static void zram_meta_init_table_locks(struct zram *zram, size_t num_pages) { }
++
+ static void zram_slot_lock(struct zram *zram, u32 index)
+ {
+ 	bit_spin_lock(ZRAM_ACCESS, &zram->table[index].value);
+@@ -765,6 +789,7 @@ static void zram_slot_unlock(struct zram
+ {
+ 	bit_spin_unlock(ZRAM_ACCESS, &zram->table[index].value);
+ }
++#endif
+ 
+ static void zram_meta_free(struct zram *zram, u64 disksize)
+ {
+@@ -794,6 +819,7 @@ static bool zram_meta_alloc(struct zram
+ 		return false;
+ 	}
+ 
++	zram_meta_init_table_locks(zram, num_pages);
+ 	return true;
+ }
+ 
+--- a/drivers/block/zram/zram_drv.h
++++ b/drivers/block/zram/zram_drv.h
+@@ -77,6 +77,9 @@ struct zram_table_entry {
+ 		unsigned long element;
+ 	};
+ 	unsigned long value;
++#ifdef CONFIG_PREEMPT_RT_BASE
++	spinlock_t lock;
++#endif
+ };
+ 
+ struct zram_stats {
diff --git a/kernel/patches-4.14.x-rt/0370-drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch b/kernel/patches-4.14.x-rt/0370-drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch
new file mode 100644
index 000000000..c39243eb1
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0370-drivers-zram-Don-t-disable-preemption-in-zcomp_strea.patch
@@ -0,0 +1,96 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Thu, 20 Oct 2016 11:15:22 +0200
+Subject: [PATCH] drivers/zram: Don't disable preemption in
+ zcomp_stream_get/put()
+
+In v4.7, the driver switched to percpu compression streams, disabling
+preemption via get/put_cpu_ptr(). Use a per-zcomp_strm lock here. We
+also have to fix an lock order issue in zram_decompress_page() such
+that zs_map_object() nests inside of zcomp_stream_put() as it does in
+zram_bvec_write().
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+[bigeasy: get_locked_var() -> per zcomp_strm lock]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/block/zram/zcomp.c    |   12 ++++++++++--
+ drivers/block/zram/zcomp.h    |    1 +
+ drivers/block/zram/zram_drv.c |    5 +++--
+ 3 files changed, 14 insertions(+), 4 deletions(-)
+
+--- a/drivers/block/zram/zcomp.c
++++ b/drivers/block/zram/zcomp.c
+@@ -116,12 +116,19 @@ ssize_t zcomp_available_show(const char
+ 
+ struct zcomp_strm *zcomp_stream_get(struct zcomp *comp)
+ {
+-	return *get_cpu_ptr(comp->stream);
++	struct zcomp_strm *zstrm;
++
++	zstrm = *this_cpu_ptr(comp->stream);
++	spin_lock(&zstrm->zcomp_lock);
++	return zstrm;
+ }
+ 
+ void zcomp_stream_put(struct zcomp *comp)
+ {
+-	put_cpu_ptr(comp->stream);
++	struct zcomp_strm *zstrm;
++
++	zstrm = *this_cpu_ptr(comp->stream);
++	spin_unlock(&zstrm->zcomp_lock);
+ }
+ 
+ int zcomp_compress(struct zcomp_strm *zstrm,
+@@ -171,6 +178,7 @@ int zcomp_cpu_up_prepare(unsigned int cp
+ 		pr_err("Can't allocate a compression stream\n");
+ 		return -ENOMEM;
+ 	}
++	spin_lock_init(&zstrm->zcomp_lock);
+ 	*per_cpu_ptr(comp->stream, cpu) = zstrm;
+ 	return 0;
+ }
+--- 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;
++	spinlock_t zcomp_lock;
+ };
+ 
+ /* dynamic per-device compression frontend */
+--- a/drivers/block/zram/zram_drv.c
++++ b/drivers/block/zram/zram_drv.c
+@@ -871,6 +871,7 @@ static int __zram_bvec_read(struct zram
+ 	unsigned long handle;
+ 	unsigned int size;
+ 	void *src, *dst;
++	struct zcomp_strm *zstrm;
+ 
+ 	if (zram_wb_enabled(zram)) {
+ 		zram_slot_lock(zram, index);
+@@ -905,6 +906,7 @@ static int __zram_bvec_read(struct zram
+ 
+ 	size = zram_get_obj_size(zram, index);
+ 
++	zstrm = zcomp_stream_get(zram->comp);
+ 	src = zs_map_object(zram->mem_pool, handle, ZS_MM_RO);
+ 	if (size == PAGE_SIZE) {
+ 		dst = kmap_atomic(page);
+@@ -912,14 +914,13 @@ static int __zram_bvec_read(struct zram
+ 		kunmap_atomic(dst);
+ 		ret = 0;
+ 	} else {
+-		struct zcomp_strm *zstrm = zcomp_stream_get(zram->comp);
+ 
+ 		dst = kmap_atomic(page);
+ 		ret = zcomp_decompress(zstrm, src, size, dst);
+ 		kunmap_atomic(dst);
+-		zcomp_stream_put(zram->comp);
+ 	}
+ 	zs_unmap_object(zram->mem_pool, handle);
++	zcomp_stream_put(zram->comp);
+ 	zram_slot_unlock(zram, index);
+ 
+ 	/* Should NEVER happen. Return bio error if it does. */
diff --git a/kernel/patches-4.14.x-rt/0371-drivers-zram-fix-zcomp_stream_get-smp_processor_id-u.patch b/kernel/patches-4.14.x-rt/0371-drivers-zram-fix-zcomp_stream_get-smp_processor_id-u.patch
new file mode 100644
index 000000000..fde000b05
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0371-drivers-zram-fix-zcomp_stream_get-smp_processor_id-u.patch
@@ -0,0 +1,37 @@
+From: Mike Galbraith <efault@gmx.de>
+Date: Wed, 23 Aug 2017 11:57:29 +0200
+Subject: [PATCH] drivers/zram: fix zcomp_stream_get() smp_processor_id() use
+ in preemptible code
+
+Use get_local_ptr() instead this_cpu_ptr() to avoid a warning regarding
+smp_processor_id() in preemptible code.
+raw_cpu_ptr() would be fine, too because the per-CPU data structure is
+protected with a spin lock so it does not matter much if we take the
+other one.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/block/zram/zcomp.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/block/zram/zcomp.c
++++ b/drivers/block/zram/zcomp.c
+@@ -118,7 +118,7 @@ struct zcomp_strm *zcomp_stream_get(stru
+ {
+ 	struct zcomp_strm *zstrm;
+ 
+-	zstrm = *this_cpu_ptr(comp->stream);
++	zstrm = *get_local_ptr(comp->stream);
+ 	spin_lock(&zstrm->zcomp_lock);
+ 	return zstrm;
+ }
+@@ -129,6 +129,7 @@ void zcomp_stream_put(struct zcomp *comp
+ 
+ 	zstrm = *this_cpu_ptr(comp->stream);
+ 	spin_unlock(&zstrm->zcomp_lock);
++	put_local_ptr(zstrm);
+ }
+ 
+ int zcomp_compress(struct zcomp_strm *zstrm,
diff --git a/kernel/patches-4.14.x-rt/0372-tpm_tis-fix-stall-after-iowrite-s.patch b/kernel/patches-4.14.x-rt/0372-tpm_tis-fix-stall-after-iowrite-s.patch
new file mode 100644
index 000000000..83ff41bdd
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0372-tpm_tis-fix-stall-after-iowrite-s.patch
@@ -0,0 +1,77 @@
+From: Haris Okanovic <haris.okanovic@ni.com>
+Date: Tue, 15 Aug 2017 15:13:08 -0500
+Subject: [PATCH] tpm_tis: fix stall after iowrite*()s
+
+ioread8() operations to TPM MMIO addresses can stall the cpu when
+immediately following a sequence of iowrite*()'s to the same region.
+
+For example, cyclitest measures ~400us latency spikes when a non-RT
+usermode application communicates with an SPI-based TPM chip (Intel Atom
+E3940 system, PREEMPT_RT_FULL kernel). The spikes are caused by a
+stalling ioread8() operation following a sequence of 30+ iowrite8()s to
+the same address. I believe this happens because the write sequence is
+buffered (in cpu or somewhere along the bus), and gets flushed on the
+first LOAD instruction (ioread*()) that follows.
+
+The enclosed change appears to fix this issue: read the TPM chip's
+access register (status code) after every iowrite*() operation to
+amortize the cost of flushing data to chip across multiple instructions.
+
+Signed-off-by: Haris Okanovic <haris.okanovic@ni.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/char/tpm/tpm_tis.c |   29 +++++++++++++++++++++++++++--
+ 1 file changed, 27 insertions(+), 2 deletions(-)
+
+--- a/drivers/char/tpm/tpm_tis.c
++++ b/drivers/char/tpm/tpm_tis.c
+@@ -52,6 +52,31 @@ static inline struct tpm_tis_tcg_phy *to
+ 	return container_of(data, struct tpm_tis_tcg_phy, priv);
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++/*
++ * Flushes previous write operations to chip so that a subsequent
++ * ioread*()s won't stall a cpu.
++ */
++static inline void tpm_tis_flush(void __iomem *iobase)
++{
++	ioread8(iobase + TPM_ACCESS(0));
++}
++#else
++#define tpm_tis_flush(iobase) do { } while (0)
++#endif
++
++static inline void tpm_tis_iowrite8(u8 b, void __iomem *iobase, u32 addr)
++{
++	iowrite8(b, iobase + addr);
++	tpm_tis_flush(iobase);
++}
++
++static inline void tpm_tis_iowrite32(u32 b, void __iomem *iobase, u32 addr)
++{
++	iowrite32(b, iobase + addr);
++	tpm_tis_flush(iobase);
++}
++
+ static bool interrupts = true;
+ module_param(interrupts, bool, 0444);
+ MODULE_PARM_DESC(interrupts, "Enable interrupts");
+@@ -230,7 +255,7 @@ static int tpm_tcg_write_bytes(struct tp
+ 	tpm_platform_begin_xfer();
+ 
+ 	while (len--)
+-		iowrite8(*value++, phy->iobase + addr);
++		tpm_tis_iowrite8(*value++, phy->iobase, addr);
+ 
+ 	tpm_platform_end_xfer();
+ 
+@@ -269,7 +294,7 @@ static int tpm_tcg_write32(struct tpm_ti
+ 
+ 	tpm_platform_begin_xfer();
+ 
+-	iowrite32(value, phy->iobase + addr);
++	tpm_tis_iowrite32(value, phy->iobase, addr);
+ 
+ 	tpm_platform_end_xfer();
+ 
diff --git a/kernel/patches-4.14.x-rt/0373-pci-switchtec-Don-t-use-completion-s-wait-queue.patch b/kernel/patches-4.14.x-rt/0373-pci-switchtec-Don-t-use-completion-s-wait-queue.patch
new file mode 100644
index 000000000..e3accac42
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0373-pci-switchtec-Don-t-use-completion-s-wait-queue.patch
@@ -0,0 +1,108 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 4 Oct 2017 10:24:23 +0200
+Subject: [PATCH] pci/switchtec: Don't use completion's wait queue
+
+The poll callback is using completion's wait_queue_head_t member and
+puts it in poll_wait() so the poll() caller gets a wakeup after command
+completed. This does not work on RT because we don't have a
+wait_queue_head_t in our completion implementation. Nobody in tree does
+like that in tree so this is the only driver that breaks.
+
+Instead of using the completion here is waitqueue with a status flag as
+suggested by Logan.
+
+I don't have the HW so I have no idea if it works as expected, so please
+test it.
+
+Cc: Kurt Schwemmer <kurt.schwemmer@microsemi.com>
+Cc: Logan Gunthorpe <logang@deltatee.com>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/pci/switch/switchtec.c |   22 +++++++++++++---------
+ 1 file changed, 13 insertions(+), 9 deletions(-)
+
+--- a/drivers/pci/switch/switchtec.c
++++ b/drivers/pci/switch/switchtec.c
+@@ -306,10 +306,11 @@ struct switchtec_user {
+ 
+ 	enum mrpc_state state;
+ 
+-	struct completion comp;
++	wait_queue_head_t cmd_comp;
+ 	struct kref kref;
+ 	struct list_head list;
+ 
++	bool cmd_done;
+ 	u32 cmd;
+ 	u32 status;
+ 	u32 return_code;
+@@ -331,7 +332,7 @@ static struct switchtec_user *stuser_cre
+ 	stuser->stdev = stdev;
+ 	kref_init(&stuser->kref);
+ 	INIT_LIST_HEAD(&stuser->list);
+-	init_completion(&stuser->comp);
++	init_waitqueue_head(&stuser->cmd_comp);
+ 	stuser->event_cnt = atomic_read(&stdev->event_cnt);
+ 
+ 	dev_dbg(&stdev->dev, "%s: %p\n", __func__, stuser);
+@@ -414,7 +415,7 @@ static int mrpc_queue_cmd(struct switcht
+ 	kref_get(&stuser->kref);
+ 	stuser->read_len = sizeof(stuser->data);
+ 	stuser_set_state(stuser, MRPC_QUEUED);
+-	init_completion(&stuser->comp);
++	stuser->cmd_done = false;
+ 	list_add_tail(&stuser->list, &stdev->mrpc_queue);
+ 
+ 	mrpc_cmd_submit(stdev);
+@@ -451,7 +452,8 @@ static void mrpc_complete_cmd(struct swi
+ 		      stuser->read_len);
+ 
+ out:
+-	complete_all(&stuser->comp);
++	stuser->cmd_done = true;
++	wake_up_interruptible(&stuser->cmd_comp);
+ 	list_del_init(&stuser->list);
+ 	stuser_put(stuser);
+ 	stdev->mrpc_busy = 0;
+@@ -721,10 +723,11 @@ static ssize_t switchtec_dev_read(struct
+ 	mutex_unlock(&stdev->mrpc_mutex);
+ 
+ 	if (filp->f_flags & O_NONBLOCK) {
+-		if (!try_wait_for_completion(&stuser->comp))
++		if (!READ_ONCE(stuser->cmd_done))
+ 			return -EAGAIN;
+ 	} else {
+-		rc = wait_for_completion_interruptible(&stuser->comp);
++		rc = wait_event_interruptible(stuser->cmd_comp,
++					      stuser->cmd_done);
+ 		if (rc < 0)
+ 			return rc;
+ 	}
+@@ -772,7 +775,7 @@ static unsigned int switchtec_dev_poll(s
+ 	struct switchtec_dev *stdev = stuser->stdev;
+ 	int ret = 0;
+ 
+-	poll_wait(filp, &stuser->comp.wait, wait);
++	poll_wait(filp, &stuser->cmd_comp, wait);
+ 	poll_wait(filp, &stdev->event_wq, wait);
+ 
+ 	if (lock_mutex_and_test_alive(stdev))
+@@ -780,7 +783,7 @@ static unsigned int switchtec_dev_poll(s
+ 
+ 	mutex_unlock(&stdev->mrpc_mutex);
+ 
+-	if (try_wait_for_completion(&stuser->comp))
++	if (READ_ONCE(stuser->cmd_done))
+ 		ret |= POLLIN | POLLRDNORM;
+ 
+ 	if (stuser->event_cnt != atomic_read(&stdev->event_cnt))
+@@ -1255,7 +1258,8 @@ static void stdev_kill(struct switchtec_
+ 
+ 	/* Wake up and kill any users waiting on an MRPC request */
+ 	list_for_each_entry_safe(stuser, tmpuser, &stdev->mrpc_queue, list) {
+-		complete_all(&stuser->comp);
++		stuser->cmd_done = true;
++		wake_up_interruptible(&stuser->cmd_comp);
+ 		list_del_init(&stuser->list);
+ 		stuser_put(stuser);
+ 	}
diff --git a/kernel/patches-4.14.x-rt/0374-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch b/kernel/patches-4.14.x-rt/0374-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch
new file mode 100644
index 000000000..7d2fd54c3
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0374-drmradeoni915_Use_preempt_disableenable_rt()_where_recommended.patch
@@ -0,0 +1,51 @@
+Subject: drm,radeon,i915: Use preempt_disable/enable_rt() where recommended
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Sat, 27 Feb 2016 08:09:11 +0100
+
+DRM folks identified the spots, so use them.
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Cc: linux-rt-users <linux-rt-users@vger.kernel.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/gpu/drm/i915/i915_irq.c         |    2 ++
+ drivers/gpu/drm/radeon/radeon_display.c |    2 ++
+ 2 files changed, 4 insertions(+)
+
+--- a/drivers/gpu/drm/i915/i915_irq.c
++++ b/drivers/gpu/drm/i915/i915_irq.c
+@@ -867,6 +867,7 @@ static bool i915_get_crtc_scanoutpos(str
+ 	spin_lock_irqsave(&dev_priv->uncore.lock, irqflags);
+ 
+ 	/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
++	preempt_disable_rt();
+ 
+ 	/* Get optional system timestamp before query. */
+ 	if (stime)
+@@ -918,6 +919,7 @@ static bool i915_get_crtc_scanoutpos(str
+ 		*etime = ktime_get();
+ 
+ 	/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
++	preempt_enable_rt();
+ 
+ 	spin_unlock_irqrestore(&dev_priv->uncore.lock, irqflags);
+ 
+--- a/drivers/gpu/drm/radeon/radeon_display.c
++++ b/drivers/gpu/drm/radeon/radeon_display.c
+@@ -1839,6 +1839,7 @@ int radeon_get_crtc_scanoutpos(struct dr
+ 	struct radeon_device *rdev = dev->dev_private;
+ 
+ 	/* preempt_disable_rt() should go right here in PREEMPT_RT patchset. */
++	preempt_disable_rt();
+ 
+ 	/* Get optional system timestamp before query. */
+ 	if (stime)
+@@ -1931,6 +1932,7 @@ int radeon_get_crtc_scanoutpos(struct dr
+ 		*etime = ktime_get();
+ 
+ 	/* preempt_enable_rt() should go right here in PREEMPT_RT patchset. */
++	preempt_enable_rt();
+ 
+ 	/* Decode into vertical and horizontal scanout position. */
+ 	*vpos = position & 0x1fff;
diff --git a/kernel/patches-4.14.x-rt/0375-drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch b/kernel/patches-4.14.x-rt/0375-drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch
new file mode 100644
index 000000000..9b8583a4f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0375-drmi915_Use_local_lockunlock_irq()_in_intel_pipe_update_startend().patch
@@ -0,0 +1,112 @@
+Subject: drm,i915: Use local_lock/unlock_irq() in intel_pipe_update_start/end()
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Sat, 27 Feb 2016 09:01:42 +0100
+
+
+[    8.014039] BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:918
+[    8.014041] in_atomic(): 0, irqs_disabled(): 1, pid: 78, name: kworker/u4:4
+[    8.014045] CPU: 1 PID: 78 Comm: kworker/u4:4 Not tainted 4.1.7-rt7 #5
+[    8.014055] Workqueue: events_unbound async_run_entry_fn
+[    8.014059]  0000000000000000 ffff880037153748 ffffffff815f32c9 0000000000000002
+[    8.014063]  ffff88013a50e380 ffff880037153768 ffffffff815ef075 ffff8800372c06c8
+[    8.014066]  ffff8800372c06c8 ffff880037153778 ffffffff8107c0b3 ffff880037153798
+[    8.014067] Call Trace:
+[    8.014074]  [<ffffffff815f32c9>] dump_stack+0x4a/0x61
+[    8.014078]  [<ffffffff815ef075>] ___might_sleep.part.93+0xe9/0xee
+[    8.014082]  [<ffffffff8107c0b3>] ___might_sleep+0x53/0x80
+[    8.014086]  [<ffffffff815f9064>] rt_spin_lock+0x24/0x50
+[    8.014090]  [<ffffffff8109368b>] prepare_to_wait+0x2b/0xa0
+[    8.014152]  [<ffffffffa016c04c>] intel_pipe_update_start+0x17c/0x300 [i915]
+[    8.014156]  [<ffffffff81093b40>] ? prepare_to_wait_event+0x120/0x120
+[    8.014201]  [<ffffffffa0158f36>] intel_begin_crtc_commit+0x166/0x1e0 [i915]
+[    8.014215]  [<ffffffffa00c806d>] drm_atomic_helper_commit_planes+0x5d/0x1a0 [drm_kms_helper]
+[    8.014260]  [<ffffffffa0171e9b>] intel_atomic_commit+0xab/0xf0 [i915]
+[    8.014288]  [<ffffffffa00654c7>] drm_atomic_commit+0x37/0x60 [drm]
+[    8.014298]  [<ffffffffa00c6fcd>] drm_atomic_helper_plane_set_property+0x8d/0xd0 [drm_kms_helper]
+[    8.014301]  [<ffffffff815f77d9>] ? __ww_mutex_lock+0x39/0x40
+[    8.014319]  [<ffffffffa0053b3d>] drm_mode_plane_set_obj_prop+0x2d/0x90 [drm]
+[    8.014328]  [<ffffffffa00c8edb>] restore_fbdev_mode+0x6b/0xf0 [drm_kms_helper]
+[    8.014337]  [<ffffffffa00cae49>] drm_fb_helper_restore_fbdev_mode_unlocked+0x29/0x80 [drm_kms_helper]
+[    8.014346]  [<ffffffffa00caec2>] drm_fb_helper_set_par+0x22/0x50 [drm_kms_helper]
+[    8.014390]  [<ffffffffa016dfba>] intel_fbdev_set_par+0x1a/0x60 [i915]
+[    8.014394]  [<ffffffff81327dc4>] fbcon_init+0x4f4/0x580
+[    8.014398]  [<ffffffff8139ef4c>] visual_init+0xbc/0x120
+[    8.014401]  [<ffffffff813a1623>] do_bind_con_driver+0x163/0x330
+[    8.014405]  [<ffffffff813a1b2c>] do_take_over_console+0x11c/0x1c0
+[    8.014408]  [<ffffffff813236e3>] do_fbcon_takeover+0x63/0xd0
+[    8.014410]  [<ffffffff81328965>] fbcon_event_notify+0x785/0x8d0
+[    8.014413]  [<ffffffff8107c12d>] ? __might_sleep+0x4d/0x90
+[    8.014416]  [<ffffffff810775fe>] notifier_call_chain+0x4e/0x80
+[    8.014419]  [<ffffffff810779cd>] __blocking_notifier_call_chain+0x4d/0x70
+[    8.014422]  [<ffffffff81077a06>] blocking_notifier_call_chain+0x16/0x20
+[    8.014425]  [<ffffffff8132b48b>] fb_notifier_call_chain+0x1b/0x20
+[    8.014428]  [<ffffffff8132d8fa>] register_framebuffer+0x21a/0x350
+[    8.014439]  [<ffffffffa00cb164>] drm_fb_helper_initial_config+0x274/0x3e0 [drm_kms_helper]
+[    8.014483]  [<ffffffffa016f1cb>] intel_fbdev_initial_config+0x1b/0x20 [i915]
+[    8.014486]  [<ffffffff8107912c>] async_run_entry_fn+0x4c/0x160
+[    8.014490]  [<ffffffff81070ffa>] process_one_work+0x14a/0x470
+[    8.014493]  [<ffffffff81071489>] worker_thread+0x169/0x4c0
+[    8.014496]  [<ffffffff81071320>] ? process_one_work+0x470/0x470
+[    8.014499]  [<ffffffff81076606>] kthread+0xc6/0xe0
+[    8.014502]  [<ffffffff81070000>] ? queue_work_on+0x80/0x110
+[    8.014506]  [<ffffffff81076540>] ? kthread_worker_fn+0x1c0/0x1c0
+
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Cc: linux-rt-users <linux-rt-users@vger.kernel.org>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ drivers/gpu/drm/i915/intel_sprite.c |   11 ++++++-----
+ 1 file changed, 6 insertions(+), 5 deletions(-)
+
+--- a/drivers/gpu/drm/i915/intel_sprite.c
++++ b/drivers/gpu/drm/i915/intel_sprite.c
+@@ -36,6 +36,7 @@
+ #include <drm/drm_rect.h>
+ #include <drm/drm_atomic.h>
+ #include <drm/drm_plane_helper.h>
++#include <linux/locallock.h>
+ #include "intel_drv.h"
+ #include "intel_frontbuffer.h"
+ #include <drm/i915_drm.h>
+@@ -67,7 +68,7 @@ int intel_usecs_to_scanlines(const struc
+ }
+ 
+ #define VBLANK_EVASION_TIME_US 100
+-
++static DEFINE_LOCAL_IRQ_LOCK(pipe_update_lock);
+ /**
+  * intel_pipe_update_start() - start update of a set of display registers
+  * @crtc: the crtc of which the registers are going to be updated
+@@ -102,7 +103,7 @@ void intel_pipe_update_start(struct inte
+ 						      VBLANK_EVASION_TIME_US);
+ 	max = vblank_start - 1;
+ 
+-	local_irq_disable();
++	local_lock_irq(pipe_update_lock);
+ 
+ 	if (min <= 0 || max <= 0)
+ 		return;
+@@ -132,11 +133,11 @@ void intel_pipe_update_start(struct inte
+ 			break;
+ 		}
+ 
+-		local_irq_enable();
++		local_unlock_irq(pipe_update_lock);
+ 
+ 		timeout = schedule_timeout(timeout);
+ 
+-		local_irq_disable();
++		local_lock_irq(pipe_update_lock);
+ 	}
+ 
+ 	finish_wait(wq, &wait);
+@@ -201,7 +202,7 @@ void intel_pipe_update_end(struct intel_
+ 		crtc->base.state->event = NULL;
+ 	}
+ 
+-	local_irq_enable();
++	local_unlock_irq(pipe_update_lock);
+ 
+ 	if (intel_vgpu_active(dev_priv))
+ 		return;
diff --git a/kernel/patches-4.14.x-rt/0376-cgroups-use-simple-wait-in-css_release.patch b/kernel/patches-4.14.x-rt/0376-cgroups-use-simple-wait-in-css_release.patch
new file mode 100644
index 000000000..c14ac1044
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0376-cgroups-use-simple-wait-in-css_release.patch
@@ -0,0 +1,86 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Fri, 13 Feb 2015 15:52:24 +0100
+Subject: cgroups: use simple wait in css_release()
+
+To avoid:
+|BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:914
+|in_atomic(): 1, irqs_disabled(): 0, pid: 92, name: rcuc/11
+|2 locks held by rcuc/11/92:
+| #0:  (rcu_callback){......}, at: [<ffffffff810e037e>] rcu_cpu_kthread+0x3de/0x940
+| #1:  (rcu_read_lock_sched){......}, at: [<ffffffff81328390>] percpu_ref_call_confirm_rcu+0x0/0xd0
+|Preemption disabled at:[<ffffffff813284e2>] percpu_ref_switch_to_atomic_rcu+0x82/0xc0
+|CPU: 11 PID: 92 Comm: rcuc/11 Not tainted 3.18.7-rt0+ #1
+| ffff8802398cdf80 ffff880235f0bc28 ffffffff815b3a12 0000000000000000
+| 0000000000000000 ffff880235f0bc48 ffffffff8109aa16 0000000000000000
+| ffff8802398cdf80 ffff880235f0bc78 ffffffff815b8dd4 000000000000df80
+|Call Trace:
+| [<ffffffff815b3a12>] dump_stack+0x4f/0x7c
+| [<ffffffff8109aa16>] __might_sleep+0x116/0x190
+| [<ffffffff815b8dd4>] rt_spin_lock+0x24/0x60
+| [<ffffffff8108d2cd>] queue_work_on+0x6d/0x1d0
+| [<ffffffff8110c881>] css_release+0x81/0x90
+| [<ffffffff8132844e>] percpu_ref_call_confirm_rcu+0xbe/0xd0
+| [<ffffffff813284e2>] percpu_ref_switch_to_atomic_rcu+0x82/0xc0
+| [<ffffffff810e03e5>] rcu_cpu_kthread+0x445/0x940
+| [<ffffffff81098a2d>] smpboot_thread_fn+0x18d/0x2d0
+| [<ffffffff810948d8>] kthread+0xe8/0x100
+| [<ffffffff815b9c3c>] ret_from_fork+0x7c/0xb0
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ include/linux/cgroup-defs.h |    2 ++
+ kernel/cgroup/cgroup.c      |    9 +++++----
+ 2 files changed, 7 insertions(+), 4 deletions(-)
+
+--- a/include/linux/cgroup-defs.h
++++ b/include/linux/cgroup-defs.h
+@@ -19,6 +19,7 @@
+ #include <linux/percpu-rwsem.h>
+ #include <linux/workqueue.h>
+ #include <linux/bpf-cgroup.h>
++#include <linux/swork.h>
+ 
+ #ifdef CONFIG_CGROUPS
+ 
+@@ -152,6 +153,7 @@ struct cgroup_subsys_state {
+ 	/* percpu_ref killing and RCU release */
+ 	struct rcu_head rcu_head;
+ 	struct work_struct destroy_work;
++	struct swork_event destroy_swork;
+ 
+ 	/*
+ 	 * PI: the parent css.	Placed here for cache proximity to following
+--- a/kernel/cgroup/cgroup.c
++++ b/kernel/cgroup/cgroup.c
+@@ -4498,10 +4498,10 @@ static void css_free_rcu_fn(struct rcu_h
+ 	queue_work(cgroup_destroy_wq, &css->destroy_work);
+ }
+ 
+-static void css_release_work_fn(struct work_struct *work)
++static void css_release_work_fn(struct swork_event *sev)
+ {
+ 	struct cgroup_subsys_state *css =
+-		container_of(work, struct cgroup_subsys_state, destroy_work);
++		container_of(sev, struct cgroup_subsys_state, destroy_swork);
+ 	struct cgroup_subsys *ss = css->ss;
+ 	struct cgroup *cgrp = css->cgroup;
+ 
+@@ -4552,8 +4552,8 @@ static void css_release(struct percpu_re
+ 	struct cgroup_subsys_state *css =
+ 		container_of(ref, struct cgroup_subsys_state, refcnt);
+ 
+-	INIT_WORK(&css->destroy_work, css_release_work_fn);
+-	queue_work(cgroup_destroy_wq, &css->destroy_work);
++	INIT_SWORK(&css->destroy_swork, css_release_work_fn);
++	swork_queue(&css->destroy_swork);
+ }
+ 
+ static void init_and_link_css(struct cgroup_subsys_state *css,
+@@ -5259,6 +5259,7 @@ static int __init cgroup_wq_init(void)
+ 	 */
+ 	cgroup_destroy_wq = alloc_workqueue("cgroup_destroy", 0, 1);
+ 	BUG_ON(!cgroup_destroy_wq);
++	BUG_ON(swork_get());
+ 	return 0;
+ }
+ core_initcall(cgroup_wq_init);
diff --git a/kernel/patches-4.14.x-rt/0377-cgroups-scheduling-while-atomic-in-cgroup-code.patch b/kernel/patches-4.14.x-rt/0377-cgroups-scheduling-while-atomic-in-cgroup-code.patch
new file mode 100644
index 000000000..8bf4ffaa1
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0377-cgroups-scheduling-while-atomic-in-cgroup-code.patch
@@ -0,0 +1,104 @@
+From: Mike Galbraith <umgwanakikbuti@gmail.com>
+Date: Sat, 21 Jun 2014 10:09:48 +0200
+Subject: memcontrol: Prevent scheduling while atomic in cgroup code
+
+mm, memcg: make refill_stock() use get_cpu_light()
+
+Nikita reported the following memcg scheduling while atomic bug:
+
+Call Trace:
+[e22d5a90] [c0007ea8] show_stack+0x4c/0x168 (unreliable)
+[e22d5ad0] [c0618c04] __schedule_bug+0x94/0xb0
+[e22d5ae0] [c060b9ec] __schedule+0x530/0x550
+[e22d5bf0] [c060bacc] schedule+0x30/0xbc
+[e22d5c00] [c060ca24] rt_spin_lock_slowlock+0x180/0x27c
+[e22d5c70] [c00b39dc] res_counter_uncharge_until+0x40/0xc4
+[e22d5ca0] [c013ca88] drain_stock.isra.20+0x54/0x98
+[e22d5cc0] [c01402ac] __mem_cgroup_try_charge+0x2e8/0xbac
+[e22d5d70] [c01410d4] mem_cgroup_charge_common+0x3c/0x70
+[e22d5d90] [c0117284] __do_fault+0x38c/0x510
+[e22d5df0] [c011a5f4] handle_pte_fault+0x98/0x858
+[e22d5e50] [c060ed08] do_page_fault+0x42c/0x6fc
+[e22d5f40] [c000f5b4] handle_page_fault+0xc/0x80
+
+What happens:
+
+   refill_stock()
+      get_cpu_var()
+      drain_stock()
+         res_counter_uncharge()
+            res_counter_uncharge_until()
+               spin_lock() <== boom
+
+Fix it by replacing get/put_cpu_var() with get/put_cpu_light().
+
+Reported-by: Nikita Yushchenko <nyushchenko@dev.rtsoft.ru>
+Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+[bigeasy: use memcg_stock_ll as a locallock since it is now IRQ-off region]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/memcontrol.c |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -1723,6 +1723,7 @@ struct memcg_stock_pcp {
+ #define FLUSHING_CACHED_CHARGE	0
+ };
+ static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
++static DEFINE_LOCAL_IRQ_LOCK(memcg_stock_ll);
+ static DEFINE_MUTEX(percpu_charge_mutex);
+ 
+ /**
+@@ -1745,7 +1746,7 @@ static bool consume_stock(struct mem_cgr
+ 	if (nr_pages > CHARGE_BATCH)
+ 		return ret;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(memcg_stock_ll, flags);
+ 
+ 	stock = this_cpu_ptr(&memcg_stock);
+ 	if (memcg == stock->cached && stock->nr_pages >= nr_pages) {
+@@ -1753,7 +1754,7 @@ static bool consume_stock(struct mem_cgr
+ 		ret = true;
+ 	}
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(memcg_stock_ll, flags);
+ 
+ 	return ret;
+ }
+@@ -1784,13 +1785,13 @@ static void drain_local_stock(struct wor
+ 	 * The only protection from memory hotplug vs. drain_stock races is
+ 	 * that we always operate on local CPU stock here with IRQ disabled
+ 	 */
+-	local_irq_save(flags);
++	local_lock_irqsave(memcg_stock_ll, flags);
+ 
+ 	stock = this_cpu_ptr(&memcg_stock);
+ 	drain_stock(stock);
+ 	clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags);
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(memcg_stock_ll, flags);
+ }
+ 
+ /*
+@@ -1802,7 +1803,7 @@ static void refill_stock(struct mem_cgro
+ 	struct memcg_stock_pcp *stock;
+ 	unsigned long flags;
+ 
+-	local_irq_save(flags);
++	local_lock_irqsave(memcg_stock_ll, flags);
+ 
+ 	stock = this_cpu_ptr(&memcg_stock);
+ 	if (stock->cached != memcg) { /* reset if necessary */
+@@ -1814,7 +1815,7 @@ static void refill_stock(struct mem_cgro
+ 	if (stock->nr_pages > CHARGE_BATCH)
+ 		drain_stock(stock);
+ 
+-	local_irq_restore(flags);
++	local_unlock_irqrestore(memcg_stock_ll, flags);
+ }
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0378-Revert-memcontrol-Prevent-scheduling-while-atomic-in.patch b/kernel/patches-4.14.x-rt/0378-Revert-memcontrol-Prevent-scheduling-while-atomic-in.patch
new file mode 100644
index 000000000..eadbbd252
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0378-Revert-memcontrol-Prevent-scheduling-while-atomic-in.patch
@@ -0,0 +1,100 @@
+From: "Steven Rostedt (VMware)" <rostedt@goodmis.org>
+Date: Wed, 22 Nov 2017 07:31:19 -0500
+Subject: [PATCH] Revert "memcontrol: Prevent scheduling while atomic in cgroup
+ code"
+
+The commit "memcontrol: Prevent scheduling while atomic in cgroup code"
+fixed this issue:
+
+       refill_stock()
+          get_cpu_var()
+          drain_stock()
+             res_counter_uncharge()
+                res_counter_uncharge_until()
+                   spin_lock() <== boom
+
+But commit 3e32cb2e0a12b ("mm: memcontrol: lockless page counters") replaced
+the calls to res_counter_uncharge() in drain_stock() to the lockless
+function page_counter_uncharge(). There is no more spin lock there and no
+more reason to have that local lock.
+
+Cc: <stable-rt@vger.kernel.org>
+Reported-by: Haiyang HY1 Tan <tanhy1@lenovo.com>
+Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+[bigeasy: That upstream commit appeared in v3.19 and the patch in
+  question in v3.18.7-rt2 and v3.18 seems still to be maintained. So I
+  guess that v3.18 would need the locallocks that we are about to remove
+  here. I am not sure if any earlier versions have the patch
+  backported.
+  The stable tag here is because Haiyang reported (and debugged) a crash
+  in 4.4-RT with this patch applied (which has get_cpu_light() instead
+  the locallocks it gained in v4.9-RT).
+  https://lkml.kernel.org/r/05AA4EC5C6EC1D48BE2CDCFF3AE0B8A637F78A15@CNMAILEX04.lenovo.com
+]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ mm/memcontrol.c |   13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+--- a/mm/memcontrol.c
++++ b/mm/memcontrol.c
+@@ -1723,7 +1723,6 @@ struct memcg_stock_pcp {
+ #define FLUSHING_CACHED_CHARGE	0
+ };
+ static DEFINE_PER_CPU(struct memcg_stock_pcp, memcg_stock);
+-static DEFINE_LOCAL_IRQ_LOCK(memcg_stock_ll);
+ static DEFINE_MUTEX(percpu_charge_mutex);
+ 
+ /**
+@@ -1746,7 +1745,7 @@ static bool consume_stock(struct mem_cgr
+ 	if (nr_pages > CHARGE_BATCH)
+ 		return ret;
+ 
+-	local_lock_irqsave(memcg_stock_ll, flags);
++	local_irq_save(flags);
+ 
+ 	stock = this_cpu_ptr(&memcg_stock);
+ 	if (memcg == stock->cached && stock->nr_pages >= nr_pages) {
+@@ -1754,7 +1753,7 @@ static bool consume_stock(struct mem_cgr
+ 		ret = true;
+ 	}
+ 
+-	local_unlock_irqrestore(memcg_stock_ll, flags);
++	local_irq_restore(flags);
+ 
+ 	return ret;
+ }
+@@ -1785,13 +1784,13 @@ static void drain_local_stock(struct wor
+ 	 * The only protection from memory hotplug vs. drain_stock races is
+ 	 * that we always operate on local CPU stock here with IRQ disabled
+ 	 */
+-	local_lock_irqsave(memcg_stock_ll, flags);
++	local_irq_save(flags);
+ 
+ 	stock = this_cpu_ptr(&memcg_stock);
+ 	drain_stock(stock);
+ 	clear_bit(FLUSHING_CACHED_CHARGE, &stock->flags);
+ 
+-	local_unlock_irqrestore(memcg_stock_ll, flags);
++	local_irq_restore(flags);
+ }
+ 
+ /*
+@@ -1803,7 +1802,7 @@ static void refill_stock(struct mem_cgro
+ 	struct memcg_stock_pcp *stock;
+ 	unsigned long flags;
+ 
+-	local_lock_irqsave(memcg_stock_ll, flags);
++	local_irq_save(flags);
+ 
+ 	stock = this_cpu_ptr(&memcg_stock);
+ 	if (stock->cached != memcg) { /* reset if necessary */
+@@ -1815,7 +1814,7 @@ static void refill_stock(struct mem_cgro
+ 	if (stock->nr_pages > CHARGE_BATCH)
+ 		drain_stock(stock);
+ 
+-	local_unlock_irqrestore(memcg_stock_ll, flags);
++	local_irq_restore(flags);
+ }
+ 
+ /*
diff --git a/kernel/patches-4.14.x-rt/0379-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch b/kernel/patches-4.14.x-rt/0379-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch
new file mode 100644
index 000000000..821fb08d6
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0379-cpuset-Convert-callback_lock-to-raw_spinlock_t.patch
@@ -0,0 +1,286 @@
+From: Mike Galbraith <efault@gmx.de>
+Date: Sun, 8 Jan 2017 09:32:25 +0100
+Subject: [PATCH] cpuset: Convert callback_lock to raw_spinlock_t
+
+The two commits below add up to a cpuset might_sleep() splat for RT:
+
+8447a0fee974 cpuset: convert callback_mutex to a spinlock
+344736f29b35 cpuset: simplify cpuset_node_allowed API
+
+BUG: sleeping function called from invalid context at kernel/locking/rtmutex.c:995
+in_atomic(): 0, irqs_disabled(): 1, pid: 11718, name: cset
+CPU: 135 PID: 11718 Comm: cset Tainted: G            E   4.10.0-rt1-rt #4
+Hardware name: Intel Corporation BRICKLAND/BRICKLAND, BIOS BRHSXSD1.86B.0056.R01.1409242327 09/24/2014
+Call Trace:
+ ? dump_stack+0x5c/0x81
+ ? ___might_sleep+0xf4/0x170
+ ? rt_spin_lock+0x1c/0x50
+ ? __cpuset_node_allowed+0x66/0xc0
+ ? ___slab_alloc+0x390/0x570 <disables IRQs>
+ ? anon_vma_fork+0x8f/0x140
+ ? copy_page_range+0x6cf/0xb00
+ ? anon_vma_fork+0x8f/0x140
+ ? __slab_alloc.isra.74+0x5a/0x81
+ ? anon_vma_fork+0x8f/0x140
+ ? kmem_cache_alloc+0x1b5/0x1f0
+ ? anon_vma_fork+0x8f/0x140
+ ? copy_process.part.35+0x1670/0x1ee0
+ ? _do_fork+0xdd/0x3f0
+ ? _do_fork+0xdd/0x3f0
+ ? do_syscall_64+0x61/0x170
+ ? entry_SYSCALL64_slow_path+0x25/0x25
+
+The later ensured that a NUMA box WILL take callback_lock in atomic
+context by removing the allocator and reclaim path __GFP_HARDWALL
+usage which prevented such contexts from taking callback_mutex.
+
+One option would be to reinstate __GFP_HARDWALL protections for
+RT, however, as the 8447a0fee974 changelog states:
+
+The callback_mutex is only used to synchronize reads/updates of cpusets'
+flags and cpu/node masks. These operations should always proceed fast so
+there's no reason why we can't use a spinlock instead of the mutex.
+
+Cc: stable-rt@vger.kernel.org
+Signed-off-by: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/cgroup/cpuset.c |   66 ++++++++++++++++++++++++-------------------------
+ 1 file changed, 33 insertions(+), 33 deletions(-)
+
+--- a/kernel/cgroup/cpuset.c
++++ b/kernel/cgroup/cpuset.c
+@@ -288,7 +288,7 @@ static struct cpuset top_cpuset = {
+  */
+ 
+ static DEFINE_MUTEX(cpuset_mutex);
+-static DEFINE_SPINLOCK(callback_lock);
++static DEFINE_RAW_SPINLOCK(callback_lock);
+ 
+ static struct workqueue_struct *cpuset_migrate_mm_wq;
+ 
+@@ -926,9 +926,9 @@ static void update_cpumasks_hier(struct
+ 			continue;
+ 		rcu_read_unlock();
+ 
+-		spin_lock_irq(&callback_lock);
++		raw_spin_lock_irq(&callback_lock);
+ 		cpumask_copy(cp->effective_cpus, new_cpus);
+-		spin_unlock_irq(&callback_lock);
++		raw_spin_unlock_irq(&callback_lock);
+ 
+ 		WARN_ON(!is_in_v2_mode() &&
+ 			!cpumask_equal(cp->cpus_allowed, cp->effective_cpus));
+@@ -993,9 +993,9 @@ static int update_cpumask(struct cpuset
+ 	if (retval < 0)
+ 		return retval;
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	cpumask_copy(cs->cpus_allowed, trialcs->cpus_allowed);
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 
+ 	/* use trialcs->cpus_allowed as a temp variable */
+ 	update_cpumasks_hier(cs, trialcs->cpus_allowed);
+@@ -1179,9 +1179,9 @@ static void update_nodemasks_hier(struct
+ 			continue;
+ 		rcu_read_unlock();
+ 
+-		spin_lock_irq(&callback_lock);
++		raw_spin_lock_irq(&callback_lock);
+ 		cp->effective_mems = *new_mems;
+-		spin_unlock_irq(&callback_lock);
++		raw_spin_unlock_irq(&callback_lock);
+ 
+ 		WARN_ON(!is_in_v2_mode() &&
+ 			!nodes_equal(cp->mems_allowed, cp->effective_mems));
+@@ -1249,9 +1249,9 @@ static int update_nodemask(struct cpuset
+ 	if (retval < 0)
+ 		goto done;
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	cs->mems_allowed = trialcs->mems_allowed;
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 
+ 	/* use trialcs->mems_allowed as a temp variable */
+ 	update_nodemasks_hier(cs, &trialcs->mems_allowed);
+@@ -1342,9 +1342,9 @@ static int update_flag(cpuset_flagbits_t
+ 	spread_flag_changed = ((is_spread_slab(cs) != is_spread_slab(trialcs))
+ 			|| (is_spread_page(cs) != is_spread_page(trialcs)));
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	cs->flags = trialcs->flags;
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 
+ 	if (!cpumask_empty(trialcs->cpus_allowed) && balance_flag_changed)
+ 		rebuild_sched_domains_locked();
+@@ -1759,7 +1759,7 @@ static int cpuset_common_seq_show(struct
+ 	cpuset_filetype_t type = seq_cft(sf)->private;
+ 	int ret = 0;
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 
+ 	switch (type) {
+ 	case FILE_CPULIST:
+@@ -1778,7 +1778,7 @@ static int cpuset_common_seq_show(struct
+ 		ret = -EINVAL;
+ 	}
+ 
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 	return ret;
+ }
+ 
+@@ -1993,12 +1993,12 @@ static int cpuset_css_online(struct cgro
+ 
+ 	cpuset_inc();
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	if (is_in_v2_mode()) {
+ 		cpumask_copy(cs->effective_cpus, parent->effective_cpus);
+ 		cs->effective_mems = parent->effective_mems;
+ 	}
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 
+ 	if (!test_bit(CGRP_CPUSET_CLONE_CHILDREN, &css->cgroup->flags))
+ 		goto out_unlock;
+@@ -2025,12 +2025,12 @@ static int cpuset_css_online(struct cgro
+ 	}
+ 	rcu_read_unlock();
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	cs->mems_allowed = parent->mems_allowed;
+ 	cs->effective_mems = parent->mems_allowed;
+ 	cpumask_copy(cs->cpus_allowed, parent->cpus_allowed);
+ 	cpumask_copy(cs->effective_cpus, parent->cpus_allowed);
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ out_unlock:
+ 	mutex_unlock(&cpuset_mutex);
+ 	return 0;
+@@ -2069,7 +2069,7 @@ static void cpuset_css_free(struct cgrou
+ static void cpuset_bind(struct cgroup_subsys_state *root_css)
+ {
+ 	mutex_lock(&cpuset_mutex);
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 
+ 	if (is_in_v2_mode()) {
+ 		cpumask_copy(top_cpuset.cpus_allowed, cpu_possible_mask);
+@@ -2080,7 +2080,7 @@ static void cpuset_bind(struct cgroup_su
+ 		top_cpuset.mems_allowed = top_cpuset.effective_mems;
+ 	}
+ 
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 	mutex_unlock(&cpuset_mutex);
+ }
+ 
+@@ -2178,12 +2178,12 @@ hotplug_update_tasks_legacy(struct cpuse
+ {
+ 	bool is_empty;
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	cpumask_copy(cs->cpus_allowed, new_cpus);
+ 	cpumask_copy(cs->effective_cpus, new_cpus);
+ 	cs->mems_allowed = *new_mems;
+ 	cs->effective_mems = *new_mems;
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 
+ 	/*
+ 	 * Don't call update_tasks_cpumask() if the cpuset becomes empty,
+@@ -2220,10 +2220,10 @@ hotplug_update_tasks(struct cpuset *cs,
+ 	if (nodes_empty(*new_mems))
+ 		*new_mems = parent_cs(cs)->effective_mems;
+ 
+-	spin_lock_irq(&callback_lock);
++	raw_spin_lock_irq(&callback_lock);
+ 	cpumask_copy(cs->effective_cpus, new_cpus);
+ 	cs->effective_mems = *new_mems;
+-	spin_unlock_irq(&callback_lock);
++	raw_spin_unlock_irq(&callback_lock);
+ 
+ 	if (cpus_updated)
+ 		update_tasks_cpumask(cs);
+@@ -2316,21 +2316,21 @@ static void cpuset_hotplug_workfn(struct
+ 
+ 	/* synchronize cpus_allowed to cpu_active_mask */
+ 	if (cpus_updated) {
+-		spin_lock_irq(&callback_lock);
++		raw_spin_lock_irq(&callback_lock);
+ 		if (!on_dfl)
+ 			cpumask_copy(top_cpuset.cpus_allowed, &new_cpus);
+ 		cpumask_copy(top_cpuset.effective_cpus, &new_cpus);
+-		spin_unlock_irq(&callback_lock);
++		raw_spin_unlock_irq(&callback_lock);
+ 		/* we don't mess with cpumasks of tasks in top_cpuset */
+ 	}
+ 
+ 	/* synchronize mems_allowed to N_MEMORY */
+ 	if (mems_updated) {
+-		spin_lock_irq(&callback_lock);
++		raw_spin_lock_irq(&callback_lock);
+ 		if (!on_dfl)
+ 			top_cpuset.mems_allowed = new_mems;
+ 		top_cpuset.effective_mems = new_mems;
+-		spin_unlock_irq(&callback_lock);
++		raw_spin_unlock_irq(&callback_lock);
+ 		update_tasks_nodemask(&top_cpuset);
+ 	}
+ 
+@@ -2429,11 +2429,11 @@ void cpuset_cpus_allowed(struct task_str
+ {
+ 	unsigned long flags;
+ 
+-	spin_lock_irqsave(&callback_lock, flags);
++	raw_spin_lock_irqsave(&callback_lock, flags);
+ 	rcu_read_lock();
+ 	guarantee_online_cpus(task_cs(tsk), pmask);
+ 	rcu_read_unlock();
+-	spin_unlock_irqrestore(&callback_lock, flags);
++	raw_spin_unlock_irqrestore(&callback_lock, flags);
+ }
+ 
+ void cpuset_cpus_allowed_fallback(struct task_struct *tsk)
+@@ -2481,11 +2481,11 @@ nodemask_t cpuset_mems_allowed(struct ta
+ 	nodemask_t mask;
+ 	unsigned long flags;
+ 
+-	spin_lock_irqsave(&callback_lock, flags);
++	raw_spin_lock_irqsave(&callback_lock, flags);
+ 	rcu_read_lock();
+ 	guarantee_online_mems(task_cs(tsk), &mask);
+ 	rcu_read_unlock();
+-	spin_unlock_irqrestore(&callback_lock, flags);
++	raw_spin_unlock_irqrestore(&callback_lock, flags);
+ 
+ 	return mask;
+ }
+@@ -2577,14 +2577,14 @@ bool __cpuset_node_allowed(int node, gfp
+ 		return true;
+ 
+ 	/* Not hardwall and node outside mems_allowed: scan up cpusets */
+-	spin_lock_irqsave(&callback_lock, flags);
++	raw_spin_lock_irqsave(&callback_lock, flags);
+ 
+ 	rcu_read_lock();
+ 	cs = nearest_hardwall_ancestor(task_cs(current));
+ 	allowed = node_isset(node, cs->mems_allowed);
+ 	rcu_read_unlock();
+ 
+-	spin_unlock_irqrestore(&callback_lock, flags);
++	raw_spin_unlock_irqrestore(&callback_lock, flags);
+ 	return allowed;
+ }
+ 
diff --git a/kernel/patches-4.14.x-rt/0380-move_sched_delayed_work_to_helper.patch b/kernel/patches-4.14.x-rt/0380-move_sched_delayed_work_to_helper.patch
new file mode 100644
index 000000000..29b2b852e
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0380-move_sched_delayed_work_to_helper.patch
@@ -0,0 +1,72 @@
+Date: Wed, 26 Jun 2013 15:28:11 -0400
+From: Steven Rostedt <rostedt@goodmis.org>
+Subject: rt,ntp: Move call to schedule_delayed_work() to helper thread
+
+The ntp code for notify_cmos_timer() is called from a hard interrupt
+context. schedule_delayed_work() under PREEMPT_RT_FULL calls spinlocks
+that have been converted to mutexes, thus calling schedule_delayed_work()
+from interrupt is not safe.
+
+Add a helper thread that does the call to schedule_delayed_work and wake
+up that thread instead of calling schedule_delayed_work() directly.
+This is only for CONFIG_PREEMPT_RT_FULL, otherwise the code still calls
+schedule_delayed_work() directly in irq context.
+
+Note: There's a few places in the kernel that do this. Perhaps the RT
+code should have a dedicated thread that does the checks. Just register
+a notifier on boot up for your check and wake up the thread when
+needed. This will be a todo.
+
+Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
+[bigeasy: use swork_queue() instead a helper thread]
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ kernel/time/ntp.c |   26 ++++++++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+--- a/kernel/time/ntp.c
++++ b/kernel/time/ntp.c
+@@ -18,6 +18,7 @@
+ #include <linux/module.h>
+ #include <linux/rtc.h>
+ #include <linux/math64.h>
++#include <linux/swork.h>
+ 
+ #include "ntp_internal.h"
+ #include "timekeeping_internal.h"
+@@ -569,10 +570,35 @@ static void sync_cmos_clock(struct work_
+ 			   &sync_cmos_work, timespec64_to_jiffies(&next));
+ }
+ 
++#ifdef CONFIG_PREEMPT_RT_FULL
++
++static void run_clock_set_delay(struct swork_event *event)
++{
++	queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
++}
++
++static struct swork_event ntp_cmos_swork;
++
++void ntp_notify_cmos_timer(void)
++{
++	swork_queue(&ntp_cmos_swork);
++}
++
++static __init int create_cmos_delay_thread(void)
++{
++	WARN_ON(swork_get());
++	INIT_SWORK(&ntp_cmos_swork, run_clock_set_delay);
++	return 0;
++}
++early_initcall(create_cmos_delay_thread);
++
++#else
++
+ void ntp_notify_cmos_timer(void)
+ {
+ 	queue_delayed_work(system_power_efficient_wq, &sync_cmos_work, 0);
+ }
++#endif /* CONFIG_PREEMPT_RT_FULL */
+ 
+ #else
+ void ntp_notify_cmos_timer(void) { }
diff --git a/kernel/patches-4.14.x-rt/0381-md-disable-bcache.patch b/kernel/patches-4.14.x-rt/0381-md-disable-bcache.patch
new file mode 100644
index 000000000..fdfe59336
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0381-md-disable-bcache.patch
@@ -0,0 +1,31 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Thu, 29 Aug 2013 11:48:57 +0200
+Subject: md: disable bcache
+
+It uses anon semaphores
+|drivers/md/bcache/request.c: In function ‘cached_dev_write_complete’:
+|drivers/md/bcache/request.c:1007:2: error: implicit declaration of function ‘up_read_non_owner’ [-Werror=implicit-function-declaration]
+|  up_read_non_owner(&dc->writeback_lock);
+|  ^
+|drivers/md/bcache/request.c: In function ‘request_write’:
+|drivers/md/bcache/request.c:1033:2: error: implicit declaration of function ‘down_read_non_owner’ [-Werror=implicit-function-declaration]
+|  down_read_non_owner(&dc->writeback_lock);
+|  ^
+
+either we get rid of those or we have to introduce them…
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ drivers/md/bcache/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/md/bcache/Kconfig
++++ b/drivers/md/bcache/Kconfig
+@@ -1,6 +1,7 @@
+ 
+ config BCACHE
+ 	tristate "Block device as cache"
++	depends on !PREEMPT_RT_FULL
+ 	---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 --git a/kernel/patches-4.14.x-rt/0382-apparmor-use-a-locallock-instead-preempt_disable.patch b/kernel/patches-4.14.x-rt/0382-apparmor-use-a-locallock-instead-preempt_disable.patch
new file mode 100644
index 000000000..b3d8f2cca
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0382-apparmor-use-a-locallock-instead-preempt_disable.patch
@@ -0,0 +1,83 @@
+From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+Date: Wed, 11 Oct 2017 17:43:49 +0200
+Subject: apparmor: use a locallock instead preempt_disable()
+
+get_buffers() disables preemption which acts as a lock for the per-CPU
+variable. Since we can't disable preemption here on RT, a local_lock is
+lock is used in order to remain on the same CPU and not to have more
+than one user within the critical section.
+
+Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
+---
+ security/apparmor/include/path.h |   21 +++++++++++++++++----
+ security/apparmor/lsm.c          |    2 +-
+ 2 files changed, 18 insertions(+), 5 deletions(-)
+
+--- a/security/apparmor/include/path.h
++++ b/security/apparmor/include/path.h
+@@ -39,9 +39,10 @@ struct aa_buffers {
+ };
+ 
+ #include <linux/percpu.h>
+-#include <linux/preempt.h>
++#include <linux/locallock.h>
+ 
+ DECLARE_PER_CPU(struct aa_buffers, aa_buffers);
++DECLARE_LOCAL_IRQ_LOCK(aa_buffers_lock);
+ 
+ #define COUNT_ARGS(X...) COUNT_ARGS_HELPER(, ##X, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0)
+ #define COUNT_ARGS_HELPER(_0, _1, _2, _3, _4, _5, _6, _7, _8, _9, n, X...) n
+@@ -55,12 +56,24 @@ DECLARE_PER_CPU(struct aa_buffers, aa_bu
+ 
+ #define for_each_cpu_buffer(I) for ((I) = 0; (I) < MAX_PATH_BUFFERS; (I)++)
+ 
+-#ifdef CONFIG_DEBUG_PREEMPT
++#ifdef CONFIG_PREEMPT_RT_BASE
++
++static inline void AA_BUG_PREEMPT_ENABLED(const char *s)
++{
++	struct local_irq_lock *lv;
++
++	lv = this_cpu_ptr(&aa_buffers_lock);
++	WARN_ONCE(lv->owner != current,
++		  "__get_buffer without aa_buffers_lock\n");
++}
++
++#elif defined(CONFIG_DEBUG_PREEMPT)
+ #define AA_BUG_PREEMPT_ENABLED(X) AA_BUG(preempt_count() <= 0, X)
+ #else
+ #define AA_BUG_PREEMPT_ENABLED(X) /* nop */
+ #endif
+ 
++
+ #define __get_buffer(N) ({					\
+ 	struct aa_buffers *__cpu_var; \
+ 	AA_BUG_PREEMPT_ENABLED("__get_buffer without preempt disabled");  \
+@@ -73,14 +86,14 @@ DECLARE_PER_CPU(struct aa_buffers, aa_bu
+ 
+ #define get_buffers(X...)	\
+ do {				\
+-	preempt_disable();	\
++	local_lock(aa_buffers_lock);	\
+ 	__get_buffers(X);	\
+ } while (0)
+ 
+ #define put_buffers(X, Y...)	\
+ do {				\
+ 	__put_buffers(X, Y);	\
+-	preempt_enable();	\
++	local_unlock(aa_buffers_lock);	\
+ } while (0)
+ 
+ #endif /* __AA_PATH_H */
+--- a/security/apparmor/lsm.c
++++ b/security/apparmor/lsm.c
+@@ -44,7 +44,7 @@
+ int apparmor_initialized;
+ 
+ DEFINE_PER_CPU(struct aa_buffers, aa_buffers);
+-
++DEFINE_LOCAL_IRQ_LOCK(aa_buffers_lock);
+ 
+ /*
+  * LSM hook functions
diff --git a/kernel/patches-4.14.x-rt/0383-workqueue-prevent-deadlock-stall.patch b/kernel/patches-4.14.x-rt/0383-workqueue-prevent-deadlock-stall.patch
new file mode 100644
index 000000000..2553ec792
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0383-workqueue-prevent-deadlock-stall.patch
@@ -0,0 +1,200 @@
+Subject: workqueue: Prevent deadlock/stall on RT
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 27 Jun 2014 16:24:52 +0200 (CEST)
+
+Austin reported a XFS deadlock/stall on RT where scheduled work gets
+never exececuted and tasks are waiting for each other for ever.
+
+The underlying problem is the modification of the RT code to the
+handling of workers which are about to go to sleep. In mainline a
+worker thread which goes to sleep wakes an idle worker if there is
+more work to do. This happens from the guts of the schedule()
+function. On RT this must be outside and the accessed data structures
+are not protected against scheduling due to the spinlock to rtmutex
+conversion. So the naive solution to this was to move the code outside
+of the scheduler and protect the data structures by the pool
+lock. That approach turned out to be a little naive as we cannot call
+into that code when the thread blocks on a lock, as it is not allowed
+to block on two locks in parallel. So we dont call into the worker
+wakeup magic when the worker is blocked on a lock, which causes the
+deadlock/stall observed by Austin and Mike.
+
+Looking deeper into that worker code it turns out that the only
+relevant data structure which needs to be protected is the list of
+idle workers which can be woken up.
+
+So the solution is to protect the list manipulation operations with
+preempt_enable/disable pairs on RT and call unconditionally into the
+worker code even when the worker is blocked on a lock. The preemption
+protection is safe as there is nothing which can fiddle with the list
+outside of thread context.
+
+Reported-and_tested-by: Austin Schuh <austin@peloton-tech.com>
+Reported-and_tested-by: Mike Galbraith <umgwanakikbuti@gmail.com>
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Link: http://vger.kernel.org/r/alpine.DEB.2.10.1406271249510.5170@nanos
+Cc: Richard Weinberger <richard.weinberger@gmail.com>
+Cc: Steven Rostedt <rostedt@goodmis.org>
+
+---
+ kernel/sched/core.c |    7 ++++--
+ kernel/workqueue.c  |   60 ++++++++++++++++++++++++++++++++++++++++------------
+ 2 files changed, 52 insertions(+), 15 deletions(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -3474,9 +3474,8 @@ void __noreturn do_task_dead(void)
+ 
+ static inline void sched_submit_work(struct task_struct *tsk)
+ {
+-	if (!tsk->state || tsk_is_pi_blocked(tsk))
++	if (!tsk->state)
+ 		return;
+-
+ 	/*
+ 	 * If a worker went to sleep, notify and ask workqueue whether
+ 	 * it wants to wake up a task to maintain concurrency.
+@@ -3484,6 +3483,10 @@ static inline void sched_submit_work(str
+ 	if (tsk->flags & PF_WQ_WORKER)
+ 		wq_worker_sleeping(tsk);
+ 
++
++	if (tsk_is_pi_blocked(tsk))
++		return;
++
+ 	/*
+ 	 * If we are going to sleep and we have plugged IO queued,
+ 	 * make sure to submit it to avoid deadlocks.
+--- a/kernel/workqueue.c
++++ b/kernel/workqueue.c
+@@ -125,6 +125,11 @@ enum {
+  *    cpu or grabbing pool->lock is enough for read access.  If
+  *    POOL_DISASSOCIATED is set, it's identical to L.
+  *
++ *    On RT we need the extra protection via rt_lock_idle_list() for
++ *    the list manipulations against read access from
++ *    wq_worker_sleeping(). All other places are nicely serialized via
++ *    pool->lock.
++ *
+  * A: pool->attach_mutex protected.
+  *
+  * PL: wq_pool_mutex protected.
+@@ -432,6 +437,31 @@ static void workqueue_sysfs_unregister(s
+ 		if (({ assert_rcu_or_wq_mutex(wq); false; })) { }	\
+ 		else
+ 
++#ifdef CONFIG_PREEMPT_RT_BASE
++static inline void rt_lock_idle_list(struct worker_pool *pool)
++{
++	preempt_disable();
++}
++static inline void rt_unlock_idle_list(struct worker_pool *pool)
++{
++	preempt_enable();
++}
++static inline void sched_lock_idle_list(struct worker_pool *pool) { }
++static inline void sched_unlock_idle_list(struct worker_pool *pool) { }
++#else
++static inline void rt_lock_idle_list(struct worker_pool *pool) { }
++static inline void rt_unlock_idle_list(struct worker_pool *pool) { }
++static inline void sched_lock_idle_list(struct worker_pool *pool)
++{
++	spin_lock_irq(&pool->lock);
++}
++static inline void sched_unlock_idle_list(struct worker_pool *pool)
++{
++	spin_unlock_irq(&pool->lock);
++}
++#endif
++
++
+ #ifdef CONFIG_DEBUG_OBJECTS_WORK
+ 
+ static struct debug_obj_descr work_debug_descr;
+@@ -838,10 +868,16 @@ static struct worker *first_idle_worker(
+  */
+ static void wake_up_worker(struct worker_pool *pool)
+ {
+-	struct worker *worker = first_idle_worker(pool);
++	struct worker *worker;
++
++	rt_lock_idle_list(pool);
++
++	worker = first_idle_worker(pool);
+ 
+ 	if (likely(worker))
+ 		wake_up_process(worker->task);
++
++	rt_unlock_idle_list(pool);
+ }
+ 
+ /**
+@@ -870,7 +906,7 @@ void wq_worker_running(struct task_struc
+  */
+ void wq_worker_sleeping(struct task_struct *task)
+ {
+-	struct worker *next, *worker = kthread_data(task);
++	struct worker *worker = kthread_data(task);
+ 	struct worker_pool *pool;
+ 
+ 	/*
+@@ -887,26 +923,18 @@ void wq_worker_sleeping(struct task_stru
+ 		return;
+ 
+ 	worker->sleeping = 1;
+-	spin_lock_irq(&pool->lock);
+ 
+ 	/*
+ 	 * The counterpart of the following dec_and_test, implied mb,
+ 	 * worklist not empty test sequence is in insert_work().
+ 	 * Please read comment there.
+-	 *
+-	 * NOT_RUNNING is clear.  This means that we're bound to and
+-	 * running on the local cpu w/ rq lock held and preemption
+-	 * disabled, which in turn means that none else could be
+-	 * manipulating idle_list, so dereferencing idle_list without pool
+-	 * lock is safe.
+ 	 */
+ 	if (atomic_dec_and_test(&pool->nr_running) &&
+ 	    !list_empty(&pool->worklist)) {
+-		next = first_idle_worker(pool);
+-		if (next)
+-			wake_up_process(next->task);
++		sched_lock_idle_list(pool);
++		wake_up_worker(pool);
++		sched_unlock_idle_list(pool);
+ 	}
+-	spin_unlock_irq(&pool->lock);
+ }
+ 
+ /**
+@@ -1637,7 +1665,9 @@ static void worker_enter_idle(struct wor
+ 	worker->last_active = jiffies;
+ 
+ 	/* idle_list is LIFO */
++	rt_lock_idle_list(pool);
+ 	list_add(&worker->entry, &pool->idle_list);
++	rt_unlock_idle_list(pool);
+ 
+ 	if (too_many_workers(pool) && !timer_pending(&pool->idle_timer))
+ 		mod_timer(&pool->idle_timer, jiffies + IDLE_WORKER_TIMEOUT);
+@@ -1670,7 +1700,9 @@ static void worker_leave_idle(struct wor
+ 		return;
+ 	worker_clr_flags(worker, WORKER_IDLE);
+ 	pool->nr_idle--;
++	rt_lock_idle_list(pool);
+ 	list_del_init(&worker->entry);
++	rt_unlock_idle_list(pool);
+ }
+ 
+ static struct worker *alloc_worker(int node)
+@@ -1836,7 +1868,9 @@ static void destroy_worker(struct worker
+ 	pool->nr_workers--;
+ 	pool->nr_idle--;
+ 
++	rt_lock_idle_list(pool);
+ 	list_del_init(&worker->entry);
++	rt_unlock_idle_list(pool);
+ 	worker->flags |= WORKER_DIE;
+ 	wake_up_process(worker->task);
+ }
diff --git a/kernel/patches-4.14.x-rt/0384-localversion.patch b/kernel/patches-4.14.x-rt/0384-localversion.patch
new file mode 100644
index 000000000..340816c8f
--- /dev/null
+++ b/kernel/patches-4.14.x-rt/0384-localversion.patch
@@ -0,0 +1,13 @@
+Subject: Add localversion for -RT release
+From: Thomas Gleixner <tglx@linutronix.de>
+Date: Fri, 08 Jul 2011 20:25:16 +0200
+
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+---
+ localversion-rt |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- /dev/null
++++ b/localversion-rt
+@@ -0,0 +1 @@
++-rt15