From: Arnd Bergmann <arnd@kernel•org>
To: Thomas Gleixner <tglx@linutronix•de>,
Vincenzo Frascino <vincenzo.frascino@arm•com>,
Kees Cook <keescook@chromium•org>,
Anna-Maria Behnsen <anna-maria@linutronix•de>
Cc: x86@kernel•org, loongarch@lists•linux.dev,
Andreas Larsson <andreas@gaisler•com>,
Catalin Marinas <catalin.marinas@arm•com>,
linux-mips@vger•kernel.org, Max Filippov <jcmvbkbc@gmail•com>,
Guo Ren <guoren@kernel•org>,
linux-csky@vger•kernel.org, sparclinux@vger•kernel.org,
linux-hexagon@vger•kernel.org, linux-riscv@lists•infradead.org,
Jan Kiszka <jan.kiszka@siemens•com>,
linux-s390@vger•kernel.org, linux-sh@vger•kernel.org,
Richard Weinberger <richard@nod•at>, Helge Deller <deller@gmx•de>,
Huacai Chen <chenhuacai@kernel•org>,
Russell King <linux@armlinux•org.uk>,
Geert Uytterhoeven <geert@linux-m68k•org>,
Vineet Gupta <vgupta@kernel•org>,
Matt Turner <mattst88@gmail•com>,
linux-snps-arc@lists•infradead.org, linux-alpha@vger•kernel.org,
Arnd Bergmann <arnd@arndb•de>,
Kieran Bingham <kbingham@kernel•org>,
linux-um@lists•infradead.org, linux-m68k@lists•linux-m68k.org,
Andy Lutomirski <luto@kernel•org>,
John Paul Adrian Glaubitz <glaubitz@physik•fu-berlin.de>,
linux-arm-kernel@lists. infradead.org,
Brian Cain <bcain@quicinc•com>, Michal Simek <monstr@monstr•eu>,
Thomas Bogendoerfer <tsbogend@alpha•franken.de>,
Linux Kernel Functional Testing <lkft@linaro•org>,
linux-parisc@vger•kernel.org, linux-openrisc@vger•kernel.org,
linux-kernel@vger•kernel.org, Palmer Dabbelt <palmer@dabbelt•com>,
Andrew Morton <akpm@linux-foundation•org>,
linuxppc-dev@lists•ozlabs.org
Subject: [PATCH 4/4] vdso: avoid including asm/page.h
Date: Mon, 26 Feb 2024 17:14:14 +0100 [thread overview]
Message-ID: <20240226161414.2316610-5-arnd@kernel.org> (raw)
In-Reply-To: <20240226161414.2316610-1-arnd@kernel.org>
From: Arnd Bergmann <arnd@arndb•de>
The recent change to the vdso_data_store broke building compat VDSO
on at least arm64 because it includes headers outside of the include/vdso/
namespace:
In file included from arch/arm64/include/asm/lse.h:5,
from arch/arm64/include/asm/cmpxchg.h:14,
from arch/arm64/include/asm/atomic.h:16,
from include/linux/atomic.h:7,
from include/asm-generic/bitops/atomic.h:5,
from arch/arm64/include/asm/bitops.h:25,
from include/linux/bitops.h:68,
from arch/arm64/include/asm/memory.h:209,
from arch/arm64/include/asm/page.h:46,
from include/vdso/datapage.h:22,
from lib/vdso/gettimeofday.c:5,
from <command-line>:
arch/arm64/include/asm/atomic_ll_sc.h:298:9: error: unknown type name 'u128'
298 | u128 full;
Use an open-coded page size calculation based on the new CONFIG_PAGE_SHIFT
Kconfig symbol instead.
Reported-by: Linux Kernel Functional Testing <lkft@linaro•org>
Fixes: a0d2fcd62ac2 ("vdso/ARM: Make union vdso_data_store available for all architectures")
Link: https://lore.kernel.org/lkml/CA+G9fYtrXXm_KO9fNPz3XaRxHV7UD_yQp-TEuPQrNRHU+_0W_Q@mail.gmail.com/
Signed-off-by: Arnd Bergmann <arnd@arndb•de>
---
include/vdso/datapage.h | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/include/vdso/datapage.h b/include/vdso/datapage.h
index 7ba44379a095..2c39a67d7e23 100644
--- a/include/vdso/datapage.h
+++ b/include/vdso/datapage.h
@@ -19,8 +19,6 @@
#include <vdso/time32.h>
#include <vdso/time64.h>
-#include <asm/page.h>
-
#ifdef CONFIG_ARCH_HAS_VDSO_DATA
#include <asm/vdso/data.h>
#else
@@ -128,7 +126,7 @@ extern struct vdso_data _timens_data[CS_BASES] __attribute__((visibility("hidden
*/
union vdso_data_store {
struct vdso_data data[CS_BASES];
- u8 page[PAGE_SIZE];
+ u8 page[1ul << CONFIG_PAGE_SHIFT];
};
/*
--
2.39.2
next prev parent reply other threads:[~2024-02-26 16:18 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-26 16:14 [PATCH 0/4] arch: mm, vdso: consolidate PAGE_SIZE definition Arnd Bergmann
2024-02-26 16:14 ` [PATCH 1/4] arch: consolidate existing CONFIG_PAGE_SIZE_*KB definitions Arnd Bergmann
2024-02-26 16:55 ` Samuel Holland
2024-02-27 15:40 ` Arnd Bergmann
2024-02-27 15:44 ` Christophe Leroy
2024-02-27 15:48 ` Arnd Bergmann
2024-02-26 19:02 ` Christophe Leroy
2024-02-27 15:42 ` Arnd Bergmann
2024-02-27 8:45 ` Geert Uytterhoeven
2024-02-27 15:43 ` Arnd Bergmann
2024-02-26 16:14 ` [PATCH 2/4] arch: simplify architecture specific page size configuration Arnd Bergmann
2024-02-26 19:05 ` Christophe Leroy
2024-02-27 13:46 ` Catalin Marinas
2024-02-27 13:53 ` Helge Deller
2024-02-26 16:14 ` [PATCH 3/4] arch: define CONFIG_PAGE_SIZE_*KB on all architectures Arnd Bergmann
2024-02-27 0:49 ` Guo Ren
2024-02-27 7:41 ` Heiko Carstens
2024-02-27 8:54 ` Geert Uytterhoeven
2024-02-27 10:59 ` Arnd Bergmann
2024-02-27 11:12 ` Geert Uytterhoeven
2024-02-27 14:18 ` Arnd Bergmann
2024-02-28 21:06 ` Stafford Horne
2024-03-05 10:59 ` Johannes Berg
2024-02-26 16:14 ` Arnd Bergmann [this message]
2024-02-26 18:53 ` [PATCH 4/4] vdso: avoid including asm/page.h Christophe Leroy
2024-02-27 12:57 ` Michael Ellerman
2024-02-27 13:46 ` Catalin Marinas
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=20240226161414.2316610-5-arnd@kernel.org \
--to=arnd@kernel$(echo .)org \
--cc=akpm@linux-foundation$(echo .)org \
--cc=andreas@gaisler$(echo .)com \
--cc=anna-maria@linutronix$(echo .)de \
--cc=arnd@arndb$(echo .)de \
--cc=bcain@quicinc$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=chenhuacai@kernel$(echo .)org \
--cc=deller@gmx$(echo .)de \
--cc=geert@linux-m68k$(echo .)org \
--cc=glaubitz@physik$(echo .)fu-berlin.de \
--cc=guoren@kernel$(echo .)org \
--cc=jan.kiszka@siemens$(echo .)com \
--cc=jcmvbkbc@gmail$(echo .)com \
--cc=kbingham@kernel$(echo .)org \
--cc=keescook@chromium$(echo .)org \
--cc=linux-alpha@vger$(echo .)kernel.org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-csky@vger$(echo .)kernel.org \
--cc=linux-hexagon@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-m68k@lists$(echo .)linux-m68k.org \
--cc=linux-mips@vger$(echo .)kernel.org \
--cc=linux-openrisc@vger$(echo .)kernel.org \
--cc=linux-parisc@vger$(echo .)kernel.org \
--cc=linux-riscv@lists$(echo .)infradead.org \
--cc=linux-s390@vger$(echo .)kernel.org \
--cc=linux-sh@vger$(echo .)kernel.org \
--cc=linux-snps-arc@lists$(echo .)infradead.org \
--cc=linux-um@lists$(echo .)infradead.org \
--cc=linux@armlinux$(echo .)org.uk \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=lkft@linaro$(echo .)org \
--cc=loongarch@lists$(echo .)linux.dev \
--cc=luto@kernel$(echo .)org \
--cc=mattst88@gmail$(echo .)com \
--cc=monstr@monstr$(echo .)eu \
--cc=palmer@dabbelt$(echo .)com \
--cc=richard@nod$(echo .)at \
--cc=sparclinux@vger$(echo .)kernel.org \
--cc=tglx@linutronix$(echo .)de \
--cc=tsbogend@alpha$(echo .)franken.de \
--cc=vgupta@kernel$(echo .)org \
--cc=vincenzo.frascino@arm$(echo .)com \
--cc=x86@kernel$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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