From nobody Mon Dec 29 09:47:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6945EC4167B for ; Wed, 29 Nov 2023 08:00:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229953AbjK2IAB (ORCPT ); Wed, 29 Nov 2023 03:00:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230017AbjK2H75 (ORCPT ); Wed, 29 Nov 2023 02:59:57 -0500 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2047D19BD for ; Tue, 28 Nov 2023 23:59:40 -0800 (PST) Received: by mail-pl1-x633.google.com with SMTP id d9443c01a7336-1cf8e569c35so43101485ad.0 for ; Tue, 28 Nov 2023 23:59:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701244779; x=1701849579; 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=78NIK428pGiojxSDNWuMJ5fRqtEcCx+gV7bFdG2Ovq8=; b=Oz13soOzsu6BHrc4+0u8Jjs6cj1lFEupiVtcNlaEuJxlneeI3NdrWvXA5QCOo5TIVp Tv46PBCTX/i+zGfYsUSfGZ547snaTTtMr3RnNSKfo6hqERJkZYW0Zgt4dFeo9qBGVeym fQha9NE/YyGLCCQnfeaD5jb6/RX6pkOKQRyXRCwSW41EFMJlbSOtw/oPNuBJbP67hAij q3WhTBERAmWxrb4Bgq8klNw+XQb3UgUnxiFyAidLqR9xLMTaZ4hmenOBMxdUIUT+3e0y /Ny11Talta+e6fQPtZZIyyYQAUyw+drRi7UgRtIzYcp46TEI5sLE7tMAH/C7AHFLdUG7 LTyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701244779; x=1701849579; 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=78NIK428pGiojxSDNWuMJ5fRqtEcCx+gV7bFdG2Ovq8=; b=QcxpGih26nTlEo3IfAFx12ZEzD/yab2+IgOjU3nH4ABM/11W3naciYaEs2wjXeK27k ZuADOjneotXyx3OIB08SLLWgyfDP2cwhgf+Vh9+PsHJBL7hxTWyPIKi9KK66JXzVEmd4 VRk2sU1yFdyNOpKBcrq6G/PJu8n6IjIn0S4l1gxGBtYShgaH6UW/wAGDg5FAWxW5bBPf EbtcVscgdyUN1sQeI4Qy2hdtHCV8yEp5OgY4Lk9HClMfKOe5SaAJuUQdsHznK8uRlK9H BVkaaF5EVnYcfhaMZ0afYn0C5Qg9PfYCvjTN1DtSgIyS39chccgSbXLmRv5iSJ0O9Ei5 DkRw== X-Gm-Message-State: AOJu0YxsSz1FoKYrLl084kBYNgnwLp0olHJ9gm/sJq7UKAgrp8PlUthI 7v6yhAORyQwjcpdJkCzvyUCC+w== X-Google-Smtp-Source: AGHT+IEAGtGte403VceLMAhkoD5W57e2RDirElbea/DiY0S0ovB97/9LItu+U0AO+5U1dkuRbbSEhA== X-Received: by 2002:a17:903:48c:b0:1cf:b3ed:817 with SMTP id jj12-20020a170903048c00b001cfb3ed0817mr13667907plb.20.1701244779597; Tue, 28 Nov 2023 23:59:39 -0800 (PST) Received: from localhost.localdomain ([61.213.176.9]) by smtp.gmail.com with ESMTPSA id s17-20020a170902989100b001cfd0ddc5d3sm4979419plp.277.2023.11.28.23.59.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 23:59:39 -0800 (PST) From: Jiachen Zhang To: Chandan Babu R , "Darrick J. Wong" Cc: Dave Chinner , Allison Henderson , Zhang Tianci , Brian Foster , Ben Myers , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, xieyongji@bytedance.com, me@jcix.top, Jiachen Zhang , Christoph Hellwig Subject: [PATCH v2 1/2] xfs: ensure logflagsp is initialized in xfs_bmap_del_extent_real Date: Wed, 29 Nov 2023 15:58:31 +0800 Message-Id: <20231129075832.73600-2-zhangjiachen.jaycee@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231129075832.73600-1-zhangjiachen.jaycee@bytedance.com> References: <20231129075832.73600-1-zhangjiachen.jaycee@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In the case of returning -ENOSPC, ensure logflagsp is initialized by 0. Otherwise the caller __xfs_bunmapi will set uninitialized illegal tmp_logflags value into xfs log, which might cause unpredictable error in the log recovery procedure. Also, remove the flags variable and set the *logflagsp directly, so that the code should be more robust in the long run. Fixes: 1b24b633aafe ("xfs: move some more code into xfs_bmap_del_extent_rea= l") Signed-off-by: Jiachen Zhang Reviewed-by: Christoph Hellwig --- fs/xfs/libxfs/xfs_bmap.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index be62acffad6c..9435bd6c950b 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c @@ -5010,7 +5010,6 @@ xfs_bmap_del_extent_real( xfs_fileoff_t del_endoff; /* first offset past del */ int do_fx; /* free extent at end of routine */ int error; /* error return value */ - int flags =3D 0;/* inode logging flags */ struct xfs_bmbt_irec got; /* current extent entry */ xfs_fileoff_t got_endoff; /* first offset past got */ int i; /* temp state */ @@ -5023,6 +5022,8 @@ xfs_bmap_del_extent_real( uint32_t state =3D xfs_bmap_fork_to_state(whichfork); struct xfs_bmbt_irec old; =20 + *logflagsp =3D 0; + mp =3D ip->i_mount; XFS_STATS_INC(mp, xs_del_exlist); =20 @@ -5048,10 +5049,12 @@ xfs_bmap_del_extent_real( if (tp->t_blk_res =3D=3D 0 && ifp->if_format =3D=3D XFS_DINODE_FMT_EXTENTS && ifp->if_nextents >=3D XFS_IFORK_MAXEXT(ip, whichfork) && - del->br_startoff > got.br_startoff && del_endoff < got_endoff) - return -ENOSPC; + del->br_startoff > got.br_startoff && del_endoff < got_endoff) { + error =3D -ENOSPC; + goto done; + } =20 - flags =3D XFS_ILOG_CORE; + *logflagsp =3D XFS_ILOG_CORE; if (whichfork =3D=3D XFS_DATA_FORK && XFS_IS_REALTIME_INODE(ip)) { if (!(bflags & XFS_BMAPI_REMAP)) { error =3D xfs_rtfree_blocks(tp, del->br_startblock, @@ -5093,9 +5096,9 @@ xfs_bmap_del_extent_real( xfs_iext_prev(ifp, icur); ifp->if_nextents--; =20 - flags |=3D XFS_ILOG_CORE; + *logflagsp |=3D XFS_ILOG_CORE; if (!cur) { - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); break; } if ((error =3D xfs_btree_delete(cur, &i))) @@ -5114,7 +5117,7 @@ xfs_bmap_del_extent_real( got.br_blockcount -=3D del->br_blockcount; xfs_iext_update_extent(ip, state, icur, &got); if (!cur) { - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); break; } error =3D xfs_bmbt_update(cur, &got); @@ -5128,7 +5131,7 @@ xfs_bmap_del_extent_real( got.br_blockcount -=3D del->br_blockcount; xfs_iext_update_extent(ip, state, icur, &got); if (!cur) { - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); break; } error =3D xfs_bmbt_update(cur, &got); @@ -5150,7 +5153,7 @@ xfs_bmap_del_extent_real( new.br_state =3D got.br_state; new.br_startblock =3D del_endblock; =20 - flags |=3D XFS_ILOG_CORE; + *logflagsp |=3D XFS_ILOG_CORE; if (cur) { error =3D xfs_bmbt_update(cur, &got); if (error) @@ -5191,7 +5194,7 @@ xfs_bmap_del_extent_real( * to the original value. */ xfs_iext_update_extent(ip, state, icur, &old); - flags =3D 0; + *logflagsp =3D 0; error =3D -ENOSPC; goto done; } @@ -5200,7 +5203,7 @@ xfs_bmap_del_extent_real( goto done; } } else - flags |=3D xfs_ilog_fext(whichfork); + *logflagsp |=3D xfs_ilog_fext(whichfork); =20 ifp->if_nextents++; xfs_iext_next(ifp, icur); @@ -5240,7 +5243,6 @@ xfs_bmap_del_extent_real( xfs_trans_mod_dquot_byino(tp, ip, qfield, (long)-nblks); =20 done: - *logflagsp =3D flags; return error; } =20 --=20 2.20.1 From nobody Mon Dec 29 09:47:04 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 037E2C4167B for ; Wed, 29 Nov 2023 07:59:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229994AbjK2H7m (ORCPT ); Wed, 29 Nov 2023 02:59:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229542AbjK2H7k (ORCPT ); Wed, 29 Nov 2023 02:59:40 -0500 Received: from mail-pg1-x533.google.com (mail-pg1-x533.google.com [IPv6:2607:f8b0:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E7EF61A5 for ; Tue, 28 Nov 2023 23:59:46 -0800 (PST) Received: by mail-pg1-x533.google.com with SMTP id 41be03b00d2f7-5c229dabbb6so4289709a12.0 for ; Tue, 28 Nov 2023 23:59:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701244786; x=1701849586; 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=ZGwa/klWYWx3gVbFO7UV3sjDmi0cMp8GGfC8jWdaqOs=; b=U4fxZJjrLknoM74F9M5SQZuwCbht/oZCeNcVFO/UDjyCFXMQKykI6sSpbuXLh8qpzS 17GlZkRmkQguChrXSjd3Bs+dPa/n3ZZTsFlykxwXvMxQ9F/nu7QAsWbDLIdA1KiVV0TO KXKxM5xQ0uXs+2UGmvFvFP7ywILl9QWIRH1J4TVOXM4Z2Jbn9qMayUhlQIJ26B58yNeP JmAQTz8P4eTyEDtxOWrZd27YKWYjMqJkZhmtBcGBRwJo5faoBKYwJ0Sizh13q177vE+L W/72gQsZwBRSGbg0mmN5VRUp48zW/V+ZRhypeBeo9QrxDQvskk4xxBFXuAaBFD9lD/3R 0y1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701244786; x=1701849586; 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=ZGwa/klWYWx3gVbFO7UV3sjDmi0cMp8GGfC8jWdaqOs=; b=uA91jtsxjCP+ZjN6gBt8FE0yKxa6fubQDG3yAJaltSC0AeC0uk361xDCKpHxy6HZUk lENuek5ZFBJ7LiE1s3C3u2yl8+buG181dH247EjZMYTFno+bh4sjfqNdykvxXx3PUKsq Dh0eutOo1M3S2Vqqk0QVkjOStraTfHUo5aCK7fXD8UPDIxiKs0QOO4/ouYgepBTwj9n+ GoaFJ0lJv/mFLlimazeft0V7ykgniKJdfqzFCwuZ8Bp9DmU14cCA3JO21+2hRLERApJ8 AoLNQtEdizLBi53epoZjD1U1gGIm7FFT2YI5WVN2vYIqOI9HWQ0P4QuTryljrZTuK5zK yEUA== X-Gm-Message-State: AOJu0YxtXk3abOPR6fhbuIMkhCjg0TBtjXR1EdL7ML6Oh2CmxGmeWBLi +W9mTrdMk3qdoz/72PFu5iw4Aw== X-Google-Smtp-Source: AGHT+IEW7RY6rW1xN0SZYk2KmfKRhGALSQC7dhZKn7nt9rZPJDObYoCq4CCKaltza5Ttsehw10eh9Q== X-Received: by 2002:a05:6a20:6a0e:b0:18b:8158:b115 with SMTP id p14-20020a056a206a0e00b0018b8158b115mr20395186pzk.56.1701244786219; Tue, 28 Nov 2023 23:59:46 -0800 (PST) Received: from localhost.localdomain ([61.213.176.9]) by smtp.gmail.com with ESMTPSA id s17-20020a170902989100b001cfd0ddc5d3sm4979419plp.277.2023.11.28.23.59.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Nov 2023 23:59:45 -0800 (PST) From: Jiachen Zhang To: Chandan Babu R , "Darrick J. Wong" Cc: Dave Chinner , Allison Henderson , Zhang Tianci , Brian Foster , Ben Myers , linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, xieyongji@bytedance.com, me@jcix.top, Dave Chinner Subject: [PATCH v2 2/2] xfs: update dir3 leaf block metadata after swap Date: Wed, 29 Nov 2023 15:58:32 +0800 Message-Id: <20231129075832.73600-3-zhangjiachen.jaycee@bytedance.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231129075832.73600-1-zhangjiachen.jaycee@bytedance.com> References: <20231129075832.73600-1-zhangjiachen.jaycee@bytedance.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" 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 !=3D 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/0xe= 0 [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 ......= ..=3D....... 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...d= DA..`.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/x= fs/xfs_buf.c. Return address =3D 00000000c0ff63c1 XFS (dm-0): Corruption of in-memory data detected. Shutting down filesys= tem 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 rec= ord its blkno is 0x1a0. Fixes: 24df33b45ecf ("xfs: add CRC checking to dir2 leaf blocks") Signed-off-by: Zhang Tianci Suggested-by: Dave Chinner --- fs/xfs/libxfs/xfs_da_btree.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index e576560b46e9..d11e6286e466 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c @@ -2318,8 +2318,17 @@ xfs_da3_swap_lastblock( * Copy the last block into the dead buffer and log it. */ memcpy(dead_buf->b_addr, last_buf->b_addr, args->geo->blksize); - xfs_trans_log_buf(tp, dead_buf, 0, args->geo->blksize - 1); dead_info =3D dead_buf->b_addr; + /* + * If xfs enable crc, the node/leaf block records its blkno, we + * must update it. + */ + if (xfs_has_crc(mp)) { + struct xfs_da3_blkinfo *da3 =3D container_of(dead_info, struct xfs_da3_b= lkinfo, hdr); + + da3->blkno =3D cpu_to_be64(xfs_buf_daddr(dead_buf)); + } + xfs_trans_log_buf(tp, dead_buf, 0, args->geo->blksize - 1); /* * Get values from the moved block. */ --=20 2.20.1