x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text

PATCH Superseded Alexander Potapenko 4 participants 5 messages Jul 14, 2016 – Jul 27, 2016

Subsystems (2)

x86 x86 entry code

lore

Share & tools

lore

Alexander Potapenko

author

2016-07-14 17:04 UTC #0 lore raw

PATCH 1/1 x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text

When building with CONFIG_FUNCTION_GRAPH_TRACER or CONFIG_KASAN, put the APIC interrupt handlers into the .irqentry.text section. This is needed because both KASAN and function graph tracer use __irqentry_text_start and __irqentry_text_end to determine whether a function is an IRQ entry point.

Dmitry Vyukov has reported unexpected KASAN stackdepot growth
(https://github.com/google/kasan/issues/36), which had been caused by the APIC handlers not being present in .irqentry.text.

Signed-off-by Alexander Potapenko <[email protected]>

Reported-by Dmitry Vyukov <[email protected]>

---
 arch/x86/entry/entry_64.S | 11 +++++++++++
 1 file changed, 11 insertions(+)

arch/x86/entry/entry_64.S +11 -0

index 9ee0da1..966b1a8 100644
@@ -601,9 +601,20 @@ apicinterrupt3 \num trace(\sym) smp_trace(\sym)
 .endm
 #endif
 
+/* Make sure APIC interrupt handlers end up in the irqentry section. */
+#ifdef defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
+#define PUSH_SECTION_IRQENTRY	.pushsection .irqentry.text, "ax"
+#define POP_SECTION_IRQENTRY	.popsection
+#else
+#define PUSH_SECTION_IRQENTRY
+#define POP_SECTION_IRQENTRY
+#endif
+
 .macro apicinterrupt num sym do_sym
+PUSH_SECTION_IRQENTRY
 apicinterrupt3 \num \sym \do_sym
 trace_apicinterrupt \num \sym
+POP_SECTION_IRQENTRY
 .endm
 
 #ifdef CONFIG_SMP

Signature · 1 line

2.8.0.rc3.226.g39d4020

kbuild test robot

build bot

2016-07-15 09:20 UTC #1 lore raw

url: https://github.com/0day-ci/linux/commits/Alexander-Potapenko/x86-kasan-ftrace-Put-APIC-interrupt-handlers-into-irqentry-text/20160715-152601 config: x86_64-acpi-redef (attached as .config)…

Hi,

[auto build test WARNING on tip/x86/core]
[also build test WARNING on v4.7-rc7 next-20160714]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url: https://github.com/0day-ci/linux/commits/Alexander-Potapenko/x86-kasan-ftrace-Put-APIC-interrupt-handlers-into-irqentry-text/20160715-152601
config: x86_64-acpi-redef (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430 reproduce:

        # save the attached .config to linux build tree
        make ARCH=x86_64

All warnings (new ones prefixed by >>):

>> arch/x86/entry/entry_64.S:674:15: warning: extra tokens at end of #ifdef directive
    #ifdef defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
                  ^

vim +674 arch/x86/entry/entry_64.S

658 END(\sym)
659 .endm
660
661 #ifdef CONFIG_TRACING
662 #define trace(sym) trace_##sym
663 #define smp_trace(sym) smp_trace_##sym
664
665 .macro trace_apicinterrupt num sym
666 apicinterrupt3 \num trace(\sym) smp_trace(\sym)
667 .endm
668 #else
669 .macro trace_apicinterrupt num sym do_sym
670 .endm
671 #endif
672
673 /* Make sure APIC interrupt handlers end up in the irqentry section. */

 > 674	#ifdef defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)

675 #define PUSH_SECTION_IRQENTRY .pushsection .irqentry.text, "ax"
676 #define POP_SECTION_IRQENTRY .popsection
677 #else
678 #define PUSH_SECTION_IRQENTRY
679 #define POP_SECTION_IRQENTRY
680 #endif
681
682 .macro apicinterrupt num sym do_sym

---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

Steven Rostedt

2016-07-27 12:45 UTC #2 lore raw

Quoted 10 lines · On Fri, 15 Jul 2016 17:19:46 +0800 kbuild test robot <[email protected]> wrote:

Hi,
[auto build test WARNING on tip/x86/core]
[also build test WARNING on v4.7-rc7 next-20160714]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Alexander-Potapenko/x86-kasan-ftrace-Put-APIC-interrupt-handlers-into-irqentry-text/20160715-152601
config: x86_64-acpi-redef (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430 reproduce:

Quoted 7 lines

        # save the attached .config to linux build tree
        make ARCH=x86_64 
All warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
arch/x86/entry/entry_64.S:674:15: warning: extra tokens at end of #ifdef directive
    #ifdef defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)

Alexander,

Can you send a v2 with this fixed?

-- Steve

Quoted 33 lines

                  ^
vim +674 arch/x86/entry/entry_64.S
   658	END(\sym)
   659	.endm
   660	
   661	#ifdef CONFIG_TRACING
   662	#define trace(sym) trace_##sym
   663	#define smp_trace(sym) smp_trace_##sym
   664	
   665	.macro trace_apicinterrupt num sym
   666	apicinterrupt3 \num trace(\sym) smp_trace(\sym)
   667	.endm
   668	#else
   669	.macro trace_apicinterrupt num sym do_sym
   670	.endm
   671	#endif
   672	
   673	/* Make sure APIC interrupt handlers end up in the irqentry section. */
Quoted 1 line
674 #ifdef defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
675 #define PUSH_SECTION_IRQENTRY .pushsection .irqentry.text, "ax"
676 #define POP_SECTION_IRQENTRY .popsection
677 #else
678 #define PUSH_SECTION_IRQENTRY
679 #define POP_SECTION_IRQENTRY
680 #endif
681
682 .macro apicinterrupt num sym do_sym
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation

Andrey Ryabinin

2016-07-27 15:23 UTC #3 lore raw

Quoted 16 lines · Steven Rostedt

Quoted 13 lines · On Fri, 15 Jul 2016 17:19:46 +0800 kbuild test robot <[email protected]> wrote:
Hi,
[auto build test WARNING on tip/x86/core]
[also build test WARNING on v4.7-rc7 next-20160714]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Alexander-Potapenko/x86-kasan-ftrace-Put-APIC-interrupt-handlers-into-irqentry-text/20160715-152601
config: x86_64-acpi-redef (attached as .config)
compiler: gcc-6 (Debian 6.1.1-1) 6.1.1 20160430 reproduce:
        # save the attached .config to linux build tree
        make ARCH=x86_64 

Quoted 9 lines

Quoted 4 lines
All warnings (new ones prefixed by >>):
Quoted 1 line
Quoted 1 line
arch/x86/entry/entry_64.S:674:15: warning: extra tokens at end of #ifdef directive
    #ifdef defined(CONFIG_FUNCTION_GRAPH_TRACER) || defined(CONFIG_KASAN)
Alexander,
Can you send a v2 with this fixed?

He did - http://lkml.kernel.org/g/<[email protected]>

Steven Rostedt

2016-07-27 13:01 UTC #4 lore raw

Quoted 7 lines · On Wed, 27 Jul 2016 15:52:08 +0300 Andrey Ryabinin <[email protected]>…

Quoted 4 lines
Alexander,
Can you send a v2 with this fixed?
He did - http://lkml.kernel.org/g/<[email protected]>

Bah, you're right. I never marked that patch as "todo" and was searching for a v2 with my "todo" filter on, so I missed it.

Sorry for the noise.

-- Steve