profiles: converted some more options from scripts to tuned.conf

profiles/enterprise-storage/script.sh

@@ -3,16 +3,12 @@
 . /usr/lib/tuned/functions
 
 start() {
-    set_elevator "/sys/block/{sd,cciss,dm-,vd}*/queue/scheduler" deadline
     remount_all_no_rootboot_partitions nobarrier
-    multiply_disk_readahead 4
     return 0
 }
 
 stop() {
-    restore_elevator "/sys/block/{sd,cciss,dm-,vd}*/queue/scheduler"
     remount_all_no_rootboot_partitions barrier
-    multiply_disk_readahead 0.25
     return 0
 }
 

profiles/enterprise-storage/tuned.conf

@@ -7,3 +7,6 @@ include=throughput-performance
 
 [script]
 script=script.sh
+
+[disk]
+readahead_multiply=4

profiles/latency-performance/script.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. /usr/lib/tuned/functions
-
-start() {
-    set_elevator "/sys/block/{sd,cciss,dm-,vd}*/queue/scheduler" deadline
-
-    return 0
-}
-
-stop() {
-    restore_elevator "/sys/block/{sd,cciss,dm-,vd}*/queue/scheduler"
-
-    return 0
-}
-
-process $@

profiles/latency-performance/tuned.conf

@@ -6,5 +6,7 @@
 force_latency=0
 governor=performance
 
-[script]
-script=script.sh
+# devices sd*,cciss*,dm-*,vd*
+[disk]
+devices=sd*,cciss*,dm-*,vd*
+elevator=deadline

profiles/powersave/tuned.conf

@@ -8,6 +8,8 @@ multicore_powersave=1
 
 [eeepc_she]
 
+[vm]
+
 [audio]
 ac97_powersave=true
 hda_intel_powersave=10

profiles/spindown-disk/script.sh

@@ -5,9 +5,6 @@
 EXT_PARTITIONS=$(mount | grep -E "type ext(3|4)" | cut -d" " -f1)
 
 start() {
-    set_disk_alpm medium_power
-    set_disk_apm 128
-    set_disk_spindown 6
 
     [ "$USB_AUTOSUSPEND" = 1 ] && enable_usb_autosuspend
     disable_bluetooth
@@ -22,9 +19,6 @@ start() {
 }
 
 stop() {
-    set_disk_alpm max_power
-    set_disk_apm 255
-    set_disk_spindown 0
 
     [ "$USB_AUTOSUSPEND" = 1 ] && disable_usb_autosuspend
     enable_bluetooth

profiles/spindown-disk/tuned.conf

@@ -16,6 +16,11 @@
 # Bluetooth will be switch off.
 # Wifi will be switch into power safe mode.
 
+[disk]
+alpm=medium_power
+apm=128
+spindown=6
+
 [sysctl]
 vm.dirty_writeback_centisecs=6000
 vm.dirty_expire_centisecs=9000

profiles/throughput-performance/script.sh

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. /usr/lib/tuned/functions
-
-start() {
-    set_elevator "/sys/block/{sd,cciss,dm-,vd}*/queue/scheduler" deadline
-    enable_transparent_hugepages
-    return 0
-}
-
-stop() {
-    restore_elevator "/sys/block/{sd,cciss,dm-,vd}*/queue/scheduler"
-    restore_transparent_hugepages
-    return 0
-}
-
-process $@

profiles/throughput-performance/tuned.conf

@@ -5,6 +5,14 @@
 [cpu]
 governor=performance
 
+[vm]
+transparent_hugepages=always
+
+# devices sd*,cciss*,dm-*,vd*
+[disk]
+devices=sd*,cciss*,dm-*,vd*
+elevator=deadline
+
 [sysctl]
 # ktune sysctl settings for rhel6 servers, maximizing i/o throughput
 #
@@ -42,5 +50,3 @@ vm.dirty_ratio = 40
 # 65536, for 4096 cpus, 4194304 (which is the upper limit possible).
 #kernel.pid_max = 65536
 
-[script]
-script=script.sh

profiles/virtual-guest/script.sh

@@ -4,13 +4,11 @@
 
 start() {
     remount_all_no_rootboot_partitions nobarrier
-    multiply_disk_readahead 4
     return 0
 }
 
 stop() {
     remount_all_no_rootboot_partitions barrier
-    multiply_disk_readahead 0.25
     return 0
 }
 

profiles/virtual-guest/tuned.conf

@@ -5,6 +5,9 @@
 [main]
 include=throughput-performance
 
+[disk]
+readahead_multiply=4
+
 [sysctl]
 # Filesystem I/O is usually much more efficient than swapping, so try to keep
 # swapping low.  It's usually safe to go even lower than this on systems with

profiles/virtual-host/script.sh

@@ -3,18 +3,12 @@
 . /usr/lib/tuned/functions
 
 start() {
-    set_elevator "/sys/block/{sd,cciss,dm-}*/queue/scheduler" deadline
-    enable_transparent_hugepages
     remount_all_no_rootboot_partitions nobarrier
-    multiply_disk_readahead 4
     return 0
 }
 
 stop() {
-    restore_elevator "/sys/block/{sd,cciss,dm-}*/queue/scheduler"
-    restore_transparent_hugepages
     remount_all_no_rootboot_partitions barrier
-    multiply_disk_readahead 0.25
     return 0
 }
 

profiles/virtual-host/tuned.conf

@@ -8,6 +8,12 @@ include=throughput-performance
 [cpu]
 governor=performance
 
+[vm]
+transparent_hugepages=always
+
+[disk]
+readahead_multiply=4
+
 [sysctl]
 # Filesystem I/O is usually much more efficient than swapping, so try to keep
 # swapping low.  It's usually safe to go even lower than this on systems with