Revert "vgsp-sema r588: copy-pending sees a CE ring's undecoded backlog (stream-order)"

This reverts commit c88a7f6b2658ea2d49b67cd63179a5a1fbce3663.

1 files changed, 4 insertions, 40 deletions

diff --git a/kernel/gsp_sema_service.c b/kernel/gsp_sema_service.c
index 23d456e..e86c463 100644
--- a/kernel/gsp_sema_service.c
+++ b/kernel/gsp_sema_service.c
@@ -21073,26 +21073,7 @@ static bool svc_gr_dstpend_overlap(void)
  * copy delays a launch by the cap and no more. GR channels are excluded
  * (a launch's own withheld release must not defer itself).
  */
-/*
- * True while any CE channel of this device still OWES work: either an
- * entry hold is active on it (the original opdef check, r568) or its
- * ring has submitted-but-unconsumed entries (last_get != put_prev).
- *
- * The r568 guard in svc_gr_request was built for the mail b-copy class
- * but could not see its live instance (r587): the h_b copy entry sat
- * BEHIND a translation-held CE entry, had never been decoded, so no
- * opdef hold existed at the decision instant and copypend read 0; the
- * launch's copy-in then captured d_b's pre-copy zeros and the engine
- * computed c = a + 0 (h_c == h_a exactly: bad = 32735 = 32768 - 33,
- * the count of i where b[i] == 0; csum = sum(a) = 8139264). A CE
- * channel with last_get != put_prev has entries the pump has not
- * consumed yet - the same "outstanding" relation the completion
- * publish uses (svc_counter_publish) - and with the r507o CE-before-GR
- * pass order its write-back for this pass has already run when the GR
- * decision reads it. Bounded by the same defer/expiry machinery as
- * every other copy-pending refusal.
- */
-static bool svc_copy_pending(struct nv_vgpu_device *vgpu)
+static bool svc_copy_pending(void)
 {
 	unsigned long flags;
 	bool pending = false;
@@ -21114,23 +21095,6 @@ static bool svc_copy_pending(struct nv_vgpu_device *vgpu)
 			}
 		spin_unlock_irqrestore(&svc.chan_lock, flags);
 	}
-	if (pending)
-		return true;
-
-	spin_lock_irqsave(&svc.chan_lock, flags);
-	for (c = 0; c < SVC_MAX_CHANNELS; c++) {
-		struct svc_channel *chan = &svc.chan[c];
-
-		if (!chan->valid || chan->vgpu != vgpu ||
-		    !chan->engine_type)
-			continue;
-		if (chan->last_get != chan->put_prev) {
-			pending = true;
-			break;
-		}
-	}
-	spin_unlock_irqrestore(&svc.chan_lock, flags);
-
 	return pending;
 }
 
@@ -21157,7 +21121,7 @@ static void svc_gr_dec_dump(const struct svc_channel *ch)
 	svc_gr_dec_log++;
 
 	dstpend = svc_gr_dstpend_overlap();
-	copypend = svc_copy_pending(ch->vgpu);
+	copypend = svc_copy_pending();
 
 	pr_info("vgsp-gr: GR-DEC h=0x%x push=0x%llx n_data=%u dropped=%u partial=%d stalled=%d dstpend=%d copypend=%d defer_exp=%d\n",
 		ch->h_object, svc_gr_cand.push_va, svc_fwd_req.gr_n_data,
@@ -21302,7 +21266,7 @@ static bool svc_gr_request(struct nv_vgpu_device *vgpu,
 	if (gsp_phys_gr_dec_log_max &&
 	    (svc_fwd_req.gr_dropped > 0 || svc_fwd_req.gr_arg_partial ||
 	     svc_gr_data_stalled || svc_gr_dstpend_overlap() ||
-	     svc_copy_pending(vgpu)))
+	     svc_copy_pending()))
 		svc_gr_dec_dump(ch);
 	/*
 	 * r541: launch-ordering guard. The fill's data pages are what the
@@ -21367,7 +21331,7 @@ static bool svc_gr_request(struct nv_vgpu_device *vgpu,
 	 * (see svc_copy_pending). Covers the dropped-argument-base case the
 	 * page-level guard cannot see (the r571 mail b-copy).
 	 */
-	if (svc_copy_pending(vgpu) &&
+	if (svc_copy_pending() &&
 	    (svc_fwd_req.gr_arg_partial || svc_fwd_req.gr_dropped > 0) &&
 	    !svc_gr_defer_expired(svc_gr_cand.push_va)) {
 		clear_bit_unlock(SVC_FWD_INFLIGHT, &svc_fwd_state);