@@ -26,3 +26,11 @@ config CACHEFILES_ERROR_INJECTION
help
This permits error injection to be enabled in cachefiles whilst a
cache is in service.
+
+config CACHEFILES_ONDEMAND
+ bool "Support for on-demand reading"
+ depends on CACHEFILES && FSCACHE_ONDEMAND
+ default n
+ help
+ This permits on-demand read mode of cachefiles.
+ If unsure, say N.
@@ -98,6 +98,7 @@ struct cachefiles_cache {
#define CACHEFILES_DEAD 1 /* T if cache dead */
#define CACHEFILES_CULLING 2 /* T if cull engaged */
#define CACHEFILES_STATE_CHANGED 3 /* T if state changed (poll trigger) */
+#define CACHEFILES_ONDEMAND_MODE 4 /* T if in on-demand read mode */
char *rootdirname; /* name of cache root directory */
char *secctx; /* LSM security context */
char *tag; /* cache binding tag */
@@ -506,15 +506,69 @@ struct file *cachefiles_create_tmpfile(struct cachefiles_object *object)
return file;
}
+#ifdef CONFIG_CACHEFILES_ONDEMAND
+static inline bool cachefiles_can_create_file(struct cachefiles_cache *cache)
+{
+ /*
+ * On-demand read mode requires that backing files have been prepared
+ * with correct file size under corresponding directory. We can get here
+ * when the backing file doesn't exist under corresponding directory, or
+ * the file size is unexpected 0.
+ */
+ return !test_bit(CACHEFILES_ONDEMAND_MODE, &cache->flags);
+
+}
+
+/*
+ * Fs using fscache for on-demand reading may have no idea of the file size of
+ * backing files. Thus the on-demand read mode requires that backing files have
+ * been prepared with correct file size under corresponding directory. Then
+ * fscache backend is responsible for taking the file size of the backing file
+ * as the object size.
+ */
+static int cachefiles_recheck_size(struct cachefiles_object *object,
+ struct file *file)
+{
+ loff_t size;
+ struct cachefiles_cache *cache = object->volume->cache;
+
+ if (!test_bit(CACHEFILES_ONDEMAND_MODE, &cache->flags))
+ return 0;
+
+ size = i_size_read(file_inode(file));
+ if (!size)
+ return -EINVAL;
+
+ object->cookie->object_size = size;
+ return 0;
+}
+#else
+static inline bool cachefiles_can_create_file(struct cachefiles_cache *cache)
+{
+ return true;
+}
+
+static int cachefiles_recheck_size(struct cachefiles_object *object,
+ struct file *file)
+{
+ return 0;
+}
+#endif
+
+
/*
* Create a new file.
*/
static bool cachefiles_create_file(struct cachefiles_object *object)
{
+ struct cachefiles_cache *cache = object->volume->cache;
struct file *file;
int ret;
- ret = cachefiles_has_space(object->volume->cache, 1, 0,
+ if (!cachefiles_can_create_file(cache))
+ return false;
+
+ ret = cachefiles_has_space(cache, 1, 0,
cachefiles_has_space_for_create);
if (ret < 0)
return false;
@@ -569,6 +623,10 @@ static bool cachefiles_open_file(struct cachefiles_object *object,
}
_debug("file -> %pd positive", dentry);
+ ret = cachefiles_recheck_size(object, file);
+ if (ret < 0)
+ goto check_failed;
+
ret = cachefiles_check_auxdata(object, file);
if (ret < 0)
goto check_failed;
fscache/cachefiles used to serve as a local cache for remote fs. The following patches will introduce a new use case, in which local read-only fs could implement on-demand reading with fscache. Then in this case, the upper read-only fs may has no idea on the size of the backed file. Besides it is worth nothing that, in this scenario, user daemon is responsible for preparing all backing files with correct file size (backing files are all sparse files in this case). And since it's read-only, we can trust the backing file size as the backed file size. With this precondition, cachefiles can detect the actual size of the backing file, and set it as the size of the backed file. This patch also adds one flag bit to distinguish the new introduced on-demand read mode from the original mode. The following patch will make it configurable by users. Signed-off-by: Jeffle Xu <jefflexu@linux.alibaba.com> --- fs/cachefiles/Kconfig | 8 ++++++ fs/cachefiles/internal.h | 1 + fs/cachefiles/namei.c | 60 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-)