File crash-4.0-3.15-3.16.patch of Package crash

Overview Repositories Revisions Requests Users Attributes Meta

File crash-4.0-3.15-3.16.patch of Package crash (Revision c1bc67168c997b363420d83149e8c6f5)

Currently displaying revision c1bc67168c997b363420d83149e8c6f5 , Show latest

diff --exclude=.pc -Nur crash-4.0-2.33/Makefile crash-4.0-3.16/Makefile
--- crash-4.0-2.33/Makefile	2006-12-22 11:51:12.388278567 +0100
+++ crash-4.0-3.16/Makefile	2006-12-21 20:54:11.000000000 +0100
@@ -470,7 +470,7 @@
 # spec file will have its own release number, which will in turn get passed 
 # to the "all" target upon the initial build.
 
-RELEASE=4.0-3.15
+RELEASE=4.0-3.16
 
 release: make_configure
 	@if [ "`id --user`" != "0" ]; then \
diff --exclude=.pc -Nur crash-4.0-2.33/README crash-4.0-3.16/README
--- crash-4.0-2.33/README	2006-12-22 11:51:12.501263158 +0100
+++ crash-4.0-3.16/README	2006-12-21 20:54:11.000000000 +0100
@@ -69,7 +69,7 @@
      After the kernel is re-compiled, the uncompressed "vmlinux" kernel
      that is created in the top-level kernel build directory must be saved.
 
-  To build this utility, simply uncompress the tar file, enter the crash-4.0-3.15
+  To build this utility, simply uncompress the tar file, enter the crash-4.0-3.16
   subdirectory, and type "make".  The initial build will take several minutes 
   because the gdb module must be configured and and built.  Alternatively, the
   crash source RPM file may be installed and built, and the resultant crash
@@ -89,7 +89,7 @@
 
     $ crash
     
-    crash 4.0-3.15
+    crash 4.0-3.16
     Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
     Copyright (C) 2004, 2005, 2006  IBM Corporation
     Copyright (C) 1999-2006  Hewlett-Packard Co
@@ -114,7 +114,7 @@
           KERNEL: /boot/vmlinux
         DUMPFILE: /dev/mem
             CPUS: 1
-            DATE: Wed Dec 20 09:57:04 2006
+            DATE: Thu Dec 21 14:54:10 2006
           UPTIME: 10 days, 22:55:18
     LOAD AVERAGE: 0.08, 0.03, 0.01
            TASKS: 42
@@ -142,7 +142,7 @@
     exit           log            rd             task           
     extend         mach           repeat         timer          
     
-    crash version: 4.0-3.15   gdb version: 6.1
+    crash version: 4.0-3.16   gdb version: 6.1
     For help on any command above, enter "help <command>".
     For help on input options, enter "help input".
     For help on output options, enter "help output".
@@ -155,7 +155,7 @@
 
     $ crash vmlinux vmcore
  
-    crash 4.0-3.15
+    crash 4.0-3.16
     Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
     Copyright (C) 2004, 2005, 2006  IBM Corporation
     Copyright (C) 1999-2006  Hewlett-Packard Co
@@ -202,7 +202,7 @@
 
     $ crash vmlinux.17 lcore.cr.17
 
-    crash 4.0-3.15
+    crash 4.0-3.16
     Copyright (C) 2002, 2003, 2004, 2005, 2006  Red Hat, Inc.
     Copyright (C) 2004, 2005, 2006  IBM Corporation
     Copyright (C) 1999-2006  Hewlett-Packard Co
diff --exclude=.pc -Nur crash-4.0-2.33/.rh_rpm_package crash-4.0-3.16/.rh_rpm_package
--- crash-4.0-2.33/.rh_rpm_package	2006-12-22 11:51:12.507262339 +0100
+++ crash-4.0-3.16/.rh_rpm_package	2006-12-21 20:54:11.000000000 +0100
@@ -1 +1 @@
-4.0-3.15
+4.0-3.16
diff --exclude=.pc -Nur crash-4.0-2.33/xendump.c crash-4.0-3.16/xendump.c
--- crash-4.0-2.33/xendump.c	2006-12-22 11:51:12.696236565 +0100
+++ crash-4.0-3.16/xendump.c	2006-12-21 20:54:11.000000000 +0100
@@ -31,6 +31,7 @@
 
 static void xc_core_p2m_create(void);
 static ulong xc_core_pfn_to_page_index(ulong);
