Skip to content

Conversation

PlaidCat
Copy link
Collaborator

@PlaidCat PlaidCat commented May 7, 2025

Update process (This kernel CentOS base for 5.14.0-503)

  • Kernel History Rebuild Process for all src.rpms hosted by RESF
  • Create sig-cloud-9/5.14.0-503.40.1.el8_10 branch
  • Check if any maintained code is included in the new el release.
  • Cherry-pick all code from previous branch into new branch (skipping unneeded code)
    • Fix conflicts as they arise
  • Build and Test

Removed Commits

None

Forward Port Process

]$ python3 rolling-release-update.py --repo ../kernel-src-tree/ --new-base-branch rocky9_5 --old-rolling-branch sig-cloud-9/5.14.0-503.38.1.el9_5
[rolling release update] Rolling Product:  sig-cloud-9
[rolling release update] Checking out branch:  sig-cloud-9/5.14.0-503.38.1.el9_5
[rolling release update] Gathering all the RESF kernel Tags
b'9e0a22d56093 (tag: resf_kernel-5.14.0-503.38.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.38.1.el9_5'
b'c9a24474a2ec (tag: resf_kernel-5.14.0-503.35.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.35.1.el9_5'
b'e74ec186a727 (tag: resf_kernel-5.14.0-503.34.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.34.1.el9_5'
b'1ddd4016943b (tag: resf_kernel-5.14.0-503.33.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.33.1.el9_5'
b'f69f8dd07b1f (tag: resf_kernel-5.14.0-503.31.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.31.1.el9_5'
b'e6683295364e (tag: resf_kernel-5.14.0-503.29.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.29.1.el9_5'
b'1173e76fd4c0 (tag: resf_kernel-5.14.0-503.26.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.26.1.el9_5'
b'97e08c052a9b (tag: resf_kernel-5.14.0-503.23.2.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.2.el9_5'
b'5fee71991ba3 (tag: resf_kernel-5.14.0-503.23.1.el9_5, origin/kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.1.el9_5'
b'208d3b195c90 (tag: resf_kernel-5.14.0-503.22.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.22.1.el9_5'
b'7b30e095ace9 (tag: resf_kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.21.1.el9_5'
b'20b61fdce2d7 (tag: resf_kernel-5.14.0-503.19.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.19.1.el9_5'
b'ac4598734b5b (tag: resf_kernel-5.14.0-503.16.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.16.1.el9_5'
b'444611411627 (tag: resf_kernel-5.14.0-503.15.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.15.1.el9_5'
b'2c1354e89576 (tag: resf_kernel-5.14.0-503.14.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.14.1.el9_5'
[rolling release update] Old Rolling Branch Tags:  [b'9e0a22d56093', b'c9a24474a2ec', b'e74ec186a727', b'1ddd4016943b', b'f69f8dd07b1f', b'e6683295364e', b'1173e76fd4c0', b'97e08c052a9b', b'5fee71991ba3', b'208d3b195c90', b'7b30e095ace9', b'20b61fdce2d7', b'ac4598734b5b', b'444611411627', b'2c1354e89576']
[rolling release update] Checking out branch:  rocky9_5
[rolling release update] Gathering all the RESF kernel Tags
b'8bb9c737cf19 (HEAD -> rocky9_5, tag: resf_kernel-5.14.0-503.40.1.el9_5, origin/rocky9_5_rebuild, origin/rocky9_5) Rebuild rocky9_5 with kernel-5.14.0-503.40.1.el9_5'
b'9e0a22d56093 (tag: resf_kernel-5.14.0-503.38.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.38.1.el9_5'
b'c9a24474a2ec (tag: resf_kernel-5.14.0-503.35.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.35.1.el9_5'
b'e74ec186a727 (tag: resf_kernel-5.14.0-503.34.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.34.1.el9_5'
b'1ddd4016943b (tag: resf_kernel-5.14.0-503.33.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.33.1.el9_5'
b'f69f8dd07b1f (tag: resf_kernel-5.14.0-503.31.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.31.1.el9_5'
b'e6683295364e (tag: resf_kernel-5.14.0-503.29.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.29.1.el9_5'
b'1173e76fd4c0 (tag: resf_kernel-5.14.0-503.26.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.26.1.el9_5'
b'97e08c052a9b (tag: resf_kernel-5.14.0-503.23.2.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.2.el9_5'
b'5fee71991ba3 (tag: resf_kernel-5.14.0-503.23.1.el9_5, origin/kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.23.1.el9_5'
b'208d3b195c90 (tag: resf_kernel-5.14.0-503.22.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.22.1.el9_5'
b'7b30e095ace9 (tag: resf_kernel-5.14.0-503.21.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.21.1.el9_5'
b'20b61fdce2d7 (tag: resf_kernel-5.14.0-503.19.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.19.1.el9_5'
b'ac4598734b5b (tag: resf_kernel-5.14.0-503.16.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.16.1.el9_5'
b'444611411627 (tag: resf_kernel-5.14.0-503.15.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.15.1.el9_5'
b'2c1354e89576 (tag: resf_kernel-5.14.0-503.14.1.el9_5) Rebuild rocky9_5 with kernel-5.14.0-503.14.1.el9_5'
[rolling release update] New Base Branch Tags:  [b'8bb9c737cf19', b'9e0a22d56093', b'c9a24474a2ec', b'e74ec186a727', b'1ddd4016943b', b'f69f8dd07b1f', b'e6683295364e', b'1173e76fd4c0', b'97e08c052a9b', b'5fee71991ba3', b'208d3b195c90', b'7b30e095ace9', b'20b61fdce2d7', b'ac4598734b5b', b'444611411627', b'2c1354e89576']
[rolling release update] Latest RESF tag sha:  b'9e0a22d56093'
"9e0a22d560937e6132749dc6290090901196064d Rebuild rocky9_5 with kernel-5.14.0-503.38.1.el9_5"
[rolling release update] Checking out old rolling branch:  sig-cloud-9/5.14.0-503.38.1.el9_5
[rolling release update] Finding the CIQ Kernel and Associated Upstream commits between the last resf tag and HEAD
[rolling release update] Last RESF tag sha:  b'9e0a22d56093'
[rolling release update] Total Commit in old branch:  1
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
{
  "32a51ac76ceb50789c5ca14ae88aebd7d510e5bc": ""
}
[rolling release update] Checking out new base branch:  rocky9_5
[rolling release update] Finding the kernel version for the new rolling release
b'8bb9c737cf19 (HEAD -> rocky9_5, tag: resf_kernel-5.14.0-503.40.1.el9_5, origin/rocky9_5_rebuild, origin/rocky9_5) Rebuild rocky9_5 with kernel-5.14.0-503.40.1.el9_5'
<re.Match object; span=(0, 70), match=b'8bb9c737cf19 (HEAD -> rocky9_5, tag: resf_kernel>
[rolling release update} New Branch to create  sig-cloud-9/5.14.0-503.40.1.el9_5
[rolling release update] Check if branch Exists:  sig-cloud-9/5.14.0-503.40.1.el9_5
Branch sig-cloud-9/5.14.0-503.40.1.el9_5 does not exists creating
[rolling release update] Creating new branch for PR:  jmaple_sig-cloud-9/5.14.0-503.40.1.el9_5
[rolling release update] Creating Map of all new commits from last rolling release fork
[rolling release update] Total Commit in new branch:  25
{ "CIQ COMMMIT" : "UPSTREAM COMMMIT" }
Printing first 5 and last 5 commits
{
  "8bb9c737cf19c5383a9f296209351c7bdcb7016f": "",
  "80bed8e2bf7a6c9b78312a5e392b36c07a1f3eeb": "ad95bab0cd28ed77c2c0d0b6e76e03e031391064",
  "bc2735ff15b23093c0b3916491276b1b8574d893": "cbd070a4ae62f119058973f6d2c984e325bce6e7",
  "07f67b776da7bb095f94e0bb544906565def12f2": "95c90e4ad89d493a7a14fa200082e466e2548f9d",
  "d0ac481fcfeb4b37cbccfcc1ff50b65d2bfaa164": "7643dbd9db09fffebb4a62cd27599f17f4148b17"
}
{
  "4999bb9783ec3bf5877fb383cffd13d97bcafbf7": "88a921aa3c6b006160d6a46a231b8b32227e8196",
  "97975ababd73d8066ccd55d9045a90289dcfba9f": "2a97388a807b6ab5538aa8f8537b2463c6988bd2",
  "a21ad3a03a26fae55f5733eee6552c6a738b61ca": "f9c169b51b6ce20394594ef674d6b10efba31220",
  "a4dde6cb35b05e9899ca6a7a63e75c4a8cc5ecba": "3523a3df03c6f04f7ea9c2e7050102657e331a4f",
  "16ae1cd6ab70d2eded1aeab44217d57e0866e26d": "ddecea00f87f0c46e9c8339a7c89fb2ff891521a"
}
[rolling release update] Checking if any of the commits from the old rolling release are already present in the new base branch
[rolling release update] Removing commits from the new branch
[rolling release update] Applying the remaining commits to the new branch
Applying commit  "32a51ac76ceb50789c5ca14ae88aebd7d510e5bc selftests/mm temporary fix of hmm infinite loop"

