From nobody Mon Jun 8 08:54:33 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 5D0014949F2; Thu, 4 Jun 2026 16:24:57 +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=1780590299; cv=none; b=Te/xZ19EUig4zlBZ6j+ryKaJtVbKr6K4DkCftRPy9zpGM8wf/yG/kamglqSFEXQz//Abca8ZdpcFQDQ5ccgJf2nBwzd7Vwr68WF4BIYB55XPsXV2k4ubroc5TCd/B8V1gsmPEW/RPLVIwZ+tCRbw9bHKyLSEG7+w4OSbi/2G/Ds= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780590299; c=relaxed/simple; bh=/LvYPUAG0UzkwFi6q1DcaKPdGF4zoc+1rLevFEXQOtw=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=bTca+g3aHYoqJKrVGIq/A66metxI1Qn0I3RLw17KuHz6MspvWe0eOw+oUJ8iEOfoWxt337qpCqpJyuwHl5O6NP+7w29uukY3jIpd+sCO2wwYYO+qG/hWByn+4VTt5WGBDxYHPLZJTIn1EbSi5O+FlVx9PwNO35MzAFbFSQN1ETU= 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=LU6SCccF; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=KO9hssUu; 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="LU6SCccF"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="KO9hssUu" Date: Thu, 04 Jun 2026 16:24:54 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1780590295; h=from:from:sender:sender:reply-to: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=RtoM5U32s1JHdWKRxRXG0IOCGhox6AxFUeAG489bo4U=; b=LU6SCccF3mPyny2xshTC+cpbkHpyuTGU44x2MpAWoXEEu4SxjQhELlGcZ5yXAJAXnbC5gS 04dY0QJjoMCrqZZAu17xNnjB+1l/YCvGMcbfenNW4WMkWeef7nEfJeJGNkemXjJYELERVw G8DdGNZmUQcjywpU0CiROnrdktR8hFBDhHYoazzm8ZjdECuzuqKhOdFZjoPdwytw7hQsPe 7rMD3lDdaQdM+9WBJ2PqEIopyC1gCLaI8w8xxYNPhjfxUVRdN4gT5BuJ2gV72o6LEsuz0f 2wW4ViMz+RpY38VlaaYhViJomNzNwJcgBG/pgTK3rmIv7d/xIuDwyJ5Bh3lOyQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1780590295; h=from:from:sender:sender:reply-to: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=RtoM5U32s1JHdWKRxRXG0IOCGhox6AxFUeAG489bo4U=; b=KO9hssUuXdOoHstNWFi+qUFzXz9THS/7s1CieYPvQAwfT1lk25gD7BNE/A09rpl01C+5xL UgoKnnrquL3iSEAQ== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/vdso] MIPS: VDSO: Only map the data pages when the vDSO is used Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , Thomas Bogendoerfer , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260521-vdso-mips-kconfig-v1-4-2f79dcd6c78f@linutronix.de> References: <20260521-vdso-mips-kconfig-v1-4-2f79dcd6c78f@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178059029438.710.11119859555214795870.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/vdso branch of tip: Commit-ID: 8ea920c48d82a0ef031bedfb649d4d8c77ef3d1c Gitweb: https://git.kernel.org/tip/8ea920c48d82a0ef031bedfb649d4d8c7= 7ef3d1c Author: Thomas Wei=C3=9Fschuh AuthorDate: Thu, 21 May 2026 08:53:18 +02:00 Committer: Thomas Gleixner CommitterDate: Thu, 04 Jun 2026 18:22:45 +02:00 MIPS: VDSO: Only map the data pages when the vDSO is used 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 Signed-off-by: Thomas Gleixner Cc: Thomas Bogendoerfer Link: https://patch.msgid.link/20260521-vdso-mips-kconfig-v1-4-2f79dcd6c78f= @linutronix.de --- 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 b041d3d..f56e1a5 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 @@ -3171,6 +3170,7 @@ config MIPS_EXTERNAL_TIMER config MIPS_GENERIC_GETTIMEOFDAY def_bool y select GENERIC_GETTIMEOFDAY + 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 2fa4df3..bd1fc17 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. */