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

Commit ee438ec8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

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

 into perf/core

Pull perf/core improvemends and fixes for v4.14:

New features:

- Filter out 'sshd' in the tracer ancestry in 'perf trace' syswide tracing,
  to elliminate tracing loops (Arnaldo Carvalho de Melo)

- Support lookup of symbols in other mount namespaces in 'perf top' (Krister Johansen)

- Initial 'clone' syscall args beautifier in 'perf trace' (Arnaldo Carvalho de Melo)

User visible changes:

- Ignore 'fd' and 'offset' args for MAP_ANONYMOUS in 'perf trace'
  (Arnaldo Carvalho de Melo)

- Process tracing data in 'perf annotate' pipe mode (David Carrillo-Cisneros)

- Make 'perf report --branch-history' work without callgraphs(-g) option
  in perf record (Jin Yao)

- Tag branch type/flag on "to" and tag cycles on "from" in 'perf report' (Jin Yao)

Fixes:

- Fix jvmti linker error when libelf config is disabled (Sudeep Holla)

- Fix cgroups refcount usage (Arnaldo Carvalho de Melo)

- Fix kernel symbol adjustment for s390x (Thomas Richter)

- Fix 'perf report --stdio --show-total-period', it was showing the
  number of samples, not the total period (Taeung Song)

Infrastructure changes:

- Add perf_sample dictionary to tracepoint handlers in 'perf script'
  python, which were already present for other types of events
  (hardware, etc) (Arun Kalyanasundaram)

- Make build fail on vendor events JSON parse error (Andi Kleen)

- Adopt strstarts() from the kernel (Arnaldo Carvalho de Melo)

Arch specific changes:

- Set no_aux_samples for the tracking event in Intel PT (Kan Liang)

- Always set no branch for Intel PT dummy event (Kan Liang)

Trivial changes:

- Simplify some error handlers in 'perf script' (Dan Carpenter)

- Add EXCLUDE_EXTLIBS and EXTRA_PERFLIBS to makefile (David Carrillo-Cisneros)

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 510457ec 62e6039f

tools/include/linux/string.h

+10 −2
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_STRING_H_

#define _TOOLS_LINUX_STRING_H_





#include <linux/types.h>	/* for size_t */

#include <string.h>



void *memdup(const void *src, size_t len);
@@ -18,6 +18,14 @@ extern size_t strlcpy(char *dest, const char *src, size_t size); 


char *str_error_r(int errnum, char *buf, size_t buflen);



int prefixcmp(const char *str, const char *prefix);

/**

 * strstarts - does @str start with @prefix?

 * @str: string to examine

 * @prefix: prefix to look for.

 */

static inline bool strstarts(const char *str, const char *prefix)

{

	return strncmp(str, prefix, strlen(prefix)) == 0;

}



#endif /* _LINUX_STRING_H_ */

tools/include/uapi/linux/sched.h

0 → 100644
+52 −0
Original line number Diff line number Diff line 
#ifndef _UAPI_LINUX_SCHED_H

#define _UAPI_LINUX_SCHED_H



/*

 * cloning flags:

 */

#define CSIGNAL		0x000000ff	/* signal mask to be sent at exit */

#define CLONE_VM	0x00000100	/* set if VM shared between processes */

#define CLONE_FS	0x00000200	/* set if fs info shared between processes */

#define CLONE_FILES	0x00000400	/* set if open files shared between processes */

#define CLONE_SIGHAND	0x00000800	/* set if signal handlers and blocked signals shared */

#define CLONE_PTRACE	0x00002000	/* set if we want to let tracing continue on the child too */

#define CLONE_VFORK	0x00004000	/* set if the parent wants the child to wake it up on mm_release */

#define CLONE_PARENT	0x00008000	/* set if we want to have the same parent as the cloner */

#define CLONE_THREAD	0x00010000	/* Same thread group? */

#define CLONE_NEWNS	0x00020000	/* New mount namespace group */

#define CLONE_SYSVSEM	0x00040000	/* share system V SEM_UNDO semantics */

#define CLONE_SETTLS	0x00080000	/* create a new TLS for the child */

#define CLONE_PARENT_SETTID	0x00100000	/* set the TID in the parent */

#define CLONE_CHILD_CLEARTID	0x00200000	/* clear the TID in the child */

#define CLONE_DETACHED		0x00400000	/* Unused, ignored */

#define CLONE_UNTRACED		0x00800000	/* set if the tracing process can't force CLONE_PTRACE on this clone */

#define CLONE_CHILD_SETTID	0x01000000	/* set the TID in the child */

#define CLONE_NEWCGROUP		0x02000000	/* New cgroup namespace */

#define CLONE_NEWUTS		0x04000000	/* New utsname namespace */

#define CLONE_NEWIPC		0x08000000	/* New ipc namespace */

#define CLONE_NEWUSER		0x10000000	/* New user namespace */

#define CLONE_NEWPID		0x20000000	/* New pid namespace */

#define CLONE_NEWNET		0x40000000	/* New network namespace */

#define CLONE_IO		0x80000000	/* Clone io context */



/*

 * Scheduling policies

 */

#define SCHED_NORMAL		0

