# git rev-parse -q --verify 00e4db51259a5f936fec1424b884f029479d3981^{commit} 00e4db51259a5f936fec1424b884f029479d3981 already have revision, skipping fetch # git checkout -q -f -B kisskb 00e4db51259a5f936fec1424b884f029479d3981 # git clean -qxdf # < git log -1 # commit 00e4db51259a5f936fec1424b884f029479d3981 # Merge: ed3854ff994b 1101c872c8c7 # Author: Linus Torvalds # Date: Mon Aug 10 19:21:38 2020 -0700 # # Merge tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux # # Pull perf tools updates from Arnaldo Carvalho de Melo: # "New features: # # - Introduce controlling how 'perf stat' and 'perf record' works via a # control file descriptor, allowing starting with events configured # but disabled until commands are received via the control file # descriptor. This allows, for instance for tools such as Intel VTune # to make further use of perf as its Linux platform driver. # # - Improve 'perf record' to to register in a perf.data file header the # clockid used to help later correlate things like syslog files and # perf events recorded. # # - Add basic syscall and find_next_bit benchmarks to 'perf bench'. # # - Allow using computed metrics in calculating other metrics. For # instance: # # { # .metric_expr = "l2_rqsts.demand_data_rd_hit + l2_rqsts.pf_hit + l2_rqsts.rfo_hit", # .metric_name = "DCache_L2_All_Hits", # }, # { # .metric_expr = "max(l2_rqsts.all_demand_data_rd - l2_rqsts.demand_data_rd_hit, 0) + l2_rqsts.pf_miss + l2_rqsts.rfo_miss", # .metric_name = "DCache_L2_All_Miss", # }, # { # .metric_expr = "dcache_l2_all_hits + dcache_l2_all_miss", # .metric_name = "DCache_L2_All", # } # # - Add suport for 'd_ratio', '>' and '<' operators to the expression # resolver used in calculating metrics in 'perf stat'. # # Support for new kernel features: # # - Support TEXT_POKE and KSYMBOL_TYPE_OOL perf metadata events to cope # with things like ftrace, trampolines, i.e. changes in the kernel # text that gets in the way of properly decoding Intel PT hardware # traces, for instance. # # Intel PT: # # - Add various knobs to reduce the volume of Intel PT traces by # reducing the level of details such as decoding just some types of # packets (e.g., FUP/TIP, PSB+), also filtering by time range. # # - Add new itrace options (log flags to the 'd' option, error flags to # the 'e' one, etc), controlling how Intel PT is transformed into # perf events, document some missing options (e.g., how to synthesize # callchains). # # BPF: # # - Properly report BPF errors when parsing events. # # - Do not setup side-band events if LIBBPF is not linked, fixing a # segfault. # # Libraries: # # - Improvements to the libtraceevent plugin mechanism. # # - Improve libtracevent support for KVM trace events SVM exit reasons. # # - Add a libtracevent plugins for decoding syscalls/sys_enter_futex # and for tlb_flush. # # - Ensure sample_period is set libpfm4 events in 'perf test'. # # - Fixup libperf namespacing, to make sure what is in libperf has the # perf_ namespace while what is now only in tools/perf/ doesn't use # that prefix. # # Arch specific: # # - Improve the testing of vendor events and metrics in 'perf test'. # # - Allow no ARM CoreSight hardware tracer sink to be specified on # command line. # # - Fix arm_spe_x recording when mixed with other perf events. # # - Add s390 idle functions 'psw_idle' and 'psw_idle_exit' to list of # idle symbols. # # - List kernel supplied event aliases for arm64 in 'perf list'. # # - Add support for extended register capability in PowerPC 9 and 10. # # - Added nest IMC power9 metric events. # # Miscellaneous: # # - No need to setup sample_regs_intr/sample_regs_user for dummy # events. # # - Update various copies of kernel headers, some causing perf to # handle new syscalls, MSRs, etc. # # - Improve usage of flex and yacc, enabling warnings and addressing # the fallout. # # - Add missing '--output' option to 'perf kmem' so that it can pass it # along to 'perf record'. # # - 'perf probe' fixes related to adding multiple probes on the same # address for the same event. # # - Make 'perf probe' warn if the target function is a GNU indirect # function. # # - Remove //anon mmap events from 'perf inject jit' to fix supporting # both using ELF files for generated functions and the perf-PID.map # approaches" # # * tag 'perf-tools-2020-08-10' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux: (144 commits) # perf record: Skip side-band event setup if HAVE_LIBBPF_SUPPORT is not set # perf tools powerpc: Add support for extended regs in power10 # perf tools powerpc: Add support for extended register capability # tools headers UAPI: Sync drm/i915_drm.h with the kernel sources # tools arch x86: Sync asm/cpufeatures.h with the kernel sources # tools arch x86: Sync the msr-index.h copy with the kernel sources # tools headers UAPI: update linux/in.h copy # tools headers API: Update close_range affected files # perf script: Add 'tod' field to display time of day # perf script: Change the 'enum perf_output_field' enumerators to be 64 bits # perf data: Add support to store time of day in CTF data conversion # perf tools: Move clockid_res_ns under clock struct # perf header: Store clock references for -k/--clockid option # perf tools: Add clockid_name function # perf clockid: Move parse_clockid() to new clockid object # tools lib traceevent: Handle possible strdup() error in tep_add_plugin_path() API # libtraceevent: Fixed description of tep_add_plugin_path() API # libtraceevent: Fixed type in PRINT_FMT_STING # libtraceevent: Fixed broken indentation in parse_ip4_print_args() # libtraceevent: Improve error handling of tep_plugin_add_option() API # ... # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-gcc --version # < /opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux-ld --version # < git log --format=%s --max-count=1 00e4db51259a5f936fec1424b884f029479d3981 # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- allmodconfig # Added to kconfig CONFIG_BUILD_DOCSRC=n # Added to kconfig CONFIG_MODULE_SIG=n # Added to kconfig CONFIG_SAMPLES=n # Added to kconfig CONFIG_MIPS_CPS_NS16550_BASE=0x1b0003f8 # Added to kconfig CONFIG_MIPS_CPS_NS16550_SHIFT=0 # Added to kconfig # < make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- help # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- olddefconfig .config:12450:warning: override: reassigning to symbol MIPS_CPS_NS16550_SHIFT # make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- /kisskb/src/drivers/input/joystick/analog.c:160:2: warning: #warning Precise timer not defined for this architecture. [-Wcpp] #warning Precise timer not defined for this architecture. ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:261:0: warning: "M_SPC_CFG_CLEAR" redefined #define M_SPC_CFG_CLEAR M_BCM1480_SPC_CFG_CLEAR ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:392:0: note: this is the location of the previous definition #define M_SPC_CFG_CLEAR _SB_MAKEMASK1(32) ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:28:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/bcm1480_scd.h:262:0: warning: "M_SPC_CFG_ENABLE" redefined #define M_SPC_CFG_ENABLE M_BCM1480_SPC_CFG_ENABLE ^ In file included from /kisskb/src/arch/mips/include/asm/sibyte/sb1250.h:27:0, from /kisskb/src/drivers/watchdog/sb_wdog.c:58: /kisskb/src/arch/mips/include/asm/sibyte/sb1250_scd.h:393:0: note: this is the location of the previous definition #define M_SPC_CFG_ENABLE _SB_MAKEMASK1(33) ^ In file included from /kisskb/src/include/linux/printk.h:405:0, from /kisskb/src/include/linux/kernel.h:15, from /kisskb/src/include/linux/clk.h:13, from /kisskb/src/drivers/crypto/sa2ul.c:11: /kisskb/src/drivers/crypto/sa2ul.c: In function 'sa_sha_init': /kisskb/src/drivers/crypto/sa2ul.c:1486:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] crypto_ahash_digestsize(tfm), (u64)rctx); ^ /kisskb/src/include/linux/dynamic_debug.h:125:15: note: in definition of macro '__dynamic_func_call' func(&id, ##__VA_ARGS__); \ ^ /kisskb/src/include/linux/dynamic_debug.h:157:2: note: in expansion of macro '_dynamic_func_call' _dynamic_func_call(fmt,__dynamic_dev_dbg, \ ^ /kisskb/src/include/linux/dev_printk.h:115:2: note: in expansion of macro 'dynamic_dev_dbg' dynamic_dev_dbg(dev, dev_fmt(fmt), ##__VA_ARGS__) ^ /kisskb/src/drivers/crypto/sa2ul.c:1485:2: note: in expansion of macro 'dev_dbg' dev_dbg(sa_k3_dev, "init: digest size: %d, rctx=%llx\n", ^ In file included from /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c:6:0: /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c: In function 'ice_free_flow_profs': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:197:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define ICE_FLOW_ENTRY_HNDL(e) ((u64)e) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flex_pipe.c:2921:9: note: in expansion of macro 'ICE_FLOW_ENTRY_HNDL' ICE_FLOW_ENTRY_HNDL(e)); ^ In file included from /kisskb/src/arch/mips/include/asm/page.h:258:0, from /kisskb/src/arch/mips/include/asm/io.h:29, from /kisskb/src/include/linux/io.h:13, from /kisskb/src/arch/mips/include/asm/mips-cps.h:10, from /kisskb/src/arch/mips/include/asm/smp-ops.h:16, from /kisskb/src/arch/mips/include/asm/smp.h:21, from /kisskb/src/include/linux/smp.h:82, from /kisskb/src/include/linux/percpu.h:7, from /kisskb/src/include/linux/prandom.h:12, from /kisskb/src/include/linux/random.h:118, from /kisskb/src/include/linux/net.h:18, from /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:8: /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c: In function 'siw_tx_hdt': /kisskb/src/arch/mips/include/asm/page.h:249:53: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/include/asm-generic/memory_model.h:33:41: note: in definition of macro '__pfn_to_page' #define __pfn_to_page(pfn) (mem_map + ((pfn) - ARCH_PFN_OFFSET)) ^ /kisskb/src/arch/mips/include/asm/page.h:249:31: note: in expansion of macro 'PFN_DOWN' #define virt_to_pfn(kaddr) PFN_DOWN(virt_to_phys((void *)(kaddr))) ^ /kisskb/src/arch/mips/include/asm/page.h:250:41: note: in expansion of macro 'virt_to_pfn' #define virt_to_page(kaddr) pfn_to_page(virt_to_pfn(kaddr)) ^ /kisskb/src/drivers/infiniband/sw/siw/siw_qp_tx.c:528:23: note: in expansion of macro 'virt_to_page' page_array[seg] = virt_to_page(va & PAGE_MASK); ^ In file included from /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:5:0: /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c: In function 'ice_flow_add_entry': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:197:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] #define ICE_FLOW_ENTRY_HNDL(e) ((u64)e) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:946:13: note: in expansion of macro 'ICE_FLOW_ENTRY_HNDL' *entry_h = ICE_FLOW_ENTRY_HNDL(e); ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c: In function 'ice_flow_rem_entry': /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.h:198:32: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] #define ICE_FLOW_ENTRY_PTR(h) ((struct ice_flow_entry *)(h)) ^ /kisskb/src/drivers/net/ethernet/intel/ice/ice_flow.c:974:10: note: in expansion of macro 'ICE_FLOW_ENTRY_PTR' entry = ICE_FLOW_ENTRY_PTR(entry_h); ^ In file included from /kisskb/src/include/linux/skbuff.h:31:0, from /kisskb/src/include/linux/if_ether.h:19, from /kisskb/src/include/uapi/linux/ethtool.h:19, from /kisskb/src/include/linux/ethtool.h:18, from /kisskb/src/include/linux/netdevice.h:37, from /kisskb/src/drivers/net/ethernet/sfc/net_driver.h:13, from /kisskb/src/drivers/net/ethernet/sfc/ef100.c:12: /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_parse_continue_entry': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:145:6: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:163:6: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_parse_xilinx_cap': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:337:5: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c: In function 'ef100_pci_probe': /kisskb/src/include/linux/dma-mapping.h:139:25: warning: large integer implicitly truncated to unsigned type [-Woverflow] #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) ^ /kisskb/src/drivers/net/ethernet/sfc/ef100.c:498:5: note: in expansion of macro 'DMA_BIT_MASK' DMA_BIT_MASK(ESF_GZ_TX_SEND_ADDR_WIDTH), ^ FIT description: Linux 5.8.0+ Created: Wed Aug 12 09:08:40 2020 Image 0 (kernel@0) Description: Linux 5.8.0+ Created: Wed Aug 12 09:08:40 2020 Type: Kernel Image Compression: gzip compressed Data Size: 8306377 Bytes = 8111.70 KiB = 7.92 MiB Architecture: MIPS OS: Linux Load Address: 0x84000000 Entry Point: 0x84c48c7c Hash algo: sha1 Hash value: ad2229e02a50ab86ff0f915daff0f48ac6e4b8e9 Image 1 (fdt@boston) Description: img,boston Device Tree Created: Wed Aug 12 09:08:40 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 3793 Bytes = 3.70 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 4799f50d688573234da6e9d7701234d394759ef4 Image 2 (fdt@ni169445) Description: NI 169445 device tree Created: Wed Aug 12 09:08:40 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 1871 Bytes = 1.83 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 51b89b31605ee62038c8468c429af091dfc75ec7 Image 3 (fdt@ocelot_pcb123) Description: MSCC Ocelot PCB123 Device Tree Created: Wed Aug 12 09:08:40 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 4639 Bytes = 4.53 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: be2724f58b66c316a61da7c11ced633f4e7e86c7 Image 4 (fdt@ocelot_pcb120) Description: MSCC Ocelot PCB120 Device Tree Created: Wed Aug 12 09:08:40 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 5398 Bytes = 5.27 KiB = 0.01 MiB Architecture: MIPS Hash algo: sha1 Hash value: 2a757b83ef9e9d35fb6c43bdbde70d311b3e4555 Image 5 (fdt@xilfpga) Description: MIPSfpga (xilfpga) Device Tree Created: Wed Aug 12 09:08:40 2020 Type: Flat Device Tree Compression: uncompressed Data Size: 2708 Bytes = 2.64 KiB = 0.00 MiB Architecture: MIPS Hash algo: sha1 Hash value: 63d058b780f65e22da30f0a183433765f1807f1d Default Configuration: 'conf@default' Configuration 0 (conf@default) Description: Generic Linux kernel Kernel: kernel@0 Configuration 1 (conf@boston) Description: Boston Linux kernel Kernel: kernel@0 FDT: fdt@boston Configuration 2 (conf@ni169445) Description: NI 169445 Linux Kernel Kernel: kernel@0 FDT: fdt@ni169445 Configuration 3 (conf@ocelot_pcb123) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb123 Configuration 4 (conf@ocelot_pcb120) Description: Ocelot Linux kernel Kernel: kernel@0 FDT: fdt@ocelot_pcb120 Configuration 5 (conf@xilfpga) Description: MIPSfpga Linux kernel Kernel: kernel@0 FDT: fdt@xilfpga ERROR: modpost: "fw_arg3" [drivers/mtd/parsers/bcm63xxpart.ko] undefined! ERROR: modpost: "__umoddi3" [drivers/net/ethernet/sfc/sfc.ko] undefined! make[2]: *** [/kisskb/src/scripts/Makefile.modpost:111: Module.symvers] Error 1 make[2]: *** Deleting file 'Module.symvers' make[1]: *** [/kisskb/src/Makefile:1389: modules] Error 2 make: *** [Makefile:185: __sub-make] Error 2 Command 'make -s -j 48 ARCH=mips O=/kisskb/build/linus_mips-allmodconfig_mipsel CROSS_COMPILE=/opt/cross/kisskb/br-mipsel-o32-full-2016.08-613-ge98b4dd/bin/mipsel-linux- ' returned non-zero exit status 2 # rm -rf /kisskb/build/linus_mips-allmodconfig_mipsel # Build took: 0:17:09.608382