1. 08 12月, 2021 2 次提交
    • L
      Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of... · 2a987e65
      Linus Torvalds 提交于
      Merge tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux
      
      Pull perf tools fixes from Arnaldo Carvalho de Melo:
      
       - Fix SMT detection fast read path on sysfs.
      
       - Fix memory leaks when processing feature headers in perf.data files.
      
       - Fix 'Simple expression parser' 'perf test' on arch without CPU die
         topology info, such as s/390.
      
       - Fix building perf with BUILD_BPF_SKEL=1.
      
       - Fix 'perf bench' by reverting "perf bench: Fix two memory leaks
         detected with ASan".
      
       - Fix itrace space allowed for new attributes in 'perf script'.
      
       - Fix the build feature detection fast path, that was always failing on
         systems with python3 development packages, speeding up the build.
      
       - Reset shadow counts before loading, fixing metrics using
         duration_time.
      
       - Sync more kernel headers changed by the new futex_waitv syscall: s390
         and powerpc.
      
      * tag 'perf-tools-fixes-for-v5.16-2021-12-07' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
        perf bpf_skel: Do not use typedef to avoid error on old clang
        perf bpf: Fix building perf with BUILD_BPF_SKEL=1 by default in more distros
        perf header: Fix memory leaks when processing feature headers
        perf test: Reset shadow counts before loading
        perf test: Fix 'Simple expression parser' test on arch without CPU die topology info
        tools build: Remove needless libpython-version feature check that breaks test-all fast path
        perf tools: Fix SMT detection fast read path
        tools headers UAPI: Sync powerpc syscall table file changed by new futex_waitv syscall
        perf inject: Fix itrace space allowed for new attributes
        tools headers UAPI: Sync s390 syscall table file changed by new futex_waitv syscall
        Revert "perf bench: Fix two memory leaks detected with ASan"
      2a987e65
    • L
      Merge tag 'platform-drivers-x86-v5.16-3' of... · 95723243
      Linus Torvalds 提交于
      Merge tag 'platform-drivers-x86-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
      
      Pull x86 platform driver fixes from Hans de Goede:
       "Various bug-fixes and hardware-id additions"
      
      * tag 'platform-drivers-x86-v5.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
        platform/x86/intel: hid: add quirk to support Surface Go 3
        platform/x86: amd-pmc: Fix s2idle failures on certain AMD laptops
        platform/x86: touchscreen_dmi: Add TrekStor SurfTab duo W1 touchscreen info
        platform/x86: lg-laptop: Recognize more models
        platform/x86: thinkpad_acpi: Add lid_logo_dot to the list of safe LEDs
        platform/x86: thinkpad_acpi: Restore missing hotkey_tablet_mode and hotkey_radio_sw sysfs-attr
      95723243
  2. 07 12月, 2021 17 次提交
    • S
      perf bpf_skel: Do not use typedef to avoid error on old clang · 5a897531
      Song Liu 提交于
      When building bpf_skel with clang-10, typedef causes confusions like:
      
        libbpf: map 'prev_readings': unexpected def kind var.
      
      Fix this by removing the typedef.
      
      Fixes: 7fac83aa ("perf stat: Introduce 'bperf' to share hardware PMCs with BPF")
      Reported-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: NSong Liu <songliubraving@fb.com>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Link: http://lore.kernel.org/lkml/BEF5C312-4331-4A60-AEC0-AD7617CB2BC4@fb.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      5a897531
    • S
      perf bpf: Fix building perf with BUILD_BPF_SKEL=1 by default in more distros · f7c4e85b
      Song Liu 提交于
      Arnaldo reported that building all his containers with BUILD_BPF_SKEL=1
      to then make this the default he found problems in some distros where
      the system linux/bpf.h file was being used and lacked this:
      
         util/bpf_skel/bperf_leader.bpf.c:13:20: error: use of undeclared identifier 'BPF_F_PRESERVE_ELEMS'
                 __uint(map_flags, BPF_F_PRESERVE_ELEMS);
      
      So use instead the vmlinux.h file generated by bpftool from BTF info.
      
      This fixed these as well, getting the build back working on debian:11,
      debian:experimental and ubuntu:21.10:
      
        In file included from In file included from util/bpf_skel/bperf_leader.bpf.cutil/bpf_skel/bpf_prog_profiler.bpf.c::33:
        :
        In file included from In file included from /usr/include/linux/bpf.h/usr/include/linux/bpf.h::1111:
        :
        /usr/include/linux/types.h/usr/include/linux/types.h::55::1010:: In file included from  util/bpf_skel/bperf_follower.bpf.c:3fatal errorfatal error:
        : : In file included from /usr/include/linux/bpf.h:'asm/types.h' file not found11'asm/types.h' file not found:
      
        /usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found
        #include <asm/types.h>#include <asm/types.h>
      
                 ^~~~~~~~~~~~~         ^~~~~~~~~~~~~
      
        #include <asm/types.h>
                 ^~~~~~~~~~~~~
        1 error generated.
      Reported-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: NSong Liu <song@kernel.org>
      Tested-by: NAthira Rajeev <atrajeev@linux.vnet.ibm.com>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Link: http://lore.kernel.org/lkml/CF175681-8101-43D1-ABDB-449E644BE986@fb.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      f7c4e85b
    • I
      perf header: Fix memory leaks when processing feature headers · 47473950
      Ian Rogers 提交于
      These leaks were found with leak sanitizer running "perf pipe recording
      and injection test".
      
      In pipe mode feat_fd may hold onto an events struct that needs freeing.
      
      When string features are processed they may overwrite an already created
      string, so free this before the overwrite.
      Signed-off-by: NIan Rogers <irogers@google.com>
      Acked-by: NJiri Olsa <jolsa@redhat.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lore.kernel.org/lkml/20211118201730.2302927-1-irogers@google.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      47473950
    • I
      perf test: Reset shadow counts before loading · 1aa79e57
      Ian Rogers 提交于
      Otherwise load counting is an average. Without this change
      duration_time in test_memory_bandwidth will alter its value if an
      earlier test contains duration_time.
      
      This patch fixes an issue that's introduced in the proposed patch:
      https://lore.kernel.org/lkml/20211124015226.3317994-1-irogers@google.com/
      in perf test "Parse and process metrics".
      Signed-off-by: NIan Rogers <irogers@google.com>
      Acked-by: NJiri Olsa <jolsa@redhat.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: John Garry <john.garry@huawei.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Paul Clarke <pc@us.ibm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lore.kernel.org/lkml/20211128085810.4027314-1-irogers@google.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      1aa79e57
    • T
      perf test: Fix 'Simple expression parser' test on arch without CPU die topology info · 6c481031
      Thomas Richter 提交于
      Some platforms do not have CPU die support, for example s390.
      
      Commit
      Cc: Ian Rogers <irogers@google.com>
      Fixes: fdf1e29b ("perf expr: Add metric literals for topology.")
      fails on s390:
      
        # perf test -Fv 7
          ...
        # FAILED tests/expr.c:173 #num_dies >= #num_packages
          ---- end ----
          Simple expression parser: FAILED!
        #
      
      Investigating this issue leads to these functions:
      
       build_cpu_topology()
         +--> has_die_topology(void)
              {
                 struct utsname uts;
      
                 if (uname(&uts) < 0)
                        return false;
                 if (strncmp(uts.machine, "x86_64", 6))
                        return false;
                 ....
              }
      
      which always returns false on s390. The caller build_cpu_topology()
      checks has_die_topology() return value. On false the the struct
      cpu_topology::die_cpu_list is not contructed and has zero entries. This
      leads to the failing comparison: #num_dies >= #num_packages.  s390 of
      course has a positive number of packages.
      
      Fix this and check if the function build_cpu_topology() did build up
      a die_cpus_list. The number of entries in this list should be larger
      than 0. If the number of list element is zero, the die_cpus_list has
      not been created and the check in function test__expr():
      
          TEST_ASSERT_VAL("#num_dies >= #num_packages", \
      		    num_dies >= num_packages)
      
      always fails.
      
      Output after:
      
        # perf test -Fv 7
         7: Simple expression parser                                        :
         --- start ---
         division by zero
         syntax error
         ---- end ----
         Simple expression parser: Ok
        #
      
      Fixes: fdf1e29b ("perf expr: Add metric literals for topology.")
      Signed-off-by: NThomas Richter <tmricht@linux.ibm.com>
      Acked-by: NIan Rogers <irogers@google.com>
      Cc: Heiko Carstens <hca@linux.ibm.com>
      Cc: Sumanth Korikkar <sumanthk@linux.ibm.com>
      Cc: Sven Schnelle <svens@linux.ibm.com>
      Cc: Vasily Gorbik <gor@linux.ibm.com>
      Link: http://lore.kernel.org/lkml/20211129112339.3003036-1-tmricht@linux.ibm.com
      [ Added comment in the added 'if (num_dies)' line about architectures not having die topology ]
      Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      6c481031
    • A
      tools build: Remove needless libpython-version feature check that breaks test-all fast path · 3d1d57de
      Arnaldo Carvalho de Melo 提交于
      Since 66dfdff0 ("perf tools: Add Python 3 support") we don't use
      the tools/build/feature/test-libpython-version.c version in any Makefile
      feature check:
      
        $ find tools/ -type f | xargs grep feature-libpython-version
        $
      
      The only place where this was used was removed in 66dfdff0:
      
        -        ifneq ($(feature-libpython-version), 1)
        -          $(warning Python 3 is not yet supported; please set)
        -          $(warning PYTHON and/or PYTHON_CONFIG appropriately.)
        -          $(warning If you also have Python 2 installed, then)
        -          $(warning try something like:)
        -          $(warning $(and ,))
        -          $(warning $(and ,)  make PYTHON=python2)
        -          $(warning $(and ,))
        -          $(warning Otherwise, disable Python support entirely:)
        -          $(warning $(and ,))
        -          $(warning $(and ,)  make NO_LIBPYTHON=1)
        -          $(warning $(and ,))
        -          $(error   $(and ,))
        -        else
        -          LDFLAGS += $(PYTHON_EMBED_LDFLAGS)
        -          EXTLIBS += $(PYTHON_EMBED_LIBADD)
        -          LANG_BINDINGS += $(obj-perf)python/perf.so
        -          $(call detected,CONFIG_LIBPYTHON)
        -        endif
      
      And nowadays we either build with PYTHON=python3 or just install the
      python3 devel packages and perf will build against it.
      
      But the leftover feature-libpython-version check made the fast path
      feature detection to break in all cases except when python2 devel files
      were installed:
      
        $ rpm -qa | grep python.*devel
        python3-devel-3.9.7-1.fc34.x86_64
        $ rm -rf /tmp/build/perf ; mkdir -p /tmp/build/perf ;
        $ make -C tools/perf O=/tmp/build/perf install-bin
        make: Entering directory '/var/home/acme/git/perf/tools/perf'
          BUILD:   Doing 'make -j32' parallel build
          HOSTCC  /tmp/build/perf/fixdep.o
        <SNIP>
        $ cat /tmp/build/perf/feature/test-all.make.output
        In file included from test-all.c:18:
        test-libpython-version.c:5:10: error: #error
            5 |         #error
              |          ^~~~~
        $ ldd ~/bin/perf | grep python
      	libpython3.9.so.1.0 => /lib64/libpython3.9.so.1.0 (0x00007fda6dbcf000)
        $
      
      As python3 is the norm these days, fix this by just removing the unused
      feature-libpython-version feature check, making the test-all fast path
      to work with the common case.
      
      With this:
      
        $ rm -rf /tmp/build/perf ; mkdir -p /tmp/build/perf ;
        $ make -C tools/perf O=/tmp/build/perf install-bin |& head
        make: Entering directory '/var/home/acme/git/perf/tools/perf'
          BUILD:   Doing 'make -j32' parallel build
          HOSTCC  /tmp/build/perf/fixdep.o
          HOSTLD  /tmp/build/perf/fixdep-in.o
          LINK    /tmp/build/perf/fixdep
      
        Auto-detecting system features:
        ...                         dwarf: [ on  ]
        ...            dwarf_getlocations: [ on  ]
        ...                         glibc: [ on  ]
        $ ldd ~/bin/perf | grep python
      	libpython3.9.so.1.0 => /lib64/libpython3.9.so.1.0 (0x00007f58800b0000)
        $ cat /tmp/build/perf/feature/test-all.make.output
        $
      Reviewed-by: NJames Clark <james.clark@arm.com>
      Fixes: 66dfdff0 ("perf tools: Add Python 3 support")
      Cc: Adrian Hunter <adrian.hunter@intel.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: Jaroslav Škarvada <jskarvad@redhat.com>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Link: https://lore.kernel.org/lkml/YaYmeeC6CS2b8OSz@kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      3d1d57de
    • I
      perf tools: Fix SMT detection fast read path · 4ffbe87e
      Ian Rogers 提交于
      sysfs__read_int() returns 0 on success, and so the fast read path was
      always failing.
      
      Fixes: bb629484 ("perf tools: Simplify checking if SMT is active.")
      Signed-off-by: NIan Rogers <irogers@google.com>
      Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
      Cc: Andi Kleen <ak@linux.intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Cc: John Garry <john.garry@huawei.com>
      Cc: Kajol Jain <kjain@linux.ibm.com>
      Cc: Kan Liang <kan.liang@linux.intel.com>
      Cc: Konstantin Khlebnikov <koct9i@gmail.com>
      Cc: Mark Rutland <mark.rutland@arm.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Paul Clarke <pc@us.ibm.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Cc: Stephane Eranian <eranian@google.com>
      Link: http://lore.kernel.org/lkml/20211124001231.3277836-2-irogers@google.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      4ffbe87e
    • A
      tools headers UAPI: Sync powerpc syscall table file changed by new futex_waitv syscall · cba43fcf
      Arnaldo Carvalho de Melo 提交于
      To pick the changes in this cset:
      
        a0eb2da9 ("futex: Wireup futex_waitv syscall")
      
      That add support for this new syscall in tools such as 'perf trace'.
      
      For instance, this is now possible (adapted from the x86_64 test output):
      
        # perf trace -e futex_waitv
        ^C#
        # perf trace -v -e futex_waitv
        event qualifier tracepoint filter: (common_pid != 807333 && common_pid != 3564) && (id == 449)
        ^C#
        # perf trace -v -e futex* --max-events 10
        event qualifier tracepoint filter: (common_pid != 812168 && common_pid != 3564) && (id == 221 || id == 449)
        mmap size 528384B
                 ? (         ): Timer/219310  ... [continued]: futex())                                            = -1 ETIMEDOUT (Connection timed out)
             0.012 ( 0.002 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
             0.024 ( 0.060 ms): Timer/219310 futex(uaddr: 0x7fd0b152d420, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) = 0
             0.086 ( 0.001 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
             0.088 (         ): Timer/219310 futex(uaddr: 0x7fd0b152d424, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) ...
             0.075 ( 0.005 ms): Web Content/219299 futex(uaddr: 0x7fd0b152d420, op: WAKE|PRIVATE_FLAG, val: 1)     = 1
             0.169 ( 0.004 ms): Web Content/219299 futex(uaddr: 0x7fd0b152d424, op: WAKE|PRIVATE_FLAG, val: 1)     = 1
             0.088 ( 0.089 ms): Timer/219310  ... [continued]: futex())                                            = 0
             0.179 ( 0.001 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
             0.181 (         ): Timer/219310 futex(uaddr: 0x7fd0b152d420, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) ...
        #
      
      That is the filter expression attached to the raw_syscalls:sys_{enter,exit}
      tracepoints.
      
        $ grep futex tools/perf/arch/powerpc/entry/syscalls/syscall.tbl
        221	32	futex				sys_futex_time32
        221	64	futex				sys_futex
        221	spu	futex				sys_futex
        422	32	futex_time64			sys_futex			sys_futex
        449	common  futex_waitv                     sys_futex_waitv
        $
      
      This addresses this perf build warnings:
      
        Warning: Kernel ABI header at 'tools/perf/arch/powerpc/entry/syscalls/syscall.tbl' differs from latest version at 'arch/powerpc/kernel/syscalls/syscall.tbl'
        diff -u tools/perf/arch/powerpc/entry/syscalls/syscall.tbl arch/powerpc/kernel/syscalls/syscall.tbl
      Reviewed-by: NAthira Rajeev <atrajeev@linux.vnet.ibm.com>
      Tested-by: NAthira Rajeev <atrajeev@linux.vnet.ibm.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>,
      Cc: André Almeida <andrealmeid@collabora.com>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Link: https://lore.kernel.org/lkml/YZ%2F1OU9mJuyS2HMa@kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      cba43fcf
    • A
      perf inject: Fix itrace space allowed for new attributes · c29d9792
      Adrian Hunter 提交于
      The space allowed for new attributes can be too small if existing header
      information is large. That can happen, for example, if there are very
      many CPUs, due to having an event ID per CPU per event being stored in the
      header information.
      
      Fix by adding the existing header.data_offset. Also increase the extra
      space allowed to 8KiB and align to a 4KiB boundary for neatness.
      Signed-off-by: NAdrian Hunter <adrian.hunter@intel.com>
      Cc: Jiri Olsa <jolsa@redhat.com>
      Link: http://lore.kernel.org/lkml/20211125071457.2066863-1-adrian.hunter@intel.comSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      c29d9792
    • A
      tools headers UAPI: Sync s390 syscall table file changed by new futex_waitv syscall · 71a16df1
      Arnaldo Carvalho de Melo 提交于
      To pick the changes in these csets:
      
        6c122360 ("s390: wire up sys_futex_waitv system call")
      
      That add support for this new syscall in tools such as 'perf trace'.
      
      For instance, this is now possible (adapted from the x86_64 test output):
      
        # perf trace -e futex_waitv
        ^C#
        # perf trace -v -e futex_waitv
        event qualifier tracepoint filter: (common_pid != 807333 && common_pid != 3564) && (id == 449)
        ^C#
        # perf trace -v -e futex* --max-events 10
        event qualifier tracepoint filter: (common_pid != 812168 && common_pid != 3564) && (id == 238 || id == 449)
                 ? (         ): Timer/219310  ... [continued]: futex())                                            = -1 ETIMEDOUT (Connection timed out)
             0.012 ( 0.002 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
             0.024 ( 0.060 ms): Timer/219310 futex(uaddr: 0x7fd0b152d420, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) = 0
             0.086 ( 0.001 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
             0.088 (         ): Timer/219310 futex(uaddr: 0x7fd0b152d424, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) ...
             0.075 ( 0.005 ms): Web Content/219299 futex(uaddr: 0x7fd0b152d420, op: WAKE|PRIVATE_FLAG, val: 1)     = 1
             0.169 ( 0.004 ms): Web Content/219299 futex(uaddr: 0x7fd0b152d424, op: WAKE|PRIVATE_FLAG, val: 1)     = 1
             0.088 ( 0.089 ms): Timer/219310  ... [continued]: futex())                                            = 0
             0.179 ( 0.001 ms): Timer/219310 futex(uaddr: 0x7fd0b152d3c8, op: WAKE|PRIVATE_FLAG, val: 1)           = 0
             0.181 (         ): Timer/219310 futex(uaddr: 0x7fd0b152d420, op: WAIT_BITSET|PRIVATE_FLAG, utime: 0x7fd0b1657840, val3: MATCH_ANY) ...
        #
      
      That is the filter expression attached to the raw_syscalls:sys_{enter,exit}
      tracepoints.
      
        $ grep futex tools/perf/arch/s390/entry/syscalls/syscall.tbl
        238  common	futex			sys_futex			sys_futex_time32
        422	32	futex_time64		-				sys_futex
        449  common	futex_waitv		sys_futex_waitv			sys_futex_waitv
        $
      
      This addresses this perf build warnings:
      
        Warning: Kernel ABI header at 'tools/perf/arch/s390/entry/syscalls/syscall.tbl' differs from latest version at 'arch/s390/kernel/syscalls/syscall.tbl'
        diff -u tools/perf/arch/s390/entry/syscalls/syscall.tbl arch/s390/kernel/syscalls/syscall.tbl
      Acked-by: NHeiko Carstens <hca@linux.ibm.com>
      Cc: Adrian Hunter <adrian.hunter@intel.com>,
      Cc: Jiri Olsa <jolsa@kernel.org>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Vasily Gorbik <gor@linux.ibm.com>
      Link: https://lore.kernel.org/lkml/YZ%2F2qRW%2FTScYTP1U@kernel.orgSigned-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      71a16df1
    • J
      Revert "perf bench: Fix two memory leaks detected with ASan" · 3f8d6577
      Jiri Olsa 提交于
      This: This reverts commit 92723ea0.
      
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRRRRRR FAILED!
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRRRRRR FAILED!
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRRRRR FAILED!
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRRRRRRRRRRR Ok
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRR FAILED!
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRRRR Ok
        # perf test 91
        91: perf stat --bpf-counters test           :RRRRRRRRRRRRRRR Ok
      
      yep, it seems the perf bench is broken so the counts won't correlated if
      I revert this one:
      
        92723ea0 perf bench: Fix two memory leaks detected with ASan
      
      it works for me again.. it seems to break -t option
      
         [root@dell-r440-01 perf]# ./perf bench sched messaging -g 1 -l 100 -t
         # Running 'sched/messaging' benchmark:
         RRRperf: CLIENT: ready write: Bad file descriptor
         Rperf: SENDER: write: Bad file descriptor
      Reported-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Signed-off-by: NJiri Olsa <jolsa@redhat.com>
      Tested-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      Cc: Ian Rogers <irogers@google.com>
      Cc: Namhyung Kim <namhyung@kernel.org>
      Cc: Sohaib Mohamed <sohaib.amhmd@gmail.com>
      Cc: Song Liu <songliubraving@fb.com>
      Link: https://lore.kernel.org/lkml/YZev7KClb%2Fud43Lc@krava/Signed-off-by: NArnaldo Carvalho de Melo <acme@redhat.com>
      3f8d6577
    • S
      Makefile: Do not quote value for CONFIG_CC_IMPLICIT_FALLTHROUGH · cd8c917a
      Salvatore Bonaccorso 提交于
      Andreas reported that a specific build environment for an external
      module, being a bit broken, does pass CC_IMPLICIT_FALLTHROUGH quoted as
      argument to gcc, causing an error
      
        gcc-11: error: "-Wimplicit-fallthrough=5": linker input file not found: No such file or directory
      
      Until this is more generally fixed as outlined in [1], by fixing
      scripts/link-vmlinux.sh, scripts/gen_autoksyms.sh, etc to not directly
      include the include/config/auto.conf, and in a second step, change
      Kconfig to generate the auto.conf without "", workaround the issue by
      explicitly unquoting CC_IMPLICIT_FALLTHROUGH.
      Reported-by: NAndreas Beckmann <anbe@debian.org>
      Link: https://bugs.debian.org/1001083
      Link: https://lore.kernel.org/linux-kbuild/CAK7LNAR-VXwHFEJqCcrFDZj+_4+Xd6oynbj_0eS8N504_ydmyw@mail.gmail.com/ [1]
      Signed-off-by: NSalvatore Bonaccorso <carnil@debian.org>
      Reviewed-by: NKees Cook <keescook@chromium.org>
      Reviewed-by: NGustavo A. R. Silva <gustavoars@kernel.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cd8c917a
    • A
      platform/x86/intel: hid: add quirk to support Surface Go 3 · 7d0c0090
      Alex Hung 提交于
      Similar to other systems Surface Go 3 requires a DMI quirk to enable
      5 button array for power and volume buttons.
      
      Buglink: https://github.com/linux-surface/linux-surface/issues/595
      
      Cc: stable@vger.kernel.org
      Signed-off-by: NAlex Hung <alex.hung@canonical.com>
      Link: https://lore.kernel.org/r/20211203212810.2666508-1-alex.hung@canonical.comSigned-off-by: NHans de Goede <hdegoede@redhat.com>
      7d0c0090
    • L
      Merge tag 'docs-5.16-3' of git://git.lwn.net/linux · f80ef9e4
      Linus Torvalds 提交于
      Pull documentation fixes from Jonathan Corbet:
       "A few important documentation fixes, including breakage that comes
        with v1.0 of the ReadTheDocs theme"
      
      * tag 'docs-5.16-3' of git://git.lwn.net/linux:
        Documentation: Add minimum pahole version
        Documentation/process: fix self reference
        docs: admin-guide/blockdev: Remove digraph of node-states
        docs: conf.py: fix support for Readthedocs v 1.0.0
      f80ef9e4
    • L
      Merge tag 'spi-fix-v5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · 9d6cf472
      Linus Torvalds 提交于
      Pull spi fix from Mark Brown:
       "Just one trivial update adding a device ID to the DT bindings"
      
      * tag 'spi-fix-v5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: spi-rockchip: Add rk3568-spi compatible
      9d6cf472
    • L
      Merge tag 'regulator-fix-v5.16-rc4' of... · b806bec5
      Linus Torvalds 提交于
      Merge tag 'regulator-fix-v5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fix from Mark Brown:
       "Documentation fix for v5.17.
      
        A fix for bitrot in the documentation for protection interrupts that
        crept in as the code was revised during review"
      
      * tag 'regulator-fix-v5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: Update protection IRQ helper docs
      b806bec5
    • L
      Merge tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi · 55a677b2
      Linus Torvalds 提交于
      Pull EFI fix from Ard Biesheuvel:
       "Ensure that the EFI memory map resides in encrypted memory even after
        it has been reallocated"
      
      * tag 'efi-urgent-for-v5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
        x86/sme: Explicitly map new EFI memmap table as encrypted
      55a677b2
  3. 06 12月, 2021 8 次提交
    • L
      Linux 5.16-rc4 · 0fcfb00b
      Linus Torvalds 提交于
      0fcfb00b
    • L
      Merge tag 'for-5.16/parisc-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 268ba095
      Linus Torvalds 提交于
      Pull parisc fixes from Helge Deller:
       "Some bug and warning fixes:
      
         - Fix "make install" to use debians "installkernel" script which is
           now in /usr/sbin
      
         - Fix the bindeb-pkg make target by giving the correct KBUILD_IMAGE
           file name
      
         - Fix compiler warnings by annotating parisc agp init functions with
           __init
      
         - Fix timekeeping on SMP machines with dual-core CPUs
      
         - Enable some more config options in the 64-bit defconfig"
      
      * tag 'for-5.16/parisc-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Mark cr16 CPU clocksource unstable on all SMP machines
        parisc: Fix "make install" on newer debian releases
        parisc/agp: Annotate parisc agp init functions with __init
        parisc: Enable sata sil, audit and usb support on 64-bit defconfig
        parisc: Fix KBUILD_IMAGE for self-extracting kernel
      268ba095
    • L
      Merge tag 'usb-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 94420704
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are some small USB fixes for a few reported issues. Included in
        here are:
      
         - xhci fix for a _much_ reported regression. I don't think there's a
           community distro that has not reported this problem yet :(
      
         - new USB quirk addition
      
         - cdns3 minor fixes
      
         - typec regression fix.
      
        All of these have been in linux-next with no reported problems, and
        the xhci fix has been reported by many to resolve their reported
        problem"
      
      * tag 'usb-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: cdnsp: Fix a NULL pointer dereference in cdnsp_endpoint_init()
        usb: cdns3: gadget: fix new urb never complete if ep cancel previous requests
        usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect
        USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub
        xhci: Fix commad ring abort, write all 64 bits to CRCR register.
      94420704
    • L
      Merge tag 'tty-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 51639539
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg KH:
       "Here are some small TTY and Serial driver fixes for 5.16-rc4 to
        resolve a number of reported problems.
      
        They include:
      
         - liteuart serial driver fixes
      
         - 8250_pci serial driver fixes for pericom devices
      
         - 8250 RTS line control fix while in RS-485 mode
      
         - tegra serial driver fix
      
         - msm_serial driver fix
      
         - pl011 serial driver new id
      
         - fsl_lpuart revert of broken change
      
         - 8250_bcm7271 serial driver fix
      
         - MAINTAINERS file update for rpmsg tty driver that came in 5.16-rc1
      
         - vgacon fix for reported problem
      
        All of these, except for the 8250_bcm7271 fix have been in linux-next
        with no reported problem. The 8250_bcm7271 fix was added to the tree
        on Friday so no chance to be linux-next yet. But it should be fine as
        the affected developers submitted it"
      
      * tag 'tty-5.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: 8250_bcm7271: UART errors after resuming from S2
        serial: 8250_pci: rewrite pericom_do_set_divisor()
        serial: 8250_pci: Fix ACCES entries in pci_serial_quirks array
        serial: 8250: Fix RTS modem control while in rs485 mode
        Revert "tty: serial: fsl_lpuart: drop earlycon entry for i.MX8QXP"
        serial: tegra: Change lower tolerance baud rate limit for tegra20 and tegra30
        serial: liteuart: relax compile-test dependencies
        serial: liteuart: fix minor-number leak on probe errors
        serial: liteuart: fix use-after-free and memleak on unbind
        serial: liteuart: Fix NULL pointer dereference in ->remove()
        vgacon: Propagate console boot parameters before calling `vc_resize'
        tty: serial: msm_serial: Deactivate RX DMA for polling support
        serial: pl011: Add ACPI SBSA UART match id
        serial: core: fix transmit-buffer reset and memleak
        MAINTAINERS: Add rpmsg tty driver maintainer
      51639539
    • L
      Merge tag 'timers_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 7587a4a5
      Linus Torvalds 提交于
      Pull timer fix from Borislav Petkov:
      
       - Prevent a tick storm when a dedicated timekeeper CPU in nohz_full
         mode runs for prolonged periods with interrupts disabled and ends up
         programming the next tick in the past, leading to that storm
      
      * tag 'timers_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        timers/nohz: Last resort update jiffies on nohz_full IRQ entry
      7587a4a5
    • L
      Merge tag 'sched_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1d213767
      Linus Torvalds 提交于
      Pull scheduler fixes from Borislav Petkov:
      
       - Properly init uclamp_flags of a runqueue, on first enqueuing
      
       - Fix preempt= callback return values
      
       - Correct utime/stime resource usage reporting on nohz_full to return
         the proper times instead of shorter ones
      
      * tag 'sched_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/uclamp: Fix rq->uclamp_max not set on first enqueue
        preempt/dynamic: Fix setup_preempt_mode() return value
        sched/cputime: Fix getrusage(RUSAGE_THREAD) with nohz_full
      1d213767
    • L
      Merge tag 'x86_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · f5d54a42
      Linus Torvalds 提交于
      Pull x86 fixes from Borislav Petkov:
      
       - Fix a couple of SWAPGS fencing issues in the x86 entry code
      
       - Use the proper operand types in __{get,put}_user() to prevent
         truncation in SEV-ES string io
      
       - Make sure the kernel mappings are present in trampoline_pgd in order
         to prevent any potential accesses to unmapped memory after switching
         to it
      
       - Fix a trivial list corruption in objtool's pv_ops validation
      
       - Disable the clocksource watchdog for TSC on platforms which claim
         that the TSC is constant, doesn't stop in sleep states, CPU has TSC
         adjust and the number of sockets of the platform are max 2, to
         prevent erroneous markings of the TSC as unstable.
      
       - Make sure TSC adjust is always checked not only when going idle
      
       - Prevent a stack leak by initializing struct _fpx_sw_bytes properly in
         the FPU code
      
       - Fix INTEL_FAM6_RAPTORLAKE define naming to adhere to the convention
      
      * tag 'x86_urgent_for_v5.16_rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/xen: Add xenpv_restore_regs_and_return_to_usermode()
        x86/entry: Use the correct fence macro after swapgs in kernel CR3
        x86/entry: Add a fence for kernel entry SWAPGS in paranoid_entry()
        x86/sev: Fix SEV-ES INS/OUTS instructions for word, dword, and qword
        x86/64/mm: Map all kernel memory into trampoline_pgd
        objtool: Fix pv_ops noinstr validation
        x86/tsc: Disable clocksource watchdog for TSC on qualified platorms
        x86/tsc: Add a timer to make sure TSC_adjust is always checked
        x86/fpu/signal: Initialize sw_bytes in save_xstate_epilog()
        x86/cpu: Drop spurious underscore from RAPTOR_LAKE #define
      f5d54a42
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 90bf8d98
      Linus Torvalds 提交于
      Pull more kvm fixes from Paolo Bonzini:
      
       - Static analysis fix
      
       - New SEV-ES protocol for communicating invalid VMGEXIT requests
      
       - Ensure APICv is considered inactive if there is no APIC
      
       - Fix reserved bits for AMD PerfEvtSeln register
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
        KVM: SVM: Do not terminate SEV-ES guests on GHCB validation failure
        KVM: SEV: Fall back to vmalloc for SEV-ES scratch area if necessary
        KVM: SEV: Return appropriate error codes if SEV-ES scratch setup fails
        KVM: x86/mmu: Retry page fault if root is invalidated by memslot update
        KVM: VMX: Set failure code in prepare_vmcs02()
        KVM: ensure APICv is considered inactive if there is no APIC
        KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register
      90bf8d98
  4. 05 12月, 2021 12 次提交
  5. 04 12月, 2021 1 次提交
    • Q
      sched/uclamp: Fix rq->uclamp_max not set on first enqueue · 315c4f88
      Qais Yousef 提交于
      Commit d81ae8aa ("sched/uclamp: Fix initialization of struct
      uclamp_rq") introduced a bug where uclamp_max of the rq is not reset to
      match the woken up task's uclamp_max when the rq is idle.
      
      The code was relying on rq->uclamp_max initialized to zero, so on first
      enqueue
      
      	static inline void uclamp_rq_inc_id(struct rq *rq, struct task_struct *p,
      					    enum uclamp_id clamp_id)
      	{
      		...
      
      		if (uc_se->value > READ_ONCE(uc_rq->value))
      			WRITE_ONCE(uc_rq->value, uc_se->value);
      	}
      
      was actually resetting it. But since commit d81ae8aa changed the
      default to 1024, this no longer works. And since rq->uclamp_flags is
      also initialized to 0, neither above code path nor uclamp_idle_reset()
      update the rq->uclamp_max on first wake up from idle.
      
      This is only visible from first wake up(s) until the first dequeue to
      idle after enabling the static key. And it only matters if the
      uclamp_max of this task is < 1024 since only then its uclamp_max will be
      effectively ignored.
      
      Fix it by properly initializing rq->uclamp_flags = UCLAMP_FLAG_IDLE to
      ensure uclamp_idle_reset() is called which then will update the rq
      uclamp_max value as expected.
      
      Fixes: d81ae8aa ("sched/uclamp: Fix initialization of struct uclamp_rq")
      Signed-off-by: NQais Yousef <qais.yousef@arm.com>
      Signed-off-by: NPeter Zijlstra (Intel) <peterz@infradead.org>
      Reviewed-by: NValentin Schneider <Valentin.Schneider@arm.com>
      Tested-by: NDietmar Eggemann <dietmar.eggemann@arm.com>
      Link: https://lkml.kernel.org/r/20211202112033.1705279-1-qais.yousef@arm.com
      315c4f88