linux-yocto: (small) consolidated pull request
cover linux-yocto: (small) consolidated pull request
From: Bruce Ashfield <[email protected]>
Richard,
This pull request is really about the TCP fix that we need for the ptest timeouts / hangs that you were seeing.
I also had one config tweak, and a -rt cleanup that are worth merging as well.
Cheers,
Bruce
The following changes since commit 244cbcce0ecc4691a9ddfb0a44dc487ff7af0670:
utils/multiprocess_launch: Improve failing subprocess output (2019-04-26 10:09:08 +0100)
are available in the Git repository at:
git://git.pokylinux.org/poky-contrib zedd/kernel
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
Bruce Ashfield (3):
linux-yocto-rt/4.19: fix merge conflict in lru_drain linux-yocto/5.0: port RAID configuration tweaks from master linux-yocto/5.0: integrate TCP timeout / hang fix
.../linux/linux-yocto-rt_4.19.bb | 2 +- .../recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 ++-- .../linux/linux-yocto-tiny_5.0.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 18 +++++++++--------- 4 files changed, 15 insertions(+), 15 deletions(-)
Signature · 1 line
2.19.1
PATCH 1/3 linux-yocto-rt/4.19: fix merge conflict in lru_drain
From: Bruce Ashfield <[email protected]>
Paul Gortmaker sent along the following fixup for 4.19-rt:
[
Author: Paul Gortmaker <[email protected]>
Date: Mon Apr 15 12:01:31 2019 -0400
Revert "mm: handle lru_add_drain_all for UP properly"
This reverts commit e6e9d6e290028b0a6b83b563fad9fafa7f1d515e.
It was a 4.19.31 backport of commit 6ea183d60c46 ("mm: handle lru_add_drain_all for UP properly"). In summary, what that did was to fix a possible harmless WARN_ON on non-SMP, introduced at commit 4d43d395fed1 ("workqueue: Try to catch flush_work() without INIT_WORK().") by adding non-SMP variants of lru functions.
The combination of that, with the -rt commit 473f14a9f234 ("mm:
perform lru_add_drain_all() remotely") at the merge of the two results in the following build failure:
mm/swap.c:736:2: error: #endif without #if
since the -rt change wants RT specific lru and the stable backport wants non-SMP specific lru, and a chunk of the backport with an #ifdef CONFIG_SMP is missing.
However, before we add a four way cluster of ifdeffery to handle all cases, we note 4d43d395fed1 was added to the v5.1 release, and it was not (currently) backported to any 4.19.x stable release - so it is unclear to me why this commit was ever backported to 4.19.31 at all.
Further, we note this change was to mm/swap.c -- and by definition, any preempt-rt deployment that uses swap for anything other than a failure contingency mitigation is broken by design.
Given all that, I decided that the best path forward was to revert the two of the three chunks of the backport that remain in the -rt branch, and return us to the pre-4.19.31 merge behaviour for -rt.
]
--- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1 -1
@@ -11,7 +11,7 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b0ea9ef736c8ab8695bdfba61cd121ce5aa47e49" +SRCREV_machine ?= "c279a81f1e654023c4cc78afa9f14350ee5f836f" SRCREV_meta ?= "9bda6190bfc9e7858c2f7588109a0ec966f37a09" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
Signature · 1 line
2.19.1
PATCH 2/3 linux-yocto/5.0: port RAID configuration tweaks from master
In reply to [email protected]From: Bruce Ashfield <[email protected]>
Porting the following three RAID config changes from master to the 5.0 branch:
ffd8cf5baf8 intel-x86: add Intel VMD support
8edf951a15c cfg/efi.cfg: built-in CONFIG_EFIVAR_FS to support Intel VROC 041a6c04244 intel-x86: built-in nvme driver to support boot from nvme disk
--- meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1 -1
@@ -12,7 +12,7 @@ python () { } SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a" -SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" +SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +1 -1
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9" SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" +SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1 -1
@@ -19,7 +19,7 @@ SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87" SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "7477b32eaf608884be5664fadd79331b39afaaa6" +SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.19.1
PATCH 3/3 linux-yocto/5.0: integrate TCP timeout / hang fix
In reply to [email protected]From: Bruce Ashfield <[email protected]>
Integrating the following fix:
[
tcp: fix issues relaed to implement coalescing on backlog queue
As was discussed on -netdev, there's an issue with TCP timeouts and hangs due to new features introduced in the 5.0 kernel:
https://www.spinics.net/lists/netdev/msg562928.html
This is a temporary commit to widely test the proposed solution. It will be dropped when an official patch makes mainline.
]
--- .../recipes-kernel/linux/linux-yocto-rt_5.0.bb | 4 ++-- .../linux/linux-yocto-tiny_5.0.bb | 6 +++--- meta/recipes-kernel/linux/linux-yocto_5.0.bb | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +2 -2
@@ -11,8 +11,8 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "04585fb29f99725a27acb96fc25efa0a55a62a8a" -SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" +SRCREV_machine ?= "a3309af7ab77156bd8d731df3a97126d3d897916" +SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.0;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.0.bb +3 -3
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e265300362d7004e3b57bb5cbcfc65fb469b9ce9" -SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" +SRCREV_machine_qemuarm ?= "d905ae925fc4a60d63f45e1922163da683d8a3bc" +SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.0.bb +9 -9
@@ -11,15 +11,15 @@ KBRANCH_qemux86 ?= "v5.0/standard/base" KBRANCH_qemux86-64 ?= "v5.0/standard/base" KBRANCH_qemumips64 ?= "v5.0/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "ed9d11e2c8ebbfe056420cb89c2e5d02836496ce" -SRCREV_machine_qemuarm64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemumips ?= "40a729c3b0683d0875f8d6ad7353e6e429c7afc2" -SRCREV_machine_qemuppc ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemux86 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemux86-64 ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_machine_qemumips64 ?= "437d99225c689f3f192bb834e4d649ea0467ac87" -SRCREV_machine ?= "9c40ed0d86ad87f48659aad4fdead2455e8b5db8" -SRCREV_meta ?= "ffd8cf5baf8e741b8987b72c942ce3b9cc7c7f30" +SRCREV_machine_qemuarm ?= "17c4b7e9db4d17aa713c85d0c3d2d84af962864a" +SRCREV_machine_qemuarm64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemumips ?= "e5c23fb31438dab373a50afc40f6e4ab0c568485" +SRCREV_machine_qemuppc ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemux86 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemux86-64 ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_machine_qemumips64 ?= "743d799797ad6828472087e1da8c67fdab87bf75" +SRCREV_machine ?= "14b6c1fc020fa357245e9ac9c6c69d253bc7ce30" +SRCREV_meta ?= "2d838e11b084a96dd70e5cc0fec01d2e492f72c3" # remap qemuarm to qemuarma15 for the 5.0 kernel # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.19.1