From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 818CC1B80F; Tue, 16 Jan 2024 01:04:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="HHczpjS3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2038CC433F1; Tue, 16 Jan 2024 01:04:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705367097; bh=SxnoDFwYsSeODzj6GXJyn6joxPm56j1x0ydoIT61rG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HHczpjS3488rJYwki+tMvqihjHmoqe8DqoKmv8JvkCEFrmDVokxqF+pkJ8xLptuQz Vld3X7OvfNhqy0StXhRI/dWpoUxV4oWfTM/vPMFm4NpN99pH5kWjx66RdvwMRHAkIs aXJ2JIjFN943CDzCqOWJsgIFMIp8yOGxDYrEIWyAZJXeTAqZC6KDjbrXtQYLNfpYnd UkRteN2TpgSRa463AOllQEo8TCkZAt0lXLCwjCbX++DIoE+nEH2Ag4bt+HhMAFrieg nABsNpjoFfaoOqqDJuMB1gE8DiVV5Ljvr8/O4fJk95iQZ4iyQq2TKGP2LATpcRCOc/ 3JrWZiTnuy0dg== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ojaswin Mujoo , Ritesh Harjani , Theodore Ts'o , Sasha Levin , adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org Subject: [PATCH AUTOSEL 6.7 11/21] ext4: enable dioread_nolock as default for bs < ps case Date: Mon, 15 Jan 2024 20:03:48 -0500 Message-ID: <20240116010422.217925-11-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240116010422.217925-1-sashal@kernel.org> References: <20240116010422.217925-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.7 Content-Transfer-Encoding: 8bit From: Ojaswin Mujoo [ Upstream commit e89fdcc425b6feea4dfb33877e9256757905d763 ] dioread_nolock was originally disabled as a default option for bs < ps scenarios due to a data corruption issue. Since then, we've had some fixes in this area which address such issues. Enable dioread_nolock by default and remove the experimental warning message for bs < ps path. dioread for bs < ps has been tested on a 64k pagesize machine using: kvm-xfstest -C 3 -g auto with the following configs: 64k adv bigalloc_4k bigalloc_64k data_journal encrypt dioread_nolock dioread_nolock_4k ext3 ext3conv nojournal And no new regressions were seen compared to baseline kernel. Suggested-by: Ritesh Harjani (IBM) Signed-off-by: Ojaswin Mujoo Reviewed-by: Ritesh Harjani (IBM) Link: https://lore.kernel.org/r/20231101154717.531865-1-ojaswin@linux.ibm.com Signed-off-by: Theodore Ts'o Signed-off-by: Sasha Levin --- fs/ext4/super.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/fs/ext4/super.c b/fs/ext4/super.c index c5fcf377ab1f..783a755078cf 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c @@ -2793,15 +2793,6 @@ static int ext4_check_opt_consistency(struct fs_context *fc, return -EINVAL; } - if (ctx_test_mount_opt(ctx, EXT4_MOUNT_DIOREAD_NOLOCK)) { - int blocksize = - BLOCK_SIZE << le32_to_cpu(sbi->s_es->s_log_block_size); - if (blocksize < PAGE_SIZE) - ext4_msg(NULL, KERN_WARNING, "Warning: mounting with an " - "experimental mount option 'dioread_nolock' " - "for blocksize < PAGE_SIZE"); - } - err = ext4_check_test_dummy_encryption(fc, sb); if (err) return err; @@ -4410,7 +4401,7 @@ static void ext4_set_def_opts(struct super_block *sb, ((def_mount_opts & EXT4_DEFM_NODELALLOC) == 0)) set_opt(sb, DELALLOC); - if (sb->s_blocksize == PAGE_SIZE) + if (sb->s_blocksize <= PAGE_SIZE) set_opt(sb, DIOREAD_NOLOCK); } -- 2.43.0