Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 347543e6 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-for-5.3-1' of git://git.linux-nfs.org/projects/anna/linux-nfs 

NFSoRDMA client updates for 5.3

New features:
- Add a way to place MRs back on the free list
- Reduce context switching
- Add new trace events

Bugfixes and cleanups:
- Fix a BUG when tracing is enabled with NFSv4.1
- Fix a use-after-free in rpcrdma_post_recvs
- Replace use of xdr_stream_pos in rpcrdma_marshal_req
- Fix occasional transport deadlock
- Fix show_nfs_errors macros, other tracing improvements
- Remove RPCRDMA_REQ_F_PENDING and fr_state
- Various simplifications and refactors
parents 80d3c45f 62a92ba9

fs/nfs/callback_proc.c

+20 −8
Original line number Diff line number Diff line
@@ -414,27 +414,39 @@ static __be32 
validate_seqid(const struct nfs4_slot_table *tbl, const struct nfs4_slot *slot,

		const struct cb_sequenceargs * args)

{

	__be32 ret;



	ret = cpu_to_be32(NFS4ERR_BADSLOT);

	if (args->csa_slotid > tbl->server_highest_slotid)

		return htonl(NFS4ERR_BADSLOT);

		goto out_err;



	/* Replay */

	if (args->csa_sequenceid == slot->seq_nr) {

		ret = cpu_to_be32(NFS4ERR_DELAY);

		if (nfs4_test_locked_slot(tbl, slot->slot_nr))

			return htonl(NFS4ERR_DELAY);

			goto out_err;



		/* Signal process_op to set this error on next op */

		ret = cpu_to_be32(NFS4ERR_RETRY_UNCACHED_REP);

		if (args->csa_cachethis == 0)

			return htonl(NFS4ERR_RETRY_UNCACHED_REP);

			goto out_err;



		/* Liar! We never allowed you to set csa_cachethis != 0 */

		return htonl(NFS4ERR_SEQ_FALSE_RETRY);

		ret = cpu_to_be32(NFS4ERR_SEQ_FALSE_RETRY);

		goto out_err;

	}



	/* Note: wraparound relies on seq_nr being of type u32 */

	if (likely(args->csa_sequenceid == slot->seq_nr + 1))

		return htonl(NFS4_OK);



	/* Misordered request */

	return htonl(NFS4ERR_SEQ_MISORDERED);

	ret = cpu_to_be32(NFS4ERR_SEQ_MISORDERED);

	if (args->csa_sequenceid != slot->seq_nr + 1)

		goto out_err;



	return cpu_to_be32(NFS4_OK);



out_err:

	trace_nfs4_cb_seqid_err(args, ret);

	return ret;

}



/*

fs/nfs/nfs2xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static int decode_stat(struct xdr_stream *xdr, enum nfs_stat *status) 
	return 0;

out_status:

	*status = be32_to_cpup(p);

	trace_nfs_xdr_status((int)*status);

	trace_nfs_xdr_status(xdr, (int)*status);

	return 0;

}

fs/nfs/nfs3xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int decode_nfsstat3(struct xdr_stream *xdr, enum nfs_stat *status) 
	return 0;

out_status:

	*status = be32_to_cpup(p);

	trace_nfs_xdr_status((int)*status);

	trace_nfs_xdr_status(xdr, (int)*status);

	return 0;

}

fs/nfs/nfs4trace.h

+128 −79
Original line number Diff line number Diff line
@@ -156,7 +156,7 @@ TRACE_DEFINE_ENUM(NFS4ERR_WRONG_TYPE); 
TRACE_DEFINE_ENUM(NFS4ERR_XDEV);



#define show_nfsv4_errors(error) \

	__print_symbolic(-(error), \

	__print_symbolic(error, \

		{ NFS4_OK, "OK" }, \

		/* Mapped by nfs4_stat_to_errno() */ \

		{ EPERM, "EPERM" }, \
