starlingx
/
integ
Code Issues Proposed changes

Kernel Upgrades for Meltdown and Spectre 

The kernel is moved ahead to version 3.10.0-693.21.1.el7

To summarize:

CVE-2017-5753 [bounds check bypass] aka 'Spectre Variant 1'
This is fixed by load fences and is "baked in" and cannot
be turned off.

CVE-2017-5715 [branch target injection] aka 'Spectre Variant 2'
This is fixed by a combination of retpolines and IBPB, or
IBRS+IBPB if on skylake.  This requires a microcode change in
the processors.  This feature, if on, has a significant performance
impact.  It is assumed on unless turned off via the
"nospectre_v2" bootarg.

CVE-2017-5754 [rogue data cache load] aka 'Meltdown' aka 'Variant 3'
This is fixed by page table isolation using the Kaiser patches.
This feature is assumed on unless turned off via the
"nopti" bootarg.

As of the commit date, we have changed the installer kickstarts
to issue both "nopti nospectre_v2" bootargs to minimize realtime
impacts by default.  The customer will be able to optionally
sacrifice performance for extra security at datafill time.

Change-Id: Id7c99923f2ee2ee91f77c7bd9940e684eff8b476
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
This commit is contained in:
Jim Somerville 2018-04-19 11:29:03 -04:00 committed by jmckenna
parent 6627ae2815
commit 50a9ff6df4
141 changed files with 1063 additions and 1357 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kernel-rt/centos/meta_patches/Add-patch-for-missing-ifdef-in-tracing.patch
View File

@ -1,10 +1,10 @@
From 6f763c9f49dbb0089159939911fb6e396b14e6eb Mon Sep 17 00:00:00 2001
Message-Id: <6f763c9f49dbb0089159939911fb6e396b14e6eb.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 150f8b1411b5eea482dab47550bca5729366252d Mon Sep 17 00:00:00 2001
Message-Id: <150f8b1411b5eea482dab47550bca5729366252d.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 14/29] Add patch for missing ifdef in tracing
Subject: [PATCH 14/39] Add patch for missing ifdef in tracing
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index d11d8fe..fd9ed82 100644
index e6b1d13..8ee6191 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -407,6 +407,7 @@ Patch1009: memblock-introduce-memblock_alloc_range.patch
@@ -404,6 +404,7 @@ Patch1009: memblock-introduce-memblock_alloc_range.patch
Patch1010: Notification-of-death-of-arbitrary-processes.patch
Patch1011: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
Patch1012: x86-enable-DMA-CMA-with-swiotlb.patch
@ -23,7 +23,7 @@ index d11d8fe..fd9ed82 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -775,6 +776,7 @@ ApplyPatch memblock-introduce-memblock_alloc_range.patch
@@ -769,6 +770,7 @@ ApplyPatch memblock-introduce-memblock_alloc_range.patch
ApplyPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
ApplyPatch Notification-of-death-of-arbitrary-processes.patch
ApplyPatch x86-enable-DMA-CMA-with-swiotlb.patch

14
kernel-rt/centos/meta_patches/CVE-mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
View File

@ -1,8 +1,10 @@
From 7aea53f8899c77d59c5022334c64e785f32af406 Mon Sep 17 00:00:00 2001
Message-Id: <7aea53f8899c77d59c5022334c64e785f32af406.1517518486.git.Jim.Somerville@windriver.com>
From 6a43de01e24750eb507e84f630dcafc7f84722c5 Mon Sep 17 00:00:00 2001
Message-Id: <6a43de01e24750eb507e84f630dcafc7f84722c5.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 19 Dec 2017 17:53:28 -0500
Subject: [PATCH 1/1] CVE mqueue fix a use after free in sys_mq_notify
Subject: [PATCH 36/39] CVE mqueue fix a use after free in sys_mq_notify
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 30a7e08..a56e051 100644
index f45d2a9..c7816a6 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -423,6 +423,8 @@ Patch1028: timer-Minimize-nohz-off-overhead.patch
@@ -425,6 +425,8 @@ Patch1028: timer-Minimize-nohz-off-overhead.patch
Patch1029: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
Patch1030: dpt_i2o-fix-build-warning.patch
Patch1031: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
@ -22,7 +24,7 @@ index 30a7e08..a56e051 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -817,6 +819,7 @@ ApplyPatch timer-Minimize-nohz-off-overhead.patch
@@ -819,6 +821,7 @@ ApplyPatch timer-Minimize-nohz-off-overhead.patch
ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
ApplyPatch dpt_i2o-fix-build-warning.patch
ApplyPatch KVM-x86-Fix-potential-preemption-when-get-the-curren.patch

10
kernel-rt/centos/meta_patches/Change-name-of-source-tarball-drop-el7.patch
View File

@ -1,8 +1,10 @@
From 473c53bbcbf2fc491f32484733e2d459a8730ab0 Mon Sep 17 00:00:00 2001
Message-Id: <473c53bbcbf2fc491f32484733e2d459a8730ab0.1507921416.git.Jim.Somerville@windriver.com>
From 08f814bf1968a6e628efc0aae3f26e59114d95dc Mon Sep 17 00:00:00 2001
Message-Id: <08f814bf1968a6e628efc0aae3f26e59114d95dc.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 13 Oct 2017 14:59:37 -0400
Subject: [PATCH 1/1] Change name of source tarball drop el7
Subject: [PATCH 31/39] Change name of source tarball drop el7
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index ae044c2..cbeb4cd 100644
index 14120ce..4f78990 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -334,7 +334,7 @@ BuildRequires: rpm-build >= 4.9.0-1, elfutils >= 0.153-1

16
kernel-rt/centos/meta_patches/Check-for-oversized-nfs-arguments.patch
View File

@ -1,10 +1,10 @@
From 2771619e5d72c19e52d27ba949a81e4dff451e1a Mon Sep 17 00:00:00 2001
Message-Id: <2771619e5d72c19e52d27ba949a81e4dff451e1a.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 9d9940ac1708935397c6b6f088e0240032a1c068 Mon Sep 17 00:00:00 2001
Message-Id: <9d9940ac1708935397c6b6f088e0240032a1c068.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 22 Aug 2017 17:26:15 -0400
Subject: [PATCH 25/29] Check for oversized nfs arguments
Subject: [PATCH 25/39] Check for oversized nfs arguments
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index dc30da0..e53f906 100644
index a0f04ae..91899ab 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -426,6 +426,7 @@ Patch1028: stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
@@ -423,6 +423,7 @@ Patch1028: stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
Patch1029: add-per-cpu-pm-qos-resume-latency-consideration.patch
Patch1030: expose-pm_qos_resume_latency-for-cpus.patch
Patch1031: avoid-taking-spinlock-for-accessing-qos-values.patch
@ -23,7 +23,7 @@ index dc30da0..e53f906 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -820,6 +821,7 @@ ApplyPatch stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
@@ -814,6 +815,7 @@ ApplyPatch stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
ApplyPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
ApplyPatch expose-pm_qos_resume_latency-for-cpus.patch
ApplyPatch avoid-taking-spinlock-for-accessing-qos-values.patch

38
kernel-rt/centos/meta_patches/Cleanup-TIC-patch-list-for-CentOS-7.4-port.patch
View File

@ -1,29 +1,21 @@
From 6b5a0a906aa6e78b38d019847020a419987218e8 Mon Sep 17 00:00:00 2001
Message-Id: <6b5a0a906aa6e78b38d019847020a419987218e8.1507923089.git.Jim.Somerville@windriver.com>
From 75280ab1e25ea5503a78c8222ffd95b46a74220f Mon Sep 17 00:00:00 2001
Message-Id: <75280ab1e25ea5503a78c8222ffd95b46a74220f.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 13 Oct 2017 12:48:00 -0400
Subject: [PATCH 1/1] Cleanup TIC patch list for CentOS 7.4 port
Subject: [PATCH 30/39] Cleanup TIC patch list for CentOS 7.4 port
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 62 +++++++++++++++-------------------------------------
1 file changed, 18 insertions(+), 44 deletions(-)
SPECS/kernel-rt.spec | 56 +++++++++++++++++-----------------------------------
1 file changed, 18 insertions(+), 38 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 636a68e..ad92b9b 100644
index 0f021b5..14120ce 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -389,9 +389,6 @@ Source30002: kernel-3.10.0-x86_64-rt-trace.config.tis_extra
# Commit 32b3809 was reverted and the new solution will be applying
# those changes at the %build section of the specfile.
Patch001: avoid-debuginfo-hash-collision-scripts.patch
-Patch1000: debrand-single-cpu.patch
-Patch1001: debrand-rh_taint.patch
-Patch1002: debrand-rh-i686-cpu.patch
# Empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
@@ -414,26 +411,16 @@ Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
@@ -411,26 +411,16 @@ Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
Patch1016: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
Patch1017: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
Patch1018: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
@ -60,17 +52,7 @@ index 636a68e..ad92b9b 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -795,9 +782,6 @@ cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
cp %{SOURCE38} .
## Apply Patches here
-ApplyPatch debrand-single-cpu.patch
-ApplyPatch debrand-rh_taint.patch
-ApplyPatch debrand-rh-i686-cpu.patch
ApplyPatch linux-kernel-test.patch
ApplyPatch debrand-single-cpu.patch
ApplyPatch debrand-rh_taint.patch
@@ -818,26 +802,16 @@ ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
@@ -812,26 +802,16 @@ ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
ApplyPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
ApplyPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
ApplyPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch

45
kernel-rt/centos/meta_patches/Cleanup-patchlist-for-kernel-rt-3.10.0-693.21.1.rt56.patch Normal file
View File

@ -0,0 +1,45 @@
From 9aaaf78f46f8922429f17c19ef031b72c32afc25 Mon Sep 17 00:00:00 2001
Message-Id: <9aaaf78f46f8922429f17c19ef031b72c32afc25.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Wed, 4 Apr 2018 13:08:49 -0400
Subject: [PATCH 39/39] Cleanup patchlist for
kernel-rt-3.10.0-693.21.1.rt56.639.el7
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 9dae160..9b0ee1d 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -424,12 +424,9 @@ Patch1028: timer-Minimize-nohz-off-overhead.patch
# Fix compile warnings that break the build
Patch1029: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
Patch1030: dpt_i2o-fix-build-warning.patch
-Patch1031: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
-# CVE-2017-11176: kernel: Use-after-free in sys_mq_notify()
-Patch1032: mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
# DRBD was choking on write same
-Patch1033: turn-off-write-same-in-smartqpi-driver.patch
-Patch1034: restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
+Patch1031: turn-off-write-same-in-smartqpi-driver.patch
+Patch1032: restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -823,8 +820,6 @@ ApplyPatch timer-Reduce-timer-migration-overhead-if-disabled.patch
ApplyPatch timer-Minimize-nohz-off-overhead.patch
ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
ApplyPatch dpt_i2o-fix-build-warning.patch
-ApplyPatch KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
-ApplyPatch mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
ApplyPatch turn-off-write-same-in-smartqpi-driver.patch
ApplyPatch restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
--
1.8.3.1

12
kernel-rt/centos/meta_patches/Correct-the-source-tarball-name.patch
View File

@ -1,10 +1,10 @@
From 337cc13e27df929f2f6cd9dac68057ac08649534 Mon Sep 17 00:00:00 2001
Message-Id: <337cc13e27df929f2f6cd9dac68057ac08649534.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 3aa8e6b13a4417351c29df52562d227e0430ff9c Mon Sep 17 00:00:00 2001
Message-Id: <3aa8e6b13a4417351c29df52562d227e0430ff9c.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 11/29] Correct the source tarball name
Subject: [PATCH 11/39] Correct the source tarball name
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 7ab7c45..5d1308b 100644
index 2ee8fb3..4d5d58d 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -334,7 +334,7 @@ BuildRequires: rpm-build >= 4.9.0-1, elfutils >= 0.153-1

46
kernel-rt/centos/meta_patches/Disable-debug.patch
View File

@ -1,21 +1,21 @@
From 8ef6f25a8c785433a91cf4abd53a1e7f013598fc Mon Sep 17 00:00:00 2001
Message-Id: <8ef6f25a8c785433a91cf4abd53a1e7f013598fc.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 917c7805691bf980a3930fe503b891e5adab62fc Mon Sep 17 00:00:00 2001
Message-Id: <917c7805691bf980a3930fe503b891e5adab62fc.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 04/29] Disable debug
Subject: [PATCH 04/39] Disable debug
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 29 ++++++++++++++++++++++++++---
1 file changed, 26 insertions(+), 3 deletions(-)
SPECS/kernel-rt.spec | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index dd642c1..0964ca4 100644
index 9a8fb8c..b3126ce 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -31,13 +31,13 @@ Summary: The Linux Realtime kernel
@@ -29,13 +29,13 @@ Summary: The Linux Realtime kernel
# Likewise a bcond_with implies the variable is off by default (turned on by --with)
%bcond_without rt
%bcond_without doc
@ -32,7 +32,7 @@ index dd642c1..0964ca4 100644
# What parts do we want to build? We must build at least one kernel.
# These are the kernels that are built IF the architecture allows it.
@@ -410,6 +410,7 @@ Summary: Header files for the Linux kernel for use by glibc
@@ -407,6 +407,7 @@ Summary: Header files for the Linux kernel for use by glibc
Group: Development/System
Obsoletes: glibc-kernheaders < 3.0-46
Provides: glibc-kernheaders = 3.0-46
@ -40,7 +40,7 @@ index dd642c1..0964ca4 100644
%description headers
Kernel-headers includes the C header files that specify the interface
between the Linux kernel and userspace libraries and programs. The
@@ -469,6 +470,7 @@ AutoReq: no\
@@ -466,6 +467,7 @@ AutoReq: no\
This package provides KVM modules for package %{name}%{?1:-%{1}}.\
%{nil}
@ -48,7 +48,7 @@ index dd642c1..0964ca4 100644
#
# This macro creates a kernel-rt-<subpackage>-kvm-debuginfo package.
# %%kernel_kvm_debuginfo_package <subpackage>
@@ -484,7 +486,9 @@ This package provides debug information for package %{name}%{?1:-%{1}}.\
@@ -481,7 +483,9 @@ This package provides debug information for package %{name}%{?1:-%{1}}.\
This is required to use SystemTap with %{name}%{?1:%{1}}-%{KVERREL}.\
%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:\.%{1}}/.*|/.*%%{KVERREL}%{?1:\.%{1}}(\.debug)?' -o debuginfo%{?1}-kvm.list}\
%{nil}
@ -58,7 +58,7 @@ index dd642c1..0964ca4 100644
#
# This macro creates a kernel-<subpackage>-debuginfo package.
# %%kernel_debuginfo_package <subpackage>
@@ -501,6 +505,7 @@ This package provides debug information for package %{name}%{?1:-%{1}}.\
@@ -498,6 +502,7 @@ This package provides debug information for package %{name}%{?1:-%{1}}.\
This is required to use SystemTap with %{name}%{?1:%{1}}-%{KVERREL}.\
%{expand:%%global debuginfo_args %{?debuginfo_args} -p '/.*/%%{KVERREL}%{?1:\.%{1}}/.*|/.*%%{KVERREL}%{?1:\.%{1}}(\.debug)?' -o debuginfo%{?1}.list}\
%{nil}
@ -66,7 +66,7 @@ index dd642c1..0964ca4 100644
#
# This macro creates a kernel-<subpackage>-devel package.
@@ -514,6 +519,7 @@ Provides: installonlypkg(kernel-rt-devel) = %{version}-%{release}%{?1:.%{1}}\
@@ -511,6 +516,7 @@ Provides: installonlypkg(kernel-rt-devel) = %{version}-%{release}%{?1:.%{1}}\
Provides: kernel-rt%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
Provides: kernel-rt-devel-%{_target_cpu} = %{version}-%{release}%{?1:.%{1}}\
Provides: kernel-rt-devel-uname-r = %{KVERREL}%{?1:.%{1}}\
@ -74,7 +74,7 @@ index dd642c1..0964ca4 100644
AutoReqProv: no\
Requires(pre): /usr/bin/find\
%description -n kernel-rt%{?variant}%{?1:-%{1}}-devel\
@@ -526,6 +532,7 @@ against the %{?2:%{2} }kernel package.\
@@ -523,6 +529,7 @@ against the %{?2:%{2} }kernel package.\
# %%define variant_summary The Linux kernel compiled for <configuration>
# %%kernel_variant_package [-n <pretty-name>] <subpackage>
#
@ -82,7 +82,7 @@ index dd642c1..0964ca4 100644
%define kernel_variant_package(n:) \
%package %1\
Summary: %{variant_summary}\
@@ -536,15 +543,29 @@ Group: System Environment/Kernel\
@@ -533,15 +540,29 @@ Group: System Environment/Kernel\
%{expand:%%kernel_kvm_package %1}\
%{expand:%%kernel_kvm_debuginfo_package %1}\
%{nil}
@ -112,20 +112,6 @@ index dd642c1..0964ca4 100644
# Now, each variant package.
@@ -1425,11 +1446,13 @@ fi
/lib/modules/%{KVERREL}%{?2:.%{2}}/modules.kvm\
/lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/arch/x86/kvm\
/lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/drivers/gpu/drm/i915/gvt\
+%if %{builddebuginfo}\
%{expand:%%files %{?2:%{2}-}kvm-debuginfo}\
%dir %{debuginfodir}/lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/arch/x86/kvm\
%{debuginfodir}/lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/arch/x86/kvm\
%{debuginfodir}/lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/drivers/gpu/drm/i915/gvt\
%endif\
+%endif\
%{nil}
%kernel_variant_files %{buildrt}
--
1.8.3.1

