diff options
| author | Logan Gunthorpe <logang@deltatee.com> | 2016-06-20 13:15:04 -0600 |
|---|---|---|
| committer | Jon Mason <jdmason@kudzu.us> | 2016-08-05 10:21:06 -0400 |
| commit | fd2ecd885bab8e456298d0b702806ea736456c62 (patch) | |
| tree | 705a3ba20eba4662738fbc94e25a818ab4942783 /drivers | |
| parent | 19645a077120c6417e9dc5ad469c45194cf78a82 (diff) | |
| download | linux-fd2ecd885bab8e456298d0b702806ea736456c62.tar.gz | |
ntb_perf: Schedule based on time not on performance
When debugging performance problems, if some issue causes the ntb hardware to be significantly slower than expected, ntb_perf will hang requiring a reboot because it only schedules once every 4GB. Instead, schedule based on jiffies so it will not hang the CPU if the transfer is slow. Signed-off-by: Logan Gunthorpe <logang@deltatee.com> Acked-by: Dave Jiang <dave.jiang@intel.com> Signed-off-by: Jon Mason <jdmason@kudzu.us>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ntb/test/ntb_perf.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/ntb/test/ntb_perf.c b/drivers/ntb/test/ntb_perf.c index 4368519da102..5008ccf600a9 100644 --- a/drivers/ntb/test/ntb_perf.c +++ b/drivers/ntb/test/ntb_perf.c @@ -273,6 +273,7 @@ static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src, char __iomem *tmp = dst; u64 perf, diff_us; ktime_t kstart, kstop, kdiff; + unsigned long last_sleep = jiffies; chunks = div64_u64(win_size, buf_size); total_chunks = div64_u64(total, buf_size); @@ -288,8 +289,9 @@ static int perf_move_data(struct pthr_ctx *pctx, char __iomem *dst, char *src, } else tmp += buf_size; - /* Probably should schedule every 4GB to prevent soft hang. */ - if (((copied % SZ_4G) == 0) && !use_dma) { + /* Probably should schedule every 5s to prevent soft hang. */ + if (unlikely((jiffies - last_sleep) > 5 * HZ)) { + last_sleep = jiffies; set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(1); } |