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@linutronix.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: timers/vdso] vdso/datastore: Gate time data behind CONFIG_GENERIC_GETTIMEOFDAY
Date: Thu, 04 Sep 2025 09:32:25 -0000 [thread overview]
Message-ID: <175697834531.1920.17519023914521515930.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20250826-vdso-cleanups-v1-1-d9b65750e49f@linutronix.de>
The following commit has been merged into the timers/vdso branch of tip:
Commit-ID: 7c0c01a216e6d9e1d169c0f6f3b5522e6da708ed
Gitweb: https://git.kernel.org/tip/7c0c01a216e6d9e1d169c0f6f3b5522e6da708ed
Author: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
AuthorDate: Tue, 26 Aug 2025 08:17:04 +02:00
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Thu, 04 Sep 2025 11:23:49 +02:00
vdso/datastore: Gate time data behind CONFIG_GENERIC_GETTIMEOFDAY
When the generic vDSO does not provide time functions, as for example on
riscv32, then the time data store is not necessary.
Avoid allocating these time data pages when not used.
Fixes: df7fcbefa710 ("vdso: Add generic time data storage")
Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/all/20250826-vdso-cleanups-v1-1-d9b65750e49f@linutronix.de
---
lib/vdso/datastore.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/vdso/datastore.c b/lib/vdso/datastore.c
index 3693c6c..a565c30 100644
--- a/lib/vdso/datastore.c
+++ b/lib/vdso/datastore.c
@@ -11,14 +11,14 @@
/*
* The vDSO data page.
*/
-#ifdef CONFIG_HAVE_GENERIC_VDSO
+#ifdef CONFIG_GENERIC_GETTIMEOFDAY
static union {
struct vdso_time_data data;
u8 page[PAGE_SIZE];
} vdso_time_data_store __page_aligned_data;
struct vdso_time_data *vdso_k_time_data = &vdso_time_data_store.data;
static_assert(sizeof(vdso_time_data_store) == PAGE_SIZE);
-#endif /* CONFIG_HAVE_GENERIC_VDSO */
+#endif /* CONFIG_GENERIC_GETTIMEOFDAY */
#ifdef CONFIG_VDSO_GETRANDOM
static union {
@@ -46,7 +46,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_HAVE_GENERIC_VDSO))
+ if (!IS_ENABLED(CONFIG_GENERIC_GETTIMEOFDAY))
return VM_FAULT_SIGBUS;
pfn = __phys_to_pfn(__pa_symbol(vdso_k_time_data));
if (timens_page) {
next prev parent reply other threads:[~2025-09-04 9:32 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-08-26 6:17 [PATCH 00/11] vdso: Various cleanups Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 01/11] vdso/datastore: Gate time data behind CONFIG_GENERIC_GETTIMEOFDAY Thomas Weißschuh
2025-09-04 9:32 ` tip-bot2 for Thomas Weißschuh [this message]
2025-08-26 6:17 ` [PATCH 02/11] ARM: VDSO: remove cntvct_ok global variable Thomas Weißschuh
2025-09-04 9:32 ` [tip: timers/vdso] ARM: VDSO: Remove " tip-bot2 for Rasmus Villemoes
2025-08-26 6:17 ` [PATCH 03/11] vdso: Move ENABLE_COMPAT_VDSO from core to arm64 Thomas Weißschuh
2025-08-26 19:33 ` Catalin Marinas
2025-09-04 9:32 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 04/11] vdso/gettimeofday: Remove !CONFIG_TIME_NS stubs Thomas Weißschuh
2025-09-04 9:32 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 05/11] time: Build generic update_vsyscall() only with generic time vDSO Thomas Weißschuh
2025-09-04 9:32 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 06/11] riscv: vdso: Untangle kconfig logic Thomas Weißschuh
2025-09-04 9:32 ` [tip: timers/vdso] riscv: vdso: Untangle Kconfig logic tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 07/11] vdso: Drop kconfig GENERIC_VDSO_32 Thomas Weißschuh
2025-09-04 9:32 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 08/11] vdso: Drop kconfig GENERIC_COMPAT_VDSO Thomas Weißschuh
2025-08-26 19:33 ` Catalin Marinas
2025-09-04 9:32 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 09/11] vdso: Drop kconfig GENERIC_VDSO_DATA_STORE Thomas Weißschuh
2025-08-26 19:33 ` Catalin Marinas
2025-09-04 9:32 ` [tip: timers/vdso] vdso: Drop Kconfig GENERIC_VDSO_DATA_STORE tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 10/11] vdso: Drop kconfig GENERIC_VDSO_TIME_NS Thomas Weißschuh
2025-08-26 19:34 ` Catalin Marinas
2025-09-04 9:32 ` [tip: timers/vdso] vdso: Drop Kconfig GENERIC_VDSO_TIME_NS tip-bot2 for Thomas Weißschuh
2025-08-26 6:17 ` [PATCH 11/11] vdso: Gate VDSO_GETRANDOM behind HAVE_GENERIC_VDSO Thomas Weißschuh
2025-09-04 9:32 ` [tip: timers/vdso] " tip-bot2 for Thomas Weißschuh
2025-10-09 1:06 ` [PATCH 00/11] vdso: Various cleanups patchwork-bot+linux-riscv
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=175697834531.1920.17519023914521515930.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=tglx@linutronix.de \
--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®