From patchwork Thu Nov 30 04:05:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiachen Zhang X-Patchwork-Id: 171730 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp142481vqy; Wed, 29 Nov 2023 20:06:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFuifB0Zomze5Bpju90YhPD5PF1kYp/5tfpXABIMMTjySFTkeqEsheD1PN5Ui1W1POXk3bB X-Received: by 2002:a17:903:2285:b0:1cf:b964:5e37 with SMTP id b5-20020a170903228500b001cfb9645e37mr16295365plh.12.1701317181232; Wed, 29 Nov 2023 20:06:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701317181; cv=none; d=google.com; s=arc-20160816; b=M7oZMQCoOzVVS9g23ULqLntlflSWwqNj/zSuJtoDWRAaObV9TVCcu1FDvHVte45tJI wA9VA37VtUKdR0m/YtA5Nf88r/sDL5VEYM7yq3K1zrxPPheHVjeuB/Kjsp1/m0gvQPx2 nq/3IK8puWXmhvsNGCwqwyLhzBLtbkoaJ1UHGXb8FccGX8dqT3KNgA0LONtLERLTSES5 J2IXZowFffM34ELj0rjzw3Ke0aZ/p/xlS+wOlajfPfuj+VHJPgs2/9W4D1/gzOfKVXJv 0gx8XGG1eAN0/9grtRpffaNgO/bso7I5xHObuWfi+D66bPkUYIRC101r+VGlu7P3XEpC kODw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=xzZ48eJfLHHMlCtm8iE2OIqQ5CTleeJ/lIhizaNpWbg=; fh=4iLs2QAZfwC0JIm6x9zjIhpwoOot1LSNFB7mwQorO68=; b=xNvZ87ltynymkBe2EWwtePgiG03TeQmb+XNLfv+BrgOk0pk6UIoe9GoJcXmVt/VgU7 ATAM/0eL2LqcNjHaG/+5yujfuu8TnXuyZUo5PqcgfXIAWPosUu61t1W1esKsyMq0qx8x 5LrDlFQgFE1lEkRr5ku/orlUv9PoB+qz0vFsvrgcslMovHplZPMzovWRTWUCSfYyrt7a RQmWxQPEd+qZ9vlatH+MmsklCEhY95hxp1Sk4HiwJ8xeE3vu2nAUCCdog3N7vz4XzJst cWH9SxAMq4ZhIyp/RuA4c8V+rdQPpPGMkcOSM+tMb/dTLQDMQaaR52VB8oe1/n83yQ4V wBig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=UJHPcnR3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id y4-20020a17090322c400b001cff290413bsi285346plg.390.2023.11.29.20.06.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 20:06:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@bytedance.com header.s=google header.b=UJHPcnR3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=bytedance.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id C6D35802AA24; Wed, 29 Nov 2023 20:05:59 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344410AbjK3EFj (ORCPT + 99 others); Wed, 29 Nov 2023 23:05:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234966AbjK3EFg (ORCPT ); Wed, 29 Nov 2023 23:05:36 -0500 Received: from mail-pj1-x1030.google.com (mail-pj1-x1030.google.com [IPv6:2607:f8b0:4864:20::1030]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0CBF710DF for ; Wed, 29 Nov 2023 20:05:42 -0800 (PST) Received: by mail-pj1-x1030.google.com with SMTP id 98e67ed59e1d1-285636785ddso584188a91.3 for ; Wed, 29 Nov 2023 20:05:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701317141; x=1701921941; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=xzZ48eJfLHHMlCtm8iE2OIqQ5CTleeJ/lIhizaNpWbg=; b=UJHPcnR3IAmJ6BxYQcXs7BT0KpYQYFtB/3DXw8JWcNb7fSZ8IRsEXMwkCdiQ8HdeVO CwzuFiUDBemxBQElnHO7aGUMkApPCPUahx87zMrLqmp7fCSl2tyYA7MgOWgU0cXyoBh5 YMb0H62WuMO8EJqVlA5yO5E624R6AC6/VLMM6UEZnZ/vCYrmBnGD5zKG5hUVoRxfUomX U7AS8n3KzT93bvXas47dqpCCID49mN5djQx/cFUH4xF2+Dc41RhNAvQu2/n5ywgDDkdO 2z1kvP48MKjlbkKdPgnk46k/32CqphqTNvOkHDBpGcVLKJr3I+rCU5i9pSU11Y0ldU95 Hd5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701317141; x=1701921941; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=xzZ48eJfLHHMlCtm8iE2OIqQ5CTleeJ/lIhizaNpWbg=; b=dPbQeqIe5OHM4Gf/oIK6XwKPPQjtttikZGCHFkcPay+DIWURe0fpPBzh1BcN+RxBw9 9oSgR5AMpKRplb82Aqvu3bDJUT11J6thQaxouUkk0oGR59XVhkbg5mbH8UngsT8267Lc M7i2WkUqn8T43PuoCfQPYs/NAV3bQprBOolIxuHE08au/jIJsEY1yf5RUuFuOeVGz+Lc HNChQjj2xOmRVgXsiQdk3vyOadpf4fUkGkf4cUmCkKoUrtTalhBYgQYSjvkNutDsNC1G i6OK1ol4o2NxSLU4TcGkdedH+DSQ/jCCus+CNDzIMeDVwn4vU9eTSomHyF6lcdJY7AFC Y+Iw== X-Gm-Message-State: AOJu0YyWTeA4FWTMv8zmighrSP8/gtD+4YfIH4JI1HJGo8sXFmyQrdC4 5j8qAbKT8cJ6hhK9PjBMm6dkTw== X-Received: by 2002:a17:90b:3a8c:b0:285:d720:b568 with SMTP id om12-20020a17090b3a8c00b00285d720b568mr11942054pjb.27.1701317141432; Wed, 29 Nov 2023 20:05:41 -0800 (PST) Received: from localhost.localdomain ([61.213.176.7]) by smtp.gmail.com with ESMTPSA id u6-20020a170903124600b001d01c970119sm174181plh.275.2023.11.29.20.05.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Nov 2023 20:05:40 -0800 (PST) From: Jiachen Zhang To: Chandan Babu R , "Darrick J. Wong" Cc: Dave Chinner , Allison Henderson , Zhang Tianci , Brian Foster , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, xieyongji@bytedance.com, me@jcix.top, Dave Chinner Subject: [PATCH v3 2/3] xfs: update dir3 leaf block metadata after swap Date: Thu, 30 Nov 2023 12:05:15 +0800 Message-Id: <20231130040516.35677-3-zhangjiachen.jaycee@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231130040516.35677-1-zhangjiachen.jaycee@bytedance.com> References: <20231130040516.35677-1-zhangjiachen.jaycee@bytedance.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Wed, 29 Nov 2023 20:06:00 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783960364527783071 X-GMAIL-MSGID: 1783960364527783071 From: Zhang Tianci xfs_da3_swap_lastblock() copy the last block content to the dead block, but do not update the metadata in it. We need update some metadata for some kinds of type block, such as dir3 leafn block records its blkno, we shall update it to the dead block blkno. Otherwise, before write the xfs_buf to disk, the verify_write() will fail in blk_hdr->blkno != xfs_buf->b_bn, then xfs will be shutdown. We will get this warning: XFS (dm-0): Metadata corruption detected at xfs_dir3_leaf_verify+0xa8/0xe0 [xfs], xfs_dir3_leafn block 0x178 XFS (dm-0): Unmount and run xfs_repair XFS (dm-0): First 128 bytes of corrupted metadata buffer: 00000000e80f1917: 00 80 00 0b 00 80 00 07 3d ff 00 00 00 00 00 00 ........=....... 000000009604c005: 00 00 00 00 00 00 01 a0 00 00 00 00 00 00 00 00 ................ 000000006b6fb2bf: e4 44 e3 97 b5 64 44 41 8b 84 60 0e 50 43 d9 bf .D...dDA..`.PC.. 00000000678978a2: 00 00 00 00 00 00 00 83 01 73 00 93 00 00 00 00 .........s...... 00000000b28b247c: 99 29 1d 38 00 00 00 00 99 29 1d 40 00 00 00 00 .).8.....).@.... 000000002b2a662c: 99 29 1d 48 00 00 00 00 99 49 11 00 00 00 00 00 .).H.....I...... 00000000ea2ffbb8: 99 49 11 08 00 00 45 25 99 49 11 10 00 00 48 fe .I....E%.I....H. 0000000069e86440: 99 49 11 18 00 00 4c 6b 99 49 11 20 00 00 4d 97 .I....Lk.I. ..M. XFS (dm-0): xfs_do_force_shutdown(0x8) called from line 1423 of file fs/xfs/xfs_buf.c. Return address = 00000000c0ff63c1 XFS (dm-0): Corruption of in-memory data detected. Shutting down filesystem XFS (dm-0): Please umount the filesystem and rectify the problem(s) From the log above, we know xfs_buf->b_no is 0x178, but the block's hdr record its blkno is 0x1a0. Fixes: 24df33b45ecf ("xfs: add CRC checking to dir2 leaf blocks") Signed-off-by: Zhang Tianci Suggested-by: Dave Chinner Reviewed-by: Darrick J. Wong Reviewed-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_da_btree.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index e576560b46e9..f3f987a65bc1 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -2316,10 +2316,18 @@ xfs_da3_swap_lastblock( return error; /* * Copy the last block into the dead buffer and log it. + * If xfs enable crc, the node/leaf block records its blkno, we + * must update it. */ memcpy(dead_buf->b_addr, last_buf->b_addr, args->geo->blksize); + if (xfs_has_crc(mp)) { + struct xfs_da3_blkinfo *da3 = dead_buf->b_addr; + + da3->blkno = cpu_to_be64(xfs_buf_daddr(dead_buf)); + } xfs_trans_log_buf(tp, dead_buf, 0, args->geo->blksize - 1); dead_info = dead_buf->b_addr; + /* * Get values from the moved block. */