Commit 6ae9bd8b authored by David Howells's avatar David Howells
Browse files

fscache, cachefiles: Remove the histogram stuff 



Remove the histogram stuff as it's mostly going to be outdated.

Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
Reviewed-by: default avatarJeff Layton <jlayton@redhat.com>
cc: linux-cachefs@redhat.com
Link: https://lore.kernel.org/r/162431195953.2908479.16770977195634296638.stgit@warthog.procyon.org.uk/
parent 884a7688

fs/cachefiles/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -19,22 +19,3 @@ config CACHEFILES_DEBUG 
	  caching on files module.  If this is set, the debugging output may be

	  enabled by setting bits in /sys/modules/cachefiles/parameter/debug or

	  by including a debugging specifier in /etc/cachefilesd.conf.
 


config CACHEFILES_HISTOGRAM

	bool "Gather latency information on CacheFiles"

	depends on CACHEFILES && PROC_FS

	help



	  This option causes latency information to be gathered on CacheFiles

	  operation and exported through file:



		/proc/fs/cachefiles/histogram



	  The generation of this histogram adds a certain amount of overhead to

	  execution as there are a number of points at which data is gathered,

	  and on a multi-CPU system these may be on cachelines that keep

	  bouncing between CPUs.  On the other hand, the histogram may be

	  useful for debugging purposes.  Saying 'N' here is recommended.



	  See Documentation/filesystems/caching/cachefiles.rst for more

	  information.

fs/cachefiles/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -15,6 +15,4 @@ cachefiles-y := \ 
	security.o \

	xattr.o



cachefiles-$(CONFIG_CACHEFILES_HISTOGRAM) += proc.o



obj-$(CONFIG_CACHEFILES) := cachefiles.o

fs/cachefiles/internal.h

+0 −25
Original line number Diff line number Diff line
@@ -180,31 +180,6 @@ extern int cachefiles_cull(struct cachefiles_cache *cache, struct dentry *dir, 
extern int cachefiles_check_in_use(struct cachefiles_cache *cache,

				   struct dentry *dir, char *filename);



/*

 * proc.c

 */

#ifdef CONFIG_CACHEFILES_HISTOGRAM

extern atomic_t cachefiles_lookup_histogram[HZ];

extern atomic_t cachefiles_mkdir_histogram[HZ];

extern atomic_t cachefiles_create_histogram[HZ];



extern int __init cachefiles_proc_init(void);

extern void cachefiles_proc_cleanup(void);

static inline

void cachefiles_hist(atomic_t histogram[], unsigned long start_jif)

{

	unsigned long jif = jiffies - start_jif;

	if (jif >= HZ)

		jif = HZ - 1;

	atomic_inc(&histogram[jif]);

}



#else

#define cachefiles_proc_init()		(0)

#define cachefiles_proc_cleanup()	do {} while (0)

#define cachefiles_hist(hist, start_jif) do {} while (0)

#endif



/*

 * rdwr.c

 */

fs/cachefiles/main.c

+0 −7
Original line number Diff line number Diff line
@@ -69,15 +69,9 @@ static int __init cachefiles_init(void) 
		goto error_object_jar;

	}



	ret = cachefiles_proc_init();

	if (ret < 0)

		goto error_proc;



	pr_info("Loaded\n");

	return 0;



error_proc:

	kmem_cache_destroy(cachefiles_object_jar);

error_object_jar:

	misc_deregister(&cachefiles_dev);

error_dev:
@@ -94,7 +88,6 @@ static void __exit cachefiles_exit(void) 
{

	pr_info("Unloading\n");



	cachefiles_proc_cleanup();

	kmem_cache_destroy(cachefiles_object_jar);

	misc_deregister(&cachefiles_dev);

}

fs/cachefiles/namei.c

+0 −13
Original line number Diff line number Diff line
@@ -496,7 +496,6 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, 
	struct dentry *dir, *next = NULL;

	struct inode *inode;

	struct path path;

	unsigned long start;

	const char *name;

	int ret, nlen;
@@ -535,9 +534,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, 


	inode_lock_nested(d_inode(dir), I_MUTEX_PARENT);



	start = jiffies;

	next = lookup_one_len(name, dir, nlen);

	cachefiles_hist(cachefiles_lookup_histogram, start);

	if (IS_ERR(next)) {

		trace_cachefiles_lookup(object, next, NULL);

		goto lookup_error;
@@ -568,9 +565,7 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, 
			ret = security_path_mkdir(&path, next, 0);

			if (ret < 0)

				goto create_error;

			start = jiffies;

			ret = vfs_mkdir(&init_user_ns, d_inode(dir), next, 0);

			cachefiles_hist(cachefiles_mkdir_histogram, start);

			if (!key)

				trace_cachefiles_mkdir(object, next, ret);

			if (ret < 0)
@@ -604,10 +599,8 @@ int cachefiles_walk_to_object(struct cachefiles_object *parent, 
			ret = security_path_mknod(&path, next, S_IFREG, 0);

			if (ret < 0)

				goto create_error;

			start = jiffies;

			ret = vfs_create(&init_user_ns, d_inode(dir), next,

					 S_IFREG, true);

			cachefiles_hist(cachefiles_create_histogram, start);

			trace_cachefiles_create(object, next, ret);

			if (ret < 0)

				goto create_error;
@@ -765,7 +758,6 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
					const char *dirname)

{

	struct dentry *subdir;

	unsigned long start;

	struct path path;

	int ret;
@@ -775,9 +767,7 @@ struct dentry *cachefiles_get_directory(struct cachefiles_cache *cache, 
	inode_lock(d_inode(dir));



retry:

	start = jiffies;

	subdir = lookup_one_len(dirname, dir, strlen(dirname));

	cachefiles_hist(cachefiles_lookup_histogram, start);

	if (IS_ERR(subdir)) {

		if (PTR_ERR(subdir) == -ENOMEM)

			goto nomem_d_alloc;
@@ -876,7 +866,6 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache, 
	struct cachefiles_object *object;

	struct rb_node *_n;

	struct dentry *victim;

	unsigned long start;

	int ret;



	//_enter(",%pd/,%s",
@@ -885,9 +874,7 @@ static struct dentry *cachefiles_check_active(struct cachefiles_cache *cache, 
	/* look up the victim */

	inode_lock_nested(d_inode(dir), I_MUTEX_PARENT);



	start = jiffies;

	victim = lookup_one_len(filename, dir, strlen(filename));

	cachefiles_hist(cachefiles_lookup_histogram, start);

	if (IS_ERR(victim))

		goto lookup_error;