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 E16B6422550; Tue, 7 Jul 2026 21:54:52 +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=1783461294; cv=none; b=rUbRrek7NS9PzBlZBE7oY0prcX8d2ozYJJ6Hewhv8YfahmYOCN4yHvIy/Atj00mBaG9YixfL98p+7h9sbHCKFd3eVHLI7zU+qUbJZnhH/dEwhdnQri0c/lkjownzPjpEzeRJqH6LhtQG6Jgutl7lmPoUjqtAnyvsFh2zrfxjaNQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783461294; c=relaxed/simple; bh=1Vd43H6lNe59qhleueA2MByk9+8cwAhIy08cLXTymZ0=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=fqxbN58RxdasWKqhfY/6FlXIq0H63dKnZkPOYDmhs2OaQzZNcDk6SpFj4HO7V1N8X+/MEpYFdgE7EHMFAInBC7MxnUHNPPGAIQw34G48zNOUQkNAl5g/3PNwnzzTBCFMU4eUcAMuQn6LGPD1EoLR/UoaDZtRePtcNW4RmWErBYA= 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=DjZ9cU4P; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=FP3OfqXY; 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="DjZ9cU4P"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="FP3OfqXY" Date: Tue, 07 Jul 2026 21:54:49 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1783461291; 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=aAxzNBvcxCgefJrXuSQMrpUw4JD5qcY9F/zsGzg0Y0k=; b=DjZ9cU4PUrFBDnGeNLoMwF/UaS/232icjKS8YKUj31gUWUlx4nMgZG07Oni6M104ti7RAK fVZVWZiD13jxwWTr6Ohm13CLnowbgfx7UDyooh2UC1YtT2CFxj1wyIznZLfqhdeUyyoXhM f6SnBr7ZcNpnWJlcEAdATMiiExFLSVOEkzLzfCOpgO4gEDFXAERWo4g+30AJjJUM8tPmKF YBD8ciAFciFUCgLRYOjTjRq9L18959c8AZOrChYEkaIftNmVRYZXU3jI1jPnnJD+ZG2bky xmRiWs7N3dmTq+ICU6ceUfdgqeb3s3oFBbUfZVmW8UnBcLjp9bLOvHoN3Xiy3Q== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1783461291; 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=aAxzNBvcxCgefJrXuSQMrpUw4JD5qcY9F/zsGzg0Y0k=; b=FP3OfqXY1qjqRkUeoaZJGhVFtb8HThEeCoYFKUE831+IZjI8uefHbVYEPP4mF1YUyUkxR7 2q79MOXune0QqhAg== 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] vdso/datastore: Simplify the mapping logic for VDSO_TIME_PAGE_OFFSET Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260630-vdso-mlockall-v4-6-6c93708ce723@linutronix.de> References: <20260630-vdso-mlockall-v4-6-6c93708ce723@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <178346128997.744054.6259325533634025124.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: 0b50763e8439b171d8fe2c6df0d27705fa89f21a Gitweb: https://git.kernel.org/tip/0b50763e8439b171d8fe2c6df0d27705fa8= 9f21a Author: Thomas Wei=C3=9Fschuh AuthorDate: Tue, 30 Jun 2026 09:32:00 +02:00 Committer: Thomas Gleixner CommitterDate: Tue, 07 Jul 2026 23:52:53 +02:00 vdso/datastore: Simplify the mapping logic for VDSO_TIME_PAGE_OFFSET The logic for CONFIG_GENERIC_GETTIMEOFDAY=3Dn and !timens_page is identical now. Use this to simplify the logic a bit. Signed-off-by: Thomas Wei=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260630-vdso-mlockall-v4-6-6c93708ce723@linut= ronix.de --- lib/vdso/datastore.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c index d7ab077..1426bf4 100644 --- a/lib/vdso/datastore.c +++ b/lib/vdso/datastore.c @@ -76,22 +76,20 @@ static vm_fault_t vvar_fault(const struct vm_special_mapp= ing *sm, =20 switch (vmf->pgoff) { case VDSO_TIME_PAGE_OFFSET: - if (!IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY)) + if (!IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY) || !timens_page) break; - if (timens_page) { - /* - * Fault in VVAR page too, since it will be accessed - * to get clock data anyway. - */ - unsigned long addr; - vm_fault_t err; - - addr =3D vmf->address + VDSO_TIMENS_PAGE_OFFSET * PAGE_SIZE; - err =3D vmf_insert_page(vma, addr, page); - if (unlikely(err & VM_FAULT_ERROR)) - return err; - page =3D timens_page; - } + /* + * Fault in VVAR page too, since it will be accessed + * to get clock data anyway. + */ + unsigned long addr; + vm_fault_t err; + + addr =3D vmf->address + VDSO_TIMENS_PAGE_OFFSET * PAGE_SIZE; + err =3D vmf_insert_page(vma, addr, page); + if (unlikely(err & VM_FAULT_ERROR)) + return err; + page =3D timens_page; break; case VDSO_TIMENS_PAGE_OFFSET: /*