From: Greg Kroah-Hartman Date: Sun, 29 Sep 2019 14:55:24 +0000 (+0200) Subject: fix up the duplicate lock_down patch issue X-Git-Tag: v5.3.2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f3df42d744370c26d7c46f3b20c4a2ab1a791283;p=thirdparty%2Fkernel%2Fstable-queue.git fix up the duplicate lock_down patch issue --- diff --git a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch b/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch deleted file mode 100644 index 18ab6332336..00000000000 --- a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6314481a8b7a4564d9a91e0e6e60a9cccb48951a Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 9 Jan 2019 23:03:25 -0500 -Subject: locking/lockdep: Add debug_locks check in __lock_downgrade() - -From: Waiman Long - -[ Upstream commit 513e1073d52e55b8024b4f238a48de7587c64ccf ] - -Tetsuo Handa had reported he saw an incorrect "downgrading a read lock" -warning right after a previous lockdep warning. It is likely that the -previous warning turned off lock debugging causing the lockdep to have -inconsistency states leading to the lock downgrade warning. - -Fix that by add a check for debug_locks at the beginning of -__lock_downgrade(). - -Reported-by: Tetsuo Handa -Reported-by: syzbot+53383ae265fb161ef488@syzkaller.appspotmail.com -Signed-off-by: Waiman Long -Signed-off-by: Peter Zijlstra (Intel) -Cc: Andrew Morton -Cc: Linus Torvalds -Cc: Paul E. McKenney -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Cc: Will Deacon -Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin ---- - kernel/locking/lockdep.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 565005a3b8f05..5c370c68466c6 100644 ---- a/kernel/locking/lockdep.c -+++ b/kernel/locking/lockdep.c -@@ -3650,6 +3650,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name, - unsigned int depth; - int i; - -+ if (unlikely(!debug_locks)) -+ return 0; -+ - depth = curr->lockdep_depth; - /* - * This function is about (re)setting the class of a held lock, --- -2.20.1 - diff --git a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091 b/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091 index 0631731daf5..2ae81e9ea48 100644 --- a/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091 +++ b/queue-4.14/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091 @@ -29,15 +29,14 @@ Cc: Will Deacon Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - kernel/locking/lockdep.c | 3 +++ + kernel/locking/lockdep.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 5c370c68466c6..bc29eae549d36 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c -@@ -3691,6 +3691,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip) +@@ -3688,6 +3688,9 @@ static int __lock_downgrade(struct lockd unsigned int depth; int i; @@ -47,6 +46,3 @@ index 5c370c68466c6..bc29eae549d36 100644 depth = curr->lockdep_depth; /* * This function is about (re)setting the class of a held lock, --- -2.20.1 - diff --git a/queue-4.14/series b/queue-4.14/series index 9760f8671f5..5c798f4709a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -18,7 +18,6 @@ objtool-clobber-user-cflags-variable.patch tpm-fix-tpm-1.2-shutdown-sequence-to-prevent-future-.patch pinctrl-sprd-use-define-directive-for-sprd_pinconf_p.patch power-supply-sysfs-ratelimit-property-read-error-mes.patch -locking-lockdep-add-debug_locks-check-in-__lock_down.patch locking-lockdep-add-debug_locks-check-in-__lock_down.patch-14091 irqchip-gic-v3-its-fix-lpi-release-for-multi-msi-dev.patch f2fs-check-all-the-data-segments-against-all-node-on.patch diff --git a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch b/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch deleted file mode 100644 index 52ff81c6b89..00000000000 --- a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 625182f17e4aee5244398822487dc6dee83a548e Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 9 Jan 2019 23:03:25 -0500 -Subject: locking/lockdep: Add debug_locks check in __lock_downgrade() - -From: Waiman Long - -[ Upstream commit 513e1073d52e55b8024b4f238a48de7587c64ccf ] - -Tetsuo Handa had reported he saw an incorrect "downgrading a read lock" -warning right after a previous lockdep warning. It is likely that the -previous warning turned off lock debugging causing the lockdep to have -inconsistency states leading to the lock downgrade warning. - -Fix that by add a check for debug_locks at the beginning of -__lock_downgrade(). - -Reported-by: Tetsuo Handa -Reported-by: syzbot+53383ae265fb161ef488@syzkaller.appspotmail.com -Signed-off-by: Waiman Long -Signed-off-by: Peter Zijlstra (Intel) -Cc: Andrew Morton -Cc: Linus Torvalds -Cc: Paul E. McKenney -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Cc: Will Deacon -Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com -Signed-off-by: Ingo Molnar -Signed-off-by: Sasha Levin ---- - kernel/locking/lockdep.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index e810e8cb17e18..68ba411a90075 100644 ---- a/kernel/locking/lockdep.c -+++ b/kernel/locking/lockdep.c -@@ -3567,6 +3567,9 @@ __lock_set_class(struct lockdep_map *lock, const char *name, - unsigned int depth; - int i; - -+ if (unlikely(!debug_locks)) -+ return 0; -+ - depth = curr->lockdep_depth; - /* - * This function is about (re)setting the class of a held lock, --- -2.20.1 - diff --git a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969 b/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969 index 7570c8b1e39..39e6471d066 100644 --- a/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969 +++ b/queue-4.19/locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969 @@ -29,15 +29,14 @@ Cc: Will Deacon Link: https://lkml.kernel.org/r/1547093005-26085-1-git-send-email-longman@redhat.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin +Signed-off-by: Greg Kroah-Hartman --- - kernel/locking/lockdep.c | 3 +++ + kernel/locking/lockdep.c | 3 +++ 1 file changed, 3 insertions(+) -diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c -index 68ba411a90075..1c8e5d186ad64 100644 --- a/kernel/locking/lockdep.c +++ b/kernel/locking/lockdep.c -@@ -3608,6 +3608,9 @@ static int __lock_downgrade(struct lockdep_map *lock, unsigned long ip) +@@ -3605,6 +3605,9 @@ static int __lock_downgrade(struct lockd unsigned int depth; int i; @@ -47,6 +46,3 @@ index 68ba411a90075..1c8e5d186ad64 100644 depth = curr->lockdep_depth; /* * This function is about (re)setting the class of a held lock, --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index 4f816cf078d..e5a8c7f367d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -33,7 +33,6 @@ objtool-clobber-user-cflags-variable.patch tpm-fix-tpm-1.2-shutdown-sequence-to-prevent-future-.patch pinctrl-sprd-use-define-directive-for-sprd_pinconf_p.patch power-supply-sysfs-ratelimit-property-read-error-mes.patch -locking-lockdep-add-debug_locks-check-in-__lock_down.patch locking-lockdep-add-debug_locks-check-in-__lock_down.patch-13969 scsi-qla2xxx-turn-off-iocb-timeout-timer-on-iocb-com.patch scsi-qla2xxx-remove-all-rports-if-fabric-scan-retry-.patch