kernel February 2024

kernel@lists.fedoraproject.org

4 participants
69 discussions

[OS-BUILD PATCH] kernel.spec: include the GDB plugin in kernel-debuginfo
by Ondrej Mosnáček (via Email Bridge) 07 Feb '24

07 Feb '24

From: Ondrej Mosnacek <omosnace(a)redhat.com> kernel.spec: include the GDB plugin in kernel-debuginfo Provide the GDB plugin files in the debuginfo package so that consumers can use it when dubugging the kernel via GDB [1]. While it spossible to do it without this plugin to some extent, it becomes essential when you want to debug also code inside modules. And it provides many more convenience commands on top of that. Place the plugin files beside vmlinux so that gdb can auto-load it (after some path setup). Example gdb command line using manually extracted debuginfo RPM contents: gdb --directory <extracted_dir>/usr/src/debug/*/linux-<kver> \ --cd <extracted_dir>/usr/lib/debug/lib/modules/<kver> \ -iex 'add-auto-load-safe-path <extracted_dir>/usr/lib/debug/lib/modules/<kver>' \ -ex 'target remote <gdb_socket_or_port>' vmlinux I occasionally use this to debug kernels built as an RPM and having the plugin included will be very useful to me. [1] https://docs.kernel.org/dev-tools/gdb-kernel-debugging.html Signed-off-by: Ondrej Mosnacek <omosnace(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 @@ -2413,6 +2413,13 @@ BuildKernel() { cp %{vmlinux_decompressor} $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux.decompressor fi fi + + # build and copy the vmlinux-gdb plugin files into kernel-debuginfo + %{make} %{?_smp_mflags} scripts_gdb + cp -a --parents scripts/gdb/{,linux/}*.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer + # this should be a relative symlink (Kbuild creates an absolute one) + ln -s scripts/gdb/vmlinux-gdb.py $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux-gdb.py + %py_byte_compile %{python3} $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/scripts/gdb %endif find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2929

1 0

[OS-BUILD PATCH] redhat: forward-port genlog.py updates from c9s
by Jan Stancek (via Email Bridge) 07 Feb '24

07 Feb '24

From: Jan Stancek <jstancek(a)redhat.com> redhat: forward-port genlog.py updates from c9s This is forward-port of c9s commit: b9e094da37a1 ("redhat: rewrite genlog and support Y- tags") It combines various parse functions into a common function that goes over list of tag:regex pairs, which makes parsing and adding new tags simpler. It also updates regexes to be aligned with ones used by webhooks. This is primarily for future RHEL downstreams, so I kept the script identical to c9s. Signed-off-by: Jan Stancek <jstancek(a)redhat.com> diff --git a/redhat/scripts/genspec/genlog.py b/redhat/scripts/genspec/genlog.py index blahblah..blahblah 100755 --- a/redhat/scripts/genspec/genlog.py +++ b/redhat/scripts/genspec/genlog.py @@ -1,143 +1,132 @@ #!/usr/bin/python3 -# -# This script parses a git log from stdin, which should be given with: -# $ git log [<options>] -z --format="- %s (%an)%n%b" [<range>] [[--] <path>...] | ... -# And then outputs to stdout a trimmed changelog for use with rpm packaging -# -# Author: Herton R. Krzesinski <herton(a)redhat.com> -# Copyright (C) 2021 Red Hat, Inc. -# -# This software may be freely redistributed under the terms of the GNU -# General Public License (GPL). - -"""Parses a git log from stdin, and output a log entry for an rpm.""" +# SPDX-License-Identifier: GPL-2.0-only +# Copyright (C) 2023 Red Hat, Inc. + +"""Parses git log from stdin, expecting format of: +$ git log [<options>] -z --format="- %s (%an)%n%N%n^^^NOTES-END^^^%n%b" [<range>] [[--] <path>...] | ... +and prints changelog output to stdout.""" import re import sys -def find_ticket_in_line(line, prefix, tkt_re, tkt_groups): - """Return ticket referenced in the given line""" - _tkts = set() - if not line.startswith(f"{prefix}: "): - return _tkts - for match in tkt_re.finditer(line[len(f"{prefix}:"):]): - for group in tkt_groups: - if match.group(group): - tid = match.group(group).strip() - _tkts.add(tid) - return _tkts - -def find_bz_in_line(line, prefix): - bznum_re = re.compile(r'(?P<bug_ids> \d{4,8})|' - r'( http(s)?://bugzilla\.redhat\.com/(show_bug\.cgi\?id=)?(?P<url_bugs>\d{4,8}))') - return find_ticket_in_line(line, prefix, bznum_re, [ 'bug_ids', 'url_bugs' ]) - -def find_ji_in_line(line, prefix): - ji_re = re.compile(r' https://issues\.redhat\.com/(?:browse|projects/RHEL/issues)/(?P<jira_id>RHEL-\d{1,8})\s*$') - return find_ticket_in_line(line, prefix, ji_re, [ 'jira_id' ]) - -def find_cve_in_line(line): - """Return cve number from properly formated CVE: line.""" - # CVEs must begin with 'CVE: ' - cve_set = set() - if not line.startswith("CVE: "): - return cve_set - _cves = line[len("CVE: "):].split() - pattern = "(?P<cve>CVE-[0-9]+-[0-9]+)" - cve_re = re.compile(pattern) - for cve_item in _cves: - cve = cve_re.match(cve_item) - if cve: - cve_set.add(cve.group('cve')) - return cve_set - - -def parse_commit(commit): - """Extract metadata from a commit log message.""" - lines = commit.split('\n') - - # Escape '%' as it will be used inside the rpm spec changelog - log_entry = lines[0].replace("%","%%") - cve_set = set() - bug_set = set() - zbug_set = set() - jira_set = set() - zjira_set = set() - for line in lines[1:]: - # Metadata in git notes has priority over commit log - # If we found any BZ/ZBZ/JIRA/ZJIRA/CVE in git notes, - # we ignore the commit log - if line == "^^^NOTES-END^^^": - if bug_set or zbug_set or jira_set or zjira_set or cve_set: - break +# CommitTags and parse_commit() in kmt and genlog.py should match +class CommitTags: + tag_patterns = { + 'Bugzilla': [ + r'(\d{4,8})\s*$', + r'https?://bugzilla\.redhat\.com/(?:show_bug\.cgi\?id=)?(\d{4,8})', + ], + 'JIRA': [r'https://issues\.redhat\.com/(?:browse|projects/RHEL/issues)/(RHEL-\d{1,8})'], + 'CVE': [r'(CVE-\d{4}-\d{4,7})'], + 'MR': [r'(.*)'], + 'Y-Commit': [r'([0-9a-fA-F]+)'], + 'Patchwork-id': [r'(.*)'], + 'Patchwork-instance': [r'(.*)'], + } + tag_patterns['Y-Bugzilla'] = tag_patterns['Bugzilla'] + tag_patterns['Z-Bugzilla'] = tag_patterns['Bugzilla'] + tag_patterns['Y-JIRA'] = tag_patterns['JIRA'] + tag_patterns['Z-JIRA'] = tag_patterns['JIRA'] + tag_patterns['O-JIRA'] = tag_patterns['JIRA'] + + compiled_patterns = {} + for tag_name, tag_pattern_list in tag_patterns.items(): + tag_pattern_list.append(r'(N/A)') + compiled_patterns[tag_name] = [] + for tag_pattern in tag_pattern_list: + pattern = r'^' + tag_name + ': ' + tag_pattern + r'\s*$' + tag_regex = re.compile(pattern, re.MULTILINE) + compiled_patterns[tag_name].append(tag_regex) + + def __init__(self, input_str): + self.parse_tags(input_str) + + def get_tag_values(self, tag_name): + if tag_name not in CommitTags.tag_patterns: + raise Exception('Unsupported tag name: ' + tag_name) + return self.tag_dict[tag_name] + + def override_by(self, other_commit_tags): + for tag_name, tag_set in other_commit_tags.tag_dict.items(): + if tag_set: + if tag_set == set(['N/A']): + self.tag_dict[tag_name] = set() + else: + self.tag_dict[tag_name] = set(tag_set) + + def parse_tags(self, input_str): + tag_values = {} + for tag_name, tag_pattern_list in CommitTags.compiled_patterns.items(): + tag_values[tag_name] = set() + for tag_regex in tag_pattern_list: + for value in tag_regex.findall(input_str): + tag_values[tag_name].add(value) + self.tag_dict = tag_values + + def convert_to_y_tags(self): + if self.tag_dict['Z-Bugzilla'] or self.tag_dict['Z-JIRA']: + tmp = self.tag_dict['Bugzilla'] + self.tag_dict['Bugzilla'] = self.tag_dict['Z-Bugzilla'] + self.tag_dict['Y-Bugzilla'] = tmp + self.tag_dict['Z-Bugzilla'] = set() + + tmp = self.tag_dict['JIRA'] + self.tag_dict['JIRA'] = self.tag_dict['Z-JIRA'] + self.tag_dict['Y-JIRA'] = tmp + self.tag_dict['Z-JIRA'] = set() + + def get_changelog_str(self): + chnglog = [] + tickets = sorted(self.tag_dict['Bugzilla']) + sorted(self.tag_dict['JIRA']) + if self.tag_dict['Y-Bugzilla'] or self.tag_dict['Y-JIRA']: + tickets = tickets + sorted(self.tag_dict['Y-Bugzilla']) + sorted(self.tag_dict['Y-JIRA']) + if tickets: + chnglog.append('[' + ' '.join(tickets) + ']') + if self.tag_dict['CVE']: + chnglog.append('{' + ' '.join(self.tag_dict['CVE']) + '}') + return ' '.join(chnglog) + + def get_resolved_tickets(self): + ret = set() + for ticket in sorted(self.tag_dict['Bugzilla']) + sorted(self.tag_dict['JIRA']): + if ticket.isnumeric(): + ticket = 'rhbz#' + ticket + ret.add(ticket) + return ret - # Process Bugzilla and ZStream Bugzilla entries - bug_set.update(find_bz_in_line(line, 'Bugzilla')) - zbug_set.update(find_bz_in_line(line, 'Z-Bugzilla')) - # Grab CVE tags if they are present - cve_set.update(find_cve_in_line(line)) +def parse_commit(commit): + if '^^^NOTES-END^^^' in commit: + input_notes, input_commit = commit.split('^^^NOTES-END^^^') + else: + input_notes = '' + input_commit = commit - # Process Jira issues - jira_set.update(find_ji_in_line(line, 'JIRA')) - zjira_set.update(find_ji_in_line(line, 'Z-JIRA')) + tags = CommitTags(input_commit) + if input_notes: + notes_tags = CommitTags(input_notes) + notes_tags.convert_to_y_tags() + tags.override_by(notes_tags) - return (log_entry, cve_set, bug_set, zbug_set, jira_set, zjira_set) + return tags if __name__ == "__main__": - all_bzs = set() - all_zbzs = set() - all_jiras = set() - all_zjiras = set() + all_resolved = set() commits = sys.stdin.read().split('\0') for c in commits: if not c: continue - log_item, cves, bugs, zbugs, jiras, zjiras = parse_commit(c) - entry = f"{log_item}" - if bugs or zbugs or jiras or zjiras: - entry += " [" - if zbugs: - entry += " ".join(sorted(zbugs)) - all_zbzs.update(zbugs) - if bugs: - entry += " " if zbugs else "" - entry += " ".join(sorted(bugs)) - all_bzs.update(bugs) - if jiras: - entry += " " if bugs or zbugs else "" - entry += " ".join(sorted(jiras)) - all_jiras.update(jiras) - if zjiras: - entry += " " if bugs or zbugs or jiras else "" - entry += " ".join(sorted(zjiras)) - all_zjiras.update(zjiras) - entry += "]" - if cves: - entry += " {" + " ".join(sorted(cves)) + "}" + # Escape '%' as it will be used inside the rpm spec changelog + entry_pos = c.find('\n') + entry = c[:entry_pos].replace("%", "%%") + + tags = parse_commit(c) + chnglog = tags.get_changelog_str() + if chnglog: + entry = entry + ' ' + chnglog print(entry) + all_resolved = all_resolved.union(tags.get_resolved_tickets()) - # If we are doing Z-Stream work, we are addressing Z-Stream tickets - # and not Y-Stream tickets, so we must make sure to list on Resolves - # line only the Z-Stream tickets - resolved_bzs = set() - resolved_jiras = set() - if all_zbzs or all_zjiras: - resolved_bzs = all_zbzs - resolved_jiras = all_zjiras - else: - resolved_bzs = all_bzs - resolved_jiras = all_jiras - print("Resolves: ", end="") - for i, bzid in enumerate(sorted(resolved_bzs)): - if i: - print(", ", end="") - print(f"rhbz#{bzid}", end="") - for j, jid in enumerate(sorted(resolved_jiras)): - if j or resolved_bzs: - print(", ", end="") - print(f"{jid}", end="") - print("\n") - + print('Resolves: ' + ', '.join(sorted(all_resolved)) + '\n') -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2928

1 0

[OS-BUILD PATCHv2 0/2] redhat/kernel.spec: add uki_addons to create UKI kernel cmdline addons
by Emanuele Giuseppe Esposito (via Email Bridge) 06 Feb '24

06 Feb '24

From: Emanuele Giuseppe Esposito on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2917 We want to enable kernel.spec to optionally ship UKI addons defined in a common config file in redhat folder. If that file is populated, and the kernel-uki-virt is built, kernel-uki-virt rpm will also contain a folder called addons that will contain the uki addons. Signed-off-by: Emanuele Giuseppe Esposito <eesposit(a)redhat.com> --- redhat/scripts/uki_addons.py | 137 +++++++++++++++++++++++++++++++++++++++++ redhat/Makefile | 2 + redhat/kernel.spec.template | 15 ++++ redhat/uki_cmdline_addons.conf | 3 + 4 files changed, 157 insertions(+), 0 deletions(-)

4 11

[OS-BUILD PATCH 0/0] fedora: cleanups and new enablement
by pbrobinson (via Email Bridge) 06 Feb '24

06 Feb '24

From: pbrobinson on gitlab.com Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2926 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. Updates for the 6.8 cycle as well as further aarch64 platform enablement. Signed-off-by: Peter Robinson <pbrobinson(a)redhat.com> --- redhat/configs/rhel/generic/CONFIG_ARM64_ERRATUM_3117295 => redhat/configs/common/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_3117295 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_R9A08G045 | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_R9A09G011 | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARCH_S32 | 1 + redhat/configs/fedora/generic/CONFIG_ARM64_ERRATUM_858921 => redhat/configs/fedora/generic/arm/aarch64/CONFIG_ARM64_ERRATUM_858921 | 0 redhat/configs/fedora/generic/arm/aarch64/CONFIG_CAN_RCAR_CANFD | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_CRYPTO_DEV_NITROX_CNN55XX | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_I2C_RIIC | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_INTERCONNECT_QCOM_X1E80100 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_NET_VENDOR_RENESAS | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_S32G2 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_PINCTRL_X1E80100 | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RAVB | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_ETHER_SWITCH | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_GEN4_PTP | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_OSTM | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RENESAS_RZG2LWDT | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RZG2L_ADC | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RZG2L_THERMAL | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_RZ_DMAC | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SH_ETH | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_SND_SOC_RZ | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_SPI_RSPI | 2 +- redhat/configs/fedora/generic/arm/aarch64/CONFIG_USB_RZV2M_USB3DRD | 1 + redhat/configs/fedora/generic/arm/aarch64/CONFIG_USB_XHCI_RCAR=m | 1 - redhat/configs/fedora/generic/arm/aarch64/CONFIG_USB_XHCI_RZV2M | 1 + redhat/configs/fedora/generic/CONFIG_CRYPTO_DEV_NITROX_CNN55XX | 2 +- redhat/configs/pending-fedora/generic/CONFIG_ARM64_ERRATUM_3117295 | 13 --------- redhat/configs/pending-fedora/generic/CONFIG_INTERCONNECT_QCOM_X1E80100 | 14 ---------- redhat/configs/pending-fedora/generic/CONFIG_PINCTRL_X1E80100 | 14 ---------- 30 files changed, 23 insertions(+), 55 deletions(-)

1 0

❌ FAIL: Test report for 6.7.4-200.fc39 (kernel-fedora)
by cki-project＠redhat.com 06 Feb '24

06 Feb '24

Hi, we tested your kernel and here are the results: Overall result: FAILED Merge: OK Compile: OK Test: FAILED Kernel information: Brew / Koji Task ID: 112999067 You can find all the details about the test run at https://datawarehouse.cki-project.org/kcidb/checkouts/127850 One or more kernel tests failed: Unrecognized or new issues: aarch64 - Reboot test Logs: https://datawarehouse.cki-project.org/kcidb/tests/11225352 Non-passing ran subtests: ❌ FAIL /10_avc_check We also see the following known issues which are not related to your changes: Issue: [rawhide] avc: denied { checkpoint_restore } for pid=793 comm="agetty" capability=40 scontext=system_u:system_r:getty_t:s0-s0:c0.c1023 tcontext=system_u:system_r:getty_t:s0-s0:c0.c1023 tclass=capability2 permissive=1 URL: https://bugzilla.redhat.com/show_bug.cgi?id=2259622 Affected tests: aarch64 - Boot test aarch64 - stress: stress-ng - interrupt aarch64 - Reboot test ppc64le - Boot test ppc64le - Reboot test s390x - Boot test s390x - stress: stress-ng - interrupt s390x - Reboot test x86_64 - Boot test x86_64 - stress: stress-ng - interrupt x86_64 - Reboot test Issue: NFS Connectathon: SELinux prevents rpcbind URL: https://bugzilla.redhat.com/1758147 Affected tests: ppc64le - Filesystem - NFS Connectathon 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] Fix dist-get-buildreqs breakage around perl(ExtUtils::Embed)
by Don Zickus (via Email Bridge) 05 Feb '24

05 Feb '24

From: Don Zickus <dzickus(a)redhat.com> Fix dist-get-buildreqs breakage around perl(ExtUtils::Embed) CKI fails with $ export missing=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2) $ if [ "$missing" == "" ]; then echo "Missing dependencies should not be null but are empty. Review test log." && exit 1; fi; $ dnf -y install $missing Last metadata expiration check: 0:00:29 ago on Sat Feb 3 23:44:30 2024. No match for argument: perl(ExtUtils Error: Unable to find a match: perl(ExtUtils This is because it was trying to "cut -d':' -f2" this line: Missing dependencies: perl(ExtUtils::Embed) And it grabbed the content between the ':', leaving out ::Embed. Easy fix, convert cut's parameter '-f2' to '-f2-' to included everything after the first ':'. Running the command locally resolves the issue. Signed-off-by: Don Zickus <dzickus(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -461,10 +461,10 @@ test_makefile: - git config user.name "Fedora Kernel Team" - git config user.email "kernel-team(a)fedoraproject.org" script: - - export missing=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2) + - export missing=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2-) - if [ "$missing" == "" ]; then echo "Missing dependencies should not be null but are empty. Review test log." && exit 1; fi; - dnf -y install $missing - - export missingafter=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2) + - export missingafter=$(make dist-get-buildreqs | grep "Missing dependencies:" | cut -d":" -f2-) - if [ "$missingafter" != "" ]; then echo "Missing dependencies should be null but are $missingafter. Review test log." && exit 1; fi; rules: - *only-os-build-mr -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2924

3 6

[OS-BUILD PATCH] gitlab-ci: merge ark-latest fixes when running ELN pipelines
by Michael Hofmann (via Email Bridge) 05 Feb '24

05 Feb '24

From: Michael Hofmann <mhofmann(a)redhat.com> gitlab-ci: merge ark-latest fixes when running ELN pipelines Fixes https://gitlab.com/cki-project/kernel-ark/-/issues/146 Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -331,35 +331,35 @@ ark_cki_gating: # ELN CI eln_merge_request: - extends: [.merge_request, .trigger_eln, .no_tests, .srpm_for_bot, + extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .srpm_for_bot, .eln_up] eln_debug_merge_request: - extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, .eln_up_debug] # eln_clang_merge_request: -# extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, +# extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, # .eln_clang_up] # # eln_clang_debug_merge_request: -# extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, +# extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, # .eln_clang_up_debug] eln_realtime_merge_request: - extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, .eln_rt] eln_realtime_debug_merge_request: - extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, .eln_rt_debug] eln_64k_merge_request: - extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, .eln_64k] eln_64k_debug_merge_request: - extends: [.merge_request, .trigger_eln, .no_tests, .manual_for_bot, + extends: [.merge_request, .trigger_eln, .no_tests, .merge_ark_latest, .manual_for_bot, .eln_64k_debug] # ELN baselines -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2925

1 0

[OS-BUILD PATCH] arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated
by Prarit Bhargava (via Email Bridge) 05 Feb '24

05 Feb '24

From: Prarit Bhargava <prarit(a)redhat.com> arch/x86: mark x86_64-v1 and x86_64-v2 processors as deprecated Upstream Status: RHEL only The x86 industry has defined microarchitecture levels x86_64-v1 and x86_64-v2 as defined here: https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels RHEL9 has a minimum of the x86_64-v2 microarchitecture and RHEL10 has a minimum of the x86_64-v3 microarchitecture. Mark x86_64-v1 and x86_64-v2 processors as deprecated. Signed-off-by: Prarit Bhargava <prarit(a)redhat.com> diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index blahblah..blahblah 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -708,6 +708,36 @@ static void rh_check_supported(void) */ if (acpi_disabled && !guest) pr_crit("ACPI has been disabled or is not available on this hardware. This may result in a single cpu boot, incorrect PCI IRQ routing, or boot failure.\n"); + + /* + * x86_64 microarchitecture levels: + * https://en.wikipedia.org/wiki/X86-64#Microarchitecture_levels + * + * RHEL9 has a minimum of the x86_64-v2 microarchitecture + * RHEL10 has a minimum of the x86_64-v3 microarchitecture + */ + + if (!boot_cpu_has(X86_FEATURE_CX16) || /* CMPXCHG16B */ + !boot_cpu_has(X86_FEATURE_LAHF_LM) || /* LAHF-SAHF */ + !boot_cpu_has(X86_FEATURE_POPCNT) || + !boot_cpu_has(X86_FEATURE_XMM3) || /* SSE-3 */ + !boot_cpu_has(X86_FEATURE_XMM4_1) || /* SSE4_1 */ + !boot_cpu_has(X86_FEATURE_XMM4_2) || /* SSE4_2 */ + !boot_cpu_has(X86_FEATURE_SSSE3)) { + mark_hardware_deprecated("x86_64-v1", "%s:%s", + boot_cpu_data.x86_vendor_id, boot_cpu_data.x86_model_id); + } else if (!boot_cpu_has(X86_FEATURE_AVX) || + !boot_cpu_has(X86_FEATURE_AVX2) || + !boot_cpu_has(X86_FEATURE_BMI1) || + !boot_cpu_has(X86_FEATURE_BMI2) || + !boot_cpu_has(X86_FEATURE_F16C) || + !boot_cpu_has(X86_FEATURE_FMA) || + /* LZCNT is not explicitly listed, but appears to be paired with BMI2 */ + !boot_cpu_has(X86_FEATURE_MOVBE) || + !boot_cpu_has(X86_FEATURE_OSXSAVE)) { + mark_hardware_deprecated("x86_64-v2", "%s:%s", + boot_cpu_data.x86_vendor_id, boot_cpu_data.x86_model_id); + } } #else #define rh_check_supported() diff --git a/include/linux/kernel.h b/include/linux/kernel.h index blahblah..blahblah 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -446,11 +446,13 @@ struct module; #ifdef CONFIG_RHEL_DIFFERENCES void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...); +void mark_hardware_deprecated(const char *driver_name, char *fmt, ...); void mark_tech_preview(const char *msg, struct module *mod); void mark_partner_supported(const char *msg, struct module *mod); void init_rh_check_status(char *fn_name); #else static inline void mark_hardware_unmaintained(const char *driver_name, char *fmt, ...) { } +static inline void mark_hardware_deprecated(const char *driver_name, char *fmt, ...) { } static inline void mark_tech_preview(const char *msg, struct module *mod) { } static inline void mark_partner_supported(const char *msg, struct module *mod) { } #endif -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2912