BUILD (Local VM)

[jmaple@devbox code]$ egrep -B 5 -A 5 "\[TIMER\]|^Starting Build" kbuild.jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5.log
/mnt/code/kernel-src-tree-build
no .config file found, moving on
[TIMER]{MRPROPER}: 0s
x86_64 architecture detected, copying config
'configs/kernel-x86_64-rhel.config' -> '.config'
Setting Local Version for build
CONFIG_LOCALVERSION="-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60"
Making olddefconfig
--
  HOSTCC  scripts/kconfig/util.o
  HOSTLD  scripts/kconfig/conf
#
# configuration written to .config
#
Starting Build
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
--
  LD [M]  sound/x86/snd-hdmi-lpe-audio.ko
  BTF [M] sound/virtio/virtio_snd.ko
  BTF [M] sound/x86/snd-hdmi-lpe-audio.ko
  LD [M]  sound/xen/snd_xen_front.ko
  BTF [M] sound/xen/snd_xen_front.ko
[TIMER]{BUILD}: 1673s
Making Modules
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/arch/x86/crypto/blake2s-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/arch/x86/crypto/blowfish-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/arch/x86/crypto/camellia-aesni-avx-x86_64.ko
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/arch/x86/crypto/camellia-aesni-avx2.ko
--
  INSTALL /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/sound/xen/snd_xen_front.ko
  STRIP   /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/sound/xen/snd_xen_front.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/sound/x86/snd-hdmi-lpe-audio.ko
  SIGN    /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+/kernel/sound/xen/snd_xen_front.ko
  DEPMOD  /lib/modules/5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+
