From nobody Fri Aug 26 06:58:17 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MDVzG28Nlz4ZPdj; Fri, 26 Aug 2022 06:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MDVzG1Yt2z3c56; Fri, 26 Aug 2022 06:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661497098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k2PGtT3cKtlfDw5nBax8VJX58E8iDKJpQ4V2nBNms3k=; b=gr4eEnqqGZ8uezq1F1d2+mIqkHPad5N8vZwtDGxfsQ/jX14M/Dz+soWsOxB7RSP20wmUp/ 8zJGFQeTrc03Ba32Muhnbwg+MXiEWl/pXfNIpNstu0GSBT4zsFyXAr+h6AiTYk4w8vEIFB wXaeJqPXCF4BfDl4UjhD4/iAOGvWvoCSqRvM+BZ3eUEwgn/rWZu8upnHSA1Ml8cMsj235I 597PQBMSbEcag2bihvJOOKB1gABvurbU7UzZWhBrWcJbNz59i45OmsVSs3tPlUl27a3o/L k2T+ue812Vn6S9nY8A2TLWYnjFR3vtshqIVD+5qASgR3iulsUmfnO9Dxqk2RzA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MDVzG0blQzJSc; Fri, 26 Aug 2022 06:58:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27Q6wH9v074105; Fri, 26 Aug 2022 06:58:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27Q6wHP8074104; Fri, 26 Aug 2022 06:58:17 GMT (envelope-from git) Date: Fri, 26 Aug 2022 06:58:17 GMT Message-Id: <202208260658.27Q6wHP8074104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kirk McKusick Subject: git: 495b1baac327 - main - Provide better diagnostic messages for bad cylinder groups. List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mckusick X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 495b1baac32774e00a9a975d4cedd2aa9f7d81b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661497098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k2PGtT3cKtlfDw5nBax8VJX58E8iDKJpQ4V2nBNms3k=; b=so73u9qbHQYsaDKL9a6BLwzBcWdag23v68NANVpzYFoTkJ9UV3EMnfCRcgxji12KV8Thr5 MnFr9BuxC+CM/euKKFNGKGBleZrg/Q6XLfAGSA82qZovMiKmOK8XWnE8OMOLajhvBjvhwR CrEXpZdj7xZyifLGGORIGssQOak7ZYqrt2cEnyyUEUR8vKeAGwjP/hrKqYiN1K9yUaAunF wEuCXmmpYHjT18VDw4zmys3kCLbuK7b9j/7HwpO3XvymXPzBb9BuTSdusHIXJTTyzBPBw9 ajPtNK5a7+A02kt25+Qcnf/nfkvjYnuaBsdqm2F/62CCbAukDzo/ELGpSf/X9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661497098; a=rsa-sha256; cv=none; b=ifKsz9r6hszVUv3d3vLqV3osq2aDWC036W6rMfDPS46v+BkKwQz2vNV7jzCJbW/SF6tihV oyo9+IfWaDfevZPkCWm6ML1k8FE5h5kvlf8b7kcVvKeZmdwDzFc3BJKQEHK7ymfMWqNH0G M0iidSnpimbT8AaCuCFrQWYjuh4Q20MFaYP1gHSYS264EG5RQu/+qAkz8pBhP6DVjW1Q+g /h9H7AGKCuSZyFViwGk1s16g4cY97mQY4sIO0RlOixsN0vItIahQmrTBvj7v6plM08hzii ZPjYvcS3aA/ZUkF9eWTmOVXufoOMdy/LsNgnQM49m2fN503lyj1TtNXxgzpiNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=495b1baac32774e00a9a975d4cedd2aa9f7d81b2 commit 495b1baac32774e00a9a975d4cedd2aa9f7d81b2 Author: Kirk McKusick AuthorDate: 2022-08-26 06:56:31 +0000 Commit: Kirk McKusick CommitDate: 2022-08-26 06:57:56 +0000 Provide better diagnostic messages for bad cylinder groups. Like the detailed diagnostics produced when a bad superblock is read, provide similar detailed diagnostics when bad cylinder groups are read. Reported by: Peter Holm Tested by: Peter Holm Sponsored by: The FreeBSD Foundation --- sbin/fsck_ffs/fsutil.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/sbin/fsck_ffs/fsutil.c b/sbin/fsck_ffs/fsutil.c index 57853abe5442..7d6a936c90a9 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -949,12 +949,21 @@ blzero(int fd, ufs2_daddr_t blk, long size) * Verify cylinder group's magic number and other parameters. If the * test fails, offer an option to rebuild the whole cylinder group. */ +#undef CHK +#define CHK(lhs, op, rhs, fmt) \ + if (lhs op rhs) { \ + pwarn("UFS%d superblock failed: %s (" #fmt ") %s %s (" \ + #fmt ")\n", sblock.fs_magic == FS_UFS1_MAGIC ? 1 : \ + 2, #lhs, (intmax_t)lhs, #op, #rhs, (intmax_t)rhs); \ + error = 1; \ + } int check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) { struct cg *cgp = cgbp->b_un.b_cg; uint32_t cghash, calchash; static int prevfailcg = -1; + int error; /* * Extended cylinder group checks. @@ -967,19 +976,20 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) calchash = calculate_crc32c(~0L, (void *)cgp, sblock.fs_cgsize); cgp->cg_ckhash = cghash; } - if (cgp->cg_ckhash == calchash && - cg_chkmagic(cgp) && - cgp->cg_cgx == cg && - ((sblock.fs_magic == FS_UFS1_MAGIC && - cgp->cg_old_niblk == sblock.fs_ipg && - cgp->cg_ndblk <= sblock.fs_fpg && - cgp->cg_old_ncyl <= sblock.fs_old_cpg) || - (sblock.fs_magic == FS_UFS2_MAGIC && - cgp->cg_niblk == sblock.fs_ipg && - cgp->cg_ndblk <= sblock.fs_fpg && - cgp->cg_initediblk <= sblock.fs_ipg))) { - return (1); + error = 0; + CHK(cgp->cg_ckhash, !=, calchash, "%jd"); + CHK(cg_chkmagic(cgp), ==, 0, "%jd"); + CHK(cgp->cg_cgx, !=, cg, "%jd"); + CHK(cgp->cg_ndblk, >, sblock.fs_fpg, "%jd"); + if (sblock.fs_magic == FS_UFS1_MAGIC) { + CHK(cgp->cg_old_niblk, !=, sblock.fs_ipg, "%jd"); + CHK(cgp->cg_old_ncyl, >, sblock.fs_old_cpg, "%jd"); + } else if (sblock.fs_magic == FS_UFS2_MAGIC) { + CHK(cgp->cg_niblk, !=, sblock.fs_ipg, "%jd"); + CHK(cgp->cg_initediblk, >, sblock.fs_ipg, "%jd"); } + if (error == 0) + return (1); if (prevfailcg == cg) return (0); prevfailcg = cg; @@ -1030,6 +1040,7 @@ check_cgmagic(int cg, struct bufarea *cgbp, int request_rebuild) cgp->cg_nextfreeoff = cgp->cg_clusteroff + howmany(fragstoblks(&sblock, sblock.fs_fpg), CHAR_BIT); } + cgp->cg_ckhash = calculate_crc32c(~0L, (void *)cgp, sblock.fs_cgsize); cgdirty(cgbp); return (0); }