| Message ID | 1492539444-25938-2-git-send-email-amir73il@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Apr 18, 2017 at 09:17:21PM +0300, Amir Goldstein wrote: > This is a clone of src/stale_handle.c test that uses generic > open_by_handle_at() syscall instead of the xfs specific ioctl. > > No test is using this helper yet. > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > --- > src/Makefile | 2 +- > src/open_by_handle.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 146 insertions(+), 1 deletion(-) > create mode 100644 src/open_by_handle.c > > diff --git a/src/Makefile b/src/Makefile > index e62d7a9..6b38e77 100644 > --- a/src/Makefile > +++ b/src/Makefile > @@ -22,7 +22,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ > seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ > renameat2 t_getcwd e4compact test-nextquota punch-alternating \ > attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ > - dio-invalidate-cache stat_test > + dio-invalidate-cache stat_test open_by_handle > > SUBDIRS = > > diff --git a/src/open_by_handle.c b/src/open_by_handle.c > new file mode 100644 > index 0000000..8f04865 > --- /dev/null > +++ b/src/open_by_handle.c > @@ -0,0 +1,145 @@ > +/* > + * open_by_handle.c - attempt to create a file handle and open it > + * with open_by_handle_at() syscall > + * > + * Copyright (C) 2017 CTERA Networks. All Rights Reserved. > + * Author: Amir Goldstein <amir73il@gmail.com> > + * > + * from: > + * stale_handle.c > + * > + * Copyright (C) 2010 Red Hat, Inc. All Rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program 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 General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +#define TEST_UTIME > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > +#include <fcntl.h> > +#include <unistd.h> > +#include <sys/stat.h> > +#include <sys/types.h> > +#include <errno.h> > +#include <linux/limits.h> > + > +#define NUMFILES 1024 > + > +struct handle { > + struct file_handle fh; > + unsigned char fid[MAX_HANDLE_SZ]; > +} handle[NUMFILES]; > + > +int main(int argc, char **argv) > +{ > + int i; > + int fd; > + int ret; > + int failed = 0; > + char fname[PATH_MAX]; > + char *test_dir; > + int mount_fd, mount_id; > + > + if (argc != 2) { > + fprintf(stderr, "usage: open_by_handle <test_dir>\n"); > + return EXIT_FAILURE; > + } > + > + test_dir = argv[1]; > + mount_fd = open(test_dir, O_RDONLY|O_DIRECTORY); > + if (mount_fd < 0) { > + perror("open test_dir"); > + return EXIT_FAILURE; > + } > + > + /* > + * create a large number of files to force allocation of new inode > + * chunks on disk. > + */ > + for (i=0; i < NUMFILES; i++) { > + sprintf(fname, "%s/file%06d", test_dir, i); > + fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); > + if (fd < 0) { > + printf("Warning (%s,%d), open(%s) failed.\n", __FILE__, __LINE__, fname); > + perror(fname); > + return EXIT_FAILURE; > + } > + close(fd); > + } > + > + /* sync to get the new inodes to hit the disk */ > + sync(); > + > + /* create the handles */ > + for (i=0; i < NUMFILES; i++) { > + sprintf(fname, "%s/file%06d", test_dir, i); > + handle[i].fh.handle_bytes = MAX_HANDLE_SZ; > + ret = name_to_handle_at(AT_FDCWD, fname, &handle[i].fh, &mount_id, 0); > + if (ret < 0) { > + perror("name_to_handle"); > + return EXIT_FAILURE; > + } > + } > + > + /* unlink the files */ > + for (i=0; i < NUMFILES; i++) { > + sprintf(fname, "%s/file%06d", test_dir, i); > + ret = unlink(fname); > + if (ret < 0) { > + perror("unlink"); > + return EXIT_FAILURE; > + } > + } > + > + /* sync to get log forced for unlink transactions to hit the disk */ > + sync(); > + > + /* sync once more FTW */ > + sync(); > + > + /* > + * now drop the caches so that unlinked inodes are reclaimed and > + * buftarg page cache is emptied so that the inode cluster has to be > + * fetched from disk again for the open_by_handle() call. > + */ > + ret = system("echo 3 > /proc/sys/vm/drop_caches"); > + if (ret < 0) { > + perror("drop_caches"); > + return EXIT_FAILURE; By the way, I noticed some time ago in kernel commit 75a6f82a0d10 that Al uses a remount for this instead of drop_caches; I wonder if that has any advantages or if it just amounts to the same thing? --b. > + } > + > + /* > + * now try to open the files by the stored handles. Expecting ENOENT > + * for all of them. > + */ > + for (i=0; i < NUMFILES; i++) { > + errno = 0; > + fd = open_by_handle_at(mount_fd, &handle[i].fh, O_RDWR); > + if (fd < 0 && (errno == ENOENT || errno == ESTALE)) { > + continue; > + } > + if (fd >= 0) { > + printf("open_by_handle(%d) opened an unlinked file!\n", i); > + close(fd); > + } else > + printf("open_by_handle(%d) returned %d incorrectly on an unlinked file!\n", i, errno); > + failed++; > + } > + if (failed) > + return EXIT_FAILURE; > + return EXIT_SUCCESS; > +} > -- > 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 18, 2017 at 9:55 PM, J . Bruce Fields <bfields@fieldses.org> wrote: > On Tue, Apr 18, 2017 at 09:17:21PM +0300, Amir Goldstein wrote: >> This is a clone of src/stale_handle.c test that uses generic >> open_by_handle_at() syscall instead of the xfs specific ioctl. >> >> No test is using this helper yet. >> >> Signed-off-by: Amir Goldstein <amir73il@gmail.com> >> --- >> src/Makefile | 2 +- >> src/open_by_handle.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ >> 2 files changed, 146 insertions(+), 1 deletion(-) >> create mode 100644 src/open_by_handle.c >> >> diff --git a/src/Makefile b/src/Makefile >> index e62d7a9..6b38e77 100644 >> --- a/src/Makefile >> +++ b/src/Makefile >> @@ -22,7 +22,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ >> seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ >> renameat2 t_getcwd e4compact test-nextquota punch-alternating \ >> attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ >> - dio-invalidate-cache stat_test >> + dio-invalidate-cache stat_test open_by_handle >> >> SUBDIRS = >> >> diff --git a/src/open_by_handle.c b/src/open_by_handle.c >> new file mode 100644 >> index 0000000..8f04865 >> --- /dev/null >> +++ b/src/open_by_handle.c >> @@ -0,0 +1,145 @@ >> +/* >> + * open_by_handle.c - attempt to create a file handle and open it >> + * with open_by_handle_at() syscall >> + * >> + * Copyright (C) 2017 CTERA Networks. All Rights Reserved. >> + * Author: Amir Goldstein <amir73il@gmail.com> >> + * >> + * from: >> + * stale_handle.c >> + * >> + * Copyright (C) 2010 Red Hat, Inc. All Rights reserved. >> + * >> + * This program is free software; you can redistribute it and/or modify >> + * it under the terms of the GNU General Public License as published by >> + * the Free Software Foundation; either version 2 of the License, or >> + * (at your option) any later version. >> + * >> + * This program 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 General Public License for more details. >> + * >> + * You should have received a copy of the GNU General Public License >> + * along with this program; if not, write to the Free Software >> + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. >> + */ >> + >> +#define TEST_UTIME >> + >> +#include <stdio.h> >> +#include <stdlib.h> >> +#include <string.h> >> +#include <fcntl.h> >> +#include <unistd.h> >> +#include <sys/stat.h> >> +#include <sys/types.h> >> +#include <errno.h> >> +#include <linux/limits.h> >> + >> +#define NUMFILES 1024 >> + >> +struct handle { >> + struct file_handle fh; >> + unsigned char fid[MAX_HANDLE_SZ]; >> +} handle[NUMFILES]; >> + >> +int main(int argc, char **argv) >> +{ >> + int i; >> + int fd; >> + int ret; >> + int failed = 0; >> + char fname[PATH_MAX]; >> + char *test_dir; >> + int mount_fd, mount_id; >> + >> + if (argc != 2) { >> + fprintf(stderr, "usage: open_by_handle <test_dir>\n"); >> + return EXIT_FAILURE; >> + } >> + >> + test_dir = argv[1]; >> + mount_fd = open(test_dir, O_RDONLY|O_DIRECTORY); >> + if (mount_fd < 0) { >> + perror("open test_dir"); >> + return EXIT_FAILURE; >> + } >> + >> + /* >> + * create a large number of files to force allocation of new inode >> + * chunks on disk. >> + */ >> + for (i=0; i < NUMFILES; i++) { >> + sprintf(fname, "%s/file%06d", test_dir, i); >> + fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); >> + if (fd < 0) { >> + printf("Warning (%s,%d), open(%s) failed.\n", __FILE__, __LINE__, fname); >> + perror(fname); >> + return EXIT_FAILURE; >> + } >> + close(fd); >> + } >> + >> + /* sync to get the new inodes to hit the disk */ >> + sync(); >> + >> + /* create the handles */ >> + for (i=0; i < NUMFILES; i++) { >> + sprintf(fname, "%s/file%06d", test_dir, i); >> + handle[i].fh.handle_bytes = MAX_HANDLE_SZ; >> + ret = name_to_handle_at(AT_FDCWD, fname, &handle[i].fh, &mount_id, 0); >> + if (ret < 0) { >> + perror("name_to_handle"); >> + return EXIT_FAILURE; >> + } >> + } >> + >> + /* unlink the files */ >> + for (i=0; i < NUMFILES; i++) { >> + sprintf(fname, "%s/file%06d", test_dir, i); >> + ret = unlink(fname); >> + if (ret < 0) { >> + perror("unlink"); >> + return EXIT_FAILURE; >> + } >> + } >> + >> + /* sync to get log forced for unlink transactions to hit the disk */ >> + sync(); >> + >> + /* sync once more FTW */ >> + sync(); >> + >> + /* >> + * now drop the caches so that unlinked inodes are reclaimed and >> + * buftarg page cache is emptied so that the inode cluster has to be >> + * fetched from disk again for the open_by_handle() call. >> + */ >> + ret = system("echo 3 > /proc/sys/vm/drop_caches"); >> + if (ret < 0) { >> + perror("drop_caches"); >> + return EXIT_FAILURE; > > By the way, I noticed some time ago in kernel commit 75a6f82a0d10 that > Al uses a remount for this instead of drop_caches; I wonder if that has > any advantages or if it just amounts to the same thing? > It is not the same thing. drop_caches is less powerful. For example an inotify watch can keep an inode in cache, but umount will remove that watch and evict the inode. There are probably more examples. In any case, after umount you *know* all caches are gone. After drop caches you don't know that. I plan to modify this test later to store handles into a dump file and read them from the file later, so the drop_caches part will be done by the test script that will also be able to do remount (as it should). But for now, I just copied that test as it is from stale_handle.c, because it is sufficient for my immediate needs. BTW, I wanted to ask you guys, going forward with my implementation, is there any NFS testsuite I should use to validate exporting overlayfs? And another question for my curiosity - Right now on my test branch, NFS handles work well as long as caches are not dropped. Am I right to assume that on normal workloads, handles are always served from cache? meaning that NFS LOOKUP populates the inode/dentry cache and all later decodes are served from cache? Is it useful to have this basic support for these 'normal' workloads without having full support (you get ESTALE if inode is not in cache)? > >> + } >> + >> + /* >> + * now try to open the files by the stored handles. Expecting ENOENT >> + * for all of them. >> + */ >> + for (i=0; i < NUMFILES; i++) { >> + errno = 0; >> + fd = open_by_handle_at(mount_fd, &handle[i].fh, O_RDWR); >> + if (fd < 0 && (errno == ENOENT || errno == ESTALE)) { >> + continue; >> + } >> + if (fd >= 0) { >> + printf("open_by_handle(%d) opened an unlinked file!\n", i); >> + close(fd); >> + } else >> + printf("open_by_handle(%d) returned %d incorrectly on an unlinked file!\n", i, errno); >> + failed++; >> + } >> + if (failed) >> + return EXIT_FAILURE; >> + return EXIT_SUCCESS; >> +} >> -- >> 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 18, 2017 at 10:13:14PM +0300, Amir Goldstein wrote: > On Tue, Apr 18, 2017 at 9:55 PM, J . Bruce Fields <bfields@fieldses.org> wrote: > > On Tue, Apr 18, 2017 at 09:17:21PM +0300, Amir Goldstein wrote: > >> This is a clone of src/stale_handle.c test that uses generic > >> open_by_handle_at() syscall instead of the xfs specific ioctl. > >> > >> No test is using this helper yet. > >> > >> Signed-off-by: Amir Goldstein <amir73il@gmail.com> > >> --- > >> src/Makefile | 2 +- > >> src/open_by_handle.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ > >> 2 files changed, 146 insertions(+), 1 deletion(-) > >> create mode 100644 src/open_by_handle.c > >> > >> diff --git a/src/Makefile b/src/Makefile > >> index e62d7a9..6b38e77 100644 > >> --- a/src/Makefile > >> +++ b/src/Makefile > >> @@ -22,7 +22,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ > >> seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ > >> renameat2 t_getcwd e4compact test-nextquota punch-alternating \ > >> attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ > >> - dio-invalidate-cache stat_test > >> + dio-invalidate-cache stat_test open_by_handle > >> > >> SUBDIRS = > >> > >> diff --git a/src/open_by_handle.c b/src/open_by_handle.c > >> new file mode 100644 > >> index 0000000..8f04865 > >> --- /dev/null > >> +++ b/src/open_by_handle.c > >> @@ -0,0 +1,145 @@ > >> +/* > >> + * open_by_handle.c - attempt to create a file handle and open it > >> + * with open_by_handle_at() syscall > >> + * > >> + * Copyright (C) 2017 CTERA Networks. All Rights Reserved. > >> + * Author: Amir Goldstein <amir73il@gmail.com> > >> + * > >> + * from: > >> + * stale_handle.c > >> + * > >> + * Copyright (C) 2010 Red Hat, Inc. All Rights reserved. > >> + * > >> + * This program is free software; you can redistribute it and/or modify > >> + * it under the terms of the GNU General Public License as published by > >> + * the Free Software Foundation; either version 2 of the License, or > >> + * (at your option) any later version. > >> + * > >> + * This program 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 General Public License for more details. > >> + * > >> + * You should have received a copy of the GNU General Public License > >> + * along with this program; if not, write to the Free Software > >> + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > >> + */ > >> + > >> +#define TEST_UTIME > >> + > >> +#include <stdio.h> > >> +#include <stdlib.h> > >> +#include <string.h> > >> +#include <fcntl.h> > >> +#include <unistd.h> > >> +#include <sys/stat.h> > >> +#include <sys/types.h> > >> +#include <errno.h> > >> +#include <linux/limits.h> > >> + > >> +#define NUMFILES 1024 > >> + > >> +struct handle { > >> + struct file_handle fh; > >> + unsigned char fid[MAX_HANDLE_SZ]; > >> +} handle[NUMFILES]; > >> + > >> +int main(int argc, char **argv) > >> +{ > >> + int i; > >> + int fd; > >> + int ret; > >> + int failed = 0; > >> + char fname[PATH_MAX]; > >> + char *test_dir; > >> + int mount_fd, mount_id; > >> + > >> + if (argc != 2) { > >> + fprintf(stderr, "usage: open_by_handle <test_dir>\n"); > >> + return EXIT_FAILURE; > >> + } > >> + > >> + test_dir = argv[1]; > >> + mount_fd = open(test_dir, O_RDONLY|O_DIRECTORY); > >> + if (mount_fd < 0) { > >> + perror("open test_dir"); > >> + return EXIT_FAILURE; > >> + } > >> + > >> + /* > >> + * create a large number of files to force allocation of new inode > >> + * chunks on disk. > >> + */ > >> + for (i=0; i < NUMFILES; i++) { > >> + sprintf(fname, "%s/file%06d", test_dir, i); > >> + fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); > >> + if (fd < 0) { > >> + printf("Warning (%s,%d), open(%s) failed.\n", __FILE__, __LINE__, fname); > >> + perror(fname); > >> + return EXIT_FAILURE; > >> + } > >> + close(fd); > >> + } > >> + > >> + /* sync to get the new inodes to hit the disk */ > >> + sync(); > >> + > >> + /* create the handles */ > >> + for (i=0; i < NUMFILES; i++) { > >> + sprintf(fname, "%s/file%06d", test_dir, i); > >> + handle[i].fh.handle_bytes = MAX_HANDLE_SZ; > >> + ret = name_to_handle_at(AT_FDCWD, fname, &handle[i].fh, &mount_id, 0); > >> + if (ret < 0) { > >> + perror("name_to_handle"); > >> + return EXIT_FAILURE; > >> + } > >> + } > >> + > >> + /* unlink the files */ > >> + for (i=0; i < NUMFILES; i++) { > >> + sprintf(fname, "%s/file%06d", test_dir, i); > >> + ret = unlink(fname); > >> + if (ret < 0) { > >> + perror("unlink"); > >> + return EXIT_FAILURE; > >> + } > >> + } > >> + > >> + /* sync to get log forced for unlink transactions to hit the disk */ > >> + sync(); > >> + > >> + /* sync once more FTW */ > >> + sync(); > >> + > >> + /* > >> + * now drop the caches so that unlinked inodes are reclaimed and > >> + * buftarg page cache is emptied so that the inode cluster has to be > >> + * fetched from disk again for the open_by_handle() call. > >> + */ > >> + ret = system("echo 3 > /proc/sys/vm/drop_caches"); > >> + if (ret < 0) { > >> + perror("drop_caches"); > >> + return EXIT_FAILURE; > > > > By the way, I noticed some time ago in kernel commit 75a6f82a0d10 that > > Al uses a remount for this instead of drop_caches; I wonder if that has > > any advantages or if it just amounts to the same thing? > > > > It is not the same thing. drop_caches is less powerful. > For example an inotify watch can keep an inode in cache, but umount > will remove that watch and evict the inode. > There are probably more examples. > In any case, after umount you *know* all caches are gone. > After drop caches you don't know that. OK. Yes, I ran into that drop_caches behavior when trying to do some similar testing--I had to create a lot of extra entries if I wanted to be sure some of them would be evicted. So maybe the remount trick would make it easier to get reproduceable results. (By the way, the particular odd test I was doing was in the deep-fh-lookup script in: git://linux-nfs.org/~bfields/fragments.git It tries to stress the code that reconnects a dentry to its parents after it's looked up by filehandle, so it creates a very deep directory hierarchy, gets the filehandle, drops caches, then tries to look up by filehandle. I meant to add that to xfstests and never got around to it.) > I plan to modify this test later to store handles into a dump file and read them > from the file later, so the drop_caches part will be done by the test script > that will also be able to do remount (as it should). > > But for now, I just copied that test as it is from stale_handle.c, because > it is sufficient for my immediate needs. > > BTW, I wanted to ask you guys, going forward with my implementation, > is there any NFS testsuite I should use to validate exporting overlayfs? You can use xfstests, actually, there's a "check -nfs" option. We also use connectathon and pynfs. I have some crufty scripts to run those at git://linux-nfs.org/~bfields/testd.git. You probably don't want to use those scripts, but maybe the commandlines under bin/do-{xfstests,pynfs,cthon} might be useful. > And another question for my curiosity - > Right now on my test branch, NFS handles work well as long as caches > are not dropped. > Am I right to assume that on normal workloads, handles are always > served from cache? meaning that NFS LOOKUP populates the > inode/dentry cache and all later decodes are served from cache? Ugh. I seem to recall filesystems that depended on that, or used to; maybe fat? Looking at git.... Yes, see 21b6633d516c. I guess you could read that changelog and/or google for any mailing-list mentions of that work to see if they had any particular motivation. Note also with NFS it's normally expected that you can reboot the server without consequences worse than applications hanging during the reboot. > Is it useful to have this basic support for these 'normal' workloads > without having full support (you get ESTALE if inode is not in cache)? I'd personally be terrified to depend on inodes staying in cache, and certainly wouldn't want to be put in the position of having to support such behavior. But I don't have any actual data on how often it would fail. --b. > >> + } > >> + > >> + /* > >> + * now try to open the files by the stored handles. Expecting ENOENT > >> + * for all of them. > >> + */ > >> + for (i=0; i < NUMFILES; i++) { > >> + errno = 0; > >> + fd = open_by_handle_at(mount_fd, &handle[i].fh, O_RDWR); > >> + if (fd < 0 && (errno == ENOENT || errno == ESTALE)) { > >> + continue; > >> + } > >> + if (fd >= 0) { > >> + printf("open_by_handle(%d) opened an unlinked file!\n", i); > >> + close(fd); > >> + } else > >> + printf("open_by_handle(%d) returned %d incorrectly on an unlinked file!\n", i, errno); > >> + failed++; > >> + } > >> + if (failed) > >> + return EXIT_FAILURE; > >> + return EXIT_SUCCESS; > >> +} > >> -- > >> 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Tue, Apr 18, 2017 at 09:17:21PM +0300, Amir Goldstein wrote: > This is a clone of src/stale_handle.c test that uses generic > open_by_handle_at() syscall instead of the xfs specific ioctl. > > No test is using this helper yet. > > Signed-off-by: Amir Goldstein <amir73il@gmail.com> > --- > src/Makefile | 2 +- > src/open_by_handle.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 146 insertions(+), 1 deletion(-) > create mode 100644 src/open_by_handle.c > > diff --git a/src/Makefile b/src/Makefile > index e62d7a9..6b38e77 100644 > --- a/src/Makefile > +++ b/src/Makefile > @@ -22,7 +22,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ > seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ > renameat2 t_getcwd e4compact test-nextquota punch-alternating \ > attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ > - dio-invalidate-cache stat_test > + dio-invalidate-cache stat_test open_by_handle Need an entry in .gitignore file too. > > SUBDIRS = > > diff --git a/src/open_by_handle.c b/src/open_by_handle.c > new file mode 100644 > index 0000000..8f04865 > --- /dev/null > +++ b/src/open_by_handle.c > @@ -0,0 +1,145 @@ > +/* > + * open_by_handle.c - attempt to create a file handle and open it > + * with open_by_handle_at() syscall > + * > + * Copyright (C) 2017 CTERA Networks. All Rights Reserved. > + * Author: Amir Goldstein <amir73il@gmail.com> > + * Trailing whitespace in above line. > + * from: > + * stale_handle.c > + * > + * Copyright (C) 2010 Red Hat, Inc. All Rights reserved. > + * > + * This program is free software; you can redistribute it and/or modify > + * it under the terms of the GNU General Public License as published by > + * the Free Software Foundation; either version 2 of the License, or > + * (at your option) any later version. > + * > + * This program 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 General Public License for more details. > + * > + * You should have received a copy of the GNU General Public License > + * along with this program; if not, write to the Free Software > + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. > + */ > + > +#define TEST_UTIME This is not used, remove it? (I think it's not used in the original stale_handle.c too). > + > +#include <stdio.h> > +#include <stdlib.h> > +#include <string.h> > +#include <fcntl.h> > +#include <unistd.h> > +#include <sys/stat.h> > +#include <sys/types.h> > +#include <errno.h> > +#include <linux/limits.h> > + > +#define NUMFILES 1024 > + > +struct handle { > + struct file_handle fh; > + unsigned char fid[MAX_HANDLE_SZ]; > +} handle[NUMFILES]; From open_by_handle_at(2): "These system calls first appeared in Linux 2.6.39. Library support is provided in glibc since version 2.14." I think we should check if the system supports open_by_handle_at(2) syscalls at build time and _require_test_program "open_by_handle" in tests in case it's not built. Currently it fails to build on my RHEL6 host: Building src [CC] open_by_handle open_by_handle.c:43: error: field 'fh' has incomplete type open_by_handle.c:44: error: 'MAX_HANDLE_SZ' undeclared here (not in a function) open_by_handle.c: In function 'main': open_by_handle.c:135: warning: implicit declaration of function 'name_to_handle_at' open_by_handle.c:193: warning: implicit declaration of function 'open_by_handle_at' gmake[2]: *** [open_by_handle] Error 1 gmake[1]: *** [src] Error 2 make: *** [default] Error 2 Thanks, Eryu -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Amir Goldstein <amir73il@gmail.com> wrote: > This is a clone of src/stale_handle.c test that uses generic > open_by_handle_at() syscall instead of the xfs specific ioctl. Don't forget to add it to doc/auxiliary-programs.txt! David -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Apr 19, 2017 at 12:51 PM, David Howells <dhowells@redhat.com> wrote: > Amir Goldstein <amir73il@gmail.com> wrote: > >> This is a clone of src/stale_handle.c test that uses generic >> open_by_handle_at() syscall instead of the xfs specific ioctl. > > Don't forget to add it to doc/auxiliary-programs.txt! > Will do :) Thanks! -- To unsubscribe from this list: send the line "unsubscribe fstests" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/src/Makefile b/src/Makefile index e62d7a9..6b38e77 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,7 +22,7 @@ LINUX_TARGETS = xfsctl bstat t_mtab getdevicesize preallo_rw_pattern_reader \ seek_copy_test t_readdir_1 t_readdir_2 fsync-tester nsexec cloner \ renameat2 t_getcwd e4compact test-nextquota punch-alternating \ attr-list-by-handle-cursor-test listxattr dio-interleaved t_dir_type \ - dio-invalidate-cache stat_test + dio-invalidate-cache stat_test open_by_handle SUBDIRS = diff --git a/src/open_by_handle.c b/src/open_by_handle.c new file mode 100644 index 0000000..8f04865 --- /dev/null +++ b/src/open_by_handle.c @@ -0,0 +1,145 @@ +/* + * open_by_handle.c - attempt to create a file handle and open it + * with open_by_handle_at() syscall + * + * Copyright (C) 2017 CTERA Networks. All Rights Reserved. + * Author: Amir Goldstein <amir73il@gmail.com> + * + * from: + * stale_handle.c + * + * Copyright (C) 2010 Red Hat, Inc. All Rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#define TEST_UTIME + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <errno.h> +#include <linux/limits.h> + +#define NUMFILES 1024 + +struct handle { + struct file_handle fh; + unsigned char fid[MAX_HANDLE_SZ]; +} handle[NUMFILES]; + +int main(int argc, char **argv) +{ + int i; + int fd; + int ret; + int failed = 0; + char fname[PATH_MAX]; + char *test_dir; + int mount_fd, mount_id; + + if (argc != 2) { + fprintf(stderr, "usage: open_by_handle <test_dir>\n"); + return EXIT_FAILURE; + } + + test_dir = argv[1]; + mount_fd = open(test_dir, O_RDONLY|O_DIRECTORY); + if (mount_fd < 0) { + perror("open test_dir"); + return EXIT_FAILURE; + } + + /* + * create a large number of files to force allocation of new inode + * chunks on disk. + */ + for (i=0; i < NUMFILES; i++) { + sprintf(fname, "%s/file%06d", test_dir, i); + fd = open(fname, O_RDWR | O_CREAT | O_TRUNC, 0644); + if (fd < 0) { + printf("Warning (%s,%d), open(%s) failed.\n", __FILE__, __LINE__, fname); + perror(fname); + return EXIT_FAILURE; + } + close(fd); + } + + /* sync to get the new inodes to hit the disk */ + sync(); + + /* create the handles */ + for (i=0; i < NUMFILES; i++) { + sprintf(fname, "%s/file%06d", test_dir, i); + handle[i].fh.handle_bytes = MAX_HANDLE_SZ; + ret = name_to_handle_at(AT_FDCWD, fname, &handle[i].fh, &mount_id, 0); + if (ret < 0) { + perror("name_to_handle"); + return EXIT_FAILURE; + } + } + + /* unlink the files */ + for (i=0; i < NUMFILES; i++) { + sprintf(fname, "%s/file%06d", test_dir, i); + ret = unlink(fname); + if (ret < 0) { + perror("unlink"); + return EXIT_FAILURE; + } + } + + /* sync to get log forced for unlink transactions to hit the disk */ + sync(); + + /* sync once more FTW */ + sync(); + + /* + * now drop the caches so that unlinked inodes are reclaimed and + * buftarg page cache is emptied so that the inode cluster has to be + * fetched from disk again for the open_by_handle() call. + */ + ret = system("echo 3 > /proc/sys/vm/drop_caches"); + if (ret < 0) { + perror("drop_caches"); + return EXIT_FAILURE; + } + + /* + * now try to open the files by the stored handles. Expecting ENOENT + * for all of them. + */ + for (i=0; i < NUMFILES; i++) { + errno = 0; + fd = open_by_handle_at(mount_fd, &handle[i].fh, O_RDWR); + if (fd < 0 && (errno == ENOENT || errno == ESTALE)) { + continue; + } + if (fd >= 0) { + printf("open_by_handle(%d) opened an unlinked file!\n", i); + close(fd); + } else + printf("open_by_handle(%d) returned %d incorrectly on an unlinked file!\n", i, errno); + failed++; + } + if (failed) + return EXIT_FAILURE; + return EXIT_SUCCESS; +}
This is a clone of src/stale_handle.c test that uses generic open_by_handle_at() syscall instead of the xfs specific ioctl. No test is using this helper yet. Signed-off-by: Amir Goldstein <amir73il@gmail.com> --- src/Makefile | 2 +- src/open_by_handle.c | 145 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 146 insertions(+), 1 deletion(-) create mode 100644 src/open_by_handle.c