[TIMER]{MODULES}: 9s
Making Install
sh ./arch/x86/boot/install.sh 5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+ \
	arch/x86/boot/bzImage System.map "/boot"
[TIMER]{INSTALL}: 24s
Checking kABI
Checking kABI
kABI check passed
Setting Default Kernel to /boot/vmlinuz-5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+ and Index to 2
Hopefully Grub2.0 took everything ... rebooting after time metrices
[TIMER]{MRPROPER}: 0s
[TIMER]{BUILD}: 1673s
[TIMER]{MODULES}: 9s
[TIMER]{INSTALL}: 24s
[TIMER]{TOTAL} 1712s
Rebooting in 10 seconds

KSELFTESTS (Local VM)

$ ls kselftest.5.14.0-rocky9_5_rebuild-8bb9c737cf19.log kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+.log |
> while read line; do echo $line; grep '^ok ' $line | wc -l; done
kselftest.5.14.0-jmaple_sig-cloud-9_5.14.0-503.40.1.el9_5-ebcb25b1fc60+.log
317
kselftest.5.14.0-rocky9_5_rebuild-8bb9c737cf19.log
316

jira SECO-170

In Rocky9 if you run ./run_vmtests.sh -t hmm it will fail and cause an
infinite loop on ASSERTs in FIXTURE_TEARDOWN()
This temporary fix is based on the discussion here
https://patchwork.kernel.org/project/linux-kselftest/patch/[email protected]/#25046055

We will investigate further kselftest updates that will resolve the root
causes of this.

Signed-off-by: Jonathan Maple <[email protected]>
Copy link

@thefossguy-ciq thefossguy-ciq left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🚤

Copy link
Collaborator

@bmastbergen bmastbergen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🥌

