From 7bec044d76980fc9fa610efc02c6cce230c6a29b Mon Sep 17 00:00:00 2001 From: ZiyangZhang Date: Thu, 24 Nov 2022 17:00:50 +0800 Subject: [PATCH] Disable metadata_csum for ext4 by default until upstream fix perf loss Signed-off-by: ZiyangZhang --- ..._csum-for-ext4-by-default-until-upst.patch | 38 +++++++++++++++++++ e2fsprogs.spec | 8 ++-- 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 0002-Disable-metadata_csum-for-ext4-by-default-until-upst.patch diff --git a/0002-Disable-metadata_csum-for-ext4-by-default-until-upst.patch b/0002-Disable-metadata_csum-for-ext4-by-default-until-upst.patch new file mode 100644 index 0000000..7f4a032 --- /dev/null +++ b/0002-Disable-metadata_csum-for-ext4-by-default-until-upst.patch @@ -0,0 +1,38 @@ +From 6ca483a87608f16bb624a61a43b45c602ce1af6a Mon Sep 17 00:00:00 2001 +From: ZiyangZhang +Date: Mon, 14 Nov 2022 17:51:35 +0800 +Subject: Disable metadata_csum for ext4 by default until upstream + fix perf loss + +AIM9 benchmarks show there are 17%~62% system perf regression loss if +ext4 metadata_csum enabled. Here we disable this default metadata_csum +for ext4 until upstream fix perf regression loss. + +Signed-off-by: Jacob Wang +(cherry picked from commit 7964b9c2e16fe478bc6560b783e9fa9f6fcf3661) +[ caspar: adjust patch to apply in new version ] +Signed-off-by: Caspar Zhang +Signed-off-by: weitao zhou +Signed-off-by: Joseph Qi +[ ZiyangZhang: adjust patch to apply in new version ] +Signed-off-by: ZiyangZhang +--- + misc/mke2fs.conf.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/misc/mke2fs.conf.in b/misc/mke2fs.conf.in +index 05680992..28088fb9 100644 +--- a/misc/mke2fs.conf.in ++++ b/misc/mke2fs.conf.in +@@ -11,7 +11,7 @@ + features = has_journal + } + ext4 = { +- features = has_journal,extent,huge_file,flex_bg,metadata_csum,64bit,dir_nlink,extra_isize ++ features = has_journal,extent,huge_file,flex_bg,uninit_bg,64bit,dir_nlink,extra_isize + } + small = { + blocksize = 1024 +-- +2.31.1 + diff --git a/e2fsprogs.spec b/e2fsprogs.spec index b3ece21..3998adf 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,4 +1,4 @@ -%define anolis_release 3 +%define anolis_release 4 Name: e2fsprogs Version: 1.46.5 Release: %{anolis_release}%{?dist} @@ -8,6 +8,7 @@ URL: http://e2fsprogs.sourceforge.net/ Source0: https://www.kernel.org/pub/linux/kernel/people/tytso/%{name}/v%{version}/%{name}-%{version}.tar.xz Patch1: 0001-change-to-use-fuse3.patch +Patch2: 0002-Disable-metadata_csum-for-ext4-by-default-until-upst.patch BuildRequires: pkgconfig, texinfo, libselinux-devel, gcc BuildRequires: fuse-devel @@ -259,9 +260,7 @@ make PRINT_FAILED=yes fullcheck %{_mandir}/man8/resize2fs.8* %{_mandir}/man8/tune2fs.8* -%ifarch x86_64 %exclude %{_libdir}/e2fsprogs/e2scrub_all_cron -%endif %files libs %dir %{abidir} @@ -332,6 +331,9 @@ make PRINT_FAILED=yes fullcheck %{_udevdir}/96-e2scrub.rules %changelog +* Tue Nov 15 2022 ZiyangZhang - 1.46.5-4 +- Disable metadata_csum for ext4 by default until upstream fix perf loss + * Mon Oct 31 2022 mgb01105731 - 1.46.5-3 - optimise spec file -- Gitee