Commit 0fb34422 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'vfs-6.16-rc1.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs 

Pull netfs updates from Christian Brauner:

 - The main API document has been extensively updated/rewritten

 - Fix an oops in write-retry due to mis-resetting the I/O iterator

 - Fix the recording of transferred bytes for short DIO reads

 - Fix a request's work item to not require a reference, thereby
   avoiding the need to get rid of it in BH/IRQ context

 - Fix waiting and waking to be consistent about the waitqueue used

 - Remove NETFS_SREQ_SEEK_DATA_READ, NETFS_INVALID_WRITE,
   NETFS_ICTX_WRITETHROUGH, NETFS_READ_HOLE_CLEAR,
   NETFS_RREQ_DONT_UNLOCK_FOLIOS, and NETFS_RREQ_BLOCKED

 - Reorder structs to eliminate holes

 - Remove netfs_io_request::ractl

 - Only provide proc_link field if CONFIG_PROC_FS=y

 - Remove folio_queue::marks3

 - Fix undifferentiation of DIO reads from unbuffered reads

* tag 'vfs-6.16-rc1.netfs' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs:
  netfs: Fix undifferentiation of DIO reads from unbuffered reads
  netfs: Fix wait/wake to be consistent about the waitqueue used
  netfs: Fix the request's work item to not require a ref
  netfs: Fix setting of transferred bytes with short DIO reads
  netfs: Fix oops in write-retry from mis-resetting the subreq iterator
  fs/netfs: remove unused flag NETFS_RREQ_BLOCKED
  fs/netfs: remove unused flag NETFS_RREQ_DONT_UNLOCK_FOLIOS
  folio_queue: remove unused field `marks3`
  fs/netfs: declare field `proc_link` only if CONFIG_PROC_FS=y
  fs/netfs: remove `netfs_io_request.ractl`
  fs/netfs: reorder struct fields to eliminate holes
  fs/netfs: remove unused enum choice NETFS_READ_HOLE_CLEAR
  fs/netfs: remove unused flag NETFS_ICTX_WRITETHROUGH
  fs/netfs: remove unused source NETFS_INVALID_WRITE
  fs/netfs: remove unused flag NETFS_SREQ_SEEK_DATA_READ
parents fcd0bb8e db26d62d

Documentation/core-api/folio_queue.rst

+0 −3
Original line number Diff line number Diff line
@@ -151,19 +151,16 @@ The marks can be set by:: 


	void folioq_mark(struct folio_queue *folioq, unsigned int slot);

	void folioq_mark2(struct folio_queue *folioq, unsigned int slot);

	void folioq_mark3(struct folio_queue *folioq, unsigned int slot);



Cleared by::



	void folioq_unmark(struct folio_queue *folioq, unsigned int slot);

	void folioq_unmark2(struct folio_queue *folioq, unsigned int slot);

	void folioq_unmark3(struct folio_queue *folioq, unsigned int slot);



And the marks can be queried by::



	bool folioq_is_marked(const struct folio_queue *folioq, unsigned int slot);

	bool folioq_is_marked2(const struct folio_queue *folioq, unsigned int slot);

	bool folioq_is_marked3(const struct folio_queue *folioq, unsigned int slot);



The marks can be used for any purpose and are not interpreted by this API.

Documentation/filesystems/netfs_library.rst

+0 −5
Original line number Diff line number Diff line
@@ -712,11 +712,6 @@ handle falling back from one source type to another. The members are: 
     at a boundary with the filesystem structure (e.g. at the end of a Ceph

     object).  It tells netfslib not to retile subrequests across it.



   * ``NETFS_SREQ_SEEK_DATA_READ``



     This is a hint from netfslib to the cache that it might want to try

     skipping ahead to the next data (ie. using SEEK_DATA).



 * ``error``



   This is for the filesystem to store result of the subrequest.  It should be

fs/9p/vfs_addr.c

+3 −2
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ static void v9fs_issue_write(struct netfs_io_subrequest *subreq) 
	len = p9_client_write(fid, subreq->start, &subreq->io_iter, &err);

	if (len > 0)

		__set_bit(NETFS_SREQ_MADE_PROGRESS, &subreq->flags);

	netfs_write_subrequest_terminated(subreq, len ?: err, false);

	netfs_write_subrequest_terminated(subreq, len ?: err);

}



/**
@@ -77,7 +77,8 @@ static void v9fs_issue_read(struct netfs_io_subrequest *subreq) 


	/* if we just extended the file size, any portion not in

	 * cache won't be on server and is zeroes */

	if (subreq->rreq->origin != NETFS_DIO_READ)

	if (subreq->rreq->origin != NETFS_UNBUFFERED_READ &&

	    subreq->rreq->origin != NETFS_DIO_READ)

		__set_bit(NETFS_SREQ_CLEAR_TAIL, &subreq->flags);

	if (pos + total >= i_size_read(rreq->inode))

		__set_bit(NETFS_SREQ_HIT_EOF, &subreq->flags);

