Commit f7f4d43b 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:
 "An uncharacteristically large number of bugs popped up in the last
  week:

   - various tooling fixes, two crashes and build problems
   - two Intel PT fixes
   - an KNL uncore driver fix
   - an Intel PMU driver fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf stat: Fallback to user only counters when perf_event_paranoid > 1
  perf evsel: Handle EACCESS + perf_event_paranoid=2 in fallback()
  perf evsel: Improve EPERM error handling in open_strerror()
  tools lib traceevent: Do not reassign parg after collapse_tree()
  perf probe: Check if dwarf_getlocations() is available
  perf dwarf: Guard !x86_64 definitions under #ifdef else clause
  perf tools: Use readdir() instead of deprecated readdir_r()
  perf thread_map: Use readdir() instead of deprecated readdir_r()
  perf script: Use readdir() instead of deprecated readdir_r()
  perf tools: Use readdir() instead of deprecated readdir_r()
  perf/core: Disable the event on a truncated AUX record
  perf/x86/intel/pt: Generate PMI in the STOP region as well
  perf/x86: Fix undefined shift on 32-bit kernels
  perf/x86/msr: Fix SMI overflow
  perf/x86/intel/uncore: Fix CHA registers configuration procedure for Knights Landing platform
  perf diff: Fix duplicated output column
parents 18759462 636fa4a7

arch/x86/events/intel/core.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3708,7 +3708,7 @@ __init int intel_pmu_init(void) 
				c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1;

				c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1;

			}

			}

			c->idxmsk64 &=

			c->idxmsk64 &=

				~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));

				~(~0ULL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed));

			c->weight = hweight64(c->idxmsk64);

			c->weight = hweight64(c->idxmsk64);

		}

		}

	}

	}

arch/x86/events/intel/pt.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -709,6 +709,7 @@ static int pt_buffer_reset_markers(struct pt_buffer *buf, 




	/* clear STOP and INT from current entry */

	/* clear STOP and INT from current entry */

	buf->topa_index[buf->stop_pos]->stop = 0;

	buf->topa_index[buf->stop_pos]->stop = 0;

	buf->topa_index[buf->stop_pos]->intr = 0;

	buf->topa_index[buf->intr_pos]->intr = 0;

	buf->topa_index[buf->intr_pos]->intr = 0;





	/* how many pages till the STOP marker */

	/* how many pages till the STOP marker */
@@ -733,6 +734,7 @@ static int pt_buffer_reset_markers(struct pt_buffer *buf, 
	buf->intr_pos = idx;

	buf->intr_pos = idx;





	buf->topa_index[buf->stop_pos]->stop = 1;

	buf->topa_index[buf->stop_pos]->stop = 1;

	buf->topa_index[buf->stop_pos]->intr = 1;

	buf->topa_index[buf->intr_pos]->intr = 1;

	buf->topa_index[buf->intr_pos]->intr = 1;





	return 0;

	return 0;

arch/x86/events/intel/uncore_snbep.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -219,6 +219,9 @@ 
#define KNL_CHA_MSR_PMON_BOX_FILTER_TID		0x1ff

#define KNL_CHA_MSR_PMON_BOX_FILTER_TID		0x1ff

#define KNL_CHA_MSR_PMON_BOX_FILTER_STATE	(7 << 18)

#define KNL_CHA_MSR_PMON_BOX_FILTER_STATE	(7 << 18)

#define KNL_CHA_MSR_PMON_BOX_FILTER_OP		(0xfffffe2aULL << 32)

#define KNL_CHA_MSR_PMON_BOX_FILTER_OP		(0xfffffe2aULL << 32)

#define KNL_CHA_MSR_PMON_BOX_FILTER_REMOTE_NODE	(0x1ULL << 32)

#define KNL_CHA_MSR_PMON_BOX_FILTER_LOCAL_NODE	(0x1ULL << 33)

#define KNL_CHA_MSR_PMON_BOX_FILTER_NNC		(0x1ULL << 37)





/* KNL EDC/MC UCLK */

/* KNL EDC/MC UCLK */

#define KNL_UCLK_MSR_PMON_CTR0_LOW		0x400

#define KNL_UCLK_MSR_PMON_CTR0_LOW		0x400
@@ -1902,6 +1905,10 @@ static int knl_cha_hw_config(struct intel_uncore_box *box, 
		reg1->reg = HSWEP_C0_MSR_PMON_BOX_FILTER0 +

		reg1->reg = HSWEP_C0_MSR_PMON_BOX_FILTER0 +

			    KNL_CHA_MSR_OFFSET * box->pmu->pmu_idx;

			    KNL_CHA_MSR_OFFSET * box->pmu->pmu_idx;

		reg1->config = event->attr.config1 & knl_cha_filter_mask(idx);

		reg1->config = event->attr.config1 & knl_cha_filter_mask(idx);



		reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_REMOTE_NODE;

		reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_LOCAL_NODE;

		reg1->config |= KNL_CHA_MSR_PMON_BOX_FILTER_NNC;

		reg1->idx = idx;

		reg1->idx = idx;

	}

	}

	return 0;

	return 0;

arch/x86/events/msr.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -166,7 +166,7 @@ again: 
	if (unlikely(event->hw.event_base == MSR_SMI_COUNT))

	if (unlikely(event->hw.event_base == MSR_SMI_COUNT))

		delta = sign_extend64(delta, 31);

		delta = sign_extend64(delta, 31);





	local64_add(now - prev, &event->count);

	local64_add(delta, &event->count);

}

}





static void msr_event_start(struct perf_event *event, int flags)

static void msr_event_start(struct perf_event *event, int flags)

kernel/events/ring_buffer.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -347,6 +347,7 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size, 
			 bool truncated)

			 bool truncated)

{

{

	struct ring_buffer *rb = handle->rb;

	struct ring_buffer *rb = handle->rb;

	bool wakeup = truncated;

	unsigned long aux_head;

	unsigned long aux_head;

	u64 flags = 0;

	u64 flags = 0;
@@ -375,9 +376,16 @@ void perf_aux_output_end(struct perf_output_handle *handle, unsigned long size, 
	aux_head = rb->user_page->aux_head = local_read(&rb->aux_head);

	aux_head = rb->user_page->aux_head = local_read(&rb->aux_head);





	if (aux_head - local_read(&rb->aux_wakeup) >= rb->aux_watermark) {

	if (aux_head - local_read(&rb->aux_wakeup) >= rb->aux_watermark) {

		perf_output_wakeup(handle);

		wakeup = true;

		local_add(rb->aux_watermark, &rb->aux_wakeup);

		local_add(rb->aux_watermark, &rb->aux_wakeup);

	}

	}



	if (wakeup) {

		if (truncated)

			handle->event->pending_disable = 1;

		perf_output_wakeup(handle);

	}



	handle->event = NULL;

	handle->event = NULL;





	local_set(&rb->aux_nest, 0);

	local_set(&rb->aux_nest, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE