diff options
Diffstat (limited to 'kernel/gsp_sema_service.c')
| -rw-r--r-- | kernel/gsp_sema_service.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/kernel/gsp_sema_service.c b/kernel/gsp_sema_service.c index f094d2b..455adff 100644 --- a/kernel/gsp_sema_service.c +++ b/kernel/gsp_sema_service.c @@ -43827,6 +43827,17 @@ static bool svc_gr_carrier_request(struct nv_vgpu_device *vgpu, /* One launch owner per channel: never compete with a real candidate. */ if (svc_gr_cand_unoffered_for(h_object) || svc_fwd_hold.active) return false; + /* + * CONT 548: do not consume the armed carrier when the forwarding + * slot is already in flight. The take below clears the arm; if the + * slot lock then fails the carrier is cancelled ("request-busy") + * and the pack is never completed (c886: FIRE gen=4 immediately + * followed by CANCEL request-busy on a clean 247 window). The slot + * can still be taken between this probe and the lock, but this + * removes the observed race for the retryable path. + */ + if (test_bit(SVC_FWD_INFLIGHT, &svc_fwd_state)) + return false; if (release) { if (!gsp_phys_gr_mme_release_take(h_object, &held, &win)) return false; |
