diff --git a/SOURCES/tuned-2.3.0-cpupower-conflict.patch b/SOURCES/tuned-2.3.0-cpupower-conflict.patch
new file mode 100644
index 0000000..44d8c29
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-cpupower-conflict.patch
@@ -0,0 +1,30 @@
+From 284041dc14f21cd343fed4297cd67ff540d22511 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Thu, 6 Mar 2014 17:22:09 +0100
+Subject: [PATCH] systemd: added cpupower.service conflict
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Resolves: rhbz#1073392
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ tuned.service | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tuned.service b/tuned.service
+index e205730..d2d5d83 100644
+--- a/tuned.service
++++ b/tuned.service
+@@ -1,6 +1,7 @@
+ [Unit]
+ Description=Dynamic System Tuning Daemon
+ After=syslog.target
++Conflicts=cpupower.service
+
+ [Service]
+ Type=dbus
+--
+1.8.5.3
+
diff --git a/SOURCES/tuned-2.3.0-dirty-ratios.patch b/SOURCES/tuned-2.3.0-dirty-ratios.patch
new file mode 100644
index 0000000..da35d92
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-dirty-ratios.patch
@@ -0,0 +1,37 @@
+From d5aea87c0bad95d5aa51a2ab3ff5d4e741cd856b Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Tue, 7 Jan 2014 15:38:26 +0100
+Subject: [PATCH] throughput-performance: altered dirty ratios for better
+ performance
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Resolves: rhbz#1043533
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ profiles/throughput-performance/tuned.conf | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/profiles/throughput-performance/tuned.conf b/profiles/throughput-performance/tuned.conf
+index e6a0551..dae02dc 100644
+--- a/profiles/throughput-performance/tuned.conf
++++ b/profiles/throughput-performance/tuned.conf
+@@ -35,11 +35,11 @@ kernel.sched_wakeup_granularity_ns = 15000000
+ #
+ # The generator of dirty data starts writeback at this percentage (system default
+ # is 20%)
+-vm.dirty_ratio = 10
++vm.dirty_ratio = 40
+
+ # Start background writeback (via writeback threads) at this percentage (system
+ # default is 10%)
+-vm.dirty_background_ratio = 3
++vm.dirty_background_ratio = 10
+
+ # PID allocation wrap value. When the kernel's next PID value
+ # reaches this value, it wraps back to a minimum PID value.
+--
+1.8.4.2
+
diff --git a/SOURCES/tuned-2.3.0-latency-performance-thp.patch b/SOURCES/tuned-2.3.0-latency-performance-thp.patch
new file mode 100644
index 0000000..28ea6d5
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-latency-performance-thp.patch
@@ -0,0 +1,32 @@
+From 640e100341fe97c3127598926c126f00c07499f9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Fri, 14 Feb 2014 12:41:59 +0100
+Subject: [PATCH 1/4] latency-performance: leaving THP on its default
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Resolves: rhbz#1064510
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ profiles/latency-performance/tuned.conf | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/profiles/latency-performance/tuned.conf b/profiles/latency-performance/tuned.conf
+index 929a556..04abfbe 100644
+--- a/profiles/latency-performance/tuned.conf
++++ b/profiles/latency-performance/tuned.conf
+@@ -8,9 +8,6 @@ governor=performance
+ energy_perf_bias=performance
+ min_perf_pct=100
+
+-[vm]
+-transparent_hugepages=never
+-
+ [sysctl]
+ # ktune sysctl settings for rhel6 servers, maximizing i/o throughput
+ #
+--
+1.8.5.3
+
diff --git a/SOURCES/tuned-2.3.0-network-latency.patch b/SOURCES/tuned-2.3.0-network-latency.patch
new file mode 100644
index 0000000..c603b59
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-network-latency.patch
@@ -0,0 +1,58 @@
+From a195fc06fe56ffcbeb2a9ad1a16af7fc38e0ffd5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Fri, 14 Feb 2014 13:13:14 +0100
+Subject: [PATCH 3/4] network-latency: added new profile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Resolves: rhbz#1052418
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ man/tuned-adm.8 | 6 ++++++
+ profiles/network-latency/tuned.conf | 15 +++++++++++++++
+ 2 files changed, 21 insertions(+)
+ create mode 100644 profiles/network-latency/tuned.conf
+
+diff --git a/man/tuned-adm.8 b/man/tuned-adm.8
+index 443fefe..dfba025 100644
+--- a/man/tuned-adm.8
++++ b/man/tuned-adm.8
+@@ -111,6 +111,12 @@ CPU governor is set to performance andlocked to the low C states (by PM QoS).
+ CPU energy performance bias to performance.
+
+ .TP
++.BI network-latency
++Profile for low latency network tuning. It is based on the latency-performance
++profile. It additionaly disables transparent hugepages, NUMA balancing and
++tunes several other network related sysctl parameters.
++
++.TP
+ .BI "desktop"
+ Profile optimized for desktops based on balanced profile. It additionaly
+ enables scheduler autogroups for better response of interactive applications.
+diff --git a/profiles/network-latency/tuned.conf b/profiles/network-latency/tuned.conf
+new file mode 100644
+index 0000000..f4ec2de
+--- /dev/null
++++ b/profiles/network-latency/tuned.conf
+@@ -0,0 +1,15 @@
++#
++# tuned configuration
++#
++
++[main]
++include=latency-performance
++
++[vm]
++transparent_hugepages=never
++
++[sysctl]
++net.core.busy_read=50
++net.core.busy_poll=50
++net.ipv4.tcp_fastopen=3
++kernel.numa_balancing=0
+--
+1.8.5.3
+
diff --git a/SOURCES/tuned-2.3.0-network-throughput.patch b/SOURCES/tuned-2.3.0-network-throughput.patch
new file mode 100644
index 0000000..52fe31e
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-network-throughput.patch
@@ -0,0 +1,57 @@
+From 153afc6c9f7663ad083fbb764164e57737f7e4d2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad@redhat.com>
+Date: Fri, 14 Feb 2014 13:31:21 +0100
+Subject: [PATCH 4/4] network-throughput: added new profile
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Resolves: rhbz#1052421
+
+Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+---
+ man/tuned-adm.8 | 5 +++++
+ profiles/network-throughput/tuned.conf | 15 +++++++++++++++
+ 2 files changed, 20 insertions(+)
+ create mode 100644 profiles/network-throughput/tuned.conf
+
+diff --git a/man/tuned-adm.8 b/man/tuned-adm.8
+index dfba025..c2a11a3 100644
+--- a/man/tuned-adm.8
++++ b/man/tuned-adm.8
+@@ -111,6 +111,11 @@ CPU governor is set to performance andlocked to the low C states (by PM QoS).
+ CPU energy performance bias to performance.
+
+ .TP
++.BI network-throughput
++Profile for throughput network tuning. It is based on the throughput-performance
++profile. It additionaly increases kernel network buffers.
++
++.TP
+ .BI network-latency
+ Profile for low latency network tuning. It is based on the latency-performance
+ profile. It additionaly disables transparent hugepages, NUMA balancing and
+diff --git a/profiles/network-throughput/tuned.conf b/profiles/network-throughput/tuned.conf
+new file mode 100644
+index 0000000..fbc2b72
+--- /dev/null
++++ b/profiles/network-throughput/tuned.conf
+@@ -0,0 +1,15 @@
++#
++# tuned configuration
++#
++
++[main]
++include=throughput-performance
++
++[sysctl]
++# Increase kernel buffer size maximums. Currently this seems only necessary at 40Gb speeds.
++#
++# The buffer tuning values below do not account for any potential hugepage allocation.
++# Ensure that you do not oversubscribe system memory.
++net.ipv4.tcp_rmem="4096 87380 16777216"
++net.ipv4.tcp_wmem="4096 16384 16777216"
++net.ipv4.udp_mem="3145728 4194304 16777216"
+--
+1.8.5.3
+
diff --git a/SOURCES/tuned-2.3.0-no-find.patch b/SOURCES/tuned-2.3.0-no-find.patch
new file mode 100644
index 0000000..0dd80e4
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-no-find.patch
@@ -0,0 +1,20 @@
+commit a47b0e1be74f31d15279aac8ae5b1438932844a2
+Author: Jaroslav Škarvada <jskarvad@redhat.com>
+Date: Tue Nov 12 14:57:01 2013 +0100
+
+ spindown-disk: removed useless find, probably typo
+
+ Signed-off-by: Jaroslav Škarvada <jskarvad@redhat.com>
+
+diff --git a/profiles/spindown-disk/script.sh b/profiles/spindown-disk/script.sh
+index fa2d389..5ee40dd 100755
+--- a/profiles/spindown-disk/script.sh
++++ b/profiles/spindown-disk/script.sh
+@@ -12,7 +12,6 @@ start() {
+ disable_logs_syncing
+
+ remount_partitions commit=600,noatime $EXT_PARTITIONS
+- find /etc/ &> /dev/null
+ sync
+
+ return 0
diff --git a/SOURCES/tuned-2.3.0-throughput-performance-on-server.patch b/SOURCES/tuned-2.3.0-throughput-performance-on-server.patch
new file mode 100644
index 0000000..37337d7
--- /dev/null
+++ b/SOURCES/tuned-2.3.0-throughput-performance-on-server.patch
@@ -0,0 +1,13 @@
+diff --git a/recommend.conf b/recommend.conf
+index 7a45523..d01ebdf 100644
+--- a/recommend.conf
++++ b/recommend.conf
+@@ -9,7 +9,7 @@
+
+ [throughput-performance]
+ virt=
+-system=.*computenode.*
++system=.*(computenode|server).*
+
+ [virtual-guest]
+ virt=.+
diff --git a/SPECS/tuned.spec b/SPECS/tuned.spec
index 0876726..6fb8436 100644
--- a/SPECS/tuned.spec
+++ b/SPECS/tuned.spec
@@ -1,7 +1,7 @@
Summary: A dynamic adaptive system tuning daemon
Name: tuned
Version: 2.3.0
-Release: 3%{?dist}
+Release: 11%{?dist}
License: GPLv2+
Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2
URL: https://fedorahosted.org/tuned/
@@ -14,6 +14,13 @@ Requires: python-decorator, dbus-python, pygobject3-base, python-pyudev
Requires: virt-what, python-configobj, ethtool, gawk
Patch0: tuned-2.3.0-fix-race.patch
Patch1: tuned-2.3.0-timing-improvements.patch
+Patch2: tuned-2.3.0-no-find.patch
+Patch3: tuned-2.3.0-dirty-ratios.patch
+Patch4: tuned-2.3.0-throughput-performance-on-server.patch
+Patch5: tuned-2.3.0-latency-performance-thp.patch
+Patch6: tuned-2.3.0-network-latency.patch
+Patch7: tuned-2.3.0-network-throughput.patch
+Patch8: tuned-2.3.0-cpupower-conflict.patch
%description
The tuned package contains a daemon that tunes system settings dynamically.
@@ -55,6 +62,13 @@ It can be also used to fine tune your system for specific scenarios.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
%build
@@ -156,6 +170,45 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile
%{_prefix}/lib/tuned/spindown-disk
%changelog
+* Fri Mar 7 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-11
+- reverted fix for bug 1073008, dependency is not met on s390
+ related: rhbz#1073008
+
+* Thu Mar 6 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-10
+- added requirement to kernel-tools
+ resolves: rhbz#1073008
+- made cpupower.service conflicting
+ resolves: rhbz#1073392
+
+* Tue Mar 4 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-9
+- re-arranged profile autoselection patches for better maintainability
+ related: rhbz#1069123
+
+* Mon Mar 3 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-8
+- fixed profile autoselection
+ resolves: rhbz#1069123
+
+* Fri Feb 14 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-7
+- throughput-performance is default for the server
+ resolves: rhbz#1063481
+- THP not disabled in the latency-performance profile
+ resolves: rhbz#1064510
+- added network-latency profile
+ resolves: rhbz#1052418
+- added network-throughput profile
+ resolves: rhbz#1052421
+
+* Tue Jan 7 2014 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-6
+- altered dirty ratios of troughput-performance for better performance
+ resolves: rhbz#1043533
+
+* Fri Dec 27 2013 Daniel Mach <dmach@redhat.com> - 2.3.0-5
+- Mass rebuild 2013-12-27
+
+* Fri Nov 22 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-4
+- removed useless find from the spindown-disk profile
+ resolves: rhbz#1030439
+
* Fri Nov 8 2013 Jaroslav Škarvada <jskarvad@redhat.com> - 2.3.0-3
- defuzzified patches
related: rhbz#1028119, rhbz#1028122