From nobody Sun Dec 11 00:38:14 2022 X-Original-To: dev-commits-src-all@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 4NV5TM1hxQz4jgs4; Sun, 11 Dec 2022 00:38:15 +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 4NV5TM1BR2z4HHb; Sun, 11 Dec 2022 00:38:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719095; 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=LDWfTNNaFHwFVyFofMMcoPuZid1DBazjyN84r646f3g=; b=WThtkgD+n0lwK6tTcBmk7YX8Tk90UDtVOXSKRPupDwhuo6Zwrl7ceqFAyjbh/EGedYU9q7 ioLmqnHjOgikiVyIOj9tWtK0RrkQv3018Oztm7XU3P9vXd1DHmk0lMUdEJt3F6mXkL3TGQ l6SG25BAN2oNTs/eP9n68MYaDN/54Krtau7jIgiIGRn9A6Tr6KPf36kwqKru3VdWsNb8rE gyqogVTtE7A4bFnESyvEJAjTlIXsunpMxTZqswcbici7K86id+Ch84JaaOTXbHnYAHFN2v 3UgQ60C43/MLJP7cMe1CTaAxkdLri/p34n5ozD3pkpwVmn3KIvHFSYhwTK7MgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670719095; 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=LDWfTNNaFHwFVyFofMMcoPuZid1DBazjyN84r646f3g=; b=qoFYyMb64CfT2IiMPXiHdGBl2ttLaj8poBucMqtxIeAMmAEJC7TYWDFKsc7uXm+54hDglr cxq3ZyCpbcV/zHneRNHD8V2+Q4IFRaHzVQhS0mxp+fXhoeBw0t38FsxqQ7JuvoZCNa6OHd zop0zbpVfhIVVhHSgtktRd7Bud/8myX1qehWBm9SjDOnGQRSQpm8mRQqytr1pT7nnAkpb1 C8cXNmHUFCvdzdXcSLIWP3PmuvttdbkZ19CuViE6zGzNtIpm+V7SH32Oq9T3UgkJTGJ/fL ruozNr6YQYSDPaS1/AqI+k9+5Alw+NmOkSEwau2wT2Iz1avQPsGs6SPGK5SmDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670719095; a=rsa-sha256; cv=none; b=jrSLG4QmEzpwuizZTXWsDAwk7tWImTYJ4bNSv+nna4gaEbD7mlW0xZQM4XeL0hkbTSaSst cw9EgLIXzactRqGmvZVEsm0AyVvJUSvYSYjnNgruTluaQPVLd38cX08Uls4IHXWwjR3+Id 66HjtTLZL4Mp6XoBvnefs3WiHTbQnCm92yMdcaYk/HElzqDItBlFwQOQvRwxLOJ+YuYCWE AcxbXDXwG6JXJZoDhg27Uunat7P62diX5THEPm1p71s9CSI6ewKycq9xf3FoELfg9oJYg5 YxLi4AqLUeJN9hEAuqVvk+y+ylFypsFe0qcZP5RR69PcRDhSfaHC5w0XcDkfkw== 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 4NV5TM0FjGzbRS; Sun, 11 Dec 2022 00:38:15 +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 2BB0cE8G003846; Sun, 11 Dec 2022 00:38:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BB0cEa7003845; Sun, 11 Dec 2022 00:38:14 GMT (envelope-from git) Date: Sun, 11 Dec 2022 00:38:14 GMT Message-Id: <202212110038.2BB0cEa7003845@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kirk McKusick Subject: git: 6d43823851ab - stable/13 - Provide better diagnostic messages for bad cylinder groups. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d43823851ab7f3c9cf60b492a476c905b2b6a4a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mckusick: URL: https://cgit.FreeBSD.org/src/commit/?id=6d43823851ab7f3c9cf60b492a476c905b2b6a4a commit 6d43823851ab7f3c9cf60b492a476c905b2b6a4a Author: Kirk McKusick AuthorDate: 2022-08-26 06:56:31 +0000 Commit: Kirk McKusick CommitDate: 2022-12-11 00:37:17 +0000 Provide better diagnostic messages for bad cylinder groups. (cherry picked from commit 495b1baac32774e00a9a975d4cedd2aa9f7d81b2) 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 dfe472ab17fb..0097ddff135e 100644 --- a/sbin/fsck_ffs/fsutil.c +++ b/sbin/fsck_ffs/fsutil.c @@ -948,12 +948,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. @@ -966,19 +975,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; @@ -1029,6 +1039,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); }