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

Commit 29d14f08 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 Thomas Gleixner:
 "This is much bigger than typical fixes, but Peter found a category of
  races that spurred more fixes and more debugging enhancements.  Work
  started before the merge window, but got finished only now.

  Aside of that this contains the usual small fixes to perf and tools.
  Nothing particular exciting"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (43 commits)
  perf: Remove/simplify lockdep annotation
  perf: Synchronously clean up child events
  perf: Untangle 'owner' confusion
  perf: Add flags argument to perf_remove_from_context()
  perf: Clean up sync_child_event()
  perf: Robustify event->owner usage and SMP ordering
  perf: Fix STATE_EXIT usage
  perf: Update locking order
  perf: Remove __free_event()
  perf/bpf: Convert perf_event_array to use struct file
  perf: Fix NULL deref
  perf/x86: De-obfuscate code
  perf/x86: Fix uninitialized value usage
  perf: Fix race in perf_event_exit_task_context()
  perf: Fix orphan hole
  perf stat: Do not clean event's private stats
  perf hists: Fix HISTC_MEM_DCACHELINE width setting
  perf annotate browser: Fix behaviour of Shift-Tab with nothing focussed
  perf tests: Remove wrong semicolon in while loop in CQM test
  perf: Synchronously free aux pages in case of allocation failure
  ...
parents bbfb239a 28fb8a5b

arch/x86/kernel/cpu/perf_event_intel.c

+3 −4
Original line number Diff line number Diff line
@@ -1960,7 +1960,8 @@ intel_bts_constraints(struct perf_event *event) 


static int intel_alt_er(int idx, u64 config)

