From: Peter Zijlstra <peterz@infradead.org>
To: mingo@kernel.org, rusty@rustcorp.com.au,
mathieu.desnoyers@efficios.com, oleg@redhat.com,
paulmck@linux.vnet.ibm.com
Cc: linux-kernel@vger.kernel.org, andi@firstfloor.org,
rostedt@goodmis.org, tglx@linutronix.de, peterz@infradead.org
Subject: [RFC][PATCH 3/9] module: Annotate module version magic
Date: Sat, 28 Feb 2015 22:24:50 +0100 [thread overview]
Message-ID: <20150228213110.010715367@infradead.org> (raw)
In-Reply-To: 20150228212447.381543289@infradead.org
[-- Attachment #1: peterz-module-fix-load_module.patch --]
[-- Type: text/plain, Size: 2707 bytes --]
Due to the new lockdep checks we go:
[ 9.759380] ------------[ cut here ]------------
[ 9.759389] WARNING: CPU: 31 PID: 597 at ../kernel/module.c:216 each_symbol_section+0x121/0x130()
[ 9.759391] Modules linked in:
[ 9.759393] CPU: 31 PID: 597 Comm: modprobe Not tainted 4.0.0-rc1+ #65
[ 9.759393] Hardware name: Intel Corporation S2600GZ/S2600GZ, BIOS SE5C600.86B.02.02.0002.122320131210 12/23/2013
[ 9.759396] ffffffff817d8676 ffff880424567ca8 ffffffff8157e98b 0000000000000001
[ 9.759398] 0000000000000000 ffff880424567ce8 ffffffff8105fbc7 ffff880424567cd8
[ 9.759400] 0000000000000000 ffffffff810ec160 ffff880424567d40 0000000000000000
[ 9.759400] Call Trace:
[ 9.759407] [<ffffffff8157e98b>] dump_stack+0x4f/0x7b
[ 9.759410] [<ffffffff8105fbc7>] warn_slowpath_common+0x97/0xe0
[ 9.759412] [<ffffffff810ec160>] ? section_objs+0x60/0x60
[ 9.759414] [<ffffffff8105fc2a>] warn_slowpath_null+0x1a/0x20
[ 9.759415] [<ffffffff810ed9c1>] each_symbol_section+0x121/0x130
[ 9.759417] [<ffffffff810eda01>] find_symbol+0x31/0x70
[ 9.759420] [<ffffffff810ef5bf>] load_module+0x20f/0x2660
[ 9.759422] [<ffffffff8104ef10>] ? __do_page_fault+0x190/0x4e0
[ 9.759426] [<ffffffff815880ec>] ? retint_restore_args+0x13/0x13
[ 9.759427] [<ffffffff815880ec>] ? retint_restore_args+0x13/0x13
[ 9.759433] [<ffffffff810ae73d>] ? trace_hardirqs_on_caller+0x11d/0x1e0
[ 9.759437] [<ffffffff812fcc0e>] ? trace_hardirqs_on_thunk+0x3a/0x3f
[ 9.759439] [<ffffffff815880ec>] ? retint_restore_args+0x13/0x13
[ 9.759441] [<ffffffff810f1ade>] SyS_init_module+0xce/0x100
[ 9.759443] [<ffffffff81587429>] system_call_fastpath+0x12/0x17
[ 9.759445] ---[ end trace 9294429076a9c644 ]---
As per the comment this site should be fine, but lets wrap it in
preempt_disable() anyhow to placate lockdep.
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
---
kernel/module.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -1192,11 +1192,17 @@ static inline int check_modstruct_versio
{
const unsigned long *crc;
- /* Since this should be found in kernel (which can't be removed),
- * no locking is necessary. */
+ /*
+ * Since this should be found in kernel (which can't be removed),
+ * no locking is necessary.
+ */
+ preempt_disable();
if (!find_symbol(VMLINUX_SYMBOL_STR(module_layout), NULL,
- &crc, true, false))
+ &crc, true, false)) {
+ preempt_enable();
BUG();
+ }
+ preempt_enable();
return check_version(sechdrs, versindex,
VMLINUX_SYMBOL_STR(module_layout), mod, crc,
NULL);
next prev parent reply other threads:[~2015-02-28 21:38 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-02-28 21:24 [RFC][PATCH 0/9] latched RB-trees and __module_address() Peter Zijlstra
2015-02-28 21:24 ` [RFC][PATCH 1/9] klp: Fix obvious RCU fail Peter Zijlstra
2015-03-01 20:09 ` Jiri Kosina
2015-03-02 8:35 ` Peter Zijlstra
2015-03-02 9:13 ` Jiri Kosina
2015-03-02 10:00 ` Peter Zijlstra
2015-03-02 9:21 ` Petr Mladek
2015-03-02 1:31 ` Masami Hiramatsu
2015-03-02 19:21 ` Paul E. McKenney
2015-03-02 21:07 ` Josh Poimboeuf
2015-02-28 21:24 ` [RFC][PATCH 2/9] module: Sanitize RCU usage and locking Peter Zijlstra
2015-03-02 11:16 ` Rusty Russell
2015-03-02 12:37 ` Peter Zijlstra
2015-03-02 19:37 ` Paul E. McKenney
2015-03-17 17:13 ` Peter Zijlstra
2015-02-28 21:24 ` Peter Zijlstra [this message]
2015-03-02 19:38 ` [RFC][PATCH 3/9] module: Annotate module version magic Paul E. McKenney
2015-02-28 21:24 ` [RFC][PATCH 4/9] module, jump_label: Fix module locking Peter Zijlstra
2015-03-02 19:39 ` Paul E. McKenney
2015-02-28 21:24 ` [RFC][PATCH 5/9] rbtree: Make lockless searches non-fatal Peter Zijlstra
2015-03-01 13:52 ` Mathieu Desnoyers
2015-03-02 8:27 ` Peter Zijlstra
2015-03-01 21:11 ` Michel Lespinasse
2015-03-02 7:46 ` Ingo Molnar
2015-03-02 8:23 ` Peter Zijlstra
2015-03-02 9:53 ` Peter Zijlstra
2015-02-28 21:24 ` [RFC][PATCH 6/9] seqlock: Better document raw_write_seqcount_latch() Peter Zijlstra
2015-03-01 14:02 ` Mathieu Desnoyers
2015-03-02 8:33 ` Peter Zijlstra
2015-03-02 8:51 ` Peter Zijlstra
2015-03-02 19:46 ` Paul E. McKenney
2015-03-01 21:12 ` Michel Lespinasse
2015-02-28 21:24 ` [RFC][PATCH 7/9] rbtree: Implement generic latch_tree Peter Zijlstra
2015-03-01 21:17 ` Michel Lespinasse
2015-03-02 8:05 ` Peter Zijlstra
2015-03-02 19:53 ` Paul E. McKenney
2015-03-17 17:24 ` Peter Zijlstra
2015-02-28 21:24 ` [RFC][PATCH 8/9] module: Optimize __module_address() using a latched RB-tree Peter Zijlstra
2015-02-28 21:24 ` [RFC][PATCH 9/9] module: Use __module_address() for module_address_lookup() Peter Zijlstra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150228213110.010715367@infradead.org \
--to=peterz@infradead.org \
--cc=andi@firstfloor.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mathieu.desnoyers@efficios.com \
--cc=mingo@kernel.org \
--cc=oleg@redhat.com \
--cc=paulmck@linux.vnet.ibm.com \
--cc=rostedt@goodmis.org \
--cc=rusty@rustcorp.com.au \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).