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

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.

+ 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 -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

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

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.

Quoted 1 line · Stephen Rothwell

That fixes the powerpc build for me, thanks.

Thx, adding your Tested-by and pushing out.

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.)