#define SCHED_FIFO		1

#define SCHED_RR		2

#define SCHED_BATCH		3

/* SCHED_ISO: reserved but not implemented yet */

#define SCHED_IDLE		5

#define SCHED_DEADLINE		6



/* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */

#define SCHED_RESET_ON_FORK     0x40000000



/*

 * For the sched_{set,get}attr() calls

 */

#define SCHED_FLAG_RESET_ON_FORK	0x01

#define SCHED_FLAG_RECLAIM		0x02



#endif /* _UAPI_LINUX_SCHED_H */

tools/lib/string.c

+25 −16
Original line number Diff line number Diff line
@@ -39,27 +39,45 @@ void *memdup(const void *src, size_t len) 
 * @s: input string

 * @res: result

 *

 * This routine returns 0 iff the first character is one of 'Yy1Nn0'.

 * Otherwise it will return -EINVAL.  Value pointed to by res is

 * updated upon finding a match.

 * This routine returns 0 iff the first character is one of 'Yy1Nn0', or

 * [oO][NnFf] for "on" and "off". Otherwise it will return -EINVAL.  Value

 * pointed to by res is updated upon finding a match.

 */

int strtobool(const char *s, bool *res)

{

	if (!s)

		return -EINVAL;



	switch (s[0]) {

	case 'y':

	case 'Y':

	case '1':

		*res = true;

		break;

		return 0;

	case 'n':

	case 'N':

	case '0':

		*res = false;

		return 0;

	case 'o':

	case 'O':

		switch (s[1]) {

		case 'n':

		case 'N':

			*res = true;

			return 0;

		case 'f':

		case 'F':

			*res = false;

			return 0;

		default:

			break;

		}

	default:

		return -EINVAL;

		break;

	}

	return 0;



	return -EINVAL;

}



/**
@@ -87,12 +105,3 @@ size_t __weak strlcpy(char *dest, const char *src, size_t size) 
	}

	return ret;

}
 


int prefixcmp(const char *str, const char *prefix)

{

	for (; ; str++, prefix++)

		if (!*prefix)

			return 0;

		else if (*str != *prefix)

			return (unsigned char)*prefix - (unsigned char)*str;

}

tools/lib/subcmd/help.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static void list_commands_in_dir(struct cmdnames *cmds, 
	while ((de = readdir(dir)) != NULL) {

		int entlen;



		if (prefixcmp(de->d_name, prefix))

		if (!strstarts(de->d_name, prefix))

			continue;



		astrcat(&buf, de->d_name);

tools/lib/subcmd/parse-options.c

+9 −9
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, 
			return 0;

		}

		if (!rest) {

			if (!prefixcmp(options->long_name, "no-")) {

			if (strstarts(options->long_name, "no-")) {

				/*

				 * The long name itself starts with "no-", so

				 * accept the option without "no-" so that users
@@ -381,7 +381,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, 
					goto match;

				}

				/* Abbreviated case */

				if (!prefixcmp(options->long_name + 3, arg)) {

				if (strstarts(options->long_name + 3, arg)) {

					flags |= OPT_UNSET;

					goto is_abbreviated;

				}
@@ -406,7 +406,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, 
				continue;

			}

			/* negated and abbreviated very much? */

			if (!prefixcmp("no-", arg)) {

			if (strstarts("no-", arg)) {

				flags |= OPT_UNSET;

				goto is_abbreviated;

			}
@@ -416,7 +416,7 @@ static int parse_long_opt(struct parse_opt_ctx_t *p, const char *arg, 
			flags |= OPT_UNSET;

			rest = skip_prefix(arg + 3, options->long_name);

			/* abbreviated and negated? */

			if (!rest && !prefixcmp(options->long_name, arg + 3))

			if (!rest && strstarts(options->long_name, arg + 3))

				goto is_abbreviated;

			if (!rest)

				continue;
@@ -456,7 +456,7 @@ static void check_typos(const char *arg, const struct option *options) 
	if (strlen(arg) < 3)

		return;



	if (!prefixcmp(arg, "no-")) {

	if (strstarts(arg, "no-")) {

		fprintf(stderr, " Error: did you mean `--%s` (with two dashes ?)", arg);

		exit(129);

	}
@@ -464,7 +464,7 @@ static void check_typos(const char *arg, const struct option *options) 
	for (; options->type != OPTION_END; options++) {

		if (!options->long_name)

			continue;

		if (!prefixcmp(options->long_name, arg)) {

		if (strstarts(options->long_name, arg)) {

			fprintf(stderr, " Error: did you mean `--%s` (with two dashes ?)", arg);

			exit(129);

		}
@@ -933,10 +933,10 @@ int parse_options_usage(const char * const *usagestr, 
		if (opts->long_name == NULL)

			continue;



		if (!prefixcmp(opts->long_name, optstr))

		if (strstarts(opts->long_name, optstr))

			print_option_help(opts, 0);

		if (!prefixcmp("no-", optstr) &&

		    !prefixcmp(opts->long_name, optstr + 3))

		if (strstarts("no-", optstr) &&

		    strstarts(opts->long_name, optstr + 3))

			print_option_help(opts, 0);

	}