From 2ac152aa9ff6e99ef65a2fda6d8acef892ee5f47 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 27 Jun 2022 08:55:53 +0200
Subject: [PATCH] main/linux-lts: enable BFQ IO scheduler

fixes https://gitlab.alpinelinux.org/alpine/aports/-/issues/13956

(cherry picked from commit 83385b7c7eb08141e36bf7673191b53813053bea)
---
 main/linux-lts/APKBUILD            | 26 +++++++++++++-------------
 main/linux-lts/lts.aarch64.config  |  3 ++-
 main/linux-lts/lts.armv7.config    |  2 ++
 main/linux-lts/lts.ppc64le.config  |  2 +-
 main/linux-lts/lts.s390x.config    |  3 ++-
 main/linux-lts/lts.x86.config      |  3 ++-
 main/linux-lts/lts.x86_64.config   |  3 ++-
 main/linux-lts/virt.aarch64.config |  3 ++-
 main/linux-lts/virt.armv7.config   |  2 ++
 main/linux-lts/virt.ppc64le.config |  3 ++-
 main/linux-lts/virt.x86.config     |  3 ++-
 main/linux-lts/virt.x86_64.config  |  3 ++-
 12 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 4459af0f7f0..3285bca4270 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -7,7 +7,7 @@ case $pkgver in
 	*.*.*)	_kernver=${pkgver%.*};;
 	*.*) _kernver=$pkgver;;
 esac
-pkgrel=1
+pkgrel=2
 pkgdesc="Linux lts kernel"
 url="https://www.kernel.org"
 depends="mkinitfs>=3.6.0"
@@ -294,17 +294,17 @@ sha512sums="
 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a  linux-5.15.tar.xz
 214c54a839ae37849715520f4b1049f0df5366ca32522701b43afecfad116794c4542940ba32d389f28f2549d08c03d148f884cb8e565b75aa3c0cad6a4887b7  0001-powerpc-config-defang-gcc-check-for-stack-protector-.patch
 d26d3f99fdcbd0f56e9af32a281870bbfd9fe6a12d17921ef3876e72bd1e92a3c131e06567078a45c11a41826b39d3068cc6f0e89f67d9e16a14825984869268  vmlinux-zstd.patch
-d0259edbe3a3ee6bbaa170b85b505a93a5593c639ef180dd960d3ed599165680446c137c727a74fe9069cc8007413580bbe5d25c2f52b061b622e53beb52e6d7  lts.aarch64.config
-723fd8d1f64ebdcd197abc9caa55a367626ee6b71ec0313beef2fab2738ff7edc7ce9088e73044ca87f467df5b7e3c84f402ef9f1df3cba99499836e16f151d8  lts.armv7.config
-292061d4afca8f9a513315fd493978c595fc1e67a09d86485e781295d0974ad19581c06300ebe7819091845f34ab620c79f45ebee7a82fefdbc7d7b4e676c67a  lts.x86.config
-f2cb6bed41d8462f3dc809cefa7b5b22a82490ec952cf3130259d2d52a2e3442286e944ffedc63d2aebf952a391944a3246be6522733cbc91e99a4f8871e1d1b  lts.x86_64.config
-9ec8398c5fb10a194f118fb17ac81a728f7310804d03d7bedafe5ce767743d7ba1942838bfa2602a08bcd4ad54b8b1abae1ee4796c40a3795463db6c26da32f8  lts.ppc64le.config
-7f57a417441458cc3034876382398608106003e499f77f803c658bb8105e72f824af29e86af3657c93b46950471125fca138e44a473e3238b787f28f9ade2bfc  lts.s390x.config
-618aa5f31179f6aacf43c8742515e25384cd4601218bdaa2a73419f5687d76dae6d2ecea6ee01335e4bb3f73e889ee675bc80d1d920209f553ee82d3603e3659  virt.aarch64.config
-faa4fdf8cd19888f095ca79e81bc48391c1c20a2c88fcbc2b98c086b4ce4f3d7f38674286315c5fe88cb27efec6282c49163915a39215cbd4a7bc6c2eb692129  virt.armv7.config
-a6021519a9c71ae86199b87f458f3814d67c03cc005301d48d4a9f44280627fad4a70138ee4e0c42d67367b30d9a0c123f61592bc7c89084dd2a40af5dea7230  virt.ppc64le.config
-c0ddfee06f958192653d840ca14fd60d5d3d88311b1335d691fc4d4c5a7575c5771351a0ec5e3d34544c76c34e4ee8731cc45fa18da77909924f0b9b6ef75d87  virt.x86.config
-fd5dea1a2ada211e1cf673553a0e2df3af7ffc4ae35b316b0d009145bcddf984cfd98c2b1e91de08c10a3442e32ff470d1285ef5d291068fb319160bb9552cf1  virt.x86_64.config
-08ede2bc8363a24a6f843021fee93ebe46d2bc01d2bf732fa140bbd5aa99130f00ea021b2b86a49a021a48368fe4d2e848604c7d86a801d268df83c02a183cab  patch-5.15.49.xz
 bb374cecb32f32f2fe669ed00abbbe35a91ddcda469801a5cc4a4941605aa1768cd872a54906acf77d627ee7addd21b0565f73495a49e34c5bce3865deb4b45a  ppc-export_mmu_feature_keys_as_non-GPL.patch
+3d8f570338ba4a1093b37c5a2e74df54317811c63cdac16533ee2177243faf7c3136bd9923bfd6ca3a9799e707d27c280d3953d143bc9585715e30d949d95186  lts.aarch64.config
+a5e2626609ae81a8334d2dc1cf846264189dd0d7713ce4ef7f9e195214165d0b7b854cbfe68b6a6eaf6d3823d78850f115686c9f87f552d75cb9618c1451e990  lts.armv7.config
+7d8cd3e7ab0588b51434773be901b19cb9172837725ee6478f6c1071c2a78ea07b6626e94f253574a7c5b102b900bea91e17ea48959c7e85398cc977eaf2777b  lts.x86.config
+78b17e87b725773783d4df3019800bbdbcd419a166c9b3c0aa369a7ccef0fbcfcb79a90f63936f2d62b0547f149bf96d350e3ea59d0e2017bf13c6bf05f5be1d  lts.x86_64.config
+11b5d1146a77039d2c3ca34209c199d823ba001525ba391551f78f596f754064114837f4a3d8ab7b0a6dc1277fa26ad20c8bb378164a1d369288249cc14db336  lts.ppc64le.config
+4408a26a1b278c2bd9ed96440da014d69f29565fc5597d14e3649c19e0ca15ddd5b3cfc3f38652a1ea340c3a862f276f3a3f70d12e6b102c935622f74cafddf4  lts.s390x.config
+b60ddfd4e2bdc7f2b80fb1945a3e39fc837518abbce81eb546fae0b7c2ca828987496dcea2c9170fe75ee25a494ca76281ff31e1d1f897ef05d79c35b29c89ee  virt.aarch64.config
+5a468162ee2f33d5e01ca8fcf2d63043ba364535de273b93335cf532905a59bbd6bbfef68e883747b22b0fcf0e5ad4bf31edd0de5b2fb7248f921ed89f622665  virt.armv7.config
+5a91305a3a92ede3fa0910b84e8327dc7e49aa01beb6bf7c49ba9695f21a4f42bf7c7410fac50878858a614baf3e9868e365bb9969defd5ce03933a758119384  virt.ppc64le.config
+1df02b268e37505e240a96586832306dd8106f026ab6898c18abe21f6add73ddf090fcb5b68e490ce9e9a4045049cb780b6b59db93ca5015328cfa08e186d42c  virt.x86.config
+ae3d94a12b8d04ac7a134dfddb9a73b9dc35cfc68c5c2b21456aae5b1976d0aa9a63955eaa5e12a5e6b85b40e1b09584de501d07d81866e2ec1b70fd8ada535d  virt.x86_64.config
+08ede2bc8363a24a6f843021fee93ebe46d2bc01d2bf732fa140bbd5aa99130f00ea021b2b86a49a021a48368fe4d2e848604c7d86a801d268df83c02a183cab  patch-5.15.49.xz
 "
diff --git a/main/linux-lts/lts.aarch64.config b/main/linux-lts/lts.aarch64.config
index c385980ce7b..561ff123c3c 100644
--- a/main/linux-lts/lts.aarch64.config
+++ b/main/linux-lts/lts.aarch64.config
@@ -137,6 +137,8 @@ CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_LDM_PARTITION=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
@@ -1504,7 +1506,6 @@ CONFIG_TCG_TPM=m
 CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TCG_XEN=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
diff --git a/main/linux-lts/lts.armv7.config b/main/linux-lts/lts.armv7.config
index 21738872a59..f4a31555b2e 100644
--- a/main/linux-lts/lts.armv7.config
+++ b/main/linux-lts/lts.armv7.config
@@ -119,6 +119,8 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
diff --git a/main/linux-lts/lts.ppc64le.config b/main/linux-lts/lts.ppc64le.config
index 2abcb4383a8..4139dd57e1a 100644
--- a/main/linux-lts/lts.ppc64le.config
+++ b/main/linux-lts/lts.ppc64le.config
@@ -63,6 +63,7 @@ CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
 CONFIG_BINFMT_MISC=m
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
@@ -504,7 +505,6 @@ CONFIG_IPMI_HANDLER=y
 CONFIG_IPMI_DEVICE_INTERFACE=y
 CONFIG_IPMI_POWERNV=y
 CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_RC_CORE=y
 CONFIG_DRM=y
 CONFIG_DRM_DP_CEC=y
diff --git a/main/linux-lts/lts.s390x.config b/main/linux-lts/lts.s390x.config
index 7d534843f63..2a503501f79 100644
--- a/main/linux-lts/lts.s390x.config
+++ b/main/linux-lts/lts.s390x.config
@@ -59,6 +59,8 @@ CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 CONFIG_BINFMT_MISC=m
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
@@ -739,7 +741,6 @@ CONFIG_HANGCHECK_TIMER=m
 CONFIG_TCG_TPM=m
 CONFIG_TN3270_FS=y
 CONFIG_SCLP_OFB=y
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_PTP_1588_CLOCK=m
 CONFIG_GPIOLIB=y
 CONFIG_GPIO_SYSFS=y
diff --git a/main/linux-lts/lts.x86.config b/main/linux-lts/lts.x86.config
index bcbde6c989d..cfd3a857c7e 100644
--- a/main/linux-lts/lts.x86.config
+++ b/main/linux-lts/lts.x86.config
@@ -121,6 +121,8 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
@@ -1524,7 +1526,6 @@ CONFIG_TCG_ATMEL=m
 CONFIG_TCG_INFINEON=m
 CONFIG_TCG_CRB=m
 CONFIG_TELCLOCK=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
diff --git a/main/linux-lts/lts.x86_64.config b/main/linux-lts/lts.x86_64.config
index 1c0b71c1eee..6e5d0d3cf06 100644
--- a/main/linux-lts/lts.x86_64.config
+++ b/main/linux-lts/lts.x86_64.config
@@ -132,6 +132,8 @@ CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
 CONFIG_LDM_PARTITION=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
@@ -1560,7 +1562,6 @@ CONFIG_TCG_INFINEON=m
 CONFIG_TCG_XEN=m
 CONFIG_TCG_CRB=m
 CONFIG_TELCLOCK=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PCA9541=m
diff --git a/main/linux-lts/virt.aarch64.config b/main/linux-lts/virt.aarch64.config
index f1aa662e6d2..f076e9a5046 100644
--- a/main/linux-lts/virt.aarch64.config
+++ b/main/linux-lts/virt.aarch64.config
@@ -108,6 +108,8 @@ CONFIG_MODULE_SIG=y
 CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
@@ -736,7 +738,6 @@ CONFIG_VIRTIO_CONSOLE=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_VIRTIO=m
 # CONFIG_DEVPORT is not set
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_PCA9541=m
diff --git a/main/linux-lts/virt.armv7.config b/main/linux-lts/virt.armv7.config
index 0f867bcd283..b19deb7f00b 100644
--- a/main/linux-lts/virt.armv7.config
+++ b/main/linux-lts/virt.armv7.config
@@ -82,6 +82,8 @@ CONFIG_MODULE_SIG=y
 CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
diff --git a/main/linux-lts/virt.ppc64le.config b/main/linux-lts/virt.ppc64le.config
index a1fec665c4e..4c298f606a5 100644
--- a/main/linux-lts/virt.ppc64le.config
+++ b/main/linux-lts/virt.ppc64le.config
@@ -86,6 +86,8 @@ CONFIG_MODULE_SIG=y
 CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
@@ -696,7 +698,6 @@ CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
 # CONFIG_DEVPORT is not set
 CONFIG_HANGCHECK_TIMER=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_PCA9541=m
diff --git a/main/linux-lts/virt.x86.config b/main/linux-lts/virt.x86.config
index 9cadf510bd7..807cf8edf7f 100644
--- a/main/linux-lts/virt.x86.config
+++ b/main/linux-lts/virt.x86.config
@@ -94,6 +94,8 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_KSM=y
@@ -709,7 +711,6 @@ CONFIG_NVRAM=m
 CONFIG_HPET=y
 # CONFIG_HPET_MMAP_DEFAULT is not set
 CONFIG_HANGCHECK_TIMER=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_PCA9541=m
diff --git a/main/linux-lts/virt.x86_64.config b/main/linux-lts/virt.x86_64.config
index 84aaf4ef8ad..7fafb867e90 100644
--- a/main/linux-lts/virt.x86_64.config
+++ b/main/linux-lts/virt.x86_64.config
@@ -104,6 +104,8 @@ CONFIG_MODULE_COMPRESS_GZIP=y
 CONFIG_BLK_DEV_THROTTLING=y
 CONFIG_BLK_CGROUP_IOLATENCY=y
 CONFIG_PARTITION_ADVANCED=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=m
 CONFIG_MEMORY_HOTPLUG=y
@@ -732,7 +734,6 @@ CONFIG_VIRTIO_CONSOLE=y
 CONFIG_HW_RANDOM_VIRTIO=m
 CONFIG_NVRAM=m
 CONFIG_HANGCHECK_TIMER=m
-CONFIG_RANDOM_TRUST_CPU=y
 CONFIG_I2C_CHARDEV=m
 CONFIG_I2C_MUX=m
 CONFIG_I2C_MUX_PCA9541=m