tools/liblockdep: Build failure

tools/liblockdep: Build failure

[Eunbong Song]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=euc-kr, Size: 1723 bytes --]


There is tools/liblockdep build failure.
I have been trying to find the cause and i found commit id 63f9a7fde715352e0769302527670542a664b981 is the casue.

Author: Andi Kleen <ak@linux.intel.com>
Date:   Sat Feb 8 08:52:01 2014 +0100

    asmlinkage: Make lockdep_sys_exit asmlinkage

    lockdep_sys_exit can be called from assembler code, so make it
    asmlinkage.

    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Ingo Molnar <mingo@kernel.org>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Link: http://lkml.kernel.org/r/1391845930-28580-5-git-send-email-ak@linux.intel.com
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
index 92b1bfc..7df9aa6 100644
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
@@ -265,7 +265,7 @@ extern void lockdep_info(void);
 extern void lockdep_reset(void);
 extern void lockdep_reset_lock(struct lockdep_map *lock);
 extern void lockdep_free_key_range(void *start, unsigned long size);
-extern void lockdep_sys_exit(void);
+extern asmlinkage void lockdep_sys_exit(void);

 extern void lockdep_off(void);
 extern void lockdep_on(void);
diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
index eb8a547..c8b6753 100644
--- a/kernel/locking/lockdep.c
+++ b/kernel/locking/lockdep.c
@@ -4191,7 +4191,7 @@ void debug_show_held_locks(struct task_struct *task)
 }
 EXPORT_SYMBOL_GPL(debug_show_held_locks);

