Subject: Re: linux-next: Tree for May 18 (mm/memory-failure.c)

From: Xie XiuQi <[email-masked]>
Date: Wed, 20 May 2015 13:41:57 +0800

On 2015/5/19 10:49, Naoya Horiguchi wrote:
> On Mon, May 18, 2015 at 08:20:07AM -0700, Randy Dunlap wrote:
>> On 05/18/15 01:52, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20150515:
>>>
>>
>> on i386:
>>
>> mm/built-in.o: In function `action_result':
>> memory-failure.c:(.text+0x344a5): undefined reference to `__tracepoint_memory_failure_event'
>> memory-failure.c:(.text+0x344d5): undefined reference to `__tracepoint_memory_failure_event'
>> memory-failure.c:(.text+0x3450c): undefined reference to `__tracepoint_memory_failure_event'
> 
> Thanks for the reporting, Randy.
> Here is a patch for this problem, could you try it?

Hi Naoya,

This patch will introduce another build error with attched config file.

drivers/built-in.o:(__tracepoints+0x500): multiple definition of `__tracepoint_aer_event'
mm/built-in.o:(__tracepoints+0x398): first defined here
drivers/built-in.o:(__tracepoints+0x4ec): multiple definition of `__tracepoint_memory_failure_event'
mm/built-in.o:(__tracepoints+0x384): first defined here
drivers/built-in.o:(__tracepoints+0x514): multiple definition of `__tracepoint_mc_event'
mm/built-in.o:(__tracepoints+0x3ac): first defined here
drivers/built-in.o:(__tracepoints+0x528): multiple definition of `__tracepoint_extlog_mem_event'
mm/built-in.o:(__tracepoints+0x3c0): first defined here
make: *** [vmlinux] Error 1

Is this one better?
---
>>From 99d91a901142b17287432b00169ac6bd9d87b489 Mon Sep 17 00:00:00 2001
From: Xie XiuQi <[email-masked]>
Date: Thu, 21 May 2015 13:11:38 +0800
Subject: [PATCH] tracing: fix build error in mm/memory-failure.c

next-20150515 fails to build on i386 with the following error:

mm/built-in.o: In function `action_result':
memory-failure.c:(.text+0x344a5): undefined reference to `__tracepoint_memory_failure_event'
memory-failure.c:(.text+0x344d5): undefined reference to `__tracepoint_memory_failure_event'
memory-failure.c:(.text+0x3450c): undefined reference to `__tracepoint_memory_failure_event'

trace_memory_failure_event depends on CONFIG_RAS,
so add 'select RAS' in mm/Kconfig to avoid this error.

Reported-by: Randy Dunlap <[email-masked]>
Reported-by: Jim Davis <[email-masked]>
Cc: Naoya Horiguchi <[email-masked]>
Cc: Steven Rostedt <[email-masked]>
Cc: Chen Gong <[email-masked]>
Signed-off-by: Xie XiuQi <[email-masked]>
---
 mm/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mm/Kconfig b/mm/Kconfig
index 52ffb86..e79de2b 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -368,6 +368,7 @@ config MEMORY_FAILURE
 	depends on ARCH_SUPPORTS_MEMORY_FAILURE
 	bool "Enable recovery from hardware memory errors"
 	select MEMORY_ISOLATION
+	select RAS
 	help
 	  Enables code to recover from some memory failures on systems
 	  with MCA recovery. This allows a system to continue running
-- 
1.8.3.1

> 
> Thanks,
> Naoya
> ---
> From: Naoya Horiguchi <[email-masked]>
> Subject: [PATCH] ras: hwpoison: fix build failure around
>  trace_memory_failure_event
> 
> next-20150515 fails to build on i386 with the following error:
> 
>   mm/built-in.o: In function `action_result':
>   memory-failure.c:(.text+0x344a5): undefined reference to `__tracepoint_memory_failure_event'
>   memory-failure.c:(.text+0x344d5): undefined reference to `__tracepoint_memory_failure_event'
>   memory-failure.c:(.text+0x3450c): undefined reference to `__tracepoint_memory_failure_event'
> 
> Defining CREATE_TRACE_POINTS and TRACE_INCLUDE_PATH fixes it.
> 
> Reported-by: Randy Dunlap <[email-masked]>
> Reported-by: Jim Davis <[email-masked]>
> Signed-off-by: Naoya Horiguchi <[email-masked]>
> ---
>  drivers/ras/ras.c       | 1 -
>  include/ras/ras_event.h | 2 ++
>  mm/memory-failure.c     | 1 +
>  3 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/ras/ras.c b/drivers/ras/ras.c
> index b67dd362b7b6..3e2745d8e221 100644
> --- a/drivers/ras/ras.c
> +++ b/drivers/ras/ras.c
> @@ -9,7 +9,6 @@
>  #include <linux/ras.h>
>  
>  #define CREATE_TRACE_POINTS
> -#define TRACE_INCLUDE_PATH ../../include/ras
>  #include <ras/ras_event.h>
>  
>  static int __init ras_init(void)
> diff --git a/include/ras/ras_event.h b/include/ras/ras_event.h
> index 1443d79e4fe6..43054c0fcf65 100644
> --- a/include/ras/ras_event.h
> +++ b/include/ras/ras_event.h
> @@ -1,6 +1,8 @@
>  #undef TRACE_SYSTEM
>  #define TRACE_SYSTEM ras
>  #define TRACE_INCLUDE_FILE ras_event
> +#undef TRACE_INCLUDE_PATH
> +#define TRACE_INCLUDE_PATH ../../include/ras
>  
>  #if !defined(_TRACE_HW_EVENT_MC_H) || defined(TRACE_HEADER_MULTI_READ)
>  #define _TRACE_HW_EVENT_MC_H
> diff --git a/mm/memory-failure.c b/mm/memory-failure.c
> index 8cbe23ac1056..e88e14d87571 100644
> --- a/mm/memory-failure.c
> +++ b/mm/memory-failure.c
> @@ -57,6 +57,7 @@
>  #include <linux/mm_inline.h>
>  #include <linux/kfifo.h>
>  #include "internal.h"
> +#define CREATE_TRACE_POINTS
>  #include "ras/ras_event.h"
>  
>  int sysctl_memory_failure_early_kill __read_mostly = 0;
>