vgsp: staged program delivery (V3 SPH accepted by engine, 0 SPH faults/40 launches), inline bytes 256, per-VA typed slots (SESSION 153 r947-r950)

1 files changed, 80 insertions, 2 deletions

diff --git a/kernel/gsp_phys_booter.c b/kernel/gsp_phys_booter.c
index 6228d28..8c9a2eb 100644
--- a/kernel/gsp_phys_booter.c
+++ b/kernel/gsp_phys_booter.c
@@ -20223,6 +20223,25 @@ int gsp_phys_backend_guest_gr_submit(const struct gsp_phys_gr_submit *req,
 						       (inl->dst_va &
 							(GSP_PHYS_PAGE_SIZE - 1)),
 					       inl->data, len);
+				/*
+				 * SESSION 153-CONTINUED-11: bounded witness of
+				 * every inline record applied (which program
+				 * page received which image), so the SPH
+				 * delivery is auditable from the log.
+				 */
+				{
+					static u32 inl_apply_log;
+
+					if (inl_apply_log < 24) {
+						inl_apply_log++;
+						pr_info("vgsp-gr: INLINE-APPLY dst=0x%llx len=%u pg_va=0x%llx guest=%u first=%08x %08x\n",
+							inl->dst_va, len, pg_va,
+							stream3d && pg->hpa ?
+								1u : 0u,
+							len >= 4 ? get_unaligned_le32(inl->data) : 0u,
+							len >= 8 ? get_unaligned_le32(inl->data + 4) : 0u);
+					}
+				}
 				copied++;
 			}
 			/*
@@ -20654,6 +20673,34 @@ gr_page_unmapped:
 		win3d_n = req->stream_n;
 		pr_info("vgsp-gr: 3D window relocated %u operand pair(s) to shadow VAs (window=%u shadow=%u)\n",
 			nrel, win3d_n, n_shadow);
+		/*
+		 * SESSION 153-CONTINUED-11: bounded raw window dump - the
+		 * exact C597 method stream the engine walks (program binds
+		 * 0x2014/0x2018+j*0x40, SET_PIPELINE_SHADER 0x2000+j*0x40,
+		 * draws 0x1618/0xd74). Two windows per boot.
+		 */
+		{
+			static u32 gr3d_win_log;
+			u32 wi;
+
+			if (gr3d_win_log < 4) {
+				gr3d_win_log++;
+				pr_info("vgsp-gr: 3D window dump h=0x%x push=0x%llx words=%u\n",
+					req->h_object, req->push_va, win3d_n);
+				for (wi = 0; wi < win3d_n && wi < 384;
+				     wi += 16)
+					pr_info("vgsp-gr: 3D win[%3u]: %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x %08x\n",
+						wi,
+						win3d[wi + 0], win3d[wi + 1],
+						win3d[wi + 2], win3d[wi + 3],
+						win3d[wi + 4], win3d[wi + 5],
+						win3d[wi + 6], win3d[wi + 7],
+						win3d[wi + 8], win3d[wi + 9],
+						win3d[wi + 10], win3d[wi + 11],
+						win3d[wi + 12], win3d[wi + 13],
+						win3d[wi + 14], win3d[wi + 15]);
+			}
+		}
 	}
 
 	words = gsp_phys_rmcall_build_gr_launch(methods, req, qmd,
@@ -24716,6 +24763,36 @@ static int gsp_phys_reg_probe_show(struct seq_file *m, void *unused)
 					     0x00404194u);
 	sked_hww_esr = gsp_phys_reg_probe_line(m, bar0, "SKED_HWW_ESR",
 					       0x00407020u);
+	/*
+	 * SESSION 153-CONTINUED-11: the shader-program-header fault window.
+	 * DS_HWW_ESR bit n = "the SPH with index n failed validation" (hwref:
+	 * NV_PGRAPH_PRI_DS_HWW_ESR_SPH0_ERR..SPH23_ERR, ESR_2 for 24..30);
+	 * the SPH_INFO registers snapshot the START address of each stage's
+	 * faulting SPH, so a post-fault read names the exact VA the engine
+	 * fetched.
+	 */
+	(void)gsp_phys_reg_probe_line(m, bar0, "DS_HWW_ESR",
+				      0x00405840u);
+	(void)gsp_phys_reg_probe_line(m, bar0, "DS_HWW_ESR_2",
+				      0x00405848u);
+	(void)gsp_phys_reg_probe_line(m, bar0,
+				      "DS_HWW_ESR_SPH_INFO_PROGRAM_REGION_A",
+				      0x00405c1cu);
+	(void)gsp_phys_reg_probe_line(m, bar0,
+				      "DS_HWW_ESR_SPH_INFO_PROGRAM_REGION_B",
+				      0x00405c20u);
+	{
+		u32 si;
+
+		for (si = 0; si < 6u; si++) {
+			gsp_phys_reg_probe_line(m, bar0,
+				"DS_HWW_ESR_SPH_INFO_STAGE_START",
+				0x00405c00u + si * 4u);
+			gsp_phys_reg_probe_line(m, bar0,
+				"DS_HWW_ESR_SPH_INFO_STAGE_START_UPPER",
+				0x00405c24u + si * 4u);
+		}
+	}
 	sked_activity = gsp_phys_reg_probe_line(m, bar0, "SKED_ACTIVITY",
 						0x00407054u);
 	sked_cwd0 = gsp_phys_reg_probe_line(m, bar0,
@@ -25428,8 +25505,9 @@ static_assert(GSP_PHYS_RMCALL_VA_GR_CTX +
 static_assert(sizeof(struct gsp_phys_gr_page) == 24,
 	      "the GR forwarding page descriptor must stay {u64,u64,u32,u32} = 24 bytes");
 static_assert(offsetof(struct gsp_phys_gr_inline, data) == 12 &&
-	      sizeof(struct gsp_phys_gr_inline) == 80,
-	      "the GR forwarding inline record must stay {u64,u32,u8[64]} padded to 80 bytes");
+	      sizeof(struct gsp_phys_gr_inline) >=
+		      12 + GSP_PHYS_GR_INLINE_BYTES,
+	      "the GR forwarding inline record must stay {u64,u32,u8[N]}");
 static_assert((2u + 1u + GSP_PHYS_RMCALL_GR_QMD_INLINE_WORDS + 8u) <=
 	      GSP_PHYS_RMCALL_GR_METHOD_WORDS,
 	      "the GR launch method block (compute init + SET_OBJECT + inline-QMD run + PCAS + REPORT_SEMAPHORE) must fit the bound");