Add .ondemand_read() callback to netfs_cache_ops to implement on-demand read. The precondition for implementing on-demand read semantics is that, all blob files have been placed under corresponding directory with correct file size (sparse files) on the first beginning. When upper fs starts to access the blob file, it will "cache miss" (hit the hole). Then .ondemand_read() callback can be called to notify backend to prepare the data. The implementation of .ondemand_read() callback can be backend specific. The following patch will introduce the implementation for cachefiles, which will notify user daemon the requested file range to read. The .ondemand_read() callback will get blocked until the user daemon has prepared the corresponding data. Then once .ondemand_read() callback returns with 0, it is guaranteed that the requested data has been ready. In this case, users can retry to read from the backing file. Signed-off-by: Jeffle Xu <jefflexu@xxxxxxxxxxxxxxxxx> --- Documentation/filesystems/netfs_library.rst | 17 ++++++++++++++ include/linux/fscache.h | 25 +++++++++++++++++++++ include/linux/netfs.h | 4 ++++ 3 files changed, 46 insertions(+) diff --git a/Documentation/filesystems/netfs_library.rst b/Documentation/filesystems/netfs_library.rst index 4f373a8ec47b..075370d4c021 100644 --- a/Documentation/filesystems/netfs_library.rst +++ b/Documentation/filesystems/netfs_library.rst @@ -466,6 +466,8 @@ operation table looks like the following:: int (*query_occupancy)(struct netfs_cache_resources *cres, loff_t start, size_t len, size_t granularity, loff_t *_data_start, size_t *_data_len); + int (*ondemand_read)(struct netfs_cache_resources *cres, + loff_t start_pos, size_t len); }; With a termination handler function pointer:: @@ -552,6 +554,21 @@ The methods defined in the table are: It returns 0 if some data was found, -ENODATA if there was no usable data within the region or -ENOBUFS if there is no caching on this file. + * ``ondemand_read()`` + + [Optional] Called to prepare cache for the requested data. It shall be called + only when on-demand read semantics is required. It will be called when a cache + miss is encountered. The function will make the backend prepare the data + regarding to @start_pos/@len of the cache file. It may get blocked until the + backend finishes getting the requested data or returns errors. + + Once it returns with 0, it is guaranteed that the requested data has been + ready in the cache file. In this case, users can get the data with another + read request. + + It returns 0 if data has been ready in the cache file, or other error code + from the cache, such as -ENOMEM. + Note that these methods are passed a pointer to the cache resource structure, not the read request structure as they could be used in other situations where there isn't a read request structure as well, such as writing dirty data to the diff --git a/include/linux/fscache.h b/include/linux/fscache.h index d2430da8aa67..34af865ba928 100644 --- a/include/linux/fscache.h +++ b/include/linux/fscache.h @@ -514,6 +514,31 @@ int fscache_read(struct netfs_cache_resources *cres, term_func, term_func_priv); } +/** + * fscache_ondemand_read - Prepare cache for the requested data. + * @cres: The cache resources to use + * @start_pos: The beginning file offset in the cache file + * @len: The length of the file offset range in the cache file + * + * This shall only be called when a cache miss is encountered. It will make + * the backend prepare the data regarding to @start_pos/@len of the cache file. + * It may get blocked until the backend finishes getting the requested data or + * returns errors. + * + * Returns: + * * 0 - Success (Data is ready in the cache file) + * * Other error code from the cache, such as -ENOMEM. + */ +static inline +int fscache_ondemand_read(struct netfs_cache_resources *cres, + loff_t start_pos, size_t len) +{ + const struct netfs_cache_ops *ops = fscache_operation_valid(cres); + if (ops->ondemand_read) + return ops->ondemand_read(cres, start_pos, len); + return -EOPNOTSUPP; +} + /** * fscache_begin_write_operation - Begin a write operation for the netfs lib * @cres: The cache resources for the write being performed diff --git a/include/linux/netfs.h b/include/linux/netfs.h index 614f22213e21..3d5f0376a326 100644 --- a/include/linux/netfs.h +++ b/include/linux/netfs.h @@ -251,6 +251,10 @@ struct netfs_cache_ops { int (*query_occupancy)(struct netfs_cache_resources *cres, loff_t start, size_t len, size_t granularity, loff_t *_data_start, size_t *_data_len); + + /* Prepare cache for the requested data */ + int (*ondemand_read)(struct netfs_cache_resources *cres, + loff_t start_pos, size_t len); }; struct readahead_control; -- 2.27.0