@PlaidCat PlaidCat merged commit ebcb25b into sig-cloud-9/5.14.0-503.40.1.el9_5 May 8, 2025
4 checks passed
@PlaidCat PlaidCat deleted the jmaple_sig-cloud-9/5.14.0-503.40.1.el9_5 branch May 8, 2025 13:48
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit cd13c91

Add a big batch of test coverage to assert all aspects of the tcx opts
attach, detach and query API:

  # ./vmtest.sh -- ./test_progs -t tc_opts
  [...]
  ctrliq#238     tc_opts_after:OK
  ctrliq#239     tc_opts_append:OK
  ctrliq#240     tc_opts_basic:OK
  ctrliq#241     tc_opts_before:OK
  ctrliq#242     tc_opts_chain_classic:OK
  ctrliq#243     tc_opts_demixed:OK
  ctrliq#244     tc_opts_detach:OK
  ctrliq#245     tc_opts_detach_after:OK
  ctrliq#246     tc_opts_detach_before:OK
  ctrliq#247     tc_opts_dev_cleanup:OK
  ctrliq#248     tc_opts_invalid:OK
  ctrliq#249     tc_opts_mixed:OK
  ctrliq#250     tc_opts_prepend:OK
  ctrliq#251     tc_opts_replace:OK
  ctrliq#252     tc_opts_revision:OK
  Summary: 15/0 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Alexei Starovoitov <[email protected]>
(cherry picked from commit cd13c91)
	Signed-off-by: Jonathan Maple <[email protected]>
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit 21ce6ab

Add a detachment test case with miniq present to assert that with and
without the miniq we get the same error.

  # ./test_progs -t tc_opts
  ctrliq#244     tc_opts_after:OK
  ctrliq#245     tc_opts_append:OK
  ctrliq#246     tc_opts_basic:OK
  ctrliq#247     tc_opts_before:OK
  ctrliq#248     tc_opts_chain_classic:OK
  ctrliq#249     tc_opts_delete_empty:OK
  ctrliq#250     tc_opts_demixed:OK
  ctrliq#251     tc_opts_detach:OK
  ctrliq#252     tc_opts_detach_after:OK
  ctrliq#253     tc_opts_detach_before:OK
  ctrliq#254     tc_opts_dev_cleanup:OK
  ctrliq#255     tc_opts_invalid:OK
  ctrliq#256     tc_opts_mixed:OK
  ctrliq#257     tc_opts_prepend:OK
  ctrliq#258     tc_opts_replace:OK
  ctrliq#259     tc_opts_revision:OK
  Summary: 16/0 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Martin KaFai Lau <[email protected]>
(cherry picked from commit 21ce6ab)
	Signed-off-by: Jonathan Maple <[email protected]>
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit ccd9a8b

Add several new tcx test cases to improve test coverage. This also includes
a few new tests with ingress instead of clsact qdisc, to cover the fix from
commit dc644b5 ("tcx: Fix splat in ingress_destroy upon tcx_entry_free").

  # ./test_progs -t tc
  [...]
  ctrliq#234     tc_links_after:OK
  ctrliq#235     tc_links_append:OK
  ctrliq#236     tc_links_basic:OK
  ctrliq#237     tc_links_before:OK
  ctrliq#238     tc_links_chain_classic:OK
  ctrliq#239     tc_links_chain_mixed:OK
  ctrliq#240     tc_links_dev_cleanup:OK
  ctrliq#241     tc_links_dev_mixed:OK
  ctrliq#242     tc_links_ingress:OK
  ctrliq#243     tc_links_invalid:OK
  ctrliq#244     tc_links_prepend:OK
  ctrliq#245     tc_links_replace:OK
  ctrliq#246     tc_links_revision:OK
  ctrliq#247     tc_opts_after:OK
  ctrliq#248     tc_opts_append:OK
  ctrliq#249     tc_opts_basic:OK
  ctrliq#250     tc_opts_before:OK
  ctrliq#251     tc_opts_chain_classic:OK
  ctrliq#252     tc_opts_chain_mixed:OK
  ctrliq#253     tc_opts_delete_empty:OK
  ctrliq#254     tc_opts_demixed:OK
  ctrliq#255     tc_opts_detach:OK
  ctrliq#256     tc_opts_detach_after:OK
  ctrliq#257     tc_opts_detach_before:OK
  ctrliq#258     tc_opts_dev_cleanup:OK
  ctrliq#259     tc_opts_invalid:OK
  ctrliq#260     tc_opts_mixed:OK
  ctrliq#261     tc_opts_prepend:OK
  ctrliq#262     tc_opts_replace:OK
  ctrliq#263     tc_opts_revision:OK
  [...]
  Summary: 44/38 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
