tools/vk: vk_frame gains an optional 7th arg (tiling: 0=optimal default, 1=linear) and a buffer-allocation type-retry loop; wall2: the QEMU-gdbstub kernel-breakpoint script (module VAs insert+patch but never fire - the stub's memory context does not resolve module VAs) and the kcore symbol dumper; session findings: the vkAllocateMemory -2 = the image's internal COMPR 2MB-page 64KB sub-allocation failing NV_ERR_NO_MEMORY after the image data alloc succeeds (both tilings)

3 files changed, 90 insertions, 2 deletions

diff --git a/tools/guest-diag/wall2/kc_dump_fn.py b/tools/guest-diag/wall2/kc_dump_fn.py
new file mode 100644
index 0000000..e481d24
--- /dev/null
+++ b/tools/guest-diag/wall2/kc_dump_fn.py
@@ -0,0 +1,21 @@
+import struct, sys
+VA = int(sys.argv[1], 16)
+N = int(sys.argv[2], 16) if len(sys.argv) > 2 else 0x800
+f = open("/proc/kcore","rb")
+hdr = f.read(64)
+e_phoff = struct.unpack_from("<Q", hdr, 0x20)[0]
+e_phentsize = struct.unpack_from("<H", hdr, 0x36)[0]
+e_phnum = struct.unpack_from("<H", hdr, 0x38)[0]
+segs = []
+for i in range(e_phnum):
+    f.seek(e_phoff + i*e_phentsize)
+    ph = f.read(e_phentsize)
+    p_type, p_flags, p_offset, p_vaddr, p_paddr, p_filesz, p_memsz = struct.unpack_from("<IIQQQQQ", ph, 0)
+    if p_type == 1:
+        segs.append((p_vaddr, p_memsz, p_offset))
+for v, sz, off in segs:
+    if v <= VA < v+sz:
+        f.seek(off + (VA - v))
+        d = f.read(min(N, v+sz-VA))
+        sys.stdout.write(d.hex())
+        break
diff --git a/tools/guest-diag/wall2/t112c-gdbstub.py b/tools/guest-diag/wall2/t112c-gdbstub.py
new file mode 100644
index 0000000..27d0b9d
--- /dev/null
+++ b/tools/guest-diag/wall2/t112c-gdbstub.py
@@ -0,0 +1,42 @@
+import gdb
+
+gr = gdb.execute
+
+def u32(a):
+    return int(gdb.parse_and_eval("*(unsigned int*)0x%x" % a))
+def u64(a):
+    return int(gdb.parse_and_eval("*(unsigned long*)0x%x" % a))
+
+state = {"hits": {}}
+
+class HB(gdb.Breakpoint):
+    def __init__(self, pa, tag, quiet_after=8):
+        super().__init__("*0x%x" % pa, type=gdb.BP_BREAKPOINT, internal=False)
+        self.tag = tag
+        self.quiet_after = quiet_after
+        self.silent = True
+    def stop(self):
+        n = state["hits"].get(self.tag, 0) + 1
+        state["hits"][self.tag] = n
+        try:
+            rdi = int(gdb.parse_and_eval("$rdi"))
+            rsi = int(gdb.parse_and_eval("$rsi"))
+            rdx = int(gdb.parse_and_eval("$rdx"))
+            rcx = int(gdb.parse_and_eval("$rcx"))
+            r8 = int(gdb.parse_and_eval("$r8"))
+            r9 = int(gdb.parse_and_eval("$r9"))
+            if n <= self.quiet_after or self.tag in ("PRED", "COMPR"):
+                print("HIT %s #%d rdi=0x%x rsi=0x%x rdx=0x%x rcx=0x%x r8=0x%x r9=0x%x" %
+                      (self.tag, n, rdi, rsi, rdx, rcx, r8, r9), flush=True)
+        except Exception as e:
+            print("err", e, flush=True)
+        return False
+
+HB(0xffffffffc0c403b0, "VIDH")
+HB(0xffffffffc0d667a0, "PMA", 4)
+HB(0xffffffffc0d6ae30, "PRED")
+HB(0xffffffffc0d57d60, "COMPR", 16)
+HB(0xffffffffc0d607f0, "SCRUB", 4)
+print("HB-SET", flush=True)
+gr("continue")
+print("T112B-DONE %s" % state["hits"], flush=True)
diff --git a/tools/vk/vk_frame.c b/tools/vk/vk_frame.c
index 8b864ff..62548be 100644
--- a/tools/vk/vk_frame.c
+++ b/tools/vk/vk_frame.c
@@ -27,6 +27,8 @@
 #define FRAME_OFFSET  0x100000UL
 #define HDR_MAGIC     0x4b564d46u
 
+static VkImageTiling g_tiling = VK_IMAGE_TILING_OPTIMAL;
+
 struct frame_hdr {
 	uint32_t magic;
 	uint32_t version;
@@ -59,6 +61,11 @@ static uint64_t now_ns(void)
 
 int main(int argc, char **argv)
 {
+	if (argc > 7 && atoi(argv[7]) == 1) {
+		g_tiling = VK_IMAGE_TILING_LINEAR;
+		printf("TILING linear\n");
+	}
+
 	int frames = argc > 1 ? atoi(argv[1]) : 60;
 	uint32_t W = argc > 2 ? (uint32_t)atoi(argv[2]) : 640;
 	uint32_t H = argc > 3 ? (uint32_t)atoi(argv[3]) : 480;
@@ -179,7 +186,7 @@ int main(int argc, char **argv)
 		ci.mipLevels = 1;
 		ci.arrayLayers = 1;
 		ci.samples = VK_SAMPLE_COUNT_1_BIT;
-		ci.tiling = VK_IMAGE_TILING_OPTIMAL;
+		ci.tiling = g_tiling;
 		ci.usage = VK_IMAGE_USAGE_STORAGE_BIT |
 			   VK_IMAGE_USAGE_TRANSFER_SRC_BIT;
 		ci.initialLayout = VK_IMAGE_LAYOUT_UNDEFINED;
@@ -244,7 +251,25 @@ int main(int argc, char **argv)
 					break;
 				}
 		}
-		VKC(vkAllocateMemory(dev, &ma, NULL, &buf_mem));
+		{
+		int rc_ = vkAllocateMemory(dev, &ma, NULL, &buf_mem);
+		if (rc_ != VK_SUCCESS) {
+			VkPhysicalDeviceMemoryProperties mp2;
+			uint32_t k2;
+			vkGetPhysicalDeviceMemoryProperties(phys, &mp2);
+			for (k2 = 0; k2 < mp2.memoryTypeCount && rc_ != VK_SUCCESS; k2++) {
+				if (!(mr.memoryTypeBits & (1u << k2)))
+					continue;
+				ma.memoryTypeIndex = k2;
+				rc_ = vkAllocateMemory(dev, &ma, NULL, &buf_mem);
+				printf("BUF retry type=%u rc=%d\n", k2, rc_);
+			}
+		}
+		if (rc_ != VK_SUCCESS) {
+			printf("VKFAIL vkAllocateMemory(buf) -> %d (line %d)\n", rc_, __LINE__);
+			return 1;
+		}
+	}
 		VKC(vkBindBufferMemory(dev, buf, buf_mem, 0));
 	}
 	/* shader + pipeline */