Port getxattr02.c to new test API
PATCH v5 1/1 Port getxattr02.c to new test API
* 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 is commonly a tmpfs and tmpfs only got xattrs support in Linux 6.6)
* Improve error handling
* Simplify code and description
Signed-off-by Marius Kittler <[email protected]>
--- .../kernel/syscalls/getxattr/getxattr02.c | 202 +++++++----------- 1 file changed, 81 insertions(+), 121 deletions(-)
testcases/kernel/syscalls/getxattr/getxattr02.c +81 -121
@@ -1,64 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0-only /* -* 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) 2014-2017 Cyril Hrubis <[email protected]> +* Copyright (c) 2023 Marius Kittler <[email protected]> */ -/* +/*\ +* [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. * * There are 4 test cases: -* 1. Get attribute from a FIFO, setxattr(2) should return -1 and +* +* - Get attribute from a FIFO, setxattr(2) should return -1 and * set errno to ENODATA -* 2. Get attribute from a char special file, setxattr(2) should +* - Get attribute from a char special file, setxattr(2) should * return -1 and set errno to ENODATA -* 3. Get attribute from a block special file, setxattr(2) should +* - Get attribute from a block special file, setxattr(2) should * return -1 and set errno to ENODATA -* 4. Get attribute from a UNIX domain socket, setxattr(2) should +* - Get attribute from a UNIX domain socket, setxattr(2) should * return -1 and set errno to ENODATA */ #include "config.h" #include <sys/types.h> -#include <sys/stat.h> #include <sys/sysmacros.h> -#include <sys/wait.h> -#include <errno.h> -#include <fcntl.h> -#include <unistd.h> -#include <signal.h> +#include <sys/xattr.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> -#ifdef HAVE_SYS_XATTR_H -# include <sys/xattr.h> -#endif -#include "test.h" -#include "safe_macros.h" -char *TCID ="getxattr02" ; +#include "tst_res_flags.h" +#include "tst_test.h" +#include "tst_test_macros.h" -#ifdef HAVE_SYS_XATTR_H +#define MNTPOINT "mntpoint" +#define FNAME MNTPOINT"/getxattr02"#define XATTR_TEST_KEY "user.testkey"#define FIFO "getxattr02fifo"
@@ -66,94 +44,76 @@ char *TCID = "getxattr02";#define BLK "getxattr02blk"#define SOCK "getxattr02sock" -static void setup (void ); -static void cleanup (void ); - -static char *tc[] = { -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 */ +static struct test_case { +const char *desc; +char *fname; +int mode; +} tcases[] = { + { + .desc ="get attr from fifo" , + .fname = FNAME FIFO, + .mode =S_IFIFO , + }, + { + .desc ="get attr from char special" , + .fname = FNAME CHR, + .mode =S_IFCHR , + }, + { + .desc ="get attr from block special" , + .fname = FNAME BLK, + .mode =S_IFBLK , + }, + { + .desc ="get attr from UNIX domain socket" , + .fname = FNAME SOCK, + .mode =S_IFSOCK , + }, }; -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); - } - } - -cleanup (); -tst_exit (); +struct test_case *tc = &tcases[i]; +dev_t dev = tc->mode ==S_IFCHR ?makedev (1 ,3 ) :0u ; + +if (mknod (tc->fname, tc->mode |0777 , dev) <0 ) +tst_brk (TBROK |TERRNO ,"create %s (mode %i) failed (%s)" , + tc->fname, tc->mode, tc->desc); + +TEST (getxattr (tc->fname,XATTR_TEST_KEY , buf,BUFSIZ )); +if (TST_RET ==-1 &&TST_ERR ==ENODATA ) +tst_res (TPASS |TTERRNO ,"%s: expected return value" , + tc->desc); +else +tst_res (TFAIL |TTERRNO ,"%s: unexpected return value" +" - expected errno %d - got" , tc->desc,ENODATA ); }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 ; +/* assert xattr support in the current filesystem */ +SAFE_TOUCH (FNAME ,0644 ,NULL ); +TEST (setxattr (FNAME ,"user.test" ,"test" ,4 ,XATTR_CREATE )); +if (TST_ERR ==ENOTSUP ) +tst_brk (TCONF , +"No xattr support in fs or mount without user_xattr " +"option" ); +else if (TST_RET !=0 ) +tst_brk (TBROK |TTERRNO ,"setxattr failed" ); } -static void cleanup (void ) -{ -tst_rmdir (); -} -#else /* HAVE_SYS_XATTR_H */ -int main (int argc,char *argv[]) -{ -tst_brkm (TCONF ,NULL ,"<sys/xattr.h> does not exist." ); -} -#endif +static struct tst_test test = { + .all_filesystems =1 , + .needs_root =1 , + .mntpoint =MNTPOINT , + .mount_device =1 , + .skip_filesystems = (const char *const []) { +"ramfs" , +"nfs" , +NULL + }, + .setup = setup, + .test = run, + .tcnt =ARRAY_SIZE (tcases) +};
Signature · 5 lines
2.43.0 -- Mailing list info: https://lists.linux.it/listinfo/ltp
Hi Marius,
I'm sorry, the last thing is that test does not umount, thus it fails with -iN:
# ./getxattr02 -i2 tst_device.c:96: TINFO: Found free device 0 '/dev/loop0' tst_test.c:1690: TINFO: LTP version: 20230929-156-ge94d16fe8 tst_test.c:1574: TINFO: Timeout per run is 0h 00m 30s tst_supported_fs_types.c:90: TINFO: Kernel supports ext2 tst_supported_fs_types.c:55: TINFO: mkfs.ext2 does exist tst_supported_fs_types.c:90: TINFO: Kernel supports ext3 tst_supported_fs_types.c:55: TINFO: mkfs.ext3 does exist tst_supported_fs_types.c:90: TINFO: Kernel supports ext4 tst_supported_fs_types.c:55: TINFO: mkfs.ext4 does exist tst_supported_fs_types.c:90: TINFO: Kernel supports xfs tst_supported_fs_types.c:55: TINFO: mkfs.xfs does exist tst_supported_fs_types.c:90: TINFO: Kernel supports btrfs tst_supported_fs_types.c:55: TINFO: mkfs.btrfs does exist tst_supported_fs_types.c:90: TINFO: Kernel supports vfat tst_supported_fs_types.c:55: TINFO: mkfs.vfat does exist tst_supported_fs_types.c:90: TINFO: Kernel supports exfat tst_supported_fs_types.c:55: TINFO: mkfs.exfat does exist tst_supported_fs_types.c:120: TINFO: FUSE does support ntfs tst_supported_fs_types.c:55: TINFO: mkfs.ntfs does exist tst_supported_fs_types.c:90: TINFO: Kernel supports tmpfs tst_supported_fs_types.c:42: TINFO: mkfs is not needed for tmpfs tst_test.c:1650: TINFO: === Testing on ext2 === tst_test.c:1105: TINFO: Formatting /dev/loop0 with ext2 opts='' extra opts='' mke2fs 1.47.0 (5-Feb-2023) tst_test.c:1119: TINFO: Mounting /dev/loop0 to /tmp/LTP_get6hhQ7M/mntpoint fstyp=ext2 flags=0 getxattr02.c:86: TPASS: get attr from fifo: expected return value: ENODATA (61) getxattr02.c:86: TPASS: get attr from char special: expected return value: ENODATA (61) getxattr02.c:86: TPASS: get attr from block special: expected return value: ENODATA (61) getxattr02.c:86: TPASS: get attr from UNIX domain socket: expected return value: ENODATA (61) getxattr02.c:81: TBROK: create mntpoint/getxattr02getxattr02fifo (mode 4096) failed (get attr from fifo): EEXIST (17)
Could you please fix it?
Kind regards,
Petr
Signature · 1 line
Mailing list info: https://lists.linux.it/listinfo/ltp