From patchwork Thu Jul 26 23:55:46 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 10289 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id DE41B24000 for ; Thu, 26 Jul 2012 23:56:54 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 985A0A181C2 for ; Thu, 26 Jul 2012 23:56:54 +0000 (UTC) Received: by ghbz12 with SMTP id z12so2632153ghb.11 for ; Thu, 26 Jul 2012 16:56:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=5Fg5zOaKxnnYSM0AEorkByb3ctfRUJc8e44TbbNihUI=; b=XHKO60nG1BSVziFv1/q9Db0npP7d55N+OW0dI5jr4jwNTqqptRe9DFhl4CZMJ/3NLb 0JsAIT5Pv1U8e4yHDJVBgTlEZUotPFQhA2txM3N7/ODWu2NS5UpYtm2FCds/O/apYZcr /lapa03uVv1n9WdRkz838TAPNOy7OOGO4Erb4Ip9lLMyH+inkobNHj2+klRE/8yNfNzd Ux/FLU+20tfZ/IbRrv/+xu4WLjBwrOckDCiqEZjLGOdVm5f3IxRL3FH5C7UOtoNqG+5l px426qWftWAI5E8A4KIOiA2KiMuuR9GSCwEhvzFGsDr+EvOkrrA7RMOdeOe4I7GAUJhK sVdg== Received: by 10.50.149.170 with SMTP id ub10mr383017igb.38.1343347013784; Thu, 26 Jul 2012 16:56:53 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.43.93.3 with SMTP id bs3csp1130icc; Thu, 26 Jul 2012 16:56:53 -0700 (PDT) Received: by 10.66.73.70 with SMTP id j6mr1270941pav.5.1343347012880; Thu, 26 Jul 2012 16:56:52 -0700 (PDT) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id qs10si365327pbb.230.2012.07.26.16.56.51 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 16:56:52 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.110.154 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.110.154 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 26 Jul 2012 17:56:49 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 26 Jul 2012 17:56:06 -0600 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id 653011FF001A; Thu, 26 Jul 2012 23:56:03 +0000 (WET) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q6QNu5oK134528; Thu, 26 Jul 2012 17:56:05 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q6QNu4RO014590; Thu, 26 Jul 2012 17:56:04 -0600 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q6QNtumQ014268; Thu, 26 Jul 2012 17:56:04 -0600 From: John Stultz To: Dave Hansen Cc: John Stultz Subject: [PATCH 2/5] [RFC] tmpfs: Add FALLOC_FL_MARK_VOLATILE/UNMARK_VOLATILE handlers Date: Thu, 26 Jul 2012 19:55:46 -0400 Message-Id: <1343346949-53715-3-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343346949-53715-1-git-send-email-john.stultz@linaro.org> References: <1343346949-53715-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12072623-7606-0000-0000-00000252E72C X-Gm-Message-State: ALoCoQkAJ0awHU/fYOA9+HeBftdV7f8cviHLtg/+Vh0Q00R8VqpZFWbF8kNgZG79AgElovrsHbhh This patch enables FALLOC_FL_MARK_VOLATILE/UNMARK_VOLATILE functionality for tmpfs making use of the volatile range management code. Conceptually, FALLOC_FL_MARK_VOLATILE is like a delayed FALLOC_FL_PUNCH_HOLE. This allows applications that have data caches that can be re-created to tell the kernel that some memory contains data that is useful in the future, but can be recreated if needed, so if the kernel needs, it can zap the memory without having to swap it out. In use, applications use FALLOC_FL_MARK_VOLATILE to mark page ranges as volatile when they are not in use. Then later if they wants to reuse the data, they use FALLOC_FL_UNMARK_VOLATILE, which will return an error if the data has been purged. This is very much influenced by the Android Ashmem interface by Robert Love so credits to him and the Android developers. In many cases the code & logic come directly from the ashmem patch. The intent of this patch is to allow for ashmem-like behavior, but embeds the idea a little deeper into the VM code. This is a reworked version of the fadvise volatile idea submitted earlier to the list. Thanks to Dave Chinner for suggesting to rework the idea in this fashion. Also thanks to Dmitry Adamushko for continued review and bug reporting, and Dave Hansen for help with the original design and mentoring me in the VM code. v3: * Fix off by one issue when truncating page ranges * Use Dave Hansesn's suggestion to use shmem_writepage to trigger range purging instead of using a shrinker. v4: * Revert the shrinker removal, since writepage won't get called if we don't have swap. v5: * Cleanups Signed-off-by: John Stultz --- fs/open.c | 3 +- include/linux/falloc.h | 7 +-- mm/shmem.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 4 deletions(-) diff --git a/fs/open.c b/fs/open.c index 1e914b3..421a97c 100644 --- a/fs/open.c +++ b/fs/open.c @@ -223,7 +223,8 @@ int do_fallocate(struct file *file, int mode, loff_t offset, loff_t len) return -EINVAL; /* Return error if mode is not supported */ - if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) + if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | + FALLOC_FL_MARK_VOLATILE | FALLOC_FL_UNMARK_VOLATILE)) return -EOPNOTSUPP; /* Punch hole must have keep size set */ diff --git a/include/linux/falloc.h b/include/linux/falloc.h index 73e0b62..3e47ad5 100644 --- a/include/linux/falloc.h +++ b/include/linux/falloc.h @@ -1,9 +1,10 @@ #ifndef _FALLOC_H_ #define _FALLOC_H_ -#define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */ -#define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */ - +#define FALLOC_FL_KEEP_SIZE 0x01 /* default is extend size */ +#define FALLOC_FL_PUNCH_HOLE 0x02 /* de-allocates range */ +#define FALLOC_FL_MARK_VOLATILE 0x04 /* mark range volatile */ +#define FALLOC_FL_UNMARK_VOLATILE 0x08 /* mark range non-volatile */ #ifdef __KERNEL__ /* diff --git a/mm/shmem.c b/mm/shmem.c index c15b998..e5ce04c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -64,6 +64,7 @@ static struct vfsmount *shm_mnt; #include #include #include +#include #include #include @@ -633,6 +634,103 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr) return error; } +static DEFINE_VOLATILE_FS_HEAD(shmem_volatile_head); + +static int shmem_mark_volatile(struct inode *inode, loff_t offset, loff_t len) +{ + pgoff_t start, end; + int ret; + + start = offset >> PAGE_CACHE_SHIFT; + end = (offset+len) >> PAGE_CACHE_SHIFT; + + volatile_range_lock(&shmem_volatile_head); + ret = volatile_range_add(&shmem_volatile_head, &inode->i_data, + start, end); + if (ret > 0) { /* immdiately purge */ + shmem_truncate_range(inode, + ((loff_t) start << PAGE_CACHE_SHIFT), + ((loff_t) end << PAGE_CACHE_SHIFT)-1); + ret = 0; + } + volatile_range_unlock(&shmem_volatile_head); + + return ret; +} + +static int shmem_unmark_volatile(struct inode *inode, loff_t offset, loff_t len) +{ + pgoff_t start, end; + int ret; + + start = offset >> PAGE_CACHE_SHIFT; + end = (offset+len) >> PAGE_CACHE_SHIFT; + + volatile_range_lock(&shmem_volatile_head); + ret = volatile_range_remove(&shmem_volatile_head, &inode->i_data, + start, end); + volatile_range_unlock(&shmem_volatile_head); + + return ret; +} + +static void shmem_clear_volatile(struct inode *inode) +{ + volatile_range_lock(&shmem_volatile_head); + volatile_range_clear(&shmem_volatile_head, &inode->i_data); + volatile_range_unlock(&shmem_volatile_head); +} + +static +int shmem_volatile_shrink(struct shrinker *ignored, struct shrink_control *sc) +{ + s64 nr_to_scan = sc->nr_to_scan; + const gfp_t gfp_mask = sc->gfp_mask; + struct address_space *mapping; + pgoff_t start, end; + int ret; + s64 page_count; + + if (nr_to_scan && !(gfp_mask & __GFP_FS)) + return -1; + + volatile_range_lock(&shmem_volatile_head); + page_count = volatile_range_lru_size(&shmem_volatile_head); + if (!nr_to_scan) + goto out; + + do { + ret = volatile_ranges_pluck_lru(&shmem_volatile_head, + &mapping, &start, &end); + if (ret) { + shmem_truncate_range(mapping->host, + ((loff_t) start << PAGE_CACHE_SHIFT), + ((loff_t) end << PAGE_CACHE_SHIFT)-1); + + nr_to_scan -= end-start; + page_count -= end-start; + }; + } while (ret && (nr_to_scan > 0)); + +out: + volatile_range_unlock(&shmem_volatile_head); + + return page_count; +} + +static struct shrinker shmem_volatile_shrinker = { + .shrink = shmem_volatile_shrink, + .seeks = DEFAULT_SEEKS, +}; + +static int __init shmem_shrinker_init(void) +{ + register_shrinker(&shmem_volatile_shrinker); + return 0; +} +arch_initcall(shmem_shrinker_init); + + static void shmem_evict_inode(struct inode *inode) { struct shmem_inode_info *info = SHMEM_I(inode); @@ -1730,6 +1828,14 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset, /* No need to unmap again: hole-punching leaves COWed pages */ error = 0; goto out; + } else if (mode & FALLOC_FL_MARK_VOLATILE) { + /* Mark pages volatile, sort of delayed hole punching */ + error = shmem_mark_volatile(inode, offset, len); + goto out; + } else if (mode & FALLOC_FL_UNMARK_VOLATILE) { + /* Mark pages non-volatile, return error if pages were purged */ + error = shmem_unmark_volatile(inode, offset, len); + goto out; } /* We need to check rlimit even when FALLOC_FL_KEEP_SIZE */ @@ -1808,6 +1914,12 @@ out: return error; } +static int shmem_release(struct inode *inode, struct file *file) +{ + shmem_clear_volatile(inode); + return 0; +} + static int shmem_statfs(struct dentry *dentry, struct kstatfs *buf) { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); @@ -2719,6 +2831,7 @@ static const struct file_operations shmem_file_operations = { .splice_read = shmem_file_splice_read, .splice_write = generic_file_splice_write, .fallocate = shmem_fallocate, + .release = shmem_release, #endif };