kernel

kernel@lists.fedoraproject.org

4833 discussions

[OS-BUILD PATCHv2] redhat: make filtermods.py less verbose by default
by Jan Stancek (via Email Bridge) 09 May '24

09 May '24

From: Jan Stancek <jstancek(a)redhat.com> redhat: make filtermods.py less verbose by default Lower the default verbosity of filtermods.py, so it doesn't increase build logs too much. Debug messages are still captured to a file, but only printed out in case there's an error. Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -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" diff --git a/redhat/scripts/filtermods.adoc b/redhat/scripts/filtermods.adoc index blahblah..blahblah 100644 --- a/redhat/scripts/filtermods.adoc +++ b/redhat/scripts/filtermods.adoc @@ -17,7 +17,15 @@ there are some best practices for configs used in kernel builds: * Write as few rules for modules package as possible * Keep the rule list alphabetical where possible -*usage:* filtermods.py [-h] [-v] [-q] {sort,rulemap,selftest,cmp2rpm} ... +*usage:* filtermods.py [-h] [-v] [-q] [-l LOG_FILENAME] {sort,rulemap,selftest,cmp2rpm} ... + +== Common command line options +These options apply to all subcommands. + +* -h / --help : display help +* -v / --verbose : increases stdout verbosity +* -q / --quiet : lowers stdout verbosity +* -l / --log-filename : name of the logfile which captures detailed logs (filtermods.log by default) == SUBCOMMANDS === sort diff --git a/redhat/scripts/filtermods.py b/redhat/scripts/filtermods.py index blahblah..blahblah 100755 --- a/redhat/scripts/filtermods.py +++ b/redhat/scripts/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": -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3098

1 0

[OS-BUILD PATCH] redhat: make filtermods.py less verbose by default
by Jan Stancek (via Email Bridge) 09 May '24

09 May '24

From: Jan Stancek <jstancek(a)redhat.com> redhat: make filtermods.py less verbose by default Lower the default verbosity of filtermods.py, so it doesn't increase build logs too much. Debug messages are still captured to a file, but only printed out in case there's an error. Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -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" diff --git a/redhat/scripts/filtermods.py b/redhat/scripts/filtermods.py index blahblah..blahblah 100755 --- a/redhat/scripts/filtermods.py +++ b/redhat/scripts/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": -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3098

2 2

[OS-BUILD PATCH 0/0] scsi: sd: remove unused sd_probe_types
by Eric Chanudet (via Email Bridge) 08 May '24

08 May '24

From: Eric Chanudet on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3055 NOTE: Truncated patchset due to missing public @redhat.com email address on your GitLab profile at https://gitlab.com/-/profile. Once that is fixed, close and reopen the merge request to retrigger sending the emails. Attend the following warning introduced by a downstream change: ``` drivers/scsi/sd.c:121:20: error: ‘sd_probe_types’ defined but not used [-Werror=unused-variable] 121 | static const char *sd_probe_types[] = { "async", "sync" }; | ^~~~~~~~~~~~~~ ``` Fixes: bc573390ad32 ("scsi: sd: Add "probe_type" module parameter to allow synchronous probing") Signed-off-by: Eric Chanudet <echanude(a)redhat.com> --- drivers/scsi/sd.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)

2 2