16
kernel-rt/centos/meta_patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
View File

@ -1,10 +1,10 @@
From 229ce04fde143e5b0e22d89dba36e2ab5f7a0274 Mon Sep 17 00:00:00 2001
Message-Id: <229ce04fde143e5b0e22d89dba36e2ab5f7a0274.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 3906760786578347a8f66f885f77b974daaae759 Mon Sep 17 00:00:00 2001
Message-Id: <3906760786578347a8f66f885f77b974daaae759.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:13 -0400
Subject: [PATCH 17/29] Enable building kernel with CONFIG_BLK_DEV_NBD
Subject: [PATCH 17/39] Enable building kernel with CONFIG_BLK_DEV_NBD
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index a613703..d5216f4 100644
index b6141b0..d9ee5c6 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -409,6 +409,7 @@ Patch1011: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
@@ -406,6 +406,7 @@ Patch1011: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
Patch1012: x86-enable-DMA-CMA-with-swiotlb.patch
Patch1013: Add-missing-ifdef-around-max-latency-variable.patch
Patch1014: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
@ -23,7 +23,7 @@ index a613703..d5216f4 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -786,6 +787,7 @@ ApplyPatch Notification-of-death-of-arbitrary-processes.patch
@@ -780,6 +781,7 @@ ApplyPatch Notification-of-death-of-arbitrary-processes.patch
ApplyPatch x86-enable-DMA-CMA-with-swiotlb.patch
ApplyPatch Add-missing-ifdef-around-max-latency-variable.patch
ApplyPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch

16
kernel-rt/centos/meta_patches/Enable-symvers.patch
View File

@ -1,10 +1,10 @@
From 3423b1e7966868a7de8baa2ceedfa8b93f5420d5 Mon Sep 17 00:00:00 2001
Message-Id: <3423b1e7966868a7de8baa2ceedfa8b93f5420d5.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 0fdfc6bf9d3b66ddf17eec0d893a3b80d68b14cb Mon Sep 17 00:00:00 2001
Message-Id: <0fdfc6bf9d3b66ddf17eec0d893a3b80d68b14cb.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 06/29] Enable symvers
Subject: [PATCH 06/39] Enable symvers
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 10 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 0b91d79..c35efae 100644
index 8bf2efa..29d78fd 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -997,6 +997,15 @@ BuildKernel() {
@@ -991,6 +991,15 @@ BuildKernel() {
# copy Module.symvers
cp Module.symvers $RPM_BUILD_ROOT/$DevelDir
@ -31,7 +31,7 @@ index 0b91d79..c35efae 100644
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
}
@@ -1397,6 +1406,7 @@ fi
@@ -1394,6 +1403,7 @@ fi
/%{image_install_path}/%{?-k:%{-k*}}%{!?-k:vmlinuz}-%{KVERREL}%{?2:.%{2}}\
/%{image_install_path}/.vmlinuz-%{KVERREL}%{?2:.%{2}}.hmac\
/boot/System.map-%{KVERREL}%{?2:.%{2}}\

20
kernel-rt/centos/meta_patches/Exclude-package-defs-for-unbuilt-firmware-and-doc-pk.patch
View File

@ -1,10 +1,10 @@
From 2e1c32f4c2d4d7e6afa769886a220c471fa73b98 Mon Sep 17 00:00:00 2001
Message-Id: <2e1c32f4c2d4d7e6afa769886a220c471fa73b98.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 8a0e9859f2ccd820d9945be774c5d8c4a44ef46d Mon Sep 17 00:00:00 2001
Message-Id: <8a0e9859f2ccd820d9945be774c5d8c4a44ef46d.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 05/29] Exclude package defs for unbuilt firmware and doc pkg
Subject: [PATCH 05/39] Exclude package defs for unbuilt firmware and doc pkg
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 0964ca4..0b91d79 100644
index b3126ce..8bf2efa 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -392,6 +392,7 @@ This kernel has been compiled with the RT patch applied and is intended
@@ -389,6 +389,7 @@ This kernel has been compiled with the RT patch applied and is intended
for use in deterministic response-time situations
@ -23,7 +23,7 @@ index 0964ca4..0b91d79 100644
%package doc
Summary: Various documentation bits found in the kernel source
Group: Documentation
@@ -403,7 +404,7 @@ device drivers shipped with it are documented in these files.
@@ -400,7 +401,7 @@ device drivers shipped with it are documented in these files.
You will want to install this package if you need a reference to the
options that can be passed to Linux kernel modules at load time.
@ -32,7 +32,7 @@ index 0964ca4..0b91d79 100644
%package headers
Summary: Header files for the Linux kernel for use by glibc
@@ -418,6 +419,7 @@ header files define structures and constants that are needed for
@@ -415,6 +416,7 @@ header files define structures and constants that are needed for
building most standard programs and are also needed for rebuilding the
glibc package.
@ -40,7 +40,7 @@ index 0964ca4..0b91d79 100644
%package firmware
Summary: Firmware files used by the Linux kernel
Group: Development/System
@@ -429,6 +431,7 @@ Provides: kernel-rt-firmware = %{rpmversion}-%{pkg_release}
@@ -426,6 +428,7 @@ Provides: kernel-rt-firmware = %{rpmversion}-%{pkg_release}
%description firmware
Kernel-firmware includes firmware files required for some devices to
operate.

14
kernel-rt/centos/meta_patches/Fix-compile-warnings-in-scsi-drivers.patch
View File

@ -1,8 +1,10 @@
From 0b645d407391f0791df1d77596f09f9a41795775 Mon Sep 17 00:00:00 2001
Message-Id: <0b645d407391f0791df1d77596f09f9a41795775.1510335500.git.Jim.Somerville@windriver.com>
From 05471f8cacd4b1b82b5015ddfabd4000c8111aa4 Mon Sep 17 00:00:00 2001
Message-Id: <05471f8cacd4b1b82b5015ddfabd4000c8111aa4.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Thu, 9 Nov 2017 15:53:41 -0500
Subject: [PATCH 1/1] Fix compile warnings in scsi drivers
Subject: [PATCH 33/39] Fix compile warnings in scsi drivers
They get turned into errors and thus break the build.
@ -12,10 +14,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 5 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 779f3ce..c8c7f22 100644
index 9c95078..4706989 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -419,6 +419,9 @@ Patch1025: US101216-IMA-support-in-Titanium-kernel.patch
@@ -421,6 +421,9 @@ Patch1025: US101216-IMA-support-in-Titanium-kernel.patch
Patch1026: US103091-IMA-System-Configuration.patch
Patch1027: timer-Reduce-timer-migration-overhead-if-disabled.patch
Patch1028: timer-Minimize-nohz-off-overhead.patch
@ -25,7 +27,7 @@ index 779f3ce..c8c7f22 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -810,6 +813,8 @@ ApplyPatch US101216-IMA-support-in-Titanium-kernel.patch
@@ -812,6 +815,8 @@ ApplyPatch US101216-IMA-support-in-Titanium-kernel.patch
ApplyPatch US103091-IMA-System-Configuration.patch
ApplyPatch timer-Reduce-timer-migration-overhead-if-disabled.patch
ApplyPatch timer-Minimize-nohz-off-overhead.patch

16
kernel-rt/centos/meta_patches/Fix-stack-clash.patch
View File

@ -1,10 +1,10 @@
From 399ce0dc1ad71eefe6d61f3e9370829103316487 Mon Sep 17 00:00:00 2001
Message-Id: <399ce0dc1ad71eefe6d61f3e9370829103316487.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From a7d69bbd83ee47b0af4276e0203c0de6623ab2ee Mon Sep 17 00:00:00 2001
Message-Id: <a7d69bbd83ee47b0af4276e0203c0de6623ab2ee.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 18 Jul 2017 15:52:25 -0400
Subject: [PATCH 20/29] Fix stack clash
Subject: [PATCH 20/39] Fix stack clash
Consists of 3 patches taken from the linux-3.10.y branch of the
linux-stable tree.
@ -23,10 +23,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 6 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 93dee4e..8458a68 100644
index 0bfaf4e..195db97 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -413,6 +413,9 @@ Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
@@ -410,6 +410,9 @@ Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
Patch1016: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
Patch1017: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
Patch1018: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
@ -36,7 +36,7 @@ index 93dee4e..8458a68 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -794,6 +797,9 @@ ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
@@ -788,6 +791,9 @@ ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
ApplyPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
ApplyPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
ApplyPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch

1
kernel-rt/centos/meta_patches/PATCH_ORDER
View File

@ -36,3 +36,4 @@ export-module-signing-key-in-kernel-devel.patch
CVE-mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
fix-drbd-by-turning-off-write-same-in-smartpqi.patch
restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
Cleanup-patchlist-for-kernel-rt-3.10.0-693.21.1.rt56.patch

16
kernel-rt/centos/meta_patches/PM-introduce-per-cpu-power-management.patch
View File

@ -1,10 +1,10 @@
From 7e79e79077bb451c8b28479d807b8b1d7e9e38da Mon Sep 17 00:00:00 2001
Message-Id: <7e79e79077bb451c8b28479d807b8b1d7e9e38da.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From b1952c2f4a8a740789c89d62f178cdeebec4f644 Mon Sep 17 00:00:00 2001
Message-Id: <b1952c2f4a8a740789c89d62f178cdeebec4f644.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Thu, 17 Aug 2017 12:37:41 -0400
Subject: [PATCH 24/29] PM: introduce per-cpu power management
Subject: [PATCH 24/39] PM: introduce per-cpu power management
Cherry-picking 4 commits from the 4.11 branch of the linux-stable tree.
All of the patches require small amount of work to apply to TiC kernel.
@ -17,10 +17,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 8 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 7e3d65e..dc30da0 100644
index 6bf0a56..a0f04ae 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -422,6 +422,10 @@ Patch1024: cacheinfo-porting-original-4.10.17-version.patch
@@ -419,6 +419,10 @@ Patch1024: cacheinfo-porting-original-4.10.17-version.patch
Patch1025: cacheinfo-fixing-compilation-issues-on-3.10.patch
Patch1026: intel-rdt-porting-original-4.10.17-version.patch
Patch1027: intel-rdt-fixing-compilation-issues-on-3.10.patch
@ -31,7 +31,7 @@ index 7e3d65e..dc30da0 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -812,6 +816,10 @@ ApplyPatch cacheinfo-porting-original-4.10.17-version.patch
@@ -806,6 +810,10 @@ ApplyPatch cacheinfo-porting-original-4.10.17-version.patch
ApplyPatch cacheinfo-fixing-compilation-issues-on-3.10.patch
ApplyPatch intel-rdt-porting-original-4.10.17-version.patch
ApplyPatch intel-rdt-fixing-compilation-issues-on-3.10.patch

16
kernel-rt/centos/meta_patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
View File

@ -1,10 +1,10 @@
From 9e609250e651cd45d637588106c7c9b907daa1ce Mon Sep 17 00:00:00 2001
Message-Id: <9e609250e651cd45d637588106c7c9b907daa1ce.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From f8fe0e8692aa42d4f632caa621ced1145668a8e4 Mon Sep 17 00:00:00 2001
Message-Id: <f8fe0e8692aa42d4f632caa621ced1145668a8e4.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Fri, 21 Jul 2017 11:00:10 -0500
Subject: [PATCH 22/29] Porting Cacheinfo from Kernel 4.10.17
Subject: [PATCH 22/39] Porting Cacheinfo from Kernel 4.10.17
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index c86ac43..b6a53d5 100644
index f536cc4..f1dda7e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -418,6 +418,8 @@ Patch1020: mm-fix-new-crash-in-unmapped_area_topdown.patch
@@ -415,6 +415,8 @@ Patch1020: mm-fix-new-crash-in-unmapped_area_topdown.patch
Patch1021: Allow-stack-to-grow-up-to-address-space-limit.patch
Patch1022: kernfs-porting-original-3.15-version.patch
Patch1023: kernfs-fixing-compilation-issues-on-3.10.patch
@ -24,7 +24,7 @@ index c86ac43..b6a53d5 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -804,6 +806,8 @@ ApplyPatch mm-fix-new-crash-in-unmapped_area_topdown.patch
@@ -798,6 +800,8 @@ ApplyPatch mm-fix-new-crash-in-unmapped_area_topdown.patch
ApplyPatch Allow-stack-to-grow-up-to-address-space-limit.patch
ApplyPatch kernfs-porting-original-3.15-version.patch
ApplyPatch kernfs-fixing-compilation-issues-on-3.10.patch

16
kernel-rt/centos/meta_patches/Porting-Kernfs-from-Kernel-3.10.patch
View File

@ -1,10 +1,10 @@
From 5a14d31ab88067d1d4acd6ef5fa80f53778d281b Mon Sep 17 00:00:00 2001
Message-Id: <5a14d31ab88067d1d4acd6ef5fa80f53778d281b.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 8bb4fda0cb481b621a0b079bbe9e65d95507c4b3 Mon Sep 17 00:00:00 2001
Message-Id: <8bb4fda0cb481b621a0b079bbe9e65d95507c4b3.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Thu, 20 Jul 2017 15:14:39 -0500
Subject: [PATCH 21/29] Porting Kernfs from Kernel 3.10
Subject: [PATCH 21/39] Porting Kernfs from Kernel 3.10
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 8458a68..c86ac43 100644
index 195db97..f536cc4 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -416,6 +416,8 @@ Patch1018: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
@@ -413,6 +413,8 @@ Patch1018: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
Patch1019: mm-larger-stack-guard-gap-between-vmas.patch
Patch1020: mm-fix-new-crash-in-unmapped_area_topdown.patch
Patch1021: Allow-stack-to-grow-up-to-address-space-limit.patch
@ -24,7 +24,7 @@ index 8458a68..c86ac43 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -800,6 +802,8 @@ ApplyPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
@@ -794,6 +796,8 @@ ApplyPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
ApplyPatch mm-larger-stack-guard-gap-between-vmas.patch
ApplyPatch mm-fix-new-crash-in-unmapped_area_topdown.patch
ApplyPatch Allow-stack-to-grow-up-to-address-space-limit.patch

16
kernel-rt/centos/meta_patches/Porting-Resource-Director-Technology-from-Kernel-4.1.patch
View File

@ -1,10 +1,10 @@
From c11c340ff04dd65eefb834770f910cd63d727a4d Mon Sep 17 00:00:00 2001
Message-Id: <c11c340ff04dd65eefb834770f910cd63d727a4d.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 672ea712bd12f8426a7e8c764ece7f8d31fe696a Mon Sep 17 00:00:00 2001
Message-Id: <672ea712bd12f8426a7e8c764ece7f8d31fe696a.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Mon, 24 Jul 2017 15:49:37 -0500
Subject: [PATCH 23/29] Porting Resource Director Technology from Kernel
Subject: [PATCH 23/39] Porting Resource Director Technology from Kernel
4.10.17
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
@ -13,10 +13,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index b6a53d5..7e3d65e 100644
index f1dda7e..6bf0a56 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -420,6 +420,8 @@ Patch1022: kernfs-porting-original-3.15-version.patch
@@ -417,6 +417,8 @@ Patch1022: kernfs-porting-original-3.15-version.patch
Patch1023: kernfs-fixing-compilation-issues-on-3.10.patch
Patch1024: cacheinfo-porting-original-4.10.17-version.patch
Patch1025: cacheinfo-fixing-compilation-issues-on-3.10.patch
@ -25,7 +25,7 @@ index b6a53d5..7e3d65e 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -808,6 +810,8 @@ ApplyPatch kernfs-porting-original-3.15-version.patch
@@ -802,6 +804,8 @@ ApplyPatch kernfs-porting-original-3.15-version.patch
ApplyPatch kernfs-fixing-compilation-issues-on-3.10.patch
ApplyPatch cacheinfo-porting-original-4.10.17-version.patch
ApplyPatch cacheinfo-fixing-compilation-issues-on-3.10.patch

18
kernel-rt/centos/meta_patches/Resolve-hard-lockup-in-get_kvmclock_ns.patch
View File

@ -1,17 +1,21 @@
From 8db6891fed197e4b4247b624a0079a60bbfdf3f9 Mon Sep 17 00:00:00 2001
From e59df4d0ef91fd9ab7545356627d97b671da098d Mon Sep 17 00:00:00 2001
Message-Id: <e59df4d0ef91fd9ab7545356627d97b671da098d.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Thu, 16 Nov 2017 11:36:56 -0500
Subject: [PATCH 1/1] Resolve hard lockup in get_kvmclock_ns
Subject: [PATCH 34/39] Resolve hard lockup in get_kvmclock_ns
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
SPECS/kernel-rt.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index c8c7f22..7240f97 100644
index 4706989..34774c1 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -422,6 +422,7 @@ Patch1028: timer-Minimize-nohz-off-overhead.patch
@@ -424,6 +424,7 @@ Patch1028: timer-Minimize-nohz-off-overhead.patch
# Fix compile warnings that break the build
Patch1029: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
Patch1030: dpt_i2o-fix-build-warning.patch
@ -19,7 +23,7 @@ index c8c7f22..7240f97 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -815,6 +816,7 @@ ApplyPatch timer-Reduce-timer-migration-overhead-if-disabled.patch
@@ -817,6 +818,7 @@ ApplyPatch timer-Reduce-timer-migration-overhead-if-disabled.patch
ApplyPatch timer-Minimize-nohz-off-overhead.patch
ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
ApplyPatch dpt_i2o-fix-build-warning.patch

14
kernel-rt/centos/meta_patches/Rework-pkg-release-naming.patch
View File

