From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 94D3042A780; Thu, 2 Jul 2026 08:21:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782980501; cv=none; b=jMwRzhYq3Bnnsmi8P5c6fv3ZR/Bo7aty+sdR96BGHnU3lETE78IliKbizJrlJ61Q8RdarSt/hgmy0eXiVxyEBxqTANfjyRFuvrxhpGG7/Ltx2WEQooRpe76xfEg6QvNyAYRLGEKlPLPSPcPVWZsFNNdv1ln5A88gqj1w1qR9Rxc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782980501; c=relaxed/simple; bh=ES3WKPDyUgyS4mPZBdPnY42fiogZCV5UazSQTeq58Dk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=gGPbr07DJZAa6Y6bWJ29GIcdJqTQp0l4wgpkY2IVerVLMEK0Fa/xAgFkp6hLmnasoem2nQZ2XuYcXfjgBhYl18JLUC5uA8TYPyRacH+HvkHe3SfqfWKdZeCf8390Taqdrwsv7KCwB5ndkKWZlIqvtWlVjeYlUSrCbKQMIM0Vles= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=zIUckbgh; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=mzvGG3dO; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="zIUckbgh"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="mzvGG3dO" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1782980499; 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=+lF/nwHjua943bbA428Xe7dIjOUux5tR7dU/qOukkB0=; b=zIUckbghrVUWq++3SdwGiNS6hqtwL1ECE/nGMKBxSzyoK0nNuEQlPC9olbDNMF4LyX0DaD D9jsQJgfpptuGSBiygZMLxvc8xM5JPlTNq/+/usMun6pndhcmi8+cAGDjeMZBD8CVSWjMC cSxTX4O+9hFM2EXNLrc1cCrHMJ09RdlGSXV3zIBp1BGrSbX5AGRx+3tDyEshidtpxCKTbf Iw2mfti3Ve+tCM9dI6iAGNm5VM3jkSEBKK3MfJjAKUFGTOO9bv1Y6oQ2WYlsZM767k7o3w BBR9FZV6OH99wAQpqY+31OLLg/bCcoibEM0T7udoPGbaTJSwx1EDbCYTkmyaYw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1782980499; 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=+lF/nwHjua943bbA428Xe7dIjOUux5tR7dU/qOukkB0=; b=mzvGG3dOcZHn3Bw/VMQq3Xn/YGXVidMo+yuUs/NZ8JkXHKA9jalYehmEdgClhub48HYaD0 Xd54bdWSzOK2epAg== Date: Thu, 02 Jul 2026 10:21:29 +0200 Subject: [PATCH v3 5/9] ARM: VDSO: Respect COMPAT_32BIT_TIME Precedence: bulk X-Mailing-List: linux-api@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260702-vdso-compat_32bit_time-v3-5-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=2321; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=ES3WKPDyUgyS4mPZBdPnY42fiogZCV5UazSQTeq58Dk=; b=ybrdOPQuXpKp06a4BqOOw7OeR9tiucSdB1PuF41euwS2bSZTkMgA8GwtnbkNpvOB/AYkjXRhC CJQa5ZQgOsyChDKK/jbOt1p/WQCBYmDgYI3F5wUWT0kXdflZin1iR+t 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/arm/vdso/vdso.lds.S | 2 ++ arch/arm/vdso/vgettimeofday.c | 14 ++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/arm/vdso/vdso.lds.S b/arch/arm/vdso/vdso.lds.S index 74d8d8bc8a40..e61038c0195a 100644 --- a/arch/arm/vdso/vdso.lds.S +++ b/arch/arm/vdso/vdso.lds.S @@ -70,9 +70,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/arm/vdso/vgettimeofday.c b/arch/arm/vdso/vgettimeofday.c index f7a2f5dc2fdc..3eebeddbfd18 100644 --- a/arch/arm/vdso/vgettimeofday.c +++ b/arch/arm/vdso/vgettimeofday.c @@ -10,16 +10,17 @@ #include #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, @@ -27,11 +28,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