4.19-stable patches

added patches:
	perf-x86-amd-don-t-touch-the-amd64_eventsel_hostonly-bit-inside-the-guest.patch
	spi-meson-spicc-fix-memory-leak-in-meson_spicc_remove.patch

diff --git a/queue-4.19/perf-x86-amd-don-t-touch-the-amd64_eventsel_hostonly-bit-inside-the-guest.patch b/queue-4.19/perf-x86-amd-don-t-touch-the-amd64_eventsel_hostonly-bit-inside-the-guest.patch
new file mode 100644 (file)
index 0000000..e67463e
--- /dev/null
+++ b/queue-4.19/perf-x86-amd-don-t-touch-the-amd64_eventsel_hostonly-bit-inside-the-guest.patch
@@ -0,0 +1,47 @@
+From df51fe7ea1c1c2c3bfdb81279712fdd2e4ea6c27 Mon Sep 17 00:00:00 2001
+From: Like Xu <likexu@tencent.com>
+Date: Mon, 2 Aug 2021 15:08:50 +0800
+Subject: perf/x86/amd: Don't touch the AMD64_EVENTSEL_HOSTONLY bit inside the guest
+
+From: Like Xu <likexu@tencent.com>
+
+commit df51fe7ea1c1c2c3bfdb81279712fdd2e4ea6c27 upstream.
+
+If we use "perf record" in an AMD Milan guest, dmesg reports a #GP
+warning from an unchecked MSR access error on MSR_F15H_PERF_CTLx:
+
+  [] unchecked MSR access error: WRMSR to 0xc0010200 (tried to write 0x0000020000110076) at rIP: 0xffffffff8106ddb4 (native_write_msr+0x4/0x20)
+  [] Call Trace:
+  []  amd_pmu_disable_event+0x22/0x90
+  []  x86_pmu_stop+0x4c/0xa0
+  []  x86_pmu_del+0x3a/0x140
+
+The AMD64_EVENTSEL_HOSTONLY bit is defined and used on the host,
+while the guest perf driver should avoid such use.
+
+Fixes: 1018faa6cf23 ("perf/x86/kvm: Fix Host-Only/Guest-Only counting with SVM disabled")
+Signed-off-by: Like Xu <likexu@tencent.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Reviewed-by: Liam Merwick <liam.merwick@oracle.com>
+Tested-by: Kim Phillips <kim.phillips@amd.com>
+Tested-by: Liam Merwick <liam.merwick@oracle.com>
+Link: https://lkml.kernel.org/r/20210802070850.35295-1-likexu@tencent.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/events/perf_event.h |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/arch/x86/events/perf_event.h
++++ b/arch/x86/events/perf_event.h
+@@ -799,9 +799,10 @@ void x86_pmu_stop(struct perf_event *eve
+ 
+ static inline void x86_pmu_disable_event(struct perf_event *event)
+ {
++      u64 disable_mask = __this_cpu_read(cpu_hw_events.perf_ctr_virt_mask);
+       struct hw_perf_event *hwc = &event->hw;
+ 
+-      wrmsrl(hwc->config_base, hwc->config);
++      wrmsrl(hwc->config_base, hwc->config & ~disable_mask);
+ }
+ 
+ void x86_pmu_enable_event(struct perf_event *event);

diff --git a/queue-4.19/series b/queue-4.19/series
index 045f24f74e498f53a806ffbc7ae92523b3d14ec6..d0b9a4715cbde8dda94f1887a560ca3f19bb43b1 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -43,3 +43,5 @@ mips-malta-do-not-byte-swap-accesses-to-the-cbus-uart.patch
 pcmcia-i82092-fix-a-null-pointer-dereference-bug.patch
 kvm-x86-accept-userspace-interrupt-only-if-no-event-is-injected.patch
 kvm-x86-mmu-fix-per-cpu-counter-corruption-on-32-bit-builds.patch
+spi-meson-spicc-fix-memory-leak-in-meson_spicc_remove.patch
+perf-x86-amd-don-t-touch-the-amd64_eventsel_hostonly-bit-inside-the-guest.patch

diff --git a/queue-4.19/spi-meson-spicc-fix-memory-leak-in-meson_spicc_remove.patch b/queue-4.19/spi-meson-spicc-fix-memory-leak-in-meson_spicc_remove.patch
new file mode 100644 (file)
index 0000000..7d994a9
--- /dev/null
+++ b/queue-4.19/spi-meson-spicc-fix-memory-leak-in-meson_spicc_remove.patch
@@ -0,0 +1,34 @@
+From 8311ee2164c5cd1b63a601ea366f540eae89f10e Mon Sep 17 00:00:00 2001
+From: Dongliang Mu <mudongliangabcd@gmail.com>
+Date: Tue, 20 Jul 2021 18:01:16 +0800
+Subject: spi: meson-spicc: fix memory leak in meson_spicc_remove
+
+From: Dongliang Mu <mudongliangabcd@gmail.com>
+
+commit 8311ee2164c5cd1b63a601ea366f540eae89f10e upstream.
+
+In meson_spicc_probe, the error handling code needs to clean up master
+by calling spi_master_put, but the remove function does not have this
+function call. This will lead to memory leak of spicc->master.
+
+Reported-by: Dongliang Mu <mudongliangabcd@gmail.com>
+Fixes: 454fa271bc4e("spi: Add Meson SPICC driver")
+Signed-off-by: Dongliang Mu <mudongliangabcd@gmail.com>
+Link: https://lore.kernel.org/r/20210720100116.1438974-1-mudongliangabcd@gmail.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/spi/spi-meson-spicc.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/spi/spi-meson-spicc.c
++++ b/drivers/spi/spi-meson-spicc.c
+@@ -599,6 +599,8 @@ static int meson_spicc_remove(struct pla
+ 
+       clk_disable_unprepare(spicc->core);
+ 
++      spi_master_put(spicc->master);
++
+       return 0;
+ }
+