@@ -348,7 +348,7 @@ DECLARE_EVENT_CLASS(nfs4_clientid_event, 


		TP_STRUCT__entry(

			__string(dstaddr, clp->cl_hostname)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(
@@ -357,8 +357,8 @@ DECLARE_EVENT_CLASS(nfs4_clientid_event, 
		),



		TP_printk(

			"error=%d (%s) dstaddr=%s",

			__entry->error,

			"error=%ld (%s) dstaddr=%s",

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			__get_str(dstaddr)

		)
@@ -420,7 +420,7 @@ TRACE_EVENT(nfs4_sequence_done, 
			__field(unsigned int, highest_slotid)

			__field(unsigned int, target_highest_slotid)

			__field(unsigned int, status_flags)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(
@@ -435,10 +435,10 @@ TRACE_EVENT(nfs4_sequence_done, 
			__entry->error = res->sr_status;

		),

		TP_printk(

			"error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u "

			"error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "

			"highest_slotid=%u target_highest_slotid=%u "

			"status_flags=%u (%s)",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			__entry->session,

			__entry->slot_nr,
@@ -467,7 +467,7 @@ TRACE_EVENT(nfs4_cb_sequence, 
			__field(unsigned int, seq_nr)

			__field(unsigned int, highest_slotid)

			__field(unsigned int, cachethis)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(
@@ -476,13 +476,13 @@ TRACE_EVENT(nfs4_cb_sequence, 
			__entry->seq_nr = args->csa_sequenceid;

			__entry->highest_slotid = args->csa_highestslotid;

			__entry->cachethis = args->csa_cachethis;

			__entry->error = -be32_to_cpu(status);

			__entry->error = be32_to_cpu(status);

		),



		TP_printk(

			"error=%d (%s) session=0x%08x slot_nr=%u seq_nr=%u "

			"error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "

			"highest_slotid=%u",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			__entry->session,

			__entry->slot_nr,
@@ -490,6 +490,44 @@ TRACE_EVENT(nfs4_cb_sequence, 
			__entry->highest_slotid

		)

);



TRACE_EVENT(nfs4_cb_seqid_err,

		TP_PROTO(

			const struct cb_sequenceargs *args,

			__be32 status

		),

		TP_ARGS(args, status),



		TP_STRUCT__entry(

			__field(unsigned int, session)

			__field(unsigned int, slot_nr)

			__field(unsigned int, seq_nr)

			__field(unsigned int, highest_slotid)

			__field(unsigned int, cachethis)

			__field(unsigned long, error)

		),



		TP_fast_assign(

			__entry->session = nfs_session_id_hash(&args->csa_sessionid);

			__entry->slot_nr = args->csa_slotid;

			__entry->seq_nr = args->csa_sequenceid;

			__entry->highest_slotid = args->csa_highestslotid;

			__entry->cachethis = args->csa_cachethis;

			__entry->error = be32_to_cpu(status);

		),



		TP_printk(

			"error=%ld (%s) session=0x%08x slot_nr=%u seq_nr=%u "

			"highest_slotid=%u",

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			__entry->session,

			__entry->slot_nr,

			__entry->seq_nr,

			__entry->highest_slotid

		)

);



#endif /* CONFIG_NFS_V4_1 */



TRACE_EVENT(nfs4_setup_sequence,
@@ -526,26 +564,37 @@ TRACE_EVENT(nfs4_setup_sequence, 


TRACE_EVENT(nfs4_xdr_status,

		TP_PROTO(

			const struct xdr_stream *xdr,

			u32 op,

			int error

		),



		TP_ARGS(op, error),

		TP_ARGS(xdr, op, error),



		TP_STRUCT__entry(

			__field(unsigned int, task_id)

			__field(unsigned int, client_id)

			__field(u32, xid)

			__field(u32, op)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(

			const struct rpc_rqst *rqstp = xdr->rqst;

			const struct rpc_task *task = rqstp->rq_task;



			__entry->task_id = task->tk_pid;

			__entry->client_id = task->tk_client->cl_clid;

			__entry->xid = be32_to_cpu(rqstp->rq_xid);

			__entry->op = op;

			__entry->error = -error;

			__entry->error = error;

		),



		TP_printk(

			"operation %d: nfs status %d (%s)",

			__entry->op,

			__entry->error, show_nfsv4_errors(__entry->error)

			"task:%u@%d xid=0x%08x error=%ld (%s) operation=%u",

			__entry->task_id, __entry->client_id, __entry->xid,

			-__entry->error, show_nfsv4_errors(__entry->error),

			__entry->op

		)

);
@@ -559,7 +608,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event, 
		TP_ARGS(ctx, flags, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(unsigned int, flags)

			__field(unsigned int, fmode)

			__field(dev_t, dev)
@@ -577,7 +626,7 @@ DECLARE_EVENT_CLASS(nfs4_open_event, 
			const struct nfs4_state *state = ctx->state;

			const struct inode *inode = NULL;



			__entry->error = error;

			__entry->error = -error;

			__entry->flags = flags;

			__entry->fmode = (__force unsigned int)ctx->mode;

			__entry->dev = ctx->dentry->d_sb->s_dev;
@@ -609,11 +658,11 @@ DECLARE_EVENT_CLASS(nfs4_open_event, 
		),



		TP_printk(

			"error=%d (%s) flags=%d (%s) fmode=%s "

			"error=%ld (%s) flags=%d (%s) fmode=%s "

			"fileid=%02x:%02x:%llu fhandle=0x%08x "

			"name=%02x:%02x:%llu/%s stateid=%d:0x%08x "

			"openstateid=%d:0x%08x",

			 __entry->error,

			 -__entry->error,

			 show_nfsv4_errors(__entry->error),

			 __entry->flags,

			 show_open_flags(__entry->flags),
@@ -695,7 +744,7 @@ TRACE_EVENT(nfs4_close, 
			__field(u32, fhandle)

			__field(u64, fileid)

			__field(unsigned int, fmode)

			__field(int, error)

			__field(unsigned long, error)

			__field(int, stateid_seq)

			__field(u32, stateid_hash)

		),
@@ -715,9 +764,9 @@ TRACE_EVENT(nfs4_close, 
		),



		TP_printk(

			"error=%d (%s) fmode=%s fileid=%02x:%02x:%llu "

			"error=%ld (%s) fmode=%s fileid=%02x:%02x:%llu "

			"fhandle=0x%08x openstateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			__entry->fmode ?  show_fmode_flags(__entry->fmode) :

					  "closed",
@@ -757,7 +806,7 @@ DECLARE_EVENT_CLASS(nfs4_lock_event, 
		TP_ARGS(request, state, cmd, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(int, cmd)

			__field(char, type)

			__field(loff_t, start)
@@ -787,10 +836,10 @@ DECLARE_EVENT_CLASS(nfs4_lock_event, 
		),



		TP_printk(

			"error=%d (%s) cmd=%s:%s range=%lld:%lld "

			"error=%ld (%s) cmd=%s:%s range=%lld:%lld "

			"fileid=%02x:%02x:%llu fhandle=0x%08x "

			"stateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			show_lock_cmd(__entry->cmd),

			show_lock_type(__entry->type),
@@ -827,7 +876,7 @@ TRACE_EVENT(nfs4_set_lock, 
		TP_ARGS(request, state, lockstateid, cmd, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(int, cmd)

			__field(char, type)

			__field(loff_t, start)
@@ -863,10 +912,10 @@ TRACE_EVENT(nfs4_set_lock, 
		),



		TP_printk(

			"error=%d (%s) cmd=%s:%s range=%lld:%lld "

			"error=%ld (%s) cmd=%s:%s range=%lld:%lld "

			"fileid=%02x:%02x:%llu fhandle=0x%08x "

			"stateid=%d:0x%08x lockstateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			show_lock_cmd(__entry->cmd),

			show_lock_type(__entry->type),
@@ -932,7 +981,7 @@ TRACE_EVENT(nfs4_delegreturn_exit, 
		TP_STRUCT__entry(

			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(int, error)

			__field(unsigned long, error)

			__field(int, stateid_seq)

			__field(u32, stateid_hash)

		),
@@ -948,9 +997,9 @@ TRACE_EVENT(nfs4_delegreturn_exit, 
		),



		TP_printk(

			"error=%d (%s) dev=%02x:%02x fhandle=0x%08x "

			"error=%ld (%s) dev=%02x:%02x fhandle=0x%08x "

			"stateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			__entry->fhandle,
@@ -969,7 +1018,7 @@ DECLARE_EVENT_CLASS(nfs4_test_stateid_event, 
		TP_ARGS(state, lsp, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)
@@ -991,9 +1040,9 @@ DECLARE_EVENT_CLASS(nfs4_test_stateid_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"stateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1026,7 +1075,7 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event, 


		TP_STRUCT__entry(

			__field(dev_t, dev)

			__field(int, error)

			__field(unsigned long, error)

			__field(u64, dir)

			__string(name, name->name)

		),
@@ -1034,13 +1083,13 @@ DECLARE_EVENT_CLASS(nfs4_lookup_event, 
		TP_fast_assign(

			__entry->dev = dir->i_sb->s_dev;

			__entry->dir = NFS_FILEID(dir);

			__entry->error = error;

			__entry->error = -error;

			__assign_str(name, name->name);

		),



		TP_printk(

			"error=%d (%s) name=%02x:%02x:%llu/%s",

			__entry->error,

			"error=%ld (%s) name=%02x:%02x:%llu/%s",

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->dir,
@@ -1076,7 +1125,7 @@ TRACE_EVENT(nfs4_lookupp, 
		TP_STRUCT__entry(

			__field(dev_t, dev)

			__field(u64, ino)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(
@@ -1086,8 +1135,8 @@ TRACE_EVENT(nfs4_lookupp, 
		),



		TP_printk(

			"error=%d (%s) inode=%02x:%02x:%llu",

			__entry->error,

			"error=%ld (%s) inode=%02x:%02x:%llu",

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->ino
@@ -1107,7 +1156,7 @@ TRACE_EVENT(nfs4_rename, 


		TP_STRUCT__entry(

			__field(dev_t, dev)

			__field(int, error)

			__field(unsigned long, error)

			__field(u64, olddir)

			__string(oldname, oldname->name)

			__field(u64, newdir)
@@ -1124,9 +1173,9 @@ TRACE_EVENT(nfs4_rename, 
		),



		TP_printk(

			"error=%d (%s) oldname=%02x:%02x:%llu/%s "

			"error=%ld (%s) oldname=%02x:%02x:%llu/%s "

			"newname=%02x:%02x:%llu/%s",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->olddir,
@@ -1149,19 +1198,19 @@ DECLARE_EVENT_CLASS(nfs4_inode_event, 
			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(

			__entry->dev = inode->i_sb->s_dev;

			__entry->fileid = NFS_FILEID(inode);

			__entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));

			__entry->error = error;

			__entry->error = error < 0 ? -error : 0;

		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x",

			__entry->error,

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x",

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1200,7 +1249,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event, 
			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)

			__field(int, error)

			__field(unsigned long, error)

			__field(int, stateid_seq)

			__field(u32, stateid_hash)

		),
@@ -1217,9 +1266,9 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"stateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1257,7 +1306,7 @@ DECLARE_EVENT_CLASS(nfs4_getattr_event, 
			__field(u32, fhandle)

			__field(u64, fileid)

			__field(unsigned int, valid)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(
@@ -1269,9 +1318,9 @@ DECLARE_EVENT_CLASS(nfs4_getattr_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"valid=%s",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1304,7 +1353,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event, 
		TP_ARGS(clp, fhandle, inode, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)
@@ -1325,9 +1374,9 @@ DECLARE_EVENT_CLASS(nfs4_inode_callback_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"dstaddr=%s",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1359,7 +1408,7 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event, 
		TP_ARGS(clp, fhandle, inode, stateid, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(dev_t, dev)

			__field(u32, fhandle)

			__field(u64, fileid)
@@ -1386,9 +1435,9 @@ DECLARE_EVENT_CLASS(nfs4_inode_stateid_callback_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"stateid=%d:0x%08x dstaddr=%s",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1422,7 +1471,7 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event, 
		TP_ARGS(name, len, id, error),



		TP_STRUCT__entry(

			__field(int, error)

			__field(unsigned long, error)

			__field(u32, id)

			__dynamic_array(char, name, len > 0 ? len + 1 : 1)

		),
@@ -1437,8 +1486,8 @@ DECLARE_EVENT_CLASS(nfs4_idmap_event, 
		),



		TP_printk(

			"error=%d id=%u name=%s",

			__entry->error,

			"error=%ld (%s) id=%u name=%s",

			-__entry->error, show_nfsv4_errors(__entry->error),

			__entry->id,

			__get_str(name)

		)
@@ -1471,7 +1520,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event, 
			__field(u64, fileid)

			__field(loff_t, offset)

			__field(size_t, count)

			__field(int, error)

			__field(unsigned long, error)

			__field(int, stateid_seq)

			__field(u32, stateid_hash)

		),
@@ -1485,7 +1534,7 @@ DECLARE_EVENT_CLASS(nfs4_read_event, 
			__entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));

			__entry->offset = hdr->args.offset;

			__entry->count = hdr->args.count;

			__entry->error = error;

			__entry->error = error < 0 ? -error : 0;

			__entry->stateid_seq =

				be32_to_cpu(state->stateid.seqid);

			__entry->stateid_hash =
@@ -1493,9 +1542,9 @@ DECLARE_EVENT_CLASS(nfs4_read_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"offset=%lld count=%zu stateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1531,7 +1580,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event, 
			__field(u64, fileid)

			__field(loff_t, offset)

			__field(size_t, count)

			__field(int, error)

			__field(unsigned long, error)

			__field(int, stateid_seq)

			__field(u32, stateid_hash)

		),
@@ -1545,7 +1594,7 @@ DECLARE_EVENT_CLASS(nfs4_write_event, 
			__entry->fhandle = nfs_fhandle_hash(NFS_FH(inode));

			__entry->offset = hdr->args.offset;

			__entry->count = hdr->args.count;

			__entry->error = error;

			__entry->error = error < 0 ? -error : 0;

			__entry->stateid_seq =

				be32_to_cpu(state->stateid.seqid);

			__entry->stateid_hash =
@@ -1553,9 +1602,9 @@ DECLARE_EVENT_CLASS(nfs4_write_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"offset=%lld count=%zu stateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1592,7 +1641,7 @@ DECLARE_EVENT_CLASS(nfs4_commit_event, 
			__field(u64, fileid)

			__field(loff_t, offset)

			__field(size_t, count)

			__field(int, error)

			__field(unsigned long, error)

		),



		TP_fast_assign(
@@ -1606,9 +1655,9 @@ DECLARE_EVENT_CLASS(nfs4_commit_event, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"offset=%lld count=%zu",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,
@@ -1656,7 +1705,7 @@ TRACE_EVENT(nfs4_layoutget, 
			__field(u32, iomode)

			__field(u64, offset)

			__field(u64, count)

			__field(int, error)

			__field(unsigned long, error)

			__field(int, stateid_seq)

			__field(u32, stateid_hash)

			__field(int, layoutstateid_seq)
@@ -1689,10 +1738,10 @@ TRACE_EVENT(nfs4_layoutget, 
		),



		TP_printk(

			"error=%d (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"error=%ld (%s) fileid=%02x:%02x:%llu fhandle=0x%08x "

			"iomode=%s offset=%llu count=%llu stateid=%d:0x%08x "

			"layoutstateid=%d:0x%08x",

			__entry->error,

			-__entry->error,

			show_nfsv4_errors(__entry->error),

			MAJOR(__entry->dev), MINOR(__entry->dev),

			(unsigned long long)__entry->fileid,

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -3187,7 +3187,7 @@ static bool __decode_op_hdr(struct xdr_stream *xdr, enum nfs_opnum4 expected, 
	return true;

out_status:

	nfserr = be32_to_cpup(p);

	trace_nfs4_xdr_status(opnum, nfserr);

	trace_nfs4_xdr_status(xdr, opnum, nfserr);

	*nfs_retval = nfs4_stat_to_errno(nfserr);

	return true;

out_bad_operation: