Commit 7fd350f6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fscache-fixes-20220121' of... 

Merge tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs

Pull more fscache updates from David Howells:
 "A set of fixes and minor updates for the fscache rewrite:

   - Fix mishandling of volume collisions (the wait condition is
     inverted and so it was only waiting if the volume collision was
     already resolved).

   - Fix miscalculation of whether there's space available in
     cachefiles.

   - Make sure a default cache name is set on a cache if the user hasn't
     set one by the time they bind the cache.

   - Adjust the way the backing inode is presented in tracepoints, add a
     tracepoint for mkdir and trace directory lookup.

   - Add a tracepoint for failure to set the active file mark.

   - Add an explanation of the checks made on the backing filesystem.

   - Check that the backing filesystem supports tmpfile.

   - Document how the page-release cancellation of the read-skip
     optimisation works.

  And I've included a change for netfslib:

   - Make ops->init_rreq() optional"

* tag 'fscache-fixes-20220121' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
  netfs: Make ops->init_rreq() optional
  fscache: Add a comment explaining how page-release optimisation works
  cachefiles: Check that the backing filesystem supports tmpfiles
  cachefiles: Explain checks in a comment
  cachefiles: Trace active-mark failure
  cachefiles: Make some tracepoint adjustments
  cachefiles: set default tag name if it's unspecified
  cachefiles: Calculate the blockshift in terms of bytes, not pages
  fscache: Fix the volume collision wait condition
parents b68b10b6 cef02231

fs/cachefiles/cache.c

+11 −6
Original line number Diff line number Diff line
@@ -49,11 +49,19 @@ int cachefiles_add_cache(struct cachefiles_cache *cache) 
		goto error_unsupported;

	}



	/* check parameters */

	/* Check features of the backing filesystem:

	 * - Directories must support looking up and directory creation

	 * - We create tmpfiles to handle invalidation

	 * - We use xattrs to store metadata

	 * - We need to be able to query the amount of space available

	 * - We want to be able to sync the filesystem when stopping the cache

	 * - We use DIO to/from pages, so the blocksize mustn't be too big.

	 */

	ret = -EOPNOTSUPP;

	if (d_is_negative(root) ||

	    !d_backing_inode(root)->i_op->lookup ||

	    !d_backing_inode(root)->i_op->mkdir ||

	    !d_backing_inode(root)->i_op->tmpfile ||

	    !(d_backing_inode(root)->i_opflags & IOP_XATTR) ||

	    !root->d_sb->s_op->statfs ||

	    !root->d_sb->s_op->sync_fs ||
@@ -84,9 +92,7 @@ int cachefiles_add_cache(struct cachefiles_cache *cache) 
		goto error_unsupported;



	cache->bsize = stats.f_bsize;

	cache->bshift = 0;

	if (stats.f_bsize < PAGE_SIZE)

		cache->bshift = PAGE_SHIFT - ilog2(stats.f_bsize);

	cache->bshift = ilog2(stats.f_bsize);



	_debug("blksize %u (shift %u)",

	       cache->bsize, cache->bshift);
@@ -106,7 +112,6 @@ int cachefiles_add_cache(struct cachefiles_cache *cache) 
	       (unsigned long long) cache->fcull,

	       (unsigned long long) cache->fstop);



	stats.f_blocks >>= cache->bshift;

	do_div(stats.f_blocks, 100);

	cache->bstop = stats.f_blocks * cache->bstop_percent;

	cache->bcull = stats.f_blocks * cache->bcull_percent;
@@ -209,7 +214,7 @@ int cachefiles_has_space(struct cachefiles_cache *cache, 
		return ret;

	}



	b_avail = stats.f_bavail >> cache->bshift;

	b_avail = stats.f_bavail;

	b_writing = atomic_long_read(&cache->b_writing);

	if (b_avail > b_writing)

		b_avail -= b_writing;

fs/cachefiles/daemon.c

+11 −0
Original line number Diff line number Diff line
@@ -703,6 +703,17 @@ static int cachefiles_daemon_bind(struct cachefiles_cache *cache, char *args) 
		return -EBUSY;

	}



	/* Make sure we have copies of the tag string */

	if (!cache->tag) {

		/*

		 * The tag string is released by the fops->release()

		 * function, so we don't release it on error here

		 */

		cache->tag = kstrdup("CacheFiles", GFP_KERNEL);

		if (!cache->tag)

			return -ENOMEM;

	}



	return cachefiles_add_cache(cache);

}

fs/cachefiles/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ struct cachefiles_cache { 
	unsigned			bcull_percent;	/* when to start culling (% blocks) */

	unsigned			bstop_percent;	/* when to stop allocating (% blocks) */

	unsigned			bsize;		/* cache's block size */

	unsigned			bshift;		/* min(ilog2(PAGE_SIZE / bsize), 0) */

	unsigned			bshift;		/* ilog2(bsize) */

	uint64_t			frun;		/* when to stop culling */

	uint64_t			fcull;		/* when to start culling */

	uint64_t			fstop;		/* when to stop allocating */

fs/cachefiles/io.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int cachefiles_write(struct netfs_cache_resources *cres, 
	ki->term_func		= term_func;

	ki->term_func_priv	= term_func_priv;

	ki->was_async		= true;

	ki->b_writing		= (len + (1 << cache->bshift)) >> cache->bshift;

	ki->b_writing		= (len + (1 << cache->bshift) - 1) >> cache->bshift;



	if (ki->term_func)

		ki->iocb.ki_complete = cachefiles_write_complete;

fs/cachefiles/namei.c

+8 −4
Original line number Diff line number Diff line
@@ -25,7 +25,9 @@ static bool __cachefiles_mark_inode_in_use(struct cachefiles_object *object, 
		trace_cachefiles_mark_active(object, inode);

		can_use = true;

	} else {

		pr_notice("cachefiles: Inode already in use: %pd\n", dentry);

		trace_cachefiles_mark_failed(object, inode);

		pr_notice("cachefiles: Inode already in use: %pd (B=%lx)\n",

			  dentry, inode->i_ino);

	}



	return can_use;
@@ -101,6 +103,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
		subdir = lookup_one_len(dirname, dir, strlen(dirname));

	else

		subdir = ERR_PTR(ret);

	trace_cachefiles_lookup(NULL, dir, subdir);

	if (IS_ERR(subdir)) {

		trace_cachefiles_vfs_error(NULL, d_backing_inode(dir),

					   PTR_ERR(subdir),
@@ -135,6 +138,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
						   cachefiles_trace_mkdir_error);

			goto mkdir_error;

		}

		trace_cachefiles_mkdir(dir, subdir);



		if (unlikely(d_unhashed(subdir))) {

			cachefiles_put_directory(subdir);
@@ -233,7 +237,7 @@ static int cachefiles_unlink(struct cachefiles_cache *cache, 
	};

	int ret;



	trace_cachefiles_unlink(object, dentry, why);

	trace_cachefiles_unlink(object, d_inode(dentry)->i_ino, why);

	ret = security_path_unlink(&path, dentry);

	if (ret < 0) {

		cachefiles_io_error(cache, "Unlink security error");
@@ -386,7 +390,7 @@ int cachefiles_bury_object(struct cachefiles_cache *cache, 
			.new_dir	= d_inode(cache->graveyard),

			.new_dentry	= grave,

		};

		trace_cachefiles_rename(object, rep, grave, why);

		trace_cachefiles_rename(object, d_inode(rep)->i_ino, why);

		ret = cachefiles_inject_read_error();

		if (ret == 0)

			ret = vfs_rename(&rd);
@@ -617,7 +621,7 @@ bool cachefiles_look_up_object(struct cachefiles_object *object) 
						  object->d_name_len);

	else

		dentry = ERR_PTR(ret);

	trace_cachefiles_lookup(object, dentry);

	trace_cachefiles_lookup(object, fan, dentry);

	if (IS_ERR(dentry)) {

		if (dentry == ERR_PTR(-ENOENT))

			goto new_file;