Commit 88a57667 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes and cleanups from Ingo Molnar:
 "A kernel fix plus mostly tooling fixes, but also some tooling
  restructuring and cleanups"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (39 commits)
  perf: Fix building warning on ARM 32
  perf symbols: Fix use after free in filename__read_build_id
  perf evlist: Use roundup_pow_of_two
  tools: Adopt roundup_pow_of_two
  perf tools: Make the mmap length autotuning more robust
  tools: Adopt rounddown_pow_of_two and deps
  tools: Adopt fls_long and deps
  tools: Move bitops.h from tools/perf/util to tools/
  tools: Introduce asm-generic/bitops.h
  tools lib: Move asm-generic/bitops/find.h code to tools/include and tools/lib
  tools: Whitespace prep patches for moving bitops.h
  tools: Move code originally from asm-generic/atomic.h into tools/include/asm-generic/
  tools: Move code originally from linux/log2.h to tools/include/linux/
  tools: Move __ffs implementation to tools/include/asm-generic/bitops/__ffs.h
  perf evlist: Do not use hard coded value for a mmap_pages default
  perf trace: Let the perf_evlist__mmap autosize the number of pages to use
  perf evlist: Improve the strerror_mmap method
  perf evlist: Clarify sterror_mmap variable names
  perf evlist: Fixup brown paper bag on "hint" for --mmap-pages cmdline arg
  perf trace: Provide a better explanation when mmap fails
  ...
parents 34b85e35 ac931f87

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+19 −3
Original line number Diff line number Diff line
@@ -276,6 +276,17 @@ static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, 
	return box;

}



/*

 * Using uncore_pmu_event_init pmu event_init callback

 * as a detection point for uncore events.

 */

static int uncore_pmu_event_init(struct perf_event *event);



static bool is_uncore_event(struct perf_event *event)

{

	return event->pmu->event_init == uncore_pmu_event_init;

}



static int

uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader, bool dogrp)

{
@@ -290,13 +301,18 @@ uncore_collect_events(struct intel_uncore_box *box, struct perf_event *leader, b 
		return -EINVAL;



	n = box->n_events;



	if (is_uncore_event(leader)) {

		box->event_list[n] = leader;

		n++;

	}



	if (!dogrp)

		return n;



	list_for_each_entry(event, &leader->sibling_list, group_entry) {

		if (event->state <= PERF_EVENT_STATE_OFF)

		if (!is_uncore_event(event) ||

		    event->state <= PERF_EVENT_STATE_OFF)

			continue;



		if (n >= max_count)

kernel/events/core.c

+2 −2
Original line number Diff line number Diff line
@@ -7477,11 +7477,11 @@ SYSCALL_DEFINE5(perf_event_open, 


	if (move_group) {

		synchronize_rcu();

		perf_install_in_context(ctx, group_leader, event->cpu);

		perf_install_in_context(ctx, group_leader, group_leader->cpu);

		get_ctx(ctx);

		list_for_each_entry(sibling, &group_leader->sibling_list,

				    group_entry) {

			perf_install_in_context(ctx, sibling, event->cpu);

			perf_install_in_context(ctx, sibling, sibling->cpu);

			get_ctx(ctx);

		}

	}

scripts/kconfig/mconf.c

+2 −2
Original line number Diff line number Diff line
@@ -330,10 +330,10 @@ static void set_subtitle(void) 
	list_for_each_entry(sp, &trail, entries) {

		if (sp->text) {

			if (pos) {

				pos->next = xcalloc(sizeof(*pos), 1);

				pos->next = xcalloc(1, sizeof(*pos));

				pos = pos->next;

			} else {

				subtitles = pos = xcalloc(sizeof(*pos), 1);

				subtitles = pos = xcalloc(1, sizeof(*pos));

			}

			pos->text = sp->text;

		}

tools/include/asm-generic/bitops.h

0 → 100644
+27 −0
Original line number Diff line number Diff line 
#ifndef __TOOLS_ASM_GENERIC_BITOPS_H

#define __TOOLS_ASM_GENERIC_BITOPS_H



/*

 * tools/ copied this from include/asm-generic/bitops.h, bit by bit as it needed

 * some functions.

 *

 * For the benefit of those who are trying to port Linux to another

 * architecture, here are some C-language equivalents.  You should

 * recode these in the native assembly language, if at all possible.

 *

 * C language equivalents written by Theodore Ts'o, 9/26/92

 */



#include <asm-generic/bitops/__ffs.h>

#include <asm-generic/bitops/fls.h>

#include <asm-generic/bitops/__fls.h>

#include <asm-generic/bitops/fls64.h>

#include <asm-generic/bitops/find.h>



#ifndef _TOOLS_LINUX_BITOPS_H_

#error only <linux/bitops.h> can be included directly

#endif



#include <asm-generic/bitops/atomic.h>



#endif /* __TOOLS_ASM_GENERIC_BITOPS_H */

tools/include/asm-generic/bitops/__ffs.h

0 → 100644
+43 −0
Original line number Diff line number Diff line 
#ifndef _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_

#define _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_



#include <asm/types.h>



/**

 * __ffs - find first bit in word.

 * @word: The word to search

 *

 * Undefined if no bit exists, so code should check against 0 first.

 */

static __always_inline unsigned long __ffs(unsigned long word)

{

	int num = 0;



#if __BITS_PER_LONG == 64

	if ((word & 0xffffffff) == 0) {

		num += 32;

		word >>= 32;

	}

#endif

	if ((word & 0xffff) == 0) {

		num += 16;

		word >>= 16;

	}

	if ((word & 0xff) == 0) {

		num += 8;

		word >>= 8;

	}

	if ((word & 0xf) == 0) {

		num += 4;

		word >>= 4;

	}

	if ((word & 0x3) == 0) {

		num += 2;

		word >>= 2;

	}

	if ((word & 0x1) == 0)

		num += 1;

	return num;

}



#endif /* _TOOLS_LINUX_ASM_GENERIC_BITOPS___FFS_H_ */

CRA Git | Maintained and supported by SUSTech CRA and CCSE