+static int xc_core_pfn_valid(ulong);
 
 /*
  *  Determine whether a file is a xendump creation, and if TRUE,
@@ -79,14 +80,15 @@
 
 	xcp = (struct xc_core_header *)buf;
 
-	if (xcp->xch_magic != XC_CORE_MAGIC)
+	if ((xcp->xch_magic != XC_CORE_MAGIC) && 
+	    (xcp->xch_magic != XC_CORE_MAGIC_HVM))
 		return FALSE;
 
 	if (!xcp->xch_nr_vcpus) {
 		error(INFO, 
 		    "faulty xc_core dump file header: xch_nr_vcpus is 0\n\n");
 
-        	fprintf(stderr, "         xch_magic: %x (XC_CORE_MAGIC)\n", xcp->xch_magic);
+        	fprintf(stderr, "         xch_magic: %x\n", xcp->xch_magic);
         	fprintf(stderr, "      xch_nr_vcpus: %d\n", xcp->xch_nr_vcpus);
         	fprintf(stderr, "      xch_nr_pages: %d\n", xcp->xch_nr_pages);
         	fprintf(stderr, "   xch_ctxt_offset: %d\n", xcp->xch_ctxt_offset);
@@ -926,17 +928,19 @@
 			break;
 		} else if (!i)
 			fprintf(fp, "(%d used)\n", used);
-		fprintf(fp, "  [%d]: pfn: %ld (0x%lx) count: %ld file_offset: %llx\n",
-			i,
-			xd->poc[i].pfn,
-			xd->poc[i].pfn,
-			xd->poc[i].cnt,
-			(ulonglong)xd->poc[i].file_offset);
+		if (CRASHDEBUG(2))
+			fprintf(fp, 
+		  	    "  [%d]: pfn: %ld (0x%lx) count: %ld file_offset: %llx\n",
+			    	i,
+			    	xd->poc[i].pfn,
+				xd->poc[i].pfn,
+				xd->poc[i].cnt,
+				(ulonglong)xd->poc[i].file_offset);
 	}
 	if (!xd->poc)
 		fprintf(fp, "\n");
 
-	fprintf(fp, "      xc_save:\n");
+	fprintf(fp, "\n      xc_save:\n");
 	fprintf(fp, "                  nr_pfns: %ld (0x%lx)\n", 
 		xd->xc_save.nr_pfns, xd->xc_save.nr_pfns); 
 	fprintf(fp, "            vmconfig_size: %d (0x%x)\n", xd->xc_save.vmconfig_size, 
@@ -985,10 +989,14 @@
 
 	fprintf(fp, "      xc_core:\n");
 	fprintf(fp, "                   header:\n");
-	fprintf(fp, "                xch_magic: %x (%s)\n", 
-		xd->xc_core.header.xch_magic,
-		xd->xc_core.header.xch_magic == XC_CORE_MAGIC ?
-		"XC_CORE_MAGIC" : "unknown");
+	fprintf(fp, "                xch_magic: %x ", 
+		xd->xc_core.header.xch_magic);
+	if (xd->xc_core.header.xch_magic == XC_CORE_MAGIC)
+		fprintf(fp, "(XC_CORE_MAGIC)\n");
+	else if (xd->xc_core.header.xch_magic == XC_CORE_MAGIC_HVM)
+		fprintf(fp, "(XC_CORE_MAGIC_HVM)\n");
+	else
+		fprintf(fp, "(unknown)\n");
 	fprintf(fp, "             xch_nr_vcpus: %d\n", 
 		xd->xc_core.header.xch_nr_vcpus);
 	fprintf(fp, "             xch_nr_pages: %d (0x%x)\n",
@@ -1006,14 +1014,15 @@
 
 	fprintf(fp, "               p2m_frames: %d\n", 
 		xd->xc_core.p2m_frames);
-	fprintf(fp, "     p2m_frame_index_list:\n");
+	fprintf(fp, "     p2m_frame_index_list: %s\n",
+		(xd->flags & (XC_CORE_NO_P2MM|XC_SAVE)) ? "(not used)" : "");
 	for (i = 0; i < xd->xc_core.p2m_frames; i++) {
 		fprintf(fp, "%ld ", 
 			xd->xc_core.p2m_frame_index_list[i]);
 	}
-	fprintf(fp, xd->xc_core.p2m_frames ? "\n\n" : "\n");
+	fprintf(fp, xd->xc_core.p2m_frames ? "\n" : "");
 
-	if (CRASHDEBUG(3))
+	if ((xd->flags & XC_CORE) && CRASHDEBUG(2))
 		xc_core_mfns(XENDUMP_LOCAL, fp);
 
 	return 0;
@@ -1272,6 +1281,7 @@
         int i, b;
 	uint nr_pages;
         ulong tmp[MAX_BATCH_SIZE];
+        ulonglong tmp64[MAX_BATCH_SIZE];
 
         if (lseek(xd->xfd, (off_t)xd->xc_core.header.xch_index_offset,
             SEEK_SET) == -1) {
@@ -1288,7 +1298,7 @@
 	         */
 		if (machine_type("X86_64") || machine_type("IA64"))
 			return FALSE;
