linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Pavo Banicevic <pavo.banicevic@sartura.hr>
To: linux@armlinux.org.uk, ast@kernel.org, daniel@iogearbox.net,
	andrii@kernel.org, kafai@fb.com, songliubraving@fb.com,
	yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org,
	nathan@kernel.org, ndesaulniers@google.com,
	ivan.khoronzhuk@linaro.org, linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, netdev@vger.kernel.org,
	bpf@vger.kernel.org, clang-built-linux@googlegroups.com,
	matt.redfearn@mips.com, mingo@kernel.org, dvlasenk@redhat.com,
	juraj.vijtiuk@sartura.hr, robert.marko@sartura.hr,
	luka.perkov@sartura.hr, jakov.petrina@sartura.hr
Subject: [PATCH 3/3] include/uapi/linux/swab: Fix potentially missing __always_inline
Date: Tue, 27 Jul 2021 16:11:19 +0200	[thread overview]
Message-ID: <20210727141119.19812-4-pavo.banicevic@sartura.hr> (raw)
In-Reply-To: <20210727141119.19812-1-pavo.banicevic@sartura.hr>

From: Matt Redfearn <matt.redfearn@mips.com>

Commit bc27fb68aaad ("include/uapi/linux/byteorder, swab: force inlining
of some byteswap operations") added __always_inline to swab functions
and commit 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to
userspace headers") added a definition of __always_inline for use in
exported headers when the kernel's compiler.h is not available.

However, since swab.h does not include stddef.h, if the header soup does
not indirectly include it, the definition of __always_inline is missing,
resulting in a compilation failure, which was observed compiling the
perf tool using exported headers containing this commit:

In file included from /usr/include/linux/byteorder/little_endian.h:12:0,
                 from /usr/include/asm/byteorder.h:14,
                 from tools/include/uapi/linux/perf_event.h:20,
                 from perf.h:8,
                 from builtin-bench.c:18:
/usr/include/linux/swab.h:160:8: error: unknown type name `__always_inline'
 static __always_inline __u16 __swab16p(const __u16 *p)

Fix this by replacing the inclusion of linux/compiler.h with
linux/stddef.h to ensure that we pick up that definition if required,
without relying on it's indirect inclusion. compiler.h is then included
indirectly, via stddef.h.

Fixes: 283d75737837 ("uapi/linux/stddef.h: Provide __always_inline to userspace headers")

Signed-off-by: Matt Redfearn <matt.redfearn@mips.com>
---
 include/uapi/linux/swab.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h
index 7272f85d6d6a..3736f2fe1541 100644
--- a/include/uapi/linux/swab.h
+++ b/include/uapi/linux/swab.h
@@ -3,7 +3,7 @@
 #define _UAPI_LINUX_SWAB_H
 
 #include <linux/types.h>
-#include <linux/compiler.h>
+#include <linux/stddef.h>
 #include <asm/bitsperlong.h>
 #include <asm/swab.h>
 
-- 
2.32.0


  parent reply	other threads:[~2021-07-27 14:13 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-27 14:11 [PATCH 0/3] Address compilation of eBPF related software with clang compiler on arm architecture Pavo Banicevic
2021-07-27 14:11 ` [PATCH 1/3] arm: include: asm: swab: mask rev16 instruction for clang Pavo Banicevic
2021-07-27 15:46   ` Yonghong Song
2021-07-27 17:53   ` Nick Desaulniers
2021-07-27 21:43     ` Andrii Nakryiko
2021-07-27 14:11 ` [PATCH 2/3] arm: include: asm: unified: mask .syntax unified " Pavo Banicevic
2021-07-27 17:55   ` Nick Desaulniers
2021-07-27 14:11 ` Pavo Banicevic [this message]
2021-07-28 13:49   ` [PATCH 3/3] include/uapi/linux/swab: Fix potentially missing __always_inline Petr Vaněk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210727141119.19812-4-pavo.banicevic@sartura.hr \
    --to=pavo.banicevic@sartura.hr \
    --cc=andrii@kernel.org \
    --cc=ast@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=clang-built-linux@googlegroups.com \
    --cc=daniel@iogearbox.net \
    --cc=dvlasenk@redhat.com \
    --cc=ivan.khoronzhuk@linaro.org \
    --cc=jakov.petrina@sartura.hr \
    --cc=john.fastabend@gmail.com \
    --cc=juraj.vijtiuk@sartura.hr \
    --cc=kafai@fb.com \
    --cc=kpsingh@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=luka.perkov@sartura.hr \
    --cc=matt.redfearn@mips.com \
    --cc=mingo@kernel.org \
    --cc=nathan@kernel.org \
    --cc=ndesaulniers@google.com \
    --cc=netdev@vger.kernel.org \
    --cc=robert.marko@sartura.hr \
    --cc=songliubraving@fb.com \
    --cc=yhs@fb.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).