-void lockdep_sys_exit(void)
+asmlinkage void lockdep_sys_exit(void)
 {
        struct task_struct *curr = current;
ÿôèº{.nÇ+‰·Ÿ®‰­†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a­¢f£¢·hšïêÿ‘êçz_è®\x03(­éšŽŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨è­Ú&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥

Re: tools/liblockdep: Build failure

[Robin Hack]

Hi.

I have same issue.

I investigated output of gcc -E and I found that asmlinkage macro isn't
expanded as is expected.

$ grep asmlinkage common.o
asmlinkage extern void lockdep_sys_exit(void);

On Tue, Apr 01, 2014 at 06:04:35AM +0000, Eunbong Song wrote:
> 
> There is tools/liblockdep build failure.
> I have been trying to find the cause and i found commit id 63f9a7fde715352e0769302527670542a664b981 is the casue.
> 
> Author: Andi Kleen <ak@linux.intel.com>
> Date:   Sat Feb 8 08:52:01 2014 +0100
> 
>     asmlinkage: Make lockdep_sys_exit asmlinkage
> 
>     lockdep_sys_exit can be called from assembler code, so make it
>     asmlinkage.
> 
>     Cc: Peter Zijlstra <peterz@infradead.org>
>     Cc: Ingo Molnar <mingo@kernel.org>
>     Signed-off-by: Andi Kleen <ak@linux.intel.com>
>     Link: http://lkml.kernel.org/r/1391845930-28580-5-git-send-email-ak@linux.intel.com
>     Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
> 
> diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
> index 92b1bfc..7df9aa6 100644
> --- a/include/linux/lockdep.h
> +++ b/include/linux/lockdep.h
> @@ -265,7 +265,7 @@ extern void lockdep_info(void);
>  extern void lockdep_reset(void);
>  extern void lockdep_reset_lock(struct lockdep_map *lock);
>  extern void lockdep_free_key_range(void *start, unsigned long size);
> -extern void lockdep_sys_exit(void);
> +extern asmlinkage void lockdep_sys_exit(void);
> 
>  extern void lockdep_off(void);
>  extern void lockdep_on(void);
> diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> index eb8a547..c8b6753 100644
> --- a/kernel/locking/lockdep.c
> +++ b/kernel/locking/lockdep.c
> @@ -4191,7 +4191,7 @@ void debug_show_held_locks(struct task_struct *task)
>  }
>  EXPORT_SYMBOL_GPL(debug_show_held_locks);
> 
> -void lockdep_sys_exit(void)
> +asmlinkage void lockdep_sys_exit(void)
>  {
>         struct task_struct *curr = current;

Re: tools/liblockdep: Build failure

[Robin Hack]

More investigation reveals this:

(from common.o which is output of gcc -E)
# 1 "./uinclude/linux/linkage.h" 1

pwd is: linux/tools/lib/lockdep
$ cat ./uinclude/linux/linkage.h

/* empty file */


Have nice day
Robin Hack
On Tue, Apr 01, 2014 at 10:02:58AM +0200, Robin Hack wrote:
> Hi.
> 
> I have same issue.
> 
> I investigated output of gcc -E and I found that asmlinkage macro isn't
> expanded as is expected.
> 
> $ grep asmlinkage common.o
> asmlinkage extern void lockdep_sys_exit(void);
> 
> On Tue, Apr 01, 2014 at 06:04:35AM +0000, Eunbong Song wrote:
> > 
> > There is tools/liblockdep build failure.
> > I have been trying to find the cause and i found commit id 63f9a7fde715352e0769302527670542a664b981 is the casue.
> > 
> > Author: Andi Kleen <ak@linux.intel.com>
> > Date:   Sat Feb 8 08:52:01 2014 +0100
> > 
> >     asmlinkage: Make lockdep_sys_exit asmlinkage
> > 
> >     lockdep_sys_exit can be called from assembler code, so make it
> >     asmlinkage.
> > 
> >     Cc: Peter Zijlstra <peterz@infradead.org>
> >     Cc: Ingo Molnar <mingo@kernel.org>
> >     Signed-off-by: Andi Kleen <ak@linux.intel.com>
> >     Link: http://lkml.kernel.org/r/1391845930-28580-5-git-send-email-ak@linux.intel.com
> >     Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
> > 
> > diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h
> > index 92b1bfc..7df9aa6 100644
> > --- a/include/linux/lockdep.h
> > +++ b/include/linux/lockdep.h
> > @@ -265,7 +265,7 @@ extern void lockdep_info(void);
> >  extern void lockdep_reset(void);
> >  extern void lockdep_reset_lock(struct lockdep_map *lock);
> >  extern void lockdep_free_key_range(void *start, unsigned long size);
> > -extern void lockdep_sys_exit(void);
> > +extern asmlinkage void lockdep_sys_exit(void);
> > 
> >  extern void lockdep_off(void);
> >  extern void lockdep_on(void);
> > diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c
> > index eb8a547..c8b6753 100644
> > --- a/kernel/locking/lockdep.c
> > +++ b/kernel/locking/lockdep.c
> > @@ -4191,7 +4191,7 @@ void debug_show_held_locks(struct task_struct *task)
> >  }
> >  EXPORT_SYMBOL_GPL(debug_show_held_locks);
> > 
> > -void lockdep_sys_exit(void)
> > +asmlinkage void lockdep_sys_exit(void)
> >  {
> >         struct task_struct *curr = current;
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

[PATCH] Re: tools/liblockdep: Build failure

[Robin Hack]

From: Robin Hack <rhack@redhat.com>
Copy asmlinkage macro to lockdep/uinclude/linux/linkage.h.

diff --git a/tools/lib/lockdep/uinclude/linux/linkage.h b/tools/lib/lockdep/uinclude/linux/linkage.h
index fab00ff..6799a5b 100644
--- a/tools/lib/lockdep/uinclude/linux/linkage.h
+++ b/tools/lib/lockdep/uinclude/linux/linkage.h
@@ -1,3 +1,19 @@
+#ifndef _LOCKDEP_ULINKAGE_H
+#define _LOCKDEP_ULINKAGE_H
 
-/* empty file */
+#if GCC_VERSION >= 40600
+/*
+ * Tell the optimizer that something else uses this function or variable.
+ */
+#define __visible __attribute__((externally_visible))
+#else
+#define __visible
+#endif
 
+#define CPP_ASMLINKAGE __visible
+
+#ifndef asmlinkage
+#define asmlinkage CPP_ASMLINKAGE
+#endif
+
+#endif

Re: [PATCH] Re: tools/liblockdep: Build failure

[Robin Hack]

Patch is wrong.
On Tue, Apr 01, 2014 at 12:21:59PM +0200, Robin Hack wrote:
> From: Robin Hack <rhack@redhat.com>
> Copy asmlinkage macro to lockdep/uinclude/linux/linkage.h.
> 
> diff --git a/tools/lib/lockdep/uinclude/linux/linkage.h b/tools/lib/lockdep/uinclude/linux/linkage.h
> index fab00ff..6799a5b 100644
> --- a/tools/lib/lockdep/uinclude/linux/linkage.h
> +++ b/tools/lib/lockdep/uinclude/linux/linkage.h
> @@ -1,3 +1,19 @@
> +#ifndef _LOCKDEP_ULINKAGE_H
> +#define _LOCKDEP_ULINKAGE_H
>  
> -/* empty file */
> +#if GCC_VERSION >= 40600
> +/*
> + * Tell the optimizer that something else uses this function or variable.
> + */
> +#define __visible __attribute__((externally_visible))
> +#else
> +#define __visible
> +#endif
>  
> +#define CPP_ASMLINKAGE __visible
> +
> +#ifndef asmlinkage
> +#define asmlinkage CPP_ASMLINKAGE
> +#endif
> +
> +#endif
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH] Re: tools/liblockdep: Build failure

[Andi Kleen]

On Tue, Apr 01, 2014 at 12:21:59PM +0200, Robin Hack wrote:
> From: Robin Hack <rhack@redhat.com>
> Copy asmlinkage macro to lockdep/uinclude/linux/linkage.h.

You can just do 

#define asmlinkage 
#define __visible

for this case.  don't need all the ifdefs or the attribute in the
userspace build.

-Andi

Re: [PATCH] Re: tools/liblockdep: Build failure

[Sasha Levin]

On 04/01/2014 11:34 AM, Andi Kleen wrote:
> On Tue, Apr 01, 2014 at 12:21:59PM +0200, Robin Hack wrote:
>> From: Robin Hack <rhack@redhat.com>
>> Copy asmlinkage macro to lockdep/uinclude/linux/linkage.h.
>
> You can just do
>
> #define asmlinkage
> #define __visible

Thanks Andi,

I've queued it up along with another fix for Ingo.


Thanks,
Sasha