Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1443605 > unrolled thread

[PATCH v1] x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text

Back to article view | Back to linux.kernel

Contents

  [PATCH v1] x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text Alexander Potapenko <glider@google.com> - 2016-07-14 19:10 +0200
    Re: [PATCH v1] x86, kasan, ftrace: Put APIC interrupt handlers into  .irqentry.text kbuild test robot <lkp@intel.com> - 2016-07-15 11:30 +0200

#1443605 — [PATCH v1] 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 <glider@google.com>
Reported-by: Dmitry Vyukov <dvyukov@google.com>
---
 arch/x86/entry/entry_64.S | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S
index 9ee0da1..966b1a8 100644
--- a/arch/x86/entry/entry_64.S
+++ b/arch/x86/entry/entry_64.S
@@ -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
-- 
2.8.0.rc3.226.g39d4020

[toc] | [next] | [standalone]

#1444114 — Re: [PATCH v1] x86, kasan, ftrace: Put APIC interrupt handlers into .irqentry.text

[Multipart message — attachments visible in raw view] — view raw

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

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web