# git rev-parse -q --verify af9c191ac2a0c857f59d75b6812fef078ab1cefe^{commit} af9c191ac2a0c857f59d75b6812fef078ab1cefe already have revision, skipping fetch # git checkout -q -f -B kisskb af9c191ac2a0c857f59d75b6812fef078ab1cefe # git clean -qxdf # < git log -1 # commit af9c191ac2a0c857f59d75b6812fef078ab1cefe # Merge: dd609b8a3a1f 75d7ff9aa0ae # Author: Linus Torvalds # Date: Sun Sep 22 09:47:16 2024 -0700 # # Merge tag 'trace-ring-buffer-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace # # Pull ring-buffer updates from Steven Rostedt: # # - tracing/ring-buffer: persistent buffer across reboots # # This allows for the tracing instance ring buffer to stay persistent # across reboots. The way this is done is by adding to the kernel # command line: # # trace_instance=boot_map@0x285400000:12M # # This will reserve 12 megabytes at the address 0x285400000, and then # map the tracing instance "boot_map" ring buffer to that memory. This # will appear as a normal instance in the tracefs system: # # /sys/kernel/tracing/instances/boot_map # # A user could enable tracing in that instance, and on reboot or kernel # crash, if the memory is not wiped by the firmware, it will recreate # the trace in that instance. For example, if one was debugging a # shutdown of a kernel reboot: # # # cd /sys/kernel/tracing # # echo function > instances/boot_map/current_tracer # # reboot # [..] # # cd /sys/kernel/tracing # # tail instances/boot_map/trace # swapper/0-1 [000] d..1. 164.549800: restore_boot_irq_mode <-native_machine_shutdown # swapper/0-1 [000] d..1. 164.549801: native_restore_boot_irq_mode <-native_machine_shutdown # swapper/0-1 [000] d..1. 164.549802: disconnect_bsp_APIC <-native_machine_shutdown # swapper/0-1 [000] d..1. 164.549811: hpet_disable <-native_machine_shutdown # swapper/0-1 [000] d..1. 164.549812: iommu_shutdown_noop <-native_machine_restart # swapper/0-1 [000] d..1. 164.549813: native_machine_emergency_restart <-__do_sys_reboot # swapper/0-1 [000] d..1. 164.549813: tboot_shutdown <-native_machine_emergency_restart # swapper/0-1 [000] d..1. 164.549820: acpi_reboot <-native_machine_emergency_restart # swapper/0-1 [000] d..1. 164.549821: acpi_reset <-acpi_reboot # swapper/0-1 [000] d..1. 164.549822: acpi_os_write_port <-acpi_reboot # # On reboot, the buffer is examined to make sure it is valid. The # validation check even steps through every event to make sure the meta # data of the event is correct. If any test fails, it will simply reset # the buffer, and the buffer will be empty on boot. # # - Allow the tracing persistent boot buffer to use the "reserve_mem" # option # # Instead of having the admin find a physical address to store the # persistent buffer, which can be very tedious if they have to # administrate several different machines, allow them to use the # "reserve_mem" option that will find a location for them. It is not as # reliable because of KASLR, as the loading of the kernel in different # locations can cause the memory allocated to be inconsistent. Booting # with "nokaslr" can make reserve_mem more reliable. # # - Have function graph tracer handle offsets from a previous boot. # # The ring buffer output from a previous boot may have different # addresses due to kaslr. Have the function graph tracer handle these # by using the delta from the previous boot to the new boot address # space. # # - Only reset the saved meta offset when the buffer is started or reset # # In the persistent memory meta data, it holds the previous address # space information, so that it can calculate the delta to have # function tracing work. But this gets updated after being read to hold # the new address space. But if the buffer isn't used for that boot, on # reboot, the delta is now calculated from the previous boot and not # the boot that holds the data in the ring buffer. This causes the # functions not to be shown. Do not save the address space information # of the current kernel until it is being recorded. # # - Add a magic variable to test the valid meta data # # Add a magic variable in the meta data that can also be used for # validation. The validator of the previous buffer doesn't need this # magic data, but it can be used if the meta data is changed by a new # kernel, which may have the same format that passes the validator but # is used differently. This magic number can also be used as a # "versioning" of the meta data. # # - Align user space mapped ring buffer sub buffers to improve TLB # entries # # Linus mentioned that the mapped ring buffer sub buffers were # misaligned between the meta page and the sub-buffers, so that if the # sub-buffers were bigger than PAGE_SIZE, it wouldn't allow the TLB to # use bigger entries. # # - Add new kernel command line "traceoff" to disable tracing on boot for # instances # # If tracing is enabled for a boot instance, there needs a way to be # able to disable it on boot so that new events do not get entered into # the ring buffer and be mixed with events from a previous boot, as # that can be confusing. # # - Allow trace_printk() to go to other instances # # Currently, trace_printk() can only go to the top level instance. When # debugging with a persistent buffer, it is really useful to be able to # add trace_printk() to go to that buffer, so that you have access to # them after a crash. # # - Do not use "bin_printk()" for traces to a boot instance # # The bin_printk() saves only a pointer to the printk format in the # ring buffer, as the reader of the buffer can still have access to it. # But this is not the case if the buffer is from a previous boot. If # the trace_printk() is going to a "persistent" buffer, it will use the # slower version that writes the printk format into the buffer. # # - Add command line option to allow trace_printk() to go to an instance # # Allow the kernel command line to define which instance the # trace_printk() goes to, instead of forcing the admin to set it for # every boot via the tracefs options. # # - Start a document that explains how to use tracefs to debug the kernel # # - Add some more kernel selftests to test user mapped ring buffer # # * tag 'trace-ring-buffer-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: (28 commits) # selftests/ring-buffer: Handle meta-page bigger than the system # selftests/ring-buffer: Verify the entire meta-page padding # tracing/Documentation: Start a document on how to debug with tracing # tracing: Add option to set an instance to be the trace_printk destination # tracing: Have trace_printk not use binary prints if boot buffer # tracing: Allow trace_printk() to go to other instance buffers # tracing: Add "traceoff" flag to boot time tracing instances # ring-buffer: Align meta-page to sub-buffers for improved TLB usage # ring-buffer: Add magic and struct size to boot up meta data # ring-buffer: Don't reset persistent ring-buffer meta saved addresses # tracing/fgraph: Have fgraph handle previous boot function addresses # tracing: Allow boot instances to use reserve_mem boot memory # tracing: Fix ifdef of snapshots to not prevent last_boot_info file # ring-buffer: Use vma_pages() helper function # tracing: Fix NULL vs IS_ERR() check in enable_instances() # tracing: Add last boot delta offset for stack traces # tracing: Update function tracing output for previous boot buffer # tracing: Handle old buffer mappings for event strings and functions # tracing/ring-buffer: Add last_boot_info file to boot instance # ring-buffer: Save text and data locations in mapped meta data # ... # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-gcc --version # < /opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux-ld --version # < git log --format=%s --max-count=1 af9c191ac2a0c857f59d75b6812fef078ab1cefe # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 allmodconfig WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] # Added to kconfig CONFIG_STANDALONE=y # Added to kconfig CONFIG_KCOV=n # Added to kconfig CONFIG_GCC_PLUGINS=n # Added to kconfig CONFIG_GCC_PLUGIN_CYC_COMPLEXITY=n # Added to kconfig CONFIG_GCC_PLUGIN_SANCOV=n # Added to kconfig CONFIG_GCC_PLUGIN_LATENT_ENTROPY=n # Added to kconfig CONFIG_GCC_PLUGIN_STRUCTLEAK=n # Added to kconfig CONFIG_GCC_PLUGIN_RANDSTRUCT=n # Added to kconfig CONFIG_UML_NET=n # Added to kconfig CONFIG_UML_NET_ETHERTAP=n # Added to kconfig CONFIG_UML_NET_TUNTAP=n # Added to kconfig CONFIG_UML_NET_SLIP=n # Added to kconfig CONFIG_UML_NET_DAEMON=n # Added to kconfig CONFIG_UML_NET_VDE=n # Added to kconfig CONFIG_UML_NET_MCAST=n # Added to kconfig CONFIG_UML_NET_PCAP=n # Added to kconfig CONFIG_UML_NET_SLIRP=n # Added to kconfig CONFIG_GCOV_KERNEL=n # Added to kconfig CONFIG_DEBUG_INFO_BTF=n # Added to kconfig CONFIG_BPF_PRELOAD=n # Added to kconfig CONFIG_SPI_STM32_QSPI=n # < make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 help # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 olddefconfig .config:14830:warning: override: reassigning to symbol GCC_PLUGIN_LATENT_ENTROPY .config:14834:warning: override: reassigning to symbol UML_NET_ETHERTAP .config:14836:warning: override: reassigning to symbol UML_NET_SLIP .config:14841:warning: override: reassigning to symbol UML_NET_SLIRP WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] # make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] WARNING: unmet direct dependencies detected for GET_FREE_REGION Depends on [n]: SPARSEMEM [=n] Selected by [m]: - RESOURCE_KUNIT_TEST [=m] && RUNTIME_TESTING_MENU [=y] && KUNIT [=m] /kisskb/src/lib/iomap.c:156:5: error: no previous prototype for ‘ioread64_lo_hi’ [-Werror=missing-prototypes] 156 | u64 ioread64_lo_hi(const void __iomem *addr) | ^~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:163:5: error: no previous prototype for ‘ioread64_hi_lo’ [-Werror=missing-prototypes] 163 | u64 ioread64_hi_lo(const void __iomem *addr) | ^~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:170:5: error: no previous prototype for ‘ioread64be_lo_hi’ [-Werror=missing-prototypes] 170 | u64 ioread64be_lo_hi(const void __iomem *addr) | ^~~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:178:5: error: no previous prototype for ‘ioread64be_hi_lo’ [-Werror=missing-prototypes] 178 | u64 ioread64be_hi_lo(const void __iomem *addr) | ^~~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:264:6: error: no previous prototype for ‘iowrite64_lo_hi’ [-Werror=missing-prototypes] 264 | void iowrite64_lo_hi(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:272:6: error: no previous prototype for ‘iowrite64_hi_lo’ [-Werror=missing-prototypes] 272 | void iowrite64_hi_lo(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:280:6: error: no previous prototype for ‘iowrite64be_lo_hi’ [-Werror=missing-prototypes] 280 | void iowrite64be_lo_hi(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~~~ /kisskb/src/lib/iomap.c:288:6: error: no previous prototype for ‘iowrite64be_hi_lo’ [-Werror=missing-prototypes] 288 | void iowrite64be_hi_lo(u64 val, void __iomem *addr) | ^~~~~~~~~~~~~~~~~ cc1: all warnings being treated as errors make[4]: *** [/kisskb/src/scripts/Makefile.build:244: lib/iomap.o] Error 1 make[3]: *** [/kisskb/src/scripts/Makefile.build:485: lib] Error 2 make[3]: *** Waiting for unfinished jobs.... make[2]: *** [/kisskb/src/Makefile:1926: .] Error 2 make[1]: *** [/kisskb/src/Makefile:224: __sub-make] Error 2 make: *** [Makefile:224: __sub-make] Error 2 Command 'make -s -j 40 ARCH=um O=/kisskb/build/linus_allmodconfig_um-x86_64-gcc12 CROSS_COMPILE=/opt/cross/kisskb/x86-64--glibc--bleeding-edge-2022.08-1/bin/x86_64-linux- SUBARCH=x86_64 ' returned non-zero exit status 2. # rm -rf /kisskb/build/linus_allmodconfig_um-x86_64-gcc12 # Build took: 0:10:28.860155