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

Commit f4848303 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

pNFS: Modify pnfs_update_layout tracepoints to use layout stateid 



Instead of displaying a layout segment pointer in these tracepoints,
let's use the layout stateid, now that Olga gave us a set of tools for
displaying them.

Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent f2dd436e

fs/nfs/nfs4trace.c

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include "internal.h"

#include "nfs4session.h"

#include "callback.h"

#include "pnfs.h"



#define CREATE_TRACE_POINTS

#include "nfs4trace.h"

fs/nfs/nfs4trace.h

+17 −6
Original line number Diff line number Diff line
@@ -1461,10 +1461,10 @@ TRACE_EVENT(pnfs_update_layout, 
			loff_t pos,

			u64 count,

			enum pnfs_iomode iomode,

			struct pnfs_layout_segment *lseg,

			struct pnfs_layout_hdr *lo,

			enum pnfs_update_layout_reason reason

		),

		TP_ARGS(inode, pos, count, iomode, lseg, reason),

		TP_ARGS(inode, pos, count, iomode, lo, reason),

		TP_STRUCT__entry(

			__field(dev_t, dev)

			__field(u64, fileid)
@@ -1472,7 +1472,8 @@ TRACE_EVENT(pnfs_update_layout, 
			__field(loff_t, pos)

			__field(u64, count)

			__field(enum pnfs_iomode, iomode)

			__field(struct pnfs_layout_segment *, lseg)

			__field(int, layoutstateid_seq)

			__field(u32, layoutstateid_hash)

			__field(enum pnfs_update_layout_reason, reason)

		),

		TP_fast_assign(
@@ -1482,18 +1483,28 @@ TRACE_EVENT(pnfs_update_layout, 
			__entry->pos = pos;

			__entry->count = count;

			__entry->iomode = iomode;

			__entry->lseg = lseg;

			__entry->reason = reason;

			if (lo != NULL) {

				__entry->layoutstateid_seq =

				be32_to_cpu(lo->plh_stateid.seqid);

				__entry->layoutstateid_hash =

				nfs_stateid_hash(&lo->plh_stateid);

			} else {

				__entry->layoutstateid_seq = 0;

				__entry->layoutstateid_hash = 0;

			}

		),

		TP_printk(

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

			"iomode=%s pos=%llu count=%llu lseg=%p (%s)",

			"iomode=%s pos=%llu count=%llu "

			"layoutstateid=%d:0x%08x (%s)",

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

			(unsigned long long)__entry->fileid,

			__entry->fhandle,

			show_pnfs_iomode(__entry->iomode),

			(unsigned long long)__entry->pos,

			(unsigned long long)__entry->count, __entry->lseg,

			(unsigned long long)__entry->count,

			__entry->layoutstateid_seq, __entry->layoutstateid_hash,

			show_pnfs_update_layout_reason(__entry->reason)

		)

);

fs/nfs/pnfs.c

+10 −10
Original line number Diff line number Diff line
@@ -1521,19 +1521,19 @@ pnfs_update_layout(struct inode *ino, 
	bool first;



	if (!pnfs_enabled_sb(NFS_SERVER(ino))) {

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, NULL,

				 PNFS_UPDATE_LAYOUT_NO_PNFS);

		goto out;

	}



	if (iomode == IOMODE_READ && i_size_read(ino) == 0) {

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, NULL,

				 PNFS_UPDATE_LAYOUT_RD_ZEROLEN);

		goto out;

	}



	if (pnfs_within_mdsthreshold(ctx, ino, iomode)) {

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, NULL,

				 PNFS_UPDATE_LAYOUT_MDSTHRESH);

		goto out;

	}
@@ -1544,14 +1544,14 @@ pnfs_update_layout(struct inode *ino, 
	lo = pnfs_find_alloc_layout(ino, ctx, gfp_flags);

	if (lo == NULL) {

		spin_unlock(&ino->i_lock);

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, NULL,

				 PNFS_UPDATE_LAYOUT_NOMEM);

		goto out;

	}



	/* Do we even need to bother with this? */

	if (test_bit(NFS_LAYOUT_BULK_RECALL, &lo->plh_flags)) {

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, lo,

				 PNFS_UPDATE_LAYOUT_BULK_RECALL);

		dprintk("%s matches recall, use MDS\n", __func__);

		goto out_unlock;
@@ -1560,7 +1560,7 @@ pnfs_update_layout(struct inode *ino, 
	/* if LAYOUTGET already failed once we don't try again */

	if (pnfs_layout_io_test_failed(lo, iomode) &&

	    !pnfs_should_retry_layoutget(lo)) {

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, lo,

				 PNFS_UPDATE_LAYOUT_IO_TEST_FAIL);

		goto out_unlock;

	}
@@ -1584,7 +1584,7 @@ pnfs_update_layout(struct inode *ino, 
		 */

		lseg = pnfs_find_lseg(lo, &arg);

		if (lseg) {

			trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

			trace_pnfs_update_layout(ino, pos, count, iomode, lo,

					PNFS_UPDATE_LAYOUT_FOUND_CACHED);

			goto out_unlock;

		}
@@ -1604,13 +1604,13 @@ pnfs_update_layout(struct inode *ino, 
			dprintk("%s retrying\n", __func__);

			goto lookup_again;

		}

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, lo,

				PNFS_UPDATE_LAYOUT_RETURN);

		goto out_put_layout_hdr;

	}



	if (pnfs_layoutgets_blocked(lo)) {

		trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

		trace_pnfs_update_layout(ino, pos, count, iomode, lo,

				PNFS_UPDATE_LAYOUT_BLOCKED);

		goto out_unlock;

	}
@@ -1638,7 +1638,7 @@ pnfs_update_layout(struct inode *ino, 
	lseg = send_layoutget(lo, ctx, &arg, gfp_flags);

	pnfs_clear_retry_layoutget(lo);

	atomic_dec(&lo->plh_outstanding);

	trace_pnfs_update_layout(ino, pos, count, iomode, lseg,

	trace_pnfs_update_layout(ino, pos, count, iomode, lo,

				 PNFS_UPDATE_LAYOUT_SEND_LAYOUTGET);

out_put_layout_hdr:

	if (first)