From f21c241f9ec962ac43653362963d8eea1de69c89 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Feb 02 2021 09:31:34 +0000
Subject: import tuned-2.11.0-11.el7_9


---

diff --git a/SOURCES/tuned-2.11.0-kernel-shmall-shmmax-fix.patch b/SOURCES/tuned-2.11.0-kernel-shmall-shmmax-fix.patch
new file mode 100644
index 0000000..ec668db
--- /dev/null
+++ b/SOURCES/tuned-2.11.0-kernel-shmall-shmmax-fix.patch
@@ -0,0 +1,58 @@
+diff --git a/profiles/sap-netweaver/script.sh b/profiles/sap-netweaver/script.sh
+deleted file mode 100755
+--- a/profiles/sap-netweaver/script.sh
++++ /dev/null
+@@ -1,40 +0,0 @@
+-#!/bin/bash
+-
+-# SAP ktune script
+-#
+-# TODO: drop this script and implement native support
+-#       into plugins
+-
+-. /usr/lib/tuned/functions
+-
+-start() {
+-	# The following lines are for autodetection of SAP settings
+-	SAP_MAIN_MEMORY_TOTAL=`awk '/MemTotal:/ {print $2}' /proc/meminfo`
+-	SAP_SWAP_SPACE_TOTAL=`awk '/SwapTotal:/ {print $2}' /proc/meminfo`
+-	# Rounding to full Gigabytes
+-	SAP_VIRT_MEMORY_TOTAL=$(( ( $SAP_MAIN_MEMORY_TOTAL + $SAP_SWAP_SPACE_TOTAL + 1048576 ) / 1048576 ))
+-
+-	# kernel.shmall is in 4 KB pages; minimum 20 GB (SAP Note 941735)
+-	SAP_SHMALL=$(( $SAP_VIRT_MEMORY_TOTAL * 1024 * 1024 / 4 ))
+-	# kernel.shmmax is in Bytes; minimum 20 GB (SAP Note 941735)
+-	SAP_SHMMAX=$(( $SAP_VIRT_MEMORY_TOTAL * 1024 * 1024 * 1024 ))
+-	CURR_SHMALL=`sysctl -n kernel.shmall`
+-	CURR_SHMMAX=`sysctl -n kernel.shmmax`
+-	save_value kernel.shmall "$CURR_SHMALL"
+-	save_value kernel.shmmax "$CURR_SHMMAX"
+-	(( $SAP_SHMALL > $CURR_SHMALL )) && sysctl -w kernel.shmall="$SAP_SHMALL"
+-	(( $SAP_SHMMAX > $CURR_SHMMAX )) && sysctl -w kernel.shmmax="$SAP_SHMMAX"
+-
+-	return 0
+-}
+-
+-stop() {
+-	SHMALL=`restore_value kernel.shmall`
+-	SHMMAX=`restore_value kernel.shmmax`
+-	[ "$SHMALL" ] && sysctl -w kernel.shmall="$SHMALL"
+-	[ "$SHMMAX" ] && sysctl -w kernel.shmmax="$SHMMAX"
+-
+-	return 0
+-}
+-
+-process $@
+diff --git a/profiles/sap-netweaver/tuned.conf b/profiles/sap-netweaver/tuned.conf
+--- a/profiles/sap-netweaver/tuned.conf
++++ b/profiles/sap-netweaver/tuned.conf
+@@ -8,7 +8,6 @@ include=throughput-performance
+ 
+ [sysctl]
+ kernel.sem = 1250 256000 100 8192
++kernel.shmall = 18446744073692774399
++kernel.shmmax = 18446744073692774399
+ vm.max_map_count = 2000000
+-
+-[script]
+-script=${i:PROFILE_DIR}/script.sh
diff --git a/SPECS/tuned.spec b/SPECS/tuned.spec
index 5e4c0a6..282ea1d 100644
--- a/SPECS/tuned.spec
+++ b/SPECS/tuned.spec
@@ -7,7 +7,7 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 2.11.0
-Release: 10%{?prerel1}%{?dist}
+Release: 11%{?prerel1}%{?dist}
 License: GPLv2+
 Source: https://github.com/redhat-performance/%{name}/archive/v%{version}%{?prerel2}.tar.gz#/%{name}-%{version}%{?prerel2}.tar.gz
 URL: http://www.tuned-project.org/
@@ -38,6 +38,7 @@ Patch10: tuned-2.11.0-netcat-requirement.patch
 Patch11: tuned-2.11.0-reapply-sysctl-ignore-usr.patch
 Patch12: tuned-2.11.0-define-variables-before-use.patch
 Patch13: tuned-2.11.0-realtime-virtual-host-remove-lapic-advancement.patch
+Patch14: tuned-2.11.0-kernel-shmall-shmmax-fix.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -185,6 +186,7 @@ It can be also used to fine tune your system for specific scenarios.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 
 %build
@@ -436,6 +438,10 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
+* Mon Dec 14 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-11
+- sap-netweaver: Use static values for kernel.shmall and kernel.shmmax
+  Resolves: rhbz#1904984
+
 * Wed Aug 12 2020 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-10
 - realtime-virtual-host: remove lapic advancement calculation and
   related qemu-kvm-tools-rhev requirement