Link: https://lore.kernel.org/r/8699efc284b75ccdc51ddf7062fa2370330dc6c0.1692029283.git.daniel@iogearbox.net
	Signed-off-by: Martin KaFai Lau <[email protected]>
(cherry picked from commit ccd9a8b)
	Signed-off-by: Jonathan Maple <[email protected]>
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit d1a783d

Add various tests to check maximum number of supported programs
being attached:

  # ./vmtest.sh -- ./test_progs -t tc_opts
  [...]
  ./test_progs -t tc_opts
  [    1.185325] bpf_testmod: loading out-of-tree module taints kernel.
  [    1.186826] bpf_testmod: module verification failed: signature and/or required key missing - tainting kernel
  [    1.270123] tsc: Refined TSC clocksource calibration: 3407.988 MHz
  [    1.272428] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x311fc932722, max_idle_ns: 440795381586 ns
  [    1.276408] clocksource: Switched to clocksource tsc
  ctrliq#252     tc_opts_after:OK
  ctrliq#253     tc_opts_append:OK
  ctrliq#254     tc_opts_basic:OK
  ctrliq#255     tc_opts_before:OK
  ctrliq#256     tc_opts_chain_classic:OK
  ctrliq#257     tc_opts_chain_mixed:OK
  ctrliq#258     tc_opts_delete_empty:OK
  ctrliq#259     tc_opts_demixed:OK
  ctrliq#260     tc_opts_detach:OK
  ctrliq#261     tc_opts_detach_after:OK
  ctrliq#262     tc_opts_detach_before:OK
  ctrliq#263     tc_opts_dev_cleanup:OK
  ctrliq#264     tc_opts_invalid:OK
  ctrliq#265     tc_opts_max:OK              <--- (new test)
  ctrliq#266     tc_opts_mixed:OK
  ctrliq#267     tc_opts_prepend:OK
  ctrliq#268     tc_opts_replace:OK
  ctrliq#269     tc_opts_revision:OK
  Summary: 18/0 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
	Signed-off-by: Andrii Nakryiko <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
(cherry picked from commit d1a783d)
	Signed-off-by: Jonathan Maple <[email protected]>
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit f9b0879

Add a new test case which performs double query of the bpf_mprog through
libbpf API, but also via raw bpf(2) syscall. This is testing to gather
first the count and then in a subsequent probe the full information with
the program array without clearing passed structs in between.

  # ./vmtest.sh -- ./test_progs -t tc_opts
  [...]
  ./test_progs -t tc_opts
  [    1.398818] tsc: Refined TSC clocksource calibration: 3407.999 MHz
  [    1.400263] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x311fd336761, max_idle_ns: 440795243819 ns
  [    1.402734] clocksource: Switched to clocksource tsc
  [    1.426639] bpf_testmod: loading out-of-tree module taints kernel.
  [    1.428112] bpf_testmod: module verification failed: signature and/or required key missing - tainting kernel
  ctrliq#252     tc_opts_after:OK
  ctrliq#253     tc_opts_append:OK
  ctrliq#254     tc_opts_basic:OK
  ctrliq#255     tc_opts_before:OK
  ctrliq#256     tc_opts_chain_classic:OK
  ctrliq#257     tc_opts_chain_mixed:OK
  ctrliq#258     tc_opts_delete_empty:OK
  ctrliq#259     tc_opts_demixed:OK
  ctrliq#260     tc_opts_detach:OK
  ctrliq#261     tc_opts_detach_after:OK
  ctrliq#262     tc_opts_detach_before:OK
  ctrliq#263     tc_opts_dev_cleanup:OK
  ctrliq#264     tc_opts_invalid:OK
  ctrliq#265     tc_opts_max:OK
  ctrliq#266     tc_opts_mixed:OK
  ctrliq#267     tc_opts_prepend:OK
  ctrliq#268     tc_opts_query:OK            <--- (new test)
  ctrliq#269     tc_opts_replace:OK
  ctrliq#270     tc_opts_revision:OK
  Summary: 19/0 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Martin KaFai Lau <[email protected]>
