From owner-svn-src-user@freebsd.org Tue Mar 6 21:45:24 2018 Return-Path: Delivered-To: svn-src-user@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id AF7A1F322D2 for ; Tue, 6 Mar 2018 21:45:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 5EC046D313; Tue, 6 Mar 2018 21:45:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 59AE3187AB; Tue, 6 Mar 2018 21:45:24 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w26LjOCq043394; Tue, 6 Mar 2018 21:45:24 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w26LjOrb043392; Tue, 6 Mar 2018 21:45:24 GMT (envelope-from markj@FreeBSD.org) Message-Id: <201803062145.w26LjOrb043392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Tue, 6 Mar 2018 21:45:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r330553 - in user/markj/netdump/sys: kern sys X-SVN-Group: user X-SVN-Commit-Author: markj X-SVN-Commit-Paths: in user/markj/netdump/sys: kern sys X-SVN-Commit-Revision: 330553 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2018 21:45:25 -0000 Author: markj Date: Tue Mar 6 21:45:23 2018 New Revision: 330553 URL: https://svnweb.freebsd.org/changeset/base/330553 Log: Simplify the kernel dump length calculation. Modified: user/markj/netdump/sys/kern/kern_shutdown.c user/markj/netdump/sys/sys/conf.h Modified: user/markj/netdump/sys/kern/kern_shutdown.c ============================================================================== --- user/markj/netdump/sys/kern/kern_shutdown.c Tue Mar 6 21:16:44 2018 (r330552) +++ user/markj/netdump/sys/kern/kern_shutdown.c Tue Mar 6 21:45:23 2018 (r330553) @@ -1369,11 +1369,13 @@ dump_start(struct dumperinfo *di, struct kerneldumphea kdh->dumpextent = htod64(dumpextent); } - /* The offset at which to begin writing the dump. */ + /* + * The offset at which to begin writing the dump. + */ di->dumpoff = di->mediaoffset + di->mediasize - di->blocksize - dumpextent; } - + di->origdumpoff = di->dumpoff; return (error); } @@ -1462,18 +1464,13 @@ dump_finish(struct dumperinfo *di, struct kerneldumphe * We now know the size of the compressed dump, so update the * header accordingly and recompute parity. */ - kdh->dumplength = htod64(di->dumpoff - - (di->mediaoffset + di->mediasize - di->blocksize - extent)); + kdh->dumplength = htod64(di->dumpoff - di->origdumpoff); kdh->parity = 0; kdh->parity = kerneldump_parity(kdh); compressor_reset(di->kdcomp->kdc_stream); } - /* - * Write kerneldump headers at the beginning and end of the dump extent. - * Write the key after the leading header. - */ error = dump_write_headers(di, kdh); if (error != 0) return (error); Modified: user/markj/netdump/sys/sys/conf.h ============================================================================== --- user/markj/netdump/sys/sys/conf.h Tue Mar 6 21:16:44 2018 (r330552) +++ user/markj/netdump/sys/sys/conf.h Tue Mar 6 21:45:23 2018 (r330553) @@ -344,8 +344,11 @@ struct dumperinfo { u_int maxiosize; /* Max size allowed for an individual I/O */ off_t mediaoffset; /* Initial offset in bytes. */ off_t mediasize; /* Space available in bytes. */ + + /* MI kernel dump state. */ void *blockbuf; /* Buffer for padding shorter dump blocks */ off_t dumpoff; /* Offset of ongoing kernel dump. */ + off_t origdumpoff; /* Starting dump offset. */ struct kerneldumpcrypto *kdcrypto; /* Kernel dump crypto. */ struct kerneldumpcomp *kdcomp; /* Kernel dump compression. */ };