From b75f10131135bd8e2f1d12596817dd80d647d34f Mon Sep 17 00:00:00 2001 From: Jacob Wang Date: Thu, 27 Aug 2020 15:57:41 +0800 Subject: [PATCH] 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 --- ...ogs-1.44.6-disable-metadata_csum-by-default.patch | 12 ++++++++++++ e2fsprogs.spec | 11 ++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch diff --git a/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch b/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch new file mode 100644 index 0000000..b1aeb55 --- /dev/null +++ b/1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch @@ -0,0 +1,12 @@ +diff -Nuar e2fsprogs-1.44.6.orig/misc/mke2fs.conf.in e2fsprogs-1.44.6/misc/mke2fs.conf.in +--- e2fsprogs-1.44.6.orig/misc/mke2fs.conf.in 2019-03-06 04:11:11.000000000 +0800 ++++ e2fsprogs-1.44.6/misc/mke2fs.conf.in 2020-08-27 15:35:20.508576799 +0800 +@@ -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 + inode_size = 256 + } + rhel6_ext4 = { diff --git a/e2fsprogs.spec b/e2fsprogs.spec index a437c65..7f93710 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,7 +1,8 @@ +%define anolis_release .0.1 Summary: Utilities for managing ext2, ext3, and ext4 file systems Name: e2fsprogs Version: 1.45.6 -Release: 3%{?dist} +Release: 3%{anolis_release}%{?dist} # License tags based on COPYING file distinctions for various components License: GPLv2 @@ -36,6 +37,10 @@ Patch5: e2fsprogs-1.45.6-Revert-libext2fs-hide-struct-ext2fs_hashmap-as-an-in.pa Patch6: e2fsprogs-1.45.6-ext2fs-fix-ABI-change-in-the-struct_ext2_filsys-stru.patch Patch7: e2fsprogs-1.45.6-mke2fs-Escape-double-quotes-when-parsing-mke2fs.conf.patch +# Begin: Anolis customized patches +Patch1001: 1001-e2fsprogs-1.44.6-disable-metadata_csum-by-default.patch +# End: Anolis customized patches + %description The e2fsprogs package contains a number of utilities for creating, checking, modifying, and correcting any inconsistencies in second, @@ -161,6 +166,7 @@ It was originally inspired by the Multics SubSystem library. %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch1001 -p1 %build %configure CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ @@ -323,6 +329,9 @@ exit 0 %{_libdir}/pkgconfig/ss.pc %changelog +* Tue Apr 19 2022 Weitao Zhou 1.45.6-3.0.1 +- Disable metadata_csum for ext4 by default + * Thu Jan 27 2022 Lukas Czerner 1.45.6-3 - Rebuild to ship libss-devel package (#1947449) -- Gitee