From patchwork Sun Mar 2 20:25:23 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Louis Taylor X-Patchwork-Id: 869773 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BF601E32BE for ; Sun, 2 Mar 2025 20:27:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740947243; cv=none; b=QznXppC/cLhFSnCO/ECnRmvSj35lnnAczQifGwlAPeAkDouGHlJAuFhOmq7iEq7utd006AMxwvr80vsGVNyRlOjleiAVpTl8WlsmHmJ09B42++Hkvj12QbWr4HByEyalZ7D6tM75CehjerQpMt+C/DxA1KmwRltjuaMQju3vv3E= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740947243; c=relaxed/simple; bh=FoAngoI/MZZsdcjDEJuPOT1p8rOyhmYEoGGRxCCCKtI=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=CPa87DkGcZlAyfoHeKgVH1/GFYDgchHnlMUPwGrl2YYkNnNYSlhoClFUuqVkqxWX03L+/vRAGCu6iMhgErl0eyMr7PDR/zMDOOVPjWMno6XkLPm2X6KsM8pya1JgrLll1e3ghYotb5eiDF562mKHEqyHGdO3aV0UPdVNvA69220= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kragniz.eu; spf=none smtp.mailfrom=kragniz.eu; dkim=pass (1024-bit key) header.d=kragniz.eu header.i=@kragniz.eu header.b=GrSDVLRe; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kragniz.eu Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=kragniz.eu Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=kragniz.eu header.i=@kragniz.eu header.b="GrSDVLRe" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-390dc0a7605so2001690f8f.1 for ; Sun, 02 Mar 2025 12:27:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kragniz.eu; s=google; t=1740947240; x=1741552040; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Toe+H3M/fPbLKjUPwqPGSh5JqM5rSp09PnBJvQRrlzo=; b=GrSDVLRe36b6HQCzwZgF4YuFk7zyjDG+svju8FtfgEhRmJ/pnSSKG1TqKmocX14mUn sXfNyTBOH6QjxTOc8ZMlIqECPJAj6dqIscg+ur65fypchIT/njIYmJWBYgU6F4ZMUpdq 4n2L5INBXfbkFnt2Ul5jQSbdIiZHWJ9Z/Fom0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740947240; x=1741552040; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Toe+H3M/fPbLKjUPwqPGSh5JqM5rSp09PnBJvQRrlzo=; b=blCxQKz9krJdRyzyGKSX/6SOtmVSL73ZuJKR2/3N7EvgtXaopGyKtMVGE/TKhZSjbK fk+rF9UvXJvY1bZxfT47X6z2cDMY97H1doXJcD3zc+z/dkOiDrnh4jgtln3IdqMOld6j bNOYhPHswKcI64ay/sBdOjfGJJtRYgDJUeiT9wD5AVDMMaRl78WwCrelDljKZqQ2yxY4 atIWou+uMm03RMHF1t/tLWzuzsoMqpz+XE1EKPOemRWoln72sxLoNZxsFNY2Id2q9E8c hps+9YwZI1pxPaT5jy3eyUbCW6DZ95MEPgOH/Qv/SHAQ+u1jcyfdZSL/wtZiSOCTbn/i QgCQ== X-Forwarded-Encrypted: i=1; AJvYcCWyuvptnVVGdJeFBRuy6TGD0xLqcChNqd6iu9Zz5PRj8FUXobumgt3z8x9ZixQ1r8AWpCJCm20gX1ZqUmF+Yl0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw5QfTcq6bhfJXV7WOFSw3qjwwvRgVyQij4oy9/KzRlScL/OTia 75T5bcijk2co5LQ9Lm54/3Ho0L6BnWMotnrC0NwwNReeYC3srcHfFnngxrkE+4I= X-Gm-Gg: ASbGncugBxqMIMqpeqSDHwfmhu0Fbw0ZXBK7ccr90wT5YrQ4shOZkpM7l4DZJ1Scgv7 8LosSB7RGAwVbaanchWfbrdTkSkLfwq0gtwP4R48J777DGJDPxMHaAekJoBaVcsR5myH6AltUrE 4XtuHsK0/OoRR1oixmhVQAgdmBqWTIPDssfViD8ZLNveQwrrDq93LIReJY4cEHygc0u57BB7G31 1wPPsSY4BlEO7GEWbDfH6/IToR3NFjdQvCMBZ8mE+E9KpvDx97CqVbJxl+JupfeKebRRndztzfH 4MCTsX7r/XXilTfcthku0RTqhR6X37XxgJHkvR5zEtJxggrzvkOU+H71CUiVjxlaNI2gaCSo/ew PYVKZ7w== X-Google-Smtp-Source: AGHT+IHs9J8Ly/fXvEU8Y5V9qY4tcCR+glMwH6IFLDwq0w/R5uvEyofQymw0Rg1+CP7r0YIBRunl9g== X-Received: by 2002:a05:600c:1d0e:b0:439:88bb:d020 with SMTP id 5b1f17b1804b1-43ba66e1dafmr93255355e9.8.1740947239536; Sun, 02 Mar 2025 12:27:19 -0800 (PST) Received: from localhost.localdomain (161.26.169.217.in-addr.arpa. [217.169.26.161]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43b73703caesm133585295e9.12.2025.03.02.12.27.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 02 Mar 2025 12:27:19 -0800 (PST) From: Louis Taylor To: Willy Tarreau , =?utf-8?q?Thomas_Wei=C3=9Fschuh?= , Shuah Khan Cc: Louis Taylor , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH] tools/nolibc: add support for openat(2) Date: Sun, 2 Mar 2025 20:25:23 +0000 Message-ID: <20250302202528.4169024-1-louis@kragniz.eu> X-Mailer: git-send-email 2.45.2 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 openat is useful to avoid needing to construct relative paths, so expose a wrapper for using it directly. Signed-off-by: Louis Taylor --- tools/include/nolibc/sys.h | 29 ++++++++++++++++++++ tools/testing/selftests/nolibc/nolibc-test.c | 22 +++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h index 8f44c33b1213..e5ff34df4aee 100644 --- a/tools/include/nolibc/sys.h +++ b/tools/include/nolibc/sys.h @@ -765,6 +765,35 @@ int mount(const char *src, const char *tgt, return __sysret(sys_mount(src, tgt, fst, flags, data)); } +/* + * int openat(int dirfd, const char *path, int flags[, mode_t mode]); + */ + +static __attribute__((unused)) +int sys_openat(int dirfd, const char *path, int flags, mode_t mode) +{ +#ifdef __NR_openat + return my_syscall4(__NR_openat, dirfd, path, flags, mode); +#else + return __nolibc_enosys(__func__, dirfd, path, flags, mode); +#endif +} + +static __attribute__((unused)) +int openat(int dirfd, const char *path, int flags, ...) +{ + mode_t mode = 0; + + if (flags & O_CREAT) { + va_list args; + + va_start(args, flags); + mode = va_arg(args, int); + va_end(args); + } + + return __sysret(sys_openat(dirfd, path, flags, mode)); +} /* * int open(const char *path, int flags[, mode_t mode]); diff --git a/tools/testing/selftests/nolibc/nolibc-test.c b/tools/testing/selftests/nolibc/nolibc-test.c index 79c3e6a845f3..97ded6c76f99 100644 --- a/tools/testing/selftests/nolibc/nolibc-test.c +++ b/tools/testing/selftests/nolibc/nolibc-test.c @@ -1028,6 +1028,26 @@ int test_rlimit(void) return 0; } +int test_openat(void) +{ + int dev; + int null; + + dev = openat(AT_FDCWD, "/dev", O_DIRECTORY); + if (dev < 0) + return -1; + + null = openat(dev, "null", 0); + if (null < 0) { + close(dev); + return -1; + } + + close(dev); + close(null); + + return 0; +} /* Run syscall tests between IDs and . * Return 0 on success, non-zero on failure. @@ -1116,6 +1136,8 @@ int run_syscall(int min, int max) CASE_TEST(mmap_munmap_good); EXPECT_SYSZR(1, test_mmap_munmap()); break; CASE_TEST(open_tty); EXPECT_SYSNE(1, tmp = open("/dev/null", 0), -1); if (tmp != -1) close(tmp); break; CASE_TEST(open_blah); EXPECT_SYSER(1, tmp = open("/proc/self/blah", 0), -1, ENOENT); if (tmp != -1) close(tmp); break; + CASE_TEST(openat_fdcwd); EXPECT_SYSNE(1, tmp = openat(AT_FDCWD, "/dev/null", 0), -1); if (tmp != -1) close(tmp); break; + CASE_TEST(openat_dir); EXPECT_SYSNE(1, test_openat(), -1); break; CASE_TEST(pipe); EXPECT_SYSZR(1, test_pipe()); break; CASE_TEST(poll_null); EXPECT_SYSZR(1, poll(NULL, 0, 0)); break; CASE_TEST(poll_stdout); EXPECT_SYSNE(1, ({ struct pollfd fds = { 1, POLLOUT, 0}; poll(&fds, 1, 0); }), -1); break;