From nobody Wed Dec 17 04:16:46 2025 Received: from out-175.mta1.migadu.com (out-175.mta1.migadu.com [95.215.58.175]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2F94169AF0 for ; Wed, 29 May 2024 09:20:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716974438; cv=none; b=at54Z03kcq7/godd7brr1LzfjP/GcvEIt16xkpTM8offfzkVB386cGwLER3zTFt50rongy76x+zazdFzhkg3skBMqNxlTltCmx84xKmi7lfkOnzhsTrVGMqZL2u9Roab8slyX64WPNmq6WRLH8LmT/xHm6JHRQ7VNlis+ki+x7c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716974438; c=relaxed/simple; bh=mRgqrVV+g3RFcPQAIieiLKcKV0KvYVsDDyfVTzietbs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qLI/JqTLkSeDLK6oE1JY6cu7oZzAA2hS/mPlA5+dZ/c0vVxjfaBtrU+P/9xn5lo7F4Zm1vXTyaG2LrqWtQQZpshJFiXXgqfSYLs7cij1wO+zuYWf9PysWxhoFrHLDPxh9k79jN5FBhRL3nhoG2BRxABcNYGQ9DNCTGY92kxMyXI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=lahw4Chd; arc=none smtp.client-ip=95.215.58.175 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="lahw4Chd" X-Envelope-To: adilger@dilger.ca DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716974434; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=0/oRQ9r3IxZKTM7rfHJfMbi3eQrNuT4jysuESWyn5dE=; b=lahw4ChdjfdeXzVOf5FlqhplAIZCPNNFUFyJNeMMai9YY5GJKP3l7cmCMrDv/Zk3BGlL8X lhM3kxU/PuxQJ8BxqZ13vjBy15UMOv6SJh8awQd31Z+H5GkmmkwwyMWruqvrc2dFWjPNWp 4zkr1Pkt9UeS+bZTjtYhvSJXzIUFcCY= X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: jack@suse.cz X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: harshadshirwadkar@gmail.com X-Envelope-To: luis.henriques@linux.dev X-Envelope-To: tytso@mit.edu X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger , Jan Kara , Harshad Shirwadkar Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH v3 1/2] ext4: fix fast commit inode enqueueing during a full journal commit Date: Wed, 29 May 2024 10:20:29 +0100 Message-ID: <20240529092030.9557-2-luis.henriques@linux.dev> In-Reply-To: <20240529092030.9557-1-luis.henriques@linux.dev> References: <20240529092030.9557-1-luis.henriques@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" When a full journal commit is on-going, any fast commit has to be enqueued into a different queue: FC_Q_STAGING instead of FC_Q_MAIN. This enqueueing is done only once, i.e. if an inode is already queued in a previous fast commit entry it won't be enqueued again. However, if a full commit starts _after_ the inode is enqueued into FC_Q_MAIN, the next fast commit needs to be done into FC_Q_STAGING. And this is not being done in function ext4_fc_track_template(). This patch fixes the issue by re-enqueuing an inode into the STAGING queue during the fast commit clean-up callback if it has a tid (i_sync_tid) greater than the one being handled. The STAGING queue will then be spliced back into MAIN. This bug was found using fstest generic/047. This test creates several 32k bytes files, sync'ing each of them after it's creation, and then shutting down the filesystem. Some data may be loss in this operation; for example a file may have it's size truncated to zero. Signed-off-by: Luis Henriques (SUSE) Reviewed-by: Harshad Shirwadkar Reviewed-by: Jan Kara --- fs/ext4/fast_commit.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 87c009e0c59a..088bd509b116 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -1282,8 +1282,17 @@ static void ext4_fc_cleanup(journal_t *journal, int = full, tid_t tid) list_del_init(&iter->i_fc_list); ext4_clear_inode_state(&iter->vfs_inode, EXT4_STATE_FC_COMMITTING); - if (iter->i_sync_tid <=3D tid) + if (iter->i_sync_tid <=3D tid) { ext4_fc_reset_inode(&iter->vfs_inode); + } else { + /* + * re-enqueue inode into STAGING, which later will be + * splice back into MAIN + */ + list_add_tail(&EXT4_I(&iter->vfs_inode)->i_fc_list, + &sbi->s_fc_q[FC_Q_STAGING]); + } + /* Make sure EXT4_STATE_FC_COMMITTING bit is clear */ smp_mb(); #if (BITS_PER_LONG < 64) From nobody Wed Dec 17 04:16:46 2025 Received: from out-185.mta1.migadu.com (out-185.mta1.migadu.com [95.215.58.185]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 72AB415B10C for ; Wed, 29 May 2024 09:20:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=95.215.58.185 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716974440; cv=none; b=U5/2fZTSMK4hH2XD8BxYUIehclHPrOeoQb6Nk/2pxAK5PMOneQLn3Buq7RGlUo7GYz6ZCjWCqYM16Qrx3KlQ1qdrPUT8VYk/2B7GYVNMaws/NhT/R452sn6105mDthkM1ENRnJCrsXzwJMBF9OQhykQO/QQhF2jfaZyAkCfy6RI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716974440; c=relaxed/simple; bh=viiNCjfXjMsAOVNEQF24ckmVna96BiwliXfQ+Trut98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kXcm/3IWa6hw6ChoIi38eK6dPT32XimuxfMqrXcz4eJqHTojOO448QQO+lQlWjGS6K/A6A8jClaHJwOSctBrbp+w0u8ruc4W85MYgnKGPFYFCqh1uCjUpuXOzjDBZsByj9IcXgDYXQcv0ZAF+NgRrqKMg7FVqKPVJOHfwb+umQE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=rEb4cntR; arc=none smtp.client-ip=95.215.58.185 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="rEb4cntR" X-Envelope-To: adilger@dilger.ca DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1716974435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/+yIEl13IIwajG/g+ej4zptTHBFXUNxUCGXGrEEsmGE=; b=rEb4cntR0bdDWPNR56x/oAfax3NQddk97e7zBgpcfJG0nZFQBKsLbvtrustH0W3EQAJa6q WtjmXCJ2Z8M3zXORWWHQmou92/61I3GEJHgW0nH/aDNgkOQw94Jv2SrGc6Hl/IfSoBA1Zr 0dLVdWLCNncuCVoLutDQZ+i82rCoG2Q= X-Envelope-To: luis.henriques@linux.dev X-Envelope-To: jack@suse.cz X-Envelope-To: linux-ext4@vger.kernel.org X-Envelope-To: harshadshirwadkar@gmail.com X-Envelope-To: linux-kernel@vger.kernel.org X-Envelope-To: tytso@mit.edu X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: "Luis Henriques (SUSE)" To: Theodore Ts'o , Andreas Dilger , Jan Kara , Harshad Shirwadkar Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, "Luis Henriques (SUSE)" Subject: [PATCH v3 2/2] ext4: fix possible tid_t sequence overflows Date: Wed, 29 May 2024 10:20:30 +0100 Message-ID: <20240529092030.9557-3-luis.henriques@linux.dev> In-Reply-To: <20240529092030.9557-1-luis.henriques@linux.dev> References: <20240529092030.9557-1-luis.henriques@linux.dev> 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 X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" In the fast commit code there are a few places where tid_t variables are being compared without taking into account the fact that these sequence numbers may wrap. Fix this issue by using the helper functions tid_gt() and tid_geq(). Signed-off-by: Luis Henriques (SUSE) Reviewed-by: Harshad Shirwadkar Reviewed-by: Jan Kara --- fs/ext4/fast_commit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/ext4/fast_commit.c b/fs/ext4/fast_commit.c index 088bd509b116..30d312e16916 100644 --- a/fs/ext4/fast_commit.c +++ b/fs/ext4/fast_commit.c @@ -353,7 +353,7 @@ void ext4_fc_mark_ineligible(struct super_block *sb, in= t reason, handle_t *handl read_unlock(&sbi->s_journal->j_state_lock); } spin_lock(&sbi->s_fc_lock); - if (sbi->s_fc_ineligible_tid < tid) + if (tid_gt(tid, sbi->s_fc_ineligible_tid)) sbi->s_fc_ineligible_tid =3D tid; spin_unlock(&sbi->s_fc_lock); WARN_ON(reason >=3D EXT4_FC_REASON_MAX); @@ -1207,7 +1207,7 @@ int ext4_fc_commit(journal_t *journal, tid_t commit_t= id) if (ret =3D=3D -EALREADY) { /* There was an ongoing commit, check if we need to restart */ if (atomic_read(&sbi->s_fc_subtid) <=3D subtid && - commit_tid > journal->j_commit_sequence) + tid_gt(commit_tid, journal->j_commit_sequence)) goto restart_fc; ext4_fc_update_stats(sb, EXT4_FC_STATUS_SKIPPED, 0, 0, commit_tid); @@ -1282,7 +1282,7 @@ static void ext4_fc_cleanup(journal_t *journal, int f= ull, tid_t tid) list_del_init(&iter->i_fc_list); ext4_clear_inode_state(&iter->vfs_inode, EXT4_STATE_FC_COMMITTING); - if (iter->i_sync_tid <=3D tid) { + if (tid_geq(tid, iter->i_sync_tid)) { ext4_fc_reset_inode(&iter->vfs_inode); } else { /* @@ -1322,7 +1322,7 @@ static void ext4_fc_cleanup(journal_t *journal, int f= ull, tid_t tid) list_splice_init(&sbi->s_fc_q[FC_Q_STAGING], &sbi->s_fc_q[FC_Q_MAIN]); =20 - if (tid >=3D sbi->s_fc_ineligible_tid) { + if (tid_geq(tid, sbi->s_fc_ineligible_tid)) { sbi->s_fc_ineligible_tid =3D 0; ext4_clear_mount_flag(sb, EXT4_MF_FC_INELIGIBLE); }