Generic name to handle and open by handle syscalls
Subsystems (16)
cover Generic name to handle and open by handle syscalls
Hi,
The below set of patches implement open by handle support using exportfs operations. This allows user space application to map a file name to file handle and later open the file using handle. This should be usable for userspace NFS [1] and 9P server [2]. XFS already support this with the ioctls XFS_IOC_PATH_TO_HANDLE and XFS_IOC_OPEN_BY_HANDLE.
[1] http://nfs-ganesha.sourceforge.net/
[2] http://thread.gmane.org/gmane.comp.emulators.qemu/68992
git repo for the patchset at:
git://git.kernel.org/pub/scm/linux/kernel/git/kvaneesh/linux-open-handle.git open-by-handle
Changes from V16:
a) mnt_id is now an arg to syscall
b) finish_open_handle is removed. Update finish_open to work with struct path and struct file.
c) Add O_NOACCESS and use that for open_by_handle on symlink
Changes from V15:
a) Add mount id to file handle
b) Add support for optional uuid tag in /proc/<pid>/mountinfo
c) Added MAY_OPEN_LINK to support open on symlink instead of adding a new may_open function. Also limited the open flag to O_RDONLY.
Changes from V14:
a) Use fget_light instead of fget in the patches
b) Drop uuid from struct file_handle as per the last review
Changes from V13:
a) Add support for file descriptor to handle conversion. This is needed so that we find the right file handle for newly created files.
Changes from V12:
a) Use CAP_DAC_READ_SEARCH instead of CAP_DAC_OVERRIDE in open_by_handle
b) Return -ENOTDIR if O_DIRECTORY flag is specified in open_by_handle with handle for non directory
Changes from V11:
a) Add necessary documentation to different functions
b) Add null pathname support to faccessat and linkat similar to readlinkat.
c) compile fix on x86_64
Changes from V10:
a) Missed an stg refresh before sending out the patchset. Send updated patchset.
Changes from V9:
a) Fix compile errors with CONFIG_EXPORTFS not defined
b) Return -EOPNOTSUPP if file system doesn't support fh_to_dentry exportfs callback.
Changes from V8:
a) exportfs_decode_fh now returns -ESTALE if export operations is not defined.
b) drop get_fsid super_operations. Instead use superblock to store uuid.
Changes from V7:
a) open_by_handle now use mountdirfd to identify the vfsmount.
b) We don't validate the UUID passed as a part of file handle in open_by_handle. UUID is provided as a part of file handle as an easy way for userspace to use the kernel returned handle as it is. It also helps in finding the 16 byte filessytem UUID in userspace without using file system specific libraries to read file system superblock. If a particular file system doesn't support UUID or any form of unique id this field in the file handle will be zero filled.
c) drop freadlink syscall. Instead use readlinkat with NULL pathname to indicate read the link target name of the link pointed by fd. This is similar to sys_utimensat
d) Instead of opencoding all the open flag related check use helper functions. Did finish_open_by_handle similar to finish_open.
c) Fix may_open to not return ELOOP for symlink when we are called from handle open. open(2) still returns error as expected.
Changes from V6:
a) Add uuid to vfsmount lookup and drop uuid to superblock lookup
b) Return -EOPNOTSUPP in sys_name_to_handle if the file system returned uuid doesn't give the same vfsmount on lookup. This ensure that we fail sys_name_to_handle when we have multiple file system returning same UUID.
Changes from V5:
a) added sys_name_to_handle_at syscall which takes AT_SYMLINK_NOFOLLOW flag instead of two syscalls sys_name_to_handle and sys_lname_to_handle.
b) addressed review comments from Niel Brown
c) rebased to b91ce4d14a21fc04d165be30319541e0f9204f15
d) Add compat_sys_open_by_handle
Chages from V4:
a) Changed the syscal arguments so that we don't need compat syscalls as suggested by Christoph
c) Added two new syscall sys_lname_to_handle and sys_freadlink to work with symlinks
d) Changed open_by_handle to work with all file types
e) Add ext3 support
Changes from V3:
a) Code cleanup suggested by Andreas
b) x86_64 syscall support
c) add compat syscall
Chages from V2:
a) Support system wide unique handle.
Changes from v1:
a) handle size is now specified in bytes
b) returns -EOVERFLOW if the handle size is small
c) dropped open_handle syscall and added open_by_handle_at syscall open_by_handle_at takes mount_fd as the directory fd of the mount point containing the file
e) handle will only be unique in a given file system. So for an NFS server exporting multiple file system, NFS server will have to internally track the mount point to which a file handle belongs to. We should be able to do it much easily than expecting kernel to give a system wide unique file handle. System wide unique file handle would need much larger changes to the exportfs or VFS interface and I was not sure whether we really need to do that in the kernel or in the user space
f) open_handle_at now only check for DAC_OVERRIDE capability
Example program: (x86_32). (x86_64 would need a different syscall number)
-------
cc <source.c>
--------
#define _GNU_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
struct file_handle {
int handle_size;
int handle_type;
unsigned char handle[0];
};#define AT_FDCWD -100
#define AT_SYMLINK_FOLLOW 0x400
static int name_to_handle(const char *name, struct file_handle *fh, int *mnt_id)
{
return syscall(338, AT_FDCWD, name, fh, mnt_id, AT_SYMLINK_FOLLOW);
}static int lname_to_handle(const char *name, struct file_handle *fh, int *mnt_id )
{
return syscall(338, AT_FDCWD, name, fh, mnt_id, 0);
}static int fd_to_handle(int fd, struct file_handle *fh, int *mnt_id)
{
return syscall(338, fd, NULL, fh, mnt_id, 0);
}static int open_by_handle(int mountfd, struct file_handle *fh, int flags)
{
return syscall(339, mountfd, fh, flags);
}#define BUFSZ 100
int main(int argc, char *argv[])
{
int fd, mnt_id;
int ret, done = 0;
int mountfd;
int handle_sz;
struct stat bufstat;
char buf[BUFSZ];
struct file_handle *fh = NULL;;
if (argc != 3 ) {
printf("Usage: %s <filename> <mount-dir-name>\n", argv[0]);
exit(1);
}
again:
if (fh && fh->handle_size) {
handle_sz = fh->handle_size;
free(fh);
fh = malloc(sizeof(struct file_handle) + handle_sz);
fh->handle_size = handle_sz;
} else {
fh = malloc(sizeof(struct file_handle));
fh->handle_size = 0;
}
errno = 0;
ret = lname_to_handle(argv[1], fh, &mnt_id);
if (ret && errno == EOVERFLOW) {
printf("Found the handle size needed to be %d\n", fh->handle_size);
goto again;
} else if (ret) {
perror("Error:");
exit(1);
}
do_again:
printf("found mount_id %d\n", mnt_id);
printf("Waiting for input");
getchar();
mountfd = open(argv[2], O_RDONLY | O_DIRECTORY);
if (mountfd <= 0) {
perror("Error:");
exit(1);
}
fd = open_by_handle(mountfd, fh, O_RDONLY);
if (fd <= 0 ) {
perror("Error:");
exit(1);
}
printf("Reading the content now \n");
fstat(fd, &bufstat);
ret = S_ISLNK(bufstat.st_mode);
if (ret) {
memset(buf, 0 , BUFSZ);
readlinkat(fd, NULL, buf, BUFSZ);
printf("%s is a symlink pointing to %s\n", argv[1], buf);
}
memset(buf, 0 , BUFSZ);
while (1) {
ret = read(fd, buf, BUFSZ -1);
if (ret <= 0)
break;
buf[ret] = '\0';
printf("%s", buf);
memset(buf, 0 , BUFSZ);
}
/* Now check for faccess */
if (faccessat(fd, NULL, W_OK, 0) == 0) {
printf("Got write permission on the file \n");
} else
perror("faccess error");
/* now try to create a hardlink */
if (linkat(fd, NULL, AT_FDCWD, "test", 0) == 0){
printf("created hardlink\n");
} else
perror("linkat error");
if (done)
exit(0);
printf("Map fd to handle \n");
ret = fd_to_handle(fd, fh, &mnt_id);
if (ret) {
perror("Error:");
exit(1);
}
done = 1;
goto do_again;
}-aneesh
PATCH 1/12 exportfs: Return the minimum required handle size
The exportfs encode handle function should return the minimum required handle size. This helps user to find out the handle size by passing 0 handle size in the first step and then redoing to the call again with the returned handle size value.
--- fs/btrfs/export.c | 8 ++++++-- fs/exportfs/expfs.c | 9 +++++++-- fs/fat/inode.c | 4 +++- fs/fuse/inode.c | 4 +++- fs/gfs2/export.c | 8 ++++++-- fs/isofs/export.c | 8 ++++++-- fs/ocfs2/export.c | 8 +++++++- fs/reiserfs/inode.c | 7 ++++++- fs/udf/namei.c | 7 ++++++- fs/xfs/linux-2.6/xfs_export.c | 4 +++- include/linux/exportfs.h | 6 ++++-- mm/shmem.c | 4 +++- 12 files changed, 60 insertions(+), 17 deletions(-)
fs/btrfs/export.c +6 -2
@@ -21,9 +21,13 @@ static int btrfs_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,int len = *max_len;int type; -if ((len <BTRFS_FID_SIZE_NON_CONNECTABLE ) || - (connectable && len <BTRFS_FID_SIZE_CONNECTABLE )) +if (connectable && (len <BTRFS_FID_SIZE_CONNECTABLE )) { + *max_len =BTRFS_FID_SIZE_CONNECTABLE ;return 255 ; + }else if (len <BTRFS_FID_SIZE_NON_CONNECTABLE ) { + *max_len =BTRFS_FID_SIZE_NON_CONNECTABLE ; +return 255 ; + } len =BTRFS_FID_SIZE_NON_CONNECTABLE ; type =FILEID_BTRFS_WITHOUT_PARENT ;
fs/exportfs/expfs.c +7 -2
@@ -319,9 +319,14 @@ static int export_encode_fh(struct dentry *dentry, struct fid *fid,struct inode * inode = dentry->d_inode;int len = *max_len;int type =FILEID_INO32_GEN ; - -if (len <2 || (connectable && len <4 )) + +if (connectable && (len <4 )) { + *max_len =4 ; +return 255 ; + }else if (len <2 ) { + *max_len =2 ;return 255 ; + } len =2 ; fid->i32.ino = inode->i_ino;
fs/fat/inode.c +3 -1
@@ -761,8 +761,10 @@ fat_encode_fh(struct dentry *de, __u32 *fh, int *lenp, int connectable)struct inode *inode = de->d_inode;u32 ipos_h, ipos_m, ipos_l; -if (len <5 ) +if (len <5 ) { + *lenp =5 ;return 255 ;/* no room */ + } ipos_h =MSDOS_I (inode)->i_pos >>8 ; ipos_m = (MSDOS_I (inode)->i_pos &0xf0 ) <<24 ;
fs/fuse/inode.c +3 -1
@@ -638,8 +638,10 @@ static int fuse_encode_fh(struct dentry *dentry, u32 *fh, int *max_len,u64 nodeid;u32 generation; -if (*max_len < len) +if (*max_len < len) { + *max_len = len;return 255 ; + } nodeid =get_fuse_inode (inode)->nodeid; generation = inode->i_generation;
fs/gfs2/export.c +6 -2
@@ -36,9 +36,13 @@ static int gfs2_encode_fh(struct dentry *dentry, __u32 *p, int *len,struct super_block *sb = inode->i_sb;struct gfs2_inode *ip =GFS2_I (inode); -if (*len <GFS2_SMALL_FH_SIZE || - (connectable && *len <GFS2_LARGE_FH_SIZE )) +if (connectable && (*len <GFS2_LARGE_FH_SIZE )) { + *len =GFS2_LARGE_FH_SIZE ;return 255 ; + }else if (*len <GFS2_SMALL_FH_SIZE ) { + *len =GFS2_SMALL_FH_SIZE ; +return 255 ; + } fh[0 ] =cpu_to_be32 (ip->i_no_formal_ino >>32 ); fh[1 ] =cpu_to_be32 (ip->i_no_formal_ino &0xFFFFFFFF );
fs/isofs/export.c +6 -2
@@ -124,9 +124,13 @@ isofs_export_encode_fh(struct dentry *dentry,* offset of the inode and the upper 16 bits of fh32[1] to * hold the offset of the parent. */ - -if (len <3 || (connectable && len <5 )) +if (connectable && (len <5 )) { + *max_len =5 ; +return 255 ; + }else if (len <3 ) { + *max_len =3 ;return 255 ; + } len =3 ; fh32[0 ] = ei->i_iget5_block;
fs/ocfs2/export.c +7 -1
@@ -201,8 +201,14 @@ static int ocfs2_encode_fh(struct dentry *dentry, u32 *fh_in, int *max_len, dentry->d_name.len, dentry->d_name.name, fh, len, connectable); -if (len <3 || (connectable && len <6 )) { +if (connectable && (len <6 )) {mlog (ML_ERROR ,"fh buffer is too small for encoding\n" ); + *max_len =6 ; + type =255 ; + goto bail; + }else if (len <3 ) { +mlog (ML_ERROR ,"fh buffer is too small for encoding\n" ); + *max_len =3 ; type =255 ; goto bail; }
fs/reiserfs/inode.c +6 -1
@@ -1588,8 +1588,13 @@ int reiserfs_encode_fh(struct dentry *dentry, __u32 * data, int *lenp,struct inode *inode = dentry->d_inode;int maxlen = *lenp; -if (maxlen <3 ) +if (need_parent && (maxlen <5 )) { + *lenp =5 ;return 255 ; + }else if (maxlen <3 ) { + *lenp =3 ; +return 255 ; + } data[0 ] = inode->i_ino; data[1 ] =le32_to_cpu (INODE_PKEY (inode)->k_dir_id);
fs/udf/namei.c +6 -1
@@ -1336,8 +1336,13 @@ static int udf_encode_fh(struct dentry *de, __u32 *fh, int *lenp,struct fid *fid = (struct fid *)fh;int type =FILEID_UDF_WITHOUT_PARENT ; -if (len <3 || (connectable && len <5 )) +if (connectable && (len <5 )) { + *lenp =5 ; +return 255 ; + }else if (len <3 ) { + *lenp =3 ;return 255 ; + } *lenp =3 ; fid->udf.block = location.logicalBlockNum;
fs/xfs/linux-2.6/xfs_export.c +3 -1
@@ -81,8 +81,10 @@ xfs_fs_encode_fh(* seven combinations work. The real answer is "don't use v2". */ len =xfs_fileid_length (fileid_type); -if (*max_len < len) +if (*max_len < len) { + *max_len = len;return 255 ; + } *max_len = len;switch (fileid_type) {
include/linux/exportfs.h +4 -2
@@ -108,8 +108,10 @@ struct fid {* set, the encode_fh() should store sufficient information so that a good * attempt can be made to find not only the file but also it's place in the * filesystem. This typically means storing a reference to de->d_parent in -* the filehandle fragment. encode_fh() should return the number of bytes -* stored or a negative error code such as %-ENOSPC +* the filehandle fragment. encode_fh() should return the fileid_type on +* success and on error returns 255 (if the space needed to encode fh is +* greater than @max_len*4 bytes). On error @max_len contain the minimum +* size(in 4 byte unit) needed to encode the file handle. * * fh_to_dentry: * @fh_to_dentry is given a &struct super_block (@sb) and a file handle
mm/shmem.c +3 -1
@@ -2117,8 +2117,10 @@ static int shmem_encode_fh(struct dentry *dentry, __u32 *fh, int *len, {struct inode *inode = dentry->d_inode; -if (*len <3 ) +if (*len <3 ) { + *len =3 ;return 255 ; + }if (hlist_unhashed (&inode->i_hash)) {/* Unfortunately insert_inode_hash is not idempotent,
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 2/12 vfs: Add name to file handle conversion support
In reply to Aneesh Kumar K.VThe file handle also include mount id which can be used to lookup file system specific information such as uuid in /proc/<pid>mountinfo
--- fs/open.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/exportfs.h | 3 + include/linux/fs.h | 8 +++ include/linux/syscalls.h | 5 ++- 4 files changed, 144 insertions(+), 1 deletions(-)
fs/open.c +129 -0
@@ -29,6 +29,7 @@#include <linux/falloc.h> #include <linux/fs_struct.h> #include <linux/ima.h> +#include <linux/exportfs.h> #include "internal.h"
@@ -1040,3 +1041,131 @@ int nonseekable_open(struct inode *inode, struct file *filp) }EXPORT_SYMBOL (nonseekable_open); + +#ifdef CONFIG_EXPORTFS +static long do_sys_name_to_handle (struct path *path, +struct file_handle __user *ufh, +int __user *mnt_id) +{ +long retval; +int handle_size; +struct file_handle f_handle; +struct file_handle *handle =NULL ; + +if (copy_from_user (&f_handle, ufh,sizeof (struct file_handle ))) { + retval = -EFAULT ; + goto err_out; + } +if (f_handle.handle_size >MAX_HANDLE_SZ ) { + retval = -EINVAL ; + goto err_out; + } + handle =kmalloc (sizeof (struct file_handle ) + f_handle.handle_size, +GFP_KERNEL ); +if (!handle) { + retval = -ENOMEM ; + goto err_out; + } + +/* convert handle size to multiple of sizeof(u32) */ + handle_size = f_handle.handle_size >>2 ; + +/* we ask for a non connected handle */ + retval =exportfs_encode_fh (path->dentry, + (struct fid *)handle->f_handle, + &handle_size,0 ); +/* convert handle size to bytes */ + handle_size *=sizeof (u32); + handle->handle_type = retval; + handle->handle_size = handle_size; +if (handle_size > f_handle.handle_size) { +/* +* set the handle_size to zero so we copy only +* non variable part of the file_handle +*/ + handle_size =0 ; + retval = -EOVERFLOW ; + }else + retval =0 ; +/* copy the mount id */ +if (copy_to_user (mnt_id, &path->mnt->mnt_id,sizeof (*mnt_id))) { + retval = -EFAULT ; + goto err_free_out; + } +if (copy_to_user (ufh, handle, +sizeof (struct file_handle ) + handle_size)) + retval = -EFAULT ; +err_free_out: +kfree (handle); +err_out: +return retval; +} + +/** +* sys_name_to_handle_at: convert name to handle +* @dfd: directory relative to which name is interpreted if not absolute +* @name: name that should be converted to handle. +* @handle: resulting file handle +* @mnt_id: mount id of the file system containing the file +* @flag: flag value to indicate whether to follow symlink or not +* +* @handle->handle_size indicate the space available to store the +* variable part of the file handle in bytes. If there is not +* enough space, the field is updated to return the minimum +* value required. +*/ +SYSCALL_DEFINE5(name_to_handle_at, int, dfd, const char __user *, name, + struct file_handle __user *, handle, int __user*, mnt_id, + int, flag) +{ + +int follow; +int fput_needed; +long ret = -EINVAL ; +struct path path, *pp; +struct file *file =NULL ; + +if ((flag & ~AT_SYMLINK_FOLLOW ) !=0 ) + goto err_out; + +if (name ==NULL && dfd !=AT_FDCWD ) { + file =fget_light (dfd, &fput_needed); +if (file) { + pp = &file->f_path; + ret =0 ; + }else + ret = -EBADF ; + }else { + follow = (flag &AT_SYMLINK_FOLLOW ) ?LOOKUP_FOLLOW :0 ; + ret =user_path_at (dfd, name, follow, &path); + pp = &path; + } +if (ret) + goto err_out; +/* +* We need t make sure wether the file system +* support decoding of the file handle +*/ +if (!pp->mnt->mnt_sb->s_export_op || + !pp->mnt->mnt_sb->s_export_op->fh_to_dentry) { + ret = -EOPNOTSUPP ; + goto out_path; + } + ret =do_sys_name_to_handle (pp, handle, mnt_id); + +out_path: +if (file) +fput_light (file, fput_needed); +else +path_put (&path); +err_out: +return ret; +} +#else +SYSCALL_DEFINE5(name_to_handle_at, int, dfd, const char __user *, name, + struct file_handle __user *, handle, int __user *, mnt_id, + int, flag) +{ +return -ENOSYS ; +} +#endif
include/linux/exportfs.h +3 -0
@@ -8,6 +8,9 @@ struct inode;struct super_block ;struct vfsmount ; +/* limit the handle size to some value */ +#define MAX_HANDLE_SZ 4096 +/* * The fileid_type identifies how the file within the filesystem is encoded. * In theory this is freely set and parsed by the filesystem, but we try to
include/linux/fs.h +8 -0
@@ -949,6 +949,14 @@ struct file {unsigned long f_mnt_write_state;#endif }; + +struct file_handle { +int handle_size; +int handle_type; +/* file identifier */ +unsigned char f_handle[0 ]; +}; +extern spinlock_t files_lock;#define file_list_lock () spin_lock(&files_lock);#define file_list_unlock () spin_unlock(&files_lock);
include/linux/syscalls.h +4 -1
@@ -61,6 +61,7 @@ struct robust_list_head;struct getcpu_cache ;struct old_linux_dirent ;struct perf_event_attr ; +struct file_handle ;#include <linux/types.h> #include <linux/aio_abi.h>
@@ -825,5 +826,7 @@ asmlinkage long sys_mmap_pgoff(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff);asmlinkage long sys_old_mmap (struct mmap_arg_struct __user *arg); - +asmlinkage long sys_name_to_handle_at (int dfd,const char __user *name, +struct file_handle __user *handle, +int __user *mnt_id,int flag);#endif
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 3/12 vfs: Add open by file handle support
In reply to Aneesh Kumar K.V--- fs/exportfs/expfs.c | 2 + fs/namei.c | 218 +++++++++++++++++++++++++++++++++++++++++++--- fs/open.c | 32 ++++++- include/linux/fs.h | 8 ++- include/linux/namei.h | 1 + include/linux/syscalls.h | 3 + 6 files changed, 245 insertions(+), 19 deletions(-)
fs/exportfs/expfs.c +2 -0
@@ -373,6 +373,8 @@ struct dentry *exportfs_decode_fh(struct vfsmount *mnt, struct fid *fid,/* * Try to get any dentry for the given file handle from the filesystem. */ +if (!nop || !nop->fh_to_dentry) +return ERR_PTR (-ESTALE ); result = nop->fh_to_dentry (mnt->mnt_sb, fid, fh_len, fileid_type);if (!result) result =ERR_PTR (-ESTALE );
fs/namei.c +204 -14
275 lines not on this page · raw message
fs/open.c +28 -4
@@ -652,10 +652,10 @@ static inline int __get_file_write_access(struct inode *inode,return error; } -static struct file *__dentry_open (struct dentry *dentry,struct vfsmount *mnt, -struct file *f, -int (*open)(struct inode *,struct file *), -const struct cred *cred) +struct file *__dentry_open (struct dentry *dentry,struct vfsmount *mnt, +struct file *f, +int (*open)(struct inode *,struct file *), +const struct cred *cred) {struct inode *inode;int error;
@@ -1169,3 +1169,27 @@ SYSCALL_DEFINE5(name_to_handle_at, int, dfd, const char __user *, name,return -ENOSYS ; }#endif + +/** +* sys_open_by_handle_at: Open the file handle +* @mountdirfd: directory file descriptor +* @handle: file handle to be opened +* @flag: open flags. +* +* @mountdirfd indicate the directory file descriptor +* of the mount point. file handle is decoded relative +* to the vfsmount pointed by the @mountdirfd. @flags +* value is same as the open(2) flags. +*/ +SYSCALL_DEFINE3 (open_by_handle_at, int, mountdirfd, + struct file_handle __user *, handle, + int, flags) +{ +long ret; + +if (force_o_largefile ()) + flags |=O_LARGEFILE ; + + ret =do_handle_open (mountdirfd, handle, flags); +return ret; +}
include/linux/fs.h +7 -1
@@ -1936,6 +1936,10 @@ extern int do_fallocate(struct file *file, int mode, loff_t offset,extern long do_sys_open (int dfd,const char __user *filename,int flags,int mode);extern struct file *filp_open (const char *,int ,int ); +struct file *__dentry_open (struct dentry *dentry,struct vfsmount *mnt, +struct file *f, +int (*open)(struct inode *,struct file *), +const struct cred *cred);extern struct file *dentry_open (struct dentry *,struct vfsmount *,int ,const struct cred *);extern int filp_close (struct file *,fl_owner_t id);
@@ -2147,11 +2151,13 @@ extern void free_write_pipe(struct file *);extern struct file *do_filp_open (int dfd,const char *pathname,int open_flag,int mode,int acc_mode); +extern long do_handle_open (int mountdirfd, +struct file_handle __user *ufh,int open_flag);extern int may_open (struct path *,int ,int );extern int kernel_read (struct file *,loff_t ,char *,unsigned long );extern struct file *open_exec (const char *); - +/* fs/dcache.c -- generic fs support functions */ extern int is_subdir (struct dentry *,struct dentry *);extern int path_is_under (struct path *,struct path *);
include/linux/namei.h +1 -0
@@ -64,6 +64,7 @@ extern int user_path_at(int, const char __user *, unsigned, struct path *);#define user_path_dir (name, path) \ user_path_at(AT_FDCWD, name, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, path) +extern struct vfsmount *get_vfsmount_from_fd (int );extern int kern_path (const char *,unsigned ,struct path *);extern int path_lookup (const char *,unsigned ,struct nameidata *);
include/linux/syscalls.h +3 -0
@@ -829,4 +829,7 @@ asmlinkage long sys_old_mmap(struct mmap_arg_struct __user *arg);asmlinkage long sys_name_to_handle_at (int dfd,const char __user *name,struct file_handle __user *handle,int __user *mnt_id,int flag); +asmlinkage long sys_open_by_handle_at (int mountdirfd, +struct file_handle __user *handle, +int flags);#endif
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 4/12 vfs: Allow handle based open on symlinks
In reply to Aneesh Kumar K.VThe patch update may_open to allow handle based open on symlinks. The file handle based API use file descritor returned from open_by_handle_at to do different file system operations. To find the link target name we need to get a file descriptor on symlinks.
We should be able to read the link target using file handle. The exact usecase is with respect to implementing READLINK operation on a userspace NFS server. The request contain the file handle and the response include target name.
--- fs/namei.c | 24 ++++++++++++++++++++++-- include/asm-generic/fcntl.h | 1 + include/linux/fs.h | 1 + 3 files changed, 24 insertions(+), 2 deletions(-)
fs/namei.c +22 -2
@@ -1457,7 +1457,20 @@ int may_open(struct path *path, int acc_mode, int flag)switch (inode->i_mode &S_IFMT ) {case S_IFLNK : -return -ELOOP ; +/* +* Allow only if acc_mode contain +* open link request. +*/ +if (!(acc_mode &MAY_OPEN_LINK )) +return -ELOOP ; +/* +* Allow open on symlink only with +* open flag O_NOACCESS. We don't +* allow read/write on symlinks +*/ +if (flag !=O_NOACCESS ) +return -ELOOP ; +break ;case S_IFDIR :if (acc_mode &MAY_WRITE )return -EISDIR ;
@@ -2046,8 +2059,15 @@ long do_handle_open(int mountdirfd,*/ if (open_flag & __O_SYNC) open_flag |=O_DSYNC ; +/* +* Handle based API allow open on a symlink +*/ +if (S_ISLNK (path->dentry->d_inode->i_mode)) + acc_mode =MAY_OPEN_LINK ; +else + acc_mode =MAY_OPEN ; - acc_mode =MAY_OPEN |ACC_MODE (open_flag); + acc_mode |=ACC_MODE (open_flag);/* O_TRUNC implies we need access checks for write permissions */ if (open_flag &O_TRUNC )
include/asm-generic/fcntl.h +1 -0
@@ -7,6 +7,7 @@#define O_RDONLY 00000000#define O_WRONLY 00000001#define O_RDWR 00000002 +#define O_NOACCESS 00000003/* No read/write access */ #ifndef O_CREAT #define O_CREAT 00000100/* not fcntl */ #endif
include/linux/fs.h +1 -0
@@ -53,6 +53,7 @@ struct inodes_stat_t {#define MAY_APPEND 8#define MAY_ACCESS 16#define MAY_OPEN 32 +#define MAY_OPEN_LINK 64/* * flags in file.f_mode. Note that FMODE_READ and FMODE_WRITE must correspond
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 5/12 vfs: Support null pathname in readlink
In reply to Aneesh Kumar K.VFrom: NeilBrown <[email protected]>
This enables to use readlink to get the link target name from a file descriptor point to the link. This can be used with open_by_handle syscall that returns a file descriptor for a link. We can then use this file descriptor to get the target name.
This is similar to utimensat(2) interface
--- fs/stat.c | 30 ++++++++++++++++++++++-------- 1 files changed, 22 insertions(+), 8 deletions(-)
fs/stat.c +22 -8
@@ -284,26 +284,40 @@ SYSCALL_DEFINE2(newfstat, unsigned int, fd, struct stat __user *, statbuf) SYSCALL_DEFINE4(readlinkat, int, dfd, const char __user *, pathname, char __user *, buf, int, bufsiz) { -struct path path; -int error; +int error =0 , fput_needed; +struct path path, *pp; +struct file *file =NULL ;if (bufsiz <=0 )return -EINVAL ; - error =user_path_at (dfd, pathname,0 , &path); +if (pathname ==NULL && dfd !=AT_FDCWD ) { + file =fget_light (dfd, &fput_needed); + +if (file) + pp = &file->f_path; +else + error = -EBADF ; + }else { + error =user_path_at (dfd, pathname,0 , &path); + pp = &path; + }if (!error) { -struct inode *inode = path.dentry->d_inode; +struct inode *inode = pp->dentry->d_inode; error = -EINVAL ;if (inode->i_op->readlink) { - error =security_inode_readlink (path.dentry); + error =security_inode_readlink (pp->dentry);if (!error) { -touch_atime (path.mnt, path.dentry); - error = inode->i_op->readlink (path.dentry, +touch_atime (pp->mnt, pp->dentry); + error = inode->i_op->readlink (pp->dentry, buf, bufsiz); } } -path_put (&path); +if (file) +fput_light (file, fput_needed); +else +path_put (&path); }return error; }
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 6/12 vfs: Support null pathname in faccessat
In reply to Aneesh Kumar K.VThis enables to use faccessat to get the access check details from a file descriptor pointing to the file. This can be used with open_by_handle syscall that returns a file descriptor.
--- fs/open.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-)
fs/open.c +21 -8
@@ -288,9 +288,10 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode) {const struct cred *old_cred;struct cred *override_cred; -struct path path; +struct file *file =NULL ; +struct path path, *pp;struct inode *inode; -int res; +int res, fput_needed;if (mode & ~S_IRWXO )/* where's F_OK, X_OK, W_OK, R_OK? */ return -EINVAL ;
@@ -312,12 +313,21 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode) } old_cred =override_creds (override_cred); - - res =user_path_at (dfd, filename,LOOKUP_FOLLOW , &path); +if (filename ==NULL && dfd !=AT_FDCWD ) { + file =fget_light (dfd, &fput_needed); +if (file) { + pp = &file->f_path; + res =0 ; + }else + res = -EBADF ; + }else { + res =user_path_at (dfd, filename,LOOKUP_FOLLOW , &path); + pp = &path; + }if (res) goto out; - inode = path.dentry->d_inode; + inode = pp->dentry->d_inode;if ((mode &MAY_EXEC ) &&S_ISREG (inode->i_mode)) {/*
@@ -325,7 +335,7 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)* with the "noexec" flag. */ res = -EACCES ; -if (path.mnt->mnt_flags &MNT_NOEXEC ) +if (pp->mnt->mnt_flags &MNT_NOEXEC ) goto out_path_release; }
@@ -343,11 +353,14 @@ SYSCALL_DEFINE3(faccessat, int, dfd, const char __user *, filename, int, mode)* inherently racy and know that the fs may change * state before we even see this result. */ -if (__mnt_is_readonly (path.mnt)) +if (__mnt_is_readonly (pp->mnt)) res = -EROFS ; out_path_release: -path_put (&path); +if (file) +fput_light (file, fput_needed); +else +path_put (&path); out:revert_creds (old_cred);put_cred (override_cred);
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 7/12 vfs: Support null pathname in linkat
In reply to Aneesh Kumar K.VThis enables to use linkat to create hardlinks from a file descriptor pointing to the file. This can be used with open_by_handle syscall that returns a file descriptor.
--- fs/namei.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-)
fs/namei.c +26 -10
@@ -2636,7 +2636,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_destruct inode *inode = old_dentry->d_inode;int error; -if (!inode) +if (!inode || inode->i_nlink ==0 )return -ENOENT ; error =may_create (dir, new_dentry);
@@ -2682,16 +2682,28 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, {struct dentry *new_dentry;struct nameidata nd; -struct path old_path; -int error; +struct path old_path, *old_pathp; +struct file *file =NULL ; +int error, fput_needed;char *to;if ((flags & ~AT_SYMLINK_FOLLOW ) !=0 )return -EINVAL ; - error =user_path_at (olddfd, oldname, - flags &AT_SYMLINK_FOLLOW ?LOOKUP_FOLLOW :0 , - &old_path); +if (oldname ==NULL && olddfd !=AT_FDCWD ) { + file =fget_light (olddfd, &fput_needed); +if (file) { + old_pathp = &file->f_path; + error =0 ; + }else + error = -EBADF ; + }else { + error =user_path_at (olddfd, oldname, + flags &AT_SYMLINK_FOLLOW ? +LOOKUP_FOLLOW :0 , + &old_path); + old_pathp = &old_path; + }if (error)return error;
@@ -2699,7 +2711,7 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname,if (error) goto out; error = -EXDEV ; -if (old_path.mnt != nd.path.mnt) +if (old_pathp->mnt != nd.path.mnt) goto out_release; new_dentry =lookup_create (&nd,0 ); error =PTR_ERR (new_dentry);
@@ -2708,10 +2720,11 @@ SYSCALL_DEFINE5(linkat, int, olddfd, const char __user *, oldname, error =mnt_want_write (nd.path.mnt);if (error) goto out_dput; - error =security_path_link (old_path.dentry, &nd.path, new_dentry); + error =security_path_link (old_pathp->dentry, &nd.path, new_dentry);if (error) goto out_drop_write; - error =vfs_link (old_path.dentry, nd.path.dentry->d_inode, new_dentry); + error =vfs_link (old_pathp->dentry, + nd.path.dentry->d_inode, new_dentry); out_drop_write:mnt_drop_write (nd.path.mnt); out_dput:
@@ -2722,7 +2735,10 @@ out_release:path_put (&nd.path);putname (to); out: -path_put (&old_path); +if (file) +fput_light (file, fput_needed); +else +path_put (&old_path);return error; }
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 8/12 x86: Add new syscalls for x86_32
In reply to Aneesh Kumar K.VThis patch adds sys_name_to_handle_at and sys_open_by_handle_at syscalls to x86_32
--- arch/x86/include/asm/unistd_32.h | 4 +++- arch/x86/kernel/syscall_table_32.S | 2 ++ 2 files changed, 5 insertions(+), 1 deletions(-)
arch/x86/include/asm/unistd_32.h +3 -1
@@ -343,10 +343,12 @@#define __NR_rt_tgsigqueueinfo 335#define __NR_perf_event_open 336#define __NR_recvmmsg 337 +#define __NR_name_to_handle_at 338 +#define __NR_open_by_handle_at 339#ifdef __KERNEL__ -#define NR_syscalls 338 +#define NR_syscalls 340#define __ARCH_WANT_IPC_PARSE_VERSION#define __ARCH_WANT_OLD_READDIR
arch/x86/kernel/syscall_table_32.S +2 -0
@@ -337,3 +337,5 @@ ENTRY(sys_call_table) .long sys_rt_tgsigqueueinfo /* 335 */ .long sys_perf_event_open .long sys_recvmmsg + .long sys_name_to_handle_at + .long sys_open_by_handle_at /* 339 */
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 9/12 x86: Add new syscalls for x86_64
In reply to Aneesh Kumar K.VAdd sys_name_to_handle_at and sys_open_by_handle_at syscalls for x86_64
--- arch/x86/ia32/ia32entry.S | 2 ++ arch/x86/include/asm/unistd_64.h | 4 ++++ fs/compat.c | 11 +++++++++++ 3 files changed, 17 insertions(+), 0 deletions(-)
arch/x86/ia32/ia32entry.S +2 -0
@@ -842,4 +842,6 @@ ia32_sys_call_table: .quad compat_sys_rt_tgsigqueueinfo /* 335 */ .quad sys_perf_event_open .quad compat_sys_recvmmsg + .quad sys_name_to_handle_at + .quad compat_sys_open_by_handle_at /* 339 */ ia32_syscall_end:
arch/x86/include/asm/unistd_64.h +4 -0
@@ -663,6 +663,10 @@ __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo) __SYSCALL(__NR_perf_event_open, sys_perf_event_open)#define __NR_recvmmsg 299 __SYSCALL(__NR_recvmmsg, sys_recvmmsg) +#define __NR_name_to_handle_at 300 +__SYSCALL(__NR_name_to_handle_at, sys_name_to_handle_at) +#define __NR_open_by_handle_at 301 +__SYSCALL(__NR_open_by_handle_at, sys_open_by_handle_at)#ifndef __NO_STUBS#define __ARCH_WANT_OLD_READDIR
fs/compat.c +11 -0
@@ -2332,3 +2332,14 @@ asmlinkage long compat_sys_timerfd_gettime(int ufd, }#endif /* CONFIG_TIMERFD */ + +/* +* Exactly like fs/open.c:sys_open_by_handle_at(), except that it +* doesn't set the O_LARGEFILE flag. +*/ +asmlinkage long +compat_sys_open_by_handle_at (int mountdirfd, +struct file_handle __user *handle,int flags) +{ +return do_handle_open (mountdirfd, handle, flags); +}
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 10/12 vfs: Export file system uuid via /proc/<pid>mountinfo
In reply to Aneesh Kumar K.VWe add a per superblock uuid field. File systems should update the uuid in the fill_super callback
--- fs/namespace.c | 16 ++++++++++++++++ include/linux/fs.h | 1 + 2 files changed, 17 insertions(+), 0 deletions(-)
fs/namespace.c +16 -0
@@ -833,6 +833,18 @@ const struct seq_operations mounts_op = { .show = show_vfsmnt }; +static int uuid_is_nil (u8 *uuid) +{ +int i; +u8 *cp = (u8 *)uuid; + +for (i =0 ; i <16 ; i++) { +if (*cp++) +return 0 ; + } +return 1 ; +} +static int show_mountinfo (struct seq_file *m,void *v) {struct proc_mounts *p = m->private;
@@ -871,6 +883,10 @@ static int show_mountinfo(struct seq_file *m, void *v)if (IS_MNT_UNBINDABLE (mnt))seq_puts (m," unbindable" ); +if (!uuid_is_nil (mnt->mnt_sb->s_uuid)) +/* print the uuid */ +seq_printf (m," uuid:%pU" , mnt->mnt_sb->s_uuid); +/* Filesystem specific data */ seq_puts (m," - " );show_type (m, sb);
include/linux/fs.h +1 -0
@@ -1366,6 +1366,7 @@ struct super_block {wait_queue_head_t s_wait_unfrozen;char s_id[32 ];/* Informational name */ +u8 s_uuid[16 ];/* UUID */ void *s_fs_info;/* Filesystem private info */ fmode_t s_mode;
Signature · 1 line
1.7.2.rc3.43.g24e7a
Ted Ts'o
maintainerRe: [PATCH -V17 10/12] vfs: Export file system uuid via /proc/<pid>mountinfo
Stupid nit-pick in the subject line/patch summary:
s;/proc/<pid>mountinfo;/proc/<pid>/mountinfo;
- Ted
Re: [PATCH -V17 10/12] vfs: Export file system uuid via /proc/<pid>mountinfo
Quoted 4 lines · Ted Ts'o
Stupid nit-pick in the subject line/patch summary:
s;/proc/<pid>mountinfo;/proc/<pid>/mountinfo;
I updated the git repo to fix the commit message. I also rebased to the latest linus tree fixing some conflicts due to MAY_CHDIR. Also fixed a wrong put_filep usage in do_handle_open.
The updated repo at
git://git.kernel.org/pub/scm/linux/kernel/git/kvaneesh/linux-open-handle.git open-by-handle
-aneesh
PATCH 11/12 ext3: Copy fs UUID to superblock.
In reply to Aneesh Kumar K.VFile system UUID is made available to application
via /proc/<pid>/mountinfo
--- fs/ext3/super.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
fs/ext3/super.c +1 -0
@@ -1931,6 +1931,7 @@ static int ext3_fill_super (struct super_block *sb, void *data, int silent) sb->s_qcop = &ext3_qctl_operations; sb->dq_op = &ext3_quota_operations;#endif +memcpy (sb->s_uuid, es->s_uuid,sizeof (es->s_uuid));INIT_LIST_HEAD (&sbi->s_orphan);/* unlinked but open files */ mutex_init (&sbi->s_orphan_lock);mutex_init (&sbi->s_resize_lock);
Signature · 1 line
1.7.2.rc3.43.g24e7a
PATCH 12/12 ext4: Copy fs UUID to superblock
In reply to Aneesh Kumar K.VFile system UUID is made available to application
via /proc/<pid>/mountinfo
--- fs/ext4/super.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
fs/ext4/super.c +2 -0
@@ -2816,6 +2816,8 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) sb->s_qcop = &ext4_qctl_operations; sb->dq_op = &ext4_quota_operations;#endif +memcpy (sb->s_uuid, es->s_uuid,sizeof (es->s_uuid)); +INIT_LIST_HEAD (&sbi->s_orphan);/* unlinked but open files */ mutex_init (&sbi->s_orphan_lock);mutex_init (&sbi->s_resize_lock);
Signature · 1 line
1.7.2.rc3.43.g24e7a