From 19a2894e6542facdfb67566826f2d3f08c395ba2 Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 11 Sep 2018 00:58:15 +0800 Subject: [PATCH] rebase std kernel patch to CentOS7.5 3.10.0-862.11.6 version Story: 2003596 Task: 24917 Depends-On: https://review.openstack.org/601202 since related rpm is also upgraded, no longer need to downgrade the linux-firmware and compiler dependencies Change-Id: I9e535f95d18f3db8b4b9c4375504e82c4597d697 Signed-off-by: slin14 --- .../Build-logic-and-sources-for-TiC.patch | 14 ++++---- ...wer-the-compiler-version-requirement.patch | 26 --------------- ...e-linux-firmware-version-requirement.patch | 26 --------------- .../centos/meta_patches/PATCH_ORDER | 2 -- ...xpose-pm_qos_resume_latency-for-CPUs.patch | 17 ++++------ ...tion-of-death-of-arbitrary-processes.patch | 33 +++++++++---------- ...orting-Cacheinfo-from-Kernel-4.10.17.patch | 23 ++++++------- kernel/kernel-std/centos/srpm_path | 2 +- 8 files changed, 40 insertions(+), 103 deletions(-) delete mode 100644 kernel/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch delete mode 100644 kernel/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch diff --git a/kernel/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch b/kernel/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch index 922974a46..d9998f9f1 100644 --- a/kernel/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch +++ b/kernel/kernel-std/centos/meta_patches/Build-logic-and-sources-for-TiC.patch @@ -1,7 +1,7 @@ -From a75195ff25cd30a4662cae5835d32a2403032a33 Mon Sep 17 00:00:00 2001 +From 32af2a0ea3905e23d85a65fd9326dbc6db0a21c4 Mon Sep 17 00:00:00 2001 From: Jim Somerville Date: Fri, 20 Apr 2018 14:51:56 -0400 -Subject: [PATCH 1/5] Build logic and sources for TiC +Subject: [PATCH] Build logic and sources for TiC Signed-off-by: Jim Somerville --- @@ -9,7 +9,7 @@ Signed-off-by: Jim Somerville 1 file changed, 60 insertions(+), 13 deletions(-) diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec -index 31a5f11..eef356a 100644 +index 1c3a765..f2499b4 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -5,7 +5,8 @@ Summary: The Linux kernel @@ -26,13 +26,13 @@ index 31a5f11..eef356a 100644 %global distro_build 862 %define rpmversion 3.10.0 --%define pkgrelease 862.6.3.el7 -+%define _pkgrelease 862.6.3 +-%define pkgrelease 862.11.6.el7 ++%define _pkgrelease 862.11.6 +%define pkgrelease %{_pkgrelease}.el7 + # allow pkg_release to have configurable %%{?dist} tag - %define specrelease 862.6.3%{?dist} + %define specrelease 862.11.6%{?dist} -%define pkg_release %{specrelease}%{?buildid} +%define pkg_release %{specrelease}%{buildid} @@ -224,7 +224,7 @@ index 31a5f11..eef356a 100644 +%endif + %changelog - * Tue Jun 26 2018 CentOS Sources - 3.10.0-862.6.3.el7 + * Tue Aug 14 2018 CentOS Sources - 3.10.0-862.11.6.el7 - Apply debranding changes -- 2.7.4 diff --git a/kernel/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch b/kernel/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch deleted file mode 100644 index d7dfa01d2..000000000 --- a/kernel/kernel-std/centos/meta_patches/Lower-the-compiler-version-requirement.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 393eb8d3d3a15cda274f5d0c45763de9a8b3fcab Mon Sep 17 00:00:00 2001 -From: Jim Somerville -Date: Tue, 29 May 2018 13:06:24 -0400 -Subject: [PATCH 3/5] Lower the compiler version requirement - -Signed-off-by: Jim Somerville ---- - SPECS/kernel.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec -index f1a0092..01dd989 100644 ---- a/SPECS/kernel.spec -+++ b/SPECS/kernel.spec -@@ -335,7 +335,7 @@ ExclusiveOS: Linux - # - BuildRequires: module-init-tools, patch >= 2.5.4, bash >= 2.03, sh-utils, tar - BuildRequires: xz, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk --BuildRequires: gcc >= 4.8.5-28.el7_5.1, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55 -+BuildRequires: gcc >= 4.8.5-16, binutils >= 2.25, redhat-rpm-config >= 9.1.0-55 - BuildRequires: hostname, net-tools, bc - BuildRequires: xmlto, asciidoc - BuildRequires: openssl --- -2.7.4 - diff --git a/kernel/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch b/kernel/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch deleted file mode 100644 index 220def9c4..000000000 --- a/kernel/kernel-std/centos/meta_patches/Lower-the-linux-firmware-version-requirement.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ec433bddc585744616d73daefc1b32326002a8ab Mon Sep 17 00:00:00 2001 -From: Jim Somerville -Date: Fri, 1 Jun 2018 16:17:43 -0400 -Subject: [PATCH 5/5] Lower the linux firmware version requirement - -Signed-off-by: Jim Somerville ---- - SPECS/kernel.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec -index d45c419..9fdd37a 100644 ---- a/SPECS/kernel.spec -+++ b/SPECS/kernel.spec -@@ -301,7 +301,7 @@ Provides: kernel-modeset = 1\ - Provides: kernel-uname-r = %{KVRA}%{?1:.%{1}}\ - Requires(pre): %{kernel_prereq}\ - Requires(pre): %{initrd_prereq}\ --Requires(pre): linux-firmware >= 20180113-61\ -+Requires(pre): linux-firmware >= 20170606-56\ - Requires(post): %{_sbindir}/new-kernel-pkg\ - Requires(post): system-release\ - Requires(preun): %{_sbindir}/new-kernel-pkg\ --- -2.7.4 - diff --git a/kernel/kernel-std/centos/meta_patches/PATCH_ORDER b/kernel/kernel-std/centos/meta_patches/PATCH_ORDER index 7a3ea4aae..8eab5dd84 100644 --- a/kernel/kernel-std/centos/meta_patches/PATCH_ORDER +++ b/kernel/kernel-std/centos/meta_patches/PATCH_ORDER @@ -1,5 +1,3 @@ Build-logic-and-sources-for-TiC.patch Kernel-source-patches-for-TiC.patch -Lower-the-compiler-version-requirement.patch Compile-issues.patch -Lower-the-linux-firmware-version-requirement.patch diff --git a/kernel/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch b/kernel/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch index 19066ed3a..dad1b90d2 100644 --- a/kernel/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch +++ b/kernel/kernel-std/centos/patches/CPU-PM-expose-pm_qos_resume_latency-for-CPUs.patch @@ -1,10 +1,7 @@ -From 7a41b9bb6ebe53e024ad5fc56c12089467d7b133 Mon Sep 17 00:00:00 2001 -Message-Id: <7a41b9bb6ebe53e024ad5fc56c12089467d7b133.1527544850.git.Jim.Somerville@windriver.com> -In-Reply-To: -References: +From 648072810b35e6251c6503a8e6693deeb6d0a89d Mon Sep 17 00:00:00 2001 From: Alex Shi Date: Thu, 12 Jan 2017 21:27:03 +0800 -Subject: [PATCH 20/26] CPU / PM: expose pm_qos_resume_latency for CPUs +Subject: [PATCH] CPU / PM: expose pm_qos_resume_latency for CPUs [ commit 37efa4b41ffb31dcdfc3beb97d47992bb2a083e5 from linux-stable ] @@ -39,18 +36,18 @@ Signed-off-by: Jim Somerville 1 file changed, 2 insertions(+) diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c -index 803d2a0..1d9bba3 100644 +index 65e786d..91d620f 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c -@@ -15,6 +15,7 @@ - #include +@@ -16,6 +16,7 @@ #include #include + #include +#include #include "base.h" -@@ -318,6 +319,7 @@ int register_cpu(struct cpu *cpu, int num) +@@ -319,6 +320,7 @@ int register_cpu(struct cpu *cpu, int num) per_cpu(cpu_sys_devices, num) = &cpu->dev; if (!error) register_cpu_under_node(num, cpu_to_node(num)); @@ -59,5 +56,5 @@ index 803d2a0..1d9bba3 100644 #ifdef CONFIG_KEXEC if (!error) -- -1.8.3.1 +2.7.4 diff --git a/kernel/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch b/kernel/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch index 4077b59b6..66f2de45a 100644 --- a/kernel/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch +++ b/kernel/kernel-std/centos/patches/Notification-of-death-of-arbitrary-processes.patch @@ -1,10 +1,7 @@ -From f18a1429e701642388614b47073f4425020deee6 Mon Sep 17 00:00:00 2001 -Message-Id: -In-Reply-To: -References: +From 36270456f8d6e274791fbf846ad03249759eafa6 Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Thu, 7 Apr 2016 11:16:19 -0600 -Subject: [PATCH 02/26] Notification of death of arbitrary processes +Subject: [PATCH] Notification of death of arbitrary processes Note: this commit was copied from Titanium Cloud Rel2 @@ -65,7 +62,7 @@ index a05294b..cfb7197 100644 .timer_slack_ns = 50000, /* 50 usec default slack */ \ .pids = { \ diff --git a/include/linux/sched.h b/include/linux/sched.h -index 0646138..3933e24 100644 +index d184652..ba6ae5c 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1631,6 +1631,12 @@ struct task_struct { @@ -82,7 +79,7 @@ index 0646138..3933e24 100644 int numa_scan_seq; unsigned int numa_scan_period; diff --git a/include/uapi/linux/prctl.h b/include/uapi/linux/prctl.h -index 8ddaa82..53d6392 100644 +index a817b5c..2cf7776 100644 --- a/include/uapi/linux/prctl.h +++ b/include/uapi/linux/prctl.h @@ -55,6 +55,24 @@ @@ -457,7 +454,7 @@ index 1afa799..a2ea26b 100644 __exit_signal(p); diff --git a/kernel/fork.c b/kernel/fork.c -index 55e4ca4..e721eed 100644 +index c75422b..30dee92 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1471,6 +1471,10 @@ static struct task_struct *copy_process(unsigned long clone_flags, @@ -472,10 +469,10 @@ index 55e4ca4..e721eed 100644 /* Perform scheduler related setup. Assign this task to a CPU. */ retval = sched_fork(clone_flags, p); diff --git a/kernel/signal.c b/kernel/signal.c -index a5aa525..b9d138e 100644 +index 35133a7..3f72ac0 100644 --- a/kernel/signal.c +++ b/kernel/signal.c -@@ -46,6 +46,9 @@ +@@ -47,6 +47,9 @@ #include #include #include "audit.h" /* audit_signal_info() */ @@ -485,7 +482,7 @@ index a5aa525..b9d138e 100644 /* * SLAB caches for signal bits. -@@ -1740,6 +1743,10 @@ bool do_notify_parent(struct task_struct *tsk, int sig) +@@ -1744,6 +1747,10 @@ bool do_notify_parent(struct task_struct *tsk, int sig) __wake_up_parent(tsk, tsk->parent); spin_unlock_irqrestore(&psig->siglock, flags); @@ -496,7 +493,7 @@ index a5aa525..b9d138e 100644 return autoreap; } -@@ -1811,6 +1818,10 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, +@@ -1815,6 +1822,10 @@ static void do_notify_parent_cldstop(struct task_struct *tsk, */ __wake_up_parent(tsk, parent); spin_unlock_irqrestore(&sighand->siglock, flags); @@ -508,12 +505,12 @@ index a5aa525..b9d138e 100644 static inline int may_ptrace_stop(void) diff --git a/kernel/sys.c b/kernel/sys.c -index cb90b1c..c68f98e 100644 +index 1fbf388..0bc6b02 100644 --- a/kernel/sys.c +++ b/kernel/sys.c -@@ -64,6 +64,10 @@ - #include - #include +@@ -67,6 +67,10 @@ + /* Hardening for Spectre-v1 */ + #include +#ifdef CONFIG_SIGEXIT +#include "death_notify.h" @@ -522,7 +519,7 @@ index cb90b1c..c68f98e 100644 #ifndef SET_UNALIGN_CTL # define SET_UNALIGN_CTL(a,b) (-EINVAL) #endif -@@ -2474,6 +2478,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, +@@ -2478,6 +2482,11 @@ SYSCALL_DEFINE5(prctl, int, option, unsigned long, arg2, unsigned long, arg3, else error = PR_MCE_KILL_DEFAULT; break; @@ -535,5 +532,5 @@ index cb90b1c..c68f98e 100644 error = prctl_set_mm(arg2, arg3, arg4, arg5); break; -- -1.8.3.1 +2.7.4 diff --git a/kernel/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch b/kernel/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch index f9694dcc3..ab797dc9b 100644 --- a/kernel/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch +++ b/kernel/kernel-std/centos/patches/Porting-Cacheinfo-from-Kernel-4.10.17.patch @@ -1,10 +1,7 @@ -From 68c649b9bc60dd2b526e0d181edde358196d2e78 Mon Sep 17 00:00:00 2001 -Message-Id: <68c649b9bc60dd2b526e0d181edde358196d2e78.1527544850.git.Jim.Somerville@windriver.com> -In-Reply-To: -References: +From ee927a1ebf0c981030adcf75c2cebf6d32ccf617 Mon Sep 17 00:00:00 2001 From: Alex Kozyrev Date: Wed, 19 Jul 2017 02:21:59 -0500 -Subject: [PATCH 16/26] Porting Cacheinfo from Kernel 4.10.17 +Subject: [PATCH] Porting Cacheinfo from Kernel 4.10.17 Original source code from tag v4.10.17 in Linux stable tree for: intel_cacheinfo.c, cacheinfo.c and cacheinfo.h. @@ -61,7 +58,7 @@ Signed-off-by: Jim Somerville create mode 100644 include/linux/cacheinfo.h diff --git a/Documentation/ABI/testing/sysfs-devices-system-cpu b/Documentation/ABI/testing/sysfs-devices-system-cpu -index 55338e6..eaf8da1 100644 +index ff65f15..7521be8 100644 --- a/Documentation/ABI/testing/sysfs-devices-system-cpu +++ b/Documentation/ABI/testing/sysfs-devices-system-cpu @@ -201,6 +201,71 @@ Description: address and size of the percpu note. @@ -1931,10 +1928,10 @@ index 0000000..eb3af27 +} +device_initcall(cacheinfo_sysfs_init); diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c -index bd82212..803d2a0 100644 +index 290609b..65e786d 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c -@@ -338,6 +338,60 @@ struct device *get_cpu_device(unsigned cpu) +@@ -340,6 +340,60 @@ struct device *get_cpu_device(unsigned cpu) } EXPORT_SYMBOL_GPL(get_cpu_device); @@ -2106,12 +2103,12 @@ index 0000000..6a524bf + +#endif /* _LINUX_CACHEINFO_H */ diff --git a/include/linux/cpu.h b/include/linux/cpu.h -index 1cc4c78..8354cc0 100644 +index 82180fe..434d92c 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h -@@ -43,6 +43,9 @@ extern ssize_t cpu_show_spectre_v1(struct device *dev, - extern ssize_t cpu_show_spectre_v2(struct device *dev, - struct device_attribute *attr, char *buf); +@@ -49,6 +49,9 @@ extern ssize_t cpu_show_spec_store_bypass(struct device *dev, + extern ssize_t cpu_show_l1tf(struct device *dev, + struct device_attribute *attr, char *buf); +extern struct device *cpu_device_create(struct device *parent, void *drvdata, + const struct attribute_group **groups, @@ -2120,5 +2117,5 @@ index 1cc4c78..8354cc0 100644 extern void unregister_cpu(struct cpu *cpu); extern ssize_t arch_cpu_probe(const char *, size_t); -- -1.8.3.1 +2.7.4 diff --git a/kernel/kernel-std/centos/srpm_path b/kernel/kernel-std/centos/srpm_path index 0d81c12a9..38c1a66b6 100644 --- a/kernel/kernel-std/centos/srpm_path +++ b/kernel/kernel-std/centos/srpm_path @@ -1,2 +1,2 @@ -mirror:Source/kernel-3.10.0-862.6.3.el7.src.rpm +mirror:Source/kernel-3.10.0-862.11.6.el7.src.rpm