From 7ff31c75b32b1146105df5bbdd9ee95982a3e405 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Fri, 10 May 2024 14:56:01 -0500 Subject: [PATCH] kernel-6.9.0-0.rc7.20240510git448b3fe5a0ea.62 * Fri May 10 2024 Fedora Kernel Team [6.9.0-0.rc7.448b3fe5a0ea.62] - redhat: make filtermods.py less verbose by default (Jan Stancek) - Linux v6.9.0-0.rc7.448b3fe5a0ea Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 3 +++ filtermods.py | 43 ++++++++++++++++++++++++++++-------------- kernel.changelog | 5 +++++ kernel.spec | 16 ++++++++++++---- patch-6.9-redhat.patch | 17 ++++++++++------- sources | 6 +++--- 7 files changed, 63 insertions(+), 29 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 933dc5093..9eeb9b728 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 61 +RHEL_RELEASE = 62 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 83c40aef2..25360df08 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/8ee6673f39bf08112ee45c7bbc194a206699842a + 8ee6673f39bf08112ee45c7bbc194a206699842a [redhat] PCI: Fix pci_rh_check_status() call semantics + https://gitlab.com/cki-project/kernel-ark/-/commit/4ab353ee7fd3b6ed9eadfb77260de8976d983b1a 4ab353ee7fd3b6ed9eadfb77260de8976d983b1a scsi: sd: condition probe_type under RHEL_DIFFERENCES diff --git a/filtermods.py b/filtermods.py index 3500cde88..9d7e33da6 100755 --- a/filtermods.py +++ b/filtermods.py @@ -11,7 +11,7 @@ import sys import yaml import unittest -from logging import getLogger, DEBUG, INFO, WARN, ERROR, CRITICAL, NOTSET, StreamHandler, Formatter, Logger +from logging import getLogger, DEBUG, INFO, WARN, ERROR, CRITICAL, NOTSET, FileHandler, StreamHandler, Formatter, Logger from typing import Optional log = getLogger('filtermods') @@ -42,14 +42,25 @@ def safe_run_command(cmd, cwddir=None): return retcode, out, err -def setup_logging(): +def setup_logging(log_filename, stdout_log_level): log_format = '%(asctime)s %(levelname)7.7s %(funcName)20.20s:%(lineno)4s %(message)s' log = getLogger('filtermods') + log.setLevel(DEBUG) + handler = StreamHandler(sys.stdout) formatter = Formatter(log_format, '%H:%M:%S') handler.setFormatter(formatter) + handler.setLevel(stdout_log_level) log.addHandler(handler) - log.debug('Logging on') + log.debug('stdout logging on') + + if log_filename: + file_handler = FileHandler(log_filename, 'w') + file_handler.setFormatter(formatter) + file_handler.setLevel(DEBUG) + log.addHandler(file_handler) + log.info('file logging on: %s', log_filename) + return log @@ -342,7 +353,7 @@ def update_allowed(kmod: KMod, visited: set[KMod], update_linked: bool = False) if init: kmod.allowed_list = init_allowed_list - log.info('%s: init to %s', kmod.name, [x.name for x in kmod.allowed_list]) + log.debug('%s: init to %s', kmod.name, [x.name for x in kmod.allowed_list]) kmod_allowed_list = kmod.allowed_list or set() # log.debug('%s: update to %s', kmod.name, [x.name for x in kmod_allowed_list]) @@ -354,8 +365,8 @@ def update_allowed(kmod: KMod, visited: set[KMod], update_linked: bool = False) continue if not is_pkg_parent_to_any(pkg, kmod_dep.allowed_list): to_remove.add(pkg) - log.info('%s: remove %s from allowed, child: %s [%s]', - kmod.name, [pkg.name], kmod_dep.name, [x.name for x in kmod_dep.allowed_list]) + log.debug('%s: remove %s from allowed, child: %s [%s]', + kmod.name, [pkg.name], kmod_dep.name, [x.name for x in kmod_dep.allowed_list]) # each allowed is child to at least one parent allowed [for _all_ parents] for pkg in kmod_allowed_list: @@ -365,8 +376,8 @@ def update_allowed(kmod: KMod, visited: set[KMod], update_linked: bool = False) if not is_pkg_child_to_any(pkg, kmod_par.allowed_list): to_remove.add(pkg) - log.info('%s: remove %s from allowed, parent: %s %s', - kmod.name, [pkg.name], kmod_par.name, [x.name for x in kmod_par.allowed_list]) + log.debug('%s: remove %s from allowed, parent: %s %s', + kmod.name, [pkg.name], kmod_par.name, [x.name for x in kmod_par.allowed_list]) for pkg in to_remove: kmod_allowed_list.remove(pkg) @@ -377,7 +388,7 @@ def update_allowed(kmod: KMod, visited: set[KMod], update_linked: bool = False) if init or to_remove or update_linked: if to_remove: - log.info('%s: updated to %s', kmod.name, [x.name for x in kmod_allowed_list]) + log.debug('%s: updated to %s', kmod.name, [x.name for x in kmod_allowed_list]) for kmod_dep in kmod.depends_on: num_updated = num_updated + update_allowed(kmod_dep, visited) @@ -488,8 +499,8 @@ def propagate_labels_2(pkg_list: KModPackageList, kmod_list: KModList): if chosen_pkg is not None: kmod.allowed_list = set([chosen_pkg]) - log.info('%s: making to prefer %s (preffered is %s), allowed: %s', kmod.name, chosen_pkg.name, - kmod.preferred_pkg.name, [pkg.name for pkg in kmod.allowed_list]) + log.debug('%s: making to prefer %s (preffered is %s), allowed: %s', kmod.name, chosen_pkg.name, + kmod.preferred_pkg.name, [pkg.name for pkg in kmod.allowed_list]) update_linked = True visited: set[KMod] = set() @@ -551,7 +562,7 @@ def propagate_labels_3(pkg_list: KModPackageList, kmod_list: KModList): if chosen_pkg: kmod.allowed_list = set([chosen_pkg]) - log.info('%s: making to prefer %s (default: %s)', kmod.name, [chosen_pkg.name], default_name) + log.debug('%s: making to prefer %s (default: %s)', kmod.name, [chosen_pkg.name], default_name) update_linked = True visited: set[KMod] = set() @@ -1002,13 +1013,15 @@ def cmd_cmp2rpm(options): def main(): global log - log = setup_logging() parser = argparse.ArgumentParser() parser.add_argument('-v', '--verbose', dest='verbose', help='be more verbose', action='count', default=4) parser.add_argument('-q', '--quiet', dest='quiet', help='be more quiet', action='count', default=0) + parser.add_argument('-l', '--log-filename', dest='log_filename', + help='log filename', default='filtermods.log') + subparsers = parser.add_subparsers(dest='cmd') def add_graphviz_arg(p): @@ -1061,7 +1074,9 @@ def main(): options.verbose = options.verbose - 2 options.verbose = max(options.verbose - options.quiet, 0) levels = [NOTSET, CRITICAL, ERROR, WARN, INFO, DEBUG] - log.setLevel(levels[min(options.verbose, len(levels) - 1)]) + stdout_log_level = levels[min(options.verbose, len(levels) - 1)] + + log = setup_logging(options.log_filename, stdout_log_level) ret = 0 if options.cmd == "sort": diff --git a/kernel.changelog b/kernel.changelog index e8585eacd..82ff4dc99 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,8 @@ +* Fri May 10 2024 Fedora Kernel Team [6.9.0-0.rc7.448b3fe5a0ea.62] +- redhat: make filtermods.py less verbose by default (Jan Stancek) +- Linux v6.9.0-0.rc7.448b3fe5a0ea +Resolves: + * Thu May 09 2024 Fedora Kernel Team [6.9.0-0.rc7.45db3ab70092.61] - scsi: sd: condition probe_type under RHEL_DIFFERENCES (Eric Chanudet) - scsi: sd: remove unused sd_probe_types (Eric Chanudet) diff --git a/kernel.spec b/kernel.spec index 32dfb6289..59f0980c0 100644 --- a/kernel.spec +++ b/kernel.spec @@ -163,13 +163,13 @@ Summary: The Linux kernel %define specrpmversion 6.9.0 %define specversion 6.9.0 %define patchversion 6.9 -%define pkgrelease 0.rc7.20240509git45db3ab70092.61 +%define pkgrelease 0.rc7.20240510git448b3fe5a0ea.62 %define kversion 6 -%define tarfile_release 6.9-rc7-56-g45db3ab70092 +%define tarfile_release 6.9-rc7-117-g448b3fe5a0ea # This is needed to do merge window version magic %define patchlevel 9 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.20240509git45db3ab70092.61%{?buildid}%{?dist} +%define specrelease 0.rc7.20240510git448b3fe5a0ea.62%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.9.0 @@ -2634,8 +2634,12 @@ BuildKernel() { fi # this creates ../modules-*.list output, where each kmod path is as it # appears in modules.dep (relative to lib/modules/$KernelVer) - %{SOURCE22} sort -d $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep -c configs/def_variants.yaml $variants_param -o .. + %{SOURCE22} -l "../filtermods-$KernelVer.log" sort -d $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep -c configs/def_variants.yaml $variants_param -o .. if [ $? -ne 0 ]; then + echo "8< --- filtermods-$KernelVer.log ---" + cat "../filtermods-$KernelVer.log" + echo "--- filtermods-$KernelVer.log --- >8" + echo "8< --- modules.dep ---" cat $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.dep echo "--- modules.dep --- >8" @@ -3936,6 +3940,10 @@ fi\ # # %changelog +* Fri May 10 2024 Fedora Kernel Team [6.9.0-0.rc7.448b3fe5a0ea.62] +- redhat: make filtermods.py less verbose by default (Jan Stancek) +- Linux v6.9.0-0.rc7.448b3fe5a0ea + * Thu May 09 2024 Fedora Kernel Team [6.9.0-0.rc7.45db3ab70092.61] - scsi: sd: condition probe_type under RHEL_DIFFERENCES (Eric Chanudet) - scsi: sd: remove unused sd_probe_types (Eric Chanudet) diff --git a/patch-6.9-redhat.patch b/patch-6.9-redhat.patch index 5d0e9f614..2504cab11 100644 --- a/patch-6.9-redhat.patch +++ b/patch-6.9-redhat.patch @@ -31,7 +31,7 @@ drivers/nvme/host/core.c | 22 +- drivers/nvme/host/multipath.c | 19 +- drivers/nvme/host/nvme.h | 4 + - drivers/pci/pci-driver.c | 7 + + drivers/pci/pci-driver.c | 9 + drivers/pci/quirks.c | 24 + drivers/scsi/aacraid/linit.c | 2 + drivers/scsi/be2iscsi/be_main.c | 2 + @@ -71,7 +71,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 73 files changed, 2360 insertions(+), 207 deletions(-) + 73 files changed, 2362 insertions(+), 207 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 396137ee018d..ff1db21fad9c 100644 @@ -1848,7 +1848,7 @@ index b564c5f1450c..37a1b9bc7ec3 100644 { } diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c -index af2996d0d17f..75d5971b9025 100644 +index af2996d0d17f..e40e09d086b4 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -19,6 +19,7 @@ @@ -1859,19 +1859,22 @@ index af2996d0d17f..75d5971b9025 100644 #include #include #include "pci.h" -@@ -321,6 +322,12 @@ static long local_pci_probe(void *_ddi) +@@ -321,7 +322,15 @@ static long local_pci_probe(void *_ddi) */ pm_runtime_get_sync(dev); pci_dev->driver = pci_drv; + +#ifdef CONFIG_RHEL_DIFFERENCES -+ if (pci_rh_check_status(pci_dev)) -+ return -EACCES; ++ rc = -EACCES; ++ if (!pci_rh_check_status(pci_dev)) ++ rc = pci_drv->probe(pci_dev, ddi->id); ++#else + rc = pci_drv->probe(pci_dev, ddi->id); +#endif + - rc = pci_drv->probe(pci_dev, ddi->id); if (!rc) return rc; + if (rc < 0) { diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index eff7f5df08e2..b58145ce7775 100644 --- a/drivers/pci/quirks.c diff --git a/sources b/sources index 8ce5b24f0..bc85775d0 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.9-rc7-56-g45db3ab70092.tar.xz) = c68d7e48f9d3f91181966ac8d4d690fe2973ae5390e2cccf258d30a40c443275b5a29ca0a9351db765de4901635dac26a8d5c700ab069f397502ac6f4e083cd8 -SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = d1b3d975dc155a8cc653d82e6ef411e7cbb627acbcbf9c10126b131d2499fa2b33919f5fc2e1a10692766347499963e0ef74b5d960c2967018b3fe3d92ee00a3 -SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 8cfc3a8ae911cbb229333b04e55a57247f399e240601fae072d7564c22eede60520d4895d69be779c6e2a27716a2e234570a48a5e2a963ac3d34c2366f20a382 +SHA512 (linux-6.9-rc7-117-g448b3fe5a0ea.tar.xz) = 40ed56b1475b7b97d318d4297573e59e7ee53ab3015144a3e7fb4dad82ced5565478626425fd4345c4e7d56e7834ab89620206059122f92cc205f50e13527369 +SHA512 (kernel-abi-stablelists-6.9.0.tar.xz) = 191c553a3fbff4a8d4b5f68c126844cd886263b01f4446bafe0ab30176ae703b6c0a5e5fa1e7f940f0e4fccf3a6198001c38b4b8b2fdf16eb1dce8754b85c309 +SHA512 (kernel-kabi-dw-6.9.0.tar.xz) = 3ab624d31c3234aba35d930cc6ac44e5a37cd9891c8798eac49a57eb8a604d2c2e6d4a1ae77454bd1c4f915af1bb8645df18961e93a5aec1abea908198471a77