From patchwork Fri Jun 24 19:59:18 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 55391 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 684B6386DC7A for ; Fri, 24 Jun 2022 20:01:14 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 684B6386DC7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1656100874; bh=OW/LGJrmXiHMJwWweSkYVOKAIhm9q7W5q9wzmuMFG9M=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=YXa+i25ShK9PfPux3fj66tCpaP4ZSQTcDjtBEyCrZjJoxlmBNBoUi9kAhP88Oxai8 VFmb58YxRKP/zJCxCSnat0s4ZR0jg0o8AVbx5biDDsa8k4u4J5MOSuGwXZS2/Knimm YhkWYh5XNH19MgW2HFc5dfo8qhzf/Oya3k4fwV0Y= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-oi1-x22d.google.com (mail-oi1-x22d.google.com [IPv6:2607:f8b0:4864:20::22d]) by sourceware.org (Postfix) with ESMTPS id C5D7A383E81C for ; Fri, 24 Jun 2022 19:59:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C5D7A383E81C Received: by mail-oi1-x22d.google.com with SMTP id u9so4843417oiv.12 for ; Fri, 24 Jun 2022 12:59:29 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=OW/LGJrmXiHMJwWweSkYVOKAIhm9q7W5q9wzmuMFG9M=; b=5B+eLjztHUZo3D/bUIHWarOJtmJSFATtxpClkAkxEjzZDXK6VobgecN0Un+CXuD7+5 W6+RsH0StvjTxH+Uu7xbENusg6wTmyowllpdlQqRW1Y0rR1xkamJcVAS0lF38lKQH5Dv BNeVrgbTB4VoP3M6LwC03uOLWMoz2U9cGMPuHc+oGPWOJ7ZD5y35LdQpdM/U3u8QeRLS h4hZQfXSaDTqARJTFmLEwezMeH9wC7rI2B5isyHd8NdCwSuJDTpAMXjQggftskX6K+ZJ BveKx9b8EL2JNr3FA1vlp5/Icr4l9sT1CyYvCHkEQOpB2ESZTuo+u0NrERW4gTsJY7ir LN/A== X-Gm-Message-State: AJIora/duk1iRXBfOg1orm7J7T/xvQL1wcnQU4I8Hr5EhSvbNctOoAJ8 9c5mzurrgmi1DidN7G22XdF26l03jmp3LDkz X-Google-Smtp-Source: AGRyM1ulq6vvJc87tPqSnuQxD9H2zPQC51qOAtlO0eOqH1O41MejN1+n3klZj1lmKtDs7znWMG3xlQ== X-Received: by 2002:a05:6808:2117:b0:32e:f441:8cbe with SMTP id r23-20020a056808211700b0032ef4418cbemr2910777oiw.167.1656100768904; Fri, 24 Jun 2022 12:59:28 -0700 (PDT) Received: from birita.. ([2804:431:c7ca:6d95:9dec:f60e:5726:dc2]) by smtp.gmail.com with ESMTPSA id p16-20020a0568708a1000b000f32c6b6871sm2543638oaq.10.2022.06.24.12.59.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jun 2022 12:59:28 -0700 (PDT) To: libc-alpha@sourceware.org, Carlos O'Donell Subject: [PATCH v7 4/5] linux: Add tst-mount to check for Linux new mount API Date: Fri, 24 Jun 2022 16:59:18 -0300 Message-Id: <20220624195919.435424-5-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220624195919.435424-1-adhemerval.zanella@linaro.org> References: <20220624195919.435424-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces+patchwork=sourceware.org@sourceware.org Sender: "Libc-alpha" The new mount API was added on Linux 5.2 with six new syscalls: fsopen, fsconfig, fsmount, move_mount, fspick, and open_tree. The new test verifies minimal functionality along with error paths for specific arguments and their corner cases. Checked on x86_64-linux-gnu. Reviewed-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/Makefile | 1 + sysdeps/unix/sysv/linux/tst-mount.c | 95 +++++++++++++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/tst-mount.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 7ffcf7ed83..2ccc92b6b8 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -130,6 +130,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-getauxval \ tst-pidfd \ tst-process_mrelease \ + tst-mount \ # tests # process_madvise requires CAP_SYS_ADMIN. diff --git a/sysdeps/unix/sysv/linux/tst-mount.c b/sysdeps/unix/sysv/linux/tst-mount.c new file mode 100644 index 0000000000..12a665f950 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-mount.c @@ -0,0 +1,95 @@ +/* Basic tests for the new Linux API added on Linux 5.2. + Copyright (C) 2022 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation; either version 2.1 of the + License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; see the file COPYING.LIB. If + not, see . */ + +#include +#include +#include +#include +#include +#include + +static void +subprocess (void) +{ + int r = fsopen ("it_should_be_not_a_valid_mount", 0); + TEST_VERIFY_EXIT (r == -1); + if (errno == ENOSYS) + FAIL_UNSUPPORTED ("kernel does not support new mount API, skipping test"); + TEST_COMPARE (errno, ENODEV); + + int fd = fsopen ("tmpfs", FSOPEN_CLOEXEC); + TEST_VERIFY (fd != -1); + + TEST_COMPARE (fsconfig (-1, FSCONFIG_SET_STRING, "size", "2048", 0), -1); + TEST_COMPARE (errno, EINVAL); + + { + int r = fsconfig (fd, FSCONFIG_SET_STRING, "size", "2048", 0); + TEST_VERIFY (r != -1); + r = fsconfig (fd, FSCONFIG_CMD_CREATE, NULL, NULL, 0); + TEST_VERIFY (r != -1); + } + + TEST_COMPARE (fsmount (-1, FSMOUNT_CLOEXEC, MOUNT_ATTR_NODEV), -1); + TEST_COMPARE (errno, EBADF); + + int mfd = fsmount (fd, FSMOUNT_CLOEXEC, MOUNT_ATTR_NODEV); + TEST_VERIFY (mfd != -1); + + TEST_COMPARE (move_mount (-1, "", AT_FDCWD, "/tmp", 0), -1); + TEST_COMPARE (errno, ENOENT); + { + int r = move_mount (mfd, "", AT_FDCWD, "/tmp", MOVE_MOUNT_F_EMPTY_PATH); + TEST_VERIFY (r != -1); + } + + TEST_COMPARE (fspick (AT_FDCWD, "", 0), -1); + TEST_COMPARE (errno, ENOENT); + { + int pfd = fspick (AT_FDCWD, "/tmp", FSPICK_CLOEXEC); + TEST_VERIFY (pfd != -1); + } + + TEST_COMPARE (open_tree (AT_FDCWD, "", 0), -1); + TEST_COMPARE (errno, ENOENT); + { + int fd_tree = open_tree (AT_FDCWD, "/tmp", + OPEN_TREE_CLONE | OPEN_TREE_CLOEXEC); + TEST_VERIFY (fd_tree != -1); + } + + _exit (0); +} + +static int +do_test (void) +{ + support_become_root (); + + pid_t pid = xfork (); + if (pid == 0) + subprocess (); + + int status; + xwaitpid (pid, &status, 0); + TEST_VERIFY (WIFEXITED (status)); + + return 0; +} + +#include