@ -1,10 +1,10 @@
From 165b8ea199b36e04d35f515a6b1482ea5ce51ae5 Mon Sep 17 00:00:00 2001
Message-Id: <165b8ea199b36e04d35f515a6b1482ea5ce51ae5.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From b64c549a4a1986ce6ee5b4d0063df5cc3ec6de1f Mon Sep 17 00:00:00 2001
Message-Id: <b64c549a4a1986ce6ee5b4d0063df5cc3ec6de1f.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 12/29] Rework pkg release naming
Subject: [PATCH 12/39] Rework pkg release naming
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 5d1308b..afd1ca3 100644
index 4d5d58d..91c2661 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -102,7 +102,7 @@ Summary: The Linux Realtime kernel
@@ -100,7 +100,7 @@ Summary: The Linux Realtime kernel
%global with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0}
%global pkg_release_simple %{rhel_build}.%{rttag}.%{rtbuild}

16
kernel-rt/centos/meta_patches/Stricter-decoding-of-NFS-ops.patch
View File

@ -1,10 +1,10 @@
From acd5a71f8758b872a8741f08be4ca0e99fefa268 Mon Sep 17 00:00:00 2001
Message-Id: <acd5a71f8758b872a8741f08be4ca0e99fefa268.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From b9b55768ff8c02a7e8632dc5189491f3bd32525a Mon Sep 17 00:00:00 2001
Message-Id: <b9b55768ff8c02a7e8632dc5189491f3bd32525a.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 22 Aug 2017 17:30:01 -0400
Subject: [PATCH 26/29] Stricter decoding of NFS ops
Subject: [PATCH 26/39] Stricter decoding of NFS ops
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index e53f906..f831609 100644
index 91899ab..5903e83 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -427,6 +427,8 @@ Patch1029: add-per-cpu-pm-qos-resume-latency-consideration.patch
@@ -424,6 +424,8 @@ Patch1029: add-per-cpu-pm-qos-resume-latency-consideration.patch
Patch1030: expose-pm_qos_resume_latency-for-cpus.patch
Patch1031: avoid-taking-spinlock-for-accessing-qos-values.patch
Patch1032: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
@ -24,7 +24,7 @@ index e53f906..f831609 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -822,6 +824,8 @@ ApplyPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
@@ -816,6 +818,8 @@ ApplyPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
ApplyPatch expose-pm_qos_resume_latency-for-cpus.patch
ApplyPatch avoid-taking-spinlock-for-accessing-qos-values.patch
ApplyPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch

28
kernel-rt/centos/meta_patches/Update-package-versioning-for-TIS-format-revised.patch
View File

@ -1,27 +1,21 @@
From f4d36cf99a55bae14d6a3590a9d8bdd5f29ee4f9 Mon Sep 17 00:00:00 2001
From 9ad55ac56fdddee38bca95c5ab57cbf0b6c1c336 Mon Sep 17 00:00:00 2001
Message-Id: <9ad55ac56fdddee38bca95c5ab57cbf0b6c1c336.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 24 Oct 2017 22:15:44 -0400
Subject: [PATCH] foo
Subject: [PATCH 32/39] Update package versioning for TIS format revised
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
SPECS/kernel-rt.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index b4a9826..cb56b2d 100644
index 4f78990..9c95078 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -4,9 +4,7 @@
Summary: The Linux Realtime kernel
# catch building on Fedora
-%if "%{?dist}" == "" || "0%{?fedora}" != "0"
%global dist .el7
-%endif
# realtimeN
%global rtbuild 623
@@ -102,7 +100,7 @@ Summary: The Linux Realtime kernel
@@ -100,7 +100,7 @@ Summary: The Linux Realtime kernel
%global with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0}
%global pkg_release_simple %{rhel_build}.%{rttag}.%{rtbuild}
@ -31,5 +25,5 @@ index b4a9826..cb56b2d 100644
%global KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
--
1.9.1
1.8.3.1

14
kernel-rt/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
View File

@ -1,10 +1,10 @@
From b485ba56b70bc19f5cf223c31402d7b723b7e9a6 Mon Sep 17 00:00:00 2001
Message-Id: <b485ba56b70bc19f5cf223c31402d7b723b7e9a6.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 4d2b4630b5e6b1f081a07f3b530b6afa9208d741 Mon Sep 17 00:00:00 2001
Message-Id: <4d2b4630b5e6b1f081a07f3b530b6afa9208d741.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 03/29] Update package versioning for TIS format
Subject: [PATCH 03/39] Update package versioning for TIS format
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index ffbdbff..dd642c1 100644
index d1f8eab..9a8fb8c 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -19,6 +19,7 @@ Summary: The Linux Realtime kernel
@@ -17,6 +17,7 @@ Summary: The Linux Realtime kernel
# The Build ID
# %%define buildid .local

16
kernel-rt/centos/meta_patches/enable-building-mpt2sas-mpt3sas-as-builtin.patch
View File

@ -1,10 +1,10 @@
From 072f3b48d291c020d6d7ce4cb6396316932a08e5 Mon Sep 17 00:00:00 2001
Message-Id: <072f3b48d291c020d6d7ce4cb6396316932a08e5.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From bc20d3c5d3bf939aeec52ad0add9e693e423ac7d Mon Sep 17 00:00:00 2001
Message-Id: <bc20d3c5d3bf939aeec52ad0add9e693e423ac7d.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:13 -0400
Subject: [PATCH 16/29] enable building mpt2sas mpt3sas as builtin
Subject: [PATCH 16/39] enable building mpt2sas mpt3sas as builtin
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index cd127ac..a613703 100644
index c8faf30..b6141b0 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -408,6 +408,7 @@ Patch1010: Notification-of-death-of-arbitrary-processes.patch
@@ -405,6 +405,7 @@ Patch1010: Notification-of-death-of-arbitrary-processes.patch
Patch1011: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
Patch1012: x86-enable-DMA-CMA-with-swiotlb.patch
Patch1013: Add-missing-ifdef-around-max-latency-variable.patch
@ -23,7 +23,7 @@ index cd127ac..a613703 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -784,6 +785,7 @@ ApplyPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
@@ -778,6 +779,7 @@ ApplyPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
ApplyPatch Notification-of-death-of-arbitrary-processes.patch
ApplyPatch x86-enable-DMA-CMA-with-swiotlb.patch
ApplyPatch Add-missing-ifdef-around-max-latency-variable.patch

12
kernel-rt/centos/meta_patches/export-module-signing-key-in-kernel-devel.patch
View File

@ -1,17 +1,21 @@
From bea6513a83c05acdd4d5947b43f34e499923130e Mon Sep 17 00:00:00 2001
From b848f46e5ea62d745cd38467b498e3e98a13ebdc Mon Sep 17 00:00:00 2001
Message-Id: <b848f46e5ea62d745cd38467b498e3e98a13ebdc.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 12 Jan 2018 11:44:29 -0500
Subject: [PATCH] export module signing key in kernel devel
Subject: [PATCH 35/39] export module signing key in kernel devel
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 298ce17..4935d51 100644
index 34774c1..f45d2a9 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -1131,6 +1131,12 @@ BuildKernel() {
@@ -1133,6 +1133,12 @@ BuildKernel() {
cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}

14
kernel-rt/centos/meta_patches/fix-drbd-by-turning-off-write-same-in-smartpqi.patch
View File

@ -1,8 +1,10 @@
From 69fe6756d51b21e909f228042ca301e88f0ef184 Mon Sep 17 00:00:00 2001
Message-Id: <69fe6756d51b21e909f228042ca301e88f0ef184.1520371020.git.Jim.Somerville@windriver.com>
From a9bbe26e81bc9fb1892a98679b0ba34fbb1dd96b Mon Sep 17 00:00:00 2001
Message-Id: <a9bbe26e81bc9fb1892a98679b0ba34fbb1dd96b.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 6 Mar 2018 16:16:54 -0500
Subject: [PATCH 1/1] fix drbd by turning off write same in smartpqi
Subject: [PATCH 37/39] fix drbd by turning off write same in smartpqi
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index a56e051..bd5d93f 100644
index c7816a6..5d9b4bc 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -425,6 +425,8 @@ Patch1030: dpt_i2o-fix-build-warning.patch
@@ -427,6 +427,8 @@ Patch1030: dpt_i2o-fix-build-warning.patch
Patch1031: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
# CVE-2017-11176: kernel: Use-after-free in sys_mq_notify()
Patch1032: mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
@ -22,7 +24,7 @@ index a56e051..bd5d93f 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -820,6 +822,7 @@ ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
@@ -822,6 +824,7 @@ ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
ApplyPatch dpt_i2o-fix-build-warning.patch
ApplyPatch KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
ApplyPatch mqueue-fix-a-use-after-free-in-sys_mq_notify.patch

16
kernel-rt/centos/meta_patches/fix-high-latency-reported-by-cyclictest.patch
View File

@ -1,10 +1,10 @@
From 78376ed0fad7d6ea82975693642445b69d4c2011 Mon Sep 17 00:00:00 2001
Message-Id: <78376ed0fad7d6ea82975693642445b69d4c2011.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 3c7673320dbc70197230e3ebc977be69d1c35870 Mon Sep 17 00:00:00 2001
Message-Id: <3c7673320dbc70197230e3ebc977be69d1c35870.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Mon, 11 Sep 2017 17:05:22 -0400
Subject: [PATCH 28/29] fix high latency reported by cyclictest
Subject: [PATCH 28/39] fix high latency reported by cyclictest
CGTS-7179 reported cyclictest latency spikes on low-latency compute profile.
The issue was injected into TC during kernel rebase to 3.10.0-514.16.1.el7.
@ -23,10 +23,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 2eb90d7..f4987fb 100644
index ca8fb19..69ba548 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -430,6 +430,8 @@ Patch1032: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
@@ -427,6 +427,8 @@ Patch1032: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
Patch1033: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
Patch1034: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
Patch1035: US101216-IMA-support-in-Titanium-kernel.patch
@ -35,7 +35,7 @@ index 2eb90d7..f4987fb 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -828,6 +830,8 @@ ApplyPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
@@ -822,6 +824,8 @@ ApplyPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
ApplyPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
ApplyPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
ApplyPatch US101216-IMA-support-in-Titanium-kernel.patch

16
kernel-rt/centos/meta_patches/lose-the-memblock-reorder-parms-patch.patch
View File

@ -1,10 +1,10 @@
From b1d0bf9cd7913823157a680e39161c8f02b252c2 Mon Sep 17 00:00:00 2001
Message-Id: <b1d0bf9cd7913823157a680e39161c8f02b252c2.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From f08a2a889590274dd7d878fbec670029a63049ca Mon Sep 17 00:00:00 2001
Message-Id: <f08a2a889590274dd7d878fbec670029a63049ca.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 13/29] lose the memblock reorder parms patch
Subject: [PATCH 13/39] lose the memblock reorder parms patch
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index afd1ca3..d11d8fe 100644
index 91c2661..e6b1d13 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -404,10 +404,9 @@ Patch1006: cma-add-placement-specifier-for-cma-kernel-parameter.patch
@@ -401,10 +401,9 @@ Patch1006: cma-add-placement-specifier-for-cma-kernel-parameter.patch
Patch1007: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
Patch1008: Make-kernel-start-eth-devices-at-offset.patch
Patch1009: memblock-introduce-memblock_alloc_range.patch
@ -29,7 +29,7 @@ index afd1ca3..d11d8fe 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -772,7 +771,6 @@ ApplyPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
@@ -766,7 +765,6 @@ ApplyPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
ApplyPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
ApplyPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
ApplyPatch Make-kernel-start-eth-devices-at-offset.patch

16
kernel-rt/centos/meta_patches/meta-patch-for-Kernel-IMA-changes.patch
View File

@ -1,10 +1,10 @@
From ac548283b0da3e13fe8dcdb1359aa3b8cfc92303 Mon Sep 17 00:00:00 2001
Message-Id: <ac548283b0da3e13fe8dcdb1359aa3b8cfc92303.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 58b1b0b36167977d68a991d9b1a709dabaccc7ed Mon Sep 17 00:00:00 2001
Message-Id: <58b1b0b36167977d68a991d9b1a709dabaccc7ed.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 1 Sep 2017 14:24:02 -0400
Subject: [PATCH 27/29] meta patch for Kernel IMA changes
Subject: [PATCH 27/39] meta patch for Kernel IMA changes
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f831609..2eb90d7 100644
index 5903e83..ca8fb19 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -429,6 +429,7 @@ Patch1031: avoid-taking-spinlock-for-accessing-qos-values.patch
@@ -426,6 +426,7 @@ Patch1031: avoid-taking-spinlock-for-accessing-qos-values.patch
Patch1032: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
Patch1033: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
Patch1034: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
@ -23,7 +23,7 @@ index f831609..2eb90d7 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -826,6 +827,7 @@ ApplyPatch avoid-taking-spinlock-for-accessing-qos-values.patch
@@ -820,6 +821,7 @@ ApplyPatch avoid-taking-spinlock-for-accessing-qos-values.patch
ApplyPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
ApplyPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
ApplyPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch

20
kernel-rt/centos/meta_patches/meta-patch-for-Kernel-IMA-keyring-changes.patch
View File

@ -1,10 +1,10 @@
From 1260d1d47badcb7ad62a999e4a9ef901fe68c30a Mon Sep 17 00:00:00 2001
Message-Id: <1260d1d47badcb7ad62a999e4a9ef901fe68c30a.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 9ba2cfab30ddbca5dc74455459c903ba93fb8a3b Mon Sep 17 00:00:00 2001
Message-Id: <9ba2cfab30ddbca5dc74455459c903ba93fb8a3b.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Kam Nasim <kam.nasim@windriver.com>
Date: Mon, 25 Sep 2017 17:30:33 -0400
Subject: [PATCH 29/29] meta patch for Kernel IMA keyring changes
Subject: [PATCH 29/39] meta patch for Kernel IMA keyring changes
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 6 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f4987fb..636a68e 100644
index 69ba548..0f021b5 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -360,6 +360,7 @@ Source27: sanity_check.py
@ -23,7 +23,7 @@ index f4987fb..636a68e 100644
%if %{?released_kernel}
%define pesign_name redhatsecureboot301
%else
@@ -432,6 +433,7 @@ Patch1034: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
@@ -429,6 +430,7 @@ Patch1034: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
Patch1035: US101216-IMA-support-in-Titanium-kernel.patch
Patch1036: timer-reduce-timer-migration-overhead-if-disabled.patch
Patch1037: timer-minimize-nohz-off-overhead.patch
@ -31,7 +31,7 @@ index f4987fb..636a68e 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -789,6 +791,9 @@ cd linux-%{kversion}.%{_target_cpu}
@@ -786,6 +788,9 @@ cd linux-%{kversion}.%{_target_cpu}
# Copy any TiS-specific config changes
cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
@ -39,9 +39,9 @@ index f4987fb..636a68e 100644
+cp %{SOURCE38} .
+
## Apply Patches here
ApplyPatch linux-kernel-test.patch
ApplyPatch debrand-single-cpu.patch
ApplyPatch debrand-rh_taint.patch
@@ -832,6 +837,7 @@ ApplyPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
@@ -826,6 +831,7 @@ ApplyPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
ApplyPatch US101216-IMA-support-in-Titanium-kernel.patch
ApplyPatch timer-reduce-timer-migration-overhead-if-disabled.patch
ApplyPatch timer-minimize-nohz-off-overhead.patch

16
kernel-rt/centos/meta_patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
View File

@ -1,10 +1,10 @@
From a998c3291fe980792bffe65add5ab579fbfe5af3 Mon Sep 17 00:00:00 2001
Message-Id: <a998c3291fe980792bffe65add5ab579fbfe5af3.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 00f41d3840e6576048660bcfe1d660b935615644 Mon Sep 17 00:00:00 2001
Message-Id: <00f41d3840e6576048660bcfe1d660b935615644.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:13 -0400
Subject: [PATCH 19/29] rcu Don't wake rcuc-X-kthreads on NOCB CPUs
Subject: [PATCH 19/39] rcu Don't wake rcuc-X-kthreads on NOCB CPUs
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 3554ef3..93dee4e 100644
index 417ea07..0bfaf4e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -412,6 +412,7 @@ Patch1014: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
@@ -409,6 +409,7 @@ Patch1014: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
Patch1016: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
Patch1017: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
@ -23,7 +23,7 @@ index 3554ef3..93dee4e 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -792,6 +793,7 @@ ApplyPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
@@ -786,6 +787,7 @@ ApplyPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
ApplyPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
ApplyPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch

19
kernel-rt/centos/meta_patches/restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
View File

@ -1,21 +1,24 @@
From 6f3bc474c914f5b4f59d0213be92d8d0df858a69 Mon Sep 17 00:00:00 2001
From 02a0f14b1c2d7542fc4919ad5440e354b45e5ab4 Mon Sep 17 00:00:00 2001
Message-Id: <02a0f14b1c2d7542fc4919ad5440e354b45e5ab4.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Fri, 16 Mar 2018 15:58:37 -0400
Subject: [PATCH 1/1] affine iSCSI kthreads as per kthread_cpus parameter
Resrict iSCSI kthreads CPU mask according to kthread_cpus kernel option.
Do not allow them to run on other CPUs to prevent interference with VMs.
Subject: [PATCH 38/39] restrict iSCSI kthreads to CPUs in cpu_kthread_mask
Do not allow them to run on other CPUs to prevent interference with VMs.
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index bd5d93f..91656be 100644
index 5d9b4bc..9dae160 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -427,6 +427,7 @@ Patch1031: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
@@ -429,6 +429,7 @@ Patch1031: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
Patch1032: mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
# DRBD was choking on write same
Patch1033: turn-off-write-same-in-smartqpi-driver.patch
@ -23,7 +26,7 @@ index bd5d93f..91656be 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -823,6 +824,7 @@ ApplyPatch dpt_i2o-fix-build-warning.patch
@@ -825,6 +826,7 @@ ApplyPatch dpt_i2o-fix-build-warning.patch
ApplyPatch KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
ApplyPatch mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
ApplyPatch turn-off-write-same-in-smartqpi-driver.patch

