From nobody Mon Apr 6 09:49:45 2026 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 196932DF13F for ; Fri, 20 Mar 2026 03:12:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773976372; cv=none; b=IOjxpWSbtqueqqBq8+Ho8d9dEZHp6iyKAGejsT60WtGOOX2et9Wxt3QqDlZfGaiqLaGlC1bLl6/IiTyiOLc4u9T4OWal1gw0e7mvD6z0OGVAd1YrvbGuxBhwzfdBc86U31j8Q+RwBSSKXFSBUgqrhv6mOiGW85cQ8rLshDEpDts= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773976372; c=relaxed/simple; bh=NvV+h593Ou5IBnxtUlqtw1Pyy++rLNAuvH0B1AJ01CI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=bzdLsGzvL2hvTKzOV4mXyzs5lnwF08LRZU3rRM85iNrLbBNH+VxdjoCcvG4qs1r79497wvXFpcAggI2JQ6oEa5brg1ODCNj+DuVUFzdE5F68h1IVHQ+zjtCESKJMckphRHVFWCiB+64r4b4ULCQtlSDqYUFjz9gVFLeSfloiFic= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=J72F7E6l; arc=none smtp.client-ip=209.85.214.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="J72F7E6l" Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-2b04b4974abso14366785ad.1 for ; Thu, 19 Mar 2026 20:12:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773976370; x=1774581170; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=4I6B8Rx4hDXdmswJxNp2RjYpERKWQN7pv7OUIlU9OXM=; b=J72F7E6l2u5ftLiq8lu2Nf13vGpquLSXaBwhQ9O9g7NEDaBvAUGjKPFvLX7xvspe8g EaGry8PsI97ZptjuIgCIfVYScXFq/x+cg9vce/bRNhSNdcXdUKT+2j5X9KGasqT2F/oO uCV0n7V/E7zhLtT8RE3fmMnpBDv/lRUz+g+fmldFfylwWWs0TViCG3zPae6pviv5E0qF rTB57PYJ2B1H7qS8E5EydNSd67FeToeuJdbUZwT4nmxjbNohFsq5Tl4YmPZpyfAlwrVN x8fn7FOmgBbpotHgBVYqjbxJl3df2Ra7/qo9ekRsry8UUC2afcUYy8d8HV27BAhSWGVz tVuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773976370; x=1774581170; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=4I6B8Rx4hDXdmswJxNp2RjYpERKWQN7pv7OUIlU9OXM=; b=SoCGXuw1JZZ4CQiV7oWT28F9XERzdWKwjqQZ7fU+vX1EZ+A9bFz3GUwNnfHS1x2C6j B1huN7M0hBuijEBY4IZjvsRZ+Pc3+mckEnznpHsHFWYWleZpRNNw0BJVfM/h6o4/2nva iIFwS+CRQb1ZFToSXzJWBc7Vkal5DtSw5fidWVwk11Ob0QiKQoeAk+gUoNB4Hozr4y4z clOVm8tEYx1nb6wdnTey3iaTI44ng1pVpp+8vHK2nRm96wjUK7H8v+CXYr9ajeHMAbVF gQHMaObi2ZtgPZqttVuwvNq7SZdM3cKFC1FsbivtbTxaFeXaZrkJpq4bzH8jxs8e9Wu6 ZNCA== X-Forwarded-Encrypted: i=1; AJvYcCV6JdfXU8ewcsxtIvzZCXZvS2XXLULD3pd1jzewXun1cbcJRuYE4/jSDFtwOSvfsKGY1vzuxa9zUBIlQeA=@vger.kernel.org X-Gm-Message-State: AOJu0Yxf50ltl4ns6A6B3HuHPRy8P/rcdZRLyvfk/F7lkLoWChKqh4GQ MoTq6kggbQgJ2tUnJcuKIYQ8UdRimbEQTm2wyX5vBZUJSdQiKhOI0MoM X-Gm-Gg: ATEYQzzVe12nX6NyT38etlcfWVVO3LOqYtJOZSj7SOP4c0nWKwxK/DPjkJZ6gESr8KP 0TElidlVnVDVf6Hh6j6CL2NQtGGPj7dPej8AWYByHnIi9yDaZ/UmuRWcVdCIHCackT2zewkkCFJ jAUSCzT4MwCITT5lsiX39uEPdC56aca5XeAbRiPBiEPRxGjPjeFuKEC/rYipB/7b4yxnIynPGLa JdRWmAAZHUufC8yd39LrOLmZQ/9+i6psNMs/uyBOyhWgvnrxe8D5NRujK66euZ3lcMBOtw7RjgX Vh7m1y6NeAYvvtCqI2wHgzRiZEcVqXHVMvNYOl7XSQ3mcHZg56eIGrt2L1CKTCU/KnyjN5m6mOc kCBUQx3pZ0ZDueH8tcyi0kFuXywAOyKPjaxsqm/xsZiBeSRkZukJm/kZatJRSVYvfxOlA0vk0Rg MRm5OIlFU43T5XVhaozQ== X-Received: by 2002:a17:903:32c6:b0:2ae:55eb:f82d with SMTP id d9443c01a7336-2b0826d751dmr12591125ad.1.1773976370299; Thu, 19 Mar 2026 20:12:50 -0700 (PDT) Received: from localhost ([111.228.63.84]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2b083656df5sm7259535ad.44.2026.03.19.20.12.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Mar 2026 20:12:49 -0700 (PDT) From: Cen Zhang To: cem@kernel.org Cc: linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, baijiaju1990@gmail.com, Cen Zhang , stable@vger.kernel.org Subject: [PATCH] xfs: annotate data race on li_lsn in CIL formatting vs AIL insertion Date: Fri, 20 Mar 2026 10:55:07 +0800 Message-Id: <20260320025507.3331221-1-zzzccc427@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" xfs_inode_item_format_core() reads lip->li_lsn without holding any lock to embed the last on-disk LSN into the log dinode during CIL commit: xfs_inode_to_log_dinode(ip, dic, ip->i_itemp->ili_item.li_lsn); Concurrently, xfs_trans_ail_update_bulk() writes lip->li_lsn under ail_lock when inserting items into the AIL after log IO completion: lip->li_lsn =3D lsn; The CIL context lock (xc_ctx_lock) and the AIL lock (ail_lock) are independent and provide no mutual exclusion between these paths. Under simple interleaving on 64-bit architectures this is benign since li_lsn monotonically increases and both old/new values are valid checkpoint LSNs. However, on 32-bit architectures the 64-bit xfs_lsn_t can be torn into two 32-bit loads, producing a bogus LSN that could cause log recovery to make incorrect replay decisions. XFS already acknowledges this concern via the xfs_trans_ail_copy_lsn() helper which takes ail_lock on 32-bit. Annotate with READ_ONCE()/WRITE_ONCE() to prevent compiler-level tearing on all architectures. Fixes: 93f958f9c41f ("xfs: cull unnecessary icdinode fields") Cc: stable@vger.kernel.org Signed-off-by: Cen Zhang --- fs/xfs/xfs_inode_item.c | 2 +- fs/xfs/xfs_trans_ail.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 8913036b8024..ef0a0889c580 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c @@ -624,7 +624,7 @@ xfs_inode_item_format_core( struct xfs_log_dinode *dic; =20 dic =3D xlog_format_start(lfb, XLOG_REG_TYPE_ICORE); - xfs_inode_to_log_dinode(ip, dic, ip->i_itemp->ili_item.li_lsn); + xfs_inode_to_log_dinode(ip, dic, READ_ONCE(ip->i_itemp->ili_item.li_lsn)); xlog_format_commit(lfb, xfs_log_dinode_size(ip->i_mount)); } =20 diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index 923729af4206..3a0e0c65ebc5 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c @@ -831,7 +831,7 @@ xfs_trans_ail_update_bulk( } else { trace_xfs_ail_insert(lip, 0, lsn); } - lip->li_lsn =3D lsn; + WRITE_ONCE(lip->li_lsn, lsn); list_add_tail(&lip->li_ail, &tmp); } =20 --=20 2.34.1