Use scsi-debug kernel module for util-linux's ptest
cover Use scsi-debug kernel module for util-linux's ptest
These patches will allow the use of scsi-debug kernel module for eject/mount related tests of the util-linux package.
The following changes since commit e00d88475d0ed7b161f5f58dd13bc9a72e3efdf9:
bluez: fix test case failures with GCC 9 (2019-06-12 21:08:52 +0100)
are available in the Git repository at:
git://github.com/justanotherboy/poky bug13301p2
https://github.com/justanotherboy/poky/tree/bug13301p2
Mariano López (2):
util-linux: Stop udevd to run ptests
linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES
meta/recipes-core/util-linux/util-linux.inc | 4 ++++ meta/recipes-core/util-linux/util-linux/run-ptest | 14 ++++++++++++++ meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 6 files changed, 22 insertions(+)
Signature · 1 line
2.21.0
PATCH 1/2 util-linux: Stop udevd to run ptests
The util-linux's ptest uses the SCSI_DEBUG kernel module to create virtual SCSI disks. The automount feature of udevd will try to mount these disks by default. Because udevd controls the mount of the disks, the eject/mount tests will fail or be skipped. This change will stop udevd before executing the util-linux's ptest and start the daemon again after all the tests.
This is for eudevd only, systemd-udevd doesn't present this problem because there are no automount rules.
[YOCTO #13301]
--- meta/recipes-core/util-linux/util-linux.inc | 4 ++++ meta/recipes-core/util-linux/util-linux/run-ptest | 14 ++++++++++++++ 2 files changed, 18 insertions(+)
meta/recipes-core/util-linux/util-linux.inc +4 -0
@@ -318,4 +318,8 @@ do_install_ptest() { sed -i -e \ '/^TS_CMD_KILL/ s|kill|${PTEST_PATH}/bin/kill|g' \ ${D}${PTEST_PATH}/tests/commands.sh + + + sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest + }
meta/recipes-core/util-linux/util-linux/run-ptest +14 -0
@@ -1,5 +1,14 @@ #!/bin/sh + +# When udevd (from eudev) is running most eject/mount tests will fail because +# of automount. We need to stop udevd before executing util-linux's tests. +# The systemd-udevd daemon doesn't change the outcome of util-linux's tests. +UDEV_PID="`pidof "@base_sbindir@/udevd"`" +if [ "x$UDEV_PID" != "x" ]; then + /etc/init.d/udev stop +fi + current_path=$(readlink -f $0) export bindir=$(dirname $current_path) export PATH=$bindir/bin:$PATH
@@ -27,3 +36,8 @@ do }' done + +if [ "x$UDEV_PID" != "x" ]; then + /etc/init.d/udev start +fi +
Signature · 1 line
2.21.0
PATCH 2/2 linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES
In reply to Mariano Lópezutil-linux ptest requires the scsi_debug module to perform eject/mount tests. This will conditionally add scsi_debug module when ptest is in DISTRO_FEATURES.
This doesn't include linux-yocto-tiny because the resulting image will be too big and do_image would complain about this.
[YOCTO #13301]
--- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 4 files changed, 4 insertions(+)
meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1 -0
@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1 -0
@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto_4.19.bb +1 -0
@@ -47,3 +47,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1 -0
@@ -50,3 +50,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
Signature · 1 line
2.21.0
Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES
Quoted 49 lines · Mariano López
util-linux ptest requires the
scsi_debugmodule to perform eject/mount tests. This will conditionally addscsi_debugmodule when ptest is inDISTRO_FEATURES.This doesn't include linux-yocto-tiny because the resulting image will be too big and
do_imagewould complain about this.[YOCTO #13301]
Signed-off-by Mariano López <[email protected]>--- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 4 files changed, 4 insertions(+)meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_4.19.bb +1
-0@@ -47,3 +47,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_5.0.bb +0
-0
meta/recipes-kernel/linux/linux-yocto_5.0.bb KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" · line 53
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1
-0@@ -50,3 +50,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"
I merged this but have just realised its causing warnings:
https://autobuilder.yoctoproject.org/typhoon/#/builders/93/builds/31
which suggest its not quite doing what we hope/need? :/
Cheers,
Richard
Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES
Quoted 56 lines · Richard Purdie
Quoted 49 lines · Mariano López
util-linux ptest requires the
scsi_debugmodule to perform eject/mount tests. This will conditionally addscsi_debugmodule when ptest is inDISTRO_FEATURES.This doesn't include linux-yocto-tiny because the resulting image will be too big and
do_imagewould complain about this.[YOCTO #13301]
Signed-off-by Mariano López <[email protected]>--- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 4 files changed, 4 insertions(+)meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_4.19.bb +1
-0@@ -47,3 +47,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_5.0.bb +0
-0meta/recipes-kernel/linux/linux-yocto_5.0.bb KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" · line 53
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1
-0@@ -50,3 +50,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"I merged this but have just realised its causing warnings:
Quoted 7 lines
https://autobuilder.yoctoproject.org/typhoon/#/builders/93/builds/31
which suggest its not quite doing what we hope/need? :/
Cheers,
Richard
Indeed, it seems the configuration is not applied for the qemuarm64 MACHINE:(
Let me look into this and send another patch
Thanks,
Mairano
Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES
Quoted 61 lines · Mariano Lopez
Quoted 58 lines · Richard Purdie
Quoted 49 lines · Mariano López
util-linux ptest requires the
scsi_debugmodule to perform eject/mount tests. This will conditionally addscsi_debugmodule when ptest is inDISTRO_FEATURES.This doesn't include linux-yocto-tiny because the resulting image will be too big and
do_imagewould complain about this.[YOCTO #13301]
Signed-off-by Mariano López <[email protected]>--- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 4 files changed, 4 insertions(+)meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_4.19.bb +1
-0@@ -47,3 +47,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_5.0.bb +0
-0meta/recipes-kernel/linux/linux-yocto_5.0.bb KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" · line 53
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1
-0@@ -50,3 +50,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"I merged this but have just realised its causing warnings:
https://autobuilder.yoctoproject.org/typhoon/#/builders/93/builds/31
Quoted 9 lines
Quoted 5 lines
which suggest its not quite doing what we hope/need? :/
Cheers,
Richard
Indeed, it seems the configuration is not applied for the qemuarm64 MACHINE:(
It would be applied, but it may be missing some dependency on that machine and is hence not enabled in the final kernel .config.
Bruce
Quoted 5 lines
Let me look into this and send another patch
Thanks,
Mairano
Signature · 3 lines
- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II
Re: [PATCH 2/2] linux-yocto: Add scsi_debug module when ptest is in DISTRO_FEATURES
Quoted 66 lines · Bruce Ashfield
Quoted 64 lines · Mariano Lopez
Quoted 62 lines · Richard Purdie
Quoted 49 lines · Mariano López
util-linux ptest requires the
scsi_debugmodule to perform eject/mount tests. This will conditionally addscsi_debugmodule when ptest is inDISTRO_FEATURES.This doesn't include linux-yocto-tiny because the resulting image will be too big and
do_imagewould complain about this.[YOCTO #13301]
Signed-off-by Mariano López <[email protected]>--- meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb | 1 + meta/recipes-kernel/linux/linux-yocto_4.19.bb | 1 + meta/recipes-kernel/linux/linux-yocto_5.0.bb | 1 + 4 files changed, 4 insertions(+)meta/recipes-kernel/linux/linux-yocto-rt_4.19.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto-rt_5.0.bb +1
-0@@ -41,3 +41,4 @@ KERNEL_FEATURES_append = " ${KERNEL_EXTRA_FEATURES}" KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" +KERNEL_FEATURES_append = "${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_4.19.bb +1
-0@@ -47,3 +47,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"meta/recipes-kernel/linux/linux-yocto_5.0.bb +0
-0meta/recipes-kernel/linux/linux-yocto_5.0.bb KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" · line 53
Quoted 4 lines
meta/recipes-kernel/linux/linux-yocto_5.0.bb +1
-0@@ -50,3 +50,4 @@ KERNEL_FEATURES_append_qemuall=" cfg/virtio.scc" KERNEL_FEATURES_append_qemux86=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append_qemux86-64=" cfg/sound.scc cfg/paravirt_kvm.scc" KERNEL_FEATURES_append = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", " cfg/x32.scc", "" ,d)}" +KERNEL_FEATURES_append = " ${@bb.utils.contains("DISTRO_FEATURES", "ptest", " features/scsi/scsi-debug.scc", "" ,d)}"I merged this but have just realised its causing warnings:
https://autobuilder.yoctoproject.org/typhoon/#/builders/93/builds/31
which suggest its not quite doing what we hope/need? :/
Cheers,
Quoted 8 lines
Quoted 4 lines
Quoted 1 line
Richard
Indeed, it seems the configuration is not applied for the qemuarm64 MACHINE:(
It would be applied, but it may be missing some dependency on that machine and is hence not enabled in the final kernel .config.
Bruce
SCSI support is not enabled by default for ARM architectures, I just sent the patch for this:
http://lists.openembedded.org/pipermail/openembedded-core/2019-June/283775.html
Thanks!
Mariano
Quoted 7 lines
Quoted 6 lines
Let me look into this and send another patch
Thanks,
Mairano