From owner-svn-soc-all@freebsd.org Wed Aug 19 14:56:45 2015 Return-Path: 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 76AAA9BC4E1 for ; Wed, 19 Aug 2015 14:56:45 +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 4E021F00 for ; Wed, 19 Aug 2015 14:56:45 +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 t7JEujWf024552 for ; Wed, 19 Aug 2015 14:56:45 GMT (envelope-from def@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.15.2/8.15.2/Submit) id t7JEuiuh024541 for svn-soc-all@FreeBSD.org; Wed, 19 Aug 2015 14:56:44 GMT (envelope-from def@FreeBSD.org) Date: Wed, 19 Aug 2015 14:56:44 GMT Message-Id: <201508191456.t7JEuiuh024541@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: r289924 - in soc2013/def/crashdump-head/sys: kern sys 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 19 Aug 2015 14:56:45 -0000 Author: def Date: Wed Aug 19 14:56:43 2015 New Revision: 289924 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=289924 Log: Write zeroes for headers' alignment. Modified: soc2013/def/crashdump-head/sys/kern/kern_dump.c soc2013/def/crashdump-head/sys/sys/kerneldump.h Modified: soc2013/def/crashdump-head/sys/kern/kern_dump.c ============================================================================== --- soc2013/def/crashdump-head/sys/kern/kern_dump.c Wed Aug 19 14:54:54 2015 (r289923) +++ soc2013/def/crashdump-head/sys/kern/kern_dump.c Wed Aug 19 14:56:43 2015 (r289924) @@ -115,6 +115,32 @@ } int +dumpsys_buf_seek(struct dumperinfo *di, size_t sz) +{ + uint8_t buf[DEV_BSIZE]; + size_t nbytes; + int error; + + bzero(buf, sizeof(buf)); + + while (sz > 0) { + if (sz >= sizeof(buf)) + nbytes = sizeof(buf); + else + nbytes = sz; + + error = dump_write(di, buf, 0, dumplo, nbytes); + if (error) + return (error); + dumplo += nbytes; + + sz -= nbytes; + } + + return (0); +} + +int dumpsys_buf_write(struct dumperinfo *di, char *ptr, size_t sz) { size_t len; @@ -370,7 +396,9 @@ * boundary. We cannot use MD_ALIGN on dumplo, because we don't * care and may very well be unaligned within the dump device. */ - dumplo += hdrgap; + error = dumpsys_buf_seek(di, (size_t)hdrgap); + if (error) + goto fail; /* Dump memory chunks (updates dumplo) */ error = dumpsys_foreach_chunk(dumpsys_cb_dumpdata, di); @@ -381,6 +409,7 @@ error = dump_write_header(di, &kdh, 0, dumplo); if (error) goto fail; + dumplo += sizeof(kdh); /* Signal completion, signoff and exit stage left. */ dump_write(di, NULL, 0, 0, 0); Modified: soc2013/def/crashdump-head/sys/sys/kerneldump.h ============================================================================== --- soc2013/def/crashdump-head/sys/sys/kerneldump.h Wed Aug 19 14:54:54 2015 (r289923) +++ soc2013/def/crashdump-head/sys/sys/kerneldump.h Wed Aug 19 14:56:43 2015 (r289924) @@ -145,6 +145,7 @@ typedef int dumpsys_callback_t(struct dump_pa *, int, void *); int dumpsys_foreach_chunk(dumpsys_callback_t, void *); int dumpsys_cb_dumpdata(struct dump_pa *, int, void *); +int dumpsys_buf_seek(struct dumperinfo *, size_t); int dumpsys_buf_write(struct dumperinfo *, char *, size_t); int dumpsys_buf_flush(struct dumperinfo *);