From 7d9eadb823c3d0003107e18491ffd2fe74a3991f Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Wed, 17 Apr 2024 13:16:51 -0300 Subject: [PATCH] kernel-6.8.7-300 * Wed Apr 17 2024 Augusto Caringi [6.8.7-0] - redhat/configs: Enable CONFIG_MITIGATION_SPECTRE_BHI (Augusto Caringi) - Turn on XEN_BALLOON_MEMORY_HOTPLUG for Fedora (Justin M. Forbes) - Linux v6.8.7 Resolves: Signed-off-by: Augusto Caringi --- kernel-x86_64-debug-fedora.config | 5 ++--- kernel-x86_64-debug-rhel.config | 3 +-- kernel-x86_64-fedora.config | 5 ++--- kernel-x86_64-rhel.config | 3 +-- kernel-x86_64-rt-debug-rhel.config | 3 +-- kernel-x86_64-rt-rhel.config | 3 +-- kernel.changelog | 6 ++++++ kernel.spec | 13 +++++++++---- patch-6.8-redhat.patch | 21 +++------------------ sources | 6 +++--- 10 files changed, 29 insertions(+), 39 deletions(-) diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 61a8eb43c..5768e2d90 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -4084,6 +4084,7 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y # CONFIG_MK8 is not set CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y @@ -7280,8 +7281,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPECTRE_BHI_AUTO is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m @@ -8774,7 +8773,7 @@ CONFIG_XDP_SOCKETS=y CONFIG_XEN_512GB=y CONFIG_XEN_ACPI_PROCESSOR=m CONFIG_XEN_BACKEND=y -# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y CONFIG_XEN_BALLOON=y CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_FRONTEND=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index db28e89a2..e841332b4 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -3612,6 +3612,7 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set # CONFIG_MLX4_CORE is not set @@ -6509,8 +6510,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPECTRE_BHI_AUTO is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 0b0bea3d6..1b504d8c8 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -4058,6 +4058,7 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y # CONFIG_MK8 is not set CONFIG_MKISS=m CONFIG_MLX4_CORE_GEN2=y @@ -7250,8 +7251,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPECTRE_BHI_AUTO is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y CONFIG_SPI_ALTERA_CORE=m CONFIG_SPI_ALTERA_DFL=m @@ -8744,7 +8743,7 @@ CONFIG_XDP_SOCKETS=y CONFIG_XEN_512GB=y CONFIG_XEN_ACPI_PROCESSOR=m CONFIG_XEN_BACKEND=y -# CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not set +CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y CONFIG_XEN_BALLOON=y CONFIG_XEN_BLKDEV_BACKEND=m CONFIG_XEN_BLKDEV_FRONTEND=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d636fe8f3..0bebccbc1 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -3592,6 +3592,7 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set # CONFIG_MLX4_CORE is not set @@ -6485,8 +6486,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPECTRE_BHI_AUTO is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index 871439c58..226b0efe7 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -3657,6 +3657,7 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set # CONFIG_MLX4_CORE is not set @@ -6562,8 +6563,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPECTRE_BHI_AUTO is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 33b46cf14..cc3b7e4c2 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -3637,6 +3637,7 @@ CONFIG_MISC_FILESYSTEMS=y CONFIG_MISC_RTSX_PCI=m CONFIG_MISC_RTSX_USB=m CONFIG_MITIGATION_RFDS=y +CONFIG_MITIGATION_SPECTRE_BHI=y # CONFIG_MK8 is not set # CONFIG_MLX4_CORE_GEN2 is not set # CONFIG_MLX4_CORE is not set @@ -6538,8 +6539,6 @@ CONFIG_SPEAKUP_SYNTH_SOFT=m CONFIG_SPEAKUP_SYNTH_SPKOUT=m CONFIG_SPEAKUP_SYNTH_TXPRT=m # CONFIG_SPECTRE_BHI_AUTO is not set -# CONFIG_SPECTRE_BHI_OFF is not set -CONFIG_SPECTRE_BHI_ON=y CONFIG_SPECULATION_MITIGATIONS=y # CONFIG_SPI_ALTERA_CORE is not set # CONFIG_SPI_ALTERA is not set diff --git a/kernel.changelog b/kernel.changelog index 236a866b1..8e5a734e6 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,9 @@ +* Wed Apr 17 2024 Augusto Caringi [6.8.7-0] +- redhat/configs: Enable CONFIG_MITIGATION_SPECTRE_BHI (Augusto Caringi) +- Turn on XEN_BALLOON_MEMORY_HOTPLUG for Fedora (Justin M. Forbes) +- Linux v6.8.7 +Resolves: + * Sat Apr 13 2024 Justin M. Forbes [6.8.6-0] - nouveau: fix devinit paths to only handle display on GSP. (Dave Airlie) - Add bluetooth bug to Bugsfixed for 6.8.6 (Justin M. Forbes) diff --git a/kernel.spec b/kernel.spec index d5ed45deb..bb7d52365 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.8.6 -%define specversion 6.8.6 +%define specrpmversion 6.8.7 +%define specversion 6.8.7 %define patchversion 6.8 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.8.6 +%define tarfile_release 6.8.7 # This is needed to do merge window version magic %define patchlevel 8 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.8.6 +%define kabiversion 6.8.7 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -3959,6 +3959,11 @@ fi\ # # %changelog +* Wed Apr 17 2024 Augusto Caringi [6.8.7-0] +- redhat/configs: Enable CONFIG_MITIGATION_SPECTRE_BHI (Augusto Caringi) +- Turn on XEN_BALLOON_MEMORY_HOTPLUG for Fedora (Justin M. Forbes) +- Linux v6.8.7 + * Sat Apr 13 2024 Justin M. Forbes [6.8.6-0] - nouveau: fix devinit paths to only handle display on GSP. (Dave Airlie) - Add bluetooth bug to Bugsfixed for 6.8.6 (Justin M. Forbes) diff --git a/patch-6.8-redhat.patch b/patch-6.8-redhat.patch index 2515f7f6c..1bafd381e 100644 --- a/patch-6.8-redhat.patch +++ b/patch-6.8-redhat.patch @@ -29,17 +29,16 @@ include/linux/security.h | 5 + kernel/module/main.c | 2 + kernel/module/signing.c | 9 +- - net/bluetooth/l2cap_core.c | 3 +- scripts/mod/modpost.c | 8 + scripts/tags.sh | 2 + security/integrity/platform_certs/load_uefi.c | 6 +- security/lockdown/Kconfig | 13 ++ security/lockdown/lockdown.c | 1 + security/security.c | 12 ++ - 38 files changed, 672 insertions(+), 179 deletions(-) + 37 files changed, 671 insertions(+), 177 deletions(-) diff --git a/Makefile b/Makefile -index c426d47f4b7b..9e0540aa3691 100644 +index e6c0a00722ea..ac70a1596394 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -233,7 +232,7 @@ index 1687483ff319..390b67f19181 100644 return ctx.rc; } diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c -index 617f3e0e963d..92d9066ab4c2 100644 +index eb4ca85d16ff..be8278b39b22 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -1757,6 +1757,15 @@ static bool acpi_device_enumeration_by_parent(struct acpi_device *device) @@ -1416,20 +1415,6 @@ index a2ff4242e623..f0d2be1ee4f1 100644 } int module_sig_check(struct load_info *info, int flags) -diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c -index ab5a9d42fae7..706d2478ddb3 100644 ---- a/net/bluetooth/l2cap_core.c -+++ b/net/bluetooth/l2cap_core.c -@@ -4054,8 +4054,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn, - return -EPROTO; - - hci_dev_lock(hdev); -- if (hci_dev_test_flag(hdev, HCI_MGMT) && -- !test_and_set_bit(HCI_CONN_MGMT_CONNECTED, &hcon->flags)) -+ if (hci_dev_test_flag(hdev, HCI_MGMT)) - mgmt_device_connected(hdev, hcon, NULL, 0); - hci_dev_unlock(hdev); - diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index ce686ebf5591..0d28efddb253 100644 --- a/scripts/mod/modpost.c diff --git a/sources b/sources index f6708862d..97cd31b71 100644 --- a/sources +++ b/sources @@ -1,5 +1,5 @@ SHA512 (kernel-abi-stablelists-6.6.0.tar.bz2) = 4f917598056dee5e23814621ec96ff2e4a411c8c4ba9d56ecb01b23cb96431825bedbecfcbaac9338efbf5cb21694d85497fa0bf43e7c80d9cd10bc6dd144dbd SHA512 (kernel-kabi-dw-6.6.0.tar.bz2) = 19308cd976031d05e18ef7f5d093218acdb89446418bab0cd956ff12cf66369915b9e64bb66fa9f20939428a60e81884fec5be3529c6c7461738d6540d3cc5c6 -SHA512 (linux-6.8.6.tar.xz) = 853928d4a18138453b122bb4131c2eb260b504974c2958000fbd9932761dc0302631e2f26d5c01b9c4fdcd2a89c8887714cfe634b84cf8f7fca20f984ad944d2 -SHA512 (kernel-abi-stablelists-6.8.6.tar.xz) = 5d67ad8ee96bf237d720ae4f4eaa9fa7452e81da693988c5c8e40675174814ada18948cf09790c73858a646c86c8756f8bde4cfee254370f634d381dc1c4147e -SHA512 (kernel-kabi-dw-6.8.6.tar.xz) = a12f7001bcbba4ee61d3f4779539a28728a3fe51361b21264a0625ad2e028ce6e1443cde4cd5c5402076c782e912b07c6d1fd56ea7a7cb8130c7d76e4cbd3d76 +SHA512 (linux-6.8.7.tar.xz) = 6874dd6a8a022437bbdfd89af6b923f77807c1bd411a26ad27a01a8e828c5de868a661cf9d4ddb2672530140ac38c1202a1bf70ad26e1572bb898164e139c633 +SHA512 (kernel-abi-stablelists-6.8.7.tar.xz) = 83653234220ecd4d0f82bbb0284ae986375f997548dbbf124764e3a222f6680640b5a943b8b17ecdcc7f23d8a0c57d91a37095c987e2c9ac2c6410ae4cef213a +SHA512 (kernel-kabi-dw-6.8.7.tar.xz) = 9d7cb1017cd70aa3fc56ec6235350e09dd56739b03e6f171b36d1052c247f7ef9cbae6c41d5452c4d151f1163b9a0dfec71d140a96700a0acffddde95d17046d