The patch titled
sysfs: refill attribute buffer when reading from offset 0
has been added to the -mm tree. Its filename is
sysfs-refill-attribute-buffer-when-reading-from-offset-0.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: sysfs: refill attribute buffer when reading from offset 0
From: Dan Williams <dan.j.williams@xxxxxxxxx>
Requiring userspace to close and re-open sysfs attributes has been the policy
since before 2.6.12. It allows userspace to get a consistent snapshot of
kernel state and consume it with incremental reads and seeks.
Now, if the file position is zero the kernel assumes userspace wants to see
the new value. The application for this change is to allow a userspace RAID
metadata handler to check the state of an array without causing any memory
allocations. Thus not causing writeback to a raid array that might be blocked
waiting for userspace to take action.
Cc: NeilBrown <neilb@xxxxxxx>
Acked-by: Tejun Heo <htejun@xxxxxxxxx>
Signed-off-by: Dan Williams <dan.j.williams@xxxxxxxxx>
Cc: Greg KH <greg@xxxxxxxxx>
Cc: Kay Sievers <kay.sievers@xxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/sysfs.txt | 9 +++++++--
fs/sysfs/file.c | 5 ++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff -puN Documentation/filesystems/sysfs.txt~sysfs-refill-attribute-buffer-when-reading-from-offset-0 Documentation/filesystems/sysfs.txt
--- a/Documentation/filesystems/sysfs.txt~sysfs-refill-attribute-buffer-when-reading-from-offset-0
+++ a/Documentation/filesystems/sysfs.txt
@@ -176,8 +176,10 @@ implementations:
Recall that an attribute should only be exporting one value, or an
array of similar values, so this shouldn't be that expensive.
- This allows userspace to do partial reads and seeks arbitrarily over
- the entire file at will.
+ This allows userspace to do partial reads and forward seeks
+ arbitrarily over the entire file at will. If userspace seeks back to
+ zero or does a pread(2) with an offset of '0' the show() method will
+ be called again, rearmed, to fill the buffer.
- On write(2), sysfs expects the entire buffer to be passed during the
first write. Sysfs then passes the entire buffer to the store()
@@ -192,6 +194,9 @@ implementations:
Other notes:
+- Writing causes the show() method to be rearmed regardless of current
+ file position.
+
- The buffer will always be PAGE_SIZE bytes in length. On i386, this
is 4096.
diff -puN fs/sysfs/file.c~sysfs-refill-attribute-buffer-when-reading-from-offset-0 fs/sysfs/file.c
--- a/fs/sysfs/file.c~sysfs-refill-attribute-buffer-when-reading-from-offset-0
+++ a/fs/sysfs/file.c
@@ -137,7 +137,7 @@ sysfs_read_file(struct file *file, char
ssize_t retval = 0;
mutex_lock(&buffer->mutex);
- if (buffer->needs_read_fill) {
+ if (buffer->needs_read_fill || *ppos == 0) {
retval = fill_read_buffer(file->f_path.dentry,buffer);
if (retval)
goto out;
@@ -423,8 +423,7 @@ static int sysfs_release(struct inode *i
* return POLLERR|POLLPRI, and select will return the fd whether
* it is waiting for read, write, or exceptions.
* Once poll/select indicates that the value has changed, you
- * need to close and re-open the file, as simply seeking and reading
- * again will not get new data, or reset the state of 'poll'.
+ * need to close and re-open the file, or seek to 0 and read again.
* Reminder: this only works for attributes which actively support
* it, and it is not possible to test an attribute from userspace
* to see if it supports poll (Neither 'poll' nor 'select' return
_
Patches currently in -mm which might be from dan.j.williams@xxxxxxxxx are
origin.patch
git-arm.patch
git-async-tx.patch
fsldma-the-mpc8377mds-board-device-tree-node-for-fsldma-driver.patch
md-introduce-get_priority_stripe-to-improve-raid456-write-performance.patch
md-raid5c-convert-simple_strtoul-to-strict_strtoul.patch
sysfs-refill-attribute-buffer-when-reading-from-offset-0.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