{

	int alt_idx;

	int alt_idx = idx;



	if (!(x86_pmu.flags & PMU_FL_HAS_RSP_1))

		return idx;
@@ -2897,14 +2898,12 @@ static void intel_pmu_cpu_starting(int cpu) 
		return;



	if (!(x86_pmu.flags & PMU_FL_NO_HT_SHARING)) {

		void **onln = &cpuc->kfree_on_online[X86_PERF_KFREE_SHARED];



		for_each_cpu(i, topology_sibling_cpumask(cpu)) {

			struct intel_shared_regs *pc;



			pc = per_cpu(cpu_hw_events, i).shared_regs;

			if (pc && pc->core_id == core_id) {

				*onln = cpuc->shared_regs;

				cpuc->kfree_on_online[0] = cpuc->shared_regs;

				cpuc->shared_regs = pc;

				break;

			}

arch/x86/kernel/cpu/perf_event_intel_uncore.c

+3 −0
Original line number Diff line number Diff line
@@ -995,6 +995,9 @@ static int __init uncore_pci_init(void) 
	case 87: /* Knights Landing */

		ret = knl_uncore_pci_init();

		break;

	case 94: /* SkyLake */

		ret = skl_uncore_pci_init();

		break;

	default:

		return 0;

	}

arch/x86/kernel/cpu/perf_event_intel_uncore.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ int snb_uncore_pci_init(void); 
int ivb_uncore_pci_init(void);

int hsw_uncore_pci_init(void);

int bdw_uncore_pci_init(void);

int skl_uncore_pci_init(void);

void snb_uncore_cpu_init(void);

void nhm_uncore_cpu_init(void);

int snb_pci2phy_map_init(int devid);

arch/x86/kernel/cpu/perf_event_intel_uncore_snb.c

+20 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define PCI_DEVICE_ID_INTEL_HSW_IMC	0x0c00

#define PCI_DEVICE_ID_INTEL_HSW_U_IMC	0x0a04

#define PCI_DEVICE_ID_INTEL_BDW_IMC	0x1604

#define PCI_DEVICE_ID_INTEL_SKL_IMC	0x191f



/* SNB event control */

#define SNB_UNC_CTL_EV_SEL_MASK			0x000000ff
@@ -524,6 +525,14 @@ static const struct pci_device_id bdw_uncore_pci_ids[] = { 
	{ /* end: all zeroes */ },

};



static const struct pci_device_id skl_uncore_pci_ids[] = {

	{ /* IMC */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_SKL_IMC),

		.driver_data = UNCORE_PCI_DEV_DATA(SNB_PCI_UNCORE_IMC, 0),

	},

	{ /* end: all zeroes */ },

};



static struct pci_driver snb_uncore_pci_driver = {

	.name		= "snb_uncore",

	.id_table	= snb_uncore_pci_ids,
@@ -544,6 +553,11 @@ static struct pci_driver bdw_uncore_pci_driver = { 
	.id_table	= bdw_uncore_pci_ids,

};



static struct pci_driver skl_uncore_pci_driver = {

	.name		= "skl_uncore",

	.id_table	= skl_uncore_pci_ids,

};



struct imc_uncore_pci_dev {

	__u32 pci_id;

	struct pci_driver *driver;
@@ -558,6 +572,7 @@ static const struct imc_uncore_pci_dev desktop_imc_pci_ids[] = { 
	IMC_DEV(HSW_IMC, &hsw_uncore_pci_driver),    /* 4th Gen Core Processor */

	IMC_DEV(HSW_U_IMC, &hsw_uncore_pci_driver),  /* 4th Gen Core ULT Mobile Processor */

	IMC_DEV(BDW_IMC, &bdw_uncore_pci_driver),    /* 5th Gen Core U */

	IMC_DEV(SKL_IMC, &skl_uncore_pci_driver),    /* 6th Gen Core */

	{  /* end marker */ }

};
@@ -610,6 +625,11 @@ int bdw_uncore_pci_init(void) 
	return imc_uncore_pci_init();

}



int skl_uncore_pci_init(void)

{

	return imc_uncore_pci_init();

}



/* end of Sandy Bridge uncore support */



/* Nehalem uncore support */

include/linux/perf_event.h

+3 −6
Original line number Diff line number Diff line
@@ -634,9 +634,6 @@ struct perf_event_context { 
	int				nr_cgroups;	 /* cgroup evts */

	void				*task_ctx_data; /* pmu specific data */

	struct rcu_head			rcu_head;



	struct delayed_work		orphans_remove;

	bool				orphans_remove_sched;

};



/*
@@ -729,7 +726,7 @@ extern int perf_event_init_task(struct task_struct *child); 
extern void perf_event_exit_task(struct task_struct *child);

extern void perf_event_free_task(struct task_struct *task);

extern void perf_event_delayed_put(struct task_struct *task);

extern struct perf_event *perf_event_get(unsigned int fd);

extern struct file *perf_event_get(unsigned int fd);

extern const struct perf_event_attr *perf_event_attrs(struct perf_event *event);

extern void perf_event_print_debug(void);

extern void perf_pmu_disable(struct pmu *pmu);
@@ -1044,7 +1041,7 @@ extern void perf_swevent_put_recursion_context(int rctx); 
extern u64 perf_swevent_set_period(struct perf_event *event);

extern void perf_event_enable(struct perf_event *event);

extern void perf_event_disable(struct perf_event *event);

extern int __perf_event_disable(void *info);

extern void perf_event_disable_local(struct perf_event *event);

extern void perf_event_task_tick(void);

#else /* !CONFIG_PERF_EVENTS: */

static inline void *
@@ -1070,7 +1067,7 @@ static inline int perf_event_init_task(struct task_struct *child) { return 0; } 
static inline void perf_event_exit_task(struct task_struct *child)	{ }

static inline void perf_event_free_task(struct task_struct *task)	{ }

static inline void perf_event_delayed_put(struct task_struct *task)	{ }

static inline struct perf_event *perf_event_get(unsigned int fd)	{ return ERR_PTR(-EINVAL); }

static inline struct file *perf_event_get(unsigned int fd)	{ return ERR_PTR(-EINVAL); }

static inline const struct perf_event_attr *perf_event_attrs(struct perf_event *event)

{

	return ERR_PTR(-EINVAL);