From patchwork Wed Jun 13 01:10:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 9245 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 C51D423E49 for ; Wed, 13 Jun 2012 01:12:11 +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 7D637A1818F for ; Wed, 13 Jun 2012 01:12:11 +0000 (UTC) Received: by ghbz12 with SMTP id z12so10803ghb.11 for ; Tue, 12 Jun 2012 18:12:11 -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=/Nc2b5QrS+PcoXMCiSoMJPGlulNj7SsKwBrBqoEwXUk=; b=n/9YufBydHDfV8G+1mWGa7d/fhfqHT0xUSYlbzelVaxuWMAd3jbxdJtTLFsIAF1jdi cehsF35/MC334YpbjZ6V15+WUT37Gcx4JP0o0P5bpJ5mAJe6U5DM5e7P5c3sbnHUqp7G h4S2bs5Mh9iwL1P5C4dQmYqL5b5IL2/cJTJeQxEfDiMa3LNewBicWM2AK7y3ccM+Bdkk wolk3Wu8B5gJav03NdwKLACmLFQiFll9eY3MvYlgYoEX1MhOodR4QL0mkWjhNKz+Pkdq wg1DjE9veifJp0B/cWWhIQtXKuyPGSGEvY5ToXXD4tIKBQ5BNyn/x9oyD6s8zNl2lT9W fgow== Received: by 10.50.40.193 with SMTP id z1mr9746946igk.0.1339549930610; Tue, 12 Jun 2012 18:12:10 -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.231.24.148 with SMTP id v20csp199015ibb; Tue, 12 Jun 2012 18:12:09 -0700 (PDT) Received: by 10.236.74.34 with SMTP id w22mr30389812yhd.46.1339549929195; Tue, 12 Jun 2012 18:12:09 -0700 (PDT) Received: from e8.ny.us.ibm.com (e8.ny.us.ibm.com. [32.97.182.138]) by mx.google.com with ESMTPS id b26si1526266yhe.85.2012.06.12.18.12.08 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 12 Jun 2012 18:12:09 -0700 (PDT) Received-SPF: pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.138 as permitted sender) client-ip=32.97.182.138; Authentication-Results: mx.google.com; spf=pass (google.com: domain of jstultz@us.ibm.com designates 32.97.182.138 as permitted sender) smtp.mail=jstultz@us.ibm.com Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 12 Jun 2012 21:12:08 -0400 Received: from d01dlp01.pok.ibm.com (9.56.224.56) by e8.ny.us.ibm.com (192.168.1.108) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 12 Jun 2012 21:11:10 -0400 Received: from d01relay04.pok.ibm.com (d01relay04.pok.ibm.com [9.56.227.236]) by d01dlp01.pok.ibm.com (Postfix) with ESMTP id 7990A38C801C; Tue, 12 Jun 2012 21:11:09 -0400 (EDT) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by d01relay04.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q5D1B9nE161058; Tue, 12 Jun 2012 21:11:09 -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 q5D1B7Cd001521; Tue, 12 Jun 2012 22:11:09 -0300 Received: from kernel.beaverton.ibm.com (kernel.beaverton.ibm.com [9.47.67.96]) by d01av03.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q5D1B7vL001499; Tue, 12 Jun 2012 22:11:07 -0300 Received: by kernel.beaverton.ibm.com (Postfix, from userid 1056) id 7A300C0624; Tue, 12 Jun 2012 18:11:06 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , Andrew Morton , Android Kernel Team , Robert Love , Mel Gorman , Hugh Dickins , Dave Hansen , Rik van Riel , Dmitry Adamushko , Dave Chinner , Neil Brown , Andrea Righi , "Aneesh Kumar K.V" , Taras Glek , Mike Hommey , Jan Kara , KOSAKI Motohiro Subject: [PATCH 3/6] [RFC] tmpfs: Add FALLOC_FL_MARK_VOLATILE/UNMARK_VOLATILE handlers Date: Tue, 12 Jun 2012 18:10:58 -0700 Message-Id: <1339549862-653-4-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.3.2.146.gca209 In-Reply-To: <1339549862-653-1-git-send-email-john.stultz@linaro.org> References: <1339549862-653-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12061301-9360-0000-0000-0000074A550C X-Gm-Message-State: ALoCoQk5NLW7hrt8JN+hGRD/6bD0GkrP89H6bCum94JQuXlbA5r58q6qH236dHvJvV5GQhHl8c94 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. CC: Andrew Morton CC: Android Kernel Team CC: Robert Love CC: Mel Gorman CC: Hugh Dickins CC: Dave Hansen CC: Rik van Riel CC: Dmitry Adamushko CC: Dave Chinner CC: Neil Brown CC: Andrea Righi CC: Aneesh Kumar K.V CC: Taras Glek CC: Mike Hommey CC: Jan Kara CC: KOSAKI Motohiro Signed-off-by: John Stultz --- fs/open.c | 3 +- include/linux/falloc.h | 7 ++- mm/shmem.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 118 insertions(+), 4 deletions(-) diff --git a/fs/open.c b/fs/open.c index d6c79a0..c0531c0 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 a15a466..0513816 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -64,6 +64,7 @@ static struct vfsmount *shm_mnt; #include #include #include +#include #include #include @@ -624,6 +625,102 @@ 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) +{ + loff_t lstart, lend; + int ret; + + lstart = offset >> PAGE_CACHE_SHIFT; + lend = (offset+len) >> PAGE_CACHE_SHIFT; + + volatile_range_lock(&shmem_volatile_head); + ret = volatile_range_add(&shmem_volatile_head, &inode->i_data, + lstart, lend); + if (ret > 0) { /* immdiately purge */ + shmem_truncate_range(inode, lstart<> PAGE_CACHE_SHIFT; + lend = (offset+len) >> PAGE_CACHE_SHIFT; + + volatile_range_lock(&shmem_volatile_head); + ret = volatile_range_remove(&shmem_volatile_head, + &inode->i_data, + lstart, lend); + 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; + loff_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, + start< 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); @@ -1806,6 +1903,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 */ @@ -1884,6 +1989,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); @@ -2795,6 +2906,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 };