Skip to contentSkip to conversation

linux-yocto/5.8: fix perf and virtio_scsi warnings

PATCH New Bruce Ashfield 1 participant 4 messages Aug 24, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 linux-yocto/5.8: fix perf and virtio_scsi warnings

From: Bruce Ashfield <[email protected]>

Integrating the following commit(s) to linux-yocto/5.8:

5d66d1a67c8d arm64/perf: Fix wrong cast that may cause wrong truncation

Khem reported in some configurations that CONFIG_SCSI_VIRTIO was throwing a warning in the final .config. That was due to the fact that if debug or not is enabled, it switches between built-in and a module. Either configuration is correct, so we add it to the non-hardware file to inhibit it being reported by deefault.

The following meta branch commit resolves the issue:

commit 96e8f5e330f5a8f87deda0f1bae71af31c578ce9 (HEAD -> master)
Author: Bruce Ashfield <[email protected]>
Date: Sat Aug 22 22:19:13 2020 -0400

virtio: declare CONFIG_SCSI_VIRTIO as non-hw

---
 .../linux/linux-yocto-rt_5.8.bb               |  4 ++--
 .../linux/linux-yocto-tiny_5.8.bb             |  6 +++---
 meta/recipes-kernel/linux/linux-yocto_5.8.bb  | 20 +++++++++----------
 3 files changed, 15 insertions(+), 15 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +2 -2
index 6317f8da7b..7b5588f01f 100644
@@ -11,8 +11,8 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0"
+SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
 
 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.8;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +3 -3
index 022779f97f..8e7272b54e 100644
@@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "15d5da73971d108241be861b5587949fd56933e9"
-SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0"
+SRCREV_machine_qemuarm ?= "01ca9ab2d6cb0de4425d9dfca99dff30653083d9"
+SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.8.bb +10 -10
index ea167c1866..e6e1189802 100644
@@ -12,16 +12,16 @@ KBRANCH_qemux86  ?= "v5.8/standard/base"
 KBRANCH_qemux86-64 ?= "v5.8/standard/base"
 KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "ca2de8f4027075ca7d7c973c2cc03f7d8b219a43"
-SRCREV_machine_qemuarm64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_machine_qemumips ?= "5e0205a156d14b6341487a169b75ea45b67007b9"
-SRCREV_machine_qemuppc ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_machine_qemuriscv64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_machine_qemux86 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_machine_qemux86-64 ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_machine_qemumips64 ?= "576f92f17434ae7dd027e8d465a32e4119ead4ee"
-SRCREV_machine ?= "3eb064c5f2b3938ef296c016bc7904cd66f50329"
-SRCREV_meta ?= "196209114496901389e2f9012c0600121fc617e0"
+SRCREV_machine_qemuarm ?= "3c532d32043dbe90c159f334d8c4232ca67537cd"
+SRCREV_machine_qemuarm64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemumips ?= "de93c804ee2e77d32e8a103a68ef19df6947757f"
+SRCREV_machine_qemuppc ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemuriscv64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemux86 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemux86-64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemumips64 ?= "3109e6f363109f0dd4bd6a8647f639e445c533f2"
+SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.19.1
#1 lore raw

PATCH 2/4 linux-yocto-rt/5.8: fix lttng-modules build

From: Bruce Ashfield <[email protected]>

Integrating the following commit(s) to linux-yocto-rt/5.8:

commit baee1af811ec9bd3e64990543b7cc85e77c8f50c (HEAD -> master)

Author: Bruce Ashfield <[email protected]>
Date:   Sun Aug 23 22:50:30 2020 -0400

linux-yocto/rt: enable kprobes by default

Traditionally kprobes and -rt haven't mixed well, but recent -rt kernels support kprobes without issues.

lttng now requires kprobes to be enabled, or the following error is thrown:

| build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.12.2-r0/lttng-modules-2.12.2/wrapper/kallsyms.c:20:3:
error: #error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0"
| 20 | # error "LTTng-modules requires CONFIG_KPROBES on kernels >= 5.7.0"
| | ^~~~~
| make[3]: *** [build/tmp/work-shared/qemux86-64/kernel-source/scripts/Makefile.build:280:
build/tmp/work/qemux86_64-poky-linux/lttng-modules/2.12.2-r0/lttng-modules-2.12.2/wrapper/kallsyms.o] Error 1

By including the kprobes fragment into the -rt kernel by default, we fix the issue.

---
 meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_5.8.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +1 -1
index 7b5588f01f..ca791a3b14 100644
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
+SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
 
 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.8;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +1 -1
index 8e7272b54e..ed07f6d9d7 100644
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine_qemuarm ?= "01ca9ab2d6cb0de4425d9dfca99dff30653083d9"
 SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
+SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.8.bb +1 -1
index e6e1189802..b10554af87 100644
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
 SRCREV_machine_qemux86-64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
 SRCREV_machine_qemumips64 ?= "3109e6f363109f0dd4bd6a8647f639e445c533f2"
 SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_meta ?= "a53fa3813188b421c420b85b51ba95e6a6278689"
+SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.19.1
#2 lore raw

PATCH 3/4 linux-yocto/5.8: selftests/bpf: Prevent runqslower from racing on building bpftool

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

Integrating the following commit(s) to linux-yocto/5.8:

912adf166eb0 selftests/bpf: Prevent runqslower from racing on building bpftool