28
kernel-rt/centos/meta_patches/tis-add-tools.patch
View File

@ -1,10 +1,10 @@
From c6c5f512db8d2e06758333f17dec7960ab7e34d9 Mon Sep 17 00:00:00 2001
Message-Id: <c6c5f512db8d2e06758333f17dec7960ab7e34d9.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From d94fc51e2769257bb9d8653961b011ccca6d3732 Mon Sep 17 00:00:00 2001
Message-Id: <d94fc51e2769257bb9d8653961b011ccca6d3732.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 10/29] tis add tools
Subject: [PATCH 10/39] tis add tools
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 157 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index aff01a7..7ab7c45 100644
index c21ca59..2ee8fb3 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -42,6 +42,11 @@ Summary: The Linux Realtime kernel
@@ -40,6 +40,11 @@ Summary: The Linux Realtime kernel
%bcond_with perf
%bcond_with firmware
%bcond_with debuginfo
@ -27,7 +27,7 @@ index aff01a7..7ab7c45 100644
# What parts do we want to build? We must build at least one kernel.
# These are the kernels that are built IF the architecture allows it.
@@ -305,6 +310,9 @@ BuildRequires: python-devel, newt-devel, perl(ExtUtils::Embed)
@@ -304,6 +309,9 @@ BuildRequires: elfutils-libelf-devel
BuildRequires: pesign >= 0.109-4
%endif
%endif
@ -49,7 +49,7 @@ index aff01a7..7ab7c45 100644
Source30000: kernel-3.10.0-x86_64-rt.config.tis_extra
Source30001: kernel-3.10.0-x86_64-rt-debug.config.tis_extra
Source30002: kernel-3.10.0-x86_64-rt-trace.config.tis_extra
@@ -641,6 +654,47 @@ It should only be installed when trying to gather additional information
@@ -638,6 +651,47 @@ It should only be installed when trying to gather additional information
on kernel bugs.
%endif
@ -97,7 +97,7 @@ index aff01a7..7ab7c45 100644
%prep
## ApplyPatch routine
patch_command='patch -p1 -F1 -s'
@@ -1097,6 +1151,31 @@ BuildKernel %make_target %kernel_image vanilla
@@ -1091,6 +1145,31 @@ BuildKernel %make_target %kernel_image vanilla
BuildKernel %make_target %kernel_image
%endif
@ -129,7 +129,7 @@ index aff01a7..7ab7c45 100644
%if %{builddoc}
# Make the HTML and man pages.
make -j1 htmldocs mandocs || %{doc_build_fail}
@@ -1229,7 +1308,6 @@ find Documentation/DocBook/man -name '*.9.gz' -print0 |
@@ -1223,7 +1302,6 @@ find Documentation/DocBook/man -name '*.9.gz' -print0 |
xargs -0 --no-run-if-empty %{__install} -m 444 -t $man9dir $m
ls $man9dir | grep -q '' || > $man9dir/BROKEN
%endif # builddoc
@ -137,7 +137,7 @@ index aff01a7..7ab7c45 100644
# perf docs
%if %{buildrt}
%if %{buildperf}
@@ -1255,6 +1333,39 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
@@ -1249,6 +1327,39 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
%endif # buildperf
%endif
@ -177,7 +177,7 @@ index aff01a7..7ab7c45 100644
%if %{buildheaders}
# Install kernel headers
make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
@@ -1303,6 +1414,14 @@ rm -rf $RPM_BUILD_ROOT
@@ -1297,6 +1408,14 @@ rm -rf $RPM_BUILD_ROOT
### scripts
###
@ -192,7 +192,7 @@ index aff01a7..7ab7c45 100644
#
# This macro defines a %%post script for a kernel*-devel package.
# %%kernel_devel_post [<subpackage>]
@@ -1460,6 +1579,43 @@ fi
@@ -1457,6 +1576,43 @@ fi
%endif
%endif

20
kernel-rt/centos/meta_patches/tis-apply-patches.patch
View File

@ -1,10 +1,10 @@
From 03cf09d820042573781332e8257124cced9c8dcc Mon Sep 17 00:00:00 2001
Message-Id: <03cf09d820042573781332e8257124cced9c8dcc.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 5a522be25447cdd21809089bb238e58c1e025e5d Mon Sep 17 00:00:00 2001
Message-Id: <5a522be25447cdd21809089bb238e58c1e025e5d.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 08/29] tis apply patches
Subject: [PATCH 08/39] tis apply patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 25 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 726669d..ae0d7e3 100644
index eb5767e..0ae5e5c 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -382,6 +382,17 @@ Patch999999: linux-kernel-test.patch
@@ -379,6 +379,17 @@ Patch999999: linux-kernel-test.patch
Patch1000: debrand-single-cpu.patch
Patch1001: debrand-rh_taint.patch
Patch1002: debrand-rh-i686-cpu.patch
@ -33,9 +33,9 @@ index 726669d..ae0d7e3 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -693,6 +704,20 @@ ApplyPatch debrand-single-cpu.patch
ApplyPatch debrand-rh_taint.patch
ApplyPatch debrand-rh-i686-cpu.patch
@@ -687,6 +698,20 @@ cd linux-%{kversion}.%{_target_cpu}
## Apply Patches here
ApplyPatch linux-kernel-test.patch
+ApplyPatch debrand-single-cpu.patch
+ApplyPatch debrand-rh_taint.patch

24
kernel-rt/centos/meta_patches/tis-build-unsigned-package.patch
View File

@ -1,10 +1,10 @@
From fed04855a35224e248e541b754b015df832503ba Mon Sep 17 00:00:00 2001
Message-Id: <fed04855a35224e248e541b754b015df832503ba.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 2dd2b214e0c646cbb24bdd0ca7fba95d5d93514f Mon Sep 17 00:00:00 2001
Message-Id: <2dd2b214e0c646cbb24bdd0ca7fba95d5d93514f.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:13 -0400
Subject: [PATCH 15/29] tis build unsigned package
Subject: [PATCH 15/39] tis build unsigned package
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index fd9ed82..cd127ac 100644
index 8ee6191..c8faf30 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -27,7 +27,7 @@ Summary: The Linux Realtime kernel
@@ -25,7 +25,7 @@ Summary: The Linux Realtime kernel
# If we want to sign the kernel and modules, do_sign should be 1.
# To speed up builds (don't sign) use 0.
@ -24,7 +24,7 @@ index fd9ed82..cd127ac 100644
# conditional with/without variables
# Note that the logic here is inverted; a bcond_without implies
@@ -695,6 +695,13 @@ the kernel source.
@@ -692,6 +692,13 @@ the kernel source.
%endif # with_tools
@ -38,7 +38,7 @@ index fd9ed82..cd127ac 100644
%prep
## ApplyPatch routine
patch_command='patch -p1 -F1 -s'
@@ -942,6 +949,8 @@ BuildKernel() {
@@ -936,6 +943,8 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%if %{do_sign}
@ -47,7 +47,7 @@ index fd9ed82..cd127ac 100644
%ifarch x86_64
%pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE37} -c %{SOURCE37} -n %{pesign_name}
mv $KernelImage.signed $KernelImage
@@ -1708,6 +1717,11 @@ fi
@@ -1707,6 +1716,11 @@ fi
%kernel_variant_files %{buildvanilla} vanilla
%endif
@ -57,8 +57,8 @@ index fd9ed82..cd127ac 100644
+%endif # do_sign
+
%changelog
* Wed Sep 13 2017 Johnny Hughes <johnny@centos.org> [3.10.0-693.2.2.rt56.623.el7]
- Manual CentOS Debranding
* Fri Feb 23 2018 Clark Williams <williams@redhat.com> [3.10.0-693.21.1.rt56.639.el7]
- [rt] Update source tree to match RHEL 7.4 tree [1537671 1462329]
--
1.8.3.1

14
kernel-rt/centos/meta_patches/tis-debrand-and-add-centos-certificate.patch
View File

@ -1,8 +1,8 @@
From 9c07167bbe02febf5402665f4a907a0edd21c1fd Mon Sep 17 00:00:00 2001
Message-Id: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 8d084dcc717666af0283e4ddeefaba7e331d879a Mon Sep 17 00:00:00 2001
Message-Id: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 01/29] tis debrand and add centos certificate
Subject: [PATCH 01/39] tis debrand and add centos certificate
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,7 +10,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index b433031..f7f4ead 100644
index b855a01..5f4a216 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -340,6 +340,12 @@ Source25: merge.pl
@ -26,7 +26,7 @@ index b433031..f7f4ead 100644
### Configuration files
Source50: kernel-%{version}-x86_64-rt.config
@@ -362,6 +368,9 @@ Patch1002: debrand-rh-i686-cpu.patch
@@ -359,6 +365,9 @@ Patch001: avoid-debuginfo-hash-collision-scripts.patch
# Empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
@ -36,11 +36,11 @@ index b433031..f7f4ead 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -805,7 +814,7 @@ BuildKernel() {
@@ -799,7 +808,7 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%ifarch x86_64
- %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13}
- %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE14} -n %{pesign_name}
+ %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE37} -c %{SOURCE37} -n %{pesign_name}
mv $KernelImage.signed $KernelImage
%endif

18
kernel-rt/centos/meta_patches/tis-handle-tis-config-customizations.patch
View File