-check_next:
+check_next_4:
 	        if (read(xd->xfd, tmp, sizeof(ulong) * 4) != (4 * sizeof(ulong))) {
 			error(INFO, "cannot read index pages\n");
 			return FALSE;
@@ -1297,7 +1307,7 @@
 		if ((tmp[0] == 0xffffffff) || (tmp[1] == 0xffffffff) ||
 		    (tmp[2] == 0xffffffff) || (tmp[3] == 0xffffffff) ||
 		    (!tmp[0] && !tmp[1]) || (!tmp[2] && !tmp[3]))
-			goto check_next;
+			goto check_next_4;
 
 		if (CRASHDEBUG(2))
 			fprintf(ofp, "mfns: %08lx %08lx %08lx %08lx\n", 
@@ -1309,9 +1319,13 @@
 			return FALSE;
 
 	case XENDUMP_LOCAL:
+		if (BITS64() || (xd->flags & XC_CORE_64BIT_HOST))
+			goto show_64bit_mfns;
+
+		fprintf(ofp, "xch_index_offset mfn list:\n");
+
 		nr_pages = xd->xc_core.header.xch_nr_pages;
-		if (xd->flags & XC_CORE_64BIT_HOST)
-                	nr_pages *= 2;
+
 	        for (b = 0; b < nr_pages; b += MAX_BATCH_SIZE) {
 	                if (read(xd->xfd, tmp, sizeof(ulong) * MAX_BATCH_SIZE) !=
 	                    (MAX_BATCH_SIZE * sizeof(ulong))) {
@@ -1324,18 +1338,49 @@
 	                for (i = 0; i < MAX_BATCH_SIZE; i++) {
 				if ((b+i) >= nr_pages)
 					break;
-				if ((i%8) == 0) {
-					fprintf(ofp, "%s[%d]: %lx", 
-						i ? "\n" : "", b+i, tmp[i]);
-				} else {
+				if ((i%8) == 0)
+					fprintf(ofp, "%s[%d]:", 
+						i ? "\n" : "", b+i);
+				if (tmp[i] == 0xffffffff)
+					fprintf(ofp, " INVALID");
+				else
 					fprintf(ofp, " %lx", tmp[i]);
-				}
 			}
 		}
-		fprintf(ofp, "\nxch_nr_pages: %d", xd->xc_core.header.xch_nr_pages);
-		if (xd->flags & XC_CORE_64BIT_HOST)
-			fprintf(ofp, " (64-bit host: effective pages: %d", nr_pages);
-		fprintf(ofp, "\n");
+
+		fprintf(ofp, "\nxch_nr_pages: %d\n", 
+			xd->xc_core.header.xch_nr_pages);
+		return TRUE;
+
+show_64bit_mfns:
+		fprintf(ofp, "xch_index_offset mfn list: %s\n",
+			BITS32() ? "(64-bit mfns)" : "");
+
+		nr_pages = xd->xc_core.header.xch_nr_pages;
+
+	        for (b = 0; b < nr_pages; b += MAX_BATCH_SIZE) {
+	                if (read(xd->xfd, tmp64, sizeof(ulonglong) * MAX_BATCH_SIZE) !=
+	                    (MAX_BATCH_SIZE * sizeof(ulonglong))) {
+	                        error(INFO, "cannot read index page %d\n", b);
+	                        return FALSE;
+	                }
+	
+			if (b) fprintf(ofp, "\n");
+
+	                for (i = 0; i < MAX_BATCH_SIZE; i++) {
+				if ((b+i) >= nr_pages)
+					break;
+				if ((i%8) == 0)
+					fprintf(ofp, "%s[%d]:", 
+						i ? "\n" : "", b+i);
+				if (tmp64[i] == 0xffffffffffffffff)
+					fprintf(ofp, " INVALID");
+				else
+					fprintf(ofp, " %llx", tmp64[i]);
+			}
+		}
+
+		fprintf(ofp, "\nxch_nr_pages: %d\n", nr_pages);
 		return TRUE;
 
 	default:
@@ -1362,7 +1407,7 @@
 	off_t offset;
 
 	if (xd->flags & XC_CORE_NO_P2MM)
-		return pfn;
+		return(xc_core_pfn_valid(pfn) ? pfn : PFN_NOT_FOUND);
 
 	idx = pfn/PFNS_PER_PAGE;
 
@@ -1406,6 +1451,59 @@
 }
 
 /*
+ *  In xendumps containing INVALID_MFN markers in the page index,
+ *  return the validity of the pfn.
+ */
+static int 
+xc_core_pfn_valid(ulong pfn)
+{
+	ulong mfn;
+	off_t offset;
+
+	if (pfn >= (ulong)xd->xc_core.header.xch_nr_pages)
+		return FALSE;
+
+        offset = (off_t)xd->xc_core.header.xch_index_offset;
+
+	if (xd->flags & XC_CORE_64BIT_HOST)
+		offset += (off_t)(pfn * sizeof(ulonglong));
+	else
+		offset += (off_t)(pfn * sizeof(ulong));
+
+	/*
+	 *  The lseek and read should never fail, so report 
+	 *  any errors unconditionally.
+	 */
+	if (lseek(xd->xfd, offset, SEEK_SET) == -1) {
+		error(INFO, 
+		    "xendump: cannot lseek to page index for pfn %lx\n", 
+			pfn);
+		return FALSE;
+	}
+
+	if (read(xd->xfd, &mfn, sizeof(ulong)) != sizeof(ulong)) {
+		error(INFO, 
+		    "xendump: cannot read index page for pfn %lx\n", 
+			pfn);
+		return FALSE;
+	}
+
+	/*
+	 *  If it's an invalid mfn, let the caller decide whether
+	 *  to display an error message (unless debugging).
+	 */
+	if (mfn == INVALID_MFN) {
+		if (CRASHDEBUG(1))
+			error(INFO, 
+		    	    "xendump: pfn %lx contains INVALID_MFN\n", 
+				pfn);
+		return FALSE;
+	} 
+
+	return TRUE;
+}
+
+/*
  *  Store the panic task's stack hooks from where it was found
  *  in get_active_set_panic_task().
  */
diff --exclude=.pc -Nur crash-4.0-2.33/xendump.h crash-4.0-3.16/xendump.h
--- crash-4.0-2.33/xendump.h	2006-12-22 11:51:12.703235611 +0100
+++ crash-4.0-3.16/xendump.h	2006-12-21 20:54:11.000000000 +0100
@@ -15,6 +15,7 @@
 
 #define XC_SAVE_SIGNATURE  "LinuxGuestRecord"
 #define XC_CORE_MAGIC      0xF00FEBED
+#define XC_CORE_MAGIC_HVM  0xF00FEBEE
 
 /*
  *  From xenctrl.h, but probably not on most host machines.
@@ -101,6 +102,8 @@
 #define MFN_NOT_FOUND (-1)
 #define PFN_NOT_FOUND (-1)
 
+#define INVALID_MFN (~0UL)
+
 /*
  *  ia64 "xm save" format is completely different than the others.
  */

Places

File crash-4.0-3.15-3.16.patch of Package crash (Revision c1bc67168c997b363420d83149e8c6f5)

Places