NFS: Add event tracing for generic NFS events (f4ce1299) · Commits · 戴 / test

fs/nfs/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -4,9 +4,10 @@

		obj-$(CONFIG_NFS_FS) += nfs.o

		CFLAGS_nfstrace.o += -I$(src)
		nfs-y := client.o dir.o file.o getroot.o inode.o super.o \
		direct.o pagelist.o read.o symlink.o unlink.o \
		write.o namespace.o mount_clnt.o
		write.o namespace.o mount_clnt.o nfstrace.o
		nfs-$(CONFIG_ROOT_NFS) += nfsroot.o
		nfs-$(CONFIG_SYSCTL) += sysctl.o
		nfs-$(CONFIG_NFS_FSCACHE) += fscache.o fscache-index.o

fs/nfs/dir.c

+11 −5

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@
		#include "internal.h"
		#include "fscache.h"

		#include "nfstrace.h"

		/* #define NFS_DEBUG_VERBOSE 1 */

		static int nfs_opendir(struct inode , struct file );
		@@ -2178,9 +2180,11 @@ static int nfs_do_access(struct inode inode, struct rpc_cred cred, int mask)
		struct nfs_access_entry cache;
		int status;

		trace_nfs_access_enter(inode);

		status = nfs_access_get_cached(inode, cred, &cache);
		if (status == 0)
		goto out;
		goto out_cached;

		/* Be clever: ask server to check for all possible rights */
		cache.mask = MAY_EXEC \| MAY_WRITE \| MAY_READ;
		@@ -2193,13 +2197,15 @@ static int nfs_do_access(struct inode inode, struct rpc_cred cred, int mask)
		if (!S_ISDIR(inode->i_mode))
		set_bit(NFS_INO_STALE, &NFS_I(inode)->flags);
		}
		return status;
		goto out;
		}
		nfs_access_add_cache(inode, &cache);
		out_cached:
		if ((mask & ~cache.mask & (MAY_READ \| MAY_WRITE \| MAY_EXEC)) != 0)
		status = -EACCES;
		out:
		if ((mask & ~cache.mask & (MAY_READ \| MAY_WRITE \| MAY_EXEC)) == 0)
		return 0;
		return -EACCES;
		trace_nfs_access_exit(inode, status);
		return status;
		}

		static int nfs_open_permission_mask(int openflags)

fs/nfs/file.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -37,6 +37,8 @@
		#include "iostat.h"
		#include "fscache.h"

		#include "nfstrace.h"

		#define NFSDBG_FACILITY NFSDBG_FILE

		static const struct vm_operations_struct nfs_file_vm_ops;
		@@ -294,6 +296,8 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
		int ret;
		struct inode *inode = file_inode(file);

		trace_nfs_fsync_enter(inode);

		do {
		ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
		if (ret != 0)
		@@ -310,6 +314,7 @@ nfs_file_fsync(struct file *file, loff_t start, loff_t end, int datasync)
		end = LLONG_MAX;
		} while (ret == -EAGAIN);

		trace_nfs_fsync_exit(inode, ret);
		return ret;
		}

fs/nfs/inode.c

+26 −3

