Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3617660e authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo' of... 

Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf

 into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

  * Wire up perf_regs and unwind support for ARM64 (Jean Pihet)

  * Move u64_swap union to its single user's header, evsel.h (Borislav Petkov)

  * Fix for s390 to properly parse tracepoints plus test code (Alexander Yarygin)

  * Handle EINTR error for readn/writen (Namhyung Kim)

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents aeffe2ab 8ab596af

tools/perf/arch/arm64/Makefile

0 → 100644
+7 −0
Original line number Original line Diff line number Diff line 
ifndef NO_DWARF

PERF_HAVE_DWARF_REGS := 1

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/dwarf-regs.o

endif

ifndef NO_LIBUNWIND

LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/unwind-libunwind.o

endif

tools/perf/arch/arm64/include/perf_regs.h

0 → 100644
+88 −0
Original line number Original line Diff line number Diff line 
#ifndef ARCH_PERF_REGS_H

#define ARCH_PERF_REGS_H



#include <stdlib.h>

#include "../../util/types.h"

#include <asm/perf_regs.h>



#define PERF_REGS_MASK	((1ULL << PERF_REG_ARM64_MAX) - 1)

#define PERF_REG_IP	PERF_REG_ARM64_PC

#define PERF_REG_SP	PERF_REG_ARM64_SP



static inline const char *perf_reg_name(int id)

{

	switch (id) {

	case PERF_REG_ARM64_X0:

		return "x0";

	case PERF_REG_ARM64_X1:

		return "x1";

	case PERF_REG_ARM64_X2:

		return "x2";

	case PERF_REG_ARM64_X3:

		return "x3";

	case PERF_REG_ARM64_X4:

		return "x4";

	case PERF_REG_ARM64_X5:

		return "x5";

	case PERF_REG_ARM64_X6:

		return "x6";

	case PERF_REG_ARM64_X7:

		return "x7";

	case PERF_REG_ARM64_X8:

		return "x8";

	case PERF_REG_ARM64_X9:

		return "x9";

	case PERF_REG_ARM64_X10:

		return "x10";

	case PERF_REG_ARM64_X11:

		return "x11";

	case PERF_REG_ARM64_X12:

		return "x12";

	case PERF_REG_ARM64_X13:

		return "x13";

	case PERF_REG_ARM64_X14:

		return "x14";

	case PERF_REG_ARM64_X15:

		return "x15";

	case PERF_REG_ARM64_X16:

		return "x16";

	case PERF_REG_ARM64_X17:

		return "x17";

	case PERF_REG_ARM64_X18:

		return "x18";

	case PERF_REG_ARM64_X19:

		return "x19";

	case PERF_REG_ARM64_X20:

		return "x20";

	case PERF_REG_ARM64_X21:

		return "x21";

	case PERF_REG_ARM64_X22:

		return "x22";

	case PERF_REG_ARM64_X23:

		return "x23";

	case PERF_REG_ARM64_X24:

		return "x24";

	case PERF_REG_ARM64_X25:

		return "x25";

	case PERF_REG_ARM64_X26:

		return "x26";

	case PERF_REG_ARM64_X27:

		return "x27";

	case PERF_REG_ARM64_X28:

		return "x28";

	case PERF_REG_ARM64_X29:

		return "x29";

	case PERF_REG_ARM64_SP:

		return "sp";

	case PERF_REG_ARM64_LR:

		return "lr";

	case PERF_REG_ARM64_PC:

		return "pc";

	default:

		return NULL;

	}



	return NULL;

}



#endif /* ARCH_PERF_REGS_H */

tools/perf/arch/arm64/util/dwarf-regs.c

0 → 100644
+80 −0
Original line number Original line Diff line number Diff line 
/*

 * Mapping of DWARF debug register numbers into register names.

 *

 * Copyright (C) 2010 Will Deacon, ARM Ltd.

 *

 * 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.

 */



#include <stddef.h>

#include <dwarf-regs.h>



