Skip to contentSkip to conversation

tools/lib/lockdep: fixes for v4.19

PATCH In review Sasha Levin 3 participants 10 messages Aug 13, 2018 – Sep 10, 2018

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

cover tools/lib/lockdep: fixes for v4.19

Hi Ingo,

Please pull the following minor fixes for liblockdep.

Also available at:

git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes

Sasha Levin (3):
tools/lib/lockdep: update Sasha Levin email to MSFT tools/lib/lockdep: add empty nmi.h tools/lib/lockdep: add dummy task_struct state member

 MAINTAINERS                   | 2 +-
 tools/include/linux/lockdep.h | 3 +++
 tools/include/linux/nmi.h     | 0
 3 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 tools/include/linux/nmi.h
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 tools/lib/lockdep: update Sasha Levin email to MSFT

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index 544cac829cf4..2e02bae7b7e0 100644
@@ -8143,7 +8143,7 @@ F:	include/linux/libata.h
 F:	Documentation/devicetree/bindings/ata/
 
 LIBLOCKDEP
-M:	Sasha Levin <[email protected]>
+M:	Sasha Levin <[email protected]>
 S:	Maintained
 F:	tools/lib/lockdep/
 
Signature · 1 line
2.17.1
#2 lore raw

[tip:locking/urgent] tools/lib/lockdep: Update Sasha Levin email to MSFT

tools/lib/lockdep: Update Sasha Levin email to MSFT
Commit-ID:  83e01228cb35823f7bd0e5a0584e24ed72a8af2b
Gitweb:     https://git.kernel.org/tip/83e01228cb35823f7bd0e5a0584e24ed72a8af2b
Author:     Sasha Levin <[email protected]>
AuthorDate: Mon, 13 Aug 2018 19:05:37 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 10 Sep 2018 13:48:22 +0200

tools/lib/lockdep: Update Sasha Levin email to MSFT

---
 MAINTAINERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
MAINTAINERS +1 -1
index d870cb57c887..f999786cfa90 100644
@@ -8300,7 +8300,7 @@ F:	include/linux/libata.h
 F:	Documentation/devicetree/bindings/ata/
 
 LIBLOCKDEP
-M:	Sasha Levin <[email protected]>
+M:	Sasha Levin <[email protected]>
 S:	Maintained
 F:	tools/lib/lockdep/
 
#3 lore raw

PATCH 2/3 tools/lib/lockdep: add empty nmi.h

In reply to Sasha Levin

Required since 88f1c87de11a8 ("locking/lockdep: Avoid triggering hardlockup from debug_show_all_locks()").

---
 tools/include/linux/nmi.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 tools/include/linux/nmi.h
tools/include/linux/nmi.h new file +0 -0
new file mode 100644
index 000000000000..e69de29bb2d1
Signature · 1 line
2.17.1
#4 lore raw

[tip:locking/urgent] tools/lib/lockdep: Add empty nmi.h

tools/lib/lockdep: Add empty nmi.h
Commit-ID:  1064ea494bb00519c6e34f791dcf17436f70592d
Gitweb:     https://git.kernel.org/tip/1064ea494bb00519c6e34f791dcf17436f70592d
Author:     Sasha Levin <[email protected]>
AuthorDate: Mon, 13 Aug 2018 19:05:38 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 10 Sep 2018 13:48:23 +0200

tools/lib/lockdep: Add empty nmi.h

Required since:

88f1c87de11a8 ("locking/lockdep: Avoid triggering hardlockup from debug_show_all_locks()")

---
 arch/arm/mach-imx/Makefile.boot => tools/include/linux/nmi.h | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
tools/include/linux/nmi.h renamed from arch/arm/mach-imx/Makefile.boot +0 -0
similarity index 100%
copy from arch/arm/mach-imx/Makefile.boot
copy to tools/include/linux/nmi.h
#5 lore raw

PATCH 3/3 tools/lib/lockdep: add dummy task_struct state member

