From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E53E8C43327 for ; Thu, 2 Jul 2026 08:21:51 +0000 (UTC) Received: from boromir.ozlabs.org (localhost [127.0.0.1]) by lists.ozlabs.org (Postfix) with ESMTP id 4grVGY5FZQz2yjg; Thu, 02 Jul 2026 18:21:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; arc=none smtp.remote-ip="2a0a:51c0:0:12e:550::1" ARC-Seal: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1782980501; cv=none; b=I1r/rlPNjQYBhZn6xTlJh8Ns72sU8rQt8tLB3ZZ5gukU8dAnebblYBLyDD60MOGJH8Q6ro5mqPKAy7Hzv71sByyrbm4oKFETGGBaTfYymN6kJQGkgaz7p4rEn/UplX5EjsSYflaOnqeZI72zSON/6S762Vm1unc+tr9qYag13/d57PSn5TeII4HE215p8aLXoAbFu3wMOwGW884fDS1LOY0oTvOlOdTaWeXwSo8ACHWfWRrW12v9I9YZ3z9UszqlFtWQ5USuawmMBTZTTNn+WM1o/9CqivNH4IAM/s88/A01AHlD2tW5l9Ch5b+g0+/m6RWPpMo54/dJkmLXM7Z0og== ARC-Message-Signature: i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1782980501; c=relaxed/relaxed; bh=oVHOIJRddqovqhLIkcVxRsjGq4Z6rx7B7PnZY9VPT4I=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=G4SboVwL803fVHbItUliHAXlARCy8XqYSb5SWj9fNFNQnBaX4BpVgzWVJsW0XLSCTaHntnoGpsYhx2rJvabbBUs8i4PaB9Z3jer9AY5stVQExL+TECUjuAVMDQDd+Aeas0+QkynPhHPKPIjdMmD/D/lFaE8+k1QBiLVjpYyxmMGLMVQhVQz94SWnn2UHoejfNsmChkyvYusuZ1NXPB0zN0fioXcLJVuDmIte78JQxGVaGzincNsaKE4yb0d8Ba4BIzaSWU/xW36C6qh9ett5e9Jd7hrULlc6jtWgYTEi50Rfo3eLwAFVfUXcqEtWZQBHa0asiNxSBACfRPGOL2PWOQ== ARC-Authentication-Results: i=1; lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; dkim=pass (2048-bit key; secure) header.d=linutronix.de header.i=@linutronix.de header.a=rsa-sha256 header.s=2020 header.b=CrqNSPHy; dkim=pass header.d=linutronix.de header.i=@linutronix.de header.a=ed25519-sha256 header.s=2020e header.b=bH2TeRMa; dkim-atps=neutral; spf=pass (client-ip=2a0a:51c0:0:12e:550::1; helo=galois.linutronix.de; envelope-from=t-8ch@linutronix.de; receiver=lists.ozlabs.org) smtp.mailfrom=linutronix.de Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=linutronix.de header.i=@linutronix.de header.a=rsa-sha256 header.s=2020 header.b=CrqNSPHy; dkim=pass header.d=linutronix.de header.i=@linutronix.de header.a=ed25519-sha256 header.s=2020e header.b=bH2TeRMa; dkim-atps=neutral Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=linutronix.de (client-ip=2a0a:51c0:0:12e:550::1; helo=galois.linutronix.de; envelope-from=t-8ch@linutronix.de; receiver=lists.ozlabs.org) Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4grVGX68ybz2xJT for ; Thu, 02 Jul 2026 18:21:40 +1000 (AEST) From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1782980498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oVHOIJRddqovqhLIkcVxRsjGq4Z6rx7B7PnZY9VPT4I=; b=CrqNSPHyhom5WgeS9I7ky45yoXIHJoKQgYMjL0NZOctLFla3kj1N1jzVeb4rWahsXS+m4i QwMCY3L8pCKRqHeleuqxYHcSC1XHXRVIUKNzs3e2A0ZLBDeoXKrNiEibRwNc8utICysDN4 x3iceWDda0BXgcnL/3WxsQU7MvyJjZn4LDN5YIsKPSLUhblS4rgnCPC11OQniRdWGE5Fqf jGvvzwJhdNVZ2uelRpaOoPkUPVbkgKsY2Z/5cYGKL5ECPC4wdHaB7iizrX5X7FoU9247mA HmbeveG53Vfy2HK50Lk8FYHPenSrMUhJVf/LOu2Lm2Gwb9q+dRjQF7PUyQmasA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1782980498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oVHOIJRddqovqhLIkcVxRsjGq4Z6rx7B7PnZY9VPT4I=; b=bH2TeRMa04lMzbfJdlIYZdVgAopNHrNmilJxFn/x99PPJWA/USXFkSUJ3EhH652Vh++h6X qE3itSWwWztZJMDQ== Date: Thu, 02 Jul 2026 10:21:28 +0200 Subject: [PATCH v3 4/9] arm64: vdso32: Respect COMPAT_32BIT_TIME X-Mailing-List: linuxppc-dev@lists.ozlabs.org List-Id: List-Help: List-Owner: List-Post: List-Archive: , List-Subscribe: , , List-Unsubscribe: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260702-vdso-compat_32bit_time-v3-4-db9f36d8d432@linutronix.de> References: <20260702-vdso-compat_32bit_time-v3-0-db9f36d8d432@linutronix.de> In-Reply-To: <20260702-vdso-compat_32bit_time-v3-0-db9f36d8d432@linutronix.de> To: Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Russell King , Catalin Marinas , Will Deacon , Madhavan Srinivasan , Michael Ellerman , Nicholas Piggin , "Christophe Leroy (CS GROUP)" , Thomas Bogendoerfer , Vincenzo Frascino , John Stultz , Stephen Boyd , "David S. Miller" , Andreas Larsson Cc: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, linux-mips@vger.kernel.org, Arnd Bergmann , linux-api@vger.kernel.org, sparclinux@vger.kernel.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1782980489; l=2429; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=s479PRbMVDXdIvbdPYAU8IZbXFBmioP81XZuIIwdP44=; b=jw72k2yu/phtrz+ZvTR0e9wnDBwUTGnyGSS31EPml2CC3DbTHtM5JXq9trW3betwaWO2xq3s/ APMfjUxDOpGAZXgiGfV9W09+JSA5KhkO1JWxkRWhns7uS5Aya1/9/1B X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= If CONFIG_COMPAT_32BIT_TIME is disabled then the vDSO should not provide any 32-bit time related functionality. This is the intended effect of the kconfig option and also the fallback system calls would also not be implemented. Signed-off-by: Thomas Weißschuh Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Arnd Bergmann --- arch/arm64/kernel/vdso32/vdso.lds.S | 2 ++ arch/arm64/kernel/vdso32/vgettimeofday.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kernel/vdso32/vdso.lds.S b/arch/arm64/kernel/vdso32/vdso.lds.S index c374fb0146f3..12bfc39e8aab 100644 --- a/arch/arm64/kernel/vdso32/vdso.lds.S +++ b/arch/arm64/kernel/vdso32/vdso.lds.S @@ -82,9 +82,11 @@ VERSION { LINUX_2.6 { global: +#ifdef CONFIG_COMPAT_32BIT_TIME __vdso_clock_gettime; __vdso_gettimeofday; __vdso_clock_getres; +#endif /* CONFIG_COMPAT_32BIT_TIME */ __vdso_clock_gettime64; __vdso_clock_getres_time64; local: *; diff --git a/arch/arm64/kernel/vdso32/vgettimeofday.c b/arch/arm64/kernel/vdso32/vgettimeofday.c index 0c6998ebe491..12d0255cc2cf 100644 --- a/arch/arm64/kernel/vdso32/vgettimeofday.c +++ b/arch/arm64/kernel/vdso32/vgettimeofday.c @@ -8,16 +8,17 @@ #define BUILD_VDSO32_64 #include +#ifdef CONFIG_COMPAT_32BIT_TIME int __vdso_clock_gettime(clockid_t clock, struct old_timespec32 *ts) { return __cvdso_clock_gettime32(clock, ts); } -int __vdso_clock_gettime64(clockid_t clock, - struct __kernel_timespec *ts) +int __vdso_clock_getres(clockid_t clock_id, + struct old_timespec32 *res) { - return __cvdso_clock_gettime(clock, ts); + return __cvdso_clock_getres_time32(clock_id, res); } int __vdso_gettimeofday(struct __kernel_old_timeval *tv, @@ -25,11 +26,12 @@ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, { return __cvdso_gettimeofday(tv, tz); } +#endif /* CONFIG_COMPAT_32BIT_TIME */ -int __vdso_clock_getres(clockid_t clock_id, - struct old_timespec32 *res) +int __vdso_clock_gettime64(clockid_t clock, + struct __kernel_timespec *ts) { - return __cvdso_clock_getres_time32(clock_id, res); + return __cvdso_clock_gettime(clock, ts); } int __vdso_clock_getres_time64(clockid_t clock_id, struct __kernel_timespec *res) -- 2.55.0