linux-next: build failure after merge of the tip tree

DISCUSSION Applied Stephen Rothwell 6 participants 9 messages Mar 17, 2021 Linux-next tree

lore

Share & tools

lore

Stephen Rothwell

author

2021-03-17 04:10 UTC #0 lore raw

Hi all,

After merging the tip tree, today's linux-next build (native perf) failed like this:

In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory
14 | #include <asm/inat.h> /*__ignore_sync_check__ */

      |          ^~~~~~~~~~~~

This is a powerpc build of perf. I can't see what caused this failure, so I have used the version of the tip tree from next-20210316 for today.

Signature · 2 lines

Cheers,
Stephen Rothwell

Borislav Petkov

2021-03-17 10:55 UTC #1 lore raw

+ Ian.

Quoted 5 lines · Stephen Rothwell

Hi all,
After merging the tip tree, today's linux-next build (native perf) failed like this:

Quoted 7 lines

In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory
14 | #include <asm/inat.h> /*__ignore_sync_check__ */
      |          ^~~~~~~~~~~~
This is a powerpc build of perf. I can't see what caused this failure, so I have used the version of the tip tree from next-20210316 for today.

Yah, this has come up in the past during review but the wrong version somehow snuck in, sorry. ;-\

Can you guys verify this fixes the build issue? I don't have a ppc build setup.

Thx.

---
From 50d91054fc421e2a90923706d5ca79e941e28300 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Wed, 17 Mar 2021 11:33:04 +0100
Subject: [PATCH] tools/insn: Restore the relative include paths for cross
building

Building perf on ppc causes:

In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory

     14 | #include <asm/inat.h> /*__ignore_sync_check__ */
        |          ^~~~~~~~~~~~

Restore the relative include paths so that the compiler can find the headers.

Fixes 93281c4a9657 ("x86/insn: Add an insn_decode() API")

Reported-by Ian Rogers <[email protected]>

Reported-by Stephen Rothwell <[email protected]>

NOT-Signed-off-by Borislav Petkov <[email protected]>

---
 tools/arch/x86/lib/insn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

tools/arch/x86/lib/insn.c +2 -2

index cd4dedde3265..999fbd4c9bea 100644
@@ -11,8 +11,8 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h> /*__ignore_sync_check__ */
-#include <asm/insn.h> /* __ignore_sync_check__ */
+#include "../include/asm/inat.h" /* __ignore_sync_check__ */
+#include "../include/asm/insn.h" /* __ignore_sync_check__ */
 
 #include <linux/errno.h>
 #include <linux/kconfig.h>

Signature · 7 lines

2.29.2

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Ian Rogers

2021-03-17 16:23 UTC #2 lore raw

Quoted 17 lines · Borislav Petkov

+ Ian.
Quoted 5 lines · Stephen Rothwell
Hi all,
After merging the tip tree, today's linux-next build (native perf) failed like this:
Quoted 7 lines
In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory
14 | #include <asm/inat.h> /*__ignore_sync_check__ */
      |          ^~~~~~~~~~~~
This is a powerpc build of perf. I can't see what caused this failure, so I have used the version of the tip tree from next-20210316 for today.

Quoted 7 lines

Yah, this has come up in the past during review but the wrong version somehow snuck in, sorry. ;-\
Can you guys verify this fixes the build issue? I don't have a ppc build setup.
Thx.

The <asm/emulate_prefix.h> path also needs fixing. With the following I was able to build for arm64 and powerpc.

Thanks,
Ian

tools/arch/x86/lib/insn.c +3 -3

index cd4dedde3265..968360bf2150 100644
@@ -11,13 +11,13 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h> /*__ignore_sync_check__ */
-#include <asm/insn.h> /* __ignore_sync_check__ */
+#include "../include/asm/inat.h" /*__ignore_sync_check__ */
+#include "../include/asm/insn.h" /* __ignore_sync_check__ */
 
 #include <linux/errno.h>
 #include <linux/kconfig.h>
 