[OS-BUILD PATCH] [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained
by Scott Weaver (via Email Bridge) 06 May '24

06 May '24

From: Scott Weaver <scweaver(a)redhat.com> [redhat] rh_messages.h: mark mlx5 on Bluefield-3 as unmaintained The mlx5 pci device 0x15B3:0xA2DC should no longer be marked as disabled. This brings the status of this device up-to-date with the hardware removal support project for RHEL-10. Signed-off-by: Scott Weaver <scweaver(a)redhat.com> diff --git a/kernel/rh_messages.h b/kernel/rh_messages.h index blahblah..blahblah 100644 --- a/kernel/rh_messages.h +++ b/kernel/rh_messages.h @@ -260,7 +260,6 @@ static const struct pci_device_id rh_disabled_pci_devices[] = { { 0x15B3, 0x100e, PCI_ANY_ID, PCI_ANY_ID }, { 0x15B3, 0x100f, PCI_ANY_ID, PCI_ANY_ID }, { 0x15B3, 0x1010, PCI_ANY_ID, PCI_ANY_ID }, - { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0064, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0065, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0070, PCI_ANY_ID, PCI_ANY_ID }, @@ -296,6 +295,7 @@ static const struct pci_device_id rh_unmaintained_pci_devices[] = { { 0x1000, 0x0071, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0073, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0079, PCI_ANY_ID, PCI_ANY_ID }, + { 0x15B3, 0xA2DC, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x006E, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0080, PCI_ANY_ID, PCI_ANY_ID }, { 0x1000, 0x0081, PCI_ANY_ID, PCI_ANY_ID }, -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3097

1 0

[OS-BUILD PATCH] redhat/kernel.spec: _buildvars_variant
by Jan Stancek (via Email Bridge) 06 May '24

06 May '24

From: Jan Stancek <jstancek(a)redhat.com> redhat/kernel.spec: _buildvars_variant This introduces a new macro that allows to override variant/config to use for standalone tools/tests build. In SPEC, we support building standalone tools and selftests. Main user are CKI pipelines, which run a native build. Over time however, selftests introduced also kmods, so picking a correct config now matters as well. This patch allows CKI (or other users) to pick a variant when doing standalone tools/tests build. Nothing is changing for builds that include kernel build. Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -217,6 +217,12 @@ Summary: The Linux kernel # arm64_64k X X X # realtime X X X +# _buildvars_variant - kernel variant used to initialise build variables +# This variable allows to set variant (and config) that is used when building +# standalone tools and/or tests (with no kernel and no modules). +# See variant parameter to BuildKernel() function. +%define buildvars_variant %{?_buildvars_variant}%{nil} + # kernel-doc %define with_doc %{?_without_doc: 0} %{?!_without_doc: 1} # kernel-headers @@ -2809,10 +2815,11 @@ BuildKernel %make_target %kernel_image %{_use_vdso} %ifnarch noarch i686 %{nobuildarches} %if !%{with_debug} && !%{with_zfcpdump} && !%{with_up} && !%{with_arm64_16k} && !%{with_arm64_64k} && !%{with_realtime} -# If only building the user space tools, then initialize the build environment -# and some variables so that the various userspace tools can be built. +# If only building the user space tools or selftests, then initialize +# the build environment and some variables so that the various userspace +# tools can be built. %{log_msg "Initialize userspace tools build environment"} -InitBuildVars +InitBuildVars %{buildvars_variant} # Some tests build also modules, and need Module.symvers if ! [[ -e Module.symvers ]] && [[ -f $DevelDir/Module.symvers ]]; then %{log_msg "Found Module.symvers in DevelDir, copying to ."} -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3089

1 0

[OS-BUILD PATCH] redhat: move amd-pstate-ut.ko to modules-internal
by Jan Stancek (via Email Bridge) 06 May '24

06 May '24

From: Jan Stancek <jstancek(a)redhat.com> redhat: move amd-pstate-ut.ko to modules-internal amd-pstate-ut is useful for testing but should be limited to the interal rpm. Signed-off-by: David Arcari <darcari(a)redhat.com> Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/rhel_files/def_variants.yaml.rhel b/redhat/rhel_files/def_variants.yaml.rhel index blahblah..blahblah 100644 --- a/redhat/rhel_files/def_variants.yaml.rhel +++ b/redhat/rhel_files/def_variants.yaml.rhel @@ -50,6 +50,7 @@ rules: - drivers/clk/.*test.*: modules-internal - drivers/clk/.*: modules-core - drivers/counter/.*: modules-core + - drivers/cpufreq/amd-pstate-ut.ko: modules-internal - drivers/cpufreq/.*: modules-core - drivers/crypto/caam/.*: modules - drivers/crypto/cavium/.*: modules -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3095

1 0

✅ PASS: Test report for 6.8.9-200.fc39 (fedora-latest)
by cki-project＠redhat.com 04 May '24

04 May '24

Hi, we tested your kernel and here are the results: Overall result: PASSED Merge: OK Compile: OK Test: OK Tested-by: CKI Project <cki-project(a)redhat.com> Kernel information: Brew / Koji Task ID: 117162762 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-117162762 One or more kernel tests failed: We also see the following known issues which are not related to your changes: Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: Filesystem - NFS Connectathon [x86_64] If you find a failure unrelated to your changes, please ask the test maintainer to review it. This will prevent the failures from being incorrectly reported in the future. Please reply to this email if you have any questions about the tests that we ran or if you have any suggestions on how to make future tests more effective. ,-. ,-. ( C ) ( K ) Continuous `-',-.`-' Kernel ( I ) Integration `-' ______________________________________________________________________________

1 0

[OS-BUILD PATCH] redhat/rhel_files: move tipc.ko and tipc_diag.ko to modules-extra
by Xin Long (via Email Bridge) 03 May '24

03 May '24

From: Xin Long <lxin(a)redhat.com> redhat/rhel_files: move tipc.ko and tipc_diag.ko to modules-extra JIRA: https://issues.redhat.com/browse/RHEL-23931 Upstream Status: RHEL Specific There have been a few TIPC CVE bugs and we see no Red Hat customers using TIPC so far. Per Jianwen's request, move TIPC modules to modules-extra, and prevent auto-loading TIPC modules just because an user triggered it. The sysadmin will have to enable it. Signed-off-by: Xin Long <lxin(a)redhat.com> diff --git a/redhat/rhel_files/def_variants.yaml.rhel b/redhat/rhel_files/def_variants.yaml.rhel index blahblah..blahblah 100644 --- a/redhat/rhel_files/def_variants.yaml.rhel +++ b/redhat/rhel_files/def_variants.yaml.rhel @@ -505,7 +505,7 @@ rules: - net/sctp/.*: modules-extra - net/sunrpc/xprtrdma/rpcrdma.*: modules - net/sunrpc/.*: modules-core - - net/tipc/.*: modules-core + - net/tipc/.*: modules-extra - net/tls/.*: modules-core - net/vmw_vsock/.*: modules-core - net/xdp/.*: modules-core -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3096

1 0

[OS-BUILD PATCH] redhat: add IMA certificates
by Jan Stancek (via Email Bridge) 03 May '24

03 May '24

From: Jan Stancek <jstancek(a)redhat.com> redhat: add IMA certificates Forward port c9s commit: 7ff63254426d ("redhat: add IMA certificates") Starting with RHEL9.0, installed package files will have IMA signatures if users choose so. The IMA subsystem will search for the certificate in the .ima keyring to verify a file signature thus to make sure this file hasn't been tampered with. To be able to add the IMA code-signing certificate to the .ima keyring, this certificate needs to be signed by a CA certificate in the system keyrings. This patch builds the IMA CA certificate into the .builtin_trusted_keys keyring and installs the IMA code-signing certificate to /usr/share/doc/kernel-keys/KVERREL/ima.cer for user space tools like dracut to add it the .ima keyring. Signed-off-by: Coiby Xu <coxu(a)redhat.com> Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template index blahblah..blahblah 100644 --- a/redhat/kernel.spec.template +++ b/redhat/kernel.spec.template @@ -918,6 +918,17 @@ Source87: flavors Source100: rheldup3.x509 Source101: rhelkpatch1.x509 Source102: nvidiagpuoot001.x509 +Source103: rhelimaca1.x509 +Source104: rhelima.x509 +Source105: rhelima_centos.x509 + +%if 0%{?centos} +%define ima_signing_cert %{SOURCE105} +%else +%define ima_signing_cert %{SOURCE104} +%endif + +%define ima_cert_name ima.cer Source200: check-kabi @@ -1893,7 +1904,8 @@ done openssl x509 -inform der -in %{SOURCE100} -out rheldup3.pem openssl x509 -inform der -in %{SOURCE101} -out rhelkpatch1.pem openssl x509 -inform der -in %{SOURCE102} -out nvidiagpuoot001.pem -cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem > ../certs/rhel.pem +openssl x509 -inform der -in %{SOURCE103} -out rhelimaca1.pem +cat rheldup3.pem rhelkpatch1.pem nvidiagpuoot001.pem rhelimaca1.pem > ../certs/rhel.pem %if %{signkernel} %ifarch s390x ppc64le openssl x509 -inform der -in %{secureboot_ca_0} -out secureboot.pem @@ -2712,6 +2724,11 @@ BuildKernel() { %endif %endif +%if 0%{?rhel} + # Red Hat IMA code-signing cert, which is used to authenticate package files + install -m 0644 %{ima_signing_cert} $RPM_BUILD_ROOT%{_datadir}/doc/kernel-keys/$KernelVer/%{ima_cert_name} +%endif + %if %{signmodules} if [ $DoModules -eq 1 ]; then # Save the signing keys so we can sign the modules in __modsign_install_post diff --git a/redhat/keys/rhelima.x509 b/redhat/keys/rhelima.x509 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/keys/rhelima.x509 Binary files /dev/null and b/redhat/keys/rhelima.x509 differ diff --git a/redhat/keys/rhelima_centos.x509 b/redhat/keys/rhelima_centos.x509 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/keys/rhelima_centos.x509 Binary files /dev/null and b/redhat/keys/rhelima_centos.x509 differ diff --git a/redhat/keys/rhelimaca1.x509 b/redhat/keys/rhelimaca1.x509 new file mode 100644 index blahblah..blahblah 100644 --- /dev/null +++ b/redhat/keys/rhelimaca1.x509 Binary files /dev/null and b/redhat/keys/rhelimaca1.x509 differ -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3094

1 0

[OS-BUILD PATCH] redhat/configs: enable CONFIG_LEDS_TRIGGER_NETDEV also for RHEL
by Michal Schmidt (via Email Bridge) 03 May '24

03 May '24

From: Michal Schmidt <mschmidt(a)redhat.com> redhat/configs: enable CONFIG_LEDS_TRIGGER_NETDEV also for RHEL JIRA: https://issues.redhat.com/browse/RHEL-32110 The igc NIC driver exposes sysfs-controllable LEDs since commit ea578703b03d ("igc: Add support for LEDs on i225/i226"). It makes sense to use the netdev trigger to control them. CONFIG_LEDS_TRIGGER_NETDEV is already enabled for Fedora. Enable it also for RHEL. Signed-off-by: Michal Schmidt <mschmidt(a)redhat.com> diff --git a/redhat/configs/fedora/generic/CONFIG_LEDS_TRIGGER_NETDEV b/redhat/configs/common/generic/CONFIG_LEDS_TRIGGER_NETDEV rename from redhat/configs/fedora/generic/CONFIG_LEDS_TRIGGER_NETDEV rename to redhat/configs/common/generic/CONFIG_LEDS_TRIGGER_NETDEV index blahblah..blahblah 100644 --- a/redhat/configs/fedora/generic/CONFIG_LEDS_TRIGGER_NETDEV +++ b/redhat/configs/common/generic/CONFIG_LEDS_TRIGGER_NETDEV diff --git a/redhat/configs/rhel/generic/CONFIG_LEDS_TRIGGER_NETDEV b/redhat/configs/rhel/generic/CONFIG_LEDS_TRIGGER_NETDEV deleted file mode 100644 index blahblah..blahblah 0 --- a/redhat/configs/rhel/generic/CONFIG_LEDS_TRIGGER_NETDEV +++ /dev/null @@ -1 +0,0 @@ -# CONFIG_LEDS_TRIGGER_NETDEV is not set -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3092

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel