From 92f04abb9ce2605b552c14d3792a5621c5336956 Mon Sep 17 00:00:00 2001 From: "Herton R. Krzesinski" Date: Wed, 10 Nov 2021 22:20:08 +0000 Subject: [PATCH] kernel-5.14.0-14.el9 * Wed Nov 10 2021 Herton R. Krzesinski [5.14.0-14.el9] - evm: mark evm_fixmode as __ro_after_init (Bruno Meneguele) [2017160] - IMA: remove -Wmissing-prototypes warning (Bruno Meneguele) [2017160] - perf flamegraph: flamegraph.py script improvements (Michael Petlan) [2010271] - redhat/configs/evaluate_configs: insert EMPTY tags at correct place (Jan Stancek) [2015082] - redhat/configs/evaluate_configs: walk cfgvariants line by line (Jan Stancek) [2015082] - redhat/configs: create a separate config for gcov options (Jan Stancek) [2015082] - redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek) [2015082] - i40e: fix endless loop under rtnl (Stefan Assmann) [1992939] - selftests/bpf: Use nanosleep tracepoint in perf buffer test (Jiri Olsa) [2006310] - selftests/bpf: Fix possible/online index mismatch in perf_buffer test (Jiri Olsa) [2006310] - selftests/bpf: Fix perf_buffer test on system with offline cpus (Jiri Olsa) [2006310] - KVM: x86: Fix stack-out-of-bounds memory access from ioapic_write_indirect() (Vitaly Kuznetsov) [1965145] - selftest/bpf: Switch recursion test to use htab_map_delete_elem (Jiri Olsa) [2006313] Resolves: rhbz#1965145, rhbz#1992939, rhbz#2006310, rhbz#2006313, rhbz#2010271, rhbz#2015082, rhbz#2017160 Signed-off-by: Herton R. Krzesinski --- Makefile.rhelver | 2 +- kernel.spec | 44 ++++++++++++++++++++++++++------------- partial-kgcov-snip.config | 4 ++++ sources | 6 +++--- 4 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 partial-kgcov-snip.config diff --git a/Makefile.rhelver b/Makefile.rhelver index f0221aa9f..18c06e49b 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 0 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 13 +RHEL_RELEASE = 14 # # Early y+1 numbering diff --git a/kernel.spec b/kernel.spec index 21bbcacb6..4a1a3ac71 100755 --- a/kernel.spec +++ b/kernel.spec @@ -85,7 +85,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 13 +%global distro_build 14 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -129,13 +129,13 @@ Summary: The Linux kernel %define kversion 5.14 %define rpmversion 5.14.0 -%define pkgrelease 13.el9 +%define pkgrelease 14.el9 # This is needed to do merge window version magic %define patchlevel 14 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 13%{?buildid}%{?dist} +%define specrelease 14%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -676,7 +676,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.0-13.el9.tar.xz +Source0: linux-5.14.0-14.el9.tar.xz Source1: Makefile.rhelver @@ -785,6 +785,7 @@ Source72: filter-s390x.sh.fedora Source73: filter-modules.sh.fedora %endif +Source75: partial-kgcov-snip.config Source80: generate_all_configs.sh Source81: process_configs.sh @@ -1360,8 +1361,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.0-13.el9 -c -mv linux-5.14.0-13.el9 linux-%{KVERREL} +%setup -q -n kernel-5.14.0-14.el9 -c +mv linux-5.14.0-14.el9 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1425,15 +1426,13 @@ for i in %{all_arch_configs} do mv $i $i.tmp ./merge.pl %{SOURCE3001} $i.tmp > $i - rm $i.tmp -done -%endif - -# enable GCOV kernel config options if gcov is on %if %{with_gcov} -for i in *.config -do - sed -i 's/# CONFIG_GCOV_KERNEL is not set/CONFIG_GCOV_KERNEL=y\nCONFIG_GCOV_PROFILE_ALL=y\n/' $i + echo "Merging with gcov options" + cat %{SOURCE75} + mv $i $i.tmp + ./merge.pl %{SOURCE75} $i.tmp > $i +%endif + rm $i.tmp done %endif @@ -2854,7 +2853,7 @@ fi %endif %if %{with_gcov} -%ifarch x86_64 s390x ppc64le aarch64 +%ifnarch %nobuildarches noarch %files gcov %{_builddir} %endif @@ -2952,6 +2951,21 @@ fi # # %changelog +* Wed Nov 10 2021 Herton R. Krzesinski [5.14.0-14.el9] +- evm: mark evm_fixmode as __ro_after_init (Bruno Meneguele) [2017160] +- IMA: remove -Wmissing-prototypes warning (Bruno Meneguele) [2017160] +- perf flamegraph: flamegraph.py script improvements (Michael Petlan) [2010271] +- redhat/configs/evaluate_configs: insert EMPTY tags at correct place (Jan Stancek) [2015082] +- redhat/configs/evaluate_configs: walk cfgvariants line by line (Jan Stancek) [2015082] +- redhat/configs: create a separate config for gcov options (Jan Stancek) [2015082] +- redhat/kernel.spec.template: don't hardcode gcov arches (Jan Stancek) [2015082] +- i40e: fix endless loop under rtnl (Stefan Assmann) [1992939] +- selftests/bpf: Use nanosleep tracepoint in perf buffer test (Jiri Olsa) [2006310] +- selftests/bpf: Fix possible/online index mismatch in perf_buffer test (Jiri Olsa) [2006310] +- selftests/bpf: Fix perf_buffer test on system with offline cpus (Jiri Olsa) [2006310] +- KVM: x86: Fix stack-out-of-bounds memory access from ioapic_write_indirect() (Vitaly Kuznetsov) [1965145] +- selftest/bpf: Switch recursion test to use htab_map_delete_elem (Jiri Olsa) [2006313] + * Mon Nov 08 2021 Herton R. Krzesinski [5.14.0-13.el9] - futex: Remove unused variable 'vpid' in futex_proxy_trylock_atomic() (Waiman Long) [2007032] - futex: Prevent inconsistent state and exit race (Waiman Long) [2007032] diff --git a/partial-kgcov-snip.config b/partial-kgcov-snip.config new file mode 100644 index 000000000..fb373597e --- /dev/null +++ b/partial-kgcov-snip.config @@ -0,0 +1,4 @@ +# kgcov +CONFIG_GCOV_KERNEL=y +CONFIG_GCOV_PROFILE_ALL=y +# CONFIG_GCOV_PROFILE_FTRACE is not set diff --git a/sources b/sources index 6ac92b2d8..7d1078a81 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.14.0-13.el9.tar.xz) = c5cf76793a47646e04953896479505b1e6a57d6dbc7a1ad4cc20bf4729f6e96800abd35b516799a91b1d79f7757a460de2f134190977a0423408db2f9aa98885 -SHA512 (kernel-abi-stablelists-5.14.0-13.tar.bz2) = 07cdaa61c07ae957f79fbf63fe918af74c0f51beac9f4ba278fa2922b6fdea961a7ef7293d90deb9f6c40ebcd7a8c028d6337e51b52ffa4ffa244d38abada620 -SHA512 (kernel-kabi-dw-5.14.0-13.tar.bz2) = 6fac3b257107534d02534961452e2154fd4ca4a4bcba2e86a78ede3cc6416818e597855198896e54513eb327531fd8a0914f0001379f68519ace66f08d37f5a9 +SHA512 (linux-5.14.0-14.el9.tar.xz) = eeb95d1724e54c0c3346c30a1fd40f106614ddd706ae725712a7c20d0792e19ce31b49b7b4bc7d208617d1f1e7d5e174d49c5ad6d1765d9cb2c47bc984a483c8 +SHA512 (kernel-abi-stablelists-5.14.0-14.tar.bz2) = aadf9f69f91b315ebcaa1f6da45106e7182b7ef53870dc773a4f48256bb3b76e6c2363b0b04e1582e924b255009b96ab926b6c86c25952c9ecd10d816a85befa +SHA512 (kernel-kabi-dw-5.14.0-14.tar.bz2) = e7370a362253b53dd589096d98170b9d1fcdb108e61b8070aa13c50df96cae5bc2338a0b44c0f463cf3e90af0da2066a9cdc92ca8cd79bb9196b06b4d7f3fe17