Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2424b5dd authored by Dan Williams's avatar Dan Williams Committed by Greg Kroah-Hartman
Browse files

sysfs: refill attribute buffer when reading from offset 0 



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: Neil Brown <neilb@suse.de>
Acked-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b844eba2

Documentation/filesystems/sysfs.txt

+7 −2
Original line number Original line Diff line number Diff line
@@ -176,8 +176,10 @@ implementations: 
  Recall that an attribute should only be exporting one value, or an

  Recall that an attribute should only be exporting one value, or an

  array of similar values, so this shouldn't be that expensive. 

  array of similar values, so this shouldn't be that expensive. 





  This allows userspace to do partial reads and seeks arbitrarily over

  This allows userspace to do partial reads and forward seeks

  the entire file at will. 

  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

- On write(2), sysfs expects the entire buffer to be passed during the

  first write. Sysfs then passes the entire buffer to the store()

  first write. Sysfs then passes the entire buffer to the store()
@@ -192,6 +194,9 @@ implementations: 




Other notes:

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

- The buffer will always be PAGE_SIZE bytes in length. On i386, this

  is 4096. 

  is 4096.

fs/sysfs/file.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ sysfs_read_file(struct file *file, char __user *buf, size_t count, loff_t *ppos) 
	ssize_t retval = 0;

	ssize_t retval = 0;





	mutex_lock(&buffer->mutex);

	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);

		retval = fill_read_buffer(file->f_path.dentry,buffer);

		if (retval)

		if (retval)

			goto out;

			goto out;
@@ -410,8 +410,7 @@ static int sysfs_release(struct inode *inode, struct file *filp) 
 * return POLLERR|POLLPRI, and select will return the fd whether

 * return POLLERR|POLLPRI, and select will return the fd whether

 * it is waiting for read, write, or exceptions.

 * it is waiting for read, write, or exceptions.

 * Once poll/select indicates that the value has changed, you

 * Once poll/select indicates that the value has changed, you

 * need to close and re-open the file, as simply seeking and reading

 * need to close and re-open the file, or seek to 0 and read again.

 * again will not get new data, or reset the state of 'poll'.

 * Reminder: this only works for attributes which actively support

 * Reminder: this only works for attributes which actively support

 * it, and it is not possible to test an attribute from userspace

 * it, and it is not possible to test an attribute from userspace

 * to see if it supports poll (Neither 'poll' nor 'select' return

 * to see if it supports poll (Neither 'poll' nor 'select' return