starlingx/integ
Code Issues Proposed changes

clean up and squash kernel meta patches

Browse Source 
This long list of meta patches to the spec file was getting
messy and difficult to keep propagating forward.

Change-Id: I6930a674091abed114210b133978d03f69118e9c
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
This commit is contained in:
Jim Somerville 2018-05-03 12:58:06 -04:00 committed by jmckenna
parent e51e090e1e
commit b382f77326
77 changed files with 973 additions and 3586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,36 +0,0 @@
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/39] Add patch for missing ifdef in tracing
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 e6b1d13..8ee6191 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1013: Add-missing-ifdef-around-max-latency-variable.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch Add-missing-ifdef-around-max-latency-variable.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

545
kernel-rt/centos/meta_patches/Build-logic-and-sources-for-TiC.patch Normal file
View File

@ -0,0 +1,545 @@
From bad8bf002117c4df5c2d4b3131567300a4bb3861 Mon Sep 17 00:00:00 2001
Message-Id: <bad8bf002117c4df5c2d4b3131567300a4bb3861.1524511431.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 23 Apr 2018 15:18:45 -0400
Subject: [PATCH 1/2] Build logic and sources for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 281 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 274 insertions(+), 7 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index b855a01..0c3f318 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -17,24 +17,34 @@ Summary: The Linux Realtime kernel
# The Build ID
# %%define buildid .local
+%define buildid .tis.%{tis_patch_ver}
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
%global released_kernel 0
+# If we want to sign the kernel and modules, do_sign should be 1.
+# To speed up builds (don't sign) use 0.
+%global do_sign 1
+
# 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)
# Likewise a bcond_with implies the variable is off by default (turned on by --with)
%bcond_without rt
%bcond_without doc
-%bcond_without debug
-%bcond_with headers
+%bcond_with debug
+%bcond_without headers
%bcond_with vanilla
-%bcond_without trace
+%bcond_with trace
%bcond_with perf
%bcond_with firmware
-%bcond_without debuginfo
+%bcond_with debuginfo
+%bcond_without tools
+
+# Architectures we build tools/cpupower on
+%define cpupowerarchs x86_64 ppc64 ppc64le
+
# 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.
@@ -55,7 +65,11 @@ Summary: The Linux Realtime kernel
# Verbose output?
# %%global verbose V=1
+%if %{do_sign}
%global signmodules 1
+%else
+%global signmodules 0
+%endif
# if patch fuzzy patch applying will be forbidden
%global with_fuzzy_patches 0
@@ -86,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}
-%global pkg_release %{rhel_build}.%{rttag}.%{rtbuild}%{?buildid}%{?dist}
+%global pkg_release %{pkg_release_simple}%{?dist}%{?buildid}
%global KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
@@ -290,9 +304,14 @@ BuildRequires: xmlto, asciidoc
BuildRequires: openssl
BuildRequires: hmaccalc
BuildRequires: elfutils-libelf-devel
+%if %{do_sign}
%ifarch x86_64
BuildRequires: pesign >= 0.109-4
%endif
+%endif
+%if %{with_tools}
+BuildRequires: pciutils-devel gettext ncurses-devel
+%endif
%if %{with_sparse}
BuildRequires: sparse >= 0.4.1
%endif
@@ -340,12 +359,26 @@ Source25: merge.pl
Source27: sanity_check.py
Source29: extrakeys.pub
+Source37: centos.cer
+Source38: ima_signing_key.pub
+%if %{?released_kernel}
+%define pesign_name redhatsecureboot301
+%else
+%define pesign_name redhatsecureboot003
+%endif
### Configuration files
Source50: kernel-%{version}-x86_64-rt.config
Source51: kernel-%{version}-x86_64-rt-trace.config
Source52: kernel-%{version}-x86_64-rt-debug.config
+# Sources for kernel-rt-tools
+Source2000: cpupower.service
+Source2001: cpupower.config
+
+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
### Started using a unified SRPM
# Bugzilla: 1209952
@@ -379,6 +412,7 @@ This kernel has been compiled with the RT patch applied and is intended
for use in deterministic response-time situations
+%if %{builddoc}
%package doc
Summary: Various documentation bits found in the kernel source
Group: Documentation
@@ -390,13 +424,14 @@ 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.
-
+%endif
%package headers
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
+Provides: kernel-headers
%description headers
Kernel-headers includes the C header files that specify the interface
between the Linux kernel and userspace libraries and programs. The
@@ -404,6 +439,7 @@ header files define structures and constants that are needed for
building most standard programs and are also needed for rebuilding the
glibc package.
+%if %{buildfirmware}
%package firmware
Summary: Firmware files used by the Linux kernel
Group: Development/System
@@ -415,6 +451,7 @@ Provides: kernel-rt-firmware = %{rpmversion}-%{pkg_release}
%description firmware
Kernel-firmware includes firmware files required for some devices to
operate.
+%endif
%if %{builddebuginfo}
%package debuginfo-common-%{_target_cpu}
@@ -456,6 +493,7 @@ AutoReq: no\
This package provides KVM modules for package %{name}%{?1:-%{1}}.\
%{nil}
+%if %{builddebuginfo}
#
# This macro creates a kernel-rt-<subpackage>-kvm-debuginfo package.
# %%kernel_kvm_debuginfo_package <subpackage>
@@ -471,7 +509,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}
+%endif
+%if %{builddebuginfo}
#
# This macro creates a kernel-<subpackage>-debuginfo package.
# %%kernel_debuginfo_package <subpackage>
@@ -488,6 +528,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}
+%endif
#
# This macro creates a kernel-<subpackage>-devel package.
@@ -501,6 +542,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}}\
+Provides: kernel-devel = %{version}-%{release}%{?1:.%{1}}\
AutoReqProv: no\
Requires(pre): /usr/bin/find\
%description -n kernel-rt%{?variant}%{?1:-%{1}}-devel\
@@ -513,6 +555,7 @@ against the %{?2:%{2} }kernel package.\
# %%define variant_summary The Linux kernel compiled for <configuration>
# %%kernel_variant_package [-n <pretty-name>] <subpackage>
#
+%if %{builddebuginfo}
%define kernel_variant_package(n:) \
%package %1\
Summary: %{variant_summary}\
@@ -523,15 +566,29 @@ Group: System Environment/Kernel\
%{expand:%%kernel_kvm_package %1}\
%{expand:%%kernel_kvm_debuginfo_package %1}\
%{nil}
+%else
+%define kernel_variant_package(n:) \
+%package %1\
+Summary: %{variant_summary}\
+Group: System Environment/Kernel\
+%kernel_reqprovconf\
+%{expand:%%kernel_devel_package %1 %{!?-n:%1}%{?-n:%{-n*}}}\
+%{expand:%%kernel_kvm_package %1}\
+%{nil}
+%endif
# First the auxiliary packages of the main kernel package.
%kernel_devel_package
+%if %{builddebuginfo}
%kernel_debuginfo_package
+%endif
# create the production kvm module package
%kernel_kvm_package
+%if %{builddebuginfo}
%kernel_kvm_debuginfo_package
+%endif
# Now, each variant package.
@@ -581,6 +638,54 @@ It should only be installed when trying to gather additional information
on kernel bugs.
%endif
+%if %{with_tools}
+
+%package -n kernel-rt-tools
+Summary: Assortment of tools for the Linux kernel
+Group: Development/System
+License: GPLv2
+Provides: cpupowerutils-rt = 1:009-0.6.p1
+Obsoletes: cpupowerutils-rt < 1:009-0.6.p1
+Provides: cpufreq-utils-rt = 1:009-0.6.p1
+Provides: cpufrequtils-rt = 1:009-0.6.p1
+Obsoletes: cpufreq-utils-rt < 1:009-0.6.p1
+Obsoletes: cpufrequtils-rt < 1:009-0.6.p1
+Obsoletes: cpuspeed-rt < 1:2.0
+Requires: kernel-rt-tools-libs = %{version}-%{release}
+%description -n kernel-rt-tools
+This package contains the tools/ directory from the kernel source
+and the supporting documentation.
+
+%package -n kernel-rt-tools-libs
+Summary: Libraries for the kernels-tools
+Group: Development/System
+License: GPLv2
+%description -n kernel-rt-tools-libs
+This package contains the libraries built from the tools/ directory
+from the kernel source.
+
+%package -n kernel-rt-tools-libs-devel
+Summary: Assortment of tools for the Linux kernel
+Group: Development/System
+License: GPLv2
+Requires: kernel-rt-tools = %{version}-%{release}
+Provides: cpupowerutils-devel = 1:009-0.6.p1.1
+Obsoletes: cpupowerutils-devel <= 1:009-0.6.p1
+Requires: kernel-rt-tools-libs = %{version}-%{release}
+Provides: kernel-rt-tools-devel
+%description -n kernel-rt-tools-libs-devel
+This package contains the development files for the tools/ directory from
+the kernel source.
+
+%endif # with_tools
+
+%if %{do_sign}
+%package unsigned
+Summary: Unsigned build of the Linux kernel
+%description unsigned
+Contains an unsigned version of the Linux kernel
+%endif # do_sign
+
%prep
## ApplyPatch routine
patch_command='patch -p1 -F1 -s'
@@ -641,6 +746,12 @@ cp -rl vanilla-%{kversion} linux-%{kversion}.%{_target_cpu}
cd linux-%{kversion}.%{_target_cpu}
+# Copy any TiS-specific config changes
+cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
+
+# Copy TiS specific IMA public key
+cp %{SOURCE38} .
+
## Apply Patches here
ApplyPatch linux-kernel-test.patch
@@ -664,6 +775,15 @@ for i in *.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`
+
+ # Handle Titanium Cloud customizations. Use -n to match oldnoconfig below. We want this before
+ # the make line below so that the one below removes any dependencies of ones that we
+ # turn off here. We also want it before "make listnewconfig" so that we can set the
+ # config option for new configs introduced in the Titanium Cloud patches.
+ if [ -f ${i}.tis_extra ]; then
+ scripts/kconfig/merge_config.sh -m -n .config ${i}.tis_extra
+ fi
+
make %{?cross_opts} ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
%if %{listnewconfig_fail}
if [ -s .newoptions ]; then
@@ -798,10 +918,14 @@ BuildKernel() {
cp arch/$Arch/boot/zImage.stub $RPM_BUILD_ROOT/%{image_install_path}/zImage.stub-$KernelVer || :
fi
# EFI SecureBoot signing, x86_64-only
+%if %{do_sign}
+ cp $KernelImage vmlinuz.unsigned
+ $CopyKernel vmlinuz.unsigned $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz.unsigned
%ifarch x86_64
- %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
+%endif
$CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -944,6 +1068,12 @@ BuildKernel() {
cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}
+ # WRS: Copy these keys as part of the devel package
+ # The Module signing keys are to ensure that only Out-of-tree
+ # built against the Titanium Kernel get signed and loaded sans warnings
+ cp signing_key.priv ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+ cp signing_key.x509 ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+
# remove files that will be auto generated by depmod at rpm -i time
for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap softdep devname
do
@@ -957,6 +1087,15 @@ BuildKernel() {
# copy Module.symvers
cp Module.symvers $RPM_BUILD_ROOT/$DevelDir
+ # create the kABI metadata for use in packaging
+ # NOTENOTE: the name symvers is used by the rpm backend
+ # NOTENOTE: to discover and run the /usr/lib/rpm/fileattrs/kabi.attr
+ # NOTENOTE: script which dynamically adds exported kernel symbol
+ # NOTENOTE: checksums to the rpm metadata provides list.
+ # NOTENOTE: if you change the symvers name, update the backend too
+ echo "**** GENERATING kernel ABI metadata ****"
+ gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz
+
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
}
@@ -997,6 +1136,31 @@ BuildKernel %make_target %kernel_image vanilla
BuildKernel %make_target %kernel_image
%endif
+%if %{with_tools}
+%ifarch %{cpupowerarchs}
+# cpupower
+# make sure version-gen.sh is executable.
+chmod +x tools/power/cpupower/utils/version-gen.sh
+make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
+%ifarch x86_64
+ pushd tools/power/cpupower/debug/x86_64
+ make %{?_smp_mflags} centrino-decode powernow-k8-decode
+ popd
+%endif
+%ifarch x86_64
+ pushd tools/power/x86/x86_energy_perf_policy/
+ make
+ popd
+ pushd tools/power/x86/turbostat
+ make
+ popd
+%endif #turbostat/x86_energy_perf_policy
+%endif
+pushd tools
+make tmon
+popd
+%endif
+
%if %{builddoc}
# Make the HTML and man pages.
make -j1 htmldocs mandocs || %{doc_build_fail}
@@ -1029,6 +1193,7 @@ popd
# if it isn't.
%ifnarch noarch
+%if %{do_sign}
%define __modsign_install_post \
if [ "%{with_rt}" -ne "0" ]; then \
Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt.config | cut -b 3-` \
@@ -1047,6 +1212,24 @@ popd
%{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.${AAA} || exit 1 \
done \
%{nil}
+%else
+%define __modsign_install_post \
+ if [ "%{with_rt}" -ne "0" ]; then \
+ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt.config | cut -b 3-` \
+ rm -rf .tmp_versions \
+ mv .tmp_versions.sign .tmp_versions \
+ mv signing_key.priv.sign signing_key.priv \
+ mv signing_key.x509.sign signing_key.x509 \
+ fi\
+ for AAA in %{?with_trace:trace} %{?with_debug:debug} %{?with_vanilla:vanilla}; do \
+ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt-${AAA}.config | cut -b 3-` \
+ rm -rf .tmp_versions \
+ mv .tmp_versions.sign.${AAA} .tmp_versions \
+ mv signing_key.priv.sign.${AAA} signing_key.priv \
+ mv signing_key.x509.sign.${AAA} signing_key.x509 \
+ done \
+%{nil}
+%endif
%endif
###
@@ -1136,6 +1319,39 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
%endif # buildperf
%endif
+%if %{with_tools}
+%ifarch %{cpupowerarchs}
+make -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
+rm -f %{buildroot}%{_libdir}/*.{a,la}
+%find_lang cpupower
+mv cpupower.lang ../
+%ifarch x86_64
+ pushd tools/power/cpupower/debug/x86_64
+ install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
+ install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
+ popd
+%endif
+chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
+mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
+install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
+%ifarch %{ix86} x86_64
+ mkdir -p %{buildroot}%{_mandir}/man8
+ pushd tools/power/x86/x86_energy_perf_policy
+ make DESTDIR=%{buildroot} install
+ popd
+ pushd tools/power/x86/turbostat
+ make DESTDIR=%{buildroot} install
+ popd
+%endif #turbostat/x86_energy_perf_policy
+pushd tools/thermal/tmon
+make INSTALL_ROOT=%{buildroot} install
+popd
+%endif
+
+%endif
+
+
%if %{buildheaders}
# Install kernel headers
make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
@@ -1184,6 +1400,14 @@ rm -rf $RPM_BUILD_ROOT
### scripts
###
+%if %{with_tools}
+%post -n kernel-rt-tools
+/sbin/ldconfig
+
+%postun -n kernel-rt-tools
+/sbin/ldconfig
+%endif
+
#
# This macro defines a %%post script for a kernel*-devel package.
# %%kernel_devel_post [<subpackage>]
@@ -1344,6 +1568,43 @@ fi
%endif
%endif
+
+%if %{with_tools}
+%files -n kernel-rt-tools -f cpupower.lang
+%defattr(-,root,root)
+%ifarch %{cpupowerarchs}
+%{_bindir}/cpupower
+%ifarch x86_64
+%{_bindir}/centrino-decode
+%{_bindir}/powernow-k8-decode
+%endif
+%{_unitdir}/cpupower.service
+%{_mandir}/man[1-8]/cpupower*
+%config(noreplace) %{_sysconfdir}/sysconfig/cpupower
+%ifarch %{ix86} x86_64
+%{_bindir}/x86_energy_perf_policy
+%{_mandir}/man8/x86_energy_perf_policy*
+%{_bindir}/turbostat
+%{_mandir}/man8/turbostat*
+%endif
+%endif
+%{_bindir}/tmon
+
+%ifarch %{cpupowerarchs}
+%files -n kernel-rt-tools-libs
+%defattr(-,root,root)
+%{_libdir}/libcpupower.so.0
+%{_libdir}/libcpupower.so.0.0.0
+
+%files -n kernel-rt-tools-libs-devel
+%defattr(-,root,root)
+%{_libdir}/libcpupower.so
+%{_includedir}/cpufreq.h
+%endif
+
+%endif # with_tools
+
+
# This is %{image_install_path} on an arch where that includes ELF files,
# or empty otherwise.
%global elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
@@ -1360,6 +1621,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}}\
+/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
/boot/config-%{KVERREL}%{?2:.%{2}}\
%exclude /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/arch/x86/kvm\
%exclude /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/drivers/gpu/drm/i915/gvt\
@@ -1437,6 +1699,11 @@ fi
%kernel_variant_files %{buildvanilla} vanilla
%endif
+%if %{do_sign}
+%files unsigned
+/boot/vmlinuz.unsigned
+%endif # do_sign
+
%changelog
* 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

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

@ -1,37 +0,0 @@
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 36/39] CVE mqueue fix a use after free in sys_mq_notify
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f45d2a9..c7816a6 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+# CVE-2017-11176: kernel: Use-after-free in sys_mq_notify()
+Patch1032: mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch mqueue-fix-a-use-after-free-in-sys_mq_notify.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,29 +0,0 @@
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 31/39] Change name of source tarball drop el7
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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 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
%define debuginfo_args --strict-build-id -r
%endif
-Source0: %{name}-%{rpmversion}-%{pkg_release_simple}%{?dist}.tar.xz
+Source0: %{name}-%{rpmversion}-%{pkg_release_simple}.tar.xz
Source10: sign-modules
%define modsign_cmd %{SOURCE10}
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/39] Check for oversized nfs arguments
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 a0f04ae..91899ab 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1032: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,92 +0,0 @@
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 30/39] Cleanup TIC patch list for CentOS 7.4 port
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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 0f021b5..14120ce 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
-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
-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
-Patch1026: intel-rdt-porting-original-4.10.17-version.patch
-Patch1027: intel-rdt-fixing-compilation-issues-on-3.10.patch
-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
-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
-Patch1036: timer-reduce-timer-migration-overhead-if-disabled.patch
-Patch1037: timer-minimize-nohz-off-overhead.patch
-Patch1038: US103091-IMA-System-Configuration.patch
+Patch1019: Porting-Cacheinfo-from-Kernel-4.10.17.patch
+Patch1020: Fix-cacheinfo-compilation-issues-for-3.10.patch
+Patch1021: cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+Patch1022: cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+Patch1023: CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
+Patch1024: cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
+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
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
-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
-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
-ApplyPatch intel-rdt-porting-original-4.10.17-version.patch
-ApplyPatch intel-rdt-fixing-compilation-issues-on-3.10.patch
-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
-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 Porting-Cacheinfo-from-Kernel-4.10.17.patch
+ApplyPatch Fix-cacheinfo-compilation-issues-for-3.10.patch
+ApplyPatch cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+ApplyPatch cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+ApplyPatch CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
+ApplyPatch cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.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
ApplyPatch US103091-IMA-System-Configuration.patch
+ApplyPatch timer-Reduce-timer-migration-overhead-if-disabled.patch
+ApplyPatch timer-Minimize-nohz-off-overhead.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,45 +0,0 @@
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

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

@ -1,29 +0,0 @@
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/39] Correct the source tarball name
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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 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
%define debuginfo_args --strict-build-id -r
%endif
-Source0: %{name}-%{rpmversion}-%{pkg_release_simple}.tar.xz
+Source0: %{name}-%{rpmversion}-%{rhel_build}.%{rttag}.%{rtbuild}%{?buildid}%{?dist}.tar.xz
Source10: sign-modules
%define modsign_cmd %{SOURCE10}
--
1.8.3.1

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

@ -1,117 +0,0 @@
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/39] Disable debug
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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 9a8fb8c..b3126ce 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
-%bcond_without debug
-%bcond_with headers
+%bcond_with debug
+%bcond_without headers
%bcond_with vanilla
%bcond_with trace
%bcond_with perf
%bcond_with firmware
-%bcond_without debuginfo
+%bcond_with debuginfo
# 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.
@@ -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
+Provides: kernel-headers
%description headers
Kernel-headers includes the C header files that specify the interface
between the Linux kernel and userspace libraries and programs. The
@@ -466,6 +467,7 @@ AutoReq: no\
This package provides KVM modules for package %{name}%{?1:-%{1}}.\
%{nil}
+%if %{builddebuginfo}
#
# This macro creates a kernel-rt-<subpackage>-kvm-debuginfo package.
# %%kernel_kvm_debuginfo_package <subpackage>
@@ -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}
+%endif
+%if %{builddebuginfo}
#
# This macro creates a kernel-<subpackage>-debuginfo package.
# %%kernel_debuginfo_package <subpackage>
@@ -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}
+%endif
#
# This macro creates a kernel-<subpackage>-devel package.
@@ -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}}\
+Provides: kernel-devel = %{version}-%{release}%{?1:.%{1}}\
AutoReqProv: no\
Requires(pre): /usr/bin/find\
%description -n kernel-rt%{?variant}%{?1:-%{1}}-devel\
@@ -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>
#
+%if %{builddebuginfo}
%define kernel_variant_package(n:) \
%package %1\
Summary: %{variant_summary}\
@@ -533,15 +540,29 @@ Group: System Environment/Kernel\
%{expand:%%kernel_kvm_package %1}\
%{expand:%%kernel_kvm_debuginfo_package %1}\
%{nil}
+%else
+%define kernel_variant_package(n:) \
+%package %1\
+Summary: %{variant_summary}\
+Group: System Environment/Kernel\
+%kernel_reqprovconf\
+%{expand:%%kernel_devel_package %1 %{!?-n:%1}%{?-n:%{-n*}}}\
+%{expand:%%kernel_kvm_package %1}\
+%{nil}
+%endif
# First the auxiliary packages of the main kernel package.
%kernel_devel_package
+%if %{builddebuginfo}
%kernel_debuginfo_package
+%endif
# create the production kvm module package
%kernel_kvm_package
+%if %{builddebuginfo}
%kernel_kvm_debuginfo_package
+%endif
# Now, each variant package.
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/39] Enable building kernel with CONFIG_BLK_DEV_NBD
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 b6141b0..d9ee5c6 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1015: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,44 +0,0 @@
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/39] Enable symvers
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 8bf2efa..29d78fd 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -991,6 +991,15 @@ BuildKernel() {
# copy Module.symvers
cp Module.symvers $RPM_BUILD_ROOT/$DevelDir
+ # create the kABI metadata for use in packaging
+ # NOTENOTE: the name symvers is used by the rpm backend
+ # NOTENOTE: to discover and run the /usr/lib/rpm/fileattrs/kabi.attr
+ # NOTENOTE: script which dynamically adds exported kernel symbol
+ # NOTENOTE: checksums to the rpm metadata provides list.
+ # NOTENOTE: if you change the symvers name, update the backend too
+ echo "**** GENERATING kernel ABI metadata ****"
+ gzip -c9 < Module.symvers > $RPM_BUILD_ROOT/boot/symvers-$KernelVer.gz
+
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
}
@@ -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}}\
+/boot/symvers-%{KVERREL}%{?2:.%{2}}.gz\
/boot/config-%{KVERREL}%{?2:.%{2}}\
%exclude /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/arch/x86/kvm\
%exclude /lib/modules/%{KVERREL}%{?2:.%{2}}/kernel/drivers/gpu/drm/i915/gvt\
--
1.8.3.1

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

@ -1,53 +0,0 @@
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/39] Exclude package defs for unbuilt firmware and doc pkg
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index b3126ce..8bf2efa 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -389,6 +389,7 @@ This kernel has been compiled with the RT patch applied and is intended
for use in deterministic response-time situations
+%if %{builddoc}
%package doc
Summary: Various documentation bits found in the kernel source
Group: Documentation
@@ -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.
-
+%endif
%package headers
Summary: Header files for the Linux kernel for use by glibc
@@ -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.
+%if %{buildfirmware}
%package firmware
Summary: Firmware files used by the Linux kernel
Group: Development/System
@@ -426,6 +428,7 @@ Provides: kernel-rt-firmware = %{rpmversion}-%{pkg_release}
%description firmware
Kernel-firmware includes firmware files required for some devices to
operate.
+%endif
%if %{builddebuginfo}
%package debuginfo-common-%{_target_cpu}
--
1.8.3.1

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

@ -1,41 +0,0 @@
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 33/39] Fix compile warnings in scsi drivers
They get turned into errors and thus break the build.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 9c95078..4706989 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+# 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
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
+ApplyPatch dpt_i2o-fix-build-warning.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,51 +0,0 @@
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/39] Fix stack clash
Consists of 3 patches taken from the linux-3.10.y branch of the
linux-stable tree.
The first (main) patch applied fairly cleanly with offsets,
requiring a small amount of wiggle and a bit of manual work
due to some affected code residing in mm/gup.c .
The other 2 patches applied cleanly.
This fix here is only temporary and won't be needed once we
move to a newer released CentOS kernel that includes it.
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 0bfaf4e..195db97 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+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
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+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
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

102
kernel-rt/centos/meta_patches/Kernel-source-patches-for-TiC.patch Normal file
View File

@ -0,0 +1,102 @@
From 474dba949c833af02a3c7662ebe888858cc76bfc Mon Sep 17 00:00:00 2001
Message-Id: <474dba949c833af02a3c7662ebe888858cc76bfc.1524511431.git.Jim.Somerville@windriver.com>
In-Reply-To: <bad8bf002117c4df5c2d4b3131567300a4bb3861.1524511431.git.Jim.Somerville@windriver.com>
References: <bad8bf002117c4df5c2d4b3131567300a4bb3861.1524511431.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Mon, 23 Apr 2018 15:19:36 -0400
Subject: [PATCH 2/2] Kernel source patches for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 0c3f318..f985ed4 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -392,6 +392,41 @@ Patch001: avoid-debuginfo-hash-collision-scripts.patch
# Empty final patch file to facilitate testing of kernel patches
Patch999999: linux-kernel-test.patch
+Patch1000: debrand-single-cpu.patch
+Patch1001: debrand-rh_taint.patch
+Patch1002: debrand-rh-i686-cpu.patch
+Patch1003: affine-compute-kernel-threads.patch
+Patch1004: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+Patch1005: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+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
+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
+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
+Patch1018: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
+Patch1019: Porting-Cacheinfo-from-Kernel-4.10.17.patch
+Patch1020: Fix-cacheinfo-compilation-issues-for-3.10.patch
+Patch1021: cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+Patch1022: cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+Patch1023: CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
+Patch1024: cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
+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
+# 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
+# DRBD was choking on write same
+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
@@ -754,6 +789,39 @@ cp %{SOURCE38} .
## Apply Patches here
ApplyPatch linux-kernel-test.patch
+ApplyPatch debrand-single-cpu.patch
+ApplyPatch debrand-rh_taint.patch
+ApplyPatch debrand-rh-i686-cpu.patch
+ApplyPatch affine-compute-kernel-threads.patch
+ApplyPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+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
+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
+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
+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
+ApplyPatch Porting-Cacheinfo-from-Kernel-4.10.17.patch
+ApplyPatch Fix-cacheinfo-compilation-issues-for-3.10.patch
+ApplyPatch cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+ApplyPatch cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+ApplyPatch CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch
+ApplyPatch cpuidle-menu-Avoid-taking-spinlock-for-accessing-QoS.patch
+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
+ApplyPatch aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
+ApplyPatch dpt_i2o-fix-build-warning.patch
+ApplyPatch turn-off-write-same-in-smartqpi-driver.patch
+ApplyPatch restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,39 +1,2 @@
tis-debrand-and-add-centos-certificate.patch
tis-remove-trace.patch
Update-package-versioning-for-TIS-format.patch
Disable-debug.patch
Exclude-package-defs-for-unbuilt-firmware-and-doc-pk.patch
Enable-symvers.patch
tis-remove-signing.patch
tis-apply-patches.patch
tis-handle-tis-config-customizations.patch
tis-add-tools.patch
Correct-the-source-tarball-name.patch
Rework-pkg-release-naming.patch
lose-the-memblock-reorder-parms-patch.patch
Add-patch-for-missing-ifdef-in-tracing.patch
tis-build-unsigned-package.patch
enable-building-mpt2sas-mpt3sas-as-builtin.patch
Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
x86-dma_alloc_coherent-fix.patch
rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
Fix-stack-clash.patch
Porting-Kernfs-from-Kernel-3.10.patch
Porting-Cacheinfo-from-Kernel-4.10.17.patch
Porting-Resource-Director-Technology-from-Kernel-4.1.patch
PM-introduce-per-cpu-power-management.patch
Check-for-oversized-nfs-arguments.patch
Stricter-decoding-of-NFS-ops.patch
meta-patch-for-Kernel-IMA-changes.patch
fix-high-latency-reported-by-cyclictest.patch
meta-patch-for-Kernel-IMA-keyring-changes.patch
Cleanup-TIC-patch-list-for-CentOS-7.4-port.patch
Change-name-of-source-tarball-drop-el7.patch
Update-package-versioning-for-TIS-format-revised.patch
Fix-compile-warnings-in-scsi-drivers.patch
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
restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
Cleanup-patchlist-for-kernel-rt-3.10.0-693.21.1.rt56.patch
Build-logic-and-sources-for-TiC.patch
Kernel-source-patches-for-TiC.patch

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

@ -1,47 +0,0 @@
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/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.
Fixes are temporary until we switch to CentOS kernel that includes them.
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 6bf0a56..a0f04ae 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+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
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+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
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/39] Porting Cacheinfo from Kernel 4.10.17
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f536cc4..f1dda7e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1024: cacheinfo-porting-original-4.10.17-version.patch
+Patch1025: cacheinfo-fixing-compilation-issues-on-3.10.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch cacheinfo-porting-original-4.10.17-version.patch
+ApplyPatch cacheinfo-fixing-compilation-issues-on-3.10.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/39] Porting Kernfs from Kernel 3.10
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 195db97..f536cc4 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1022: kernfs-porting-original-3.15-version.patch
+Patch1023: kernfs-fixing-compilation-issues-on-3.10.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch kernfs-porting-original-3.15-version.patch
+ApplyPatch kernfs-fixing-compilation-issues-on-3.10.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,39 +0,0 @@
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/39] Porting Resource Director Technology from Kernel
4.10.17
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index f1dda7e..6bf0a56 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1026: intel-rdt-porting-original-4.10.17-version.patch
+Patch1027: intel-rdt-fixing-compilation-issues-on-3.10.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch intel-rdt-porting-original-4.10.17-version.patch
+ApplyPatch intel-rdt-fixing-compilation-issues-on-3.10.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,36 +0,0 @@
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 34/39] Resolve hard lockup in get_kvmclock_ns
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 4706989..34774c1 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1031: KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch KVM-x86-Fix-potential-preemption-when-get-the-curren.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/39] Rework pkg release naming
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 4d5d58d..91c2661 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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}
-%global pkg_release %{rhel_build}.%{rttag}.%{rtbuild}%{?buildid}%{?dist}
+%global pkg_release %{pkg_release_simple}%{?buildid}%{?dist}
%global KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
@@ -334,7 +334,7 @@ BuildRequires: rpm-build >= 4.9.0-1, elfutils >= 0.153-1
%define debuginfo_args --strict-build-id -r
%endif
-Source0: %{name}-%{rpmversion}-%{rhel_build}.%{rttag}.%{rtbuild}%{?buildid}%{?dist}.tar.xz
+Source0: %{name}-%{rpmversion}-%{pkg_release_simple}%{?dist}.tar.xz
Source10: sign-modules
%define modsign_cmd %{SOURCE10}
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/39] Stricter decoding of NFS ops
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 91899ab..5903e83 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1033: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
+Patch1034: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
+ApplyPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,29 +0,0 @@
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 32/39] Update package versioning for TIS format revised
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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 4f78990..9c95078 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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}
-%global pkg_release %{pkg_release_simple}%{?buildid}%{?dist}
+%global pkg_release %{pkg_release_simple}%{?dist}%{?buildid}
%global KVERREL %{rpmversion}-%{pkg_release}.%{_target_cpu}
--
1.8.3.1

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

@ -1,28 +0,0 @@
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/39] Update package versioning for TIS format
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index d1f8eab..9a8fb8c 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -17,6 +17,7 @@ Summary: The Linux Realtime kernel
# The Build ID
# %%define buildid .local
+%define buildid .tis.%{tis_patch_ver}
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/39] enable building mpt2sas mpt3sas as builtin
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 c8faf30..b6141b0 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1014: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,33 +0,0 @@
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 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 34774c1..f45d2a9 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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}}
+ # WRS: Copy these keys as part of the devel package
+ # The Module signing keys are to ensure that only Out-of-tree
+ # built against the Titanium Kernel get signed and loaded sans warnings
+ cp signing_key.priv ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+ cp signing_key.x509 ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+
# remove files that will be auto generated by depmod at rpm -i time
for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap softdep devname
do
--
1.8.3.1

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

@ -1,37 +0,0 @@
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 37/39] fix drbd by turning off write same in smartpqi
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index c7816a6..5d9b4bc 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+# DRBD was choking on write same
+Patch1033: turn-off-write-same-in-smartqpi-driver.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch turn-off-write-same-in-smartqpi-driver.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,49 +0,0 @@
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/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.
Latency has been hurt by addition of the timer_migration sysctl.
To cure the issue we need to port back two patches from latest stable kernel:
bc7a34b8b9ebfb0f4b8a35a72a0b134fd6c5ef50
timer: Reduce timer migration overhead if disabled
683be13a284720205228e29207ef11a1c3c322b9
timer: Minimize nohz off overhead
Little modification were required to apply these patches nicely.
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index ca8fb19..69ba548 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1036: timer-reduce-timer-migration-overhead-if-disabled.patch
+Patch1037: timer-minimize-nohz-off-overhead.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch timer-reduce-timer-migration-overhead-if-disabled.patch
+ApplyPatch timer-minimize-nohz-off-overhead.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,42 +0,0 @@
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/39] lose the memblock reorder parms patch
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 91c2661..e6b1d13 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
-Patch1010: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
-Patch1011: Notification-of-death-of-arbitrary-processes.patch
-Patch1012: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
-Patch1013: x86-enable-DMA-CMA-with-swiotlb.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
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
-ApplyPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
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
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/39] meta patch for Kernel IMA changes
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 5903e83..ca8fb19 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1035: US101216-IMA-support-in-Titanium-kernel.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch US101216-IMA-support-in-Titanium-kernel.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,54 +0,0 @@
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/39] meta patch for Kernel IMA keyring changes
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 69ba548..0f021b5 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -360,6 +360,7 @@ Source27: sanity_check.py
Source29: extrakeys.pub
Source37: centos.cer
+Source38: ima_signing_key.pub
%if %{?released_kernel}
%define pesign_name redhatsecureboot301
%else
@@ -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
+Patch1038: US103091-IMA-System-Configuration.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -786,6 +788,9 @@ cd linux-%{kversion}.%{_target_cpu}
# Copy any TiS-specific config changes
cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
+# Copy TiS specific IMA public key
+cp %{SOURCE38} .
+
## Apply Patches here
ApplyPatch linux-kernel-test.patch
ApplyPatch debrand-single-cpu.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
+ApplyPatch US103091-IMA-System-Configuration.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/39] rcu Don't wake rcuc-X-kthreads on NOCB CPUs
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 417ea07..0bfaf4e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1018: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,39 +0,0 @@
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 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 5d9b4bc..9dae160 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1034: restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch restrict-iSCSI-kthreads-to-CPUs-in-cpu_kthread_mask.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,241 +0,0 @@
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/39] tis add tools
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 157 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index c21ca59..2ee8fb3 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -40,6 +40,11 @@ Summary: The Linux Realtime kernel
%bcond_with perf
%bcond_with firmware
%bcond_with debuginfo
+%bcond_without tools
+
+# Architectures we build tools/cpupower on
+%define cpupowerarchs x86_64 ppc64 ppc64le
+
# 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.
@@ -304,6 +309,9 @@ BuildRequires: elfutils-libelf-devel
BuildRequires: pesign >= 0.109-4
%endif
%endif
+%if %{with_tools}
+BuildRequires: pciutils-devel gettext ncurses-devel
+%endif
%if %{with_sparse}
BuildRequires: sparse >= 0.4.1
%endif
@@ -362,6 +370,11 @@ Source37: centos.cer
Source50: kernel-%{version}-x86_64-rt.config
Source51: kernel-%{version}-x86_64-rt-trace.config
Source52: kernel-%{version}-x86_64-rt-debug.config
+
+# Sources for kernel-rt-tools
+Source2000: cpupower.service
+Source2001: cpupower.config
+
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
@@ -638,6 +651,47 @@ It should only be installed when trying to gather additional information
on kernel bugs.
%endif
+%if %{with_tools}
+
+%package -n kernel-rt-tools
+Summary: Assortment of tools for the Linux kernel
+Group: Development/System
+License: GPLv2
+Provides: cpupowerutils-rt = 1:009-0.6.p1
+Obsoletes: cpupowerutils-rt < 1:009-0.6.p1
+Provides: cpufreq-utils-rt = 1:009-0.6.p1
+Provides: cpufrequtils-rt = 1:009-0.6.p1
+Obsoletes: cpufreq-utils-rt < 1:009-0.6.p1
+Obsoletes: cpufrequtils-rt < 1:009-0.6.p1
+Obsoletes: cpuspeed-rt < 1:2.0
+Requires: kernel-rt-tools-libs = %{version}-%{release}
+%description -n kernel-rt-tools
+This package contains the tools/ directory from the kernel source
+and the supporting documentation.
+
+%package -n kernel-rt-tools-libs
+Summary: Libraries for the kernels-tools
+Group: Development/System
+License: GPLv2
+%description -n kernel-rt-tools-libs
+This package contains the libraries built from the tools/ directory
+from the kernel source.
+
+%package -n kernel-rt-tools-libs-devel
+Summary: Assortment of tools for the Linux kernel
+Group: Development/System
+License: GPLv2
+Requires: kernel-rt-tools = %{version}-%{release}
+Provides: cpupowerutils-devel = 1:009-0.6.p1.1
+Obsoletes: cpupowerutils-devel <= 1:009-0.6.p1
+Requires: kernel-rt-tools-libs = %{version}-%{release}
+Provides: kernel-rt-tools-devel
+%description -n kernel-rt-tools-libs-devel
+This package contains the development files for the tools/ directory from
+the kernel source.
+
+%endif # with_tools
+
%prep
## ApplyPatch routine
patch_command='patch -p1 -F1 -s'
@@ -1091,6 +1145,31 @@ BuildKernel %make_target %kernel_image vanilla
BuildKernel %make_target %kernel_image
%endif
+%if %{with_tools}
+%ifarch %{cpupowerarchs}
+# cpupower
+# make sure version-gen.sh is executable.
+chmod +x tools/power/cpupower/utils/version-gen.sh
+make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
+%ifarch x86_64
+ pushd tools/power/cpupower/debug/x86_64
+ make %{?_smp_mflags} centrino-decode powernow-k8-decode
+ popd
+%endif
+%ifarch x86_64
+ pushd tools/power/x86/x86_energy_perf_policy/
+ make
+ popd
+ pushd tools/power/x86/turbostat
+ make
+ popd
+%endif #turbostat/x86_energy_perf_policy
+%endif
+pushd tools
+make tmon
+popd
+%endif
+
%if %{builddoc}
# Make the HTML and man pages.
make -j1 htmldocs mandocs || %{doc_build_fail}
@@ -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
-
# perf docs
%if %{buildrt}
%if %{buildperf}
@@ -1249,6 +1327,39 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
%endif # buildperf
%endif
+%if %{with_tools}
+%ifarch %{cpupowerarchs}
+make -C tools/power/cpupower DESTDIR=$RPM_BUILD_ROOT libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install
+rm -f %{buildroot}%{_libdir}/*.{a,la}
+%find_lang cpupower
+mv cpupower.lang ../
+%ifarch x86_64
+ pushd tools/power/cpupower/debug/x86_64
+ install -m755 centrino-decode %{buildroot}%{_bindir}/centrino-decode
+ install -m755 powernow-k8-decode %{buildroot}%{_bindir}/powernow-k8-decode
+ popd
+%endif
+chmod 0755 %{buildroot}%{_libdir}/libcpupower.so*
+mkdir -p %{buildroot}%{_unitdir} %{buildroot}%{_sysconfdir}/sysconfig
+install -m644 %{SOURCE2000} %{buildroot}%{_unitdir}/cpupower.service
+install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower
+%ifarch %{ix86} x86_64
+ mkdir -p %{buildroot}%{_mandir}/man8
+ pushd tools/power/x86/x86_energy_perf_policy
+ make DESTDIR=%{buildroot} install
+ popd
+ pushd tools/power/x86/turbostat
+ make DESTDIR=%{buildroot} install
+ popd
+%endif #turbostat/x86_energy_perf_policy
+pushd tools/thermal/tmon
+make INSTALL_ROOT=%{buildroot} install
+popd
+%endif
+
+%endif
+
+
%if %{buildheaders}
# Install kernel headers
make ARCH=%{hdrarch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr headers_install
@@ -1297,6 +1408,14 @@ rm -rf $RPM_BUILD_ROOT
### scripts
###
+%if %{with_tools}
+%post -n kernel-rt-tools
+/sbin/ldconfig
+
+%postun -n kernel-rt-tools
+/sbin/ldconfig
+%endif
+
#
# This macro defines a %%post script for a kernel*-devel package.
# %%kernel_devel_post [<subpackage>]
@@ -1457,6 +1576,43 @@ fi
%endif
%endif
+
+%if %{with_tools}
+%files -n kernel-rt-tools -f cpupower.lang
+%defattr(-,root,root)
+%ifarch %{cpupowerarchs}
+%{_bindir}/cpupower
+%ifarch x86_64
+%{_bindir}/centrino-decode
+%{_bindir}/powernow-k8-decode
+%endif
+%{_unitdir}/cpupower.service
+%{_mandir}/man[1-8]/cpupower*
+%config(noreplace) %{_sysconfdir}/sysconfig/cpupower
+%ifarch %{ix86} x86_64
+%{_bindir}/x86_energy_perf_policy
+%{_mandir}/man8/x86_energy_perf_policy*
+%{_bindir}/turbostat
+%{_mandir}/man8/turbostat*
+%endif
+%endif
+%{_bindir}/tmon
+
+%ifarch %{cpupowerarchs}
+%files -n kernel-rt-tools-libs
+%defattr(-,root,root)
+%{_libdir}/libcpupower.so.0
+%{_libdir}/libcpupower.so.0.0.0
+
+%files -n kernel-rt-tools-libs-devel
+%defattr(-,root,root)
+%{_libdir}/libcpupower.so
+%{_includedir}/cpufreq.h
+%endif
+
+%endif # with_tools
+
+
# This is %{image_install_path} on an arch where that includes ELF files,
# or empty otherwise.
%global elf_image_install_path %{?kernel_image_elf:%{image_install_path}}
--
1.8.3.1

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

@ -1,59 +0,0 @@
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/39] tis apply patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index eb5767e..0ae5e5c 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1003: affine-compute-kernel-threads.patch
+Patch1004: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+Patch1005: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+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
+Patch1010: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
+Patch1011: Notification-of-death-of-arbitrary-processes.patch
+Patch1012: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+Patch1013: x86-enable-DMA-CMA-with-swiotlb.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch debrand-rh-i686-cpu.patch
+ApplyPatch affine-compute-kernel-threads.patch
+ApplyPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+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
+ApplyPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
+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
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,64 +0,0 @@
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/39] tis build unsigned package
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 8ee6191..c8faf30 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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.
-%global do_sign 0
+%global do_sign 1
# conditional with/without variables
# Note that the logic here is inverted; a bcond_without implies
@@ -692,6 +692,13 @@ the kernel source.
%endif # with_tools
+%if %{do_sign}
+%package unsigned
+Summary: Unsigned build of the Linux kernel
+%description unsigned
+Contains an unsigned version of the Linux kernel
+%endif # do_sign
+
%prep
## ApplyPatch routine
patch_command='patch -p1 -F1 -s'
@@ -936,6 +943,8 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%if %{do_sign}
+ cp $KernelImage vmlinuz.unsigned
+ $CopyKernel vmlinuz.unsigned $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz.unsigned
%ifarch x86_64
%pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE37} -c %{SOURCE37} -n %{pesign_name}
mv $KernelImage.signed $KernelImage
@@ -1707,6 +1716,11 @@ fi
%kernel_variant_files %{buildvanilla} vanilla
%endif
+%if %{do_sign}
+%files unsigned
+/boot/vmlinuz.unsigned
+%endif # do_sign
+
%changelog
* 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

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

@ -1,50 +0,0 @@
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/39] tis debrand and add centos certificate
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index b855a01..5f4a216 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -340,6 +340,12 @@ Source25: merge.pl
Source27: sanity_check.py
Source29: extrakeys.pub
+Source37: centos.cer
+%if %{?released_kernel}
+%define pesign_name redhatsecureboot301
+%else
+%define pesign_name redhatsecureboot003
+%endif
### Configuration files
Source50: kernel-%{version}-x86_64-rt.config
@@ -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
+Patch1000: debrand-single-cpu.patch
+Patch1001: debrand-rh_taint.patch
+Patch1002: debrand-rh-i686-cpu.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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 %{SOURCE14} -n %{pesign_name}
+ %pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE37} -c %{SOURCE37} -n %{pesign_name}
mv $KernelImage.signed $KernelImage
%endif
$CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
--
1.8.3.1

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

@ -1,57 +0,0 @@
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/39] tis handle tis config customizations
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 0ae5e5c..c21ca59 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -362,7 +362,9 @@ Source37: centos.cer
Source50: kernel-%{version}-x86_64-rt.config
Source51: kernel-%{version}-x86_64-rt-trace.config
Source52: kernel-%{version}-x86_64-rt-debug.config
-
+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
### Started using a unified SRPM
# Bugzilla: 1209952
@@ -696,6 +698,9 @@ cp -rl vanilla-%{kversion} linux-%{kversion}.%{_target_cpu}
cd linux-%{kversion}.%{_target_cpu}
+# Copy any TiS-specific config changes
+cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
+
## Apply Patches here
ApplyPatch linux-kernel-test.patch
ApplyPatch debrand-single-cpu.patch
@@ -733,6 +738,15 @@ for i in *.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`
+
+ # Handle Titanium Cloud customizations. Use -n to match oldnoconfig below. We want this before
+ # the make line below so that the one below removes any dependencies of ones that we
+ # turn off here. We also want it before "make listnewconfig" so that we can set the
+ # config option for new configs introduced in the Titanium Cloud patches.
+ if [ -f ${i}.tis_extra ]; then
+ scripts/kconfig/merge_config.sh -m -n .config ${i}.tis_extra
+ fi
+
make %{?cross_opts} ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
%if %{listnewconfig_fail}
if [ -s .newoptions ]; then
--
1.8.3.1

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

@ -1,101 +0,0 @@
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/39] tis remove signing
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index 29d78fd..eb5767e 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -23,6 +23,10 @@ Summary: The Linux Realtime kernel
# For internal testing builds during development, it should be 0.
%global released_kernel 0
+# If we want to sign the kernel and modules, do_sign should be 1.
+# To speed up builds (don't sign) use 0.
+%global do_sign 0
+
# 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)
@@ -56,7 +60,11 @@ Summary: The Linux Realtime kernel
# Verbose output?
# %%global verbose V=1
+%if %{do_sign}
%global signmodules 1
+%else
+%global signmodules 0
+%endif
# if patch fuzzy patch applying will be forbidden
%global with_fuzzy_patches 0
@@ -291,9 +299,11 @@ BuildRequires: xmlto, asciidoc
BuildRequires: openssl
BuildRequires: hmaccalc
BuildRequires: elfutils-libelf-devel
+%if %{do_sign}
%ifarch x86_64
BuildRequires: pesign >= 0.109-4
%endif
+%endif
%if %{with_sparse}
BuildRequires: sparse >= 0.4.1
%endif
@@ -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
+%if %{do_sign}
%ifarch x86_64
%pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE37} -c %{SOURCE37} -n %{pesign_name}
mv $KernelImage.signed $KernelImage
%endif
+%endif
$CopyKernel $KernelImage $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
chmod 755 $RPM_BUILD_ROOT/%{image_install_path}/$InstallName-$KernelVer
@@ -1072,6 +1084,7 @@ popd
# if it isn't.
%ifnarch noarch
+%if %{do_sign}
%define __modsign_install_post \
if [ "%{with_rt}" -ne "0" ]; then \
Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt.config | cut -b 3-` \
@@ -1090,6 +1103,24 @@ popd
%{modsign_cmd} $RPM_BUILD_ROOT/lib/modules/%{KVERREL}.${AAA} || exit 1 \
done \
%{nil}
+%else
+%define __modsign_install_post \
+ if [ "%{with_rt}" -ne "0" ]; then \
+ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt.config | cut -b 3-` \
+ rm -rf .tmp_versions \
+ mv .tmp_versions.sign .tmp_versions \
+ mv signing_key.priv.sign signing_key.priv \
+ mv signing_key.x509.sign signing_key.x509 \
+ fi\
+ for AAA in %{?with_trace:trace} %{?with_debug:debug} %{?with_vanilla:vanilla}; do \
+ Arch=`head -1 configs/kernel-%{version}-%{_target_cpu}-rt-${AAA}.config | cut -b 3-` \
+ rm -rf .tmp_versions \
+ mv .tmp_versions.sign.${AAA} .tmp_versions \
+ mv signing_key.priv.sign.${AAA} signing_key.priv \
+ mv signing_key.x509.sign.${AAA} signing_key.x509 \
+ done \
+%{nil}
+%endif
%endif
###
--
1.8.3.1

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

@ -1,29 +0,0 @@
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/39] tis remove trace
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
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 5f4a216..d1f8eab 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -31,7 +31,7 @@ Summary: The Linux Realtime kernel
%bcond_without debug
%bcond_with headers
%bcond_with vanilla
-%bcond_without trace
+%bcond_with trace
%bcond_with perf
%bcond_with firmware
%bcond_without debuginfo
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/39] x86 dma_alloc_coherent fix
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel-rt.spec | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/SPECS/kernel-rt.spec b/SPECS/kernel-rt.spec
index d9ee5c6..417ea07 100644
--- a/SPECS/kernel-rt.spec
+++ b/SPECS/kernel-rt.spec
@@ -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
+Patch1016: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+Patch1017: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -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
+ApplyPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+ApplyPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
# move off upstream version mechanism
if [ -e localversion-rt ]; then
--
1.8.3.1

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

@ -1,45 +0,0 @@
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/32] Allow ignoring Ethernet device RMRR with IOMMU passt
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index a82ec4c..729b9f0 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 3
+%define patch_rel 4
%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
@@ -429,6 +429,7 @@ Patch40007: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
Patch40008: affine-compute-kernel-threads.patch
Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
Patch40010: Make-kernel-start-eth-devices-at-offset.patch
+Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -755,6 +756,7 @@ ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
ApplyOptionalPatch affine-compute-kernel-threads.patch
ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
+ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

228
kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch Normal file
View File

@ -0,0 +1,228 @@
From 50ee0ad2b80404b7736ca489dc9f18f6b84094da Mon Sep 17 00:00:00 2001
Message-Id: <50ee0ad2b80404b7736ca489dc9f18f6b84094da.1524255483.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 20 Apr 2018 14:51:56 -0400
Subject: [PATCH 1/2] Build logic and sources for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 72 +++++++++++++++++++++++++++++++++++++++++++++----------
1 file changed, 59 insertions(+), 13 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 5ba126c..1a8c742 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -3,7 +3,8 @@
Summary: The Linux kernel
-# % define buildid .local
+# This is the WRS patch release
+%define buildid .%{tis_patch_ver}.tis
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
@@ -12,9 +13,10 @@ Summary: The Linux kernel
%global distro_build 693
%define rpmversion 3.10.0
-%define pkgrelease 693.21.1.el7
+%define _pkgrelease 693.21.1
+%define pkgrelease %{_pkgrelease}.el7
-%define pkg_release %{pkgrelease}%{?buildid}
+%define pkg_release %{pkgrelease}%{buildid}
# The kernel tarball/base version
%define rheltarball %{rpmversion}-%{pkgrelease}
@@ -61,7 +63,7 @@ Summary: The Linux kernel
%define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0}
# Control whether we perform a compat. check against published ABI.
-%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1}
+%define with_kabichk 0
# Control whether we perform a compat. check against DUP ABI.
%define with_kabidupchk 1
@@ -78,7 +80,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'. RHEL only ever does 1.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
%define with_gcov %{?_with_gcov: 1} %{?!_with_gcov: 0}
@@ -349,6 +351,7 @@ BuildRequires: rpm-build >= 4.9.0-1, elfutils >= 0.153-1
# required for zfcpdump
BuildRequires: glibc-static
%endif
+BuildRequires: util-linux
Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz
@@ -410,6 +413,12 @@ Patch1000: debrand-single-cpu.patch
Patch1001: debrand-rh_taint.patch
Patch1002: debrand-rh-i686-cpu.patch
+# Titanium Cloud sources here.
+# Not sure if we need to worry about numerical collisions between
+# SourceX and PatchX, so let's not risk it
+Source30000: kernel-3.10.0-x86_64.config.tis_extra
+Source30001: ima_signing_key.pub
+
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
%description
@@ -561,6 +570,13 @@ This package provides debug information for package kernel-tools.
%endif # with_tools
+%ifarch x86_64
+%package unsigned
+Summary: Unsigned build of the Linux kernel
+%description unsigned
+Contains an unsigned version of the Linux kernel
+%endif # x86_64
+
%if %{with_gcov}
%package gcov
Summary: gcov graph and source files for coverage data collection.
@@ -716,6 +732,9 @@ cd linux-%{KVRA}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
+# Copy any TiS-specific config changes
+cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
+
ApplyOptionalPatch linux-kernel-test.patch
ApplyOptionalPatch debrand-single-cpu.patch
ApplyOptionalPatch debrand-rh_taint.patch
@@ -760,6 +779,15 @@ for i in *.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`
+
+ # Handle Titanium Cloud customizations. Use -n to match oldnoconfig below. We want this before
+ # the make line below so that the one below removes any dependencies of ones that we
+ # turn off here. We also want it before "make listnewconfig" so that we can set the
+ # config option for new configs introduced in the Titanium Cloud patches.
+ if [ -f ${i}.tis_extra ]; then
+ scripts/kconfig/merge_config.sh -m -n .config ${i}.tis_extra
+ fi
+
make %{?cross_opts} ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
%if %{listnewconfig_fail}
if [ -s .newoptions ]; then
@@ -833,12 +861,13 @@ BuildKernel() {
# and now to start the build process
- make %{?cross_opts} -s mrproper
+ make -j"%(nproc)" %{?cross_opts} -s mrproper
cp %{SOURCE11} . # x509.genkey
cp %{SOURCE12} . # extra_certificates
cp %{SOURCE15} . # rheldup3.x509
cp %{SOURCE16} . # rhelkpatch1.x509
+ cp %{SOURCE30001} . # ima_signing_key.pub
cp configs/$Config .config
@@ -853,8 +882,8 @@ BuildKernel() {
fi
%endif
- make -s %{?cross_opts} ARCH=$Arch oldnoconfig >/dev/null
- make -s %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" $MakeTarget %{?sparse_mflags}
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch oldnoconfig >/dev/null
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" $MakeTarget %{?sparse_mflags}
if [ "$Flavour" != "kdump" ]; then
make -s %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" modules %{?sparse_mflags} || exit 1
@@ -878,6 +907,8 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%ifarch x86_64
+ cp $KernelImage vmlinuz.unsigned
+ $CopyKernel vmlinuz.unsigned $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz.unsigned
%pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13}
mv $KernelImage.signed $KernelImage
%endif
@@ -894,7 +925,7 @@ BuildKernel() {
if [ "$Flavour" != "kdump" ]; then
# Override $(mod-fw) because we don't want it to install any firmware
# we'll get it from the linux-firmware package and we don't want conflicts
- make -s %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
%if %{with_gcov}
# install gcov-needed files to $BUILDROOT/$BUILD/...:
# gcov_info->filename is absolute path
@@ -904,7 +935,7 @@ BuildKernel() {
%endif
fi
%ifarch %{vdso_arches}
- make -s %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
if [ ! -s ldconfig-kernel.conf ]; then
echo > ldconfig-kernel.conf "\
# Placeholder file, no vDSO hwcap entries used in this kernel."
@@ -1061,6 +1092,12 @@ BuildKernel() {
cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}
+ # WRS: Copy these keys as part of the devel package
+ # The Module signing keys are to ensure that only Out-of-tree
+ # built against the Titanium Kernel get signed and loaded sans warnings
+ cp signing_key.priv ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+ cp signing_key.x509 ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+
# remove files that will be auto generated by depmod at rpm -i time
for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap softdep devname
do
@@ -1119,15 +1156,15 @@ make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
%endif
%ifarch x86_64
pushd tools/power/x86/x86_energy_perf_policy/
- make
+ make -j"%(nproc)"
popd
pushd tools/power/x86/turbostat
- make
+ make -j"%(nproc)"
popd
%endif #turbostat/x86_energy_perf_policy
%endif
pushd tools
-make tmon
+make -j"%(nproc)" tmon
popd
%endif
@@ -1386,6 +1423,10 @@ fi}\
%{expand:\
%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVRA}%{?-v:.%{-v*}} || exit $?\
}\
+# If this is a pkg upgrade (ie installed as a patch), set the reboot flag\
+if [ $1 -gt 1 ] ; then\
+ touch /var/run/node_is_patched_rr\
+fi\
%{nil}
#
@@ -1587,6 +1628,11 @@ fi
%kernel_variant_files %{with_debug} debug
%kernel_variant_files %{with_kdump} kdump
+%ifarch x86_64
+%files unsigned
+/boot/vmlinuz.unsigned
+%endif
+
%changelog
* Tue Mar 06 2018 CentOS Sources <bugs@centos.org> - 3.10.0-693.21.1.el7
- Apply debranding changes
--
1.8.3.1

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

@ -1,37 +0,0 @@
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 30/32] CVE mqueue fix a use after free in sys_mq_notify
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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
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
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -802,6 +804,7 @@ 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
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,49 +0,0 @@
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/32] Centos fix calltrace in megaraid sas driver
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 729b9f0..4f7b7b4 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 4
+%define patch_rel 5
%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
@@ -430,6 +430,9 @@ Patch40008: affine-compute-kernel-threads.patch
Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
Patch40010: Make-kernel-start-eth-devices-at-offset.patch
Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+Patch40012: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
+Patch40013: memblock-introduce-memblock_alloc_range.patch
+Patch40014: cma-add-placement-specifier-for-cma-kernel-parameter.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -757,6 +760,9 @@ ApplyOptionalPatch affine-compute-kernel-threads.patch
ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+ApplyOptionalPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
+ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
+ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/32] Check for oversized nfs arguments
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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
Patch40027: add-per-cpu-pm-qos-resume-latency-consideration.patch
Patch40028: expose-pm_qos_resume_latency-for-cpus.patch
Patch40029: avoid-taking-spinlock-for-accessing-qos-values.patch
+Patch40030: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -790,6 +791,7 @@ ApplyOptionalPatch stop-seeking-deeper-idle-if-current-state-is-deep-enough.patc
ApplyOptionalPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
ApplyOptionalPatch expose-pm_qos_resume_latency-for-cpus.patch
ApplyOptionalPatch avoid-taking-spinlock-for-accessing-qos-values.patch
+ApplyOptionalPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,76 +0,0 @@
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 26/32] Cleanup TIC patch list for CentOS 7.4 port
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 40 ++++++++++++++++------------------------
1 file changed, 16 insertions(+), 24 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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
Patch40014: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
Patch40015: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
Patch40016: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
-Patch40022: cacheinfo-porting-original-4.10.17-version.patch
-Patch40023: cacheinfo-fixing-compilation-issues-on-3.10.patch
-Patch40024: intel-rdt-porting-original-4.10.17-version.patch
-Patch40025: intel-rdt-fixing-compilation-issues-on-3.10.patch
-Patch40026: stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
-Patch40027: add-per-cpu-pm-qos-resume-latency-consideration.patch
-Patch40028: expose-pm_qos_resume_latency-for-cpus.patch
-Patch40029: avoid-taking-spinlock-for-accessing-qos-values.patch
-Patch40030: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
-Patch40031: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
-Patch40032: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
-Patch40033: US101216-IMA-support-in-Titanium-kernel.patch
-Patch40036: US103091-IMA-System-Configuration.patch
+Patch40017: Porting-Cacheinfo-from-Kernel-4.10.17.patch
+Patch40018: Fix-cacheinfo-compilation-issues-for-3.10.patch
+Patch40019: cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+Patch40020: cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+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
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -788,19 +784,15 @@ ApplyOptionalPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
ApplyOptionalPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
ApplyOptionalPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
ApplyOptionalPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
-ApplyOptionalPatch cacheinfo-porting-original-4.10.17-version.patch
-ApplyOptionalPatch cacheinfo-fixing-compilation-issues-on-3.10.patch
-ApplyOptionalPatch intel-rdt-porting-original-4.10.17-version.patch
-ApplyOptionalPatch intel-rdt-fixing-compilation-issues-on-3.10.patch
-ApplyOptionalPatch stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
-ApplyOptionalPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
-ApplyOptionalPatch expose-pm_qos_resume_latency-for-cpus.patch
-ApplyOptionalPatch avoid-taking-spinlock-for-accessing-qos-values.patch
-ApplyOptionalPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
-ApplyOptionalPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
-ApplyOptionalPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
+ApplyOptionalPatch Porting-Cacheinfo-from-Kernel-4.10.17.patch
+ApplyOptionalPatch Fix-cacheinfo-compilation-issues-for-3.10.patch
+ApplyOptionalPatch cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+ApplyOptionalPatch cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+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
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,55 +0,0 @@
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

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

@ -1,45 +0,0 @@
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/32] Enable DMA CMA with swiotlb
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 4f7b7b4..0447fe8 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 5
+%define patch_rel 6
%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
@@ -433,6 +433,7 @@ Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
Patch40012: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
Patch40013: memblock-introduce-memblock_alloc_range.patch
Patch40014: cma-add-placement-specifier-for-cma-kernel-parameter.patch
+Patch40015: x86-enable-DMA-CMA-with-swiotlb.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -763,6 +764,7 @@ ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
ApplyOptionalPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
+ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/32] Enable building kernel with CONFIG_BLK_DEV_NBD
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index ebff6f1..5fbea09 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -431,6 +431,7 @@ Patch40009: memblock-introduce-memblock_alloc_range.patch
Patch40010: cma-add-placement-specifier-for-cma-kernel-parameter.patch
Patch40011: x86-enable-DMA-CMA-with-swiotlb.patch
Patch40012: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
+Patch40013: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -766,6 +767,7 @@ ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
ApplyOptionalPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
+ApplyOptionalPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,84 +0,0 @@
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/32] Enable the rebased source patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 50 ++++++++++++++++++++------------------------------
1 file changed, 20 insertions(+), 30 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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
# Titanium Cloud patches here.
Patch40001: Fix-compile-issue-when-transparent-hugepages-are-off.patch
-#Patch40001: Notification-of-death-of-arbitrary-processes.patch
-#Patch40002: CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
-#Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
-#Patch40004: ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
-#Patch40005: ixgbe-disable-LRO-by-default.patch
-#Patch40006: ixgbe-RXC-nextp-bounds-check.patch
-#Patch40007: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
-#Patch40008: affine-compute-kernel-threads.patch
-#Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
-#Patch40010: Make-kernel-start-eth-devices-at-offset.patch
-#Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
-#Patch40012: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
-#Patch40013: memblock-introduce-memblock_alloc_range.patch
-#Patch40014: cma-add-placement-specifier-for-cma-kernel-parameter.patch
-#Patch40015: x86-enable-DMA-CMA-with-swiotlb.patch
+Patch40002: Notification-of-death-of-arbitrary-processes.patch
+Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+Patch40004: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+Patch40005: affine-compute-kernel-threads.patch
+Patch40006: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+Patch40007: Make-kernel-start-eth-devices-at-offset.patch
+Patch40008: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+Patch40009: memblock-introduce-memblock_alloc_range.patch
+Patch40010: cma-add-placement-specifier-for-cma-kernel-parameter.patch
+Patch40011: x86-enable-DMA-CMA-with-swiotlb.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -752,21 +747,16 @@ ApplyOptionalPatch debrand-rh-i686-cpu.patch
# Titanium Cloud patches here.
ApplyOptionalPatch Fix-compile-issue-when-transparent-hugepages-are-off.patch
-#ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
-#ApplyOptionalPatch CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
-#ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
-#ApplyOptionalPatch ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
-#ApplyOptionalPatch ixgbe-disable-LRO-by-default.patch
-#ApplyOptionalPatch ixgbe-RXC-nextp-bounds-check.patch
-#ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
-#ApplyOptionalPatch affine-compute-kernel-threads.patch
-#ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
-#ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
-#ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
-#ApplyOptionalPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
-#ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
-#ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
-#ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
+ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
+ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+ApplyOptionalPatch affine-compute-kernel-threads.patch
+ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
+ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
+ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
+ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,36 +0,0 @@
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/32] Fix compile issue with transparent hugepages
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 401e98f..6d87c33 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -419,6 +419,7 @@ Patch1002: debrand-rh-i686-cpu.patch
Source30000: kernel-3.10.0-x86_64.config.tis_extra
# Titanium Cloud patches here.
+Patch40001: Fix-compile-issue-when-transparent-hugepages-are-off.patch
#Patch40001: Notification-of-death-of-arbitrary-processes.patch
#Patch40002: CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
#Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
@@ -750,6 +751,7 @@ ApplyOptionalPatch debrand-rh_taint.patch
ApplyOptionalPatch debrand-rh-i686-cpu.patch
# Titanium Cloud patches here.
+ApplyOptionalPatch Fix-compile-issue-when-transparent-hugepages-are-off.patch
#ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
#ApplyOptionalPatch CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
#ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
--
1.8.3.1

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

@ -1,41 +0,0 @@
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 27/32] Fix compile warnings in scsi drivers
They get turned into errors and thus break the build.
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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
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
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -793,6 +796,8 @@ 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
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,77 +0,0 @@
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/32] Further parallelize kernel build
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index e1661d7..f436d93 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -896,7 +896,7 @@ BuildKernel() {
# and now to start the build process
- make %{?cross_opts} -s mrproper
+ make -j"%(nproc)" %{?cross_opts} -s mrproper
cp %{SOURCE11} . # x509.genkey
cp %{SOURCE12} . # extra_certificates
@@ -916,8 +916,8 @@ BuildKernel() {
fi
%endif
- make -s %{?cross_opts} ARCH=$Arch oldnoconfig >/dev/null
- make -s %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" $MakeTarget %{?sparse_mflags}
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch oldnoconfig >/dev/null
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" $MakeTarget %{?sparse_mflags}
if [ "$Flavour" != "kdump" ]; then
make -s %{?cross_opts} ARCH=$Arch V=1 %{?_smp_mflags} KCFLAGS="%{?kcflags}" WITH_GCOV="%{?with_gcov}" modules %{?sparse_mflags} || exit 1
@@ -959,7 +959,7 @@ BuildKernel() {
if [ "$Flavour" != "kdump" ]; then
# Override $(mod-fw) because we don't want it to install any firmware
# we'll get it from the linux-firmware package and we don't want conflicts
- make -s %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=$KernelVer mod-fw=
%if %{with_gcov}
# install gcov-needed files to $BUILDROOT/$BUILD/...:
# gcov_info->filename is absolute path
@@ -969,7 +969,7 @@ BuildKernel() {
%endif
fi
%ifarch %{vdso_arches}
- make -s %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
+ make -s -j"%(nproc)" %{?cross_opts} ARCH=$Arch INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=$KernelVer
if [ ! -s ldconfig-kernel.conf ]; then
echo > ldconfig-kernel.conf "\
# Placeholder file, no vDSO hwcap entries used in this kernel."
@@ -1184,15 +1184,15 @@ make %{?cross_opts} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false
%endif
%ifarch x86_64
pushd tools/power/x86/x86_energy_perf_policy/
- make
+ make -j"%(nproc)"
popd
pushd tools/power/x86/turbostat
- make
+ make -j"%(nproc)"
popd
%endif #turbostat/x86_energy_perf_policy
%endif
pushd tools
-make tmon
+make -j"%(nproc)" tmon
popd
%endif
--
1.8.3.1

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

@ -1,110 +0,0 @@
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/32] Initial kernel build for TiS
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 45 ++++++++++++++++++++++++++++++++++++++++++---
1 file changed, 42 insertions(+), 3 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 5ba126c..55901b6 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -3,7 +3,7 @@
Summary: The Linux kernel
-# % define buildid .local
+%define buildid .tis
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
@@ -61,7 +61,7 @@ Summary: The Linux kernel
%define with_dbgonly %{?_with_dbgonly: 1} %{?!_with_dbgonly: 0}
# Control whether we perform a compat. check against published ABI.
-%define with_kabichk %{?_without_kabichk: 0} %{?!_without_kabichk: 1}
+%define with_kabichk 0
# Control whether we perform a compat. check against DUP ABI.
%define with_kabidupchk 1
@@ -78,7 +78,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'. RHEL only ever does 1.
-%define debugbuildsenabled 1
+%define debugbuildsenabled 0
%define with_gcov %{?_with_gcov: 1} %{?!_with_gcov: 0}
@@ -410,6 +410,22 @@ Patch1000: debrand-single-cpu.patch
Patch1001: debrand-rh_taint.patch
Patch1002: debrand-rh-i686-cpu.patch
+# Titanium Cloud sources here.
+# Not sure if we need to worry about numerical collisions between
+# SourceX and PatchX, so let's not risk it
+Source30000: kernel-3.10.0-x86_64.config.tis_extra
+
+# Titanium Cloud patches here.
+Patch40001: Notification-of-death-of-arbitrary-processes.patch
+Patch40002: CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
+Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+Patch40004: ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
+Patch40005: ixgbe-disable-LRO-by-default.patch
+Patch40006: ixgbe-RXC-nextp-bounds-check.patch
+Patch40007: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+Patch40008: affine-compute-kernel-threads.patch
+Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
%description
@@ -716,11 +732,25 @@ cd linux-%{KVRA}
# Drop some necessary files from the source dir into the buildroot
cp $RPM_SOURCE_DIR/kernel-%{version}-*.config .
+# Copy any TiS-specific config changes
+cp $RPM_SOURCE_DIR/kernel-%{version}-*.config.tis_extra .
+
ApplyOptionalPatch linux-kernel-test.patch
ApplyOptionalPatch debrand-single-cpu.patch
ApplyOptionalPatch debrand-rh_taint.patch
ApplyOptionalPatch debrand-rh-i686-cpu.patch
+# Titanium Cloud patches here.
+ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
+ApplyOptionalPatch CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
+ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+ApplyOptionalPatch ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
+ApplyOptionalPatch ixgbe-disable-LRO-by-default.patch
+ApplyOptionalPatch ixgbe-RXC-nextp-bounds-check.patch
+ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+ApplyOptionalPatch affine-compute-kernel-threads.patch
+ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+
# Any further pre-build tree manipulations happen here.
chmod +x scripts/checkpatch.pl
@@ -760,6 +790,15 @@ for i in *.config
do
mv $i .config
Arch=`head -1 .config | cut -b 3-`
+
+ # Handle Titanium Cloud customizations. Use -n to match oldnoconfig below. We want this before
+ # the make line below so that the one below removes any dependencies of ones that we
+ # turn off here. We also want it before "make listnewconfig" so that we can set the
+ # config option for new configs introduced in the Titanium Cloud patches.
+ if [ -f ${i}.tis_extra ]; then
+ scripts/kconfig/merge_config.sh -m -n .config ${i}.tis_extra
+ fi
+
make %{?cross_opts} ARCH=$Arch listnewconfig | grep -E '^CONFIG_' >.newoptions || true
%if %{listnewconfig_fail}
if [ -s .newoptions ]; then
--
1.8.3.1

94
kernel-std/centos/meta_patches/Kernel-source-patches-for-TiC.patch Normal file
View File

@ -0,0 +1,94 @@
From 67260aef458fa5dcf4de1663156a966d972a3d04 Mon Sep 17 00:00:00 2001
Message-Id: <67260aef458fa5dcf4de1663156a966d972a3d04.1524255484.git.Jim.Somerville@windriver.com>
In-Reply-To: <50ee0ad2b80404b7736ca489dc9f18f6b84094da.1524255483.git.Jim.Somerville@windriver.com>
References: <50ee0ad2b80404b7736ca489dc9f18f6b84094da.1524255483.git.Jim.Somerville@windriver.com>
From: Jim Somerville <Jim.Somerville@windriver.com>
Date: Fri, 20 Apr 2018 16:13:47 -0400
Subject: [PATCH 2/2] Kernel source patches for TiC
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 1a8c742..65820b9 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -419,6 +419,37 @@ Patch1002: debrand-rh-i686-cpu.patch
Source30000: kernel-3.10.0-x86_64.config.tis_extra
Source30001: ima_signing_key.pub
+# Titanium Cloud patches here.
+Patch40001: Fix-compile-issue-when-transparent-hugepages-are-off.patch
+Patch40002: Notification-of-death-of-arbitrary-processes.patch
+Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+Patch40004: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+Patch40005: affine-compute-kernel-threads.patch
+Patch40006: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+Patch40007: Make-kernel-start-eth-devices-at-offset.patch
+Patch40008: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+Patch40009: memblock-introduce-memblock_alloc_range.patch
+Patch40010: cma-add-placement-specifier-for-cma-kernel-parameter.patch
+Patch40011: x86-enable-DMA-CMA-with-swiotlb.patch
+Patch40012: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
+Patch40013: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
+Patch40014: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+Patch40015: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
+Patch40016: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
+Patch40017: Porting-Cacheinfo-from-Kernel-4.10.17.patch
+Patch40018: Fix-cacheinfo-compilation-issues-for-3.10.patch
+Patch40019: cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+Patch40020: cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+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
+# Fix compile warnings that break the build
+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
+Patch40027: turn-off-write-same-in-smartqpi-driver.patch
+
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
%description
@@ -740,6 +771,35 @@ ApplyOptionalPatch debrand-single-cpu.patch
ApplyOptionalPatch debrand-rh_taint.patch
ApplyOptionalPatch debrand-rh-i686-cpu.patch
+# Titanium Cloud patches here.
+ApplyOptionalPatch Fix-compile-issue-when-transparent-hugepages-are-off.patch
+ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
+ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+ApplyOptionalPatch affine-compute-kernel-threads.patch
+ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
+ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
+ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
+ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
+ApplyOptionalPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
+ApplyOptionalPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
+ApplyOptionalPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+ApplyOptionalPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
+ApplyOptionalPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
+ApplyOptionalPatch Porting-Cacheinfo-from-Kernel-4.10.17.patch
+ApplyOptionalPatch Fix-cacheinfo-compilation-issues-for-3.10.patch
+ApplyOptionalPatch cpuidle-menu-stop-seeking-deeper-idle-if-current-sta.patch
+ApplyOptionalPatch cpuidle-menu-add-per-CPU-PM-QoS-resume-latency-consi.patch
+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 aic94xx-Skip-reading-user-settings-if-flash-is-not-f.patch
+ApplyOptionalPatch dpt_i2o-fix-build-warning.patch
+ApplyOptionalPatch turn-off-write-same-in-smartqpi-driver.patch
+
# Any further pre-build tree manipulations happen here.
chmod +x scripts/checkpatch.pl
--
1.8.3.1

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

@ -1,45 +0,0 @@
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/32] Make kernel start eth devices at offset
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 04b9816..a82ec4c 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 2
+%define patch_rel 3
%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
@@ -428,6 +428,7 @@ Patch40006: ixgbe-RXC-nextp-bounds-check.patch
Patch40007: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
Patch40008: affine-compute-kernel-threads.patch
Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+Patch40010: Make-kernel-start-eth-devices-at-offset.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -753,6 +754,7 @@ ApplyOptionalPatch ixgbe-RXC-nextp-bounds-check.patch
ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
ApplyOptionalPatch affine-compute-kernel-threads.patch
ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,32 +1,2 @@
Initial-kernel-build-for-TiS.patch
Tweak-install-script-for-patching-add-patch-release.patch
Make-kernel-start-eth-devices-at-offset.patch
Allow-ignoring-Ethernet-device-RMRR-with-IOMMU-passt.patch
Centos-fix-calltrace-in-megaraid-sas-driver.patch
Enable-DMA-CMA-with-swiotlb.patch
kernel-build_requires.patch
ixgbe-remove-kernel-builtin-drivers.patch
Update-package-versioning-for-TIS-format.patch
Temporarily-neuter-off-any-TiS-specific-patches.patch
Fix-compile-issue-with-transparent-hugepages.patch
Enable-the-rebased-source-patches.patch
Package-unsigned-kernel.patch
enable-building-mpt2sas-mpt3sas-as-builtin.patch
Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
x86_dma_alloc_coherent-fix.patch
rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
Further-parallelize-kernel-build.patch
Porting-Cacheinfo-from-Kernel-4.10.17.patch
Porting-Resource-Director-Technology-from-Kernel-4.1.patch
PM-introduce-per-cpu-power-management.patch
Check-for-oversized-nfs-arguments.patch
Stricter-decoding-of-NFS-ops.patch
meta-patch-for-Kernel-IMA-changes.patch
meta-patch-for-Kernel-IMA-keyring-changes.patch
Cleanup-TIC-patch-list-for-CentOS-7.4-port.patch
Fix-compile-warnings-in-scsi-drivers.patch
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
Build-logic-and-sources-for-TiC.patch
Kernel-source-patches-for-TiC.patch

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

@ -1,47 +0,0 @@
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/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.
Fixes are temporary until we switch to CentOS kernel that includes them.
Signed-off-by: Alex Kozyrev <alex.kozyrev@windriver.com>
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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
Patch40023: cacheinfo-fixing-compilation-issues-on-3.10.patch
Patch40024: intel-rdt-porting-original-4.10.17-version.patch
Patch40025: intel-rdt-fixing-compilation-issues-on-3.10.patch
+Patch40026: stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
+Patch40027: add-per-cpu-pm-qos-resume-latency-consideration.patch
+Patch40028: expose-pm_qos_resume_latency-for-cpus.patch
+Patch40029: avoid-taking-spinlock-for-accessing-qos-values.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -782,6 +786,10 @@ ApplyOptionalPatch cacheinfo-porting-original-4.10.17-version.patch
ApplyOptionalPatch cacheinfo-fixing-compilation-issues-on-3.10.patch
ApplyOptionalPatch intel-rdt-porting-original-4.10.17-version.patch
ApplyOptionalPatch intel-rdt-fixing-compilation-issues-on-3.10.patch
+ApplyOptionalPatch stop-seeking-deeper-idle-if-current-state-is-deep-enough.patch
+ApplyOptionalPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
+ApplyOptionalPatch expose-pm_qos_resume_latency-for-cpus.patch
+ApplyOptionalPatch avoid-taking-spinlock-for-accessing-qos-values.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,55 +0,0 @@
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/32] Package unsigned kernel
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
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.
%endif # with_tools
+%ifarch x86_64
+%package unsigned
+Summary: Unsigned build of the Linux kernel
+%description unsigned
+Contains an unsigned version of the Linux kernel
+%endif # x86_64
+
%if %{with_gcov}
%package gcov
Summary: gcov graph and source files for coverage data collection.
@@ -924,6 +931,8 @@ BuildKernel() {
fi
# EFI SecureBoot signing, x86_64-only
%ifarch x86_64
+ cp $KernelImage vmlinuz.unsigned
+ $CopyKernel vmlinuz.unsigned $RPM_BUILD_ROOT/%{image_install_path}/vmlinuz.unsigned
%pesign -s -i $KernelImage -o $KernelImage.signed -a %{SOURCE13} -c %{SOURCE13}
mv $KernelImage.signed $KernelImage
%endif
@@ -1637,6 +1646,11 @@ fi
%kernel_variant_files %{with_debug} debug
%kernel_variant_files %{with_kdump} kdump
+%ifarch x86_64
+%files unsigned
+/boot/vmlinuz.unsigned
+%endif
+
%changelog
* Tue Mar 06 2018 CentOS Sources <bugs@centos.org> - 3.10.0-693.21.1.el7
- Apply debranding changes
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/32] Porting Cacheinfo from Kernel 4.10.17
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 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
Patch40014: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
Patch40015: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
Patch40016: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
+Patch40022: cacheinfo-porting-original-4.10.17-version.patch
+Patch40023: cacheinfo-fixing-compilation-issues-on-3.10.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -774,6 +776,8 @@ ApplyOptionalPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
ApplyOptionalPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
ApplyOptionalPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
ApplyOptionalPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
+ApplyOptionalPatch cacheinfo-porting-original-4.10.17-version.patch
+ApplyOptionalPatch cacheinfo-fixing-compilation-issues-on-3.10.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,39 +0,0 @@
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/32] Porting Resource Director Technology from Kernel
4.10.17
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 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
Patch40016: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
Patch40022: cacheinfo-porting-original-4.10.17-version.patch
Patch40023: cacheinfo-fixing-compilation-issues-on-3.10.patch
+Patch40024: intel-rdt-porting-original-4.10.17-version.patch
+Patch40025: intel-rdt-fixing-compilation-issues-on-3.10.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -778,6 +780,8 @@ ApplyOptionalPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
ApplyOptionalPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
ApplyOptionalPatch cacheinfo-porting-original-4.10.17-version.patch
ApplyOptionalPatch cacheinfo-fixing-compilation-issues-on-3.10.patch
+ApplyOptionalPatch intel-rdt-porting-original-4.10.17-version.patch
+ApplyOptionalPatch intel-rdt-fixing-compilation-issues-on-3.10.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,38 +0,0 @@
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 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 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
# 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
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -798,6 +800,8 @@ 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
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,38 +0,0 @@
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/32] Stricter decoding of NFS ops
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 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
Patch40028: expose-pm_qos_resume_latency-for-cpus.patch
Patch40029: avoid-taking-spinlock-for-accessing-qos-values.patch
Patch40030: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
+Patch40031: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
+Patch40032: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -792,6 +794,8 @@ ApplyOptionalPatch add-per-cpu-pm-qos-resume-latency-consideration.patch
ApplyOptionalPatch expose-pm_qos_resume_latency-for-cpus.patch
ApplyOptionalPatch avoid-taking-spinlock-for-accessing-qos-values.patch
ApplyOptionalPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
+ApplyOptionalPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
+ApplyOptionalPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,94 +0,0 @@
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/32] Temporarily neuter off any TiS specific patches
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 60 +++++++++++++++++++++++++++----------------------------
1 file changed, 30 insertions(+), 30 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 6097b90..401e98f 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -419,21 +419,21 @@ Patch1002: debrand-rh-i686-cpu.patch
Source30000: kernel-3.10.0-x86_64.config.tis_extra
# Titanium Cloud patches here.
-Patch40001: Notification-of-death-of-arbitrary-processes.patch
-Patch40002: CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
-Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
-Patch40004: ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
-Patch40005: ixgbe-disable-LRO-by-default.patch
-Patch40006: ixgbe-RXC-nextp-bounds-check.patch
-Patch40007: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
-Patch40008: affine-compute-kernel-threads.patch
-Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
-Patch40010: Make-kernel-start-eth-devices-at-offset.patch
-Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
-Patch40012: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
-Patch40013: memblock-introduce-memblock_alloc_range.patch
-Patch40014: cma-add-placement-specifier-for-cma-kernel-parameter.patch
-Patch40015: x86-enable-DMA-CMA-with-swiotlb.patch
+#Patch40001: Notification-of-death-of-arbitrary-processes.patch
+#Patch40002: CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
+#Patch40003: CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+#Patch40004: ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
+#Patch40005: ixgbe-disable-LRO-by-default.patch
+#Patch40006: ixgbe-RXC-nextp-bounds-check.patch
+#Patch40007: PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+#Patch40008: affine-compute-kernel-threads.patch
+#Patch40009: Affine-irqs-and-workqueues-with-kthread_cpus.patch
+#Patch40010: Make-kernel-start-eth-devices-at-offset.patch
+#Patch40011: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+#Patch40012: mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
+#Patch40013: memblock-introduce-memblock_alloc_range.patch
+#Patch40014: cma-add-placement-specifier-for-cma-kernel-parameter.patch
+#Patch40015: x86-enable-DMA-CMA-with-swiotlb.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -750,21 +750,21 @@ ApplyOptionalPatch debrand-rh_taint.patch
ApplyOptionalPatch debrand-rh-i686-cpu.patch
# Titanium Cloud patches here.
-ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
-ApplyOptionalPatch CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
-ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
-ApplyOptionalPatch ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
-ApplyOptionalPatch ixgbe-disable-LRO-by-default.patch
-ApplyOptionalPatch ixgbe-RXC-nextp-bounds-check.patch
-ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
-ApplyOptionalPatch affine-compute-kernel-threads.patch
-ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
-ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
-ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
-ApplyOptionalPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
-ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
-ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
-ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
+#ApplyOptionalPatch Notification-of-death-of-arbitrary-processes.patch
+#ApplyOptionalPatch CGTS-3456-emit-CPU-logging-on-hard-soft-lockup.patch
+#ApplyOptionalPatch CGTS-3744-route-do-not-cache-fib-route-info-on-local.patch
+#ApplyOptionalPatch ixgbe-fully-disable-hardware-RSC-logic-when-disablin.patch
+#ApplyOptionalPatch ixgbe-disable-LRO-by-default.patch
+#ApplyOptionalPatch ixgbe-RXC-nextp-bounds-check.patch
+#ApplyOptionalPatch PCI-Add-ACS-quirk-for-Intel-Fortville-NICs.patch
+#ApplyOptionalPatch affine-compute-kernel-threads.patch
+#ApplyOptionalPatch Affine-irqs-and-workqueues-with-kthread_cpus.patch
+#ApplyOptionalPatch Make-kernel-start-eth-devices-at-offset.patch
+#ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
+#ApplyOptionalPatch mm-memblock-reorder-parameters-of-memblock_find_in_r.patch
+#ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
+#ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
+#ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

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

@ -1,52 +0,0 @@
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/32] Tweak install script for patching add patch release
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 55901b6..04b9816 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -3,7 +3,9 @@
Summary: The Linux kernel
-%define buildid .tis
+# This is the WRS patch release
+%define patch_rel 2
+%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
# For internal testing builds during development, it should be 0.
@@ -12,7 +14,8 @@ Summary: The Linux kernel
%global distro_build 693
%define rpmversion 3.10.0
-%define pkgrelease 693.21.1.el7
+%define _pkgrelease 693.21.1
+%define pkgrelease %{_pkgrelease}.el7
%define pkg_release %{pkgrelease}%{?buildid}
@@ -1425,6 +1428,10 @@ fi}\
%{expand:\
%{_sbindir}/new-kernel-pkg --package kernel%{?-v:-%{-v*}} --install %{KVRA}%{?-v:.%{-v*}} || exit $?\
}\
+# If this is a pkg upgrade (ie installed as a patch), set the reboot flag\
+if [ $1 -gt 1 ] ; then\
+ touch /var/run/node_is_patched_rr\
+fi\
%{nil}
#
--
1.8.3.1

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

@ -1,39 +0,0 @@
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/32] Update package versioning for TIS format
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 99df727..6097b90 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,8 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 7
-%define buildid .%{patch_rel}.tis
+%define buildid .%{tis_patch_ver}.tis
# 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.21.1
%define pkgrelease %{_pkgrelease}.el7
-%define pkg_release %{pkgrelease}%{?buildid}
+%define pkg_release %{pkgrelease}%{buildid}
# The kernel tarball/base version
%define rheltarball %{rpmversion}-%{pkgrelease}
--
1.8.3.1

36
kernel-std/centos/meta_patches/enable-building-mpt2sas-mpt3sas-as-builtin.patch
View File

@ -1,36 +0,0 @@
From 1c2b754ec0fa86647e27a4f3acfe8a9aa530ae65 Mon Sep 17 00:00:00 2001
Message-Id: <1c2b754ec0fa86647e27a4f3acfe8a9aa530ae65.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 14/32] enable building mpt2sas mpt3sas as builtin
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 48d55c0..ebff6f1 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -430,6 +430,7 @@ Patch40008: intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
Patch40009: memblock-introduce-memblock_alloc_range.patch
Patch40010: cma-add-placement-specifier-for-cma-kernel-parameter.patch
Patch40011: x86-enable-DMA-CMA-with-swiotlb.patch
+Patch40012: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -764,6 +765,7 @@ ApplyOptionalPatch intel-iommu-allow-ignoring-Ethernet-device-RMRR-with.patch
ApplyOptionalPatch memblock-introduce-memblock_alloc_range.patch
ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
+ApplyOptionalPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

33
kernel-std/centos/meta_patches/export-module-signing-key-in-kernel-devel.patch
View File

@ -1,33 +0,0 @@
From 4063a7c63935e29528514386350182bc8446fedc Mon Sep 17 00:00:00 2001
Message-Id: <4063a7c63935e29528514386350182bc8446fedc.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: Kam Nasim <kam.nasim@windriver.com>
Date: Wed, 10 Jan 2018 17:34:42 -0500
Subject: [PATCH 29/32] export module signing key in kernel devel
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 7735ebf..03863a6 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -1155,6 +1155,12 @@ BuildKernel() {
cp signing_key.priv signing_key.priv.sign${Flavour:+.${Flavour}}
cp signing_key.x509 signing_key.x509.sign${Flavour:+.${Flavour}}
+ # WRS: Copy these keys as part of the devel package
+ # The Module signing keys are to ensure that only Out-of-tree
+ # built against the Titanium Kernel get signed and loaded sans warnings
+ cp signing_key.priv ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+ cp signing_key.x509 ${RPM_BUILD_ROOT}/lib/modules/${KernelVer}/build/
+
# remove files that will be auto generated by depmod at rpm -i time
for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap softdep devname
do
--
1.8.3.1

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

@ -1,37 +0,0 @@
From 12abdd52f85c120ace88513aec1b106d9fb28bee Mon Sep 17 00:00:00 2001
Message-Id: <12abdd52f85c120ace88513aec1b106d9fb28bee.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, 6 Mar 2018 12:58:10 -0500
Subject: [PATCH 31/32] fix drbd by turning off write same in smartpqi
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 3 +++
1 file changed, 3 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 139607f..b50d791 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -452,6 +452,8 @@ 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
+# DRBD was choking on write same
+Patch40031: turn-off-write-same-in-smartqpi-driver.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -805,6 +807,7 @@ 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

29
kernel-std/centos/meta_patches/ixgbe-remove-kernel-builtin-drivers.patch
View File

@ -1,29 +0,0 @@
From 7c8bcd92cacf72071a12637e1934843f0f8f2f5d Mon Sep 17 00:00:00 2001
Message-Id: <7c8bcd92cacf72071a12637e1934843f0f8f2f5d.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 08/32] ixgbe remove kernel builtin drivers
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 849372a..99df727 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -4,7 +4,7 @@
Summary: The Linux kernel
# This is the WRS patch release
-%define patch_rel 6
+%define patch_rel 7
%define buildid .%{patch_rel}.tis
# For a kernel released for public testing, released_kernel should be 1.
--
1.8.3.1

28
kernel-std/centos/meta_patches/kernel-build_requires.patch
View File

@ -1,28 +0,0 @@
From 328fdfb32b03a0434189f9ce1a459df2f51fe406 Mon Sep 17 00:00:00 2001
Message-Id: <328fdfb32b03a0434189f9ce1a459df2f51fe406.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 07/32] kernel build_requires
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 1 +
1 file changed, 1 insertion(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 0447fe8..849372a 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -352,6 +352,7 @@ BuildRequires: rpm-build >= 4.9.0-1, elfutils >= 0.153-1
# required for zfcpdump
BuildRequires: glibc-static
%endif
+BuildRequires: util-linux
Source0: linux-%{rpmversion}-%{pkgrelease}.tar.xz
--
1.8.3.1

36
kernel-std/centos/meta_patches/meta-patch-for-Kernel-IMA-changes.patch
View File

@ -1,36 +0,0 @@
From f52203a514f61c1421deecf68b0ac8ecad96ece7 Mon Sep 17 00:00:00 2001
Message-Id: <f52203a514f61c1421deecf68b0ac8ecad96ece7.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: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 1 Sep 2017 13:45:40 -0400
Subject: [PATCH 24/32] meta patch for Kernel IMA changes
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index e6c1dad..f8a45ea 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -446,6 +446,7 @@ Patch40029: avoid-taking-spinlock-for-accessing-qos-values.patch
Patch40030: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
Patch40031: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
Patch40032: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
+Patch40033: US101216-IMA-support-in-Titanium-kernel.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -796,6 +797,7 @@ ApplyOptionalPatch avoid-taking-spinlock-for-accessing-qos-values.patch
ApplyOptionalPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
ApplyOptionalPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
ApplyOptionalPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
+ApplyOptionalPatch US101216-IMA-support-in-Titanium-kernel.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

52
kernel-std/centos/meta_patches/meta-patch-for-Kernel-IMA-keyring-changes.patch
View File

@ -1,52 +0,0 @@
From 2e6ec030be15349b2f1491fb65009338c1a8775c Mon Sep 17 00:00:00 2001
Message-Id: <2e6ec030be15349b2f1491fb65009338c1a8775c.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: Kam Nasim <kam.nasim@windriver.com>
Date: Mon, 25 Sep 2017 17:20:15 -0400
Subject: [PATCH 25/32] meta patch for Kernel IMA keyring changes
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 f8a45ea..e72feaa 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -417,6 +417,7 @@ Patch1002: debrand-rh-i686-cpu.patch
# Not sure if we need to worry about numerical collisions between
# SourceX and PatchX, so let's not risk it
Source30000: kernel-3.10.0-x86_64.config.tis_extra
+Source30001: ima_signing_key.pub
# Titanium Cloud patches here.
Patch40001: Fix-compile-issue-when-transparent-hugepages-are-off.patch
@@ -447,6 +448,7 @@ Patch40030: nfsd-check-for-oversized-NFSv2-v3-arguments.patch
Patch40031: nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
Patch40032: nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
Patch40033: US101216-IMA-support-in-Titanium-kernel.patch
+Patch40036: US103091-IMA-System-Configuration.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -798,6 +800,7 @@ ApplyOptionalPatch nfsd-check-for-oversized-NFSv2-v3-arguments.patch
ApplyOptionalPatch nfsd4-minor-NFSv2-v3-write-decoding-cleanup.patch
ApplyOptionalPatch nfsd-stricter-decoding-of-write-like-NFSv2-v3-ops.patch
ApplyOptionalPatch US101216-IMA-support-in-Titanium-kernel.patch
+ApplyOptionalPatch US103091-IMA-System-Configuration.patch
# Any further pre-build tree manipulations happen here.
@@ -926,6 +929,7 @@ BuildKernel() {
cp %{SOURCE12} . # extra_certificates
cp %{SOURCE15} . # rheldup3.x509
cp %{SOURCE16} . # rhelkpatch1.x509
+ cp %{SOURCE30001} . # ima_signing_key.pub
cp configs/$Config .config
--
1.8.3.1

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

@ -1,36 +0,0 @@
From 01ff6b59bcb1682a4fa9c690f4bf1d7a71816ecf Mon Sep 17 00:00:00 2001
Message-Id: <01ff6b59bcb1682a4fa9c690f4bf1d7a71816ecf.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 17/32] rcu Don't wake rcuc-X-kthreads on NOCB CPUs
Signed-off-by: Jim Somerville <Jim.Somerville@windriver.com>
---
SPECS/kernel.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec
index 65f030e..e1661d7 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -434,6 +434,7 @@ Patch40012: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
Patch40013: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
Patch40014: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
Patch40015: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
+Patch40016: rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -772,6 +773,7 @@ ApplyOptionalPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
ApplyOptionalPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
ApplyOptionalPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
ApplyOptionalPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
+ApplyOptionalPatch rcu-Don-t-wake-rcuc-X-kthreads-on-NOCB-CPUs.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1

38
kernel-std/centos/meta_patches/x86_dma_alloc_coherent-fix.patch
View File

@ -1,38 +0,0 @@
From bb0a6f45a3d5df2edee4e6372fbe85af5d7ec790 Mon Sep 17 00:00:00 2001
Message-Id: <bb0a6f45a3d5df2edee4e6372fbe85af5d7ec790.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:26 -0400
Subject: [PATCH 16/32] x86_dma_alloc_coherent fix
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 5fbea09..65f030e 100644
--- a/SPECS/kernel.spec
+++ b/SPECS/kernel.spec
@@ -432,6 +432,8 @@ Patch40010: cma-add-placement-specifier-for-cma-kernel-parameter.patch
Patch40011: x86-enable-DMA-CMA-with-swiotlb.patch
Patch40012: Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
Patch40013: Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
+Patch40014: x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+Patch40015: arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
BuildRoot: %{_tmppath}/kernel-%{KVRA}-root
@@ -768,6 +770,8 @@ ApplyOptionalPatch cma-add-placement-specifier-for-cma-kernel-parameter.patch
ApplyOptionalPatch x86-enable-DMA-CMA-with-swiotlb.patch
ApplyOptionalPatch Enable-building-mpt2sas-and-mpt3sas-as-builtin-for-C.patch
ApplyOptionalPatch Enable-building-kernel-with-CONFIG_BLK_DEV_NBD.patch
+ApplyOptionalPatch x86-make-dma_alloc_coherent-return-zeroed-memory-if-.patch
+ApplyOptionalPatch arch-x86-kernel-pci-dma.c-fix-dma_generic_alloc_cohe.patch
# Any further pre-build tree manipulations happen here.
--
1.8.3.1