fs/afs/write.c

+5 −4
Original line number Diff line number Diff line
@@ -120,17 +120,17 @@ static void afs_issue_write_worker(struct work_struct *work) 


#if 0 // Error injection

	if (subreq->debug_index == 3)

		return netfs_write_subrequest_terminated(subreq, -ENOANO, false);

		return netfs_write_subrequest_terminated(subreq, -ENOANO);



	if (!subreq->retry_count) {

		set_bit(NETFS_SREQ_NEED_RETRY, &subreq->flags);

		return netfs_write_subrequest_terminated(subreq, -EAGAIN, false);

		return netfs_write_subrequest_terminated(subreq, -EAGAIN);

	}

#endif



	op = afs_alloc_operation(wreq->netfs_priv, vnode->volume);

	if (IS_ERR(op))

		return netfs_write_subrequest_terminated(subreq, -EAGAIN, false);

		return netfs_write_subrequest_terminated(subreq, -EAGAIN);



	afs_op_set_vnode(op, 0, vnode);

	op->file[0].dv_delta	= 1;
@@ -166,7 +166,7 @@ static void afs_issue_write_worker(struct work_struct *work) 
		break;

	}



	netfs_write_subrequest_terminated(subreq, ret < 0 ? ret : subreq->len, false);

	netfs_write_subrequest_terminated(subreq, ret < 0 ? ret : subreq->len);

}



void afs_issue_write(struct netfs_io_subrequest *subreq)
@@ -202,6 +202,7 @@ void afs_retry_request(struct netfs_io_request *wreq, struct netfs_io_stream *st 
	case NETFS_READ_GAPS:

	case NETFS_READ_SINGLE:

	case NETFS_READ_FOR_WRITE:

	case NETFS_UNBUFFERED_READ:

	case NETFS_DIO_READ:

		return;

	default:

fs/cachefiles/io.c

+8 −8
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static void cachefiles_read_complete(struct kiocb *iocb, long ret) 
				ret = -ESTALE;

		}



		ki->term_func(ki->term_func_priv, ret, ki->was_async);

		ki->term_func(ki->term_func_priv, ret);

	}



	cachefiles_put_kiocb(ki);
@@ -188,7 +188,7 @@ static int cachefiles_read(struct netfs_cache_resources *cres, 


presubmission_error:

	if (term_func)

		term_func(term_func_priv, ret < 0 ? ret : skipped, false);

		term_func(term_func_priv, ret < 0 ? ret : skipped);

	return ret;

}
@@ -271,7 +271,7 @@ static void cachefiles_write_complete(struct kiocb *iocb, long ret) 
	atomic_long_sub(ki->b_writing, &object->volume->cache->b_writing);

	set_bit(FSCACHE_COOKIE_HAVE_DATA, &object->cookie->flags);

	if (ki->term_func)

		ki->term_func(ki->term_func_priv, ret, ki->was_async);

		ki->term_func(ki->term_func_priv, ret);

	cachefiles_put_kiocb(ki);

}
@@ -301,7 +301,7 @@ int __cachefiles_write(struct cachefiles_object *object, 
	ki = kzalloc(sizeof(struct cachefiles_kiocb), GFP_KERNEL);

	if (!ki) {

		if (term_func)

			term_func(term_func_priv, -ENOMEM, false);

			term_func(term_func_priv, -ENOMEM);

		return -ENOMEM;

	}
@@ -366,7 +366,7 @@ static int cachefiles_write(struct netfs_cache_resources *cres, 
{

	if (!fscache_wait_for_operation(cres, FSCACHE_WANT_WRITE)) {

		if (term_func)

			term_func(term_func_priv, -ENOBUFS, false);

			term_func(term_func_priv, -ENOBUFS);

		trace_netfs_sreq(term_func_priv, netfs_sreq_trace_cache_nowrite);

		return -ENOBUFS;

	}
@@ -665,7 +665,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) 
		pre = CACHEFILES_DIO_BLOCK_SIZE - off;

		if (pre >= len) {

			fscache_count_dio_misfit();

			netfs_write_subrequest_terminated(subreq, len, false);

			netfs_write_subrequest_terminated(subreq, len);

			return;

		}

		subreq->transferred += pre;
@@ -691,7 +691,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) 
		len -= post;

		if (len == 0) {

			fscache_count_dio_misfit();

			netfs_write_subrequest_terminated(subreq, post, false);

			netfs_write_subrequest_terminated(subreq, post);

			return;

		}

		iov_iter_truncate(&subreq->io_iter, len);
@@ -703,7 +703,7 @@ static void cachefiles_issue_write(struct netfs_io_subrequest *subreq) 
					 &start, &len, len, true);

	cachefiles_end_secure(cache, saved_cred);

	if (ret < 0) {

		netfs_write_subrequest_terminated(subreq, ret, false);

		netfs_write_subrequest_terminated(subreq, ret);

		return;

	}