(cherry picked from commit f9b0879)
	Signed-off-by: Jonathan Maple <[email protected]>
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit 685446b

Add a new test case to query on an empty bpf_mprog and pass the revision
directly into expected_revision for attachment to assert that this does
succeed.

  ./test_progs -t tc_opts
  [    1.406778] tsc: Refined TSC clocksource calibration: 3407.990 MHz
  [    1.408863] clocksource: tsc: mask: 0xffffffffffffffff max_cycles: 0x311fcaf6eb0, max_idle_ns: 440795321766 ns
  [    1.412419] clocksource: Switched to clocksource tsc
  [    1.428671] bpf_testmod: loading out-of-tree module taints kernel.
  [    1.430260] bpf_testmod: module verification failed: signature and/or required key missing - tainting kernel
  ctrliq#252     tc_opts_after:OK
  ctrliq#253     tc_opts_append:OK
  ctrliq#254     tc_opts_basic:OK
  ctrliq#255     tc_opts_before:OK
  ctrliq#256     tc_opts_chain_classic:OK
  ctrliq#257     tc_opts_chain_mixed:OK
  ctrliq#258     tc_opts_delete_empty:OK
  ctrliq#259     tc_opts_demixed:OK
  ctrliq#260     tc_opts_detach:OK
  ctrliq#261     tc_opts_detach_after:OK
  ctrliq#262     tc_opts_detach_before:OK
  ctrliq#263     tc_opts_dev_cleanup:OK
  ctrliq#264     tc_opts_invalid:OK
  ctrliq#265     tc_opts_max:OK
  ctrliq#266     tc_opts_mixed:OK
  ctrliq#267     tc_opts_prepend:OK
  ctrliq#268     tc_opts_query:OK
  ctrliq#269     tc_opts_query_attach:OK     <--- (new test)
  ctrliq#270     tc_opts_replace:OK
  ctrliq#271     tc_opts_revision:OK
  Summary: 20/0 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
	Signed-off-by: Martin KaFai Lau <[email protected]>
(cherry picked from commit 685446b)
	Signed-off-by: Jonathan Maple <[email protected]>
bmastbergen pushed a commit to bmastbergen/kernel-src-tree that referenced this pull request Aug 29, 2025
jira LE-1907
Rebuild_History Non-Buildable kernel-5.14.0-427.18.1.el9_4
commit-author Daniel Borkmann <[email protected]>
commit 2451630

Add several new test cases which assert corner cases on the mprog query
mechanism, for example, around passing in a too small or a larger array
than the current count.

  ./test_progs -t tc_opts
  ctrliq#252     tc_opts_after:OK
  ctrliq#253     tc_opts_append:OK
  ctrliq#254     tc_opts_basic:OK
  ctrliq#255     tc_opts_before:OK
  ctrliq#256     tc_opts_chain_classic:OK
  ctrliq#257     tc_opts_chain_mixed:OK
  ctrliq#258     tc_opts_delete_empty:OK
  ctrliq#259     tc_opts_demixed:OK
  ctrliq#260     tc_opts_detach:OK
  ctrliq#261     tc_opts_detach_after:OK
  ctrliq#262     tc_opts_detach_before:OK
  ctrliq#263     tc_opts_dev_cleanup:OK
  ctrliq#264     tc_opts_invalid:OK
  ctrliq#265     tc_opts_max:OK
  ctrliq#266     tc_opts_mixed:OK
  ctrliq#267     tc_opts_prepend:OK
  ctrliq#268     tc_opts_query:OK
  ctrliq#269     tc_opts_query_attach:OK
  ctrliq#270     tc_opts_replace:OK
  ctrliq#271     tc_opts_revision:OK
  Summary: 20/0 PASSED, 0 SKIPPED, 0 FAILED

	Signed-off-by: Daniel Borkmann <[email protected]>
	Signed-off-by: Andrii Nakryiko <[email protected]>
	Reviewed-by: Alan Maguire <[email protected]>
Link: https://lore.kernel.org/bpf/[email protected]
(cherry picked from commit 2451630)
	Signed-off-by: Jonathan Maple <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants