From owner-svn-soc-all@freebsd.org  Sun Aug  9 23:31:46 2015
Return-Path: <owner-svn-soc-all@freebsd.org>
Delivered-To: svn-soc-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75DC799DB6D
 for <svn-soc-all@mailman.ysv.freebsd.org>;
 Sun,  9 Aug 2015 23:31:46 +0000 (UTC) (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org (socsvn.freebsd.org
 [IPv6:2001:1900:2254:206a::50:2])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 62C85B5E
 for <svn-soc-all@FreeBSD.org>; Sun,  9 Aug 2015 23:31:46 +0000 (UTC)
 (envelope-from def@FreeBSD.org)
Received: from socsvn.freebsd.org ([127.0.1.124])
 by socsvn.freebsd.org (8.15.2/8.15.2) with ESMTP id t79NVkm9007843
 for <svn-soc-all@FreeBSD.org>; Sun, 9 Aug 2015 23:31:46 GMT
 (envelope-from def@FreeBSD.org)
Received: (from www@localhost)
 by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t79NVjDc007839
 for svn-soc-all@FreeBSD.org; Sun, 9 Aug 2015 23:31:45 GMT
 (envelope-from def@FreeBSD.org)
Date: Sun, 9 Aug 2015 23:31:45 GMT
Message-Id: <201508092331.t79NVjDc007839@socsvn.freebsd.org>
X-Authentication-Warning: socsvn.freebsd.org: www set sender to
 def@FreeBSD.org using -f
From: def@FreeBSD.org
To: svn-soc-all@FreeBSD.org
Subject: socsvn commit: r289498 - soc2013/def/crashdump-head/sys/kern
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-soc-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the entire Summer of Code repository
 <svn-soc-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-soc-all/>
List-Post: <mailto:svn-soc-all@freebsd.org>
List-Help: <mailto:svn-soc-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-soc-all>,
 <mailto:svn-soc-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Aug 2015 23:31:46 -0000

Author: def
Date: Sun Aug  9 23:31:45 2015
New Revision: 289498
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289498

Log:
  Add EKCD support for physical dumps.

Modified:
  soc2013/def/crashdump-head/sys/kern/kern_dump.c

Modified: soc2013/def/crashdump-head/sys/kern/kern_dump.c
==============================================================================
--- soc2013/def/crashdump-head/sys/kern/kern_dump.c	Sun Aug  9 23:25:41 2015	(r289497)
+++ soc2013/def/crashdump-head/sys/kern/kern_dump.c	Sun Aug  9 23:31:45 2015	(r289498)
@@ -322,12 +322,14 @@
 	hdrgap = fileofs - DEV_ALIGN(hdrsz);
 
 	/* Determine dump offset on device. */
-	if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2) {
+	if (di->mediasize < SIZEOF_METADATA + dumpsize + sizeof(kdh) * 2 +
+	    kerneldumpkey_size(di->kdk)) {
 		error = ENOSPC;
 		goto fail;
 	}
 	dumplo = di->mediaoffset + di->mediasize - dumpsize;
 	dumplo -= sizeof(kdh) * 2;
+	dumplo -= kerneldumpkey_size(di->kdk);
 
 	mkdumpheader(&kdh, KERNELDUMPMAGIC, KERNELDUMP_ARCH_VERSION, dumpsize,
 	    kerneldumpkey_size(di->kdk), di->blocksize);
@@ -336,11 +338,17 @@
 	    ehdr.e_phnum - DUMPSYS_NUM_AUX_HDRS);
 
 	/* Dump leader */
-	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
+	error = dump_write_header(di, &kdh, 0, dumplo);
 	if (error)
 		goto fail;
 	dumplo += sizeof(kdh);
 
+	/* Dump key */
+	error = dump_write_key(di, di->kdk, 0, dumplo);
+	if (error)
+		goto fail;
+	dumplo += kerneldumpkey_size(di->kdk);
+
 	/* Dump ELF header */
 	error = dumpsys_buf_write(di, (char*)&ehdr, sizeof(ehdr));
 	if (error)
@@ -370,7 +378,7 @@
 		goto fail;
 
 	/* Dump trailer */
-	error = dump_write(di, &kdh, 0, dumplo, sizeof(kdh));
+	error = dump_write_header(di, &kdh, 0, dumplo);
 	if (error)
 		goto fail;