diff options
Diffstat (limited to 'kernel/gsp_sema_service.c')
| -rw-r--r-- | kernel/gsp_sema_service.c | 39 |
1 files changed, 5 insertions, 34 deletions
diff --git a/kernel/gsp_sema_service.c b/kernel/gsp_sema_service.c index 033bded..1e549a0 100644 --- a/kernel/gsp_sema_service.c +++ b/kernel/gsp_sema_service.c @@ -21172,16 +21172,6 @@ static bool svc_ce_stream_backlog(struct nv_vgpu_device *vgpu, unsigned gsp_phys_gr_dec_log_max; static unsigned svc_gr_dec_log; -/* - * r595b: the stream-order settle window (ms). A launch whose device rings - * still hold unconsumed entries is deferred for at most this long (one pump - * pass per deferral; the pump drains the copy rings first), then forwarded. - * Default 2000 ms: the r595 relocation copies execute within 0.5-1.5 s. - */ -unsigned gsp_phys_gr_cewm_settle_ms = 2000; -static u64 svc_gr_cewm_push; /* push currently inside its settle */ -static unsigned long svc_gr_cewm_since; /* settle window start */ - static void svc_gr_dec_dump(const struct svc_channel *ch) { bool dstpend, copypend, ceback; @@ -21423,43 +21413,24 @@ static bool svc_gr_request(struct nv_vgpu_device *vgpu, * it never refuses one, so it cannot recreate r588's mail refusal. */ if (svc_ce_stream_backlog(vgpu, ch)) { - /* - * r595b: the settle window. Since r595 runs a plausible GR - * push's own copies, the driver's relocation/H2D copies now - * execute within ~0.5-1.5 s of submission; deferring through - * the shared 15 s cap let the r541/r583 dstpend guard reach - * its fail-closed branch and refuse a launch whose data was - * already on its way. Give the pump a short bounded window to - * drain the rings (each deferral is one pump pass, and the - * pump drains the copy rings before the launching channel), - * then forward regardless - never a refusal. - */ - if (svc_gr_cewm_push != svc_gr_cand.push_va) { - svc_gr_cewm_push = svc_gr_cand.push_va; - svc_gr_cewm_since = jiffies; - } - if (time_before(jiffies, svc_gr_cewm_since + - msecs_to_jiffies(gsp_phys_gr_cewm_settle_ms))) { + if (!svc_gr_defer_expired(svc_gr_cand.push_va)) { clear_bit_unlock(SVC_FWD_INFLIGHT, &svc_fwd_state); mutex_unlock(&svc_fwd_lock); svc_gr_busy_defer = true; svc.fwd_gr_refused++; svc.fwd_gr_dstpend++; - svc.fwd_gr_cewm++; if (svc.fwd_gr_dstpend_log < 32) { svc.fwd_gr_dstpend_log++; - pr_info("vgsp-work: GR forward deferred h=0x%x push=0x%llx (CE ring has unconsumed entries; stream-order settle %ums)\n", - ch->h_object, svc_gr_cand.push_va, - gsp_phys_gr_cewm_settle_ms); + pr_info("vgsp-work: GR forward deferred h=0x%x push=0x%llx (CE ring has unconsumed entries; stream-order watermark)\n", + ch->h_object, svc_gr_cand.push_va); } return false; } svc.fwd_gr_cewm_cap++; if (svc.fwd_gr_cewm_log < 32) { svc.fwd_gr_cewm_log++; - pr_warn("vgsp-work: GR forward after settle h=0x%x push=0x%llx (CE ring still has unconsumed entries after %ums; historical forward)\n", - ch->h_object, svc_gr_cand.push_va, - gsp_phys_gr_cewm_settle_ms); + pr_warn("vgsp-work: GR forward at defer cap h=0x%x push=0x%llx (CE ring still has unconsumed entries; historical forward)\n", + ch->h_object, svc_gr_cand.push_va); } } /* |