4.9-stable patches

added patches:
	perf-fix-data-race-between-pin_count-increment-decrement.patch
	regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch

diff --git a/queue-4.9/perf-fix-data-race-between-pin_count-increment-decrement.patch b/queue-4.9/perf-fix-data-race-between-pin_count-increment-decrement.patch
new file mode 100644 (file)
index 0000000..3f4b7c2
--- /dev/null
+++ b/queue-4.9/perf-fix-data-race-between-pin_count-increment-decrement.patch
@@ -0,0 +1,48 @@
+From 6c605f8371159432ec61cbb1488dcf7ad24ad19a Mon Sep 17 00:00:00 2001
+From: Marco Elver <elver@google.com>
+Date: Thu, 27 May 2021 12:47:11 +0200
+Subject: perf: Fix data race between pin_count increment/decrement
+
+From: Marco Elver <elver@google.com>
+
+commit 6c605f8371159432ec61cbb1488dcf7ad24ad19a upstream.
+
+KCSAN reports a data race between increment and decrement of pin_count:
+
+  write to 0xffff888237c2d4e0 of 4 bytes by task 15740 on cpu 1:
+   find_get_context            kernel/events/core.c:4617
+   __do_sys_perf_event_open    kernel/events/core.c:12097 [inline]
+   __se_sys_perf_event_open    kernel/events/core.c:11933
+   ...
+  read to 0xffff888237c2d4e0 of 4 bytes by task 15743 on cpu 0:
+   perf_unpin_context          kernel/events/core.c:1525 [inline]
+   __do_sys_perf_event_open    kernel/events/core.c:12328 [inline]
+   __se_sys_perf_event_open    kernel/events/core.c:11933
+   ...
+
+Because neither read-modify-write here is atomic, this can lead to one
+of the operations being lost, resulting in an inconsistent pin_count.
+Fix it by adding the missing locking in the CPU-event case.
+
+Fixes: fe4b04fa31a6 ("perf: Cure task_oncpu_function_call() races")
+Reported-by: syzbot+142c9018f5962db69c7e@syzkaller.appspotmail.com
+Signed-off-by: Marco Elver <elver@google.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Link: https://lkml.kernel.org/r/20210527104711.2671610-1-elver@google.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/events/core.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -3782,7 +3782,9 @@ find_get_context(struct pmu *pmu, struct
+               cpuctx = per_cpu_ptr(pmu->pmu_cpu_context, cpu);
+               ctx = &cpuctx->ctx;
+               get_ctx(ctx);
++              raw_spin_lock_irqsave(&ctx->lock, flags);
+               ++ctx->pin_count;
++              raw_spin_unlock_irqrestore(&ctx->lock, flags);
+ 
+               return ctx;
+       }

diff --git a/queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch b/queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch
new file mode 100644 (file)
index 0000000..d96fce8
--- /dev/null
+++ b/queue-4.9/regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch
@@ -0,0 +1,38 @@
+From 98e48cd9283dbac0e1445ee780889f10b3d1db6a Mon Sep 17 00:00:00 2001
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Date: Thu, 20 May 2021 01:12:23 +0300
+Subject: regulator: core: resolve supply for boot-on/always-on regulators
+
+From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+
+commit 98e48cd9283dbac0e1445ee780889f10b3d1db6a upstream.
+
+For the boot-on/always-on regulators the set_machine_constrainst() is
+called before resolving rdev->supply. Thus the code would try to enable
+rdev before enabling supplying regulator. Enforce resolving supply
+regulator before enabling rdev.
+
+Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator")
+Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Link: https://lore.kernel.org/r/20210519221224.2868496-1-dmitry.baryshkov@linaro.org
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/regulator/core.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/regulator/core.c
++++ b/drivers/regulator/core.c
+@@ -1080,6 +1080,12 @@ static int set_machine_constraints(struc
+        * and we have control then make sure it is enabled.
+        */
+       if (rdev->constraints->always_on || rdev->constraints->boot_on) {
++              /* If we want to enable this regulator, make sure that we know
++               * the supplying regulator.
++               */
++              if (rdev->supply_name && !rdev->supply)
++                      return -EPROBE_DEFER;
++
+               ret = _regulator_do_enable(rdev);
+               if (ret < 0 && ret != -EINVAL) {
+                       rdev_err(rdev, "failed to enable\n");

diff --git a/queue-4.9/series b/queue-4.9/series
index 38a49e30f64c9bc0f65bd2e3537bd1d5975f1c81..cd0debc0935188d515d407aacf239ccd0a3552a3 100644 (file)
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -30,3 +30,5 @@ usb-serial-quatech2-fix-control-request-directions.patch
 usb-gadget-eem-fix-wrong-eem-header-operation.patch
 usb-fix-various-gadgets-null-ptr-deref-on-10gbps-cabling.patch
 usb-fix-various-gadget-panics-on-10gbps-cabling.patch
+regulator-core-resolve-supply-for-boot-on-always-on-regulators.patch
+perf-fix-data-race-between-pin_count-increment-decrement.patch