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 picard.linux.it (picard.linux.it [213.254.12.146]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 936C9EE6457 for ; Fri, 15 Sep 2023 13:44:06 +0000 (UTC) Received: from picard.linux.it (localhost [IPv6:::1]) by picard.linux.it (Postfix) with ESMTP id 4508B3CE6B4 for ; Fri, 15 Sep 2023 15:44:04 +0200 (CEST) Received: from in-4.smtp.seeweb.it (in-4.smtp.seeweb.it [IPv6:2001:4b78:1:20::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by picard.linux.it (Postfix) with ESMTPS id 7AEAC3CB172 for ; Fri, 15 Sep 2023 15:43:53 +0200 (CEST) Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by in-4.smtp.seeweb.it (Postfix) with ESMTPS id 57F9910001A4 for ; Fri, 15 Sep 2023 15:43:51 +0200 (CEST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 2188A218F0; Fri, 15 Sep 2023 13:43:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1694785431; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Z9cVq4p3qaYVLrO9p5nyaFMWY2jDvL/6EM+7V86fW9c=; b=WMAcS1j2bd54EM7fo7rZkQHR1cvaUN/KoRVc8Zkya+sEUfRkAEMJBHBkGCnvGYRu4spBJ8 M8CPK8XcNi+OWBoGbsoIdJ4ge6EabPc1XQnPUfPRLHCu83kEGDuDidjysW6IQ5DU2zd1s9 qXQV792ZW/rFKXdy4HdNyvSsTRnQo/Y= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1694785431; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Z9cVq4p3qaYVLrO9p5nyaFMWY2jDvL/6EM+7V86fW9c=; b=Idvr6GAllv/Zm9VBuKvSogvZLxi1Cq4yLbiZoRkHq80hWYoEbE0uM6yVYp+qmPEO+c1hHr c+ghAezIv1d2JPDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0AD201358A; Fri, 15 Sep 2023 13:43:51 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id S/WjAZdfBGVwZwAAMHmgww (envelope-from ); Fri, 15 Sep 2023 13:43:51 +0000 From: Marius Kittler To: ltp@lists.linux.it Date: Fri, 15 Sep 2023 15:43:48 +0200 Message-ID: <20230915134348.5553-1-mkittler@suse.de> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 1.0.1 at in-4.smtp.seeweb.it X-Virus-Status: Clean Subject: [LTP] [PATCH v1] Port `getxattr02.c` to new test API X-BeenThere: ltp@lists.linux.it X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Test Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ltp-bounces+ltp=archiver.kernel.org@lists.linux.it Sender: "ltp" * Utilize `all_filesystems = 1`-mechanism to test on various file systems instead of relying on the temporary directory's file system to support xattr (which it probably does not as it is commonly a tmpfs) * Improve error handling * Simplify code and description Signed-off-by: Marius Kittler --- .../kernel/syscalls/getxattr/getxattr02.c | 182 ++++++++---------- 1 file changed, 75 insertions(+), 107 deletions(-) diff --git a/testcases/kernel/syscalls/getxattr/getxattr02.c b/testcases/kernel/syscalls/getxattr/getxattr02.c index a42057d0a..d6dea2c81 100644 --- a/testcases/kernel/syscalls/getxattr/getxattr02.c +++ b/testcases/kernel/syscalls/getxattr/getxattr02.c @@ -1,28 +1,12 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* - * Copyright (C) 2011 Red Hat, Inc. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of version 2 of the GNU General Public - * License as published by the Free Software Foundation. - * - * This program is distributed in the hope that it would be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * - * Further, this software is distributed without any warranty that it - * is free of the rightful claim of any third person regarding - * infringement or the like. Any license provided herein, whether - * implied or otherwise, applies only to this software file. Patent - * licenses, if any, provided herein do not apply to combinations of - * this program with other software, or any other product whatsoever. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - * 02110-1301, USA. + * Copyright (C) 2011 Red Hat, Inc. + * Copyright (c) 2023 Marius Kittler */ -/* +/*\ + * [Description] + * * In the user.* namespace, only regular files and directories can * have extended attributes. Otherwise getxattr(2) will return -1 * and set errno to ENODATA. @@ -39,26 +23,17 @@ */ #include "config.h" -#include -#include #include -#include -#include -#include -#include -#include #include #include -#include #ifdef HAVE_SYS_XATTR_H # include #endif -#include "test.h" -#include "safe_macros.h" -char *TCID = "getxattr02"; +#include "tst_test.h" +#include "tst_test_macros.h" -#ifdef HAVE_SYS_XATTR_H +#define MNTPOINT "mntpoint" #define XATTR_TEST_KEY "user.testkey" #define FIFO "getxattr02fifo" @@ -66,94 +41,87 @@ char *TCID = "getxattr02"; #define BLK "getxattr02blk" #define SOCK "getxattr02sock" -static void setup(void); -static void cleanup(void); +static char *workdir; -static char *tc[] = { +static char *tcases[] = { FIFO, /* case 00, get attr from fifo */ CHR, /* case 01, get attr from char special */ BLK, /* case 02, get attr from block special */ SOCK, /* case 03, get attr from UNIX domain socket */ }; -int TST_TOTAL = sizeof(tc) / sizeof(tc[0]); - -int main(int argc, char *argv[]) +static void run(unsigned int i) { - int lc; - int i; - int exp_eno; - char buf[BUFSIZ]; - - tst_parse_opts(argc, argv, NULL, NULL); - - setup(); - - for (lc = 0; TEST_LOOPING(lc); lc++) { - tst_count = 0; - exp_eno = ENODATA; - - for (i = 0; i < TST_TOTAL; i++) { - TEST(getxattr(tc[0], XATTR_TEST_KEY, buf, BUFSIZ)); - - if (TEST_RETURN == -1 && TEST_ERRNO == exp_eno) - tst_resm(TPASS | TTERRNO, "expected behavior"); - else - tst_resm(TFAIL | TTERRNO, "unexpected behavior" - " - expected errno %d - Got", exp_eno); +#ifdef HAVE_SYS_XATTR_H + SAFE_CHDIR(workdir); + + if (i == 0) { + /* Test for xattr support in the current filesystem */ + int fd = SAFE_CREAT("testfile", 0644); + close(fd); + TEST(setxattr("testfile", "user.test", "test", 4, XATTR_CREATE)); + if (TST_RET < 0) { + if (TST_ERR == ENOTSUP) + tst_brk(TCONF, "no xattr support in filesystem"); + tst_brk(TBROK | TTERRNO, "unexpected setxattr() return code"); + return; } + unlink("testfile"); + + /* Create test files */ + if (mknod(FIFO, S_IFIFO | 0777, 0) < 0) + tst_brk(TBROK | TERRNO, "create FIFO(%s) failed", FIFO); + dev_t dev = makedev(1, 3); + if (mknod(CHR, S_IFCHR | 0777, dev) < 0) + tst_brk(TBROK | TERRNO, "create char special(%s)" + " failed", CHR); + if (mknod(BLK, S_IFBLK | 0777, 0) < 0) + tst_brk(TBROK | TERRNO, "create block special(%s)" + " failed", BLK); + if (mknod(SOCK, S_IFSOCK | 0777, 0) < 0) + tst_brk(TBROK | TERRNO, "create socket(%s) failed", + SOCK); } - cleanup(); - tst_exit(); + int exp_eno = ENODATA; + char buf[BUFSIZ]; + TEST(getxattr(tcases[i], XATTR_TEST_KEY, buf, BUFSIZ)); + if (TST_RET == -1 && TST_ERR == exp_eno) + tst_res(TPASS | TTERRNO, "expected return value"); + else + tst_res(TFAIL | TTERRNO, "unexpected return value" + " - expected errno %d - got", exp_eno); +#endif } static void setup(void) { - int fd; - dev_t dev; - - tst_require_root(); - - tst_tmpdir(); - - /* Test for xattr support */ - fd = SAFE_CREAT(cleanup, "testfile", 0644); - close(fd); - if (setxattr("testfile", "user.test", "test", 4, XATTR_CREATE) == -1) - if (errno == ENOTSUP) - tst_brkm(TCONF, cleanup, "No xattr support in fs or " - "mount without user_xattr option"); - unlink("testfile"); - - /* Create test files */ - if (mknod(FIFO, S_IFIFO | 0777, 0) == -1) - tst_brkm(TBROK | TERRNO, cleanup, "Create FIFO(%s) failed", - FIFO); - - dev = makedev(1, 3); - if (mknod(CHR, S_IFCHR | 0777, dev) == -1) - tst_brkm(TBROK | TERRNO, cleanup, "Create char special(%s)" - " failed", CHR); - - if (mknod(BLK, S_IFBLK | 0777, 0) == -1) - tst_brkm(TBROK | TERRNO, cleanup, "Create block special(%s)" - " failed", BLK); - - if (mknod(SOCK, S_IFSOCK | 0777, 0) == -1) - tst_brkm(TBROK | TERRNO, cleanup, "Create socket(%s) failed", - SOCK); - - TEST_PAUSE; +#ifdef HAVE_SYS_XATTR_H + char *cwd = SAFE_GETCWD(NULL, 0); + workdir = SAFE_MALLOC(strlen(cwd) + strlen(MNTPOINT) + 2); + sprintf(workdir, "%s/%s", cwd, MNTPOINT); + free(cwd); +#else + tst_brk(TCONF, " does not exist."); +#endif } -static void cleanup(void) -{ - tst_rmdir(); -} -#else /* HAVE_SYS_XATTR_H */ -int main(int argc, char *argv[]) -{ - tst_brkm(TCONF, NULL, " does not exist."); -} +static struct tst_test test = { +#ifdef HAVE_SYS_XATTR_H + .all_filesystems = 1, + .needs_root = 1, + .mntpoint = MNTPOINT, + .mount_device = 1, + .skip_filesystems = (const char *const []) { + "exfat", + "tmpfs", + "ramfs", + "nfs", + "vfat", + NULL + }, #endif + .setup = setup, + .test = run, + .tcnt = ARRAY_SIZE(tcases) +}; -- 2.42.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp