From patchwork Sun Feb 9 20:27:12 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: 13967096 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 1C7B91E283C; Sun, 9 Feb 2025 20:27:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739132849; cv=none; b=WTSKbdWacmfx/fXm0li/9fsvUAwt6ZpeYFpTZ4CIvgI1UrD9KDJ3IOCc5X+qqGE/H5k4y0LGO6nu7mXs4xRPSTdEul0mkTG+YGJwFuVLe8wqEJs7vlQU/dpyV+jF6BbmZIyjGkerWa9bQH25DL7wxOXoLaJadDFvdkMT5XWe/do= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739132849; c=relaxed/simple; bh=+QUeG+bKiljNl7Cap2FGBbyuKBrPpyf/B7O4/k1S14s=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=D3zasbUw+0b4K4Z0AMNz6E17IK49LtBFZGfr65XhJcuqZxURwzSr2oSozBGlUG4DgpFReDo/8FOyHhirE9b3gc3mi7eIdI1WFK70+eupBAg3ww6xNosuXzejQAwtRI/AfRrhbzQt77GrtSyxktBEGjwLw59avV7r1jTL9Ksn8IU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=WpjMvFAy; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="WpjMvFAy" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1739132837; bh=+QUeG+bKiljNl7Cap2FGBbyuKBrPpyf/B7O4/k1S14s=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=WpjMvFAy1zmNWCtPzAaFDAWBqiDiuLUcRVKWMgk4Bw7UU/UAg93sl3fzD0CjhhaDe z+bZLSJbq+vtlB5plRFs9r/3FAVuwEz2YCQDv3dc+rOvus416yiWsxWBp0uDJyJpHf J7J+B4sKcT4BEO5KuggZrX+RG3wIIefFaYq+m3w4= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 09 Feb 2025 21:27:12 +0100 Subject: [PATCH v2 1/2] tools/nolibc: add support for [v]sscanf() Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250209-nolibc-scanf-v2-1-c29dea32f1cd@weissschuh.net> References: <20250209-nolibc-scanf-v2-0-c29dea32f1cd@weissschuh.net> In-Reply-To: <20250209-nolibc-scanf-v2-0-c29dea32f1cd@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1739132836; l=5306; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=+QUeG+bKiljNl7Cap2FGBbyuKBrPpyf/B7O4/k1S14s=; b=/qNf9OS9H7TXvjGCJSGtCMUcZET0S3+z3KO3ntyfjNvcgzhuXZmlXnfpoT6EnobRfBJM4QU5h Lcgyc/eOtuQDuDBJeFvarmtryL7WfLFBTVptBNYBKJ1PfRuvDtjlAsr X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= These functions are used often, also in selftests. sscanf() itself is also used by kselftest.h itself. The implementation is limited and only supports numeric arguments. Signed-off-by: Thomas Weißschuh --- tools/include/nolibc/stdio.h | 98 ++++++++++++++++++++++++++++ tools/testing/selftests/nolibc/nolibc-test.c | 68 +++++++++++++++++++ 2 files changed, 166 insertions(+) diff --git a/tools/include/nolibc/stdio.h b/tools/include/nolibc/stdio.h index 3892034198dd566d21a5cc0a9f67cf097d428393..a403351dbf6098ac8292b9589ed8a054b4c5669f 100644 --- a/tools/include/nolibc/stdio.h +++ b/tools/include/nolibc/stdio.h @@ -349,6 +349,104 @@ int printf(const char *fmt, ...) return ret; } +static __attribute__((unused)) +int vsscanf(const char *str, const char *format, va_list args) +{ + uintmax_t uval; + intmax_t ival; + int base; + char *endptr; + int matches; + int lpref; + + matches = 0; + + while (1) { + if (*format == '%') { + /* start of pattern */ + lpref = 0; + format++; + + if (*format == 'l') { + /* same as in printf() */ + lpref = 1; + format++; + if (*format == 'l') { + lpref = 2; + format++; + } + } + + if (*format == '%') { + /* literal % */ + if ('%' != *str) + goto done; + str++; + format++; + continue; + } else if (*format == 'd') { + ival = strtoll(str, &endptr, 10); + if (lpref == 0) + *va_arg(args, int *) = ival; + else if (lpref == 1) + *va_arg(args, long *) = ival; + else if (lpref == 2) + *va_arg(args, long long *) = ival; + } else if (*format == 'u' || *format == 'x' || *format == 'X') { + base = *format == 'u' ? 10 : 16; + uval = strtoull(str, &endptr, base); + if (lpref == 0) + *va_arg(args, unsigned int *) = uval; + else if (lpref == 1) + *va_arg(args, unsigned long *) = uval; + else if (lpref == 2) + *va_arg(args, unsigned long long *) = uval; + } else if (*format == 'p') { + *va_arg(args, void **) = (void *)strtoul(str, &endptr, 16); + } else { + SET_ERRNO(EILSEQ); + goto done; + } + + format++; + str = endptr; + matches++; + + } else if (*format == '\0') { + goto done; + } else if (isspace(*format)) { + /* skip spaces in format and str */ + while (isspace(*format)) + format++; + while (isspace(*str)) + str++; + } else if (*format == *str) { + /* literal match */ + format++; + str++; + } else { + if (!matches) + matches = EOF; + goto done; + } + } + +done: + return matches; +} + +static __attribute__((unused, format(scanf, 2, 3))) +int sscanf(const char *str, const char *format, ...) +{ + va_list args; + int ret; + + va_start(args, format); + ret = vsscanf(str, format, args); + va_end(args); + return ret; +} + static __attribute__((unused)) void perror(const char *msg) { diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 798fbdcd3ff8c36b514feb3fa1c7b8d7701cccd7..81e942c7d1684a7dd59af0b05c8330378532ecc1 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1325,6 +1325,73 @@ static int expect_vfprintf(int llen, int c, const char *expected, const char *fm return ret; } +static int test_scanf(void) +{ + unsigned long long ull; + unsigned long ul; + unsigned int u; + long long ll; + long l; + void *p; + int i; + + /* return __LINE__ to point to the specific failure */ + + /* test EOF */ + if (sscanf("", "foo") != EOF) + return __LINE__; + + /* test simple literal without placeholder */ + if (sscanf("foo", "foo") != 0) + return __LINE__; + + /* test single placeholder */ + if (sscanf("123", "%d", &i) != 1) + return __LINE__; + + if (i != 123) + return __LINE__; + + /* test multiple place holders and separators */ + if (sscanf("a123b456c0x90", "a%db%uc%p", &i, &u, &p) != 3) + return __LINE__; + + if (i != 123) + return __LINE__; + + if (u != 456) + return __LINE__; + + if (p != (void *)0x90) + return __LINE__; + + /* test space handling */ + if (sscanf("a b1", "a b%d", &i) != 1) + return __LINE__; + + if (i != 1) + return __LINE__; + + /* test literal percent */ + if (sscanf("a%1", "a%%%d", &i) != 1) + return __LINE__; + + if (i != 1) + return __LINE__; + + /* test stdint.h types */ + if (sscanf("1|2|3|4|5|6", + "%d|%ld|%lld|%u|%lu|%llu", + &i, &l, &ll, &u, &ul, &ull) != 6) + return __LINE__; + + if (i != 1 || l != 2 || ll != 3 || + u != 4 || ul != 5 || ull != 6) + return __LINE__; + + return 0; +} + static int run_vfprintf(int min, int max) { int test; @@ -1346,6 +1413,7 @@ static int run_vfprintf(int min, int max) CASE_TEST(char); EXPECT_VFPRINTF(1, "c", "%c", 'c'); break; CASE_TEST(hex); EXPECT_VFPRINTF(1, "f", "%x", 0xf); break; CASE_TEST(pointer); EXPECT_VFPRINTF(3, "0x1", "%p", (void *) 0x1); break; + CASE_TEST(scanf); EXPECT_ZR(1, test_scanf()); break; case __LINE__: return ret; /* must be last */ /* note: do not set any defaults so as to permit holes above */ From patchwork Sun Feb 9 20:27:13 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: 13967094 Received: from todd.t-8ch.de (todd.t-8ch.de [159.69.126.157]) (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 57C371E2847; Sun, 9 Feb 2025 20:27:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=159.69.126.157 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739132848; cv=none; b=n+V321D5BmbPnnZURU7v2jZ1+Og9wBMIHvolEjDNxuuNs3iCLzRdyckmwFXm8qA9LqMMVN0muYKIfv+4V1a3UkTNMv9Eahmcha3QKT/fa7KLAA3hdFqPyrehhr0qu8VOgqbMIosw48sZZtFmrL6fB7H/7C3OtbTD7B7lbHWqcto= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739132848; c=relaxed/simple; bh=YNKEjTClg6tWy+D1g15zHkrPsd+OULb6yiDU7924Efg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l08Jrjl2M62+R1ZUyTgf30dzUTossZQ6Lo5tiIwaD9uzeSafjKuNQRPib5mekUzElgwipsLDVEjmzclVugALqZ8D4isBtroa24w9755wC9+tWtH1499YrbUS+tdKF46PJGAH63FYT+2EKa3vtjgnf8GNr1qxlDrkkvgU8xEM7pA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net; spf=pass smtp.mailfrom=weissschuh.net; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b=kKArsENq; arc=none smtp.client-ip=159.69.126.157 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=weissschuh.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=weissschuh.net header.i=@weissschuh.net header.b="kKArsENq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=weissschuh.net; s=mail; t=1739132837; bh=YNKEjTClg6tWy+D1g15zHkrPsd+OULb6yiDU7924Efg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=kKArsENqzae29GFwWFDSXWb4bopWKoSZ198DIA9x/IErqjZaDC7jl+FtN5QPf7Q/t JBs42zw5But9JpAqALu4SCrS7P6ZeCReQFd+MCwgDG4guog/AnPJvDBEyEI4fkNZY0 EPsU+1q8cs0nUjOcP+GL7bVyLb62KTPU3EKWzj30= From: =?utf-8?q?Thomas_Wei=C3=9Fschuh?= Date: Sun, 09 Feb 2025 21:27:13 +0100 Subject: [PATCH v2 2/2] Revert "selftests: kselftest: Fix build failure with NOLIBC" Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250209-nolibc-scanf-v2-2-c29dea32f1cd@weissschuh.net> References: <20250209-nolibc-scanf-v2-0-c29dea32f1cd@weissschuh.net> In-Reply-To: <20250209-nolibc-scanf-v2-0-c29dea32f1cd@weissschuh.net> To: Willy Tarreau , Shuah Khan Cc: linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, =?utf-8?q?Thomas_Wei=C3=9Fschuh?= X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1739132836; l=1327; i=linux@weissschuh.net; s=20221212; h=from:subject:message-id; bh=YNKEjTClg6tWy+D1g15zHkrPsd+OULb6yiDU7924Efg=; b=CXkafB+LbXOtimbxyOVjEmNpRnMIv12SGz/h80n2RslGHBfFzbnvzFHLbTtEEbx2pwfKa3Y7M ONNZGPmHplPCEsJKcyHp/pE2XzHAtLlGrmHXBV1l4whmNPDAXZR9oQ3 X-Developer-Key: i=linux@weissschuh.net; a=ed25519; pk=KcycQgFPX2wGR5azS7RhpBqedglOZVgRPfdFSPB1LNw= This reverts commit 16767502aa990cca2cb7d1372b31d328c4c85b40. Nolibc gained support for uname(2) and sscanf(3) which are the dependencies of ksft_min_kernel_version(). So re-enable support for ksft_min_kernel_version() under nolibc. Signed-off-by: Thomas Weißschuh --- tools/testing/selftests/kselftest.h | 5 ----- 1 file changed, 5 deletions(-) diff --git a/tools/testing/selftests/kselftest.h b/tools/testing/selftests/kselftest.h index cdf91b0ca40fbdc4fb825b86d4dc547b5afa673c..c3b6d2604b1e486af5a224a11386f75fe0a83495 100644 --- a/tools/testing/selftests/kselftest.h +++ b/tools/testing/selftests/kselftest.h @@ -444,10 +444,6 @@ static inline __noreturn __printf(1, 2) void ksft_exit_skip(const char *msg, ... static inline int ksft_min_kernel_version(unsigned int min_major, unsigned int min_minor) { -#ifdef NOLIBC - ksft_print_msg("NOLIBC: Can't check kernel version: Function not implemented\n"); - return 0; -#else unsigned int major, minor; struct utsname info; @@ -455,7 +451,6 @@ static inline int ksft_min_kernel_version(unsigned int min_major, ksft_exit_fail_msg("Can't parse kernel version\n"); return major > min_major || (major == min_major && minor >= min_minor); -#endif } #endif /* __KSELFTEST_H */