4.19-stable patches

added patches:
	jump_label-lockdep-assert-we-hold-the-hotplug-lock-for-_cpuslocked-operations.patch
	locking-static_key-fix-false-positive-warnings-on-concurrent-dec-inc.patch

diff --git a/queue-4.19/jump_label-lockdep-assert-we-hold-the-hotplug-lock-for-_cpuslocked-operations.patch b/queue-4.19/jump_label-lockdep-assert-we-hold-the-hotplug-lock-for-_cpuslocked-operations.patch
new file mode 100644 (file)
index 0000000..2cc84a6
--- /dev/null
+++ b/queue-4.19/jump_label-lockdep-assert-we-hold-the-hotplug-lock-for-_cpuslocked-operations.patch
@@ -0,0 +1,57 @@
+From cb538267ea1e9e025ec692577c9ae75797261889 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Tue, 31 Jul 2018 14:35:32 +0200
+Subject: jump_label/lockdep: Assert we hold the hotplug lock for _cpuslocked() operations
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit cb538267ea1e9e025ec692577c9ae75797261889 upstream.
+
+Weirdly we seem to have forgotten this...
+
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Will McVicker <willmcvicker@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/jump_label.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/kernel/jump_label.c
++++ b/kernel/jump_label.c
+@@ -83,6 +83,7 @@ void static_key_slow_inc_cpuslocked(stru
+       int v, v1;
+ 
+       STATIC_KEY_CHECK_USE(key);
++      lockdep_assert_cpus_held();
+ 
+       /*
+        * Careful if we get concurrent static_key_slow_inc() calls;
+@@ -128,6 +129,7 @@ EXPORT_SYMBOL_GPL(static_key_slow_inc);
+ void static_key_enable_cpuslocked(struct static_key *key)
+ {
+       STATIC_KEY_CHECK_USE(key);
++      lockdep_assert_cpus_held();
+ 
+       if (atomic_read(&key->enabled) > 0) {
+               WARN_ON_ONCE(atomic_read(&key->enabled) != 1);
+@@ -158,6 +160,7 @@ EXPORT_SYMBOL_GPL(static_key_enable);
+ void static_key_disable_cpuslocked(struct static_key *key)
+ {
+       STATIC_KEY_CHECK_USE(key);
++      lockdep_assert_cpus_held();
+ 
+       if (atomic_read(&key->enabled) != 1) {
+               WARN_ON_ONCE(atomic_read(&key->enabled) != 0);
+@@ -183,6 +186,8 @@ static void __static_key_slow_dec_cpuslo
+                                          unsigned long rate_limit,
+                                          struct delayed_work *work)
+ {
++      lockdep_assert_cpus_held();
++
+       /*
+        * The negative count check is valid even when a negative
+        * key->enabled is in use by static_key_slow_inc(); a

diff --git a/queue-4.19/locking-static_key-fix-false-positive-warnings-on-concurrent-dec-inc.patch b/queue-4.19/locking-static_key-fix-false-positive-warnings-on-concurrent-dec-inc.patch
new file mode 100644 (file)
index 0000000..810839d
--- /dev/null
+++ b/queue-4.19/locking-static_key-fix-false-positive-warnings-on-concurrent-dec-inc.patch
@@ -0,0 +1,89 @@
+From a1247d06d01045d7ab2882a9c074fbf21137c690 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <peterz@infradead.org>
+Date: Tue, 19 Mar 2019 13:18:56 +0100
+Subject: locking/static_key: Fix false positive warnings on concurrent dec/inc
+
+From: Peter Zijlstra <peterz@infradead.org>
+
+commit a1247d06d01045d7ab2882a9c074fbf21137c690 upstream.
+
+Even though the atomic_dec_and_mutex_lock() in
+__static_key_slow_dec_cpuslocked() can never see a negative value in
+key->enabled the subsequent sanity check is re-reading key->enabled, which may
+have been set to -1 in the meantime by static_key_slow_inc_cpuslocked().
+
+                CPU  A                               CPU B
+
+ __static_key_slow_dec_cpuslocked():          static_key_slow_inc_cpuslocked():
+                               # enabled = 1
+   atomic_dec_and_mutex_lock()
+                               # enabled = 0
+                                              atomic_read() == 0
+                                              atomic_set(-1)
+                               # enabled = -1
+   val = atomic_read()
+   # Oops - val == -1!
+
+The test case is TCP's clean_acked_data_enable() / clean_acked_data_disable()
+as tickled by KTLS (net/ktls).
+
+Suggested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
+Reported-by: Jakub Kicinski <jakub.kicinski@netronome.com>
+Tested-by: Jakub Kicinski <jakub.kicinski@netronome.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Will Deacon <will.deacon@arm.com>
+Cc: ard.biesheuvel@linaro.org
+Cc: oss-drivers@netronome.com
+Cc: pbonzini@redhat.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Will McVicker <willmcvicker@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/jump_label.c |   21 +++++++++++++--------
+ 1 file changed, 13 insertions(+), 8 deletions(-)
+
+--- a/kernel/jump_label.c
++++ b/kernel/jump_label.c
+@@ -186,6 +186,8 @@ static void __static_key_slow_dec_cpuslo
+                                          unsigned long rate_limit,
+                                          struct delayed_work *work)
+ {
++      int val;
++
+       lockdep_assert_cpus_held();
+ 
+       /*
+@@ -195,17 +197,20 @@ static void __static_key_slow_dec_cpuslo
+        * returns is unbalanced, because all other static_key_slow_inc()
+        * instances block while the update is in progress.
+        */
+-      if (!atomic_dec_and_mutex_lock(&key->enabled, &jump_label_mutex)) {
+-              WARN(atomic_read(&key->enabled) < 0,
+-                   "jump label: negative count!\n");
++      val = atomic_fetch_add_unless(&key->enabled, -1, 1);
++      if (val != 1) {
++              WARN(val < 0, "jump label: negative count!\n");
+               return;
+       }
+ 
+-      if (rate_limit) {
+-              atomic_inc(&key->enabled);
+-              schedule_delayed_work(work, rate_limit);
+-      } else {
+-              jump_label_update(key);
++      jump_label_lock();
++      if (atomic_dec_and_test(&key->enabled)) {
++              if (rate_limit) {
++                      atomic_inc(&key->enabled);
++                      schedule_delayed_work(work, rate_limit);
++              } else {
++                      jump_label_update(key);
++              }
+       }
+       jump_label_unlock();
+ }

diff --git a/queue-4.19/scripts-recordmcount.pl-support-big-endian-for-arch-.patch b/queue-4.19/scripts-recordmcount.pl-support-big-endian-for-arch-.patch
index 154c5433806301cd510bf2c1e8a017a6820a6129..49e998c03894d1b61da6c3ca4fce635615faf0c4 100644 (file)
--- a/queue-4.19/scripts-recordmcount.pl-support-big-endian-for-arch-.patch
+++ b/queue-4.19/scripts-recordmcount.pl-support-big-endian-for-arch-.patch
@@ -30,11 +30,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- scripts/recordmcount.pl | 6 +++++-
+ scripts/recordmcount.pl |    6 +++++-
  1 file changed, 5 insertions(+), 1 deletion(-)
 
-diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
-index f599031260d51..7f6f96256b09f 100755
 --- a/scripts/recordmcount.pl
 +++ b/scripts/recordmcount.pl
 @@ -263,7 +263,11 @@ if ($arch eq "x86_64") {
@@ -50,6 +48,3 @@ index f599031260d51..7f6f96256b09f 100755
  
  } elsif ($arch eq "powerpc") {
      my $ldemulation;
--- 
-2.27.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index 7dfd467bf8b539fa86e5b07ba357e302ba206e56..3d3358b14505d02f988c5c051e4fb80c58be3758 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -12,3 +12,5 @@ block-don-t-release-queue-s-sysfs-lock-during-switching-elevator.patch
 net-usb-qmi_wwan-adding-support-for-cinterion-mv31.patch
 cifs-set-cifs_mount_use_prefix_path-flag-on-setting-.patch
 scripts-recordmcount.pl-support-big-endian-for-arch-.patch
+jump_label-lockdep-assert-we-hold-the-hotplug-lock-for-_cpuslocked-operations.patch
+locking-static_key-fix-false-positive-warnings-on-concurrent-dec-inc.patch