From patchwork Wed Jan 5 02:17:16 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shaohua Li X-Patchwork-Id: 452671 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p052Hf4G005904 for ; Wed, 5 Jan 2011 02:17:42 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751169Ab1AECRV (ORCPT ); Tue, 4 Jan 2011 21:17:21 -0500 Received: from mga03.intel.com ([143.182.124.21]:12432 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750801Ab1AECRU (ORCPT ); Tue, 4 Jan 2011 21:17:20 -0500 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 04 Jan 2011 18:17:19 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.60,275,1291622400"; d="scan'208";a="370175575" Received: from sli10-conroe.sh.intel.com (HELO [10.239.36.124]) ([10.239.36.124]) by azsmga001.ch.intel.com with ESMTP; 04 Jan 2011 18:17:17 -0800 Subject: Re: [PATCH v2 1/5] add metadata_incore ioctl in vfs From: Shaohua Li To: Arnd Bergmann Cc: "linux-btrfs@vger.kernel.org" , "linux-fsdevel@vger.kernel.org" , Chris Mason , Christoph Hellwig , Andrew Morton , Arjan van de Ven , "Yan, Zheng" , "linux-api@vger.kernel.org" , "mtk.manpages@gmail.com" In-Reply-To: <201101041040.31482.arnd@arndb.de> References: <1294119632.1949.366.camel@sli10-conroe> <201101041040.31482.arnd@arndb.de> Date: Wed, 05 Jan 2011 10:17:16 +0800 Message-ID: <1294193836.1949.384.camel@sli10-conroe> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 05 Jan 2011 02:17:42 +0000 (UTC) Index: linux/fs/ioctl.c =================================================================== --- linux.orig/fs/ioctl.c 2011-01-04 10:25:11.000000000 +0800 +++ linux/fs/ioctl.c 2011-01-05 09:53:09.000000000 +0800 @@ -530,6 +530,80 @@ static int ioctl_fsthaw(struct file *fil } /* + * Copy info about metadata in memory to userspace + * Returns: + * > 0, number of metadata_incore_ent entries copied to userspace + * = 0, no more metadata + * < 0, error + */ +static int ioctl_metadata_incore(struct file *filp, void __user *argp) +{ + struct super_block *sb = filp->f_path.dentry->d_inode->i_sb; + struct metadata_incore_args args; + struct metadata_incore_ent ent; + loff_t offset, last_offset = 0; + ssize_t size, last_size = 0; + __u64 vec_addr; + int entries = 0; + + if (!sb->s_op->metadata_incore) + return -EINVAL; + + if (copy_from_user(&args, argp, sizeof(args))) + return -EFAULT; + + /* we check metadata info in page unit */ + if (args.offset & ~PAGE_CACHE_MASK) + return -EINVAL; + + if ((args.vec_size % sizeof(struct metadata_incore_ent)) != 0) + return -EINVAL; + + offset = args.offset; + + ent.unused = 0; + vec_addr = args.vec_addr; + + while (vec_addr < args.vec_addr + args.vec_size) { + if (signal_pending(current)) + return -EINTR; + cond_resched(); + + if (sb->s_op->metadata_incore(sb, &offset, &size) < 0) + break; + /* A merge or offset == 0 */ + if (offset == last_offset + last_size) { + last_size += size; + offset = offset + size; + continue; + } + ent.offset = last_offset; + ent.size = last_size; + if (copy_to_user((void __user *)(long)vec_addr, &ent, + sizeof(ent))) + return -EFAULT; + vec_addr += sizeof(ent); + entries++; + + last_offset = offset; + last_size = size; + ent.unused = 0; + offset = offset + size; + } + + if (last_size > 0 && vec_addr < args.vec_addr + args.vec_size) { + ent.offset = last_offset; + ent.size = last_size; + if (copy_to_user((void __user *)(long)vec_addr, &ent, + sizeof(ent))) + return -EFAULT; + entries++; + } + + return entries; +} + +/* * When you add any new common ioctls to the switches above and below * please update compat_sys_ioctl() too. * @@ -589,6 +663,9 @@ int do_vfs_ioctl(struct file *filp, unsi return put_user(inode->i_sb->s_blocksize, p); } + case FIMETADATA_INCORE: + return ioctl_metadata_incore(filp, argp); + default: if (S_ISREG(filp->f_path.dentry->d_inode->i_mode)) error = file_ioctl(filp, cmd, arg); Index: linux/include/linux/fs.h =================================================================== --- linux.orig/include/linux/fs.h 2011-01-04 10:25:11.000000000 +0800 +++ linux/include/linux/fs.h 2011-01-05 09:10:12.000000000 +0800 @@ -52,6 +52,18 @@ struct inodes_stat_t { int dummy[5]; /* padding for sysctl ABI compatibility */ }; +struct metadata_incore_ent { + __u64 offset; + __u32 size; + __u32 unused; +}; + +struct metadata_incore_args { + __u64 offset; /* offset in meta address */ + __u64 vec_addr; /* vector's address */ + __u32 vec_size; /* vector's size */ + __u32 unused; +}; #define NR_FILE 8192 /* this can well be larger on a larger system */ @@ -325,6 +337,7 @@ struct inodes_stat_t { #define FIFREEZE _IOWR('X', 119, int) /* Freeze */ #define FITHAW _IOWR('X', 120, int) /* Thaw */ #define FITRIM _IOWR('X', 121, struct fstrim_range) /* Trim */ +#define FIMETADATA_INCORE _IOWR('X', 122, struct metadata_incore_args) #define FS_IOC_GETFLAGS _IOR('f', 1, long) #define FS_IOC_SETFLAGS _IOW('f', 2, long) @@ -1613,6 +1626,8 @@ struct super_operations { ssize_t (*quota_write)(struct super_block *, int, const char *, size_t, loff_t); #endif int (*bdev_try_to_free_page)(struct super_block*, struct page*, gfp_t); + int (*metadata_incore)(struct super_block*, loff_t *offset, + ssize_t *size); }; /* Index: linux/fs/compat_ioctl.c =================================================================== --- linux.orig/fs/compat_ioctl.c 2011-01-04 10:25:11.000000000 +0800 +++ linux/fs/compat_ioctl.c 2011-01-05 08:58:06.000000000 +0800 @@ -882,6 +882,7 @@ COMPATIBLE_IOCTL(FIGETBSZ) /* 'X' - originally XFS but some now in the VFS */ COMPATIBLE_IOCTL(FIFREEZE) COMPATIBLE_IOCTL(FITHAW) +COMPATIBLE_IOCTL(FIMETADATA_INCORE) COMPATIBLE_IOCTL(KDGETKEYCODE) COMPATIBLE_IOCTL(KDSETKEYCODE) COMPATIBLE_IOCTL(KDGKBTYPE) @@ -1577,6 +1578,7 @@ asmlinkage long compat_sys_ioctl(unsigne case FIONBIO: case FIOASYNC: case FIOQSIZE: + case FIMETADATA_INCORE: break; #if defined(CONFIG_IA64) || defined(CONFIG_X86_64)