From patchwork Sun Sep 23 12:56:33 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiyong Wu X-Patchwork-Id: 186223 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9B22C2C00A1 for ; Sun, 23 Sep 2012 23:00:51 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754025Ab2IWM6X (ORCPT ); Sun, 23 Sep 2012 08:58:23 -0400 Received: from e6.ny.us.ibm.com ([32.97.182.146]:37949 "EHLO e6.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753889Ab2IWM5q (ORCPT ); Sun, 23 Sep 2012 08:57:46 -0400 Received: from /spool/local by e6.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Sun, 23 Sep 2012 08:57:45 -0400 Received: from d01relay03.pok.ibm.com (9.56.227.235) by e6.ny.us.ibm.com (192.168.1.106) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Sun, 23 Sep 2012 08:57:43 -0400 Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8NCvgcW097096; Sun, 23 Sep 2012 08:57:42 -0400 Received: from d01av03.pok.ibm.com (loopback [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8NCvfxa002930; Sun, 23 Sep 2012 09:57:42 -0300 Received: from us.ibm.com (f15.cn.ibm.com [9.115.122.154]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with SMTP id q8NCvZOa002791; Sun, 23 Sep 2012 09:57:36 -0300 Received: by us.ibm.com (sSMTP sendmail emulation); Sun, 23 Sep 2012 20:57:25 +0800 From: zwu.kernel@gmail.com To: linux-fsdevel@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-btrfs@vger.kernel.org, linux-ext4@vger.kernel.org, linuxram@linux.vnet.ibm.com, viro@zeniv.linux.org.uk, cmm@us.ibm.com, tytso@mit.edu, marco.stornelli@gmail.com, david@fromorbit.com, stroetmann@ontolinux.com, diegocg@gmail.com, chris@csamuel.org, Zhi Yong Wu Subject: [RFC v2 08/10] vfs: add 3 new ioctl interfaces Date: Sun, 23 Sep 2012 20:56:33 +0800 Message-Id: <1348404995-14372-9-git-send-email-zwu.kernel@gmail.com> X-Mailer: git-send-email 1.7.6.5 In-Reply-To: <1348404995-14372-1-git-send-email-zwu.kernel@gmail.com> References: <1348404995-14372-1-git-send-email-zwu.kernel@gmail.com> x-cbid: 12092312-1976-0000-0000-000011A65E41 Sender: linux-ext4-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-ext4@vger.kernel.org From: Zhi Yong Wu FS_IOC_GET_HEAT_INFO: return a struct containing the various metrics collected in btrfs_freq_data structs, and also return a calculated data temperature based on those metrics. Optionally, retrieve the temperature from the hot data hash list instead of recalculating it. FS_IOC_GET_HEAT_OPTS: return an integer representing the current state of hot data tracking and migration: 0 = do nothing 1 = track frequency of access FS_IOC_SET_HEAT_OPTS: change the state of hot data tracking and migration, as described above. Signed-off-by: Zhi Yong Wu --- fs/compat_ioctl.c | 8 +++ fs/ioctl.c | 130 ++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 11 ++++ include/linux/hot_tracking.h | 12 ++++ 4 files changed, 161 insertions(+), 0 deletions(-) diff --git a/fs/compat_ioctl.c b/fs/compat_ioctl.c index debdfe0..a88c7de 100644 --- a/fs/compat_ioctl.c +++ b/fs/compat_ioctl.c @@ -1390,6 +1390,11 @@ COMPATIBLE_IOCTL(TIOCSTART) COMPATIBLE_IOCTL(TIOCSTOP) #endif +/*Hot data tracking*/ +COMPATIBLE_IOCTL(FS_IOC_GET_HEAT_INFO) +COMPATIBLE_IOCTL(FS_IOC_SET_HEAT_OPTS) +COMPATIBLE_IOCTL(FS_IOC_GET_HEAT_OPTS) + /* fat 'r' ioctls. These are handled by fat with ->compat_ioctl, but we don't want warnings on other file systems. So declare them as compatible here. */ @@ -1572,6 +1577,9 @@ asmlinkage long compat_sys_ioctl(unsigned int fd, unsigned int cmd, case FIBMAP: case FIGETBSZ: case FIONREAD: + case FS_IOC_GET_HEAT_INFO: + case FS_IOC_SET_HEAT_OPTS: + case FS_IOC_GET_HEAT_OPTS: if (S_ISREG(filp->f_path.dentry->d_inode->i_mode)) break; /*FALL THROUGH*/ diff --git a/fs/ioctl.c b/fs/ioctl.c index 29167be..394975e 100644 --- a/fs/ioctl.c +++ b/fs/ioctl.c @@ -15,6 +15,7 @@ #include #include #include +#include "hot_tracking.h" #include @@ -537,6 +538,126 @@ static int ioctl_fsthaw(struct file *filp) } /* + * Retrieve information about access frequency for the given file. Return it in + * a userspace-friendly struct for btrfsctl (or another tool) to parse. + * + * The temperature that is returned can be "live" -- that is, recalculated when + * the ioctl is called -- or it can be returned from the hashtable, reflecting + * the (possibly old) value that the system will use when considering files + * for migration. This behavior is determined by hot_heat_info->live. + */ +static int ioctl_heat_info(struct file *file, void __user *argp) +{ + struct inode *mnt_inode = file->f_path.dentry->d_inode; + struct inode *file_inode; + struct file *file_filp; + struct hot_info *root = &(mnt_inode->i_sb->s_hotinfo); + struct hot_heat_info *heat_info; + struct hot_inode_tree *hitree; + struct hot_inode_item *he; + int ret; + + heat_info = kmalloc(sizeof(struct hot_heat_info), + GFP_KERNEL | GFP_NOFS); + + if (copy_from_user((void *) heat_info, + argp, + sizeof(struct hot_heat_info)) != 0) { + ret = -EFAULT; + goto err; + } + + file_filp = filp_open(heat_info->filename, O_RDONLY, 0); + file_inode = file_filp->f_dentry->d_inode; + filp_close(file_filp, NULL); + + hitree = &root->hot_inode_tree; + read_lock(&hitree->lock); + he = hot_rb_lookup_hot_inode_item(hitree, file_inode->i_ino); + read_unlock(&hitree->lock); + if (!he) { + /* we don't have any info on this file yet */ + ret = -ENODATA; + goto err; + } + + spin_lock(&he->lock); + heat_info->avg_delta_reads = + (__u64) he->hot_freq_data.avg_delta_reads; + heat_info->avg_delta_writes = + (__u64) he->hot_freq_data.avg_delta_writes; + heat_info->last_read_time = + (__u64) timespec_to_ns(&he->hot_freq_data.last_read_time); + heat_info->last_write_time = + (__u64) timespec_to_ns(&he->hot_freq_data.last_write_time); + heat_info->num_reads = + (__u32) he->hot_freq_data.nr_reads; + heat_info->num_writes = + (__u32) he->hot_freq_data.nr_writes; + + if (heat_info->live > 0) { + /* got a request for live temperature, + * call hot_hash_calc_temperature to recalculate + */ + heat_info->temperature = + hot_hash_calc_temperature(&he->hot_freq_data); + } else { + /* not live temperature, get it from the hashlist */ + read_lock(&he->heat_node->hlist->rwlock); + heat_info->temperature = he->heat_node->hlist->temperature; + read_unlock(&he->heat_node->hlist->rwlock); + } + spin_unlock(&he->lock); + + hot_rb_free_hot_inode_item(he); + + if (copy_to_user(argp, (void *) heat_info, + sizeof(struct hot_heat_info))) { + ret = -EFAULT; + goto err; + } + + kfree(heat_info); + return 0; + +err: + kfree(heat_info); + return ret; +} + +static int ioctl_heat_opts(struct file *file, void __user *argp, int set) +{ + struct inode *inode = file->f_path.dentry->d_inode; + int arg, ret = 0; + + if (!set) { + arg = TRACK_THIS_INODE(inode) ? 1 : 0; + + if (copy_to_user(argp, (void *) &arg, sizeof(int)) != 0) + ret = -EFAULT; + } else { + if (copy_from_user((void *) &arg, argp, sizeof(int)) != 0) { + ret = -EFAULT; + } else { + switch (arg) { + case 0: /* track nothing */ + /* set S_NOHOTDATATRACK */ + inode->i_flags |= S_NOHOTDATATRACK; + break; + case 1: /* do tracking */ + /* clear S_NOHOTDATATRACK */ + inode->i_flags &= ~S_NOHOTDATATRACK; + break; + default: + ret = -EINVAL; + } + } + } + + return ret; +} + +/* * When you add any new common ioctls to the switches above and below * please update compat_sys_ioctl() too. * @@ -591,6 +712,15 @@ int do_vfs_ioctl(struct file *filp, unsigned int fd, unsigned int cmd, case FIGETBSZ: return put_user(inode->i_sb->s_blocksize, argp); + case FS_IOC_GET_HEAT_INFO: + return ioctl_heat_info(filp, argp); + + case FS_IOC_SET_HEAT_OPTS: + return ioctl_heat_opts(filp, argp, 1); + + case FS_IOC_GET_HEAT_OPTS: + return ioctl_heat_opts(filp, argp, 0); + default: if (S_ISREG(inode->i_mode)) error = file_ioctl(filp, cmd, arg); diff --git a/include/linux/fs.h b/include/linux/fs.h index db1a144..277791f 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -256,6 +256,7 @@ struct inodes_stat_t { #define S_IMA 1024 /* Inode has an associated IMA struct */ #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */ #define S_NOSEC 4096 /* no suid or xattr security attributes */ +#define S_NOHOTDATATRACK (1 << 13) /* hot data tracking */ /* * Note that nosuid etc flags are inode-specific: setting some file-system @@ -354,6 +355,16 @@ struct inodes_stat_t { #define FS_IOC32_SETVERSION _IOW('v', 2, int) /* + * Hot data tracking ioctls: + * + * HOT_INFO - retrieve info on frequency of access + */ +#define FS_IOC_GET_HEAT_INFO _IOR('f', 17, \ + struct hot_heat_info) +#define FS_IOC_SET_HEAT_OPTS _IOW('f', 18, int) +#define FS_IOC_GET_HEAT_OPTS _IOR('f', 19, int) + +/* * Inode flags (FS_IOC_GETFLAGS / FS_IOC_SETFLAGS) */ #define FS_SECRM_FL 0x00000001 /* Secure deletion */ diff --git a/include/linux/hot_tracking.h b/include/linux/hot_tracking.h index 1ec90a6..b0a2705 100644 --- a/include/linux/hot_tracking.h +++ b/include/linux/hot_tracking.h @@ -63,6 +63,18 @@ struct hot_freq_data { u32 last_temperature; }; +struct hot_heat_info { + __u64 avg_delta_reads; + __u64 avg_delta_writes; + __u64 last_read_time; + __u64 last_write_time; + __u32 num_reads; + __u32 num_writes; + __u32 temperature; + __u8 live; + char filename[PATH_MAX]; +}; + /* Hash list heads for hot hash table */ struct hot_hash_head { struct hlist_head hashhead;