2 files changed, 28 insertions, 5 deletions

diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c
index 6bcb6d6c9dc3..d3b3b6236711 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.c
+++ b/fs/nfs/flexfilelayout/flexfilelayout.c
@@ -452,14 +452,23 @@ nfs4_ff_layout_calc_completion_time(struct rpc_task *task)
         return ktime_sub(ktime_get(), task->tk_start);
 }
 
-static void
+static bool
 nfs4_ff_layoutstat_start_io(struct nfs4_ff_layout_mirror *mirror,
                             struct nfs4_ff_layoutstat *layoutstat)
 {
         static const ktime_t notime = {0};
+        ktime_t now = ktime_get();
 
         nfs4_ff_start_busy_timer(&layoutstat->busy_timer);
-        cmpxchg(&mirror->start_time, notime, ktime_get());
+        cmpxchg(&mirror->start_time.tv64, notime.tv64, now.tv64);
+        cmpxchg(&mirror->last_report_time.tv64, notime.tv64, now.tv64);
+        if (ktime_to_ms(ktime_sub(now, mirror->last_report_time)) >=
+                        FF_LAYOUTSTATS_REPORT_INTERVAL) {
+                mirror->last_report_time = now;
+                return true;
+        }
+
+        return false;
 }
 
 static void
@@ -496,10 +505,15 @@ static void
 nfs4_ff_layout_stat_io_start_read(struct nfs4_ff_layout_mirror *mirror,
                 __u64 requested)
 {
+        bool report;
+
         spin_lock(&mirror->lock);
-        nfs4_ff_layoutstat_start_io(mirror, &mirror->read_stat);
+        report = nfs4_ff_layoutstat_start_io(mirror, &mirror->read_stat);
         nfs4_ff_layout_stat_io_update_requested(&mirror->read_stat, requested);
         spin_unlock(&mirror->lock);
+
+        if (report)
+                pnfs_report_layoutstat(mirror->lseg->pls_layout->plh_inode);
 }
 
 static void
@@ -519,10 +533,15 @@ static void
 nfs4_ff_layout_stat_io_start_write(struct nfs4_ff_layout_mirror *mirror,
                 __u64 requested)
 {
+        bool report;
+
         spin_lock(&mirror->lock);
-        nfs4_ff_layoutstat_start_io(mirror, &mirror->write_stat);
+        report = nfs4_ff_layoutstat_start_io(mirror , &mirror->write_stat);
         nfs4_ff_layout_stat_io_update_requested(&mirror->write_stat, requested);
         spin_unlock(&mirror->lock);
+
+        if (report)
+                pnfs_report_layoutstat(mirror->lseg->pls_layout->plh_inode);
 }
 
 static void
diff --git a/fs/nfs/flexfilelayout/flexfilelayout.h b/fs/nfs/flexfilelayout/flexfilelayout.h
index 7e248874f46d..6fcd8d5e8e3d 100644
--- a/fs/nfs/flexfilelayout/flexfilelayout.h
+++ b/fs/nfs/flexfilelayout/flexfilelayout.h
@@ -15,6 +15,9 @@
  * due to network error etc. */
 #define NFS4_FLEXFILE_LAYOUT_MAX_MIRROR_CNT 4096
 
+/* LAYOUTSTATS report interval in ms */
+#define FF_LAYOUTSTATS_REPORT_INTERVAL (60000L)
+
 struct nfs4_ff_ds_version {
         u32                             version;
         u32                             minor_version;
@@ -62,6 +65,7 @@ struct nfs4_ff_layoutstat {
 };
 
 struct nfs4_ff_layout_mirror {
+        struct pnfs_layout_segment      *lseg; /* back pointer */
         u32                             ds_count;
         u32                             efficiency;
         struct nfs4_ff_layout_ds        *mirror_ds;
@@ -75,7 +79,7 @@ struct nfs4_ff_layout_mirror {
         struct nfs4_ff_layoutstat       read_stat;
         struct nfs4_ff_layoutstat       write_stat;
         ktime_t                         start_time;
-        struct pnfs_layout_segment      *lseg; /* back pointer */
+        ktime_t                         last_report_time;
 };
 
 struct nfs4_ff_layout_segment {