-#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */
+#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */
 
 #define leXX_to_cpu(t, r)                                              \
 ({                                                                     \

Quoted 48 lines

---
From 50d91054fc421e2a90923706d5ca79e941e28300 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Wed, 17 Mar 2021 11:33:04 +0100
Subject: [PATCH] tools/insn: Restore the relative include paths for cross
building
Building perf on ppc causes:
In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory
     14 | #include <asm/inat.h> /*__ignore_sync_check__ */
        |          ^~~~~~~~~~~~
Restore the relative include paths so that the compiler can find the headers.
Fixes 93281c4a9657 ("x86/insn: Add an insn_decode() API")
Reported-by Ian Rogers <[email protected]>
Reported-by Stephen Rothwell <[email protected]>
NOT-Signed-off-by Borislav Petkov <[email protected]>
---
 tools/arch/x86/lib/insn.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/arch/x86/lib/insn.c +2 -3
index cd4dedde3265..999fbd4c9bea 100644
@@ -11,8 +11,8 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h> /*__ignore_sync_check__ */
-#include <asm/insn.h> /* __ignore_sync_check__ */
+#include "../include/asm/inat.h" /* __ignore_sync_check__ */
+#include "../include/asm/insn.h" /* __ignore_sync_check__ */
 
 #include <linux/errno.h>
 #include <linux/kconfig.h>
--
2.29.2
--
Regards/Gruss,
Boris.
SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Borislav Petkov

Tested-by Ian Rogers

2021-03-17 18:03 UTC #3 lore raw

Quoted 2 lines · Ian Rogers

The <asm/emulate_prefix.h> path also needs fixing. With the following I was able to build for arm64 and powerpc.

Thanks, I've updated and added your Tested-by. I'll give sfr a chance to test and queue it tomorrow.

---
From d242b2639a23ed03d9aed94cf05b99af5343d4e9 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Wed, 17 Mar 2021 11:33:04 +0100
Subject: [PATCH] tools/insn: Restore the relative include paths for cross building

Building perf on ppc causes:

In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory

     14 | #include <asm/inat.h> /*__ignore_sync_check__ */
        |          ^~~~~~~~~~~~

Restore the relative include paths so that the compiler can find the headers.

Fixes 93281c4a9657 ("x86/insn: Add an insn_decode() API")

Reported-by Ian Rogers <[email protected]>

Reported-by Stephen Rothwell <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

Tested-by Ian Rogers <[email protected]>

---
 tools/arch/x86/lib/insn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

tools/arch/x86/lib/insn.c +3 -3

index cd4dedde3265..c41f95815480 100644
@@ -11,13 +11,13 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h> /*__ignore_sync_check__ */
-#include <asm/insn.h> /* __ignore_sync_check__ */
+#include "../include/asm/inat.h" /* __ignore_sync_check__ */
+#include "../include/asm/insn.h" /* __ignore_sync_check__ */
 
 #include <linux/errno.h>
 #include <linux/kconfig.h>
 
-#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */
+#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */
 
 #define leXX_to_cpu(t, r)						\
 ({									\

Signature · 7 lines

2.29.2

-- 
Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Stephen Rothwell

author

2021-03-17 18:50 UTC #4 lore raw

Hi Borislav,

Quoted 56 lines · On Wed, 17 Mar 2021 19:02:36 +0100 Borislav Petkov <[email protected]> wrote:

Quoted 2 lines · Ian Rogers
The <asm/emulate_prefix.h> path also needs fixing. With the following I was able to build for arm64 and powerpc.
Thanks, I've updated and added your Tested-by. I'll give sfr a chance to test and queue it tomorrow.
---
From d242b2639a23ed03d9aed94cf05b99af5343d4e9 Mon Sep 17 00:00:00 2001
From: Borislav Petkov <[email protected]>
Date: Wed, 17 Mar 2021 11:33:04 +0100
Subject: [PATCH] tools/insn: Restore the relative include paths for cross building
Building perf on ppc causes:
In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory
     14 | #include <asm/inat.h> /*__ignore_sync_check__ */
        |          ^~~~~~~~~~~~
Restore the relative include paths so that the compiler can find the headers.
Fixes 93281c4a9657 ("x86/insn: Add an insn_decode() API")
Reported-by Ian Rogers <[email protected]>
Reported-by Stephen Rothwell <[email protected]>
Signed-off-by Borislav Petkov <[email protected]>
Tested-by Ian Rogers <[email protected]>
---
 tools/arch/x86/lib/insn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/arch/x86/lib/insn.c +3 -3
index cd4dedde3265..c41f95815480 100644
@@ -11,13 +11,13 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h> /*__ignore_sync_check__ */
-#include <asm/insn.h> /* __ignore_sync_check__ */
+#include "../include/asm/inat.h" /* __ignore_sync_check__ */
+#include "../include/asm/insn.h" /* __ignore_sync_check__ */
 
 #include <linux/errno.h>
 #include <linux/kconfig.h>
 
-#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */
+#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */
 
 #define leXX_to_cpu(t, r)						\
 ({									\
Signature · 1 line
2.29.2

That fixes the powerpc build for me, thanks.

Signature · 2 lines

Cheers,
Stephen Rothwell

Borislav Petkov

2021-03-17 19:19 UTC #5 lore raw

Quoted 1 line · Stephen Rothwell

That fixes the powerpc build for me, thanks.

Thx, adding your Tested-by and pushing out.

Signature · 4 lines

Regards/Gruss,
    Boris.

SUSE Software Solutions Germany GmbH, GF: Felix Imendörffer, HRB 36809, AG Nürnberg

Ingo Molnar

2021-03-17 20:05 UTC #6 lore raw

Quoted 4 lines · Borislav Petkov

Quoted 1 line · Stephen Rothwell
That fixes the powerpc build for me, thanks.
Thx, adding your Tested-by and pushing out.

I've pushed this out into tip:auto-latest as well, so that tomorrow's -next should pick this up automatically. (Assuming everything else is fine.)

Thanks,

Ingo

Stephen Rothwell

2021-03-17 22:03 UTC #7 lore raw

Hi Ingo,

Quoted 11 lines · On Wed, 17 Mar 2021 21:04:08 +0100 Ingo Molnar <[email protected]> wrote:

Quoted 4 lines · Borislav Petkov
Quoted 1 line · Stephen Rothwell
That fixes the powerpc build for me, thanks.
Thx, adding your Tested-by and pushing out.
I've pushed this out into tip:auto-latest as well, so that tomorrow's -next should pick this up automatically. (Assuming everything else is fine.)

Excellent, thanks.

Signature · 2 lines

Cheers,
Stephen Rothwell

tip-bot2 for Borislav Petkov

merge bot Applied

2021-03-17 19:33 UTC #8 lore raw

[tip: x86/core] tools/insn: Restore the relative include paths for cross building

In reply to Stephen Rothwell

The following commit has been merged into the x86/core branch of tip:

Commit-ID:     0705ef64d1ff52b817e278ca6e28095585ff31e1
Gitweb:        https://git.kernel.org/tip/0705ef64d1ff52b817e278ca6e28095585ff31e1
Author:        Borislav Petkov <[email protected]>
AuthorDate:    Wed, 17 Mar 2021 11:33:04 +01:00
Committer:     Borislav Petkov <[email protected]>
CommitterDate: Wed, 17 Mar 2021 20:17:05 +01:00

tools/insn: Restore the relative include paths for cross building

Building perf on ppc causes:

In file included from util/intel-pt-decoder/intel-pt-insn-decoder.c:15:
util/intel-pt-decoder/../../../arch/x86/lib/insn.c:14:10: fatal error: asm/inat.h: No such file or directory

     14 | #include <asm/inat.h> /*__ignore_sync_check__ */
        |          ^~~~~~~~~~~~

Restore the relative include paths so that the compiler can find the headers.

Fixes 93281c4a9657 ("x86/insn: Add an insn_decode() API")

Reported-by Ian Rogers <[email protected]>

Reported-by Stephen Rothwell <[email protected]>

Signed-off-by Borislav Petkov <[email protected]>

Tested-by Ian Rogers <[email protected]>

Tested-by Stephen Rothwell <[email protected]>

Link https://lkml.kernel.org/r/[email protected] open here

---
 tools/arch/x86/lib/insn.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

tools/arch/x86/lib/insn.c +3 -3

index cd4dedd..c41f958 100644
@@ -11,13 +11,13 @@
 #else
 #include <string.h>
 #endif
-#include <asm/inat.h> /*__ignore_sync_check__ */
-#include <asm/insn.h> /* __ignore_sync_check__ */
+#include "../include/asm/inat.h" /* __ignore_sync_check__ */
+#include "../include/asm/insn.h" /* __ignore_sync_check__ */
 
 #include <linux/errno.h>
 #include <linux/kconfig.h>
 
-#include <asm/emulate_prefix.h> /* __ignore_sync_check__ */
+#include "../include/asm/emulate_prefix.h" /* __ignore_sync_check__ */
 
 #define leXX_to_cpu(t, r)						\
 ({									\