Unverified Commit 49866ce7 authored by David Howells's avatar David Howells Committed by Christian Brauner
Browse files

netfs: Add support for caching single monolithic objects such as AFS dirs 



Add support for caching the content of a file that contains a single
monolithic object that must be read/written with a single I/O operation,
such as an AFS directory.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Link: https://lore.kernel.org/r/20241216204124.3752367-20-dhowells@redhat.com


cc: Jeff Layton <jlayton@kernel.org>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: netfs@lists.linux.dev
cc: linux-afs@lists.infradead.org
cc: linux-fsdevel@vger.kernel.org
Signed-off-by: default avatarChristian Brauner <brauner@kernel.org>
parent e61bfaad

fs/netfs/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ netfs-y := \ 
	read_collect.o \

	read_pgpriv2.o \

	read_retry.o \

	read_single.o \

	rolling_buffer.o \

	write_collect.o \

	write_issue.o \

fs/netfs/buffered_read.c

+8 −3
Original line number Diff line number Diff line
@@ -137,14 +137,17 @@ static enum netfs_io_source netfs_cache_prepare_read(struct netfs_io_request *rr 
						     loff_t i_size)

{

	struct netfs_cache_resources *cres = &rreq->cache_resources;

	enum netfs_io_source source;



	if (!cres->ops)

		return NETFS_DOWNLOAD_FROM_SERVER;

	return cres->ops->prepare_read(subreq, i_size);

	source = cres->ops->prepare_read(subreq, i_size);

	trace_netfs_sreq(subreq, netfs_sreq_trace_prepare);

	return source;



}



static void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error,

					bool was_async)

void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error, bool was_async)

{

	struct netfs_io_subrequest *subreq = priv;
@@ -213,6 +216,8 @@ static void netfs_read_to_pagecache(struct netfs_io_request *rreq) 
			unsigned long long zp = umin(ictx->zero_point, rreq->i_size);

			size_t len = subreq->len;



			if (unlikely(rreq->origin == NETFS_READ_SINGLE))

				zp = rreq->i_size;

			if (subreq->start >= zp) {

				subreq->source = source = NETFS_FILL_WITH_ZEROES;

				goto fill_with_zeroes;

fs/netfs/internal.h

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
/*

 * buffered_read.c

 */

void netfs_cache_read_terminated(void *priv, ssize_t transferred_or_error, bool was_async);

int netfs_prefetch_for_write(struct file *file, struct folio *folio,

			     size_t offset, size_t len);
@@ -110,6 +111,7 @@ void netfs_unlock_abandoned_read_pages(struct netfs_io_request *rreq); 
extern atomic_t netfs_n_rh_dio_read;

extern atomic_t netfs_n_rh_readahead;

extern atomic_t netfs_n_rh_read_folio;

extern atomic_t netfs_n_rh_read_single;

extern atomic_t netfs_n_rh_rreq;

extern atomic_t netfs_n_rh_sreq;

extern atomic_t netfs_n_rh_download;

fs/netfs/main.c

+2 −0
Original line number Diff line number Diff line
@@ -37,9 +37,11 @@ static const char *netfs_origins[nr__netfs_io_origin] = { 
	[NETFS_READAHEAD]		= "RA",

	[NETFS_READPAGE]		= "RP",

	[NETFS_READ_GAPS]		= "RG",

	[NETFS_READ_SINGLE]		= "R1",

	[NETFS_READ_FOR_WRITE]		= "RW",

	[NETFS_DIO_READ]		= "DR",

	[NETFS_WRITEBACK]		= "WB",

	[NETFS_WRITEBACK_SINGLE]	= "W1",

	[NETFS_WRITETHROUGH]		= "WT",

	[NETFS_UNBUFFERED_WRITE]	= "UW",

	[NETFS_DIO_WRITE]		= "DW",

fs/netfs/objects.c

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ struct netfs_io_request *netfs_alloc_request(struct address_space *mapping, 
	if (origin == NETFS_READAHEAD ||

	    origin == NETFS_READPAGE ||

	    origin == NETFS_READ_GAPS ||

	    origin == NETFS_READ_SINGLE ||

	    origin == NETFS_READ_FOR_WRITE ||

	    origin == NETFS_DIO_READ)

		INIT_WORK(&rreq->work, NULL);
@@ -196,6 +197,7 @@ struct netfs_io_subrequest *netfs_alloc_subrequest(struct netfs_io_request *rreq 
	case NETFS_READAHEAD:

	case NETFS_READPAGE:

	case NETFS_READ_GAPS:

	case NETFS_READ_SINGLE:

	case NETFS_READ_FOR_WRITE:

	case NETFS_DIO_READ:

		INIT_WORK(&subreq->work, netfs_read_subreq_termination_worker);