Commit 4da7e90e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-fixes-for-linus' of... 

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

* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  perf: Fix task_struct reference leak
  perf: Fix task context scheduling
  perf: mmap 512 kiB by default
  perf: Rebase max unprivileged mlock threshold on top of page size
  perf tools: Fix NO_NEWT=1 python build error
  perf symbols: Properly align symbol_conf.priv_size
  perf tools: Emit clearer message for sys_perf_event_open ENOENT return
  perf tools: Fixup exit path when not able to open events
  perf symbols: Fix vsyscall symbol lookup
  oprofile, x86: Allow setting EDGE/INV/CMASK for counter events
parents fb9a7d76 fd1edb3a

arch/x86/oprofile/nmi_int.c

+5 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ u64 op_x86_get_ctrl(struct op_x86_model_spec const *model, 
	val |= counter_config->user ? ARCH_PERFMON_EVENTSEL_USR : 0;

	val |= counter_config->kernel ? ARCH_PERFMON_EVENTSEL_OS : 0;

	val |= (counter_config->unit_mask & 0xFF) << 8;

	counter_config->extra &= (ARCH_PERFMON_EVENTSEL_INV |

				  ARCH_PERFMON_EVENTSEL_EDGE |

				  ARCH_PERFMON_EVENTSEL_CMASK);

	val |= counter_config->extra;

	event &= model->event_mask ? model->event_mask : 0xFF;

	val |= event & 0xFF;

	val |= (event & 0x0F00) << 24;
@@ -440,6 +444,7 @@ static int nmi_create_files(struct super_block *sb, struct dentry *root) 
		oprofilefs_create_ulong(sb, dir, "unit_mask", &counter_config[i].unit_mask);

		oprofilefs_create_ulong(sb, dir, "kernel", &counter_config[i].kernel);

		oprofilefs_create_ulong(sb, dir, "user", &counter_config[i].user);

		oprofilefs_create_ulong(sb, dir, "extra", &counter_config[i].extra);

	}



	return 0;

arch/x86/oprofile/op_counter.h

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ struct op_counter_config { 
	unsigned long kernel;

	unsigned long user;

	unsigned long unit_mask;

	unsigned long extra;

};



extern struct op_counter_config counter_config[];

include/linux/perf_event.h

+1 −1
Original line number Diff line number Diff line
@@ -1086,7 +1086,7 @@ void perf_event_task_sched_out(struct task_struct *task, struct task_struct *nex 
{

	perf_sw_event(PERF_COUNT_SW_CONTEXT_SWITCHES, 1, 1, NULL, 0);



	COND_STMT(&perf_sched_events, __perf_event_task_sched_out(task, next));

	__perf_event_task_sched_out(task, next);

}



extern void perf_event_mmap(struct vm_area_struct *vma);

kernel/perf_event.c

+7 −2
Original line number Diff line number Diff line
@@ -145,8 +145,8 @@ static struct srcu_struct pmus_srcu; 
 */

int sysctl_perf_event_paranoid __read_mostly = 1;



/* Minimum for 128 pages + 1 for the user control page */

int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */

/* Minimum for 512 kiB + 1 user control page */

int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */



/*

 * max perf event sample rate
@@ -6531,6 +6531,11 @@ SYSCALL_DEFINE5(perf_event_open, 
		goto err_alloc;

	}



	if (task) {

		put_task_struct(task);

		task = NULL;

	}



	/*

	 * Look up the group leader (we will attach this event to it):

	 */

tools/perf/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -165,8 +165,12 @@ grep-libs = $(filter -l%,$(1)) 
strip-libs = $(filter-out -l%,$(1))



$(OUTPUT)python/perf.so: $(PYRF_OBJS)

	$(QUIET_GEN)python util/setup.py --quiet  build_ext --build-lib='$(OUTPUT)python' \

						--build-temp='$(OUTPUT)python/temp'

	$(QUIET_GEN)( \

		export CFLAGS="$(BASIC_CFLAGS)"; \

		python util/setup.py --quiet  build_ext --build-lib='$(OUTPUT)python' \

			--build-temp='$(OUTPUT)python/temp' \

	)



#

# No Perl scripts right now:

#

CRA Git | Maintained and supported by SUSTech CRA and CCSE