From 46c77cb8ef35cb55107d64545e51c97de91d7ddf Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 31 2020 09:36:16 +0000
Subject: import tuned-2.11.0-8.el7


---

diff --git a/SOURCES/tuned-2.11.0-realtime-virtual-profiles-enable-ktimer-lockless-check.patch b/SOURCES/tuned-2.11.0-realtime-virtual-profiles-enable-ktimer-lockless-check.patch
new file mode 100644
index 0000000..93d8551
--- /dev/null
+++ b/SOURCES/tuned-2.11.0-realtime-virtual-profiles-enable-ktimer-lockless-check.patch
@@ -0,0 +1,41 @@
+diff --git a/profiles/realtime-virtual-guest/script.sh b/profiles/realtime-virtual-guest/script.sh
+index 33cb730..ce94a4b 100755
+--- a/profiles/realtime-virtual-guest/script.sh
++++ b/profiles/realtime-virtual-guest/script.sh
+@@ -2,8 +2,13 @@
+ 
+ . /usr/lib/tuned/functions
+ 
++KTIMER_LOCKLESS_FILE=/sys/kernel/ktimer_lockless_check
++
+ start() {
+     systemctl start rt-entsk
++    if [ -f $KTIMER_LOCKLESS_FILE ]; then
++        echo 1 > $KTIMER_LOCKLESS_FILE
++    fi
+     return "$?"
+ }
+ 
+diff --git a/profiles/realtime-virtual-host/script.sh b/profiles/realtime-virtual-host/script.sh
+index 8ff5509..be1804f 100755
+--- a/profiles/realtime-virtual-host/script.sh
++++ b/profiles/realtime-virtual-host/script.sh
+@@ -5,6 +5,7 @@
+ CACHE_VALUE_FILE=./lapic_timer_adv_ns
+ CACHE_CPU_FILE=./lapic_timer_adv_ns.cpumodel
+ KVM_LAPIC_FILE=/sys/module/kvm/parameters/lapic_timer_advance_ns
++KTIMER_LOCKLESS_FILE=/sys/kernel/ktimer_lockless_check
+ QEMU=$(type -P qemu-kvm || echo /usr/libexec/qemu-kvm)
+ TSCDEADLINE_LATENCY="/usr/share/qemu-kvm/tscdeadline_latency.flat"
+ if [ ! -f "$TSCDEADLINE_LATENCY" ]; then
+@@ -100,6 +101,10 @@ start() {
+     fi
+     systemctl start rt-entsk
+ 
++    if [ -f $KTIMER_LOCKLESS_FILE ]; then
++        echo 1 > $KTIMER_LOCKLESS_FILE
++    fi
++
+     return 0
+ }
+ 
diff --git a/SOURCES/tuned-2.11.0-sap-hana-vmware-deprecation.patch b/SOURCES/tuned-2.11.0-sap-hana-vmware-deprecation.patch
new file mode 100644
index 0000000..794fe6a
--- /dev/null
+++ b/SOURCES/tuned-2.11.0-sap-hana-vmware-deprecation.patch
@@ -0,0 +1,14 @@
+diff --git a/man/tuned-profiles-sap-hana.7 b/man/tuned-profiles-sap-hana.7
+index e199f27..a56274c 100644
+--- a/man/tuned-profiles-sap-hana.7
++++ b/man/tuned-profiles-sap-hana.7
+@@ -37,6 +37,9 @@ regarding semaphores.
+ 
+ .TP
+ .BI "sap\-hana\-vmware"
++Deprecated profile. It is being kept here for backward compatibility.
++Original description follows:
++
+ A performance optimized profile for the SAP HANA applications on VMware.
+ It is based on throughput\-performance profile. It additionally disables
+ transparent hugepages, locks CPU to the low C states (by PM QoS) and tunes sysctl
diff --git a/SPECS/tuned.spec b/SPECS/tuned.spec
index d04f711..72cb741 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: 5%{?prerel1}%{?dist}.1
+Release: 8%{?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/
@@ -29,7 +29,9 @@ Patch2: 0001-functions-Return-an-ordered-cpu-list-in-cpulist_onli.patch
 Patch3: 0001-Fix-verifying-sysctl-options-with-tabs.patch
 # Upstream patch:
 Patch4: 0001-sysctl-Ignore-non-existent-settings-from-system-sysc.patch
-Patch5: tuned-2.11.0-sysctl-modifiers-traceback-fix.patch
+Patch5: tuned-2.11.0-sap-hana-vmware-deprecation.patch
+Patch6: tuned-2.11.0-sysctl-modifiers-traceback-fix.patch
+Patch7: tuned-2.11.0-realtime-virtual-profiles-enable-ktimer-lockless-check.patch
 
 %description
 The tuned package contains a daemon that tunes system settings dynamically.
@@ -168,6 +170,8 @@ It can be also used to fine tune your system for specific scenarios.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 
 %build
@@ -419,11 +423,19 @@ fi
 %{_mandir}/man7/tuned-profiles-compat.7*
 
 %changelog
-* Fri Aug  9 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-5.1
+* Wed Aug 14 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-8
+- realtime-virtual-guest/host: enabled ktimer-lockless-check
+  Resolves: rhbz#1730016
+
+* Fri Aug  9 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-7
 - plugin_sysctl: fixed traceback when assignments modifiers ('<', '>')
   are used with sysctl and the current sysctl value is the same as
   the new value
-  Resolves: rhbz#1739563
+  Resolves: rhbz#1739418
+
+* Tue Jul 30 2019 Jaroslav Škarvada <jskarvad@redhat.com> - 2.11.0-6
+- sap-hana-vmware: deprecated profile
+  Resolves: rhbz#1672213
 
 * Fri Jun 07 2019 Ondřej Lysoněk <olysonek@redhat.com> - 2.11.0-5
 - Ignore non-existent settings from system sysctl configs