1 0

[OS-BUILD PATCH] [redhat] process_configs.sh: include config commit
by Scott Weaver (via Email Bridge) 05 Feb '24

05 Feb '24

From: Scott Weaver <scweaver(a)redhat.com> [redhat] process_configs.sh: include config commit This adds a comment to the pending config file that documents the commit where the new config was defined. This is based on the "Defined at" line provided by the helpnewconfig make target. Signed-off-by: Scott Weaver <scweaver(a)redhat.com> diff --git a/redhat/configs/process_configs.sh b/redhat/configs/process_configs.sh index blahblah..blahblah 100755 --- a/redhat/configs/process_configs.sh +++ b/redhat/configs/process_configs.sh @@ -148,7 +148,8 @@ parsenewconfigs() /usr/bin/awk -v BASE="$tmpdir" ' BEGIN { inpatch=0; outfile="none"; - symbol="none"; } + symbol="none"; + commit=""; } /^Symbol: .*$/ { split($0, a, " "); symbol="CONFIG_"a[2]; @@ -160,9 +161,11 @@ parsenewconfigs() } else { if (symbol != "none") { + print "# Commit: "commit >> outfile system("cat " outfile " " BASE "/" symbol " > " BASE "/tmpf"); system("mv " BASE "/tmpf " BASE "/" symbol); symbol="none" + commit="" } outfile="none" inpatch = 0; @@ -173,6 +176,15 @@ parsenewconfigs() print "# "$0 >> outfile; } } + /^Defined at .*$/ { + split($0, x, " "); + filenum=x[3]; + split(filenum, x, ":"); + file=x[1] + line=x[2] + cmd="git blame -L " line "," line " " file " | cut -d \" \" -f1 | xargs git log --pretty=format:\"%C(auto)%h %C(cyan)('%s')\" -1" + cmd | getline commit + } ' .helpnewconfig -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2923

2 1

[OS-BUILD PATCH] gitlab-ci: use all arches for container image gating
by Michael Hofmann (via Email Bridge) 03 Feb '24

03 Feb '24

From: Michael Hofmann <mhofmann(a)redhat.com> gitlab-ci: use all arches for container image gating Part of https://gitlab.com/cki-project/kernel-ark/-/issues/144 Signed-off-by: Michael Hofmann <mhofmann(a)redhat.com> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index blahblah..blahblah 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -110,8 +110,6 @@ workflow: .cki_gating_overrides: variables: - # assume potential breakages affect multiple arches and test just a couple - architectures: x86_64 aarch64 # prevent the CKI production machinery from caring about these pipelines CKI_DEPLOYMENT_ENVIRONMENT: retrigger # explicitly pass down some trigger variables to the child pipeline -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2922

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

kernel February 2024