---
 .../recipes-kernel/linux/linux-yocto-rt_5.8.bb |  2 +-
 .../linux/linux-yocto-tiny_5.8.bb              |  4 ++--
 meta/recipes-kernel/linux/linux-yocto_5.8.bb   | 18 +++++++++---------
 3 files changed, 12 insertions(+), 12 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +1 -1
index ca791a3b14..b2d4995474 100644
@@ -11,7 +11,7 @@ python () {
         raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it")
 }
 
-SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3"
 SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
 
 SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \
meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +2 -2
index ed07f6d9d7..847b2623d6 100644
@@ -15,8 +15,8 @@ DEPENDS += "openssl-native util-linux-native"
 KMETA = "kernel-meta"
 KCONF_BSP_AUDIT_LEVEL = "2"
 
-SRCREV_machine_qemuarm ?= "01ca9ab2d6cb0de4425d9dfca99dff30653083d9"
-SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemuarm ?= "a463c9ee9da138e9fd6f602b5a18352ddd241fbd"
+SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3"
 SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.8.bb +9 -9
index b10554af87..86f3e851f7 100644
@@ -12,15 +12,15 @@ KBRANCH_qemux86  ?= "v5.8/standard/base"
 KBRANCH_qemux86-64 ?= "v5.8/standard/base"
 KBRANCH_qemumips64 ?= "v5.8/standard/mti-malta64"
 
-SRCREV_machine_qemuarm ?= "3c532d32043dbe90c159f334d8c4232ca67537cd"
-SRCREV_machine_qemuarm64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_machine_qemumips ?= "de93c804ee2e77d32e8a103a68ef19df6947757f"
-SRCREV_machine_qemuppc ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_machine_qemuriscv64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_machine_qemux86 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_machine_qemux86-64 ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
-SRCREV_machine_qemumips64 ?= "3109e6f363109f0dd4bd6a8647f639e445c533f2"
-SRCREV_machine ?= "5d66d1a67c8d654fa400f476daefbf2acd3a99f3"
+SRCREV_machine_qemuarm ?= "cdc1a8a82f795aa0bcf60744109798a7cea5816f"
+SRCREV_machine_qemuarm64 ?= "912adf166eb0688e011154048f5fa0e5863249c3"
+SRCREV_machine_qemumips ?= "b71b28c3ef58e2db03ab3eb6c576a1e9fda7f181"
+SRCREV_machine_qemuppc ?= "912adf166eb0688e011154048f5fa0e5863249c3"
+SRCREV_machine_qemuriscv64 ?= "912adf166eb0688e011154048f5fa0e5863249c3"
+SRCREV_machine_qemux86 ?= "912adf166eb0688e011154048f5fa0e5863249c3"
+SRCREV_machine_qemux86-64 ?= "912adf166eb0688e011154048f5fa0e5863249c3"
+SRCREV_machine_qemumips64 ?= "21530680430bfb9f8a73fba97e6734bd4869a690"
+SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3"
 SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
Signature · 1 line
2.19.1
#3 lore raw

PATCH 4/4 linux-yocto/5.8: disable CONFIG_NFS_DISABLE_UDP_SUPPORT

In reply to Bruce Ashfield

From: Bruce Ashfield <[email protected]>

Some of our tests may run NFS over UDP, so we don't want udp support disabled.

Turn off that setting, and we can revisit if any side effects are noticed.

---
 meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb   | 2 +-
 meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb | 2 +-
 meta/recipes-kernel/linux/linux-yocto_5.8.bb      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.8.bb +1 -1
index b2d4995474..bf1dba1060 100644
@@ -12,7 +12,7 @@ python () {
 }
 
 SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3"
-SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
+SRCREV_meta ?= "89db4beb484f8eca238bdd57554ebd7b55b78427"
 
 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.8;destsuffix=${KMETA}"
meta/recipes-kernel/linux/linux-yocto-tiny_5.8.bb +1 -1
index 847b2623d6..308022ad16 100644
@@ -17,7 +17,7 @@ KCONF_BSP_AUDIT_LEVEL = "2"
 
 SRCREV_machine_qemuarm ?= "a463c9ee9da138e9fd6f602b5a18352ddd241fbd"
 SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3"
-SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
+SRCREV_meta ?= "89db4beb484f8eca238bdd57554ebd7b55b78427"
 
 PV = "${LINUX_VERSION}+git${SRCPV}"
 
meta/recipes-kernel/linux/linux-yocto_5.8.bb +1 -1
index 86f3e851f7..42d76f2b80 100644
@@ -21,7 +21,7 @@ SRCREV_machine_qemux86 ?= "912adf166eb0688e011154048f5fa0e5863249c3"
 SRCREV_machine_qemux86-64 ?= "912adf166eb0688e011154048f5fa0e5863249c3"
 SRCREV_machine_qemumips64 ?= "21530680430bfb9f8a73fba97e6734bd4869a690"
 SRCREV_machine ?= "912adf166eb0688e011154048f5fa0e5863249c3"
-SRCREV_meta ?= "2f9b296099dc534d1c9909f34b1090d8d2280c9b"
+SRCREV_meta ?= "89db4beb484f8eca238bdd57554ebd7b55b78427"
 
 # remap qemuarm to qemuarma15 for the 5.8 kernel
 # KMACHINE_qemuarm ?= "qemuarma15"
Signature · 1 line
2.19.1