mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	"stable@vger.kernel.org" <stable@vger.kernel.org>
Cc: David Carrillo-Cisneros <davidcc@google.com>,
	Alexander Shishkin <alexander.shishkin@linux.intel.com>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Borislav Petkov <bp@suse.de>,
	Dave Hansen <dave.hansen@linux.intel.com>,
	Jiri Olsa <jolsa@redhat.com>, Kan Liang <kan.liang@intel.com>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	"Paul Turner" <pjt@google.com>,
	Peter Zijlstra <peterz@infradead.org>,
	"Srinivas Pandruvada" <srinivas.pandruvada@linux.intel.com>,
	Stephane Eranian <eranian@google.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Ingo Molnar <mingo@kernel.org>,
	"Levin, Alexander (Sasha Levin)" <alexander.levin@verizon.com>
Subject: [PATCH for v4.9 LTS 53/87] perf/x86: Set pmu->module in Intel PMU modules
Date: Sat, 15 Jul 2017 01:26:15 +0000	[thread overview]
Message-ID: <20170715012538.10101-53-alexander.levin@verizon.com> (raw)
In-Reply-To: <20170715012538.10101-1-alexander.levin@verizon.com>

From: David Carrillo-Cisneros <davidcc@google.com>

[ Upstream commit 74545f63890e38520eb4d1dbedcadaa9c0dbc824 ]

The conversion of Intel PMU drivers into modules did not include reference
counting. The machine will crash when attempting to  access deleted code
if an event from a module PMU is started and the module removed before the
event is destroyed.

i.e. this crashes the machine:

	$ insmod intel-rapl-perf.ko
	$ perf stat -e power/energy-cores/ -C 0 &
	$ rmmod intel-rapl-perf.ko

Set THIS_MODULE to pmu->module in Intel module PMUs so that generic code
can handle reference counting and deny rmmod while an event still exists.

Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kan Liang <kan.liang@intel.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1482455860-116269-1-git-send-email-davidcc@google.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
---
 arch/x86/events/intel/cstate.c | 2 ++
 arch/x86/events/intel/rapl.c   | 1 +
 arch/x86/events/intel/uncore.c | 1 +
 3 files changed, 4 insertions(+)

