mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: David Howells <dhowells@redhat.com>
To: torvalds@osdl.org, akpm@linux-foundation.org,
	trond.myklebust@fys.uio.no, chuck.lever@oracle.com
Cc: nfsv4@linux-nfs.org, linux-kernel@vger.kernel.org,
	linux-fsdevel@vger.kernel.org, selinux@tycho.nsa.gov,
	linux-security-module@vger.kernel.org, dhowells@redhat.com
Subject: [PATCH 22/45] CacheFiles: Add a hook to write a single page of data to an inode [ver #35]
Date: Fri, 28 Mar 2008 14:32:04 +0000	[thread overview]
Message-ID: <20080328143203.3483.18861.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20080328143010.3483.99079.stgit@warthog.procyon.org.uk>

Add an address space operation to write one single page of data to an inode at
a page-aligned location (thus permitting the implementation to be highly
optimised).  The data source is a single page.

This is used by CacheFiles to store the contents of netfs pages into their
backing file pages.

Supply a generic implementation for this that uses the write_begin() and
write_end() address_space operations to bind a copy directly into the page
cache.

Hook the Ext2 and Ext3 operations to the generic implementation.

Signed-off-by: David Howells <dhowells@redhat.com>
---

 fs/ext2/inode.c    |    2 ++
 fs/ext3/inode.c    |    3 +++
 include/linux/fs.h |    7 ++++++
 mm/filemap.c       |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 0 deletions(-)


diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index c620068..f483014 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -792,6 +792,7 @@ const struct address_space_operations ext2_aops = {
 	.direct_IO		= ext2_direct_IO,
 	.writepages		= ext2_writepages,
 	.migratepage		= buffer_migrate_page,
+	.write_one_page		= generic_file_buffered_write_one_page,
 };
 
 const struct address_space_operations ext2_aops_xip = {
@@ -810,6 +811,7 @@ const struct address_space_operations ext2_nobh_aops = {
 	.direct_IO		= ext2_direct_IO,
 	.writepages		= ext2_writepages,
 	.migratepage		= buffer_migrate_page,
+	.write_one_page		= generic_file_buffered_write_one_page,
 };
 
 /*
diff --git a/fs/ext3/inode.c b/fs/ext3/inode.c
index c976123..0209f3b 100644
--- a/fs/ext3/inode.c
+++ b/fs/ext3/inode.c
@@ -1776,6 +1776,7 @@ static const struct address_space_operations ext3_ordered_aops = {
 	.releasepage	= ext3_releasepage,
 	.direct_IO	= ext3_direct_IO,
 	.migratepage	= buffer_migrate_page,
+	.write_one_page	= generic_file_buffered_write_one_page,
 };
 
 static const struct address_space_operations ext3_writeback_aops = {
@@ -1790,6 +1791,7 @@ static const struct address_space_operations ext3_writeback_aops = {
 	.releasepage	= ext3_releasepage,
 	.direct_IO	= ext3_direct_IO,
 	.migratepage	= buffer_migrate_page,
+	.write_one_page	= generic_file_buffered_write_one_page,
 };
 
 static const struct address_space_operations ext3_journalled_aops = {
@@ -1803,6 +1805,7 @@ static const struct address_space_operations ext3_journalled_aops = {
 	.bmap		= ext3_bmap,
 	.invalidatepage	= ext3_invalidatepage,
 	.releasepage	= ext3_releasepage,
+	.write_one_page	= generic_file_buffered_write_one_page,
 };
 
 void ext3_set_aops(struct inode *inode)
diff --git a/include/linux/fs.h b/include/linux/fs.h
index d218ef5..dd6c3d1 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -481,6 +481,11 @@ struct address_space_operations {
 	int (*migratepage) (struct address_space *,
 			struct page *, struct page *);
 	int (*launder_page) (struct page *);
+	/* write the contents of the source page over the page at the specified
+	 * index in the target address space (the source page does not need to
+	 * be related to the target address space) */
+	int (*write_one_page)(struct address_space *, pgoff_t, struct page *);
+
 };
 
 /*
@@ -1811,6 +1816,8 @@ extern ssize_t generic_file_direct_write(struct kiocb *, const struct iovec *,
 		unsigned long *, loff_t, loff_t *, size_t, size_t);
 extern ssize_t generic_file_buffered_write(struct kiocb *, const struct iovec *,
 		unsigned long, loff_t, loff_t *, size_t, ssize_t);
+extern int generic_file_buffered_write_one_page(struct address_space *,
+						pgoff_t, struct page *);
 extern ssize_t do_sync_read(struct file *filp, char __user *buf, size_t len, loff_t *ppos);
 extern ssize_t do_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos);
 extern int generic_segment_checks(const struct iovec *iov,
diff --git a/mm/filemap.c b/mm/filemap.c
index 1c01452..bd3ab83 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -2370,6 +2370,67 @@ generic_file_buffered_write(struct kiocb *iocb, const struct iovec *iov,
 }
 EXPORT_SYMBOL(generic_file_buffered_write);
 
+/**
+ * generic_file_buffered_write_one_page - Write a single page of data to an
+ *	inode
+ * @mapping - The address space of the target inode
+ * @index - The target page in the target inode to fill
+ * @source - The data to write into the target page
+ *
+ * Write the data from the source page to the page in the nominated address
+ * space at the @index specified.  Note that the file will not be extended if
+ * the page crosses the EOF marker, in which case only the first part of the
+ * page will be written.
+ *
+ * The @source page does not need to have any association with the file or the
+ * target page offset.
+ */
+int generic_file_buffered_write_one_page(struct address_space *mapping,
+					 pgoff_t index,
+					 struct page *source)
+{
+	const struct address_space_operations *a_ops = mapping->a_ops;
+	struct page *page;
+	unsigned len;
+	loff_t isize, pos;
+	void *fsdata;
+	int ret;
+
+	pos = index;
+	pos <<= PAGE_CACHE_SHIFT;
+
+	len = PAGE_CACHE_SIZE;
+	isize = i_size_read(mapping->host);
+	if ((isize >> PAGE_CACHE_SHIFT) == index)
+		len = isize & (PAGE_CACHE_SIZE - 1);
+
+	ret = pagecache_write_begin(NULL, mapping, pos, len,
+				    AOP_FLAG_UNINTERRUPTIBLE, &page, &fsdata);
+	if (ret < 0)
+		goto sync;
+
+	copy_highpage(page, source);
+
+	ret = pagecache_write_end(NULL, mapping, pos, len, len, page, fsdata);
+	if (ret < 0)
+		goto sync;
+
+	balance_dirty_pages_ratelimited(mapping);
+	cond_resched();
+
+sync:
+	/* the caller must handle O_SYNC themselves, but we handle S_SYNC and
+	 * MS_SYNCHRONOUS here */
+	if (unlikely(IS_SYNC(mapping->host)) && !a_ops->writepage)
+		ret = generic_osync_inode(mapping->host, mapping,
+					     OSYNC_METADATA | OSYNC_DATA);
+
+	/* the caller must handle O_DIRECT for themselves */
+
+	return ret;
+}
+EXPORT_SYMBOL(generic_file_buffered_write_one_page);
+
 static ssize_t
 __generic_file_aio_write_nolock(struct kiocb *iocb, const struct iovec *iov,
 				unsigned long nr_segs, loff_t *ppos)


  parent reply	other threads:[~2008-03-28 14:46 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-03-28 14:30 [PATCH 00/45] Permit filesystem local caching " David Howells
2008-03-28 14:30 ` [PATCH 01/45] KEYS: Increase the payload size when instantiating a key " David Howells
2008-03-28 14:30 ` [PATCH 02/45] KEYS: Check starting keyring as part of search " David Howells
2008-03-28 14:30 ` [PATCH 03/45] KEYS: Allow the callout data to be passed as a blob rather than a string " David Howells
2008-03-28 14:30 ` [PATCH 04/45] KEYS: Allow clients to set key perms in key_create_or_update() " David Howells
2008-03-28 14:30 ` [PATCH 05/45] KEYS: Don't generate user and user session keyrings unless they're accessed " David Howells
2008-03-28 14:30 ` [PATCH 06/45] KEYS: Make the keyring quotas controllable through /proc/sys " David Howells
2008-04-01 15:29   ` Berthold Cogel
2008-03-28 14:30 ` [PATCH 07/45] KEYS: Make key_serial() a function if CONFIG_KEYS=y " David Howells
2008-03-28 14:30 ` [PATCH 08/45] KEYS: Add keyctl function to get a security label " David Howells
2008-03-28 14:30 ` [PATCH 09/45] Security: Change current->fs[ug]id to current_fs[ug]id() " David Howells
2008-03-28 14:31 ` [PATCH 10/45] Security: Separate task security context from task_struct " David Howells
2008-03-28 14:31 ` [PATCH 11/45] Security: De-embed task security record from task and use refcounting " David Howells
2008-03-28 14:31 ` [PATCH 12/45] Security: Add a kernel_service object class to SELinux " David Howells
2008-03-28 14:31 ` [PATCH 13/45] Security: Allow kernel services to override LSM settings for task actions " David Howells
2008-03-28 14:31 ` [PATCH 14/45] Security: Make NFSD work with detached security " David Howells
2008-03-28 14:31 ` [PATCH 15/45] FS-Cache: Release page->private after failed readahead " David Howells
2008-03-28 14:31 ` [PATCH 16/45] FS-Cache: Recruit a couple of page flags for cache management " David Howells
2008-03-28 14:31 ` [PATCH 17/45] FS-Cache: Provide an add_wait_queue_tail() function " David Howells
2008-03-28 14:31 ` [PATCH 18/45] FS-Cache: Generic filesystem caching facility " David Howells
2008-03-28 14:31 ` [PATCH 19/45] Add missing consts to xattr function arguments " David Howells
2008-03-28 14:31 ` [PATCH 20/45] CacheFiles: Add missing copy_page export for ia64 " David Howells
2008-03-28 14:31 ` [PATCH 21/45] CacheFiles: Be consistent about the use of mapping vs file->f_mapping in Ext3 " David Howells
2008-03-28 14:32 ` David Howells [this message]
2008-03-28 14:32 ` [PATCH 23/45] CacheFiles: Permit the page lock state to be monitored " David Howells
2008-03-28 14:32 ` [PATCH 24/45] CacheFiles: Export things for CacheFiles " David Howells
2008-03-28 14:32 ` [PATCH 25/45] CacheFiles: A cache that backs onto a mounted filesystem " David Howells
2008-03-28 14:32 ` [PATCH 26/45] AFS: Add a MAINTAINERS record for AFS " David Howells
2008-03-28 14:32 ` [PATCH 27/45] AFS: prevent double cell registration " David Howells
2008-03-28 14:32 ` [PATCH 28/45] FS-Cache: Make kAFS use FS-Cache " David Howells
2008-03-28 14:32 ` [PATCH 29/45] NFS: Add comment banners to some NFS functions " David Howells
2008-03-28 14:32 ` [PATCH 30/45] NFS: Add FS-Cache option bit and debug bit " David Howells
2008-03-28 14:32 ` [PATCH 31/45] NFS: Permit local filesystem caching to be enabled for NFS " David Howells
2008-03-28 14:32 ` [PATCH 32/45] NFS: Register NFS for caching and retrieve the top-level index " David Howells
2008-03-28 14:33 ` [PATCH 33/45] NFS: Define and create server-level objects " David Howells
2008-03-28 14:33 ` [PATCH 34/45] NFS: Define and create superblock-level " David Howells
2008-03-28 14:33 ` [PATCH 35/45] NFS: Define and create inode-level cache " David Howells
2008-03-28 14:33 ` [PATCH 36/45] NFS: Use local disk inode cache " David Howells
2008-03-28 14:33 ` [PATCH 37/45] NFS: Invalidate FsCache page flags when cache removed " David Howells
2008-03-28 14:33 ` [PATCH 38/45] NFS: Add some new I/O counters for FS-Cache doing things for NFS " David Howells
2008-03-28 14:33 ` [PATCH 39/45] NFS: FS-Cache page management " David Howells
2008-03-28 14:33 ` [PATCH 40/45] NFS: Add read context retention for FS-Cache to call back with " David Howells
2008-03-28 14:33 ` [PATCH 41/45] NFS: nfs_readpage_async() needs to be accessible as a fallback for local caching " David Howells
2008-03-28 14:33 ` [PATCH 42/45] NFS: Read pages from FS-Cache into an NFS inode " David Howells
2008-03-28 14:33 ` [PATCH 43/45] NFS: Store pages from an NFS inode into a local cache " David Howells
2008-03-28 14:33 ` [PATCH 44/45] NFS: Display local caching state " David Howells
2008-03-28 14:34 ` [PATCH 45/45] NFS: Add mount options to enable local caching on NFS " David Howells

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20080328143203.3483.18861.stgit@warthog.procyon.org.uk \
    --to=dhowells@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=chuck.lever@oracle.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-security-module@vger.kernel.org \
    --cc=nfsv4@linux-nfs.org \
    --cc=selinux@tycho.nsa.gov \
    --cc=torvalds@osdl.org \
    --cc=trond.myklebust@fys.uio.no \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®