Commit 0dcb7b6f 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 from Ingo Molnar:
 "Mostly tooling fixes, but also start/stop filter related fixes, a perf
  event read() fix, a fix uncovered by fuzzing, and an uprobes leak fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/core: Check return value of the perf_event_read() IPI
  perf/core: Enable mapping of the stop filters
  perf/core: Update filters only on executable mmap
  perf/core: Fix file name handling for start/stop filters
  perf/core: Fix event_function_local()
  uprobes: Fix the memcg accounting
  perf intel-pt: Fix occasional decoding errors when tracing system-wide
  tools: Sync kvm related header files for arm64 and s390
  perf probe: Release resources on error when handling exit paths
  perf probe: Check for dup and fdopen failures
  perf symbols: Fix annotation of objects with debuginfo files
  perf script: Don't disable use_callchain if input is pipe
  perf script: Show proper message when failed list scripts
  perf jitdump: Add the right header to get the major()/minor() definitions
  perf ppc64le: Fix build failure when libelf is not present
  perf tools mem: Fix -t store option for record command
  perf intel-pt: Fix ip compression
parents bd3fd451 71e7bc2b

kernel/events/core.c

+68 −27
Original line number Diff line number Diff line
@@ -242,18 +242,6 @@ unlock: 
	return ret;

}



static void event_function_local(struct perf_event *event, event_f func, void *data)

{

	struct event_function_struct efs = {

		.event = event,

		.func = func,

		.data = data,

	};



	int ret = event_function(&efs);

	WARN_ON_ONCE(ret);

}



static void event_function_call(struct perf_event *event, event_f func, void *data)

{

	struct perf_event_context *ctx = event->ctx;
@@ -303,6 +291,54 @@ again: 
	raw_spin_unlock_irq(&ctx->lock);

}



/*

 * Similar to event_function_call() + event_function(), but hard assumes IRQs

 * are already disabled and we're on the right CPU.

 */

static void event_function_local(struct perf_event *event, event_f func, void *data)

{

	struct perf_event_context *ctx = event->ctx;

	struct perf_cpu_context *cpuctx = __get_cpu_context(ctx);

	struct task_struct *task = READ_ONCE(ctx->task);

	struct perf_event_context *task_ctx = NULL;



	WARN_ON_ONCE(!irqs_disabled());



	if (task) {

		if (task == TASK_TOMBSTONE)

			return;



		task_ctx = ctx;

	}



	perf_ctx_lock(cpuctx, task_ctx);



	task = ctx->task;

	if (task == TASK_TOMBSTONE)

		goto unlock;



	if (task) {

		/*

		 * We must be either inactive or active and the right task,

		 * otherwise we're screwed, since we cannot IPI to somewhere

		 * else.

		 */

		if (ctx->is_active) {

			if (WARN_ON_ONCE(task != current))

				goto unlock;



			if (WARN_ON_ONCE(cpuctx->task_ctx != ctx))

				goto unlock;

		}

	} else {

		WARN_ON_ONCE(&cpuctx->ctx != ctx);

	}



	func(event, cpuctx, ctx, data);

unlock:

	perf_ctx_unlock(cpuctx, task_ctx);

}



#define PERF_FLAG_ALL (PERF_FLAG_FD_NO_GROUP |\

		       PERF_FLAG_FD_OUTPUT  |\

		       PERF_FLAG_PID_CGROUP |\
@@ -3513,9 +3549,10 @@ static int perf_event_read(struct perf_event *event, bool group) 
			.group = group,

			.ret = 0,

		};

		smp_call_function_single(event->oncpu,

					 __perf_event_read, &data, 1);

		ret = data.ret;

		ret = smp_call_function_single(event->oncpu, __perf_event_read, &data, 1);

		/* The event must have been read from an online CPU: */

		WARN_ON_ONCE(ret);

		ret = ret ? : data.ret;

	} else if (event->state == PERF_EVENT_STATE_INACTIVE) {

		struct perf_event_context *ctx = event->ctx;

		unsigned long flags;
@@ -6583,15 +6620,6 @@ got_name: 
	kfree(buf);

}



/*

 * Whether this @filter depends on a dynamic object which is not loaded

 * yet or its load addresses are not known.

 */

static bool perf_addr_filter_needs_mmap(struct perf_addr_filter *filter)

{

	return filter->filter && filter->inode;

}



/*

 * Check whether inode and address range match filter criteria.

 */
