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

Commit d983803d authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

pNFS/flexfiles: track when layout is first used 



So that we can report cumulative time since the beginning
of statistics collection of the layout.

Reviewed-by: default avatarJeff Layton <jeff.layton@primarydata.com>
Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent abcb7bfc

fs/nfs/flexfilelayout/flexfilelayout.c

+7 −3
Original line number Diff line number Diff line
@@ -451,9 +451,13 @@ nfs4_ff_layout_calc_completion_time(struct rpc_task *task) 
}



static void

nfs4_ff_layoutstat_start_io(struct nfs4_ff_layoutstat *layoutstat)

nfs4_ff_layoutstat_start_io(struct nfs4_ff_layout_mirror *mirror,

			    struct nfs4_ff_layoutstat *layoutstat)

{

	static const ktime_t notime = {0};



	nfs4_ff_start_busy_timer(&layoutstat->busy_timer);

	cmpxchg(&mirror->start_time, notime, ktime_get());

}



static void
@@ -491,7 +495,7 @@ nfs4_ff_layout_stat_io_start_read(struct nfs4_ff_layout_mirror *mirror, 
		__u64 requested)

{

	spin_lock(&mirror->lock);

	nfs4_ff_layoutstat_start_io(&mirror->read_stat);

	nfs4_ff_layoutstat_start_io(mirror, &mirror->read_stat);

	nfs4_ff_layout_stat_io_update_requested(&mirror->read_stat, requested);

	spin_unlock(&mirror->lock);

}
@@ -514,7 +518,7 @@ nfs4_ff_layout_stat_io_start_write(struct nfs4_ff_layout_mirror *mirror, 
		__u64 requested)

{

	spin_lock(&mirror->lock);

	nfs4_ff_layoutstat_start_io(&mirror->write_stat);

	nfs4_ff_layoutstat_start_io(mirror, &mirror->write_stat);

	nfs4_ff_layout_stat_io_update_requested(&mirror->write_stat, requested);

	spin_unlock(&mirror->lock);

}

fs/nfs/flexfilelayout/flexfilelayout.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct nfs4_ff_layout_mirror { 
	spinlock_t			lock;

	struct nfs4_ff_layoutstat	read_stat;

	struct nfs4_ff_layoutstat	write_stat;

	ktime_t				start_time;

};



struct nfs4_ff_layout_segment {