From patchwork Wed Feb 26 11:44:49 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Patchwork-Id: 13992109 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7A30C021B8 for ; Wed, 26 Feb 2025 11:45:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E44AE28000A; Wed, 26 Feb 2025 06:45:25 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D634F28000E; Wed, 26 Feb 2025 06:45:25 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A486B28000D; Wed, 26 Feb 2025 06:45:25 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4769728000A for ; Wed, 26 Feb 2025 06:45:25 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 1D01E8134F for ; Wed, 26 Feb 2025 11:45:18 +0000 (UTC) X-FDA: 83161915116.04.6D87CF9 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by imf10.hostedemail.com (Postfix) with ESMTP id 28ABCC0011 for ; Wed, 26 Feb 2025 11:45:15 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=nasqugvG; dkim=pass header.d=linutronix.de header.s=2020e header.b=CWmvpnCr; spf=pass (imf10.hostedemail.com: domain of t-8ch@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=t-8ch@linutronix.de; dmarc=pass (policy=none) header.from=linutronix.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1740570316; h=from:from:sender: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:dkim-signature; bh=cRuD5hbVHSSw/8cljIctKIY+Y3ZkYhQFJxv3Eq1eG8c=; b=x2vaCollZS1eaxxOZ6DNA7iMdpZSJMyCzg0nRUbYSu6RH0jlWoyO5fIpLWWpgfN9k0LeZF 4VRJCnNw7AmO5YIEd3xMkpS/Hy6aiDmPLWrXPwVNMM/oECK6sZKEqBVv9Oi6vTQ/PIS1hj SfjNU8+Dxq2zvQZsB3iBKxJaeKyd9VI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linutronix.de header.s=2020 header.b=nasqugvG; dkim=pass header.d=linutronix.de header.s=2020e header.b=CWmvpnCr; spf=pass (imf10.hostedemail.com: domain of t-8ch@linutronix.de designates 193.142.43.55 as permitted sender) smtp.mailfrom=t-8ch@linutronix.de; dmarc=pass (policy=none) header.from=linutronix.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1740570316; a=rsa-sha256; cv=none; b=4FhKVzmKc5WR7wU7gdBorsOQpYnZSOe/jGElxmfYgFkKi0TKIbZ3rM+x/+Ox1j88ZnAwH2 fmS568ubVbe1IVzq/zUDdPVK+ujRoLkyomLkvp3+3fHLxi7Osd35GFBbEe+5mwXaLwJDv0 6iKJgm53FCQEAv5WvYHZePECvexzjgs= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1740570314; 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=cRuD5hbVHSSw/8cljIctKIY+Y3ZkYhQFJxv3Eq1eG8c=; b=nasqugvGFKackdKOCTch+AP72kWRqEucxypuXDsMds9gPwL8RK61E3IAURJfFRwVz6qCFV borLyAg+H0LG9tWwXNBlUwuDFwYZPS4sMuMxBeAx6ObJr9TGjNFDhtRAWyulzmylyhWtwJ P723Y+vsU/GF2dTuLScSrd42stge6MnfiMB8FerpsLUDR/zDnvtjIEmaOYfykQmjZqPh6N 9J2wj71O+zBQnyIXpq2/C7y6QezLH5rhiXHdkKjY0lULjTCFb6/K4L75NxQ/9D4sys6/zp nDlUnoAgYdIMx/DPTHflxDyqMuOQYiBxugcpuMRiDOgqbdn4WR2SX8G87j/Qbg== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1740570314; 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=cRuD5hbVHSSw/8cljIctKIY+Y3ZkYhQFJxv3Eq1eG8c=; b=CWmvpnCrI4ggnNzOB2bFK5VZej2qGU4p7haIEM0fQFYcPsUdGJejZoOoBmHUpDnIp5RS2p vfN2Hj/oogOEL1BA== Date: Wed, 26 Feb 2025 12:44:49 +0100 Subject: [PATCH v2 10/16] selftests: vDSO: vdso_standalone_test_x86: Use vdso_init_form_sysinfo_ehdr MIME-Version: 1.0 Message-Id: <20250226-parse_vdso-nolibc-v2-10-28e14e031ed8@linutronix.de> References: <20250226-parse_vdso-nolibc-v2-0-28e14e031ed8@linutronix.de> In-Reply-To: <20250226-parse_vdso-nolibc-v2-0-28e14e031ed8@linutronix.de> To: Kees Cook , Eric Biederman , Shuah Khan , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andy Lutomirski , Thomas Gleixner , Vincenzo Frascino , Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Cc: "Jason A. Donenfeld" , Christophe Leroy , linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, llvm@lists.linux.dev, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Developer-Signature: v=1; a=ed25519-sha256; t=1740570307; l=1895; i=thomas.weissschuh@linutronix.de; s=20240209; h=from:subject:message-id; bh=C3WrIXo4pF6mfQdzvKKu1BjqdXgy4M3jnZi0dZUjrCw=; b=eQDHEgBbcQlTMN155d79X04vEswgzq72yKppWr5aBDgxbIbLYxd/IvNp2Y1YQ9/fNaQ7z11QT DAUfoLznQjjCZKLGqX216kBJX2mCS9MUbVbIRKbqrvmzEqOe0Ab+zYq X-Developer-Key: i=thomas.weissschuh@linutronix.de; a=ed25519; pk=pfvxvpFUDJV2h2nY0FidLUml22uGLSjByFbM6aqQQws= X-Rspam-User: X-Stat-Signature: zu7shhk371ws1nwikn1ebr3rakwo9ttx X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 28ABCC0011 X-HE-Tag: 1740570315-323039 X-HE-Meta: U2FsdGVkX19A//KDvooBeRaOT6VezySQdA50ggYhuTg+hBWoPnIjM9gvIxgai5/OdxLhE4q8ujwEVaI36JyH4q7Qhyp1jS4lmfXpX+ftQRpt3KzyZnEYMcd6zgMzMEPExMsxddEM0CaXHtBrCb3lyhOFnO/7kwlJ47JmIynw3qVjia+dewlKgb0b/wCSei+iZmL1KGgjd8xh30nOxrz4a3ErQeongyIT8e9ULbFfKGxv/qPhT4897HuXqEdyVWfRi+y7NCI6gmosxqWFcA8ilnA9/RnGy1XmKhZyC1F4/UMQIVE4bvIzK8o+fYQDIOFX4z1narLnKELVBxiSh6mPpR6B3ui9Co8X76Hqu9ZYOFfqPl4a/jh0IFVhdvonxp1Tk/FnukYymzJOrUnoclpc3zzIfaiaYCEaR9UjGdKq278fEwe7oOTRmRBPiElZBFbBDCAtcYr4EQlPC6xO91vP5Kbkio0yR2J3K63/Wc3hAEAR5bfoADmJILtd/aBxZsAXWX96IwVnw7ZjX9+R2fZSOCY1XFNHb2bvF0w2ZIVpgtHIf8FozPk65TtAOHYpaJkNdtlcaDvQc2SJgJeSgdE3n6fPOesQyvPh3BNycshn/1k+mEW6d8KdFLwzYaYpV6ty8YAFn0GEbp29IXJoSzh+dFitLQzqLrrL1ANmyVL7S2NYTbUqDNaZm2zor4jQmdY4YK1LD6y7qJxY1VBcsb8zW64a700lHh2MqJNwYpWUnBqD2spEg3GPgyRH2Jl7T6EdNpmceGe1gXeQJys0pIZ+zzYPhVoGA/6aKLYpaxX1/aLQQ2MZel3fvxBdRStGEDjkPqY5KkYwig1pZy1amaC8Xhc0/mq4FIm13AmCSTwkYq1nwkUW9js+XCe+IWn+0DIfP2bnX0JtBdnUHGCE9+ubqmMH9wWvM/g/yczNWJGEJcNytdh/oYLhAGrKjokz2TEhtI9/TuzdT6B9Rdfv/Ev +zhzREgv F0LoO/PYVk4LP+gepAswFqeXmS4aVhgCmCgj+vpdtRVzw+9xG1OPOuUa8Xu95dWJcUp5LqTEgpzC4OXbklmvluV3zKBVG0my505d0CUqbTWF1Hb6OPbixRqcZeQuME7reVdWF6ReRbUCIpt1yEVXIc9FjBH95gVbjEGkw/MEytJVcbbTOcYBtFUgEncdknqIby42knMn2ttUJQtRzeqhL6ogwpBG9iEgBtmm2CtoKKYITOvmb7VuFJJQ18Ni9TKe6uCeVlDGWm5pkTeUh4akfmgXqfczuYFfqW3tzGI0iuZfgY0mmSJt6WFeNQA7ybGjlkkrSmCWjdnw0JfeGmcSERT6wfCKTAqWBIOoRzKUGdqG7rPgXxjaUhtCYC6cSjVyl1RxjeOzkLlnGL8kwcMVUqwBXnq5uuhmMWZgjggEiD2pAG4DTHJQW0fjFYbsYovl/uNjntSY9V08UAc9wD5cc2cYVNPGRPgi59IxPHMah9cSTA6U= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: vdso_standalone_test_x86 is the only user of vdso_init_from_auxv(). Instead of combining the parsing the aux vector with the parsing of the vDSO, split them apart into getauxval() and the regular vdso_init_from_sysinfo_ehdr(). The implementation of getauxval() is taken from tools/include/nolibc/stdlib.h. Signed-off-by: Thomas Weißschuh --- All of this code will be deleted later again. --- .../selftests/vDSO/vdso_standalone_test_x86.c | 27 +++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c index 644915862af8883131e5defd336f1bd80736fc0f..500608f89c66b5747e3d845ebc54e4c3a35b6ccd 100644 --- a/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c +++ b/tools/testing/selftests/vDSO/vdso_standalone_test_x86.c @@ -15,6 +15,7 @@ #include #include #include +#include #include "parse_vdso.h" @@ -84,6 +85,30 @@ void to_base10(char *lastdig, time_t n) } } +unsigned long getauxval(const unsigned long *auxv, unsigned long type) +{ + unsigned long ret; + + if (!auxv) + return 0; + + while (1) { + if (!auxv[0] && !auxv[1]) { + ret = 0; + break; + } + + if (auxv[0] == type) { + ret = auxv[1]; + break; + } + + auxv += 2; + } + + return ret; +} + void c_main(void **stack) { /* Parse the stack */ @@ -96,7 +121,7 @@ void c_main(void **stack) stack++; /* Now we're pointing at auxv. Initialize the vDSO parser. */ - vdso_init_from_auxv((void *)stack); + vdso_init_from_sysinfo_ehdr(getauxval((unsigned long *)stack, AT_SYSINFO_EHDR)); /* Find gettimeofday. */ typedef long (*gtod_t)(struct timeval *tv, struct timezone *tz);