Original line number	Diff line number	Diff line
		@@ -51,6 +51,8 @@
		#include "nfs.h"
		#include "netns.h"

		#include "nfstrace.h"

		#define NFSDBG_FACILITY NFSDBG_VFS

		#define NFS_64_BIT_INODE_NUMBERS_ENABLED 1
		@@ -503,6 +505,8 @@ nfs_setattr(struct dentry dentry, struct iattr attr)
		if ((attr->ia_valid & ~(ATTR_FILE\|ATTR_OPEN)) == 0)
		return 0;

		trace_nfs_setattr_enter(inode);

		/* Write all dirty data */
		if (S_ISREG(inode->i_mode)) {
		nfs_inode_dio_wait(inode);
		@@ -522,6 +526,7 @@ nfs_setattr(struct dentry dentry, struct iattr attr)
		error = nfs_refresh_inode(inode, fattr);
		nfs_free_fattr(fattr);
		out:
		trace_nfs_setattr_exit(inode, error);
		return error;
		}
		EXPORT_SYMBOL_GPL(nfs_setattr);
		@@ -591,6 +596,7 @@ int nfs_getattr(struct vfsmount mnt, struct dentry dentry, struct kstat *stat)
		int need_atime = NFS_I(inode)->cache_validity & NFS_INO_INVALID_ATIME;
		int err;

		trace_nfs_getattr_enter(inode);
		/* Flush out writes to the server in order to update c/mtime. */
		if (S_ISREG(inode->i_mode)) {
		nfs_inode_dio_wait(inode);
		@@ -621,6 +627,7 @@ int nfs_getattr(struct vfsmount mnt, struct dentry dentry, struct kstat *stat)
		stat->ino = nfs_compat_user_ino64(NFS_FILEID(inode));
		}
		out:
		trace_nfs_getattr_exit(inode, err);
		return err;
		}
		EXPORT_SYMBOL_GPL(nfs_getattr);
		@@ -875,6 +882,8 @@ __nfs_revalidate_inode(struct nfs_server server, struct inode inode)
		dfprintk(PAGECACHE, "NFS: revalidating (%s/%Ld)\n",
		inode->i_sb->s_id, (long long)NFS_FILEID(inode));

		trace_nfs_revalidate_inode_enter(inode);

		if (is_bad_inode(inode))
		goto out;
		if (NFS_STALE(inode))
		@@ -925,6 +934,7 @@ err_out:
		nfs4_label_free(label);
		out:
		nfs_free_fattr(fattr);
		trace_nfs_revalidate_inode_exit(inode, status);
		return status;
		}

		@@ -975,6 +985,7 @@ static int nfs_invalidate_mapping(struct inode inode, struct address_space map
		spin_unlock(&inode->i_lock);
		nfs_inc_stats(inode, NFSIOS_DATAINVALIDATE);
		nfs_fscache_wait_on_invalidate(inode);

		dfprintk(PAGECACHE, "NFS: (%s/%Ld) data cache invalidated\n",
		inode->i_sb->s_id, (long long)NFS_FILEID(inode));
		return 0;
		@@ -1008,8 +1019,12 @@ int nfs_revalidate_mapping(struct inode inode, struct address_space mapping)
		if (ret < 0)
		goto out;
		}
		if (nfsi->cache_validity & NFS_INO_INVALID_DATA)
		if (nfsi->cache_validity & NFS_INO_INVALID_DATA) {
		trace_nfs_invalidate_mapping_enter(inode);
		ret = nfs_invalidate_mapping(inode, mapping);
		trace_nfs_invalidate_mapping_exit(inode, ret);
		}

		out:
		return ret;
		}
		@@ -1268,9 +1283,17 @@ static int nfs_inode_attrs_need_update(const struct inode *inode, const struct n

		static int nfs_refresh_inode_locked(struct inode inode, struct nfs_fattr fattr)
		{
		int ret;

		trace_nfs_refresh_inode_enter(inode);

		if (nfs_inode_attrs_need_update(inode, fattr))
		return nfs_update_inode(inode, fattr);
		return nfs_check_inode_attributes(inode, fattr);
		ret = nfs_update_inode(inode, fattr);
		else
		ret = nfs_check_inode_attributes(inode, fattr);

		trace_nfs_refresh_inode_exit(inode, ret);
		return ret;
		}

		/**

fs/nfs/nfstrace.c

0 → 100644

+8 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2013 Trond Myklebust <Trond.Myklebust@netapp.com>
		*/
		#include <linux/nfs_fs.h>
		#include "internal.h"

		#define CREATE_TRACE_POINTS
		#include "nfstrace.h"

Admin message