Merging upstream version 2.40.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 146 insertions, 0 deletions

diff --git a/tests/expected/dmesg/cid-kmsg-console-levels b/tests/expected/dmesg/cid-kmsg-console-levels
new file mode 100644
index 0000000..ef2e83c
--- /dev/null
+++ b/tests/expected/dmesg/cid-kmsg-console-levels
@@ -0,0 +1,146 @@
+Display console level: -1
+Display console level: 0
+[    0.000000] [T1] Linux version 6.6.4-arch1-1 (linux@archlinux) (gcc (GCC) 13.2.1 20230801, GNU ld (GNU Binutils) 2.41.0) #1 SMP PREEMPT_DYNAMIC Mon, 04 Dec 2023 00:29:19 +0000
+Display console level: 1
+[    0.000001] [T2] Command line: initrd=\ucode.img initrd=\initramfs-linux.img rw cryptdevice=/dev/nvme0n1p3:system:discard root=/dev/mapper/system
+Display console level: 2
+[    0.000002] [T3] BIOS-provided physical RAM map:
+Display console level: 3
+[    0.000003] [T4] BIOS-e820: [mem 0x0000000000000000-0x000000000009efff] usable
+[   16.690000] [T36] Serial bus multi instantiate pseudo device driver INT3515:00: error -ENXIO: IRQ index 1 not found.
+[   17.710000] [T37] snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535
+[   35.768091] [T42] snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535
+Display console level: 4
+[    0.000004] [T5] BIOS-e820: [mem 0x000000000009f000-0x00000000000bffff] reserved
+[    0.209670] [T14]   #1  #3  #5  #7
+[    0.215966] [T18] ENERGY_PERF_BIAS: Set to 'normal', was 'performance'
+[   20.740000] [T39] systemd-journald[723]: File /var/log/journal/a124ea923b144109a12d557d5ac53179/system.journal corrupted or uncleanly shut down, renaming and replacing.
+[   24.761100] [T41] PEFILE: Unsigned PE binary
+[  169.911147] [T123] User program Dmesg Test Message at warn priority
+[  178.927435] [T1234] User program Dmesg Test Message at warn priority
+Display console level: 5
+[    0.000005] [T6] BIOS-e820: [mem 0x0000000000100000-0x0000000009afffff] usable
+[    0.215936] [T16] audit: type=2000 audit(1702926179.015:1): state=initialized audit_enabled=0 res=1
+[    9.398562] [T30] user network daemon initialization complete
+[  185.943456] [T12345] User program Dmesg Test Message at notice priority
+Display console level: 6
+[    0.000006] [T7] BIOS-e820: [mem 0x0000000009b00000-0x0000000009dfffff] reserved
+[    0.000008] [T9] BIOS-e820: [mem 0x0000000009f00000-0x0000000009f3bfff] ACPI NVS
+[    0.000009] [T10] BIOS-e820: [mem 0x0000000009f3c000-0x000000004235ffff] usable
+[    0.000010] [T11] BIOS-e820: [mem 0x0000000042360000-0x000000004455ffff] reserved
+[    0.201607] [T12] smp: Bringing up secondary CPUs ...
+[    0.201607] [T13] smpboot: x86: Booting SMP configuration:
+[    0.212630] [T15] smp: Brought up 1 node, 16 CPUs
+[    0.215937] [T17] thermal_sys: Registered thermal governor 'fair_share'
+[    0.367657] [T19] ACPI: \_SB_.PCI0.GP19.NHI1.PWRS: New power resource
+[    0.368615] [T20] ACPI: \_SB_.PCI0.GP19.XHC4.PWRS: New power resource
+[    0.376316] [T21] ACPI: \_SB_.PRWL: New power resource
+[    0.376343] [T22] ACPI: \_SB_.PRWB: New power resource
+[    0.377373] [T23] ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])
+[    0.377378] [T24] acpi PNP0A08:00: _OSC: OS supports [ExtendedConfig ASPM ClockPM Segments MSI EDR HPX-Type3]
+[    0.377569] [T25] acpi PNP0A08:00: _OSC: platform does not support [SHPCHotplug AER]
+[    0.377933] [T26] acpi PNP0A08:00: _OSC: OS now controls [PCIeHotplug PME PCIeCapability LTR DPC]
+[    0.378458] [T27] PCI host bridge to bus 0000:00
+[    0.378459] [T28] pci_bus 0000:00: root bus resource [io  0x0000-0x0cf7 window]
+[    0.378461] [T29] pci_bus 0000:00: root bus resource [io  0x0d00-0xffff window]
+[   10.441520] [T31] systemd[1]: systemd 254.7-1.fc39 running in system mode
+[   11.441524] [T32] systemd[1]: Detected architecture x86-64.
+[   12.441525] [T33] systemd[1]: Running in initrd.
+[   13.541598] [T34] systemd[1]: Hostname set to <catalina>.
+[   15.641860] [T35] usb 3-3: New USB device found, idVendor=1a40, idProduct=0101, bcdDevice= 1.11
+[   18.720000] [T38] systemd-journald[723]: Received client request to flush runtime journal.
+[   21.752348] [T40] systemd-journald[723]: /var/log/journal/ad7a2547ac0e4342a342e62a34a3eae4/user-1000.journal: Journal file uses a different sequence number ID, rotating.
+[  137.791785] [C1] usb 3-3.1: device firmware changed
+[  146.803248] [C2] usb 3-3.1: USB disconnect, device number 44
+[  148.821859] [C3] usb 3-3.1: New USB device found, idVendor=17ef, idProduct=6047, bcdDevice= 3.30
+[  149.840480] [C4] perf: interrupt took too long (2518 > 2500)
+[  150.853128] [C5] perf: interrupt took too long (3217 > 3147)
+[  153.859311] [C12] perf: interrupt took too long (3654 > 3239)
+[  155.861908] [C123] perf: interrupt took too long (3789 > 3545)
+[  158.870434] [C1234] perf: interrupt took too long (3891 > 3647)
+[  161.887625] [C12345] perf: interrupt took too long (3947 > 3789)
+[  163.898434] [C123456] perf: interrupt took too long (4011 > 3898)
+[  166.909842] [C1234567] perf: interrupt took too long (4174 > 3987)
+[  189.963238] [T123456] User program Dmesg Test Message at info priority
+Display console level: 7
+[    0.000007] [T8] BIOS-e820: [mem 0x0000000009e00000-0x0000000009efffff] usable
+[  207.987439] [T1234567] User program Dmesg Test Message at debug priority
+
+Display console level: 8
+Display console level: err+
+[    0.000000] [T1] Linux version 6.6.4-arch1-1 (linux@archlinux) (gcc (GCC) 13.2.1 20230801, GNU ld (GNU Binutils) 2.41.0) #1 SMP PREEMPT_DYNAMIC Mon, 04 Dec 2023 00:29:19 +0000
+[    0.000001] [T2] Command line: initrd=\ucode.img initrd=\initramfs-linux.img rw cryptdevice=/dev/nvme0n1p3:system:discard root=/dev/mapper/system
+[    0.000002] [T3] BIOS-provided physical RAM map:
+[    0.000003] [T4] BIOS-e820: [mem 0x0000000000000000-0x000000000009efff] usable
+[   16.690000] [T36] Serial bus multi instantiate pseudo device driver INT3515:00: error -ENXIO: IRQ index 1 not found.
+[   17.710000] [T37] snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535
+[   35.768091] [T42] snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535
+Display console level: emerg+
+[    0.000000] [T1] Linux version 6.6.4-arch1-1 (linux@archlinux) (gcc (GCC) 13.2.1 20230801, GNU ld (GNU Binutils) 2.41.0) #1 SMP PREEMPT_DYNAMIC Mon, 04 Dec 2023 00:29:19 +0000
+Display console level: +err
+[    0.000003] [T4] BIOS-e820: [mem 0x0000000000000000-0x000000000009efff] usable
+[    0.000004] [T5] BIOS-e820: [mem 0x000000000009f000-0x00000000000bffff] reserved
+[    0.000005] [T6] BIOS-e820: [mem 0x0000000000100000-0x0000000009afffff] usable
+[    0.000006] [T7] BIOS-e820: [mem 0x0000000009b00000-0x0000000009dfffff] reserved
+[    0.000007] [T8] BIOS-e820: [mem 0x0000000009e00000-0x0000000009efffff] usable
+[    0.000008] [T9] BIOS-e820: [mem 0x0000000009f00000-0x0000000009f3bfff] ACPI NVS
+[    0.000009] [T10] BIOS-e820: [mem 0x0000000009f3c000-0x000000004235ffff] usable
+[    0.000010] [T11] BIOS-e820: [mem 0x0000000042360000-0x000000004455ffff] reserved
+[    0.201607] [T12] smp: Bringing up secondary CPUs ...
+[    0.201607] [T13] smpboot: x86: Booting SMP configuration:
+[    0.209670] [T14]   #1  #3  #5  #7
+[    0.212630] [T15] smp: Brought up 1 node, 16 CPUs
+[    0.215936] [T16] audit: type=2000 audit(1702926179.015:1): state=initialized audit_enabled=0 res=1
+[    0.215937] [T17] thermal_sys: Registered thermal governor 'fair_share'
+[    0.215966] [T18] ENERGY_PERF_BIAS: Set to 'normal', was 'performance'
+[    0.367657] [T19] ACPI: \_SB_.PCI0.GP19.NHI1.PWRS: New power resource
+[    0.368615] [T20] ACPI: \_SB_.PCI0.GP19.XHC4.PWRS: New power resource
+[    0.376316] [T21] ACPI: \_SB_.PRWL: New power resource
+[    0.376343] [T22] ACPI: \_SB_.PRWB: New power resource
+[    0.377373] [T23] ACPI: PCI Root Bridge [PCI0] (domain 0000 [bus 00-ff])
+[    0.377378] [T24] acpi PNP0A08:00: _OSC: OS supports [ExtendedConfig ASPM ClockPM Segments MSI EDR HPX-Type3]
+[    0.377569] [T25] acpi PNP0A08:00: _OSC: platform does not support [SHPCHotplug AER]
+[    0.377933] [T26] acpi PNP0A08:00: _OSC: OS now controls [PCIeHotplug PME PCIeCapability LTR DPC]
+[    0.378458] [T27] PCI host bridge to bus 0000:00
+[    0.378459] [T28] pci_bus 0000:00: root bus resource [io  0x0000-0x0cf7 window]
+[    0.378461] [T29] pci_bus 0000:00: root bus resource [io  0x0d00-0xffff window]
+[    9.398562] [T30] user network daemon initialization complete
+[   10.441520] [T31] systemd[1]: systemd 254.7-1.fc39 running in system mode
+[   11.441524] [T32] systemd[1]: Detected architecture x86-64.
+[   12.441525] [T33] systemd[1]: Running in initrd.
+[   13.541598] [T34] systemd[1]: Hostname set to <catalina>.
+[   15.641860] [T35] usb 3-3: New USB device found, idVendor=1a40, idProduct=0101, bcdDevice= 1.11
+[   16.690000] [T36] Serial bus multi instantiate pseudo device driver INT3515:00: error -ENXIO: IRQ index 1 not found.
+[   17.710000] [T37] snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535
+[   18.720000] [T38] systemd-journald[723]: Received client request to flush runtime journal.
+[   20.740000] [T39] systemd-journald[723]: File /var/log/journal/a124ea923b144109a12d557d5ac53179/system.journal corrupted or uncleanly shut down, renaming and replacing.
+[   21.752348] [T40] systemd-journald[723]: /var/log/journal/ad7a2547ac0e4342a342e62a34a3eae4/user-1000.journal: Journal file uses a different sequence number ID, rotating.
+[   24.761100] [T41] PEFILE: Unsigned PE binary
+[   35.768091] [T42] snd_hda_intel 0000:00:1f.3: CORB reset timeout#2, CORBRP = 65535
+[  137.791785] [C1] usb 3-3.1: device firmware changed
+[  146.803248] [C2] usb 3-3.1: USB disconnect, device number 44
+[  148.821859] [C3] usb 3-3.1: New USB device found, idVendor=17ef, idProduct=6047, bcdDevice= 3.30
+[  149.840480] [C4] perf: interrupt took too long (2518 > 2500)
+[  150.853128] [C5] perf: interrupt took too long (3217 > 3147)
+[  153.859311] [C12] perf: interrupt took too long (3654 > 3239)
+[  155.861908] [C123] perf: interrupt took too long (3789 > 3545)
+[  158.870434] [C1234] perf: interrupt took too long (3891 > 3647)
+[  161.887625] [C12345] perf: interrupt took too long (3947 > 3789)
+[  163.898434] [C123456] perf: interrupt took too long (4011 > 3898)
+[  166.909842] [C1234567] perf: interrupt took too long (4174 > 3987)
+[  169.911147] [T123] User program Dmesg Test Message at warn priority
+[  178.927435] [T1234] User program Dmesg Test Message at warn priority
+[  185.943456] [T12345] User program Dmesg Test Message at notice priority
+[  189.963238] [T123456] User program Dmesg Test Message at info priority
+[  207.987439] [T1234567] User program Dmesg Test Message at debug priority
+
+Display console level: +debug
+[    0.000007] [T8] BIOS-e820: [mem 0x0000000009e00000-0x0000000009efffff] usable
+[  207.987439] [T1234567] User program Dmesg Test Message at debug priority
+
+Display console level: debug
+[    0.000007] [T8] BIOS-e820: [mem 0x0000000009e00000-0x0000000009efffff] usable
+[  207.987439] [T1234567] User program Dmesg Test Message at debug priority
+
+Display console level: + (invalid)
+test_dmesg: unknown level '+'