@ -1,10 +1,10 @@
From 18d55409c48176c1af22c21033755a7aa4eaac8f Mon Sep 17 00:00:00 2001
Message-Id: <18d55409c48176c1af22c21033755a7aa4eaac8f.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From b80187698d0228e3a6b678b7bce3d9ed5d4ef6eb Mon Sep 17 00:00:00 2001
Message-Id: <b80187698d0228e3a6b678b7bce3d9ed5d4ef6eb.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 09/29] tis handle tis config customizations
Subject: [PATCH 09/39] tis handle tis config customizations
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index ae0d7e3..aff01a7 100644
index 0ae5e5c..c21ca59 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -362,7 +362,9 @@ Source37: centos.cer
@ -26,7 +26,7 @@ index ae0d7e3..aff01a7 100644
### Started using a unified SRPM
# Bugzilla: 1209952
@@ -699,6 +701,9 @@ cp -rl vanilla-%{kversion} linux-%{kversion}.%{_target_cpu}
@@ -696,6 +698,9 @@ cp -rl vanilla-%{kversion} linux-%{kversion}.%{_target_cpu}
cd linux-%{kversion}.%{_target_cpu}
@ -34,9 +34,9 @@ index ae0d7e3..aff01a7 100644
+cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
+
## Apply Patches here
ApplyPatch linux-kernel-test.patch
ApplyPatch debrand-single-cpu.patch
ApplyPatch debrand-rh_taint.patch
@@ -739,6 +744,15 @@ for i in *.config
@@ -733,6 +738,15 @@ for i in *.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`

26
kernel-rt/centos/meta_patches/tis-remove-signing.patch
View File

@ -1,10 +1,10 @@
From 06ec75f66757a2cb7a16ce72a634e750d3d9ec4e Mon Sep 17 00:00:00 2001
Message-Id: <06ec75f66757a2cb7a16ce72a634e750d3d9ec4e.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 06415789393f352f779cf03c79bd814a54203c5f Mon Sep 17 00:00:00 2001
Message-Id: <06415789393f352f779cf03c79bd814a54203c5f.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 07/29] tis remove signing
Subject: [PATCH 07/39] tis remove signing
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 31 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index c35efae..726669d 100644
index 29d78fd..eb5767e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -25,6 +25,10 @@ Summary: The Linux Realtime kernel
@@ -23,6 +23,10 @@ Summary: The Linux Realtime kernel
# For internal testing builds during development, it should be 0.
%global released_kernel 0
@ -26,7 +26,7 @@ index c35efae..726669d 100644
# conditional with/without variables
# Note that the logic here is inverted; a bcond_without implies
# that the variable is on by default (since you use --without to turn it off)
@@ -58,7 +62,11 @@ Summary: The Linux Realtime kernel
@@ -56,7 +60,11 @@ Summary: The Linux Realtime kernel
# Verbose output?
# %%global verbose V=1
@ -38,10 +38,10 @@ index c35efae..726669d 100644
# if patch fuzzy patch applying will be forbidden
%global with_fuzzy_patches 0
@@ -292,9 +300,11 @@ BuildRequires: openssl
@@ -291,9 +299,11 @@ BuildRequires: xmlto, asciidoc
BuildRequires: openssl
BuildRequires: hmaccalc
BuildRequires: elfutils-libelf-devel
BuildRequires: python-devel, newt-devel, perl(ExtUtils::Embed)
+%if %{do_sign}
%ifarch x86_64
BuildRequires: pesign >= 0.109-4
@ -50,7 +50,7 @@ index c35efae..726669d 100644
%if %{with_sparse}
BuildRequires: sparse >= 0.4.1
%endif
@@ -838,10 +848,12 @@ BuildKernel() {
@@ -832,10 +842,12 @@ BuildKernel() {
cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
fi
# EFI SecureBoot signing, x86_64-only
@ -63,7 +63,7 @@ index c35efae..726669d 100644
$CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -1078,6 +1090,7 @@ popd
@@ -1072,6 +1084,7 @@ popd
# if it isn't.
%ifnarch noarch
@ -71,7 +71,7 @@ index c35efae..726669d 100644
%define __modsign_install_post \
if [ "%{with_rt}" -ne "0" ]; then \
Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt.config | cut -b 3-` \
@@ -1096,6 +1109,24 @@ popd
@@ -1090,6 +1103,24 @@ popd
%{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.${AAA} || exit 1 \
done \
%{nil}

14
kernel-rt/centos/meta_patches/tis-remove-trace.patch
View File

@ -1,10 +1,10 @@
From 134b18065f3e083407ddb9ad8f574a22c3bc194e Mon Sep 17 00:00:00 2001
Message-Id: <134b18065f3e083407ddb9ad8f574a22c3bc194e.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 28652a2978a06c248b4b9c01d8832f9287c44da7 Mon Sep 17 00:00:00 2001
Message-Id: <28652a2978a06c248b4b9c01d8832f9287c44da7.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:12 -0400
Subject: [PATCH 02/29] tis remove trace
Subject: [PATCH 02/39] tis remove trace
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f7f4ead..ffbdbff 100644
index 5f4a216..d1f8eab 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -33,7 +33,7 @@ Summary: The Linux Realtime kernel
@@ -31,7 +31,7 @@ Summary: The Linux Realtime kernel
%bcond_without debug
%bcond_with headers
%bcond_with vanilla

16
kernel-rt/centos/meta_patches/x86-dma_alloc_coherent-fix.patch
View File

@ -1,10 +1,10 @@
From 4aab9c0f96b173dc91a60c0a332c26d2564ad57a Mon Sep 17 00:00:00 2001
Message-Id: <4aab9c0f96b173dc91a60c0a332c26d2564ad57a.1507842722.git.Jim.Somerville@windriver.com>
In-Reply-To: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
References: <9c07167bbe02febf5402665f4a907a0edd21c1fd.1507842722.git.Jim.Somerville@windriver.com>
From 0452d60ff9c84b827d66ac76040bf3c3cfd9a375 Mon Sep 17 00:00:00 2001
Message-Id: <0452d60ff9c84b827d66ac76040bf3c3cfd9a375.1524081065.git.Jim.Somerville@windriver.com>
In-Reply-To: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
References: <8d084dcc717666af0283e4ddeefaba7e331d879a.1524081065.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:00:13 -0400
Subject: [PATCH 18/29] x86 dma_alloc_coherent fix
Subject: [PATCH 18/39] x86 dma_alloc_coherent fix
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,10 +12,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index d5216f4..3554ef3 100644
index d9ee5c6..417ea07 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -410,6 +410,8 @@ Patch1012: x86-enable-DMA-CMA-with-swiotlb.patch
@@ -407,6 +407,8 @@ Patch1012: x86-enable-DMA-CMA-with-swiotlb.patch
Patch1013: Add-missing-ifdef-around-max-latency-variable.patch
Patch1014: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
@ -24,7 +24,7 @@ index d5216f4..3554ef3 100644
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -788,6 +790,8 @@ ApplyPatch x86-enable-DMA-CMA-with-swiotlb.patch
@@ -782,6 +784,8 @@ ApplyPatch x86-enable-DMA-CMA-with-swiotlb.patch
ApplyPatch Add-missing-ifdef-around-max-latency-variable.patch
ApplyPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch

8
kernel-rt/centos/patches/Add-missing-ifdef-around-max-latency-variable.patch
View File

@ -1,8 +1,10 @@
From fbc8904ee75e751956cbe0f7e038073e4020fa27 Mon Sep 17 00:00:00 2001
Message-Id: <fbc8904ee75e751956cbe0f7e038073e4020fa27.1507924974.git.Jim.Somerville@windriver.com>
From d871c73e670cdf54cbb396806273302bebd9da6e Mon Sep 17 00:00:00 2001
Message-Id: <d871c73e670cdf54cbb396806273302bebd9da6e.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Thu, 22 Dec 2016 17:54:11 -0500
Subject: [PATCH 1/1] Add missing ifdef around max latency variable
Subject: [PATCH 14/33] Add missing ifdef around max latency variable
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---

10
kernel-rt/centos/patches/Affine-irqs-and-workqueues-with-kthread_cpus.patch
View File

@ -1,10 +1,10 @@
From e90cbe249f37ec1c93f1b3674a725bf4c16abf60 Mon Sep 17 00:00:00 2001
Message-Id: <e90cbe249f37ec1c93f1b3674a725bf4c16abf60.1507911922.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 740c7ef9d851b9e9536fd32b07247811247f98a5 Mon Sep 17 00:00:00 2001
Message-Id: <740c7ef9d851b9e9536fd32b07247811247f98a5.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Chris Friesen <chris.friesen@windriver.com>
Date: Tue, 24 Nov 2015 16:27:29 -0500
Subject: [PATCH 02/26] Affine irqs and workqueues with kthread_cpus
Subject: [PATCH 05/33] Affine irqs and workqueues with kthread_cpus
If the kthread_cpus boot arg is set it means we want to affine
kernel threads to the specified CPU mask as much as possible

14
kernel-rt/centos/patches/CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
View File

@ -1,10 +1,10 @@
From b078d369b8f0505c9a87cc7001dd1c8b34893a43 Mon Sep 17 00:00:00 2001
Message-Id: <b078d369b8f0505c9a87cc7001dd1c8b34893a43.1507911922.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 019f975e35b7746001fef094995f5f8ed3e1e687 Mon Sep 17 00:00:00 2001
Message-Id: <019f975e35b7746001fef094995f5f8ed3e1e687.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Allain Legacy <allain.legacy@windriver.com>
Date: Fri, 29 Jan 2016 12:13:40 -0500
Subject: [PATCH 03/26] CGTS-3744: route: do not cache fib route info on local
Subject: [PATCH 06/33] CGTS-3744: route: do not cache fib route info on local
routes with oif
For local routes that require a particular output interface we do not want to
@ -32,10 +32,10 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 11 insertions(+)
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index e9a2b06..66a2a89 100644
index def37c6..b554914 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -2044,6 +2044,17 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
@@ -2050,6 +2050,17 @@ static struct rtable *__mkroute_output(const struct fib_result *res,
*/
if (fi && res->prefixlen < 4)
fi = NULL;

12
kernel-rt/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
View File

@ -1,10 +1,10 @@
From c227e9a864d4f2567c9ebfdae0f8da703d447fe4 Mon Sep 17 00:00:00 2001
Message-Id: <c227e9a864d4f2567c9ebfdae0f8da703d447fe4.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 16210ff52ec2d6b6d8799220fed83ae17a16f694 Mon Sep 17 00:00:00 2001
Message-Id: <16210ff52ec2d6b6d8799220fed83ae17a16f694.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 12 Jan 2017 21:27:03 +0800
Subject: [PATCH 21/26] CPU / PM: expose pm_qos_resume_latency for CPUs
Subject: [PATCH 24/33] CPU / PM: expose pm_qos_resume_latency for CPUs
[ commit 37efa4b41ffb31dcdfc3beb97d47992bb2a083e5 from linux-stable ]
@ -39,7 +39,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index 0ff0eff..e5a5de3 100644
index 9cc92a2..daae169 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -15,6 +15,7 @@

10
kernel-rt/centos/patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
View File

@ -1,10 +1,10 @@
From dffbc3e34d7080dc2fce05b9c16565e6374572bf Mon Sep 17 00:00:00 2001
Message-Id: <dffbc3e34d7080dc2fce05b9c16565e6374572bf.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 259937f2c70e43a1aea46c3a80c88b86f3e4a37d Mon Sep 17 00:00:00 2001
Message-Id: <259937f2c70e43a1aea46c3a80c88b86f3e4a37d.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Chris Friesen <chris.friesen@windriver.com>
Date: Wed, 11 Jan 2017 13:38:37 -0500
Subject: [PATCH 13/26] Enable building kernel with CONFIG_BLK_DEV_NBD
Subject: [PATCH 16/33] Enable building kernel with CONFIG_BLK_DEV_NBD
By default, the CentOS 7.3 kernel will fail to build if
CONFIG_BLK_DEV_NBD is enabled, either as module or builtin.

10
kernel-rt/centos/patches/Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
View File

@ -1,10 +1,10 @@
From 02ec2a87997e5cfff64bdee145a4dc0e0b46d577 Mon Sep 17 00:00:00 2001
Message-Id: <02ec2a87997e5cfff64bdee145a4dc0e0b46d577.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 5e33851f4482dd8920d1b3669c074ddffd70a088 Mon Sep 17 00:00:00 2001
Message-Id: <5e33851f4482dd8920d1b3669c074ddffd70a088.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Chris Friesen <chris.friesen@windriver.com>
Date: Mon, 9 Jan 2017 15:03:00 -0500
Subject: [PATCH 12/26] Enable building mpt2sas and mpt3sas as builtin for
Subject: [PATCH 15/33] Enable building mpt2sas and mpt3sas as builtin for
CentOS 7.3
In CentOS 7.3 the upstream mpt2sas/mpt3sas drivers are built from

10
kernel-rt/centos/patches/Fix-cacheinfo-compilation-issues-for-3.10.patch
View File

@ -1,10 +1,10 @@
From 5f99bc2a1bed716a9b602e6fdd6e240a6c61260e Mon Sep 17 00:00:00 2001
Message-Id: <5f99bc2a1bed716a9b602e6fdd6e240a6c61260e.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From c033f5d778b1f5a13c34aade143c0e127cd82a99 Mon Sep 17 00:00:00 2001
Message-Id: <c033f5d778b1f5a13c34aade143c0e127cd82a99.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Wed, 19 Jul 2017 02:25:15 -0500
Subject: [PATCH 18/26] Fix cacheinfo compilation issues for 3.10
Subject: [PATCH 21/33] Fix cacheinfo compilation issues for 3.10
Had to revert commit 7cc277b489b4fe91f42eb596b282879c2d13152e:
"Install the callbacks via the state machine and let the core invoke

91
kernel-rt/centos/patches/KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
View File

@ -1,91 +0,0 @@
From f944a307041bf3d43dbc9ca3484982dfec4340f5 Mon Sep 17 00:00:00 2001
From: Wanpeng Li <wanpeng.li@hotmail.com>
Date: Thu, 11 May 2017 18:12:05 -0700
Subject: [PATCH 1/1] KVM: x86: Fix potential preemption when get the current
kvmclock timestamp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
BUG: using __this_cpu_read() in preemptible [00000000] code: qemu-system-x86/2809
caller is __this_cpu_preempt_check+0x13/0x20
CPU: 2 PID: 2809 Comm: qemu-system-x86 Not tainted 4.11.0+ #13
Call Trace:
dump_stack+0x99/0xce
check_preemption_disabled+0xf5/0x100
__this_cpu_preempt_check+0x13/0x20
get_kvmclock_ns+0x6f/0x110 [kvm]
get_time_ref_counter+0x5d/0x80 [kvm]
kvm_hv_process_stimers+0x2a1/0x8a0 [kvm]
? kvm_hv_process_stimers+0x2a1/0x8a0 [kvm]
? kvm_arch_vcpu_ioctl_run+0xac9/0x1ce0 [kvm]
kvm_arch_vcpu_ioctl_run+0x5bf/0x1ce0 [kvm]
kvm_vcpu_ioctl+0x384/0x7b0 [kvm]
? kvm_vcpu_ioctl+0x384/0x7b0 [kvm]
? __fget+0xf3/0x210
do_vfs_ioctl+0xa4/0x700
? __fget+0x114/0x210
SyS_ioctl+0x79/0x90
entry_SYSCALL_64_fastpath+0x23/0xc2
RIP: 0033:0x7f9d164ed357
? __this_cpu_preempt_check+0x13/0x20
This can be reproduced by run kvm-unit-tests/hyperv_stimer.flat w/
CONFIG_PREEMPT and CONFIG_DEBUG_PREEMPT enabled.
Safe access to per-CPU data requires a couple of constraints, though: the
thread working with the data cannot be preempted and it cannot be migrated
while it manipulates per-CPU variables. If the thread is preempted, the
thread that replaces it could try to work with the same variables; migration
to another CPU could also cause confusion. However there is no preemption
disable when reads host per-CPU tsc rate to calculate the current kvmclock
timestamp.
This patch fixes it by utilizing get_cpu/put_cpu pair to guarantee both
__this_cpu_read() and rdtsc() are not preempted.
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Cc: stable@vger.kernel.org
Signed-off-by: Radim Krčmář <rkrcmar@redhat.com>
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
---
arch/x86/kvm/x86.c | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index 8babcb5..84925dc 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1743,6 +1743,7 @@ u64 get_kvmclock_ns(struct kvm *kvm)
{
struct kvm_arch *ka = &kvm->arch;
struct pvclock_vcpu_time_info hv_clock;
+ u64 ret;
spin_lock(&ka->pvclock_gtod_sync_lock);
if (!ka->use_master_clock) {
@@ -1753,10 +1754,17 @@ u64 get_kvmclock_ns(struct kvm *kvm)
hv_clock.system_time = ka->master_kernel_ns + ka->kvmclock_offset;
spin_unlock(&ka->pvclock_gtod_sync_lock);
+ /* both __this_cpu_read() and rdtsc() should be on the same cpu */
+ get_cpu();
+
kvm_get_time_scale(NSEC_PER_SEC, __this_cpu_read(cpu_tsc_khz) * 1000LL,
&hv_clock.tsc_shift,
&hv_clock.tsc_to_system_mul);
- return __pvclock_read_cycles(&hv_clock, rdtsc());
+ ret = __pvclock_read_cycles(&hv_clock, rdtsc());
+
+ put_cpu();
+
+ return ret;
}
static int kvm_guest_time_update(struct kvm_vcpu *v)
--
1.8.3.1

12
kernel-rt/centos/patches/Make-kernel-start-eth-devices-at-offset.patch
View File

@ -1,10 +1,10 @@
From 0f49e3a41bc1edcea227deed767bf24af144b691 Mon Sep 17 00:00:00 2001
Message-Id: <0f49e3a41bc1edcea227deed767bf24af144b691.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From bfce6a674ed9879b29ad1f832ed5f01cd4113c42 Mon Sep 17 00:00:00 2001
Message-Id: <bfce6a674ed9879b29ad1f832ed5f01cd4113c42.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Chris Friesen <chris.friesen@windriver.com>
Date: Thu, 12 May 2016 18:00:00 -0400
Subject: [PATCH 06/26] Make kernel start eth devices at offset
Subject: [PATCH 09/33] Make kernel start eth devices at offset
In order to avoid naming collisions, we want to make the kernel
start naming its "ethX" devices at eth1000 instead of eth0. This
@ -16,7 +16,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 6 insertions(+)
diff --git a/net/core/dev.c b/net/core/dev.c
index 6e016cf..ca3ef1a 100644
index 82c06bc..5324eb6 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1057,6 +1057,12 @@ static int __dev_alloc_name(struct net *net, const char *name, char *buf)

16
kernel-rt/centos/patches/Notification-of-death-of-arbitrary-processes.patch
View File

@ -1,10 +1,10 @@
From e7474cc4bfff10e58d239a773423074d0f71ff38 Mon Sep 17 00:00:00 2001
Message-Id: <e7474cc4bfff10e58d239a773423074d0f71ff38.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 8265cd2e5d675d5ea9ecbd8798df7f58d5b2db71 Mon Sep 17 00:00:00 2001
Message-Id: <8265cd2e5d675d5ea9ecbd8798df7f58d5b2db71.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Chris Friesen <chris.friesen@windriver.com>
Date: Thu, 7 Apr 2016 11:16:19 -0600
Subject: [PATCH 08/26] Notification of death of arbitrary processes
Subject: [PATCH 11/33] Notification of death of arbitrary processes
Note: this commit was copied from Titanium Cloud Rel2
@ -65,7 +65,7 @@ index d8c82e0..ba0c12e 100644
.timer_slack_ns = 50000, /* 50 usec default slack */ \
INIT_TIMER_LIST \
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 4e8bf6a..175461f 100644
index f805b0c..841032d 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1660,6 +1660,12 @@ struct task_struct {
@ -457,10 +457,10 @@ index 8a908ea..448a3c3 100644
__exit_signal(p);
diff --git a/kernel/fork.c b/kernel/fork.c
index 81a8d77..0644030 100644
index 79cab0e..31455e6 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -1469,6 +1469,10 @@ static struct task_struct *copy_process(unsigned long clone_flags,
@@ -1470,6 +1470,10 @@ static struct task_struct *copy_process(unsigned long clone_flags,
p->sequential_io = 0;
p->sequential_io_avg = 0;
#endif

10
kernel-rt/centos/patches/PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
View File

@ -1,10 +1,10 @@
From 06088df87c55e7fac3783e539b0acf45fd9a5bad Mon Sep 17 00:00:00 2001
Message-Id: <06088df87c55e7fac3783e539b0acf45fd9a5bad.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 42288a3b887346752a49fdbb20e4b21f06791890 Mon Sep 17 00:00:00 2001
Message-Id: <42288a3b887346752a49fdbb20e4b21f06791890.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Dahir Osman <dahir.osman@windriver.com>
Date: Wed, 13 Jan 2016 10:01:11 -0500
Subject: [PATCH 09/26] PCI: Add ACS quirk for Intel Fortville NICs
Subject: [PATCH 12/33] PCI: Add ACS quirk for Intel Fortville NICs
Use quirks to determine isolation for now until a later kernel can
properly read the Fortville ACS capabilities.

69
kernel-rt/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
View File

@ -1,10 +1,10 @@
From f00521f1f3af8dc5784e16e92d51f6f386da824d Mon Sep 17 00:00:00 2001
Message-Id: <f00521f1f3af8dc5784e16e92d51f6f386da824d.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 5d2dbe8e437247ccb99ce3bc9daa6240943d036a Mon Sep 17 00:00:00 2001
Message-Id: <5d2dbe8e437247ccb99ce3bc9daa6240943d036a.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Wed, 19 Jul 2017 02:21:59 -0500
Subject: [PATCH 17/26] Porting Cacheinfo from Kernel 4.10.17
Subject: [PATCH 20/33] Porting Cacheinfo from Kernel 4.10.17
Original source code from tag v4.10.17 in Linux stable tree for:
intel_cacheinfo.c, cacheinfo.c and cacheinfo.h.
@ -61,7 +61,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
create mode 100644 include/linux/cacheinfo.h
diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu
index 4a639ed..9e877e1 100644
index 7b467f3..145ae37 100644
--- a/Documentation/ABI/testing/sysfs-devices-system-cpu
+++ b/Documentation/ABI/testing/sysfs-devices-system-cpu
@@ -201,6 +201,71 @@ Description: address and size of the percpu note.
@ -137,7 +137,7 @@ index 4a639ed..9e877e1 100644
/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/turbo_stat
/sys/devices/system/cpu/cpuX/cpufreq/throttle_stats/sub_turbo_stat
diff --git a/arch/x86/kernel/cpu/intel_cacheinfo.c b/arch/x86/kernel/cpu/intel_cacheinfo.c
index 3182124..d8bb5bd 100644
index a77da35..bf23bd2 100644
--- a/arch/x86/kernel/cpu/intel_cacheinfo.c
+++ b/arch/x86/kernel/cpu/intel_cacheinfo.c
@@ -1,5 +1,5 @@
@ -591,7 +591,7 @@ index 3182124..d8bb5bd 100644
}
}
}
@@ -721,72 +774,81 @@ unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c)
@@ -721,34 +774,40 @@ unsigned int init_intel_cacheinfo(struct cpuinfo_x86 *c)
if (new_l2) {
l2 = new_l2;
@ -643,8 +643,27 @@ index 3182124..d8bb5bd 100644
+ struct cacheinfo *this_leaf;
int i, sibling;
- if (cpu_has_topoext) {
+ if (boot_cpu_has(X86_FEATURE_TOPOEXT)) {
/*
@@ -757,40 +816,43 @@ static int cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
*/
if (index == 3) {
for_each_cpu(i, cpu_llc_shared_mask(cpu)) {
- if (!per_cpu(ici_cpuid4_info, i))
+ this_cpu_ci = get_cpu_cacheinfo(i);
+ if (!this_cpu_ci->info_list)
continue;
- this_leaf = CPUID4_INFO_IDX(i, index);
+ this_leaf = this_cpu_ci->info_list + index;
for_each_cpu(sibling, cpu_llc_shared_mask(cpu)) {
if (!cpu_online(sibling))
continue;
- set_bit(sibling, this_leaf->shared_cpu_map);
+ cpumask_set_cpu(sibling,
+ &this_leaf->shared_cpu_map);
}
}
- } else if (cpu_has_topoext) {
+ } else if (boot_cpu_has(X86_FEATURE_TOPOEXT)) {
unsigned int apicid, nshared, first, last;
- if (!per_cpu(ici_cpuid4_info, cpu))
@ -678,27 +697,11 @@ index 3182124..d8bb5bd 100644
continue;
- set_bit(sibling, this_leaf->shared_cpu_map);
+ cpumask_set_cpu(sibling,
+ &this_leaf->shared_cpu_map);
}
}
} else if (index == 3) {
for_each_cpu(i, cpu_llc_shared_mask(cpu)) {
- if (!per_cpu(ici_cpuid4_info, i))
+ this_cpu_ci = get_cpu_cacheinfo(i);
+ if (!this_cpu_ci->info_list)
continue;
- this_leaf = CPUID4_INFO_IDX(i, index);
+ this_leaf = this_cpu_ci->info_list + index;
for_each_cpu(sibling, cpu_llc_shared_mask(cpu)) {
if (!cpu_online(sibling))
continue;
- set_bit(sibling, this_leaf->shared_cpu_map);
+ cpumask_set_cpu(sibling,
+ &this_leaf->shared_cpu_map);
}
}
} else
@@ -795,72 +857,70 @@ static int cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
@@ -799,72 +861,70 @@ static int cache_shared_amd_cpu_map_setup(unsigned int cpu, int index)
return 1;
}
@ -815,7 +818,7 @@ index 3182124..d8bb5bd 100644
}
/*
@@ -882,411 +942,37 @@ static void get_cache_id(int cpu, struct _cpuid4_info_regs *id4_regs)
@@ -886,411 +946,37 @@ static void get_cache_id(int cpu, struct _cpuid4_info_regs *id4_regs)
int get_cpu_cache_id(int cpu, int level)
{
int i;
@ -1929,7 +1932,7 @@ index 0000000..eb3af27
+}
+device_initcall(cacheinfo_sysfs_init);
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index dfc7870..0ff0eff 100644
index 4263273..9cc92a2 100644
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -338,6 +338,60 @@ struct device *get_cpu_device(unsigned cpu)
@ -2104,12 +2107,12 @@ index 0000000..6a524bf
+
+#endif /* _LINUX_CACHEINFO_H */
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 6b8e456..f473ccc 100644
index 0523265..e328af8 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -36,6 +36,9 @@ extern void cpu_remove_dev_attr(struct device_attribute *attr);
extern int cpu_add_dev_attr_group(struct attribute_group *attrs);
extern void cpu_remove_dev_attr_group(struct attribute_group *attrs);
@@ -43,6 +43,9 @@ extern ssize_t cpu_show_spectre_v1(struct device *dev,
extern ssize_t cpu_show_spectre_v2(struct device *dev,
struct device_attribute *attr, char *buf);
+extern struct device *cpu_device_create(struct device *parent, void *drvdata,
+ const struct attribute_group **groups,

10
kernel-rt/centos/patches/US101216-IMA-support-in-Titanium-kernel.patch
View File

@ -1,10 +1,10 @@
From 6ccffebc5216dffb264c996db07dacc2a6764818 Mon Sep 17 00:00:00 2001
Message-Id: <6ccffebc5216dffb264c996db07dacc2a6764818.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From e3029f52b26f33fc0d2c4434eb8667a6a32c97ee Mon Sep 17 00:00:00 2001
Message-Id: <e3029f52b26f33fc0d2c4434eb8667a6a32c97ee.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Kam Nasim <kam.nasim@windriver.com>
Date: Wed, 23 Aug 2017 17:58:12 -0400
Subject: [PATCH 23/26] US101216: IMA support in Titanium kernel
Subject: [PATCH 26/33] US101216: IMA support in Titanium kernel
facilitate building the IMA subsytem out-of-the-kernel tree as a Kernel
module (for which CONFIG_IMA and CONFIG_INTEGRITY will be undefined) by:

8
kernel-rt/centos/patches/US103091-IMA-System-Configuration.patch
View File

@ -1,8 +1,10 @@
From 57cc2aae684bbea546044e973a013bec8bedf409 Mon Sep 17 00:00:00 2001
Message-Id: <57cc2aae684bbea546044e973a013bec8bedf409.1508185780.git.Jim.Somerville@windriver.com>
From 314d5a3dbe0fe5c0758d70246fb47db7dce26e75 Mon Sep 17 00:00:00 2001
Message-Id: <314d5a3dbe0fe5c0758d70246fb47db7dce26e75.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Kam Nasim <kam.nasim@windriver.com>
Date: Wed, 4 Oct 2017 14:02:10 -0400
Subject: [PATCH 1/1] US103091: IMA: System Configuration
Subject: [PATCH 27/33] US103091: IMA: System Configuration
Normally (if trusted integrity keyring is disabled), the _ima keyring
needs to be created by user space (specifically systemd), but that has

22
kernel-rt/centos/patches/affine-compute-kernel-threads.patch
View File

@ -1,8 +1,10 @@
From 0bd66eb88c950d172a7dcefc61cb2e89b89cacce Mon Sep 17 00:00:00 2001
Message-Id: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 4bbc4e75ee08251f9ba71634b39fab8bbc7f47a5 Mon Sep 17 00:00:00 2001
Message-Id: <4bbc4e75ee08251f9ba71634b39fab8bbc7f47a5.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Chris Friesen <chris.friesen@windriver.com>
Date: Tue, 24 Nov 2015 16:27:28 -0500
Subject: [PATCH 01/26] affine compute kernel threads
Subject: [PATCH 04/33] affine compute kernel threads
This is a kernel enhancement to configure the cpu affinity of kernel
threads via kernel boot option kthread_cpus=<cpulist>. The compute
@ -37,12 +39,12 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
6 files changed, 32 insertions(+), 6 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 92b5ff7..e6109df 100644
index 9daf365..6328332 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1482,6 +1482,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
kstack=N [X86] Print N words from the kernel stack
in oops dumps.
@@ -1481,6 +1481,16 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
kpti [X86-64] Enable kernel page table isolation.
+ kthread_cpus= [KNL, SMP] Only run kernel threads on the specified
+ list of processors. The kernel will start threads
@ -78,10 +80,10 @@ index 123f0a3..bc4fea4 100644
#if NR_CPUS > 1
#define num_online_cpus() cpumask_weight(cpu_online_mask)
diff --git a/init/main.c b/init/main.c
index c39460d..49ec0cd 100644
index 13f5343..d22eadb 100644
--- a/init/main.c
+++ b/init/main.c
@@ -945,10 +945,6 @@ static noinline void __init kernel_init_freeable(void)
@@ -948,10 +948,6 @@ static noinline void __init kernel_init_freeable(void)
* init can allocate pages on any node
*/
set_mems_allowed(node_states[N_MEMORY]);
@ -92,7 +94,7 @@ index c39460d..49ec0cd 100644
cad_pid = task_pid(current);
@@ -964,6 +960,8 @@ static noinline void __init kernel_init_freeable(void)
@@ -967,6 +963,8 @@ static noinline void __init kernel_init_freeable(void)
do_basic_setup();

11
kernel-rt/centos/patches/aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
View File

@ -1,8 +1,11 @@
From 36dd5acd196574d41de3e81d8264df475bbb7123 Mon Sep 17 00:00:00 2001
Message-Id: <36dd5acd196574d41de3e81d8264df475bbb7123.1510260544.git.Jim.Somerville@windriver.com>
From 21d9d4710a704e7c4e1a494cd25b6fb567991fe8 Mon Sep 17 00:00:00 2001
Message-Id: <21d9d4710a704e7c4e1a494cd25b6fb567991fe8.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Hannes Reinecke <hare@suse.de>
Date: Mon, 6 Jul 2015 13:07:58 +0200
Subject: [PATCH 1/1] aic94xx: Skip reading user settings if flash is not found
Subject: [PATCH 30/33] aic94xx: Skip reading user settings if flash is not
found
If no user settings are found it's pointless trying to
read them from flash. So skip that step.
@ -48,5 +51,5 @@ index edb43fd..c831e30 100644
if (err) {
ASD_DPRINTK("couldn't process ctrla phy settings\n");
--
1.9.1
1.8.3.1

10
kernel-rt/centos/patches/arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
View File

@ -1,10 +1,10 @@
From 3c27b4b6c4a4ba1f703fdf270a6c886963117b23 Mon Sep 17 00:00:00 2001
Message-Id: <3c27b4b6c4a4ba1f703fdf270a6c886963117b23.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 5b06b6c35a65b9924cc8cd34efcfdabf80c56fd8 Mon Sep 17 00:00:00 2001
Message-Id: <5b06b6c35a65b9924cc8cd34efcfdabf80c56fd8.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Wed, 4 Jun 2014 16:06:56 -0700
Subject: [PATCH 15/26] arch/x86/kernel/pci-dma.c: fix
Subject: [PATCH 18/33] arch/x86/kernel/pci-dma.c: fix
dma_generic_alloc_coherent() when CONFIG_DMA_CMA is enabled
dma_generic_alloc_coherent() firstly attempts to allocate by

12
kernel-rt/centos/patches/cma-add-placement-specifier-for-cma-kernel-parameter.patch
View File

@ -1,10 +1,10 @@
From 4e9b5379a010ad11e88365fbca2828fc08ab5243 Mon Sep 17 00:00:00 2001
Message-Id: <4e9b5379a010ad11e88365fbca2828fc08ab5243.1507911922.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 3a176ca20851cee094e593ebfea34cb318298f5c Mon Sep 17 00:00:00 2001
Message-Id: <3a176ca20851cee094e593ebfea34cb318298f5c.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Tue, 31 May 2016 16:09:04 -0400
Subject: [PATCH 04/26] cma: add placement specifier for "cma=" kernel
Subject: [PATCH 07/33] cma: add placement specifier for "cma=" kernel
parameter
Commit 5ea3b1b2f8ad9162684431ce6188102ca4c64b7a upstream
@ -49,7 +49,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
4 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index e6109df..d723499 100644
index 6328332..81e5488 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -560,8 +560,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

10
kernel-rt/centos/patches/cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
View File

@ -1,10 +1,10 @@
From 83c9c822f24ee171998e209dd571b32a7416eca4 Mon Sep 17 00:00:00 2001
Message-Id: <83c9c822f24ee171998e209dd571b32a7416eca4.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 52a9e3d1424fb24f3a5683919fc8a1d98d10e869 Mon Sep 17 00:00:00 2001
Message-Id: <52a9e3d1424fb24f3a5683919fc8a1d98d10e869.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Fri, 24 Feb 2017 13:25:14 +0100
Subject: [PATCH 22/26] cpuidle: menu: Avoid taking spinlock for accessing QoS
Subject: [PATCH 25/33] cpuidle: menu: Avoid taking spinlock for accessing QoS
values
[commit 6dbf5cea05a7098a69f294c96b6d76f08562cae5 from linux-stable ]

10
kernel-rt/centos/patches/cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
View File

@ -1,10 +1,10 @@
From d087440dbd07fea5c5c52015b93fc46ce8a96d5f Mon Sep 17 00:00:00 2001
Message-Id: <d087440dbd07fea5c5c52015b93fc46ce8a96d5f.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From f90228ac0d638d9e7bec4372411a3fbfbd1844d1 Mon Sep 17 00:00:00 2001
Message-Id: <f90228ac0d638d9e7bec4372411a3fbfbd1844d1.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 12 Jan 2017 21:27:04 +0800
Subject: [PATCH 20/26] cpuidle/menu: add per CPU PM QoS resume latency
Subject: [PATCH 23/33] cpuidle/menu: add per CPU PM QoS resume latency
consideration
[ commit 9908859acaa95640d4a07991a93f7cd5bfc18e02 from linux-stable ]

10
kernel-rt/centos/patches/cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
View File

@ -1,10 +1,10 @@
From dfc5d8197b1e2550462352c15afe4150aa53392a Mon Sep 17 00:00:00 2001
Message-Id: <dfc5d8197b1e2550462352c15afe4150aa53392a.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From e5121449996ca4ab6b4c32dff247ec1b8ee2830f Mon Sep 17 00:00:00 2001
Message-Id: <e5121449996ca4ab6b4c32dff247ec1b8ee2830f.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Alex Shi <alex.shi@linaro.org>
Date: Thu, 12 Jan 2017 21:27:02 +0800
Subject: [PATCH 19/26] cpuidle/menu: stop seeking deeper idle if current state
Subject: [PATCH 22/33] cpuidle/menu: stop seeking deeper idle if current state
is deep enough
[ commit 8e37e1a2a3295f5d99e6dbe99eca24eca7a034ef from linux-stable ]

24
kernel-rt/centos/patches/debrand-rh-i686-cpu.patch
View File

@ -1,6 +1,21 @@
--- a/arch/x86/boot/main.c 2014-06-04 10:05:04.000000000 -0700
+++ b/arch/x86/boot/main.c 2014-07-09 12:54:40.000000000 -0700
@@ -146,7 +146,7 @@ void main(void)
From a258113edc7bffd2bc66cbdfda05c980f7a86b7e Mon Sep 17 00:00:00 2001
Message-Id: <a258113edc7bffd2bc66cbdfda05c980f7a86b7e.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 3 Apr 2018 18:07:37 -0400
Subject: [PATCH 03/33] debrand rh i686 cpu
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
arch/x86/boot/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index 0d12b19..99dcb04 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -147,7 +147,7 @@ void main(void)
/* Make sure we have all the proper CPU support */
if (validate_cpu()) {
@ -9,3 +24,6 @@
die();
}
--
1.8.3.1

10
kernel-rt/centos/patches/debrand-rh_taint.patch
View File

@ -1,14 +1,18 @@
From 69c0d42cfa26515196896dea086857c2caccb6eb Mon Sep 17 00:00:00 2001
From 795444e7e11ed99d7bbe9f8e72cf2b5f11ed4b56 Mon Sep 17 00:00:00 2001
Message-Id: <795444e7e11ed99d7bbe9f8e72cf2b5f11ed4b56.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Jim Perrin <jperrin@centos.org>
Date: Thu, 19 Jun 2014 10:05:12 -0500
Subject: [PATCH] branding patch for rh_taint
Subject: [PATCH 02/33] branding patch for rh_taint
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
kernel/rh_taint.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/rh_taint.c b/kernel/rh_taint.c
index 59a74b0..0708e15 100644
index fd17748..a999c14 100644
--- a/kernel/rh_taint.c
+++ b/kernel/rh_taint.c
@@ -8,7 +8,7 @@

10
kernel-rt/centos/patches/debrand-single-cpu.patch
View File

@ -1,17 +1,19 @@
From 66185f5c6f881847776702e3a7956c504400f4f2 Mon Sep 17 00:00:00 2001
From 21c11de06542297206c798b405b54a3ec9052aa4 Mon Sep 17 00:00:00 2001
Message-Id: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Jim Perrin <jperrin@centos.org>
Date: Thu, 19 Jun 2014 09:53:13 -0500
Subject: [PATCH] branding patch for single-cpu systems
Subject: [PATCH 01/33] branding patch for single-cpu systems
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
arch/x86/kernel/setup.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index b289118..9d25982 100644
index ab95131..dcb7e8a 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -846,7 +846,7 @@ static void rh_check_supported(void)
@@ -872,7 +872,7 @@ static void rh_check_supported(void)
if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
!x86_hyper && !cpu_has_hypervisor && !is_kdump_kernel()) {
pr_crit("Detected single cpu native boot.\n");

12
kernel-rt/centos/patches/dpt_i2o-fix-build-warning.patch
View File

@ -1,8 +1,10 @@
From f50abb9b63b1d8773e1ce32115701c06416e6f91 Mon Sep 17 00:00:00 2001
Message-Id: <f50abb9b63b1d8773e1ce32115701c06416e6f91.1510262508.git.Jim.Somerville@windriver.com>
From 31d8c25a2ff177c2820275464b2812aa829cf123 Mon Sep 17 00:00:00 2001
Message-Id: <31d8c25a2ff177c2820275464b2812aa829cf123.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Date: Thu, 18 Feb 2016 13:59:13 +0530
Subject: [PATCH 1/1] dpt_i2o: fix build warning
Subject: [PATCH 31/33] dpt_i2o: fix build warning
We were getting build warning about:
drivers/scsi/dpt_i2o.c:183:29: warning: 'dptids' defined but not used
@ -19,7 +21,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+)
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index d4cda5e..21c8d21 100644
index 2bce881..cb62223 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -180,11 +180,14 @@ static u8 adpt_read_blink_led(adpt_hba* host)
@ -38,5 +40,5 @@ index d4cda5e..21c8d21 100644
static int adpt_detect(struct scsi_host_template* sht)
--
1.9.1
1.8.3.1

12
kernel-rt/centos/patches/intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
View File

@ -1,10 +1,10 @@
From d72c68c72ecef169b3a01c2623ef7b4542449aa6 Mon Sep 17 00:00:00 2001
Message-Id: <d72c68c72ecef169b3a01c2623ef7b4542449aa6.1507911922.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From be1b4c28c46182b292fc73cc8d0109cd8c0b824f Mon Sep 17 00:00:00 2001
Message-Id: <be1b4c28c46182b292fc73cc8d0109cd8c0b824f.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Matt Peters <matt.peters@windriver.com>
Date: Mon, 30 May 2016 10:51:02 -0400
Subject: [PATCH 05/26] intel-iommu: allow ignoring Ethernet device RMRR with
Subject: [PATCH 08/33] intel-iommu: allow ignoring Ethernet device RMRR with
IOMMU passthrough
Some BIOS's are reporting DMAR RMRR entries for Ethernet devices
@ -56,7 +56,7 @@ index cf9431d..1dcc349 100644
---------------------
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d723499..907487a 100644
index 81e5488..825f2f4 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1267,6 +1267,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted.

10
kernel-rt/centos/patches/memblock-introduce-memblock_alloc_range.patch
View File

@ -1,10 +1,10 @@
From d0f00e7d2fe5e3b77edb1e390ef33c665e644e02 Mon Sep 17 00:00:00 2001
Message-Id: <d0f00e7d2fe5e3b77edb1e390ef33c665e644e02.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From a3672b6ff654120cbd19ced86cf8c27475424a95 Mon Sep 17 00:00:00 2001
Message-Id: <a3672b6ff654120cbd19ced86cf8c27475424a95.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Tue, 31 May 2016 16:07:55 -0400
Subject: [PATCH 07/26] memblock: introduce memblock_alloc_range()
Subject: [PATCH 10/33] memblock: introduce memblock_alloc_range()
Commit 2bfc2862c4fe38379a2fb2cfba33fad32ccb4ff4 upstream
Backported-by: Nam Ninh <nam.ninh@windriver.com>

51
kernel-rt/centos/patches/mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
View File

@ -1,51 +0,0 @@
From c6b013ca69eea1b231191d12ff6392ad5313e6c7 Mon Sep 17 00:00:00 2001
Message-Id: <c6b013ca69eea1b231191d12ff6392ad5313e6c7.1517518298.git.Jim.Somerville@windriver.com>
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Sun, 9 Jul 2017 13:19:55 -0700
Subject: [PATCH 1/1] mqueue: fix a use-after-free in sys_mq_notify()
The retry logic for netlink_attachskb() inside sys_mq_notify()
is nasty and vulnerable:
1) The sock refcnt is already released when retry is needed
2) The fd is controllable by user-space because we already
release the file refcnt
so we when retry but the fd has been just closed by user-space
during this small window, we end up calling netlink_detachskb()
on the error path which releases the sock again, later when
the user-space closes this socket a use-after-free could be
triggered.
Setting 'sock' to NULL here should be sufficient to fix it.
Reported-by: GeneBlue <geneblue.mail@gmail.com>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: stable@kernel.org
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
ipc/mqueue.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ipc/mqueue.c b/ipc/mqueue.c
index ae9cf6a..8a244f4 100644
--- a/ipc/mqueue.c
+++ b/ipc/mqueue.c
@@ -1254,8 +1254,10 @@ retry:
timeo = MAX_SCHEDULE_TIMEOUT;
ret = netlink_attachskb(sock, nc, &timeo, NULL);
- if (ret == 1)
+ if (ret == 1) {
+ sock = NULL;
goto retry;
+ }
if (ret) {
sock = NULL;
nc = NULL;
--
1.8.3.1

10
kernel-rt/centos/patches/rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
View File

@ -1,10 +1,10 @@
From d25e7c407b3556ea8ecccaf6dadaa728d6bcd234 Mon Sep 17 00:00:00 2001
Message-Id: <d25e7c407b3556ea8ecccaf6dadaa728d6bcd234.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 1ecaedbb65c0673425e9f35c619de9a086391aed Mon Sep 17 00:00:00 2001
Message-Id: <1ecaedbb65c0673425e9f35c619de9a086391aed.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Date: Thu, 15 Dec 2016 15:37:47 -0800
Subject: [PATCH 16/26] rcu: Don't wake rcuc/X kthreads on NOCB CPUs
Subject: [PATCH 19/33] rcu: Don't wake rcuc/X kthreads on NOCB CPUs
[ upstream 630c7ed9ca0608912fa7c8591d05dfc8742dc9e6 in tip repo ]

12
kernel-rt/centos/patches/restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
View File

@ -1,11 +1,15 @@
From 84a36052449cae1607d2a18eae2ec2d520992e62 Mon Sep 17 00:00:00 2001
From 1d05af8d8fd2b6c0f9f79af1bc777a8c1df20589 Mon Sep 17 00:00:00 2001
Message-Id: <1d05af8d8fd2b6c0f9f79af1bc777a8c1df20589.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Fri, 16 Mar 2018 15:50:57 -0400
Subject: [PATCH 1/1] affine iSCSI kthreads as per kthread_cpus parameter
Resrict iSCSI kthreads CPU mask according to kthread_cpus kernel option.
Do not allow them to run on other CPUs to prevent interference with VMs.
Subject: [PATCH 33/33] restrict iSCSI kthreads to CPUs in cpu_kthread_mask
Do not allow them to run on other CPUs to prevent interference with VMs.
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
drivers/target/iscsi/iscsi_target.c | 4 ++--
include/linux/cpumask.h | 1 +

14
kernel-rt/centos/patches/timer-Minimize-nohz-off-overhead.patch
View File

@ -1,10 +1,10 @@
From 2e4df25b1cd4cd67877e1d5ad8cb48776b678b2d Mon Sep 17 00:00:00 2001
Message-Id: <2e4df25b1cd4cd67877e1d5ad8cb48776b678b2d.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 6d8b9f4ef4b7e1e9edbce102317a195d06f96441 Mon Sep 17 00:00:00 2001
Message-Id: <6d8b9f4ef4b7e1e9edbce102317a195d06f96441.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 26 May 2015 22:50:35 +0000
Subject: [PATCH 26/26] timer: Minimize nohz off overhead
Subject: [PATCH 29/33] timer: Minimize nohz off overhead
If nohz is disabled on the kernel command line the [hr]timer code
still calls wake_up_nohz_cpu() and tick_nohz_full_cpu(), a pretty
@ -61,7 +61,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
4 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 37b5233..f93bcf7 100644
index 00d4c9b..6183bf8 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -176,6 +176,7 @@ enum hrtimer_base_type {
@ -110,7 +110,7 @@ index 6c92920..3ccc18c 100644
/**
diff --git a/kernel/timer.c b/kernel/timer.c
index 1c40b95..d14e37b 100644
index 4fcb630..08c96e1 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -88,6 +88,7 @@ struct tvec_base {

24
kernel-rt/centos/patches/timer-Reduce-timer-migration-overhead-if-disabled.patch
View File

@ -1,10 +1,10 @@
From dc913075a43c45343b3f1d028ff7c3ab32a80c40 Mon Sep 17 00:00:00 2001
Message-Id: <dc913075a43c45343b3f1d028ff7c3ab32a80c40.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From bd8ffe3c3045b4570c4b39b70c3924a33da3206e Mon Sep 17 00:00:00 2001
Message-Id: <bd8ffe3c3045b4570c4b39b70c3924a33da3206e.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 26 May 2015 22:50:33 +0000
Subject: [PATCH 25/26] timer: Reduce timer migration overhead if disabled
Subject: [PATCH 28/33] timer: Reduce timer migration overhead if disabled
Eric reported that the timer_migration sysctl is not really nice
performance wise as it needs to check at every timer insertion whether
@ -82,7 +82,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
11 files changed, 133 insertions(+), 71 deletions(-)
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h
index 5435498..37b5233 100644
index cd04b77..00d4c9b 100644
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
@@ -175,6 +175,7 @@ enum hrtimer_base_type {
@ -150,7 +150,7 @@ index 05ed589..694e389 100644
unsigned long __round_jiffies_relative(unsigned long j, int cpu);
unsigned long round_jiffies(unsigned long j);
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 9ce838e..d5a76d8 100644
index 40655c8..55444ab 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -168,19 +168,6 @@ struct hrtimer_clock_base *lock_hrtimer_base(const struct hrtimer *timer,
@ -254,10 +254,10 @@ index 6213316..0a70c49 100644
* Try to advance callbacks for all flavors of RCU on the current CPU.
* Afterwards, if there are any callbacks ready for immediate invocation,
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index 54ab4d8..3fff45b 100644
index 5685111..f388158 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -8560,8 +8560,6 @@ void __init sched_init_smp(void)
@@ -8570,8 +8570,6 @@ void __init sched_init_smp(void)
}
#endif /* CONFIG_SMP */
@ -267,7 +267,7 @@ index 54ab4d8..3fff45b 100644
{
return in_lock_functions(addr) ||
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 61f4051..86aba20 100644
index 7ef2e6a..b5a0644 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -347,15 +347,6 @@ static struct ctl_table kern_table[] = {
@ -286,7 +286,7 @@ index 61f4051..86aba20 100644
#ifdef CONFIG_SCHEDSTATS
{
.procname = "sched_schedstats",
@@ -1169,6 +1160,15 @@ static struct ctl_table kern_table[] = {
@@ -1162,6 +1153,15 @@ static struct ctl_table kern_table[] = {
.extra1 = &zero,
.extra2 = &one,
},
@ -417,7 +417,7 @@ index 9174c0a..d7dd92a 100644
* This allows printing both to /proc/timer_list and
* to the console (on SysRq-Q):
diff --git a/kernel/timer.c b/kernel/timer.c
index 63f2f43..1c40b95 100644
index dc85e24..4fcb630 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -49,6 +49,8 @@

8
kernel-rt/centos/patches/turn-off-write-same-in-smartqpi-driver.patch
View File

@ -1,8 +1,10 @@
From 88dc5da8815c32f80f1791c00fa4a435897b45f1 Mon Sep 17 00:00:00 2001
Message-Id: <88dc5da8815c32f80f1791c00fa4a435897b45f1.1520358900.git.Jim.Somerville@windriver.com>
From 40550f5360054b62c0e00a8b176891bbe4139c3e Mon Sep 17 00:00:00 2001
Message-Id: <40550f5360054b62c0e00a8b176891bbe4139c3e.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 6 Mar 2018 12:54:40 -0500
Subject: [PATCH 1/1] turn off write same in smartqpi driver
Subject: [PATCH 32/33] turn off write same in smartqpi driver
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---

12
kernel-rt/centos/patches/x86-enable-DMA-CMA-with-swiotlb.patch
View File

@ -1,10 +1,10 @@
From 2948323707c9abfca9431da3b7dd81c0c505a27e Mon Sep 17 00:00:00 2001
Message-Id: <2948323707c9abfca9431da3b7dd81c0c505a27e.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 537d90bb4398f6b9b9832f750ec131d02be884af Mon Sep 17 00:00:00 2001
Message-Id: <537d90bb4398f6b9b9832f750ec131d02be884af.1522795097.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Wed, 4 Jun 2014 16:06:50 -0700
Subject: [PATCH 10/26] x86: enable DMA CMA with swiotlb
Subject: [PATCH 13/33] x86: enable DMA CMA with swiotlb
commit 9c5a3621427da68afe6a078cadf807d2c8cc1d12 upstream.
Ported-by: Nam Ninh <nam.ninh@windriver.com>
@ -58,7 +58,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
7 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d9ab220..31d8683 100644
index 1577003..100a6e2 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -43,7 +43,7 @@ config X86

10
kernel-rt/centos/patches/x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
View File

@ -1,10 +1,10 @@
From 026d80830e4450cff921a28a554b51509b779ace Mon Sep 17 00:00:00 2001
Message-Id: <026d80830e4450cff921a28a554b51509b779ace.1507911923.git.Jim.Somerville@windriver.com>
In-Reply-To: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
References: <0bd66eb88c950d172a7dcefc61cb2e89b89cacce.1507911922.git.Jim.Somerville@windriver.com>
From 00135c26c13feaa5b906049483742a2249276416 Mon Sep 17 00:00:00 2001
Message-Id: <00135c26c13feaa5b906049483742a2249276416.1522795098.git.Jim.Somerville@windriver.com>
In-Reply-To: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
References: <21c11de06542297206c798b405b54a3ec9052aa4.1522795097.git.Jim.Somerville@windriver.com>
From: Akinobu Mita <akinobu.mita@gmail.com>
Date: Wed, 4 Jun 2014 16:06:48 -0700
Subject: [PATCH 14/26] x86: make dma_alloc_coherent() return zeroed memory if
Subject: [PATCH 17/33] x86: make dma_alloc_coherent() return zeroed memory if
CMA is enabled
This patchset enhances the DMA Contiguous Memory Allocator on x86.

2
kernel-rt/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/kernel-rt-3.10.0-693.2.2.rt56.623.el7.src.rpm
mirror:Source/kernel-rt-3.10.0-693.21.1.rt56.639.el7.src.rpm

12
kernel-std/centos/meta_patches/Allow-ignoring-Ethernet-device-RMRR-with-IOMMU-passt.patch
View File

@ -1,10 +1,10 @@
From 21e3d3468eea25c6eb7f05969fdb2b56c2d104af Mon Sep 17 00:00:00 2001
Message-Id: <21e3d3468eea25c6eb7f05969fdb2b56c2d104af.1507220784.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 06b8a11218f462652588a333cca0154f1bbf815a Mon Sep 17 00:00:00 2001
Message-Id: <06b8a11218f462652588a333cca0154f1bbf815a.1522099415.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:23 -0400
Subject: [PATCH 04/25] Allow ignoring Ethernet device RMRR with IOMMU passt
Subject: [PATCH 04/32] Allow ignoring Ethernet device RMRR with IOMMU passt
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 13dc572..c7c4df4 100644
index a82ec4c..729b9f0 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@

10
kernel-std/centos/meta_patches/CVE-mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
View File

@ -1,8 +1,10 @@
From c75bec8f18ac99965a5134e541b4334d82a0f2a3 Mon Sep 17 00:00:00 2001
Message-Id: <c75bec8f18ac99965a5134e541b4334d82a0f2a3.1517514415.git.Jim.Somerville@windriver.com>
From 78733d3ccec11b917241842658393526a2c5794b Mon Sep 17 00:00:00 2001
Message-Id: <78733d3ccec11b917241842658393526a2c5794b.1522099420.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 19 Dec 2017 17:53:28 -0500
Subject: [PATCH 1/1] CVE mqueue fix a use after free in sys_mq_notify
Subject: [PATCH 30/32] CVE mqueue fix a use after free in sys_mq_notify
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 8532f98..db2e319 100644
index 03863a6..139607f 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -450,6 +450,8 @@ Patch40026: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch

12
kernel-std/centos/meta_patches/Centos-fix-calltrace-in-megaraid-sas-driver.patch
View File

@ -1,10 +1,10 @@
From 1cedf3c592d1c6400e8f0c6899c116e97bd2cecf Mon Sep 17 00:00:00 2001
Message-Id: <1cedf3c592d1c6400e8f0c6899c116e97bd2cecf.1507220784.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 28382f6196cfc7793c8ca5533f0322e04a70f81e Mon Sep 17 00:00:00 2001
Message-Id: <28382f6196cfc7793c8ca5533f0322e04a70f81e.1522099416.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:23 -0400
Subject: [PATCH 05/25] Centos fix calltrace in megaraid sas driver
Subject: [PATCH 05/32] Centos fix calltrace in megaraid sas driver
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index c7c4df4..004ebcb 100644
index 729b9f0..4f7b7b4 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@

12
kernel-std/centos/meta_patches/Check-for-oversized-nfs-arguments.patch
View File

@ -1,10 +1,10 @@
From eb1aeb0fce42608f4c76c50daba8705c680b960b Mon Sep 17 00:00:00 2001
Message-Id: <eb1aeb0fce42608f4c76c50daba8705c680b960b.1507220787.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 1f465340692f95fd46e4670d5cf4d228d1b1fbc3 Mon Sep 17 00:00:00 2001
Message-Id: <1f465340692f95fd46e4670d5cf4d228d1b1fbc3.1522099419.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 22 Aug 2017 17:26:15 -0400
Subject: [PATCH 22/25] Check for oversized nfs arguments
Subject: [PATCH 22/32] Check for oversized nfs arguments
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 466bcdc..ed85a41 100644
index d5e7aaf..6985dbc 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -443,6 +443,7 @@ Patch40026: stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch

10
kernel-std/centos/meta_patches/Cleanup-TIC-patch-list-for-CentOS-7.4-port.patch
View File

@ -1,8 +1,10 @@
From 7bdeda20d3df0a642c1242253cb5b8fc58a31702 Mon Sep 17 00:00:00 2001
Message-Id: <7bdeda20d3df0a642c1242253cb5b8fc58a31702.1507326521.git.Jim.Somerville@windriver.com>
From 93d50ee36287ea51a6e10bf2689058e5d7b5ed64 Mon Sep 17 00:00:00 2001
Message-Id: <93d50ee36287ea51a6e10bf2689058e5d7b5ed64.1522099419.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Thu, 5 Oct 2017 17:27:15 -0400
Subject: [PATCH 1/1] Cleanup TIC patch list for CentOS 7.4 port
Subject: [PATCH 26/32] Cleanup TIC patch list for CentOS 7.4 port
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 62103ae..84a95eb 100644
index e72feaa..d1dc5bf 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -436,19 +436,15 @@ Patch40013: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch

55
kernel-std/centos/meta_patches/Cleanup-patchlist-for-kernel-3.10.0-693.21.1.el7.patch Normal file
View File

@ -0,0 +1,55 @@
From 64f5d136720c79acf533800f0917d2bc70cfc029 Mon Sep 17 00:00:00 2001
Message-Id: <64f5d136720c79acf533800f0917d2bc70cfc029.1522099420.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 26 Mar 2018 17:22:44 -0400
Subject: [PATCH 32/32] Cleanup patchlist for kernel-3.10.0-693.21.1.el7
Dropped 4 patches already included.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index b50d791..65820b9 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -444,16 +444,11 @@ Patch40021: CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
Patch40022: cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
Patch40023: US101216-IMA-support-in-Titanium-kernel.patch
Patch40024: US103091-IMA-System-Configuration.patch
-Patch40025: Fix-CentOS-mistake-thinking-that-Xen-is-always-enabl.patch
# Fix compile warnings that break the build
-Patch40026: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
-Patch40027: dpt_i2o-fix-build-warning.patch
-Patch40028: KVM-x86-remove-irq-disablement-around-KVM_SET_CLOCK-.patch
-Patch40029: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
-# CVE-2017-11176: kernel: Use-after-free in sys_mq_notify()
-Patch40030: mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
+Patch40025: aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
+Patch40026: dpt_i2o-fix-build-warning.patch
# DRBD was choking on write same
-Patch40031: turn-off-write-same-in-smartqpi-driver.patch
+Patch40027: turn-off-write-same-in-smartqpi-driver.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -801,12 +796,8 @@ ApplyOptionalPatch CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
ApplyOptionalPatch cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
ApplyOptionalPatch US101216-IMA-support-in-Titanium-kernel.patch
ApplyOptionalPatch US103091-IMA-System-Configuration.patch
-ApplyOptionalPatch Fix-CentOS-mistake-thinking-that-Xen-is-always-enabl.patch
ApplyOptionalPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
ApplyOptionalPatch dpt_i2o-fix-build-warning.patch
-ApplyOptionalPatch KVM-x86-remove-irq-disablement-around-KVM_SET_CLOCK-.patch
-ApplyOptionalPatch KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
-ApplyOptionalPatch mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
ApplyOptionalPatch turn-off-write-same-in-smartqpi-driver.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

12
kernel-std/centos/meta_patches/Enable-DMA-CMA-with-swiotlb.patch
View File

@ -1,10 +1,10 @@
From 05211712f0b2ca66fde4997d2d2d325b17b4f21c Mon Sep 17 00:00:00 2001
Message-Id: <05211712f0b2ca66fde4997d2d2d325b17b4f21c.1507220785.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 751ffa1e603af3affda807ca36c8c2f370739ba6 Mon Sep 17 00:00:00 2001
Message-Id: <751ffa1e603af3affda807ca36c8c2f370739ba6.1522099416.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:23 -0400
Subject: [PATCH 06/25] Enable DMA CMA with swiotlb
Subject: [PATCH 06/32] Enable DMA CMA with swiotlb
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 004ebcb..54fc219 100644
index 4f7b7b4..0447fe8 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@

12
kernel-std/centos/meta_patches/Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
View File

@ -1,10 +1,10 @@
From 86ee436ccb3760bb0802d4372e992192c2dedb29 Mon Sep 17 00:00:00 2001
Message-Id: <86ee436ccb3760bb0802d4372e992192c2dedb29.1507220786.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From fa97e2bc1a41223b74bf88f04d49c4281275528a Mon Sep 17 00:00:00 2001
Message-Id: <fa97e2bc1a41223b74bf88f04d49c4281275528a.1522099417.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:26 -0400
Subject: [PATCH 15/25] Enable building kernel with CONFIG_BLK_DEV_NBD
Subject: [PATCH 15/32] Enable building kernel with CONFIG_BLK_DEV_NBD
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 73a7f99..c0559d5 100644
index ebff6f1..5fbea09 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -431,6 +431,7 @@ Patch40009: memblock-introduce-memblock_alloc_range.patch

12
kernel-std/centos/meta_patches/Enable-the-rebased-source-patches.patch
View File

@ -1,10 +1,10 @@
From 0db14f243797d5c24524c453fedce25d9662fa41 Mon Sep 17 00:00:00 2001
Message-Id: <0db14f243797d5c24524c453fedce25d9662fa41.1507220786.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From afbf8e51ced50173b233bfbd6e7120111adcf5a3 Mon Sep 17 00:00:00 2001
Message-Id: <afbf8e51ced50173b233bfbd6e7120111adcf5a3.1522099417.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:25 -0400
Subject: [PATCH 12/25] Enable the rebased source patches
Subject: [PATCH 12/32] Enable the rebased source patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index bc52f1d..de04976 100644
index 6d87c33..b212f90 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -420,21 +420,16 @@ Source30000: kernel-3.10.0-x86_64.config.tis_extra

12
kernel-std/centos/meta_patches/Fix-compile-issue-with-transparent-hugepages.patch
View File

@ -1,10 +1,10 @@
From 228d8848a4af532af1d4c92c20389851db1497f0 Mon Sep 17 00:00:00 2001
Message-Id: <228d8848a4af532af1d4c92c20389851db1497f0.1507220785.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From bfa174ce429d56f4832584469edfeb09d4c56c95 Mon Sep 17 00:00:00 2001
Message-Id: <bfa174ce429d56f4832584469edfeb09d4c56c95.1522099417.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:25 -0400
Subject: [PATCH 11/25] Fix compile issue with transparent hugepages
Subject: [PATCH 11/32] Fix compile issue with transparent hugepages
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 9fa6c7b..bc52f1d 100644
index 401e98f..6d87c33 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -419,6 +419,7 @@ Patch1002: debrand-rh-i686-cpu.patch

10
kernel-std/centos/meta_patches/Fix-compile-warnings-in-scsi-drivers.patch
View File

@ -1,8 +1,10 @@
From a56528b5e47a925d169ce3b7e8b5e4bde43c2a1b Mon Sep 17 00:00:00 2001
Message-Id: <a56528b5e47a925d169ce3b7e8b5e4bde43c2a1b.1510262785.git.Jim.Somerville@windriver.com>
From 784a33ecc2a8732ef773c68b1990d165398b6d71 Mon Sep 17 00:00:00 2001
Message-Id: <784a33ecc2a8732ef773c68b1990d165398b6d71.1522099420.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Thu, 9 Nov 2017 15:53:41 -0500
Subject: [PATCH 1/1] Fix compile warnings in scsi drivers
Subject: [PATCH 27/32] Fix compile warnings in scsi drivers
They get turned into errors and thus break the build.
@ -12,7 +14,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 5 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 263bc01..8e1a50d 100644
index d1dc5bf..735f8a0 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -445,6 +445,9 @@ Patch40022: cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch

12
kernel-std/centos/meta_patches/Further-parallelize-kernel-build.patch
View File

@ -1,10 +1,10 @@
From 6b34cc7b511afc2fa8f01985a6d74490bcc12e77 Mon Sep 17 00:00:00 2001
Message-Id: <6b34cc7b511afc2fa8f01985a6d74490bcc12e77.1507220787.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 0a2f84b9437cf6b444cbf946ef7faa54e8bdbe39 Mon Sep 17 00:00:00 2001
Message-Id: <0a2f84b9437cf6b444cbf946ef7faa54e8bdbe39.1522099418.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:27 -0400
Subject: [PATCH 18/25] Further parallelize kernel build
Subject: [PATCH 18/32] Further parallelize kernel build
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 3289bba..6f82e53 100644
index e1661d7..f436d93 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -896,7 +896,7 @@ BuildKernel() {

8
kernel-std/centos/meta_patches/Initial-kernel-build-for-TiS.patch
View File

@ -1,8 +1,8 @@
From 08db0b379c2009e0d5bc0c20427267fa07d75e5a Mon Sep 17 00:00:00 2001
Message-Id: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 37dfb62264baec527d56aaf20db887840bec1ea1 Mon Sep 17 00:00:00 2001
Message-Id: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:22 -0400
Subject: [PATCH 01/25] Initial kernel build for TiS
Subject: [PATCH 01/32] Initial kernel build for TiS
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -10,7 +10,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index f3cd16f..a6884c2 100644
index 5ba126c..55901b6 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -3,7 +3,7 @@

12
kernel-std/centos/meta_patches/Make-kernel-start-eth-devices-at-offset.patch
View File

@ -1,10 +1,10 @@
From 4f0d9b095c0ec101e7dfb2c7af84084f955d308e Mon Sep 17 00:00:00 2001
Message-Id: <4f0d9b095c0ec101e7dfb2c7af84084f955d308e.1507220784.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 7437667e180a53c10774ac02b828e0dba51564b6 Mon Sep 17 00:00:00 2001
Message-Id: <7437667e180a53c10774ac02b828e0dba51564b6.1522099415.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:23 -0400
Subject: [PATCH 03/25] Make kernel start eth devices at offset
Subject: [PATCH 03/32] Make kernel start eth devices at offset
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 0fc23c5..13dc572 100644
index 04b9816..a82ec4c 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@

1
kernel-std/centos/meta_patches/PATCH_ORDER
View File

@ -29,3 +29,4 @@ Resolve-hard-lockup-in-get_kvmclock_ns.patch
export-module-signing-key-in-kernel-devel.patch
CVE-mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
fix-drbd-by-turning-off-write-same-in-smartpqi.patch
Cleanup-patchlist-for-kernel-3.10.0-693.21.1.el7.patch

12
kernel-std/centos/meta_patches/PM-introduce-per-cpu-power-management.patch
View File

@ -1,10 +1,10 @@
From e6db3094a1f71bec80302884257be833f37c75e3 Mon Sep 17 00:00:00 2001
Message-Id: <e6db3094a1f71bec80302884257be833f37c75e3.1507220787.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 944948cf301916d5bccab042853feaadb3e2d7d6 Mon Sep 17 00:00:00 2001
Message-Id: <944948cf301916d5bccab042853feaadb3e2d7d6.1522099418.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Thu, 17 Aug 2017 12:37:41 -0400
Subject: [PATCH 21/25] PM: introduce per-cpu power management
Subject: [PATCH 21/32] PM: introduce per-cpu power management
Cherry-picking 4 commits from the 4.11 branch of the linux-stable tree.
All of the patches require small amount of work to apply to TiC kernel.
@ -17,7 +17,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 8 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 2886708..466bcdc 100644
index 18da325..d5e7aaf 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -439,6 +439,10 @@ Patch40022: cacheinfo-porting-original-4.10.17-version.patch

14
kernel-std/centos/meta_patches/Package-unsigned-kernel.patch
View File

@ -1,10 +1,10 @@
From 381a06a934075707e637ef7a9f818dc4e731e09c Mon Sep 17 00:00:00 2001
Message-Id: <381a06a934075707e637ef7a9f818dc4e731e09c.1507220786.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 5f18b98136646ee1d7eaa65e729bd1dbc06261fc Mon Sep 17 00:00:00 2001
Message-Id: <5f18b98136646ee1d7eaa65e729bd1dbc06261fc.1522099417.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:25 -0400
Subject: [PATCH 13/25] Package unsigned kernel
Subject: [PATCH 13/32] Package unsigned kernel
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 14 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index de04976..aa4f957 100644
index b212f90..48d55c0 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -582,6 +582,13 @@ This package provides debug information for package kernel-tools.
@ -48,7 +48,7 @@ index de04976..aa4f957 100644
+%endif
+
%changelog
* Tue Sep 12 2017 CentOS Sources <bugs@centos.org> - 3.10.0-693.2.2.el7
* Tue Mar 06 2018 CentOS Sources <bugs@centos.org> - 3.10.0-693.21.1.el7
- Apply debranding changes
--
1.8.3.1

12
kernel-std/centos/meta_patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch
View File

@ -1,10 +1,10 @@
From b0e305322f0d22cbd2505c9cdc133ff9f526ed5e Mon Sep 17 00:00:00 2001
Message-Id: <b0e305322f0d22cbd2505c9cdc133ff9f526ed5e.1507220787.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From d82a3a47aabf392521caffc51a5f7fc380584229 Mon Sep 17 00:00:00 2001
Message-Id: <d82a3a47aabf392521caffc51a5f7fc380584229.1522099418.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Fri, 21 Jul 2017 09:47:48 -0500
Subject: [PATCH 19/25] Porting Cacheinfo from Kernel 4.10.17
Subject: [PATCH 19/32] Porting Cacheinfo from Kernel 4.10.17
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 6f82e53..103fd01 100644
index f436d93..46e77bf 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -435,6 +435,8 @@ Patch40013: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch

12
kernel-std/centos/meta_patches/Porting-Resource-Director-Technology-from-Kernel-4.1.patch
View File

@ -1,10 +1,10 @@
From e976aca15e3136d7e42e98ac65deed8fa5eea336 Mon Sep 17 00:00:00 2001
Message-Id: <e976aca15e3136d7e42e98ac65deed8fa5eea336.1507220787.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 7e1b079cbff3b5b668fce530e238eb2af2cf931a Mon Sep 17 00:00:00 2001
Message-Id: <7e1b079cbff3b5b668fce530e238eb2af2cf931a.1522099418.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Mon, 24 Jul 2017 11:46:36 -0500
Subject: [PATCH 20/25] Porting Resource Director Technology from Kernel
Subject: [PATCH 20/32] Porting Resource Director Technology from Kernel
4.10.17
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
@ -13,7 +13,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 103fd01..2886708 100644
index 46e77bf..18da325 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -437,6 +437,8 @@ Patch40015: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch

10
kernel-std/centos/meta_patches/Resolve-hard-lockup-in-get_kvmclock_ns.patch
View File

@ -1,14 +1,18 @@
From c89b0d1916fffc8e8594a7308b35a391bbee6061 Mon Sep 17 00:00:00 2001
From 26005d108fb24bab3db91a721c9cfc5813bc7e61 Mon Sep 17 00:00:00 2001
Message-Id: <26005d108fb24bab3db91a721c9cfc5813bc7e61.1522099420.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Alex Kozyrev <alex.kozyrev@windriver.com>
Date: Thu, 16 Nov 2017 11:32:45 -0500
Subject: [PATCH 1/1] Resolve hard lockup in get_kvmclock_ns
Subject: [PATCH 28/32] Resolve hard lockup in get_kvmclock_ns
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 8e1a50d..ac9eb8c 100644
index 735f8a0..7735ebf 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -448,6 +448,8 @@ Patch40025: Fix-CentOS-mistake-thinking-that-Xen-is-always-enabl.patch

12
kernel-std/centos/meta_patches/Stricter-decoding-of-NFS-ops.patch
View File

@ -1,10 +1,10 @@
From 475beba36f3ec495a70c8823c44b376c249257c0 Mon Sep 17 00:00:00 2001
Message-Id: <475beba36f3ec495a70c8823c44b376c249257c0.1507220787.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From fcf0c30bf7958340360829d0b8395141a834a298 Mon Sep 17 00:00:00 2001
Message-Id: <fcf0c30bf7958340360829d0b8395141a834a298.1522099419.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Tue, 22 Aug 2017 17:30:01 -0400
Subject: [PATCH 23/25] Stricter decoding of NFS ops
Subject: [PATCH 23/32] Stricter decoding of NFS ops
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index ed85a41..32e5a52 100644
index 6985dbc..e6c1dad 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -444,6 +444,8 @@ Patch40027: add-per-cpu-pm-qos-resume-latency-consideration.patch

12
kernel-std/centos/meta_patches/Temporarily-neuter-off-any-TiS-specific-patches.patch
View File

@ -1,10 +1,10 @@
From 5425a28666187bdad67d5cdb673b4d33df5b6a9d Mon Sep 17 00:00:00 2001
Message-Id: <5425a28666187bdad67d5cdb673b4d33df5b6a9d.1507220785.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From ccc5c76ae1a0f60637d37f61e8f098d5ad21d37a Mon Sep 17 00:00:00 2001
Message-Id: <ccc5c76ae1a0f60637d37f61e8f098d5ad21d37a.1522099416.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:25 -0400
Subject: [PATCH 10/25] Temporarily neuter off any TiS specific patches
Subject: [PATCH 10/32] Temporarily neuter off any TiS specific patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 3a2d10d..9fa6c7b 100644
index 6097b90..401e98f 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -419,21 +419,21 @@ Patch1002: debrand-rh-i686-cpu.patch

16
kernel-std/centos/meta_patches/Tweak-install-script-for-patching-add-patch-release.patch
View File

@ -1,10 +1,10 @@
From ab67f811ca20a8ac98307472382876f6c247b00c Mon Sep 17 00:00:00 2001
Message-Id: <ab67f811ca20a8ac98307472382876f6c247b00c.1507220784.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From c8c1453e69025ac3d2afc3064d42b74098bab3aa Mon Sep 17 00:00:00 2001
Message-Id: <c8c1453e69025ac3d2afc3064d42b74098bab3aa.1522099415.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:22 -0400
Subject: [PATCH 02/25] Tweak install script for patching add patch release
Subject: [PATCH 02/32] Tweak install script for patching add patch release
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index a6884c2..0fc23c5 100644
index 55901b6..04b9816 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -3,7 +3,9 @@
@ -30,8 +30,8 @@ index a6884c2..0fc23c5 100644
%global distro_build 693
%define rpmversion 3.10.0
-%define pkgrelease 693.2.2.el7
+%define _pkgrelease 693.2.2
-%define pkgrelease 693.21.1.el7
+%define _pkgrelease 693.21.1
+%define pkgrelease %{_pkgrelease}.el7
%define pkg_release %{pkgrelease}%{?buildid}

14
kernel-std/centos/meta_patches/Update-package-versioning-for-TIS-format.patch
View File

@ -1,10 +1,10 @@
From 02791ff1f3bd5267ffdf2aafb04b9a57cd4eb176 Mon Sep 17 00:00:00 2001
Message-Id: <02791ff1f3bd5267ffdf2aafb04b9a57cd4eb176.1507220785.git.Jim.Somerville@windriver.com>
In-Reply-To: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
References: <08db0b379c2009e0d5bc0c20427267fa07d75e5a.1507220784.git.Jim.Somerville@windriver.com>
From 95f859e51b7db7e6b0434f1c0ea655e9e83d2635 Mon Sep 17 00:00:00 2001
Message-Id: <95f859e51b7db7e6b0434f1c0ea655e9e83d2635.1522099416.git.Jim.Somerville@windriver.com>
In-Reply-To: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
References: <37dfb62264baec527d56aaf20db887840bec1ea1.1522099415.git.Jim.Somerville@windriver.com>
From: Scott Little <scott.little@windriver.com>
Date: Tue, 9 May 2017 13:10:24 -0400
Subject: [PATCH 09/25] Update package versioning for TIS format
Subject: [PATCH 09/32] Update package versioning for TIS format
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
@ -12,7 +12,7 @@ Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index bff543a..3a2d10d 100644
index 99df727..6097b90 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,8 +4,7 @@
@ -26,7 +26,7 @@ index bff543a..3a2d10d 100644
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
@@ -17,7 +16,7 @@ Summary: The Linux kernel
%define _pkgrelease 693.2.2
%define _pkgrelease 693.21.1
%define pkgrelease %{_pkgrelease}.el7
-%define pkg_release %{pkgrelease}%{?buildid}

Some files were not shown because too many files have changed in this diff Show More