Received-SPF: pass (google.com: domain of linux-kernel+bounces-83428-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <46b1d475-4542-4840-8685-6a3d2f9b5002@arm.com>
Date: Tue, 27 Feb 2024 14:46:03 +0000
Precedence: bulk
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] vdso/datapage: Quick fix - use asm/page-def.h for ARM64
Content-Language: en-US
To: Anna-Maria Behnsen <anna-maria@linutronix.de>,
 linux-kernel@vger.kernel.org
Cc: Andy Lutomirski <luto@kernel.org>, Thomas Gleixner <tglx@linutronix.de>,
 Arnd Bergmann <arnd@kernel.org>, Kees Cook <keescook@chromium.org>,
 Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>,
 linux-arm-kernel@lists.infradead.org,
 Linux Kernel Functional Testing <lkft@linaro.org>
References: <20240226175023.56679-1-anna-maria@linutronix.de>
From: Vincenzo Frascino <vincenzo.frascino@arm.com>
In-Reply-To: <20240226175023.56679-1-anna-maria@linutronix.de>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit


On 26/02/2024 17:50, Anna-Maria Behnsen wrote:
> The vdso rework for the generic union vdso_data_store broke compat VDSO on
> arm64:
> 
> 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;
>       |         ^~~~
> arch/arm64/include/asm/atomic_ll_sc.h:305:24: error: unknown type name 'u128'
>   305 | static __always_inline u128
> 	 \
>       |
> 
> The reason is the include of asm/page.h which in turn includes headers
> which are outside the scope of compat VDSO. The only reason for the
> asm/page.h include is the required definition of PAGE_SIZE. But as arm64
> defines PAGE_SIZE in asm/page-def.h without extra header includes, this
> could be used instead.
> 
> Caution: this is a quick fix only! The final fix is an upcoming cleanup of
> Arnd which consolidates PAGE_SIZE definition. After the cleanup, the
> include of asm/page.h to access PAGE_SIZE is no longer required.
> 
> 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: Anna-Maria Behnsen <anna-maria@linutronix.de>
> ---
> 
> Patch applies on tip/timers/core and was tested with clang-14

Waiting for Arnd's fix:

Acked-by: Vincenzo Frascino <vincenzo.frascino@arm.com>