In reply to Sasha Levin

Commit 8cc05c71ba5f ("locking/lockdep: Move sanity check to inside lockdep_print_held_locks()") added accesses to the task_struct's state member. Add dummy userspace declaration.

---
 tools/include/linux/lockdep.h | 3 +++
 1 file changed, 3 insertions(+)
tools/include/linux/lockdep.h +3 -0
index 6b0c36a58fcb..e56997288f2b 100644
@@ -30,9 +30,12 @@ struct task_struct {
 	struct held_lock held_locks[MAX_LOCK_DEPTH];
 	gfp_t lockdep_reclaim_gfp;
 	int pid;
+	int state;
 	char comm[17];
 };
 
+#define TASK_RUNNING 0
+
 extern struct task_struct *__curr(void);
 
 #define current (__curr())
Signature · 1 line
2.17.1
#6 lore raw

[tip:locking/urgent] tools/lib/lockdep: Add dummy task_struct state member

tools/lib/lockdep: Add dummy task_struct state member
Commit-ID:  16214312df6d5aaa5324864d032ce565e97f8890
Gitweb:     https://git.kernel.org/tip/16214312df6d5aaa5324864d032ce565e97f8890
Author:     Sasha Levin <[email protected]>
AuthorDate: Mon, 13 Aug 2018 19:05:39 +0000
Committer:  Ingo Molnar <[email protected]>
CommitDate: Mon, 10 Sep 2018 13:48:24 +0200

tools/lib/lockdep: Add dummy task_struct state member

Commit:

8cc05c71ba5f ("locking/lockdep: Move sanity check to inside lockdep_print_held_locks()")

added accesses to the task_struct's state member. Add dummy userspace declaration.

---
 tools/include/linux/lockdep.h | 3 +++
 1 file changed, 3 insertions(+)
tools/include/linux/lockdep.h +3 -0
index 6b0c36a58fcb..e56997288f2b 100644
@@ -30,9 +30,12 @@ struct task_struct {
 	struct held_lock held_locks[MAX_LOCK_DEPTH];
 	gfp_t lockdep_reclaim_gfp;
 	int pid;
+	int state;
 	char comm[17];
 };
 
+#define TASK_RUNNING 0
+
 extern struct task_struct *__curr(void);
 
 #define current (__curr())
#7 lore raw
In reply to Sasha Levin

Ping?

Quoted 21 lines · Sasha Levin

Hi Ingo,

Please pull the following minor fixes for liblockdep.

Also available at:

git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes

Sasha Levin (3):
tools/lib/lockdep: update Sasha Levin email to MSFT tools/lib/lockdep: add empty nmi.h tools/lib/lockdep: add dummy task_struct state member

MAINTAINERS                   | 2 +-
tools/include/linux/lockdep.h | 3 +++
tools/include/linux/nmi.h     | 0
3 files changed, 4 insertions(+), 1 deletion(-)

create mode 100644 tools/include/linux/nmi.h

Signature · 1 line
2.17.1
#8 lore raw

Ping?

Quoted 24 lines · Sasha Levin

Ping?

Quoted 21 lines · Sasha Levin

Hi Ingo,

Please pull the following minor fixes for liblockdep.

Also available at:

git://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux.git liblockdep-fixes

Sasha Levin (3):
tools/lib/lockdep: update Sasha Levin email to MSFT tools/lib/lockdep: add empty nmi.h tools/lib/lockdep: add dummy task_struct state member

MAINTAINERS                   | 2 +-
tools/include/linux/lockdep.h | 3 +++
tools/include/linux/nmi.h     | 0
3 files changed, 4 insertions(+), 1 deletion(-)

create mode 100644 tools/include/linux/nmi.h

Signature · 1 line
2.17.1
#9 lore raw
Quoted 1 line · Sasha Levin

Ping?

Sorry about the delay - all applied now, thanks!

Ingo