diff --git a/arch/x86/events/intel/cstate.c b/arch/x86/events/intel/cstate.c
index fec8a461bdef..1076c9a77292 100644
--- a/arch/x86/events/intel/cstate.c
+++ b/arch/x86/events/intel/cstate.c
@@ -434,6 +434,7 @@ static struct pmu cstate_core_pmu = {
 	.stop		= cstate_pmu_event_stop,
 	.read		= cstate_pmu_event_update,
 	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT,
+	.module		= THIS_MODULE,
 };
 
 static struct pmu cstate_pkg_pmu = {
@@ -447,6 +448,7 @@ static struct pmu cstate_pkg_pmu = {
 	.stop		= cstate_pmu_event_stop,
 	.read		= cstate_pmu_event_update,
 	.capabilities	= PERF_PMU_CAP_NO_INTERRUPT,
+	.module		= THIS_MODULE,
 };
 
 static const struct cstate_model nhm_cstates __initconst = {
diff --git a/arch/x86/events/intel/rapl.c b/arch/x86/events/intel/rapl.c
index 8b902b67342a..970c1de3b86e 100644
--- a/arch/x86/events/intel/rapl.c
+++ b/arch/x86/events/intel/rapl.c
@@ -697,6 +697,7 @@ static int __init init_rapl_pmus(void)
 	rapl_pmus->pmu.start		= rapl_pmu_event_start;
 	rapl_pmus->pmu.stop		= rapl_pmu_event_stop;
 	rapl_pmus->pmu.read		= rapl_pmu_event_read;
+	rapl_pmus->pmu.module		= THIS_MODULE;
 	return 0;
 }
 
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index 19d646a783fd..aec6cc925af8 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -733,6 +733,7 @@ static int uncore_pmu_register(struct intel_uncore_pmu *pmu)
 			.start		= uncore_pmu_event_start,
 			.stop		= uncore_pmu_event_stop,
 			.read		= uncore_pmu_event_read,
+			.module		= THIS_MODULE,
 		};
 	} else {
 		pmu->pmu = *pmu->type->pmu;
-- 
2.11.0

  parent reply	other threads:[~2017-07-15  1:39 UTC|newest]

Thread overview: 91+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-07-15  1:25 [PATCH for v4.9 LTS 01/87] x86/mce/AMD: Make the init code more robust Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 03/87] ARM: omap2+: fixing wrong strcat for Non-NULL terminated string Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 02/87] r8169: add support for RTL8168 series add-on card Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 05/87] dt-bindings: input: Specify the interrupt number of TPS65217 power button Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 06/87] ARM: dts: am57xx-idk: Put USB2 port in peripheral mode Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 04/87] dt-bindings: power/supply: Update TPS65217 properties Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 08/87] net/mlx5: Disable RoCE on the e-switch management port under switchdev mode Levin, Alexander (Sasha Levin)
2017-07-15  1:25 ` [PATCH for v4.9 LTS 07/87] ARM: dts: n900: Mark eMMC slot with no-sdio and no-sd flags Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 09/87] ipv6: Should use consistent conditional judgement for ip6 fragment between __ip6_append_data and ip6_finish_output Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 11/87] net/mlx4: Remove BUG_ON from ICM allocation routine Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 10/87] net/mlx4_core: Use-after-free causes a resource leak in flow-steering detach Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 14/87] drm/msm: Put back the vaddr in submit_reloc() Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 13/87] drm/msm: Ensure that the hardware write pointer is valid Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 12/87] net/mlx4_core: Fix raw qp flow steering rules under SRIOV Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 16/87] vfio-pci: use 32-bit comparisons for register address for gcc-4.5 Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 15/87] drm/msm: Verify that MSM_SUBMIT_BO_FLAGS are set Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 17/87] irqchip/keystone: Fix "scheduling while atomic" on rt Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 19/87] spi: dw: Make debugfs name unique between instances Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 18/87] ASoC: tlv320aic3x: Mark the RESET register as volatile Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 20/87] ASoC: nau8825: fix invalid configuration in Pre-Scalar of FLL Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 21/87] irqchip/mxs: Enable SKIP_SET_WAKE and MASK_ON_SUSPEND Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 22/87] openrisc: Add _text symbol to fix ksym build error Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 23/87] dmaengine: ioatdma: Add Skylake PCI Dev ID Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 25/87] l2tp: consider '::' as wildcard address in l2tp_ip6 socket lookup Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 24/87] dmaengine: ioatdma: workaround SKX ioatdma version Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 26/87] dmaengine: ti-dma-crossbar: Add some 'of_node_put()' in error path Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 28/87] ARM64: zynqmp: Fix W=1 dtc 1.4 warnings Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 29/87] ARM64: zynqmp: Fix i2c node's compatible string Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 27/87] usb: dwc3: omap: fix race of pm runtime with irq handler in probe Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 30/87] perf probe: Fix to get correct modname from elf header Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 31/87] ARM: s3c2410_defconfig: Fix invalid values for NF_CT_PROTO_* Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 32/87] ACPI / scan: Prefer devices without _HID/_CID for _ADR matching Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 33/87] usb: gadget: Fix copy/pasted error message Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 35/87] Btrfs: fix lockdep warning about log_mutex Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 34/87] Btrfs: use down_read_nested to make lockdep silent Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 36/87] benet: stricter vxlan offloading check in be_features_check Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 37/87] Btrfs: adjust outstanding_extents counter properly when dio write is split Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 38/87] Xen: ARM: Zero reserved fields of xatp before making hypervisor call Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 39/87] tools lib traceevent: Fix prev/next_prio for deadline tasks Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 40/87] perf tools: Install tools/lib/traceevent plugins with install-bin Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 42/87] video: fbdev: cobalt_lcdfb: Handle return NULL error from devm_ioremap Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 41/87] perf symbols: Robustify reading of build-id from sysfs Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 43/87] perf probe: Fix to probe on gcc generated symbols for offline kernel Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 44/87] vfio-pci: Handle error from pci_iomap Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 46/87] nvmem: imx-ocotp: Fix wrong register size Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 45/87] arm64: mm: fix show_pte KERN_CONT fallout Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 47/87] net: usb: asix_devices: add .reset_resume for USB PM Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 49/87] sh_eth: enable RX descriptor word 0 shift on SH7734 Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 48/87] ASoC: fsl_ssi: set fifo watermark to more reliable value Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 50/87] ARCv2: IRQ: Call entry/exit functions for chained handlers in MCIP Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 52/87] x86/platform/intel-mid: Rename 'spidev' to 'mrfld_spidev' Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` Levin, Alexander (Sasha Levin) [this message]
2017-07-15  1:26 ` [PATCH for v4.9 LTS 51/87] ALSA: usb-audio: test EP_FLAG_RUNNING at urb completion Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 55/87] HID: ignore Petzl USB headlamp Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 54/87] ASoC: Intel: bytcr-rt5640: fix settings in internal clock mode Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 56/87] scsi: fnic: Avoid sending reset to firmware when another reset is in progress Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 57/87] scsi: snic: Return error code on memory allocation failure Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 58/87] scsi: bfa: Increase requested firmware version to 3.2.5.1 Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 61/87] sh_eth: fix EESIPR values for SH77{34|63} Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 60/87] ASoC: dpcm: Avoid putting stream state to STOP when FE stream is paused Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 59/87] ASoC: Intel: Skylake: Release FW ctx in cleanup Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 63/87] net: phy: dp83867: fix irq generation Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 62/87] sh_eth: R8A7740 supports packet shecksumming Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 64/87] tg3: Fix race condition in tg3_get_stats64() Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 66/87] spi: spi-axi: Free resources on error path Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 67/87] ASoC: rt5645: set sel_i2s_pre_div1 to 2 Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 65/87] x86/boot: Add missing declaration of string functions Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 68/87] netfilter: use fwmark_reflect in nf_send_reset Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 69/87] phy state machine: failsafe leave invalid RUNNING state Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 70/87] ipv4: make tcp_notsent_lowat sysctl knob behave as true unsigned int Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 71/87] clk/samsung: exynos542x: mark some clocks as critical Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 72/87] libfs: Modify mount_pseudo_xattr to be clear it is not a userspace mount Levin, Alexander (Sasha Levin)
2017-07-15  7:50   ` Eric W. Biederman
2017-07-15 15:46     ` Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 73/87] scsi: qla2xxx: Get mutex lock before checking optrom_state Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 75/87] ARM: dts: sun6i: hummingbird: Enable display engine again Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 74/87] drm/virtio: fix framebuffer sparse warning Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 78/87] iw_cxgb4: do not send RX_DATA_ACK CPLs after close/abort Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 76/87] ARM: dts: sun8i: Support DTB build for NanoPi M1 Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 77/87] ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 81/87] ARM: 8632/1: ftrace: fix syscall name matching Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 80/87] virtio_blk: fix panic in initialization error path Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 79/87] nbd: blk_mq_init_queue returns an error code on failure, not NULL Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 82/87] mm, slab: make sure that KMALLOC_MAX_SIZE will fit into MAX_ORDER Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 83/87] lib/Kconfig.debug: fix frv build failure Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 86/87] net: account for current skb length when deciding about UFO Levin, Alexander (Sasha Levin)
2017-07-15  8:53   ` Michal Kubecek
2017-07-24 14:10     ` Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 84/87] signal: protect SIGNAL_UNKILLABLE from unintentional clearing Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 85/87] mm: don't dereference struct page fields of invalid pages Levin, Alexander (Sasha Levin)
2017-07-15  1:26 ` [PATCH for v4.9 LTS 87/87] net/mlx5: E-Switch, Re-enable RoCE on mode change only after FDB destroy Levin, Alexander (Sasha Levin)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170715012538.10101-53-alexander.levin@verizon.com \
    --to=alexander.levin@verizon.com \
    --cc=acme@redhat.com \
    --cc=alexander.shishkin@linux.intel.com \
    --cc=bp@suse.de \
    --cc=dave.hansen@linux.intel.com \
    --cc=davidcc@google.com \
    --cc=eranian@google.com \
    --cc=jolsa@redhat.com \
    --cc=kan.liang@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=peterz@infradead.org \
    --cc=pjt@google.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=stable@vger.kernel.org \
    --cc=tglx@linutronix.de \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®