From nobody Sun May 24 21:39:30 2026 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 2D5ED384CF6; Thu, 21 May 2026 06:53:20 +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=1779346402; cv=none; b=W9aBt4+RvIL0jqa51cK2Wk0ja26fpjOo810U55ZUmED10N03fAFRiaht32n+cStXH3ERK0MankOhl7j3t29SNqh+ozdtFRlxN137Vo0SBjaLp4q5sJ8/+WbybUl8ErxtKIjBVi28LMGcSnubG0/r6gyFN+C6CcV4kjeomzomMq4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346402; c=relaxed/simple; bh=13cLvGZZ6A4vhrhuxgcectzpmVhX9ANUNsQxSTkRb6Y=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=iHWLuAZ4e8KUpmL7l91h9RHH9OJzW14w1EU6mc+RALPGQXMnnum/pgep5hhOgLq6KI1y2ZsMQqp5HoPTJ7cpl+w1T3yIbkNs9kp1rQK2vgB8mUrDJvQNYKE5+34rrZkqi3z+zo6GbbieNHke10e8ThhRjWazmScPe2jdn0IntQI= 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=ClZiqWOI; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=yXA5RG9C; 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="ClZiqWOI"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="yXA5RG9C" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346399; 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=VQ37MDaIkKRVYt3r1jO04bLsBtL2wGv/MXye3TsflZE=; b=ClZiqWOISRcFWpI3PU3taoOBMYLnaLMdke8aE6+HRa9GDyk722T2F7o65lbpKXpwH35yOY P2ig3wPTlT+eKEaAhg6p2nNr8ABqlx5zf8sbjNw/OLTrEPqiOKtUr9qvsdICGZpIxnpLoF wEr8fgO+nWVvpXMYOMt/0hii/n4yfhHvasxBWty3c0m41SZPbiHdlUv3xg3ZVTrxgotBRf JQ/BuzjrEE91exvz26JlahFBfr0N5fKOpLIMZR69WHpEl/XOYiyvHlchC0Gf+uzh2pEYgd vpVMsrQfgTJPp2t2/lhkQNSWK7nleNyI9JYqLWGLumXKYdFKcp5L8KcLeDdulA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346399; 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=VQ37MDaIkKRVYt3r1jO04bLsBtL2wGv/MXye3TsflZE=; b=yXA5RG9Ch/rLqv598qMUGE8af+04AOARKjblxxHgzwucSfIFZamWU9Gsg0Y5nK2lMVXcCS 6nuVlHocJIK6RtBQ== Date: Thu, 21 May 2026 08:53:15 +0200 Subject: [PATCH 1/9] MAINTAINERS: Add include/linux/vdso_datastore.h to vDSO block Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-1-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=624; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=13cLvGZZ6A4vhrhuxgcectzpmVhX9ANUNsQxSTkRb6Y=; b=53VhIkX1OIPoSRu+fMfGTfL42cx9Tns+s6i8sIpz/vGTNsuxqhPZa0qeRHLWuUoHKCGxIxE1f kPBkAkMm+ENBViQoab7DMXMToItpO50WSdrIb+/BWazvIg/yH5kxMA2 X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= This file is part of the generic vDSO subsystem. Signed-off-by: Thomas Wei=C3=9Fschuh --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 2fb1c75afd16..e1ba3826ef53 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10857,6 +10857,7 @@ L: linux-kernel@vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/vd= so F: include/asm-generic/vdso/vsyscall.h +F: include/linux/vdso_datastore.h F: include/vdso/ F: kernel/time/namespace_vdso.c F: kernel/time/vsyscall.c --=20 2.54.0 From nobody Sun May 24 21:39:30 2026 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 50AE4385D78; Thu, 21 May 2026 06:53:21 +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=1779346402; cv=none; b=fg7+V320wXLyAeGM6lQuCVmQ5x+LWuYc/OcEWFzxLpBKsXi2ix1dXo0Cd1cXCWgD107POzRjrV78jyW2KDm9RI2Uh0S6aSAzDv7KPLHubwDa+mlyDWZeuxBnQVywzCfpRVWqHorwFOY6easDsa4jXygnGVWG4sMM2nRXJxJZYyg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346402; c=relaxed/simple; bh=OVak7TKpeaRIUbVyvb+zHBuH7k1GG910atn5riKp+FU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=lZSc0oyE32qgwguM8VTIPnOAjudvpbRiLjZet3GI3krtwljzyqdXbjTk9bIDWK9GmQLZIyWmWZbwC2Y+NqZKG0Yt9W2zGxVLy3YCkp/ziFA+XU3XbWxGESe15DD70AhIuNYesu/0TJzwrtLoBt2tfH+7dhhQqp3Dy93NTyY2cn8= 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=uXzZZwhP; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=Qi6onu77; 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="uXzZZwhP"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="Qi6onu77" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346400; 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=/LQVuGzqTtzYNoVCLleBW959g/lofVvNzrc4DQR59Eg=; b=uXzZZwhPxbNkKiONbSJCh+HWphCzXhNfNnA96MvTvKh1gopWbYM1Z5LGpPXq6trjNw3fTF fqlhme/24FJahbt9fPjeNIRn51P0pMjTKhO+PnSGNz9mkwErRSZHBQ4R9RrQK99Q29M7B6 ZPCxMr5D7Y60HxGe0IirLQLjfA3YAfCgnYEeKbQ3GhPKbB1mCshUlWc7IpqSpXlsCx53Of GgWbtV9hJ341Wo8JEde8cwi+krUKn7GLfDmbd8563VaZNBpDuY9hraLe5FhItXoIWyWnTS D2oS56z+y8ViTR4vvlMOL8yuaNsZ2L8hVYLGfWa2smv/aibvr6S/KzHFmJdX3g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346400; 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=/LQVuGzqTtzYNoVCLleBW959g/lofVvNzrc4DQR59Eg=; b=Qi6onu77Hddis9pLYBZ4do8/J095b/2afIZID5guBuIrIDaIuiErSFFoAsEEWbPdZHMK4x 6V1CI9Czr5GvySCg== Date: Thu, 21 May 2026 08:53:16 +0200 Subject: [PATCH 2/9] vdso/datastore: Always provide symbol declarations Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-2-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=1162; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=OVak7TKpeaRIUbVyvb+zHBuH7k1GG910atn5riKp+FU=; b=mwErtyHXZD6XHk9u2EdnASrNaB5g6aRHgp5pgDiI+jrQ0EJADIkyVxJVqBA8Ln5mRmNuqXJ5X rt2/i0WSlLpBpFnDJ5e2kHYWhz3V7F9czE0+J9LPMq3hgj0oWPUR1+0 X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= Allow callers to easily reference these symbols in code that is built even when the generic datastore is disabled. As there are no good default no-op variants of these symbols, do not provide stubs but require users to have their own fallback handling using IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO). Signed-off-by: Thomas Wei=C3=9Fschuh --- include/linux/vdso_datastore.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/vdso_datastore.h b/include/linux/vdso_datastore.h index 0b530428db71..3dfba9502d78 100644 --- a/include/linux/vdso_datastore.h +++ b/include/linux/vdso_datastore.h @@ -2,12 +2,12 @@ #ifndef _LINUX_VDSO_DATASTORE_H #define _LINUX_VDSO_DATASTORE_H =20 -#ifdef CONFIG_HAVE_GENERIC_VDSO #include =20 extern const struct vm_special_mapping vdso_vvar_mapping; struct vm_area_struct *vdso_install_vvar_mapping(struct mm_struct *mm, uns= igned long addr); =20 +#ifdef CONFIG_HAVE_GENERIC_VDSO void __init vdso_setup_data_pages(void); #else /* !CONFIG_HAVE_GENERIC_VDSO */ static inline void vdso_setup_data_pages(void) { } --=20 2.54.0 From nobody Sun May 24 21:39:30 2026 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 CD80D385D93; Thu, 21 May 2026 06:53:21 +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=1779346403; cv=none; b=RZW78nnxyQSSdzXmtOR/UHteOXN8xZloBlRME5Oc17NX/U+vqPb9MCpj4BysiWv1dKGf5iIYnnodYvUNNyJUNXISnqsNXwt4KknUGdex9nRkUNBBdlG1C2goDaJH8ZsFi8vaBD+8RrllsITdnCm3Uc1ZzH3vDubH33gok92n07o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346403; c=relaxed/simple; bh=2Rhl6KhXOzAWSyrFsPC5B2D8s8CUrLEMqaxta4InEX0=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=BMX18ZCljRAfv9u2x+hYRxpOyMGuExUbY4AdHbbLXEMzojeVYmt1/OQQQcp6dt+XrsNr1+kElOMEd1lbCr4UbAY2yYdoW/1vNwyF/n6ZOI99Ei4Zn/Wvn9IU98MadIsGk8osCU9ohugHq4qQ92YrMbPlQ3qYpS/fGokAJkt14iY= 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=wUrAzzdR; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=z6b8T3PW; 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="wUrAzzdR"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="z6b8T3PW" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346400; 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=Svw1+W0VEOuo1iCigxaI1rSxxspHZtHWaoeRgwTpz40=; b=wUrAzzdRMLWPUmEGsoD+9Nu3durxRrIcYHa5Sxh6tvVvllTPUwgKtNN7jhBWtpF92n7Vii 4HMuh9LblippOU6dOvnM40c1ObNAzpaCWkMSD9dHDC0os4nHJ/QJIeAbPhy5X9leaUsTQ7 1623T9Gs/e1X6GARgd8CgG3ip/K5kooyzFowWoiyv+ADsxS5OLC6hJbT0yxfdpWAFbto2e 72jyS7gqNt+aMHEEN3sevSY0ZWdHHTDotb8Skh2FBtfz7nW3YD5a35qPw4kytFF0lYOEvn /smqxDboygOmqgfuYvIXBVVuenmfkirR6gFUnaiDMnty/PoUj+drrfEkSuRGjg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346400; 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=Svw1+W0VEOuo1iCigxaI1rSxxspHZtHWaoeRgwTpz40=; b=z6b8T3PWxYjxsCCs+OWtkqhRm4eImnD+jD2TXra/+1+T+CCPEU4t+GpH5csS/IaS6++Wur 2OQQRTct9mK2NqDw== Date: Thu, 21 May 2026 08:53:17 +0200 Subject: [PATCH 3/9] MIPS: Introduce Kconfig MIPS_GENERIC_GETTIMEOFDAY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-3-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=1327; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=2Rhl6KhXOzAWSyrFsPC5B2D8s8CUrLEMqaxta4InEX0=; b=jj1zCb1zeSR2FBJed73F5dnKJlFdAW8RRbh8qAvLUkHFwYFN+1e/Ki5Itxgy88g0oilWxsezw 1id0KswTVeDDlUaYYzngQRtNzOAq9n25TBnC7PJIWLVhe3H2rHMltvh X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= The logic to enable the generic vDSO Kconfig symbols is about to become more complex. Introduce a new helper symbol to keep the configuration readable. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/mips/Kconfig | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 4364f3dba688..af610af7ed08 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -38,7 +38,6 @@ config MIPS select GENERIC_BUILTIN_DTB if BUILTIN_DTB select GENERIC_CMOS_UPDATE select GENERIC_CPU_AUTOPROBE - select GENERIC_GETTIMEOFDAY select GENERIC_IRQ_PROBE select GENERIC_IRQ_SHOW select GENERIC_ISA_DMA if EISA @@ -51,7 +50,6 @@ config MIPS select GENERIC_SCHED_CLOCK if !CAVIUM_OCTEON_SOC select GENERIC_SMP_IDLE_THREAD select GENERIC_IDLE_POLL_SETUP - select GENERIC_TIME_VSYSCALL select GUP_GET_PXX_LOW_HIGH if CPU_MIPS32 && PHYS_ADDR_T_64BIT select HAS_IOPORT if !NO_IOPORT_MAP || ISA select HAVE_ARCH_COMPILER_H @@ -3170,6 +3168,11 @@ endmenu config MIPS_EXTERNAL_TIMER bool =20 +config MIPS_GENERIC_GETTIMEOFDAY + def_bool y + select GENERIC_GETTIMEOFDAY + select GENERIC_TIME_VSYSCALL + menu "CPU Power Management" =20 if CPU_SUPPORTS_CPUFREQ && MIPS_EXTERNAL_TIMER --=20 2.54.0 From nobody Sun May 24 21:39:30 2026 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 7177F386C12; Thu, 21 May 2026 06:53:22 +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=1779346403; cv=none; b=FCMr/D8pY+eqUJnyQwIodnmVD5FqLZ13Bk7xZmoSDz1Xz+Eqv4JwYv6R+zxizgLZmRfbAf6EYGlm4w8PaFajN1xEeDenawUhLAKlw2vs3ipA+jJ4Mgw2c1EnxXviFQwcBLX3at0nZwBkLnRapkuLD08Dw/OCjwZlbQp2DR7EzFQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346403; c=relaxed/simple; bh=PyMNV1JJg8wjJfWAFS5o3wUdk0QWKNX1OKuKircEbYQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aptlAU1nC4ncYdNyu9MVelKD5cljvAmaA6P9XsSsbPpXVvd7r9yMTu0qfurYibMM9DKXzxSefv+gTaEjvJmMMBzOhQG3KRKSTVFMGCdNU6Z6nKT+okk226kObLMLGCJS4F+/g7t3osTmXNHIAU4n7ZqK2lYLUBrun+hoyELXCCE= 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=NnfNQBML; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=4i/rYZkS; 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="NnfNQBML"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="4i/rYZkS" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346401; 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=GFRGrKy4q9od/mzOS61iRuF0vEFrRaRT+0Nme72HCCw=; b=NnfNQBMLxl7iNBztMqBOas+EqlReOQP+VWBpiRRqXdtxd5+yrjT8OAijRifCsW9BXFOe7Z Lx3bn0b7Su231LrxhditNssUF/Zprmpx2OuIsbCvGtxHdhcvkf92Y5zoKS2ee5oAZtjG9M oDIKyGA8q8MHSjXzBiOJy5VU8gBGWTCOM0bq4X2uQhdqqURIk2DvfS9WbgA4PbiQ8dtjJc +NXAAaXgHVKmWh9pPf/RyF8/47R2T4EfkFObt8OUmtcrvMDGkD4KJpOH/slEOfERr427x7 7Cm+ZwCeRUWJoao1jnHUpYnAUh8u0XUo1v+VjxIoUv0MLRJFsn1EM80yzvoEAA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346401; 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=GFRGrKy4q9od/mzOS61iRuF0vEFrRaRT+0Nme72HCCw=; b=4i/rYZkS38crrexDMA7C4xJV/FwShmGCmmw9VlyKhWIZlifwhJ1Cpgq99amnApdZ0xDLG7 jLxdnlMbHxdhPyBg== Date: Thu, 21 May 2026 08:53:18 +0200 Subject: [PATCH 4/9] MIPS: VDSO: Only map the data pages when the vDSO is used Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-4-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=2082; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=PyMNV1JJg8wjJfWAFS5o3wUdk0QWKNX1OKuKircEbYQ=; b=PC3u2A1gmunF8ye85WjeePaYwopQIj+YsBZjg49P12WoxtH3XGyMmSHVeCp5DLhxdX8tYYPYK w3b17YdvrCpBylNLYFu9kiOeTSIuMKijXkwb3Sk+PKx1e5gtzlB0P6l X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= A future change will make it possible to disable the time-related vDSO. In that case there is no point in calling into the datastore. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/mips/Kconfig | 2 +- arch/mips/kernel/vdso.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index af610af7ed08..3a01cc85bd6a 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -74,7 +74,6 @@ config MIPS select HAVE_FUNCTION_GRAPH_TRACER select HAVE_FUNCTION_TRACER select HAVE_GCC_PLUGINS - select HAVE_GENERIC_VDSO select HAVE_IOREMAP_PROT select HAVE_IRQ_EXIT_ON_IRQ_STACK select HAVE_IRQ_TIME_ACCOUNTING @@ -3172,6 +3171,7 @@ config MIPS_GENERIC_GETTIMEOFDAY def_bool y select GENERIC_GETTIMEOFDAY select GENERIC_TIME_VSYSCALL + select HAVE_GENERIC_VDSO =20 menu "CPU Power Management" =20 diff --git a/arch/mips/kernel/vdso.c b/arch/mips/kernel/vdso.c index 2fa4df3e46e4..bd1fc17d3975 100644 --- a/arch/mips/kernel/vdso.c +++ b/arch/mips/kernel/vdso.c @@ -129,7 +129,7 @@ int arch_setup_additional_pages(struct linux_binprm *bp= rm, int uses_interp) * This ensures that when the kernel updates the VDSO data userland * will observe it without requiring cache invalidations. */ - if (cpu_has_dc_aliases) { + if (cpu_has_dc_aliases && IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO)) { base =3D __ALIGN_MASK(base, shm_align_mask); base +=3D ((unsigned long)vdso_k_time_data - gic_size) & shm_align_mask; } @@ -137,10 +137,12 @@ int arch_setup_additional_pages(struct linux_binprm *= bprm, int uses_interp) data_addr =3D base + gic_size; vdso_addr =3D data_addr + VDSO_NR_PAGES * PAGE_SIZE; =20 - vma =3D vdso_install_vvar_mapping(mm, data_addr); - if (IS_ERR(vma)) { - ret =3D PTR_ERR(vma); - goto out; + if (IS_ENABLED(CONFIG_HAVE_GENERIC_VDSO)) { + vma =3D vdso_install_vvar_mapping(mm, data_addr); + if (IS_ERR(vma)) { + ret =3D PTR_ERR(vma); + goto out; + } } =20 /* Map GIC user page. */ --=20 2.54.0 From nobody Sun May 24 21:39:30 2026 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 DDA13395AEA; Thu, 21 May 2026 06:53:23 +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=1779346406; cv=none; b=GT7gdk4HLLU18k7b5YlUC6Md1VQf0Jns/qo83P0JcI71RBWUezIGJGbUVeGdEtF0MBPR9nUXvkeG+k+oRrk9G6/g8QFzbEJREN603f3loWdd0a6hWew5naO6QNyNx+HbUxCEwWU8VlOy52tvV/xcT+sNN/6I8JiSrLCsDVZcJMo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346406; c=relaxed/simple; bh=k5y6mhg47PkKW3NG3mli/fa0fpt+8vCI0NkWxuFN+Jc=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fIWF7drxu/m+1NhY4dioO3X0HToi4ajYnCIZewOYRdDG9cUAIR+k6jAmIOrBAL+ibu9iFk8grpJ7TvXipFoj6gIuW3fAXkH+AoXVePGzWv7vDEMPl/g7F7C3GniKQBpUad9XNI1WLxHcQWD+N9psoShlOSs1MBzU26DGulLfMaw= 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=05dZLUbX; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=2FeQHdOE; 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="05dZLUbX"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="2FeQHdOE" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346401; 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=Nf18gitBVQzFrXc+yGpE5m2ORwt5+KE3lHgDXrZnDvI=; b=05dZLUbXDfNjQcb58/z04BHAZ35W6uScmEeHXYKYo3TpdBdbEQv6iUOUock338mKpul+MD BlN10Q9dNXC5B8Z8z3NWpVvMKtk4InI2nkgiHeDbc0CJX6tjN7oONqXe5r6iRYSqPb/0TW 6SGkHW5YjFi2f2kHtB653oyNm4eHBa1zKSJUtEowdW4Eaz4EvJjWQA4k3+4L6fkaNea9l2 rdj8Xon/64XL4LQOBjXw3Dz+Q4taou5f6+DCT7Mh2y/sB0oOCVgzZJ9CsI+H6bc/LL0gIi PfezzylK/eXmrqooxHtCG82doi2cFGC9MM/Kjtss7NTH5MP6u6hdYz0f3Huwjw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346401; 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=Nf18gitBVQzFrXc+yGpE5m2ORwt5+KE3lHgDXrZnDvI=; b=2FeQHdOENNmtaPGpadOc6UG6KKuHGecy2zGtY0MspZTkPf8Gv0rwrqMtCfOrp7g4bFedCk OBEKWsT7IpN68cAw== Date: Thu, 21 May 2026 08:53:19 +0200 Subject: [PATCH 5/9] MIPS: csrc-r4k: Only use VDSO_CLOCKMODE_R4K when it is a available Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-5-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=1064; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=k5y6mhg47PkKW3NG3mli/fa0fpt+8vCI0NkWxuFN+Jc=; b=oLxSimcsSXVDwxxn3b/5fZ5B4bE8sgVcmfO8KAYDVqabYPzVWDCJ6VqZhsl2uON4MlXqrWsqS luZJ+NBOAetC8PTu0cF7DbLKZVgI8Ih6OhutRvOR9pfdc/64bAHilwM X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= VDSO_CLOCKMODE_R4K is only defined if CONFIG_GENERIC_GETTIMEOFDAY is enabled. Right now this is always the case, but it will change soon. Prepare for the potential unavailability of VDSO_CLOCKMODE_R4K. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/mips/kernel/csrc-r4k.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/mips/kernel/csrc-r4k.c b/arch/mips/kernel/csrc-r4k.c index 59eca397f297..7c431119bb14 100644 --- a/arch/mips/kernel/csrc-r4k.c +++ b/arch/mips/kernel/csrc-r4k.c @@ -130,8 +130,11 @@ int __init init_r4k_clocksource(void) * R2 onwards makes the count accessible to user mode so it can be used * by the VDSO (HWREna is configured by configure_hwrena()). */ - if (cpu_has_mips_r2_r6 && rdhwr_count_usable()) + if (cpu_has_mips_r2_r6 && rdhwr_count_usable()) { +#ifdef CONFIG_GENERIC_GETTIMEOFDAY clocksource_mips.vdso_clock_mode =3D VDSO_CLOCKMODE_R4K; +#endif + } =20 clocksource_register_hz(&clocksource_mips, mips_hpt_frequency); =20 --=20 2.54.0 From nobody Sun May 24 21:39:30 2026 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 DBCF5395AE9; Thu, 21 May 2026 06:53:23 +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=1779346405; cv=none; b=VTZyIIVd+swDIqLl4WUu8CscQ9+g/a72hgHKsTqPnyyY8grZSqcPEx80BEl0EhF2GvGJ8/dILn5M3TpTBi3i1j39cY8zQGIG4KCS2jRut8Ul5vsYuM+qPjw3P9vepUx3rz2ECSv+i6BHj/c0zQNo2l1/emwaQ+IOiEx4ILG+gU4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346405; c=relaxed/simple; bh=QsDfvsWvWffVCiwKb6Wor4fGAHs+70c4y3p7kuNqC+o=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fxEF6VV/sJ6gg5h7J8ELwhWmA/dvNvXPVWLL5kUEalZMC9D8EZZ0AibNW/2A23O9+h7c0/5FdRYLZm7lOG7YJYh/Oa6vJDpwMu3t4B6cQXNuHc/Ex5Vc8BfGLlqrJ+OWXTjbsyN3VB2gB3wfWE8mkfywsyWv2lxF1U+MdT4MB2w= 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=lYXY/QWg; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=qzUSBmxy; 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="lYXY/QWg"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="qzUSBmxy" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346402; 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=LBYA8E165eIAxxUbk1ZW1SZ9ewSPkgr6E8pVal91xJE=; b=lYXY/QWgBhZBnfGxWUDDjbdIJX6UX/peWV7DZg9iKxVQSYAIrylcmLcz2SeGuwpQPUav8m uhRQwyhVKJjVrnQrsqharApFnLwNhfqYK3Oy/XAk/knmUFI2nlJ2FpPfq0geUkwV8G1KxR TpsgfxQ/FwoZFiOffYGSL+5BBVa3V1WMpUonpO37BBLdiG/QSC0H81cQWIZezWHZormG8k SC6jY2MkCjRfpGP6/seFBXXuWB44qv3rsFoVoC0YrMKr3lYEjbkSvWk59GNUywGDNSDLVf k3ZQpEZsaL98vEqp0PCuo1RwJZKZpacOitgiPWPwICkYInYr8M4PaayyA+9qUg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346402; 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=LBYA8E165eIAxxUbk1ZW1SZ9ewSPkgr6E8pVal91xJE=; b=qzUSBmxyG7TKMaK2pskXhbhHad9fNPQuGp6hllENz7v8Li4ieIi2B1Qa9wb4roqXGo8lF5 GwNXBC8xTb4N5YCw== Date: Thu, 21 May 2026 08:53:20 +0200 Subject: [PATCH 6/9] clocksource/drivers/mips-gic-timer: Only use VDSO_CLOCKMODE_GIC when it is a available Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-6-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=903; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=QsDfvsWvWffVCiwKb6Wor4fGAHs+70c4y3p7kuNqC+o=; b=fbXC9XdaN8jrZidPP1OEW2Nlz+wGmkX6xnSw52ecBKtdd8bbOL4QAcF2piqYx9/hDfGn0E9+5 hizUED+qnfWB9C1ceQevsXQVfS0MHR89KPKWA3JH+HLVY7gYDuKIyIg X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= VDSO_CLOCKMODE_GIC is only defined if CONFIG_GENERIC_GETTIMEOFDAY is enabled. Right now this is always the case, but it will change soon. Prepare for the potential unavailability of VDSO_CLOCKMODE_GIC. Signed-off-by: Thomas Wei=C3=9Fschuh --- drivers/clocksource/mips-gic-timer.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clocksource/mips-gic-timer.c b/drivers/clocksource/mip= s-gic-timer.c index 1501c7db9a8e..a1669266c94d 100644 --- a/drivers/clocksource/mips-gic-timer.c +++ b/drivers/clocksource/mips-gic-timer.c @@ -198,7 +198,9 @@ static struct clocksource gic_clocksource =3D { .name =3D "GIC", .read =3D gic_hpt_read, .flags =3D CLOCK_SOURCE_IS_CONTINUOUS, +#ifdef CONFIG_GENERIC_GETTIMEOFDAY .vdso_clock_mode =3D VDSO_CLOCKMODE_GIC, +#endif }; =20 static void gic_clocksource_unstable(char *reason) --=20 2.54.0 From nobody Sun May 24 21:39:31 2026 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 E02D4395AEB; Thu, 21 May 2026 06:53:23 +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=1779346405; cv=none; b=QF+QWKapj6CWmXzgj3MQQ+Aph++yMUPe6SdFR8ruxR3GYsBXuMEc9m9C7cLgF56sBeon1uZtPjq7RH1QEamJMygInx6KXNqaXO0yD37/WfJD5USON6HTX34UCWJHCXb4rfCYq56PGGX8OYrgMxP/PlPAJpWpCjAJWkyDy3qMnfY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346405; c=relaxed/simple; bh=s9pAGY/eIOzEZ2CnnlmklgDRvVjcE7ayC9Y8a43CMZM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=WsK9WkyelsBnak1t4fXuJQM1sx6yJAVt7yO2CUiyVQheUWYdQCeR6Gpqf4Ex7ufNJhuMZIklR/bVVB9GPtcrmKKQr31wWBj6A6m8uk6ALyKIys6/ms/KAiOSjeipRszyyrY4p/WRM9nazitvTUnHAmcy8dC+yxInkYQvDAtZuig= 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=jKENBybm; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=TBcl2xPb; 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="jKENBybm"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="TBcl2xPb" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346402; 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=7GuSCYZvVyqZH0xl580lwlvyKaoH6Mwa4WGhLxtj9eI=; b=jKENBybmBjVsSBpJey/WKyvwv2/DQ0JdaLtZ1DUkY8MGOZkAHI2nZPcehnMCZ+oXS2gPgu g9vmZM+H6ZwaO9cW3IQ90E/J6XoSJGGDC4gdmqgfhDwI/hKaUrjOQ2SFOgwWGQhiudvM13 Zv0V6P+Zt2ew/OhjYRA5PhkoBlK+O3LPgeDf01hlBkw4kECQ4Y7Kgq8CenzQswwRDz/NLj JpjYvBW0i8Uz00pJ8EN6Jk1G/qFDLipLRyK5T0AsTEb9SmkXBSTPEW3z5IMngD7HojFbiw YGIzybNUELpL6XpddPai3Kw1TNM95nvmHWNlgaIw6z6umbn7uY+P1245ykR/ag== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346402; 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=7GuSCYZvVyqZH0xl580lwlvyKaoH6Mwa4WGhLxtj9eI=; b=TBcl2xPbWICwKVthfzn2uat++72JF/TjYcHJzpNX/D3lDm7qdQNiJP9YZ1IfLfRwgvmhCc JXHHT/f3dFnsjYCA== Date: Thu, 21 May 2026 08:53:21 +0200 Subject: [PATCH 7/9] MIPS: VDSO: Fold MIPS_DISABLE_VDSO into MIPS_GENERIC_GETTIMEOFDAY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-7-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=3201; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=s9pAGY/eIOzEZ2CnnlmklgDRvVjcE7ayC9Y8a43CMZM=; b=Rfr45FUvI2CbS6/tcMHH97hJEfI+HXnBhznhNNYCW947ZpUENm8Gztm68i0fOsM4mxlMf1WmN 17Nd/9cK++gAE3iP07Yi7c34Si5shwL7IK13dQBs+7ABzh5RDCfH2hl X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= The currently used MIPS_DISABLE_VDSO will disable only the userspace bits of the time-related vDSO. The kernel part is still pointlessly built and running. Remove MIPS_DISABLE_VDSO and fold its usecase into MIPS_GENERIC_GETTIMEOFDAY, which works correctly. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/mips/Kconfig | 6 ++++-- arch/mips/vdso/Kconfig | 6 ------ arch/mips/vdso/Makefile | 7 ++----- arch/mips/vdso/vdso.lds.S | 2 +- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 3a01cc85bd6a..8a3bd431b16a 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -3172,6 +3172,10 @@ config MIPS_GENERIC_GETTIMEOFDAY select GENERIC_GETTIMEOFDAY select GENERIC_TIME_VSYSCALL select HAVE_GENERIC_VDSO + # GCC (at least up to version 9.2) appears to emit function calls that ma= ke use + # of the GOT when targeting microMIPS, which we can't use in the VDSO due= to + # the lack of relocations. As such, we disable the VDSO for microMIPS bui= lds. + depends on !CPU_MICROMIPS =20 menu "CPU Power Management" =20 @@ -3184,5 +3188,3 @@ source "drivers/cpuidle/Kconfig" endmenu =20 source "arch/mips/kvm/Kconfig" - -source "arch/mips/vdso/Kconfig" diff --git a/arch/mips/vdso/Kconfig b/arch/mips/vdso/Kconfig deleted file mode 100644 index 70140248da72..000000000000 --- a/arch/mips/vdso/Kconfig +++ /dev/null @@ -1,6 +0,0 @@ -# GCC (at least up to version 9.2) appears to emit function calls that mak= e use -# of the GOT when targeting microMIPS, which we can't use in the VDSO due = to -# the lack of relocations. As such, we disable the VDSO for microMIPS buil= ds. - -config MIPS_DISABLE_VDSO - def_bool CPU_MICROMIPS diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile index 69d4593f64fe..00d3ba2c482a 100644 --- a/arch/mips/vdso/Makefile +++ b/arch/mips/vdso/Makefile @@ -4,7 +4,7 @@ # Include the generic Makefile to check the built vdso. include $(srctree)/lib/vdso/Makefile.include =20 -obj-vdso-y :=3D elf.o vgettimeofday.o sigreturn.o +obj-vdso-y :=3D elf.o sigreturn.o =20 # Common compiler flags between ABIs. ccflags-vdso :=3D \ @@ -36,6 +36,7 @@ aflags-vdso :=3D $(ccflags-vdso) \ -D__ASSEMBLY__ -Wa,-gdwarf-2 =20 ifneq ($(c-gettimeofday-y),) +obj-vdso-y +=3D vgettimeofday.o CFLAGS_vgettimeofday.o =3D -include $(c-gettimeofday-y) =20 # config-n32-o32-env.c prepares the environment to build a 32bit vDSO @@ -47,10 +48,6 @@ endif =20 CFLAGS_REMOVE_vgettimeofday.o =3D $(CC_FLAGS_FTRACE) =20 -ifdef CONFIG_MIPS_DISABLE_VDSO - obj-vdso-y :=3D $(filter-out vgettimeofday.o, $(obj-vdso-y)) -endif - # VDSO linker flags. ldflags-y :=3D -Bsymbolic --no-undefined -soname=3Dlinux-vdso.so.1 \ $(filter -E%,$(KBUILD_CFLAGS)) -shared \ diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S index 5d08be3a6b85..fd263b05d3e7 100644 --- a/arch/mips/vdso/vdso.lds.S +++ b/arch/mips/vdso/vdso.lds.S @@ -94,7 +94,7 @@ PHDRS VERSION { LINUX_2.6 { -#ifndef CONFIG_MIPS_DISABLE_VDSO +#ifdef CONFIG_GENERIC_GETTIMEOFDAY global: __vdso_clock_gettime; #ifdef CONFIG_MIPS_CLOCK_VSYSCALL --=20 2.54.0 From nobody Sun May 24 21:39:31 2026 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 87667395AC4; Thu, 21 May 2026 06:53:24 +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=1779346406; cv=none; b=EkygCNCfjf0QY9jwbNr6A4CuRprxQtRCzNXU4TTFpZfn6P37/OKtT2g+E1cjS+ae3P7i75//4mnj5PEaYQ6z8+s3AeNr8SFIVpsWzfbX4pKN0J4uQ4aU3naHyqwTRpnYe54QdH+97bXy/iP+9GCu32yeIuXF9rp4ajizMx1XjfI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346406; c=relaxed/simple; bh=IOgkgRMYHaQ3lfYPsXHLHKq0L7IMnU3l5oMD1rpCKr8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EDwSF33ZaYngtsVezn5NZW+I+AfJGiZmBhZoe+yH94njwvKPKciiTWaie3Pi7KdmrcdcO237/vvOP2m3u/wOYJU+0CiznAQ2Kr0qvtO83/YHp7NhbuJ4mbKfG3+K37bMC5r4CYJ3GTOvkDbiapqTNHcEtgMdfs0YjFVp3mUKqqE= 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=QE1k7C8v; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=itZw1hpJ; 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="QE1k7C8v"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="itZw1hpJ" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346403; 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=2cKrJiS3UcZSMKGxMeqts0l6bn/r7+nHO0AACNyvkoA=; b=QE1k7C8v76QXwO1c9oghXScAsvRL1c2JqbN2K8PVPAQmRXCVjLRiWUk1Qtox5+kb83YmzO 4iDxM2xBlvN4QyAKXjAeumsNQp+1rA56BuH52IgUHGezMWdQ0VSWDIel2Ll0ZoKWae4BKI Vdbpn/2SZARdZxIYn/Qmx+aCSDTMrlN2viCEdSIG7RLiPGe9yvZNfUPT7Z87yYjxddVaRV umJ5MSD/KdNxOSFaYnYNEcTwOz0tJNxVN+kpc/n7KkMIbXlOwv7MfMnOIs2kW+FdNz1wAF tL5DywTDN79Am7YqoD7aark2pFhi0yBziJWhmUI3AZNO5AJnj4IcOtbkCbHYiA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346403; 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=2cKrJiS3UcZSMKGxMeqts0l6bn/r7+nHO0AACNyvkoA=; b=itZw1hpJ0TfbdymjailfMQy+VZqr+PYC0cmCmKUuTErM1oLCdky1H9aytws18nomq8xWX/ kedVXbJ/+pXg6XDw== Date: Thu, 21 May 2026 08:53:22 +0200 Subject: [PATCH 8/9] MIPS: VDSO: Gate microMIPS restriction on GCC version Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-8-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=890; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=IOgkgRMYHaQ3lfYPsXHLHKq0L7IMnU3l5oMD1rpCKr8=; b=ExOkdlxiihnC2V3Gr87Mvwv4woXg/CRlccytT71HBPNhm1PnnHZMme9FrCzMUjJIoojD0D9l0 1sgSJ2kEWXPCNTmDrhRxBAXT6mF10w0bPGpbuyHPZpI9FrxMS173OEj X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= As explained in the comment, the problematic GOT references are only emitted by old versions of GCC. Limit the restriction to those compilers. Signed-off-by: Thomas Wei=C3=9Fschuh --- arch/mips/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 8a3bd431b16a..d545a50c4bd5 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -3175,7 +3175,7 @@ config MIPS_GENERIC_GETTIMEOFDAY # GCC (at least up to version 9.2) appears to emit function calls that ma= ke use # of the GOT when targeting microMIPS, which we can't use in the VDSO due= to # the lack of relocations. As such, we disable the VDSO for microMIPS bui= lds. - depends on !CPU_MICROMIPS + depends on !(CPU_MICROMIPS && CC_IS_GCC && GCC_VERSION < 90300) =20 menu "CPU Power Management" =20 --=20 2.54.0 From nobody Sun May 24 21:39:31 2026 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 8F9B3395ADA; Thu, 21 May 2026 06:53:25 +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=1779346407; cv=none; b=Rxl4R3xwSxDqeIv3ALJm+0jOySJU2SAiXoWodeiWUcedyJoiWxEN9KWswXZnLx6AAobw0+wLDuUh6aFxcgg8kb4+jTopuAEf7hmBrJAwoXJYEt+5itUZPnl0X2kLEy6EgPsjGFw44M8Eqg4/i+qslJHVP581yZcUxuFD+mQh1NQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779346407; c=relaxed/simple; bh=eag02RGWeVs4N05gOsKq3PdNBZN2b6GqI/QPQiVunD8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=UTKGimL1mQ71Is6lz6UW4QtuVPfwanUjibY00UYZTd4g7mBfxv1c92FZba/98rkmo8fm6QWzvPpRu4BzvVpjQzlMJ3NvU6IowRGI5Jhu/Oq1st1gWrQx1u2GYzdTIaFukGy45Gobg0LSSrWiVj/LQLtLLaYg37E0nmjU6o0FTiI= 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=vEmrbzM2; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=zxMnuBSR; 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="vEmrbzM2"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="zxMnuBSR" From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1779346404; 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=J8rCI749cvyOIfOoBqSsJlC5HeQj+h0l8nwmIUsQvwU=; b=vEmrbzM2nKlA0grWn8T4+SAAIr6pDpC601rkC2GmCcDUYW4xO2oxz7NaK+xgKoSbU5u/qk TprX5vtFBmmcTvQpTVuhc9xqXVPDH2KOZwcCioZELdkPG4/DVGQUZ7Vw76il6EXozG2LeH TGeybEqCh6by+D8gG5/EBbFnhgesHbj95rjntR0iaQp1fEUhYq/Vfb37y2diWoSknMHksT S/DgVh2gNe7thH/0YVHhiXIkRXp28OR2Xu5sLRVAgRqH91lwKSLv2EEvL6izHk71BtyPLy xtOQaoUr+l0DO0FWpNK9sLNY1yOpnu12jemd42HdPevEhYGhztUk7rrNxaZ/JA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1779346404; 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=J8rCI749cvyOIfOoBqSsJlC5HeQj+h0l8nwmIUsQvwU=; b=zxMnuBSRqAh+HL9hu7muQyC0o6OXj8ibHApzCPn/L+T/ftHbdihEL8pHXdn/E0f2HfPUXx 3coQ2Sg5z+wX6gCg== Date: Thu, 21 May 2026 08:53:23 +0200 Subject: [PATCH 9/9] MIPS: VDSO: Fold MIPS_CLOCK_VSYSCALL into MIPS_GENERIC_GETTIMEOFDAY Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260521-vdso-mips-kconfig-v1-9-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> In-Reply-To: <20260521-vdso-mips-kconfig-v1-0-2f79dcd6c78f@linutronix.de> To: Thomas Bogendoerfer , Daniel Lezcano , Thomas Gleixner , Andy Lutomirski , Vincenzo Frascino Cc: Arnd Bergmann , linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1779346397; l=3671; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=eag02RGWeVs4N05gOsKq3PdNBZN2b6GqI/QPQiVunD8=; b=LNMq2hdnk+3K9uBLffI+RiDtgv+BBRtgKTMouPXaukLdm1V7L5Hm0VzR/7gZ14wPBR98AjcyM ASUeLQSEYVSANyu+t6az6G4rl4V6l5PKYYuz5aWq0cJg1lbm9Jjovyu X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= This configuration option exists so "that we don't provide the symbol when there's no possibility of there being a usable clocksource". However it only covers __vdso_gettimeofday() and none of the other vDSO functions which should be affected by the same circumstances.slightly sligh= tly. Remove MIPS_CLOCK_VSYSCALL and fold its usecase into MIPS_GENERIC_GETTIMEOFDAY, which works correctly. Signed-off-by: Thomas Wei=C3=9Fschuh --- A different variant of this was originally part of another series [0]. [0] https://lore.kernel.org/lkml/20260227-vdso-compat_32bit_time-v1-0-3f028= 6a7bac3@linutronix.de/ --- arch/mips/Kconfig | 4 +--- arch/mips/vdso/vdso.lds.S | 2 -- arch/mips/vdso/vgettimeofday.c | 20 -------------------- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d545a50c4bd5..fcfa16b483a8 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1133,9 +1133,6 @@ config CSRC_R4K config CSRC_SB1250 bool =20 -config MIPS_CLOCK_VSYSCALL - def_bool CSRC_R4K || CLKSRC_MIPS_GIC - config GPIO_TXX9 select GPIOLIB bool @@ -3172,6 +3169,7 @@ config MIPS_GENERIC_GETTIMEOFDAY select GENERIC_GETTIMEOFDAY select GENERIC_TIME_VSYSCALL select HAVE_GENERIC_VDSO + depends on CSRC_R4K || CLKSRC_MIPS_GIC # GCC (at least up to version 9.2) appears to emit function calls that ma= ke use # of the GOT when targeting microMIPS, which we can't use in the VDSO due= to # the lack of relocations. As such, we disable the VDSO for microMIPS bui= lds. diff --git a/arch/mips/vdso/vdso.lds.S b/arch/mips/vdso/vdso.lds.S index fd263b05d3e7..05badf3ae0ff 100644 --- a/arch/mips/vdso/vdso.lds.S +++ b/arch/mips/vdso/vdso.lds.S @@ -97,9 +97,7 @@ VERSION #ifdef CONFIG_GENERIC_GETTIMEOFDAY global: __vdso_clock_gettime; -#ifdef CONFIG_MIPS_CLOCK_VSYSCALL __vdso_gettimeofday; -#endif __vdso_clock_getres; #if _MIPS_SIM !=3D _MIPS_SIM_ABI64 __vdso_clock_gettime64; diff --git a/arch/mips/vdso/vgettimeofday.c b/arch/mips/vdso/vgettimeofday.c index 1d236215e8f6..00f9fcfc327e 100644 --- a/arch/mips/vdso/vgettimeofday.c +++ b/arch/mips/vdso/vgettimeofday.c @@ -18,22 +18,12 @@ int __vdso_clock_gettime(clockid_t clock, return __cvdso_clock_gettime32(clock, ts); } =20 -#ifdef CONFIG_MIPS_CLOCK_VSYSCALL - -/* - * This is behind the ifdef so that we don't provide the symbol when there= 's no - * possibility of there being a usable clocksource, because there's nothin= g we - * can do without it. When libc fails the symbol lookup it should fall bac= k on - * the standard syscall path. - */ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) { return __cvdso_gettimeofday(tv, tz); } =20 -#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */ - int __vdso_clock_getres(clockid_t clock_id, struct old_timespec32 *res) { @@ -59,22 +49,12 @@ int __vdso_clock_gettime(clockid_t clock, return __cvdso_clock_gettime(clock, ts); } =20 -#ifdef CONFIG_MIPS_CLOCK_VSYSCALL - -/* - * This is behind the ifdef so that we don't provide the symbol when there= 's no - * possibility of there being a usable clocksource, because there's nothin= g we - * can do without it. When libc fails the symbol lookup it should fall bac= k on - * the standard syscall path. - */ int __vdso_gettimeofday(struct __kernel_old_timeval *tv, struct timezone *tz) { return __cvdso_gettimeofday(tv, tz); } =20 -#endif /* CONFIG_MIPS_CLOCK_VSYSCALL */ - int __vdso_clock_getres(clockid_t clock_id, struct __kernel_timespec *res) { --=20 2.54.0