@@ -12,6 +12,7 @@
#include "cache.h"
#include "xdr3.h"
#include "vfs.h"
+#include "trace.h"
#define NFSDDBG_FACILITY NFSDDBG_PROC
@@ -102,6 +103,8 @@ nfsd3_proc_lookup(struct svc_rqst *rqstp)
argp->name,
argp->len,
&resp->fh);
+ trace_nfsd_lookup(rqstp, &resp->dirfh, argp->name, argp->len,
+ &resp->fh, nfserr);
RETURN_STATUS(nfserr);
}
@@ -772,6 +772,7 @@ nfsd4_lookup(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
status = nfsd_lookup(rqstp, &cstate->current_fh,
u->lookup.lo_name, u->lookup.lo_len,
&cstate->current_fh);
+ trace_nfsd4_lookup(rqstp, u->lookup.lo_name, u->lookup.lo_len, status);
trace_nfsd4_fh_current(rqstp, &cstate->current_fh);
return status;
}
@@ -10,6 +10,7 @@
#include "cache.h"
#include "xdr.h"
#include "vfs.h"
+#include "trace.h"
typedef struct svc_rqst svc_rqst;
typedef struct svc_buf svc_buf;
@@ -137,6 +138,8 @@ nfsd_proc_lookup(struct svc_rqst *rqstp)
fh_init(&resp->fh, NFS_FHSIZE);
nfserr = nfsd_lookup(rqstp, &argp->fh, argp->name, argp->len,
&resp->fh);
+ trace_nfsd_lookup(rqstp, &argp->fh, argp->name, argp->len,
+ &resp->fh, nfserr);
fh_put(&argp->fh);
return nfsd_return_dirop(nfserr, resp);
@@ -76,6 +76,38 @@ TRACE_EVENT(nfsd_access,
)
);
+TRACE_EVENT(nfsd_lookup,
+ TP_PROTO(
+ const struct svc_rqst *rqstp,
+ const struct svc_fh *parent,
+ const char *name,
+ unsigned int namelen,
+ const struct svc_fh *result,
+ __be32 status
+ ),
+ TP_ARGS(rqstp, parent, name, namelen, result, status),
+ TP_STRUCT__entry(
+ __field(u32, xid)
+ __field(u32, parent)
+ __field(u32, result)
+ __field(unsigned long, status)
+ __dynamic_array(unsigned char, name, namelen + 1)
+ ),
+ TP_fast_assign(
+ __entry->xid = be32_to_cpu(rqstp->rq_xid);
+ __entry->parent = knfsd_fh_hash(&parent->fh_handle);
+ __entry->result = (status == nfs_ok) ?
+ knfsd_fh_hash(&result->fh_handle) : 0;
+ __entry->status = be32_to_cpu(status);
+ memcpy(__get_str(name), name, namelen);
+ __get_str(name)[namelen] = '\0';
+ ),
+ TP_printk("xid=0x%08x parent fh_hash=0x%08x name=%s result fh_hash=0x%08x status=%s",
+ __entry->xid, __entry->parent, __get_str(name),
+ __entry->result, show_nfs_status(__entry->status)
+ )
+);
+
TRACE_EVENT(nfsd_setattr_args,
TP_PROTO(
const struct svc_rqst *rqstp,
@@ -564,6 +596,31 @@ TRACE_EVENT(nfsd4_fh_current,
)
);
+TRACE_EVENT(nfsd4_lookup,
+ TP_PROTO(
+ const struct svc_rqst *rqstp,
+ const char *name,
+ unsigned int namelen,
+ __be32 status
+ ),
+ TP_ARGS(rqstp, name, namelen, status),
+ TP_STRUCT__entry(
+ __field(u32, xid)
+ __field(unsigned long, status)
+ __dynamic_array(unsigned char, name, namelen + 1)
+ ),
+ TP_fast_assign(
+ __entry->xid = be32_to_cpu(rqstp->rq_xid);
+ __entry->status = be32_to_cpu(status);
+ memcpy(__get_str(name), name, namelen);
+ __get_str(name)[namelen] = '\0';
+ ),
+ TP_printk("xid=0x%08x name=%s status=%s",
+ __entry->xid, __get_str(name),
+ show_nfs4_status(__entry->status)
+ )
+);
+
TRACE_EVENT(nfsd4_getattr,
TP_PROTO(
const struct svc_rqst *rqstp,
@@ -179,8 +179,6 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
struct dentry *dentry;
int host_err;
- dprintk("nfsd: nfsd_lookup(fh %s, %.*s)\n", SVCFH_fmt(fhp), len,name);
-
dparent = fhp->fh_dentry;
exp = exp_get(fhp->fh_export);
@@ -234,14 +232,23 @@ nfsd_lookup_dentry(struct svc_rqst *rqstp, struct svc_fh *fhp,
return nfserrno(host_err);
}
-/*
- * Look up one component of a pathname.
+/**
+ * nfsd_lookup - Look up one component of a pathname
+ * @rqstp: RPC Call being processed
+ * @fhp: file handle of parent directory
+ * @name: non-terminated C string of file name to look up
+ * @len: length of @name
+ * @resfh: on success, file handle of the looked-up object
+ *
* N.B. After this call _both_ fhp and resfh need an fh_put
+ * When callers pass the same memory for @fhp and @resfh,
+ * fh_compose() fh_put's @fhp before overwritting it.
*
* If the lookup would cross a mountpoint, and the mounted filesystem
* is exported to the client with NFSEXP_NOHIDE, then the lookup is
* accepted as it stands and the mounted directory is
* returned. Otherwise the covered directory is returned.
+ *
* NOTE: this mountpoint crossing is not supported properly by all
* clients and is explicitly disallowed for NFSv3
* NeilBrown <neilb@cse.unsw.edu.au>
Unfortunately, some callers pass the same memory as the input and result FH argument. This means we can't capture both and the status code with a single tracepoint. The status code is recorded by other existing tracepoints (for example in the SVC layer). Also note that RFC 5661 S. 18.13.3 explicitly states that: "if the object exists, the current filehandle is replaced with the component’s filehandle... " otherwise "... an error will be returned and the current filehandle will be unchanged." Given that nfsd4_lookup() passes &cstate->current_fh as both the input and output arguement, the current filehandle is set even in the error case. This is probably not behaviorally consequential because COMPOUND processing stops as soon as an operation fails, but it is not compliant with the spec language. NFSv2/3: nfsd-1035 [001] 1162.390149: nfsd_lookup: xid=0x8c2e5fd5 parent fh_hash=0xcf756a3e \ name=Makefile result fh_hash=0x00000000 status=NOENT NFSv4: nfsd-1035 [003] 72.687149: nfsd4_lookup: xid=0x8673fc16 name=Makefile status=ENOENT nfsd-1035 [003] 72.687150: nfsd4_fh_current: xid=0x8673fc16 fh_hash=0x5f73bc5d name=Makefile nfsd-1035 [003] 72.687151: nfsd4_compoundstatus: xid=0x8673fc16 op=3/5 OP_LOOKUP status=ENOENT Signed-off-by: Chuck Lever <chuck.lever@oracle.com> --- fs/nfsd/nfs3proc.c | 3 +++ fs/nfsd/nfs4proc.c | 1 + fs/nfsd/nfsproc.c | 3 +++ fs/nfsd/trace.h | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ fs/nfsd/vfs.c | 15 ++++++++++---- 5 files changed, 75 insertions(+), 4 deletions(-)