summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO30
-rw-r--r--PKGBUILD140
-rw-r--r--config4
-rw-r--r--config.x86_644
4 files changed, 121 insertions, 57 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a881eb41a85..a69af7eed9a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sat Oct 22 11:19:58 UTC 2016
+# Sat Oct 22 19:46:59 UTC 2016
pkgbase = linux-ck
pkgver = 4.8.4
pkgrel = 1
@@ -16,25 +16,35 @@ pkgbase = linux-ck
source = https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.8.tar.sign
source = http://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.4.xz
source = https://www.kernel.org/pub/linux/kernel/v4.x/patch-4.8.4.sign
- source = http://ck.kolivas.org/patches/4.0/4.8/4.8-ck3/patch-4.8-ck3.xz
- source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
+ source = http://ck.kolivas.org/patches/muqss/4.0/4.8/4.8-sched-MuQSS_115.patch
source = config.x86_64
source = config
source = linux-ck.preset
source = change-default-console-loglevel.patch
+ source = http://ck.kolivas.org/patches/4.0/4.8/4.8-ck1/patch-4.8-ck1.xz
+ source = http://repo-ck.com/source/gcc_patch/enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch.gz
+ source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4/0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch
+ source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4/0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch
+ source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch
+ source = http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4/0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch
sha256sums = 3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a
sha256sums = SKIP
sha256sums = 86e246b19253ee3aa971403a5990376a5e33667122f7c8742cc0ee807f204403
sha256sums = SKIP
- sha256sums = dc1a5562a20136e58a533b6f3937b993c4b5ed6d6b89988329c86538507f0503
- sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791
- sha256sums = 1db84d68a6fc570d2006e36cb958a8c913823d9d37db4944a0fc5148266eb868
- sha256sums = 5a2f4f61b6e529e2726bc20c33f31edf4d90500af1a30ade51dd48be270f49c8
+ sha256sums = d19217cbdfa5022dcfd4af2141085ef15c3fdc9c13851ab7e3bd6ba2ed50a205
+ sha256sums = 395e0b97e5cf3d483778d8ff0ec11d305d93597d397305d97efc3b7826a296ed
+ sha256sums = 4a053e009e05fd597b11b3781a7214a20624b188c3c610f9bf9d67039e1c656c
sha256sums = 2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e
sha256sums = 1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99
+ sha256sums = f085e2471668f4069c971d8beaaf12a353efea8d1cea9c68c9665858ae42b2ff
+ sha256sums = cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791
+ sha256sums = 1dabd969b18b7e09e2ffeffe4c2430dbc26e5df9868563d54ca95f45c690262f
+ sha256sums = c8d17a7893d5780fd0c90311470160dcc842b81621b30671150e2e3224be86d2
+ sha256sums = e47ea5b1c2f20cfade4e6a85bff1320dac84ac638e48ef4eec7285fe9e1e1def
+ sha256sums = c3c96e304aef378f0cc6e1fb18eeabe176e6ba918d13060c105f3d8cabc85f59
pkgname = linux-ck
- pkgdesc = Linux Kernel with the ck3 patchset featuring MuQSS CPU scheduler v0.115
+ pkgdesc = Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.512.
install = linux-ck.install
depends = coreutils
depends = linux-firmware
@@ -43,6 +53,7 @@ pkgname = linux-ck
optdepends = nvidia-ck: nVidia drivers for linux-ck
optdepends = modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig
provides = linux-ck=4.8.4
+ conflicts = kernel26-ck
conflicts = linux-ck-corex
conflicts = linux-ck-p4
conflicts = linux-ck-pentm
@@ -60,6 +71,7 @@ pkgname = linux-ck
conflicts = linux-ck-bulldozer
conflicts = linux-ck-piledriver
conflicts = linux-ck-silvermont
+ replaces = kernel26-ck
backup = etc/mkinitcpio.d/linux-ck.preset
pkgname = linux-ck-headers
@@ -67,6 +79,7 @@ pkgname = linux-ck-headers
depends = linux-ck
provides = linux-ck-headers=4.8.4
provides = linux-headers=4.8.4
+ conflicts = kernel26-ck-headers
conflicts = linux-ck-corex-headers
conflicts = linux-ck-p4-headers
conflicts = linux-ck-pentm-headers
@@ -84,4 +97,5 @@ pkgname = linux-ck-headers
conflicts = linux-ck-bulldozer-headers
conflicts = linux-ck-piledriver-headers
conflicts = linux-ck-silvermont-headers
+ replaces = kernel26-ck-headers
diff --git a/PKGBUILD b/PKGBUILD
index e35ab9e6de9..fd418e35ca4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,17 +5,25 @@
### BUILD OPTIONS
# Set these variables to ANYTHING that is not null to enable them
+# Patch with MuQSS (Multiple Queue Skiplist Scheduler)
+# See, http://ck-hack.blogspot.com/2016/10/muqss-multiple-queue-skiplist-scheduler_17.html
+_MuQSS=
+
# Tweak kernel options prior to a build via nconfig
_makenconfig=
-# NUMA is optimized for multi-socket motherboards. A single multi-core CPU can
-# actually run slower with NUMA enabled.
-# See, https://bugs.archlinux.org/task/31187
-_NUMAdisable=
-
-# Use a 1000 Hz timer (CK recommended) rather than the Arch default of 300 Hz.
+# Running with a 1000 HZ tick rate (vs the ARCH 300) is reported to solve the
+# issues with the bfs/linux 3.1x and suspend. For more see:
+# http://ck-hack.blogspot.com/2013/09/bfs-0441-311-ck1.html?showComment=1378756529345#c5266548105449573343
_1k_HZ_ticks=y
+### Do not disable NUMA until CK figures out why doing so causes panics for
+### some users!
+# NUMA is optimized for multi-socket motherboards.
+# A single multi-core CPU actually runs slower with NUMA enabled.
+# See, https://bugs.archlinux.org/task/31187
+#_NUMAdisable=
+
# Compile ONLY probed modules
# As of mainline 2.6.32, running with this option will only build the modules
# that you currently have probed in your system VASTLY reducing the number of
@@ -30,12 +38,6 @@ _1k_HZ_ticks=y
# More at this wiki page ---> https://wiki.archlinux.org/index.php/Modprobed-db
_localmodcfg=
-# Alternative I/O scheduler by Paolo Valente
-# Set this if you want it enabled globally i.e. for all devices in your system
-# If you want it enabled on a device-by-device basis, leave this unset and see:
-# https://wiki.archlinux.org/index.php/Linux-ck#How_to_Enable_the_BFQ_I.2FO_Scheduler
-_BFQ_enable_=
-
# Use the current kernel's .config file
# Enabling this option will use the .config of the RUNNING kernel rather than
# the ARCH defaults. Useful when the package gets updated and you already went
@@ -43,6 +45,12 @@ _BFQ_enable_=
# a new kernel is released, but again, convenient for package bumps.
_use_current=
+# Alternative I/O scheduler by Paolo Valente
+# Set this if you want it enabled globally i.e. for all devices in your system
+# If you want it enabled on a device-by-device basis, leave this unset and see:
+# https://wiki.archlinux.org/index.php/Linux-ck#How_to_Enable_the_BFQ_I.2FO_Scheduler
+_BFQ_enable_=
+
### Do no edit below this line unless you know what you're doing
pkgname=(linux-ck linux-ck-headers)
@@ -50,33 +58,53 @@ _kernelname=-ck
_srcname=linux-4.8
pkgver=4.8.4
pkgrel=1
-_ckpatchversion=3
arch=('i686' 'x86_64')
url="https://wiki.archlinux.org/index.php/Linux-ck"
license=('GPL2')
makedepends=('kmod' 'inetutils' 'bc' 'libelf')
options=('!strip')
+_ckpatchversion=1
_ckpatchname="patch-4.8-ck${_ckpatchversion}"
+_muqssversion=115
+_muqsspatch="4.8-sched-MuQSS_$_muqssversion"
_gcc_patch='enable_additional_cpu_optimizations_for_gcc_v4.9+_kernel_v3.15+.patch'
+_bfqpath='http://algo.ing.unimo.it/people/paolo/disk_sched/patches/4.8.0-v8r4'
+_bfqp1='0001-block-cgroups-kconfig-build-bits-for-BFQ-v7r11-4.8.0.patch'
+_bfqp2='0002-block-introduce-the-BFQ-v7r11-I-O-sched-to-be-ported.patch'
+_bfqp3='0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-v7r11-to-.patch'
+_bfqp4='0004-Turn-BFQ-v7r11-into-BFQ-v8r4-for-4.8.0.patch'
source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.sign"
"http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
"https://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.sign"
-"http://ck.kolivas.org/patches/4.0/4.8/4.8-ck${_ckpatchversion}/${_ckpatchname}.xz"
-"http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
+"http://ck.kolivas.org/patches/muqss/4.0/4.8/$_muqsspatch.patch"
'config.x86_64' 'config'
'linux-ck.preset'
-'change-default-console-loglevel.patch')
+'change-default-console-loglevel.patch'
+# ck1
+"http://ck.kolivas.org/patches/4.0/4.8/4.8-ck${_ckpatchversion}/${_ckpatchname}.xz"
+# gcc
+"http://repo-ck.com/source/gcc_patch/${_gcc_patch}.gz"
+# bfq
+"$_bfqpath/$_bfqp1"
+"$_bfqpath/$_bfqp2"
+"$_bfqpath/$_bfqp3"
+"$_bfqpath/$_bfqp4")
sha256sums=('3e9150065f193d3d94bcf46a1fe9f033c7ef7122ab71d75a7fb5a2f0c9a7e11a'
'SKIP'
'86e246b19253ee3aa971403a5990376a5e33667122f7c8742cc0ee807f204403'
'SKIP'
- 'dc1a5562a20136e58a533b6f3937b993c4b5ed6d6b89988329c86538507f0503'
- 'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
- '1db84d68a6fc570d2006e36cb958a8c913823d9d37db4944a0fc5148266eb868'
- '5a2f4f61b6e529e2726bc20c33f31edf4d90500af1a30ade51dd48be270f49c8'
+ 'd19217cbdfa5022dcfd4af2141085ef15c3fdc9c13851ab7e3bd6ba2ed50a205'
+ '395e0b97e5cf3d483778d8ff0ec11d305d93597d397305d97efc3b7826a296ed'
+ '4a053e009e05fd597b11b3781a7214a20624b188c3c610f9bf9d67039e1c656c'
'2b3ebf5446aa3cac279842ca00bc1f2d6b7ff1766915282c201d763dbf6ca07e'
- '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99')
+ '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+ 'f085e2471668f4069c971d8beaaf12a353efea8d1cea9c68c9665858ae42b2ff'
+ 'cf0f984ebfbb8ca8ffee1a12fd791437064b9ebe0712d6f813fd5681d4840791'
+ '1dabd969b18b7e09e2ffeffe4c2430dbc26e5df9868563d54ca95f45c690262f'
+ 'c8d17a7893d5780fd0c90311470160dcc842b81621b30671150e2e3224be86d2'
+ 'e47ea5b1c2f20cfade4e6a85bff1320dac84ac638e48ef4eec7285fe9e1e1def'
+ 'c3c96e304aef378f0cc6e1fb18eeabe176e6ba918d13060c105f3d8cabc85f59')
validpgpkeys=(
'ABAF11C65A2970B130ABE3C479BE3E4300411886' # Linus Torvalds
'647F28654894E3BD457199BE38DBBDC86092693E' # Greg Kroah-Hartman
@@ -93,13 +121,26 @@ prepare() {
# (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
- msg "Patching source with ck patchset"
- patch -Np1 -i "${srcdir}/${_ckpatchname}"
+ # patch source with ck patchset with BFS
+ if [ -n "$_MuQSS" ]; then
+ msg "Patching with MuQSS"
+ patch -Np1 -i "$srcdir/$_muqsspatch.patch"
+ else
+ # fix double name in EXTRAVERSION
+ sed -i -re "s/^(.EXTRAVERSION).*$/\1 = /" "${srcdir}/${_ckpatchname}"
+ msg "Patching source with ck patchset including BFS v0.512"
+ patch -Np1 -i "${srcdir}/${_ckpatchname}"
+ fi
# Patch source to enable more gcc CPU optimizatons via the make nconfig
msg "Patching source with gcc patch to enable more cpus types"
patch -Np1 -i "${srcdir}/${_gcc_patch}"
-
+
+ msg "Patching source with BFQ patches"
+ patch -Np1 -i "$srcdir/$_bfqp1"
+ patch -Np1 -i "$srcdir/$_bfqp2"
+ patch -Np1 -i "$srcdir/$_bfqp3"
+ patch -Np1 -i "$srcdir/$_bfqp4"
# Clean tree and copy ARCH config over
msg "Running make mrproper to clean source tree"
make mrproper
@@ -109,29 +150,36 @@ prepare() {
else
cat "${srcdir}/config" > ./.config
fi
-
+
+ ### Optionally set tickrate to 1000 to avoid suspend issues as reported here:
+ # http://ck-hack.blogspot.com/2013/09/bfs-0441-311-ck1.html?showComment=1379234249615#c4156123736313039413
if [ -n "$_1k_HZ_ticks" ]; then
- msg "Setting tick rate to 1000 Hz..."
+ msg "Setting tick rate to 1k..."
sed -i -e 's/^CONFIG_HZ_300=y/# CONFIG_HZ_300 is not set/' \
-i -e 's/^# CONFIG_HZ_1000 is not set/CONFIG_HZ_1000=y/' \
-i -e 's/^CONFIG_HZ=300/CONFIG_HZ=1000/' .config
fi
- if [ -n "$_NUMAdisable" ]; then
- if [ "${CARCH}" = "x86_64" ]; then
- msg "Disabling NUMA from kernel config..."
- sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \
- -i -e '/CONFIG_AMD_NUMA=y/d' \
- -i -e '/CONFIG_X86_64_ACPI_NUMA=y/d' \
- -i -e '/CONFIG_NODES_SPAN_OTHER_NODES=y/d' \
- -i -e '/# CONFIG_NUMA_EMU is not set/d' \
- -i -e '/CONFIG_NODES_SHIFT=6/d' \
- -i -e '/CONFIG_NEED_MULTIPLE_NODES=y/d' \
- -i -e '/# CONFIG_MOVABLE_NODE is not set/d' \
- -i -e '/CONFIG_USE_PERCPU_NUMA_NODE_ID=y/d' \
- -i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
- fi
- fi
+ ### Do not disable NUMA until CK figures out why doing so causes panics for
+ ### some users!
+
+ # Optionally disable NUMA since >99% of users have mono-socket systems.
+ # For more, see: https://bugs.archlinux.org/task/31187
+# if [ -n "$_NUMAdisable" ]; then
+# if [ "${CARCH}" = "x86_64" ]; then
+# msg "Disabling NUMA from kernel config..."
+# sed -i -e 's/CONFIG_NUMA=y/# CONFIG_NUMA is not set/' \
+# -i -e '/CONFIG_AMD_NUMA=y/d' \
+# -i -e '/CONFIG_X86_64_ACPI_NUMA=y/d' \
+# -i -e '/CONFIG_NODES_SPAN_OTHER_NODES=y/d' \
+# -i -e '/# CONFIG_NUMA_EMU is not set/d' \
+# -i -e '/CONFIG_NODES_SHIFT=6/d' \
+# -i -e '/CONFIG_NEED_MULTIPLE_NODES=y/d' \
+# -i -e '/# CONFIG_MOVABLE_NODE is not set/d' \
+# -i -e '/CONFIG_USE_PERCPU_NUMA_NODE_ID=y/d' \
+# -i -e '/CONFIG_ACPI_NUMA=y/d' ./.config
+# fi
+# fi
### Optionally use running kernel's config
# code originally by nous; http://aur.archlinux.org/packages.php?ID=40191
@@ -205,13 +253,14 @@ build() {
}
package_linux-ck() {
- pkgdesc='Linux Kernel with the ck3 patchset featuring MuQSS CPU scheduler v0.115'
- #_Kpkgdesc='Linux Kernel and modules with the ck3 patchset featuring MuQSS CPU scheduler v0.115'
+ pkgdesc='Linux Kernel with the ck1 patchset featuring the Brain Fuck Scheduler v0.512.'
+ #_Kpkgdesc='Linux Kernel and modules with the ck1 patchset featuring the Brain Fuck Scheduler v0.512.'
#pkgdesc="${_Kpkgdesc}"
depends=('coreutils' 'linux-firmware' 'mkinitcpio>=0.7')
optdepends=('crda: to set the correct wireless channels of your country' 'nvidia-ck: nVidia drivers for linux-ck' 'modprobed-db: Keeps track of EVERY kernel module that has ever been probed - useful for those of us who make localmodconfig')
provides=("linux-ck=${pkgver}")
- conflicts=('linux-ck-corex' 'linux-ck-p4' 'linux-ck-pentm' 'linux-ck-atom' 'linux-ck-core2' 'linux-ck-nehalem' 'linux-ck-sandybridge' 'linux-ck-ivybridge' 'linux-ck-broadwell' 'linux-ck-skylake' 'linux-ck-haswell' 'linux-ck-kx' 'linux-ck-k10' 'linux-ck-barcelona' 'linux-ck-bulldozer' 'linux-ck-piledriver' 'linux-ck-silvermont')
+ conflicts=('kernel26-ck' 'linux-ck-corex' 'linux-ck-p4' 'linux-ck-pentm' 'linux-ck-atom' 'linux-ck-core2' 'linux-ck-nehalem' 'linux-ck-sandybridge' 'linux-ck-ivybridge' 'linux-ck-broadwell' 'linux-ck-skylake' 'linux-ck-haswell' 'linux-ck-kx' 'linux-ck-k10' 'linux-ck-barcelona' 'linux-ck-bulldozer' 'linux-ck-piledriver' 'linux-ck-silvermont')
+ replaces=('kernel26-ck')
backup=("etc/mkinitcpio.d/linux-ck.preset")
install=linux-ck.install
#groups=('ck-generic')
@@ -275,7 +324,8 @@ package_linux-ck-headers() {
#pkgdesc="${_Hpkgdesc}"
depends=('linux-ck') # added to keep kernel and headers packages matched
provides=("linux-ck-headers=${pkgver}" "linux-headers=${pkgver}")
- conflicts=('linux-ck-corex-headers' 'linux-ck-p4-headers' 'linux-ck-pentm-headers' 'linux-ck-atom-headers' 'linux-ck-core2-headers' 'linux-ck-nehalem-headers' 'linux-ck-sandybridge-headers' 'linux-ck-ivybridge-headers' 'linux-ck-haswell-headers' 'linux-ck-broadwell-headers' 'linux-ck-skylake-headers' 'linux-ck-kx-headers' 'linux-ck-k10-headers' 'linux-ck-barcelona-headers' 'linux-ck-bulldozer-headers' 'linux-ck-piledriver-headers' 'linux-ck-silvermont-headers')
+ conflicts=('kernel26-ck-headers' 'linux-ck-corex-headers' 'linux-ck-p4-headers' 'linux-ck-pentm-headers' 'linux-ck-atom-headers' 'linux-ck-core2-headers' 'linux-ck-nehalem-headers' 'linux-ck-sandybridge-headers' 'linux-ck-ivybridge-headers' 'linux-ck-haswell-headers' 'linux-ck-broadwell-headers' 'linux-ck-skylake-headers' 'linux-ck-kx-headers' 'linux-ck-k10-headers' 'linux-ck-barcelona-headers' 'linux-ck-bulldozer-headers' 'linux-ck-piledriver-headers' 'linux-ck-silvermont-headers')
+ replaces=('kernel26-ck-headers')
#groups=('ck-generic')
install -dm755 "${pkgdir}/usr/lib/modules/${_kernver}"
diff --git a/config b/config
index 37d3f3bc63d..77b3d0b123b 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.3-2-ck2 Kernel Configuration
+# Linux/x86 4.8.2-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -47,7 +47,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#
-CONFIG_SCHED_MUQSS=y
+CONFIG_SCHED_BFS=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set
diff --git a/config.x86_64 b/config.x86_64
index ab05ff3adab..4e0a7195100 100644
--- a/config.x86_64
+++ b/config.x86_64
@@ -1,6 +1,6 @@
#
# Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.8.3-2-ck2 Kernel Configuration
+# Linux/x86 4.8.2-1 Kernel Configuration
#
CONFIG_64BIT=y
CONFIG_X86_64=y
@@ -50,7 +50,7 @@ CONFIG_BUILDTIME_EXTABLE_SORT=y
#
# General setup
#
-CONFIG_SCHED_MUQSS=y
+CONFIG_SCHED_BFS=y
CONFIG_INIT_ENV_ARG_LIMIT=32
CONFIG_CROSS_COMPILE=""
# CONFIG_COMPILE_TEST is not set