Commit 221856b1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo-5.1-20190502' of... 

Merge tag 'perf-urgent-for-mingo-5.1-20190502' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

tools UAPI:

  Arnaldo Carvalho de Melo:

  - Sync x86's vmx.h with the kernel.

  - Copy missing unistd.h headers for arc, hexagon and riscv, fixing
    a reported build regression on the ARC 32-bit architecture.

perf bench numa:

  Arnaldo Carvalho de Melo:

  - Add define for RUSAGE_THREAD if not present, fixing the build on the
    ARC architecture when only zlib and libnuma are present.

perf BPF:

  Arnaldo Carvalho de Melo:

  - The disassembler-four-args feature test needs -ldl on distros such as
    Mageia 7.

  Bo YU:

  - Fix unlocking on success in perf_env__find_btf(), detected with
    the coverity tool.

libtraceevent:

  Leo Yan:

  - Change misleading hard coded 'trace-cmd' string in error messages.

ARM hardware tracing:

  Leo Yan:

  - Always allocate memory for cs_etm_queue::prev_packet, fixing a segfault
    when processing CoreSight perf data.

perf annotate:

  Thadeu Lima de Souza Cascardo:

  - Fix build on 32 bit for BPF.

perf report:

  Thomas Richter:

  - Report OOM in status line in the GTK UI.

core libs:

  - Remove needless asm/unistd.h that, used with sys/syscall.h ended
    up redefining the syscalls defines in environments such as the
    ARC arch when using uClibc.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 1804569d 7e221b81

tools/arch/arc/include/uapi/asm/unistd.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com)

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



/******** no-legacy-syscalls-ABI *******/



/*

 * Non-typical guard macro to enable inclusion twice in ARCH sys.c

 * That is how the Generic syscall wrapper generator works

 */

#if !defined(_UAPI_ASM_ARC_UNISTD_H) || defined(__SYSCALL)

#define _UAPI_ASM_ARC_UNISTD_H



#define __ARCH_WANT_RENAMEAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS



#define sys_mmap2 sys_mmap_pgoff



#include <asm-generic/unistd.h>



#define NR_syscalls	__NR_syscalls



/* Generic syscall (fs/filesystems.c - lost in asm-generic/unistd.h */

#define __NR_sysfs		(__NR_arch_specific_syscall + 3)



/* ARC specific syscall */

#define __NR_cacheflush		(__NR_arch_specific_syscall + 0)

#define __NR_arc_settls		(__NR_arch_specific_syscall + 1)

#define __NR_arc_gettls		(__NR_arch_specific_syscall + 2)

#define __NR_arc_usr_cmpxchg	(__NR_arch_specific_syscall + 4)



__SYSCALL(__NR_cacheflush, sys_cacheflush)

__SYSCALL(__NR_arc_settls, sys_arc_settls)

__SYSCALL(__NR_arc_gettls, sys_arc_gettls)

__SYSCALL(__NR_arc_usr_cmpxchg, sys_arc_usr_cmpxchg)

__SYSCALL(__NR_sysfs, sys_sysfs)



#undef __SYSCALL



#endif

tools/arch/hexagon/include/uapi/asm/unistd.h

0 → 100644
+40 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Syscall support for Hexagon

 *

 * Copyright (c) 2010-2011, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA.

 */



/*

 *  The kernel pulls this unistd.h in three different ways:

 *  1.  the "normal" way which gets all the __NR defines

 *  2.  with __SYSCALL defined to produce function declarations

 *  3.  with __SYSCALL defined to produce syscall table initialization

 *  See also:  syscalltab.c

 */



#define sys_mmap2 sys_mmap_pgoff

#define __ARCH_WANT_RENAMEAT

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_SET_GET_RLIMIT

#define __ARCH_WANT_SYS_EXECVE

#define __ARCH_WANT_SYS_CLONE

#define __ARCH_WANT_SYS_VFORK

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_TIME32_SYSCALLS



#include <asm-generic/unistd.h>

tools/arch/riscv/include/uapi/asm/unistd.h

0 → 100644
+42 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */

/*

 * Copyright (C) 2018 David Abdurachmanov <david.abdurachmanov@gmail.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifdef __LP64__

#define __ARCH_WANT_NEW_STAT

#define __ARCH_WANT_SET_GET_RLIMIT

#endif /* __LP64__ */



#include <asm-generic/unistd.h>



/*

 * Allows the instruction cache to be flushed from userspace.  Despite RISC-V

 * having a direct 'fence.i' instruction available to userspace (which we

 * can't trap!), that's not actually viable when running on Linux because the

 * kernel might schedule a process on another hart.  There is no way for

 * userspace to handle this without invoking the kernel (as it doesn't know the

 * thread->hart mappings), so we've defined a RISC-V specific system call to

 * flush the instruction cache.

 *

 * __NR_riscv_flush_icache is defined to flush the instruction cache over an

 * address range, with the flush applying to either all threads or just the

 * caller.  We don't currently do anything with the address range, that's just

 * in there for forwards compatibility.

 */

#ifndef __NR_riscv_flush_icache

#define __NR_riscv_flush_icache (__NR_arch_specific_syscall + 15)

#endif

__SYSCALL(__NR_riscv_flush_icache, sys_riscv_flush_icache)

tools/arch/x86/include/uapi/asm/vmx.h

+1 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ 


#define VMX_ABORT_SAVE_GUEST_MSR_FAIL        1

#define VMX_ABORT_LOAD_HOST_PDPTE_FAIL       2

#define VMX_ABORT_VMCS_CORRUPTED             3

#define VMX_ABORT_LOAD_HOST_MSR_FAIL         4



#endif /* _UAPIVMX_H */

tools/lib/traceevent/parse-utils.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
void __vwarning(const char *fmt, va_list ap)

{

	if (errno)

		perror("trace-cmd");

		perror("libtraceevent");

	errno = 0;



	fprintf(stderr, "  ");

CRA Git | Maintained and supported by SUSTech CRA and CCSE