From ab31ee964a8d6e3d998ba0f2f037c915e98ac4bc Mon Sep 17 00:00:00 2001 From: "solar.hu" Date: Fri, 13 Mar 2020 20:38:22 +0800 Subject: [PATCH 1/4] add performance script,close transparent_hugepage,change vm.min_free_kbytes=112640,export GOMP_CPU_AFFINITY close autogroup --- generic-release.spec | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/generic-release.spec b/generic-release.spec index 66b18b4..efb019d 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 1.0 %define generic_patch_level %{nil} -%define generic_release 24 +%define generic_release 25 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -100,6 +100,22 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/ %clean rm -rf $RPM_BUILD_ROOT +%post +cat /etc/profile|grep GOMP_CPU_AFFINITY +if [ $? -eq 1 ];then + CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` + export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] + echo "export GOMP_CPU_AFFINITY=0-$[CPUNO - 1]" >> /etc/profile + + echo vm.min_free_kbytes=112640 >> /etc/sysctl.conf + echo vm.dirty_ratio=60 >> /etc/sysctl.conf + echo "echo never > /sys/kernel/mm/transparent_hugepage/enabled" >> /etc/profile + echo "echo never > /sys/kernel/mm/transparent_hugepage/defrag" >> /etc/profile + echo kernel.sched_autogroup_enabled=0 >> /etc/sysctl.conf + sysctl -p + +fi + %files %defattr(0644,root,root,0755) /etc/system-release @@ -117,6 +133,10 @@ rm -rf $RPM_BUILD_ROOT /usr/share/eula/eula.* %changelog +* Fri Mar 13 2020 openEuler Buildteam - 1.0-25 +- add performance script,close transparent_hugepage,change vm.min_free_kbytes=112640,export GOMP_CPU_AFFINITY +- close autogroup + * Tue Mar 3 2020 openEuler Buildteam - 1.0-24 - remove unnecessary swap file -- Gitee From 7b1582ab3ddf7397cddb41ad627d425ba10d3b26 Mon Sep 17 00:00:00 2001 From: "solar.hu" Date: Fri, 13 Mar 2020 22:40:05 +0800 Subject: [PATCH 2/4] Enbale performance options immediately --- generic-release.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generic-release.spec b/generic-release.spec index efb019d..c943d7b 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -109,6 +109,8 @@ if [ $? -eq 1 ];then echo vm.min_free_kbytes=112640 >> /etc/sysctl.conf echo vm.dirty_ratio=60 >> /etc/sysctl.conf + echo never > /sys/kernel/mm/transparent_hugepage/enabled + echo never > /sys/kernel/mm/transparent_hugepage/defrag echo "echo never > /sys/kernel/mm/transparent_hugepage/enabled" >> /etc/profile echo "echo never > /sys/kernel/mm/transparent_hugepage/defrag" >> /etc/profile echo kernel.sched_autogroup_enabled=0 >> /etc/sysctl.conf -- Gitee From 8f72ec220a1f5d54ce10d9e9b2430c70fedecdac Mon Sep 17 00:00:00 2001 From: "solar.hu" Date: Sat, 14 Mar 2020 11:45:40 +0800 Subject: [PATCH 3/4] fix install problem --- generic-release-1.0/system-info.sh | 10 ++++++++++ generic-release.spec | 19 +------------------ 2 files changed, 11 insertions(+), 18 deletions(-) diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index 7dd02ac..c84dd0d 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -68,3 +68,13 @@ then else echo -e "To run a command as administrator(user \"root\"),use \"sudo \"." fi + +CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` +export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] + +sysctl -w vm.min_free_kbytes=112640 &> /dev/null +sysctl -w vm.dirty_ratio=60 &> /dev/null +echo never > /sys/kernel/mm/transparent_hugepage/enabled +echo never > /sys/kernel/mm/transparent_hugepage/defrag +sysctl -w kernel.sched_autogroup_enabled=0 &> /dev/null +sysctl -p &> /dev/null diff --git a/generic-release.spec b/generic-release.spec index c943d7b..1edc0a3 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -5,7 +5,7 @@ %define dist_release_version 8 %define generic_version 1.0 %define generic_patch_level %{nil} -%define generic_release 25 +%define generic_release 26 %define builtin_release_version 1.0 %define current_arch %{_arch} @@ -100,23 +100,6 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/ %clean rm -rf $RPM_BUILD_ROOT -%post -cat /etc/profile|grep GOMP_CPU_AFFINITY -if [ $? -eq 1 ];then - CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` - export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] - echo "export GOMP_CPU_AFFINITY=0-$[CPUNO - 1]" >> /etc/profile - - echo vm.min_free_kbytes=112640 >> /etc/sysctl.conf - echo vm.dirty_ratio=60 >> /etc/sysctl.conf - echo never > /sys/kernel/mm/transparent_hugepage/enabled - echo never > /sys/kernel/mm/transparent_hugepage/defrag - echo "echo never > /sys/kernel/mm/transparent_hugepage/enabled" >> /etc/profile - echo "echo never > /sys/kernel/mm/transparent_hugepage/defrag" >> /etc/profile - echo kernel.sched_autogroup_enabled=0 >> /etc/sysctl.conf - sysctl -p - -fi %files %defattr(0644,root,root,0755) -- Gitee From 6d8b88630dfcac818bc6ff2d1790137122faa117 Mon Sep 17 00:00:00 2001 From: "solar.hu" Date: Sat, 14 Mar 2020 17:21:27 +0800 Subject: [PATCH 4/4] fix obs build problem --- generic-release-1.0/performance.sh | 20 ++++++++++++++++++++ generic-release-1.0/system-info.sh | 9 --------- generic-release.spec | 15 +++++++++++++++ 3 files changed, 35 insertions(+), 9 deletions(-) create mode 100644 generic-release-1.0/performance.sh diff --git a/generic-release-1.0/performance.sh b/generic-release-1.0/performance.sh new file mode 100644 index 0000000..02a4b66 --- /dev/null +++ b/generic-release-1.0/performance.sh @@ -0,0 +1,20 @@ +#/bin/bash +#Copyright (c) [2019] Huawei Technologies Co., Ltd. +#generic-release is licensed under the Mulan PSL v1. +#You can use this software according to the terms and conditions of the Mulan PSL v1. +#You may obtain a copy of Mulan PSL v1 at: +# http://license.coscl.org.cn/MulanPSL +#THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND, EITHER EXPRESS OR +#IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT, MERCHANTABILITY OR FIT FOR A PARTICULAR +#PURPOSE. +#See the Mulan PSL v1 for more details. + +CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` +export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] + +sysctl -w vm.min_free_kbytes=112640 &> /dev/null +sysctl -w vm.dirty_ratio=60 &> /dev/null +echo never > /sys/kernel/mm/transparent_hugepage/enabled +echo never > /sys/kernel/mm/transparent_hugepage/defrag +sysctl -w kernel.sched_autogroup_enabled=0 &> /dev/null +sysctl -p &> /dev/null diff --git a/generic-release-1.0/system-info.sh b/generic-release-1.0/system-info.sh index c84dd0d..211f66e 100644 --- a/generic-release-1.0/system-info.sh +++ b/generic-release-1.0/system-info.sh @@ -69,12 +69,3 @@ else echo -e "To run a command as administrator(user \"root\"),use \"sudo \"." fi -CPUNO=`cat /proc/cpuinfo|grep processor|wc -l` -export GOMP_CPU_AFFINITY=0-$[CPUNO - 1] - -sysctl -w vm.min_free_kbytes=112640 &> /dev/null -sysctl -w vm.dirty_ratio=60 &> /dev/null -echo never > /sys/kernel/mm/transparent_hugepage/enabled -echo never > /sys/kernel/mm/transparent_hugepage/defrag -sysctl -w kernel.sched_autogroup_enabled=0 &> /dev/null -sysctl -p &> /dev/null diff --git a/generic-release.spec b/generic-release.spec index 1edc0a3..f261a2d 100644 --- a/generic-release.spec +++ b/generic-release.spec @@ -33,6 +33,15 @@ Requires: %{product_family}-repos %description %{product_family} release files +%package -n openEuler-performance +Requires: coreutils systemd setup + +Summary:performance script +%description -n openEuler-performance +performance script + + + %prep %setup -q -n generic-release-%{builtin_release_version} @@ -58,6 +67,7 @@ EOF mkdir -p -m 755 $RPM_BUILD_ROOT/etc/profile.d cp -a system-info.sh $RPM_BUILD_ROOT/etc/profile.d/ +cp -a performance.sh $RPM_BUILD_ROOT/etc/profile.d/ # write cpe to /etc/system/release-cpe echo "cpe:/o:%{product_family}:%{product_family}:%{version}:ga:server" > $RPM_BUILD_ROOT/etc/system-release-cpe @@ -101,6 +111,7 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/system-preset/ rm -rf $RPM_BUILD_ROOT + %files %defattr(0644,root,root,0755) /etc/system-release @@ -117,6 +128,10 @@ rm -rf $RPM_BUILD_ROOT /var/lib/supportinfo /usr/share/eula/eula.* +%files -n openEuler-performance +%defattr(0644,root,root,0755) +/etc/profile.d/performance.sh + %changelog * Fri Mar 13 2020 openEuler Buildteam - 1.0-25 - add performance script,close transparent_hugepage,change vm.min_free_kbytes=112640,export GOMP_CPU_AFFINITY -- Gitee