From owner-svn-src-head@freebsd.org Sun Jan 14 16:55:15 2018 Return-Path: Delivered-To: svn-src-head@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 E3B4BE7A362; Sun, 14 Jan 2018 16:55:15 +0000 (UTC) (envelope-from imp@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 BEDFC83582; Sun, 14 Jan 2018 16:55:15 +0000 (UTC) (envelope-from imp@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 082EE24621; Sun, 14 Jan 2018 16:55:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0EGtE48044165; Sun, 14 Jan 2018 16:55:14 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0EGtEGj044164; Sun, 14 Jan 2018 16:55:14 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201801141655.w0EGtEGj044164@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 14 Jan 2018 16:55:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r327970 - head/sbin/fsck_ffs X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sbin/fsck_ffs X-SVN-Commit-Revision: 327970 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jan 2018 16:55:16 -0000 Author: imp Date: Sun Jan 14 16:55:14 2018 New Revision: 327970 URL: https://svnweb.freebsd.org/changeset/base/327970 Log: Report CG checksum mismatches. These errors are non-fatal. The previous behavior is preserved (the CG checksum is fixed). We're just noisy about it now. Reviewed by: kirk@ Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D13884 Modified: head/sbin/fsck_ffs/pass5.c Modified: head/sbin/fsck_ffs/pass5.c ============================================================================== --- head/sbin/fsck_ffs/pass5.c Sun Jan 14 16:04:51 2018 (r327969) +++ head/sbin/fsck_ffs/pass5.c Sun Jan 14 16:55:14 2018 (r327970) @@ -63,7 +63,7 @@ pass5(void) int inomapsize, blkmapsize; struct fs *fs = &sblock; ufs2_daddr_t d, dbase, dmax, start; - int rewritecg = 0; + int rewritecg = 0, cgckadd = 0; struct csum *cs; struct csum_total cstotal; struct inodesc idesc[3]; @@ -80,6 +80,7 @@ pass5(void) reply("ADD CYLINDER GROUP CHECKSUM PROTECTION") != 0) { fs->fs_metackhash |= CK_CYLGRP; rewritecg = 1; + cgckadd = 1; sbdirty(); } if (cvtlevel >= 3) { @@ -177,6 +178,16 @@ pass5(void) cg = cgbp->b_un.b_cg; if (!cg_chkmagic(cg)) pfatal("CG %d: BAD MAGIC NUMBER\n", c); + if ((fs->fs_metackhash & CK_CYLGRP) != 0 && cgckadd == 0) { + uint32_t ckhash, thishash; + + ckhash = cg->cg_ckhash; + cg->cg_ckhash = 0; + thishash = calculate_crc32c(~0L, cg, fs->fs_cgsize); + if (ckhash != thishash) + pwarn("CG %d: BAD CHECKSUM %#x vs %#x", c, ckhash, thishash); + cg->cg_ckhash = ckhash; + } newcg->cg_time = cg->cg_time; newcg->cg_old_time = cg->cg_old_time; newcg->cg_unrefs = cg->cg_unrefs;