struct pt_regs_dwarfnum {

	const char *name;

	unsigned int dwarfnum;

};



#define STR(s) #s

#define REG_DWARFNUM_NAME(r, num) {.name = r, .dwarfnum = num}

#define GPR_DWARFNUM_NAME(num) \

	{.name = STR(%x##num), .dwarfnum = num}

#define REG_DWARFNUM_END {.name = NULL, .dwarfnum = 0}



/*

 * Reference:

 * http://infocenter.arm.com/help/topic/com.arm.doc.ihi0057b/IHI0057B_aadwarf64.pdf

 */

static const struct pt_regs_dwarfnum regdwarfnum_table[] = {

	GPR_DWARFNUM_NAME(0),

	GPR_DWARFNUM_NAME(1),

	GPR_DWARFNUM_NAME(2),

	GPR_DWARFNUM_NAME(3),

	GPR_DWARFNUM_NAME(4),

	GPR_DWARFNUM_NAME(5),

	GPR_DWARFNUM_NAME(6),

	GPR_DWARFNUM_NAME(7),

	GPR_DWARFNUM_NAME(8),

	GPR_DWARFNUM_NAME(9),

	GPR_DWARFNUM_NAME(10),

	GPR_DWARFNUM_NAME(11),

	GPR_DWARFNUM_NAME(12),

	GPR_DWARFNUM_NAME(13),

	GPR_DWARFNUM_NAME(14),

	GPR_DWARFNUM_NAME(15),

	GPR_DWARFNUM_NAME(16),

	GPR_DWARFNUM_NAME(17),

	GPR_DWARFNUM_NAME(18),

	GPR_DWARFNUM_NAME(19),

	GPR_DWARFNUM_NAME(20),

	GPR_DWARFNUM_NAME(21),

	GPR_DWARFNUM_NAME(22),

	GPR_DWARFNUM_NAME(23),

	GPR_DWARFNUM_NAME(24),

	GPR_DWARFNUM_NAME(25),

	GPR_DWARFNUM_NAME(26),

	GPR_DWARFNUM_NAME(27),

	GPR_DWARFNUM_NAME(28),

	GPR_DWARFNUM_NAME(29),

	REG_DWARFNUM_NAME("%lr", 30),

	REG_DWARFNUM_NAME("%sp", 31),

	REG_DWARFNUM_END,

};



/**

 * get_arch_regstr() - lookup register name from it's DWARF register number

 * @n:	the DWARF register number

 *

 * get_arch_regstr() returns the name of the register in struct

 * regdwarfnum_table from it's DWARF register number. If the register is not

 * found in the table, this returns NULL;

 */

const char *get_arch_regstr(unsigned int n)

{

	const struct pt_regs_dwarfnum *roff;

	for (roff = regdwarfnum_table; roff->name != NULL; roff++)

		if (roff->dwarfnum == n)

			return roff->name;

	return NULL;

}

tools/perf/arch/arm64/util/unwind-libunwind.c

0 → 100644
+82 −0
Original line number Original line Diff line number Diff line 


#include <errno.h>

#include <libunwind.h>

#include "perf_regs.h"

#include "../../util/unwind.h"



int libunwind__arch_reg_id(int regnum)

{

	switch (regnum) {

	case UNW_AARCH64_X0:

		return PERF_REG_ARM64_X0;

	case UNW_AARCH64_X1:

		return PERF_REG_ARM64_X1;

	case UNW_AARCH64_X2:

		return PERF_REG_ARM64_X2;

	case UNW_AARCH64_X3:

		return PERF_REG_ARM64_X3;

	case UNW_AARCH64_X4:

		return PERF_REG_ARM64_X4;

	case UNW_AARCH64_X5:

		return PERF_REG_ARM64_X5;

	case UNW_AARCH64_X6:

		return PERF_REG_ARM64_X6;

	case UNW_AARCH64_X7:

		return PERF_REG_ARM64_X7;

	case UNW_AARCH64_X8:

		return PERF_REG_ARM64_X8;

	case UNW_AARCH64_X9:

		return PERF_REG_ARM64_X9;

	case UNW_AARCH64_X10:

		return PERF_REG_ARM64_X10;

	case UNW_AARCH64_X11:

		return PERF_REG_ARM64_X11;

	case UNW_AARCH64_X12:

		return PERF_REG_ARM64_X12;

	case UNW_AARCH64_X13:

		return PERF_REG_ARM64_X13;

	case UNW_AARCH64_X14:

		return PERF_REG_ARM64_X14;

	case UNW_AARCH64_X15:

		return PERF_REG_ARM64_X15;

	case UNW_AARCH64_X16:

		return PERF_REG_ARM64_X16;

	case UNW_AARCH64_X17:

		return PERF_REG_ARM64_X17;

	case UNW_AARCH64_X18:

		return PERF_REG_ARM64_X18;

	case UNW_AARCH64_X19:

		return PERF_REG_ARM64_X19;

	case UNW_AARCH64_X20:

		return PERF_REG_ARM64_X20;

	case UNW_AARCH64_X21:

		return PERF_REG_ARM64_X21;

	case UNW_AARCH64_X22:

		return PERF_REG_ARM64_X22;

	case UNW_AARCH64_X23:

		return PERF_REG_ARM64_X23;

	case UNW_AARCH64_X24:

		return PERF_REG_ARM64_X24;

	case UNW_AARCH64_X25:

		return PERF_REG_ARM64_X25;

	case UNW_AARCH64_X26:

		return PERF_REG_ARM64_X26;

	case UNW_AARCH64_X27:

		return PERF_REG_ARM64_X27;

	case UNW_AARCH64_X28:

		return PERF_REG_ARM64_X28;

	case UNW_AARCH64_X29:

		return PERF_REG_ARM64_X29;

	case UNW_AARCH64_X30:

		return PERF_REG_ARM64_LR;

	case UNW_AARCH64_SP:

		return PERF_REG_ARM64_SP;

	case UNW_AARCH64_PC:

		return PERF_REG_ARM64_PC;

	default:

		pr_err("unwind: invalid reg id %d\n", regnum);

		return -EINVAL;

	}



	return -EINVAL;

}

tools/perf/config/Makefile

+7 −1
Original line number Original line Diff line number Diff line
@@ -29,11 +29,17 @@ ifeq ($(ARCH),x86) 
  endif

  endif

  NO_PERF_REGS := 0

  NO_PERF_REGS := 0

endif

endif



ifeq ($(ARCH),arm)

ifeq ($(ARCH),arm)

  NO_PERF_REGS := 0

  NO_PERF_REGS := 0

  LIBUNWIND_LIBS = -lunwind -lunwind-arm

  LIBUNWIND_LIBS = -lunwind -lunwind-arm

endif

endif





ifeq ($(ARCH),arm64)

  NO_PERF_REGS := 0

  LIBUNWIND_LIBS = -lunwind -lunwind-aarch64

endif



# So far there's only x86 libdw unwind support merged in perf.

# So far there's only x86 libdw unwind support merged in perf.

# Disable it on all other architectures in case libdw unwind

# Disable it on all other architectures in case libdw unwind

# support is detected in system. Add supported architectures

# support is detected in system. Add supported architectures
@@ -370,7 +376,7 @@ else 
endif

endif





ifndef NO_LIBUNWIND

ifndef NO_LIBUNWIND

  ifeq ($(ARCH),arm)

  ifeq ($(ARCH),$(filter $(ARCH),arm arm64))

    $(call feature_check,libunwind-debug-frame)

    $(call feature_check,libunwind-debug-frame)

    ifneq ($(feature-libunwind-debug-frame), 1)

    ifneq ($(feature-libunwind-debug-frame), 1)

      msg := $(warning No debug_frame support found in libunwind);

      msg := $(warning No debug_frame support found in libunwind);