@@ -6653,6 +6681,13 @@ static void perf_addr_filters_adjust(struct vm_area_struct *vma) 
	struct perf_event_context *ctx;

	int ctxn;



	/*

	 * Data tracing isn't supported yet and as such there is no need

	 * to keep track of anything that isn't related to executable code:

	 */

	if (!(vma->vm_flags & VM_EXEC))

		return;



	rcu_read_lock();

	for_each_task_context_nr(ctxn) {

		ctx = rcu_dereference(current->perf_event_ctxp[ctxn]);
@@ -7805,7 +7840,11 @@ static void perf_event_addr_filters_apply(struct perf_event *event) 
	list_for_each_entry(filter, &ifh->list, entry) {

		event->addr_filters_offs[count] = 0;



		if (perf_addr_filter_needs_mmap(filter))

		/*

		 * Adjust base offset if the filter is associated to a binary

		 * that needs to be mapped:

		 */

		if (filter->inode)

			event->addr_filters_offs[count] =

				perf_addr_filter_apply(filter, mm);
@@ -7936,8 +7975,10 @@ perf_event_parse_addr_filter(struct perf_event *event, char *fstr, 
					goto fail;

			}



			if (token == IF_SRC_FILE) {

				filename = match_strdup(&args[2]);

			if (token == IF_SRC_FILE || token == IF_SRC_FILEADDR) {

				int fpos = filter->range ? 2 : 1;



				filename = match_strdup(&args[fpos]);

				if (!filename) {

					ret = -ENOMEM;

					goto fail;

kernel/events/uprobes.c

+3 −2
Original line number Diff line number Diff line
@@ -172,8 +172,10 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 
	mmu_notifier_invalidate_range_start(mm, mmun_start, mmun_end);

	err = -EAGAIN;

	ptep = page_check_address(page, mm, addr, &ptl, 0);

	if (!ptep)

	if (!ptep) {

		mem_cgroup_cancel_charge(kpage, memcg, false);

		goto unlock;

	}



	get_page(kpage);

	page_add_new_anon_rmap(kpage, vma, addr, false);
@@ -200,7 +202,6 @@ static int __replace_page(struct vm_area_struct *vma, unsigned long addr, 


	err = 0;

 unlock:

	mem_cgroup_cancel_charge(kpage, memcg, false);

	mmu_notifier_invalidate_range_end(mm, mmun_start, mmun_end);

	unlock_page(page);

	return err;

tools/arch/arm64/include/uapi/asm/kvm.h

+2 −0
Original line number Diff line number Diff line
@@ -87,9 +87,11 @@ struct kvm_regs { 
/* Supported VGICv3 address types  */

#define KVM_VGIC_V3_ADDR_TYPE_DIST	2

#define KVM_VGIC_V3_ADDR_TYPE_REDIST	3

#define KVM_VGIC_ITS_ADDR_TYPE		4



#define KVM_VGIC_V3_DIST_SIZE		SZ_64K

#define KVM_VGIC_V3_REDIST_SIZE		(2 * SZ_64K)

#define KVM_VGIC_V3_ITS_SIZE		(2 * SZ_64K)



#define KVM_ARM_VCPU_POWER_OFF		0 /* CPU is started in OFF state */

#define KVM_ARM_VCPU_EL1_32BIT		1 /* CPU running a 32bit VM */

tools/arch/s390/include/uapi/asm/kvm.h

+41 −0
Original line number Diff line number Diff line
@@ -93,6 +93,47 @@ struct kvm_s390_vm_cpu_machine { 
	__u64 fac_list[256];

};



#define KVM_S390_VM_CPU_PROCESSOR_FEAT	2

#define KVM_S390_VM_CPU_MACHINE_FEAT	3



#define KVM_S390_VM_CPU_FEAT_NR_BITS	1024

#define KVM_S390_VM_CPU_FEAT_ESOP	0

#define KVM_S390_VM_CPU_FEAT_SIEF2	1

#define KVM_S390_VM_CPU_FEAT_64BSCAO	2

#define KVM_S390_VM_CPU_FEAT_SIIF	3

#define KVM_S390_VM_CPU_FEAT_GPERE	4

#define KVM_S390_VM_CPU_FEAT_GSLS	5

#define KVM_S390_VM_CPU_FEAT_IB		6

#define KVM_S390_VM_CPU_FEAT_CEI	7

#define KVM_S390_VM_CPU_FEAT_IBS	8

#define KVM_S390_VM_CPU_FEAT_SKEY	9

#define KVM_S390_VM_CPU_FEAT_CMMA	10

#define KVM_S390_VM_CPU_FEAT_PFMFI	11

#define KVM_S390_VM_CPU_FEAT_SIGPIF	12

struct kvm_s390_vm_cpu_feat {

	__u64 feat[16];

};



#define KVM_S390_VM_CPU_PROCESSOR_SUBFUNC	4

#define KVM_S390_VM_CPU_MACHINE_SUBFUNC		5

/* for "test bit" instructions MSB 0 bit ordering, for "query" raw blocks */

struct kvm_s390_vm_cpu_subfunc {

	__u8 plo[32];		/* always */

	__u8 ptff[16];		/* with TOD-clock steering */

	__u8 kmac[16];		/* with MSA */

	__u8 kmc[16];		/* with MSA */

	__u8 km[16];		/* with MSA */

	__u8 kimd[16];		/* with MSA */

	__u8 klmd[16];		/* with MSA */

	__u8 pckmo[16];		/* with MSA3 */

	__u8 kmctr[16];		/* with MSA4 */

	__u8 kmf[16];		/* with MSA4 */

	__u8 kmo[16];		/* with MSA4 */

	__u8 pcc[16];		/* with MSA4 */

	__u8 ppno[16];		/* with MSA5 */

	__u8 reserved[1824];

};



/* kvm attributes for crypto */

#define KVM_S390_VM_CRYPTO_ENABLE_AES_KW	0

#define KVM_S390_VM_CRYPTO_ENABLE_DEA_KW	1

tools/arch/s390/include/uapi/asm/sie.h

+1 −0
Original line number Diff line number Diff line
@@ -140,6 +140,7 @@ 
	exit_code_ipa0(0xB2, 0x4c, "TAR"),	\

	exit_code_ipa0(0xB2, 0x50, "CSP"),	\

	exit_code_ipa0(0xB2, 0x54, "MVPG"),	\

	exit_code_ipa0(0xB2, 0x56, "STHYI"),	\

	exit_code_ipa0(0xB2, 0x58, "BSG"),	\

	exit_code_ipa0(0xB2, 0x5a, "BSA"),	\

	exit_code_ipa0(0xB2, 0x5f, "CHSC"),	\

CRA Git | Maintained and supported by SUSTech CRA and CCSE