From: Don Zickus <dzickus@redhat.com>
To: <x86@kernel.org>
Cc: LKML <linux-kernel@vger.kernel.org>,
baryluk@smp.if.uj.edu.pl, Don Zickus <dzickus@redhat.com>,
Jan Beulich <JBeulich@suse.com>
Subject: [PATCH] x86,nmi: Fix section mismatch warnings on 32-bit
Date: Wed, 6 Jun 2012 10:05:42 -0400
Message-ID: <1338991542-23000-1-git-send-email-dzickus@redhat.com> (raw)
It was reported that compiling for 32-bit caused a bunch of section
mismatch warnings:
VDSOSYM arch/x86/vdso/vdso32-syms.lds
LD arch/x86/vdso/built-in.o
LD arch/x86/built-in.o
WARNING: arch/x86/built-in.o(.data+0x5af0): Section mismatch in reference from the variable
test_nmi_ipi_callback_na.10451 to the function .init.text:test_nmi_ipi_callback()
The variable test_nmi_ipi_callback_na.10451 references
the function __init test_nmi_ipi_callback()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
WARNING: arch/x86/built-in.o(.data+0x5b04): Section mismatch in reference from the variable
nmi_unk_cb_na.10399 to the function .init.text:nmi_unk_cb()
The variable nmi_unk_cb_na.10399 references
the function __init nmi_unk_cb()
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console
Both of these are attributed to the internal representation of the nmiaction
struct created during register_nmi_handler. The reason for this is that those
structs are not defined in the init section whereas the rest of the code in
nmi_selftest.c is.
To resolve this, I created a new #define, register_nmi_handler_initonly, that
tags the struct as __initdata to resolve the mismatch. This #define should
only be used in rare situations where the register/unregister is called during
init of the kernel.
Big thanks to Jan Beulich for decoding this for me as I didn't have a clue
what was going on.
Reported-by: Witold Baryluk <baryluk@smp.if.uj.edu.pl>
Cc: Jan Beulich <JBeulich@suse.com>
Signed-off-by: Don Zickus <dzickus@redhat.com>
---
arch/x86/include/asm/nmi.h | 14 ++++++++++++++
arch/x86/kernel/nmi_selftest.c | 4 ++--
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/nmi.h b/arch/x86/include/asm/nmi.h
index 0e3793b..dc580c4 100644
--- a/arch/x86/include/asm/nmi.h
+++ b/arch/x86/include/asm/nmi.h
@@ -54,6 +54,20 @@ struct nmiaction {
__register_nmi_handler((t), &fn##_na); \
})
+/*
+ * For special handlers that register/unregister in the
+ * init section only. This should be considered rare.
+ */
+#define register_nmi_handler_initonly(t, fn, fg, n) \
+({ \
+ static struct nmiaction fn##_na __initdata = { \
+ .handler = (fn), \
+ .name = (n), \
+ .flags = (fg), \
+ }; \
+ __register_nmi_handler((t), &fn##_na); \
+})
+
int __register_nmi_handler(unsigned int, struct nmiaction *);
void unregister_nmi_handler(unsigned int, const char *);
diff --git a/arch/x86/kernel/nmi_selftest.c b/arch/x86/kernel/nmi_selftest.c
index e31bf8d..149b8d9 100644
--- a/arch/x86/kernel/nmi_selftest.c
+++ b/arch/x86/kernel/nmi_selftest.c
@@ -42,7 +42,7 @@ static int __init nmi_unk_cb(unsigned int val, struct pt_regs *regs)
static void __init init_nmi_testsuite(void)
{
/* trap all the unknown NMIs we may generate */
- register_nmi_handler(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk");
+ register_nmi_handler_initonly(NMI_UNKNOWN, nmi_unk_cb, 0, "nmi_selftest_unk");
}
static void __init cleanup_nmi_testsuite(void)
@@ -64,7 +64,7 @@ static void __init test_nmi_ipi(struct cpumask *mask)
{
unsigned long timeout;
- if (register_nmi_handler(NMI_LOCAL, test_nmi_ipi_callback,
+ if (register_nmi_handler_initonly(NMI_LOCAL, test_nmi_ipi_callback,
NMI_FLAG_FIRST, "nmi_selftest")) {
nmi_fail = FAILURE;
return;
--
1.7.7.6
next reply index
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-06 14:05 Don Zickus [this message]
2012-06-06 21:22 ` Witold Baryluk
2012-06-08 14:57 ` [tip:x86/urgent] x86/nmi: " tip-bot for Don Zickus
-- strict thread matches above, loose matches on Subject: below --
2012-06-04 19:56 [PATCH] x86,nmi: " Don Zickus
2012-06-05 8:12 ` Jan Beulich
2012-06-05 14:47 ` Don Zickus
2012-06-05 15:42 ` Jan Beulich
2012-06-05 18:35 ` Don Zickus
2012-06-06 11:14 ` Jan Beulich
2012-06-06 14:03 ` Don Zickus
2012-06-06 15:45 ` Ingo Molnar
2012-06-06 18:28 ` Don Zickus
2012-06-07 7:43 ` Li Zhong
2012-06-07 12:48 ` Don Zickus
2012-06-08 20:51 ` Don Zickus
2012-06-11 1:36 ` Zhong Li
2012-06-11 8:19 ` Ingo Molnar
2012-06-05 16:13 ` Sam Ravnborg
2012-06-05 16:18 ` Jan Beulich
2012-06-05 17:22 ` Sam Ravnborg
2012-06-08 2:06 ` Don Zickus
2012-06-08 5:40 ` Sam Ravnborg
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=1338991542-23000-1-git-send-email-dzickus@redhat.com \
--to=dzickus@redhat.com \
--cc=JBeulich@suse.com \
--cc=baryluk@smp.if.uj.edu.pl \
--cc=linux-kernel@vger.kernel.org \
--cc=x86@kernel.org \
/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
LKML Archive on lore.kernel.org
Archives are clonable:
git clone --mirror https://lore.kernel.org/lkml/0 lkml/git/0.git
git clone --mirror https://lore.kernel.org/lkml/1 lkml/git/1.git
git clone --mirror https://lore.kernel.org/lkml/2 lkml/git/2.git
git clone --mirror https://lore.kernel.org/lkml/3 lkml/git/3.git
git clone --mirror https://lore.kernel.org/lkml/4 lkml/git/4.git
git clone --mirror https://lore.kernel.org/lkml/5 lkml/git/5.git
git clone --mirror https://lore.kernel.org/lkml/6 lkml/git/6.git
git clone --mirror https://lore.kernel.org/lkml/7 lkml/git/7.git
git clone --mirror https://lore.kernel.org/lkml/8 lkml/git/8.git
git clone --mirror https://lore.kernel.org/lkml/9 lkml/git/9.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 lkml lkml/ https://lore.kernel.org/lkml \
linux-kernel@vger.kernel.org
public-inbox-index lkml
Example config snippet for mirrors
Newsgroup available over NNTP:
nntp://nntp.lore.kernel.org/org.kernel.vger.linux-kernel
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git