mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "tip-bot2 for Thomas Weißschuh" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: thomas.weissschuh@linutronix.de,
	Thomas Gleixner <tglx@kernel.org>, Nam Cao <namcao@linutronix.de>,
	x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] vdso/datastore: Map zeroed pages for unavailable data
Date: Tue, 07 Jul 2026 21:54:54 -0000	[thread overview]
Message-ID: <178346129417.744054.9109363176684031173.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20260630-vdso-mlockall-v4-3-6c93708ce723@linutronix.de>

The following commit has been merged into the timers/vdso branch of tip:

Commit-ID:     43648f9f3a67125ba649027a5be00bc005065482
Gitweb:        https://git.kernel.org/tip/43648f9f3a67125ba649027a5be00bc005065482
Author:        Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate:    Tue, 30 Jun 2026 09:31:57 +02:00
Committer:     Thomas Gleixner <tglx@kernel.org>
CommitterDate: Tue, 07 Jul 2026 23:52:52 +02:00

vdso/datastore: Map zeroed pages for unavailable data

mlockall() stops if a page in a VMA is unmappable. As the datastore VMA
can contain holes, mlockall() would not process all data pages.

Replace the mapping error VM_FAULT_SIGBUS by just mapping the underlying
unused and zeroed-out data page. The vDSO will not access these pages in
any case and for other userspace these pages have undefined contents.

This will allow mlockall() to process all pages within the VMA as soon
as VM_IO is removed from the VMA.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Tested-by: Nam Cao <namcao@linutronix.de>
Link: https://patch.msgid.link/20260630-vdso-mlockall-v4-3-6c93708ce723@linutronix.de
---
 lib/vdso/datastore.c |  9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c
index e01db96..cf7aa80 100644
--- a/lib/vdso/datastore.c
+++ b/lib/vdso/datastore.c
@@ -74,7 +74,7 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
 	switch (vmf->pgoff) {
 	case VDSO_TIME_PAGE_OFFSET:
 		if (!IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY))
-			return VM_FAULT_SIGBUS;
+			break;
 		if (timens_page) {
 			/*
 			 * Fault in VVAR page too, since it will be accessed
@@ -99,16 +99,11 @@ static vm_fault_t vvar_fault(const struct vm_special_mapping *sm,
 		 * See also the comment near timens_setup_vdso_data().
 		 */
 		if (!IS_ENABLED(CONFIG_TIME_NS) || !timens_page)
-			return VM_FAULT_SIGBUS;
+			break;
 		page = vdso_data_pages + VDSO_TIME_PAGE_OFFSET;
 		break;
 	case VDSO_RNG_PAGE_OFFSET:
-		if (!IS_ENABLED(CONFIG_VDSO_GETRANDOM))
-			return VM_FAULT_SIGBUS;
-		break;
 	case VDSO_ARCH_PAGES_START ... VDSO_ARCH_PAGES_END:
-		if (!IS_ENABLED(CONFIG_ARCH_HAS_VDSO_ARCH_DATA))
-			return VM_FAULT_SIGBUS;
 		break;
 	default:
 		return VM_FAULT_SIGBUS;

  reply	other threads:[~2026-07-07 21:55 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-06-30  7:31 [PATCH v4 0/6] vdso/datastore: Allow prefaulting by mlockall() Thomas Weißschuh
2026-06-30  7:31 ` [PATCH v4 1/6] vdso/datastore: Rename data pages variable Thomas Weißschuh
2026-07-07 21:54   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-30  7:31 ` [PATCH v4 2/6] vdso/datastore: Map pages in terms of the faults pgoff Thomas Weißschuh
2026-07-07 21:54   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-30  7:31 ` [PATCH v4 3/6] vdso/datastore: Map zeroed pages for unavailable data Thomas Weißschuh
2026-07-07 21:54   ` tip-bot2 for Thomas Weißschuh [this message]
2026-06-30  7:31 ` [PATCH v4 4/6] vdso/datastore: Explicitly prevent remote access to timens vvar page Thomas Weißschuh
2026-07-07 21:54   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-30  7:31 ` [PATCH v4 5/6] vdso/datastore: Allow prefaulting by mlockall() Thomas Weißschuh
2026-07-07 21:54   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2026-06-30  7:32 ` [PATCH v4 6/6] vdso/datastore: Simplify the mapping logic for VDSO_TIME_PAGE_OFFSET Thomas Weißschuh
2026-07-07 21:54   ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=178346129417.744054.9109363176684031173.tip-bot2@tip-bot2 \
    --to=tip-bot2@linutronix.de \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-tip-commits@vger.kernel.org \
    --cc=namcao@linutronix.de \
    --cc=tglx@kernel.org \
    --cc=thomas.weissschuh@linutronix.de \
    --cc=x86@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®