From patchwork Thu Oct 5 21:36:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 31748 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 144EAE92FC0 for ; Thu, 5 Oct 2023 21:36:45 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web11.28055.1696541795051730602 for ; Thu, 05 Oct 2023 14:36:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=XmvWDs+z; spf=pass (domain: gmail.com, ip: 209.85.214.171, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1c888b3a25aso7236085ad.0 for ; Thu, 05 Oct 2023 14:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696541794; x=1697146594; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VcMDuKx8LULKL/I98fu8VyV41XJsQLogsbrOELhYXoM=; b=XmvWDs+zw9P2/BwHz6QFUa8hGVGPtRQiQfNUaCugtrzhQfbhs2E2UWxVKiEt4JgKIy euKV/QoIzHjKkCXhsnMUiuWnH0TwzOP8CKLGq3sKcSbBitDZZBy10UylNUhjJmPILdUq 2zV6YDnpy64Umxl5Vk4r97kDDlgKtIZCuS979IRkNfoSLVgthN7UIfxuMqa2x/wT4kNj Edb+6EtXwSbtggPcvtrmNI05zPgtIFU8IgjauDDYs8eq5rXwqMT0iOiR5AULKH0aDhQo dnnt9n0EWXNiSppTBXCZ0GF+3nfNZDEhQKCHtwMACIluYOFdW695zlIzLBx7IPWGXu23 63yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696541794; x=1697146594; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=VcMDuKx8LULKL/I98fu8VyV41XJsQLogsbrOELhYXoM=; b=MEnf7/y6Vd0y4IZJWWHok3pdslGU0PHRr4I83uocCQhN0YqdmwVP9C+u3WcZBX37QJ 15KBw3IjNmDqYMfLoiBEq7kp9I3hFA1umNi3RO9pCpHrtFYmAXMjkCkdsdiUSHWX0TrY RDyy1NOazkyFDpI4KkRMUuUsJBof/DMpF1OMhjb/7A3Z3xgiRZjaMGlX0reQvIKnHK6Y k5MTIpvwj24lo2AQHD8QKkPssgq9+x8TBYeBVdLbGZFg8DEPFxpiOUP23NXYHYrT9LyD hdfoDadcBOjR2tV1fzbrN3FXhYoh72jxe8jpu3rAuuS69/QG4rzfmtCJBZ0PZIUNtjys TMpQ== X-Gm-Message-State: AOJu0YwshbJwKv+ifRY2DPSqw7chCV+vLPCcX2/iQRkXWQ+lOdOPi5k/ dSUT4JX0C5fplgDgd+I3nX148lIMe0gxkA== X-Google-Smtp-Source: AGHT+IH8CvIMd/NzKuUikUbMQYhqfxrfMBKGZIpINUTG1LelfPY7ZX+L71UqH30bzgiA04S7kxi1Mg== X-Received: by 2002:a17:902:7d92:b0:1c3:2ee6:3802 with SMTP id a18-20020a1709027d9200b001c32ee63802mr5204423plm.47.1696541793894; Thu, 05 Oct 2023 14:36:33 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::7f07]) by smtp.gmail.com with ESMTPSA id jc20-20020a17090325d400b001c613b4aa33sm2233225plb.287.2023.10.05.14.36.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 14:36:33 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 1/2] kernel-selftest: Build bpf tests again Date: Thu, 5 Oct 2023 14:36:30 -0700 Message-ID: <20231005213631.390714-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 05 Oct 2023 21:36:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105362 Fix run-ptest script to run all compiled selftests Signed-off-by: Khem Raj --- .../kernel-selftest/kernel-selftest.bb | 34 ++++++++++++++----- .../kernel-selftest/kernel-selftest/run-ptest | 10 ++---- 2 files changed, 29 insertions(+), 15 deletions(-) diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb index 4d6e0e3717..8fab1df391 100644 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest.bb @@ -18,7 +18,7 @@ SRC_URI += "file://run-ptest \ # we will append other kernel selftest in the future # bpf was added in 4.10 with: https://github.com/torvalds/linux/commit/5aa5bd14c5f8660c64ceedf14a549781be47e53d # if you have older kernel than that you need to remove it from PACKAGECONFIG -PACKAGECONFIG ??= "firmware" +PACKAGECONFIG ??= "firmware bpf" PACKAGECONFIG:remove:x86 = "bpf" PACKAGECONFIG:remove:arm = "bpf vm" # host ptrace.h is used to compile BPF target but mips ptrace.h is needed @@ -31,30 +31,39 @@ PACKAGECONFIG:remove:qemumips = "bpf vm" PACKAGECONFIG:remove:riscv64 = "vm" PACKAGECONFIG:remove:riscv32 = "vm" -PACKAGECONFIG[bpf] = ",,elfutils libcap libcap-ng rsync-native," +PACKAGECONFIG[bpf] = ",,elfutils elfutils-native libcap libcap-ng rsync-native python3-docutils-native," PACKAGECONFIG[firmware] = ",,libcap, bash" PACKAGECONFIG[vm] = ",,libcap libhugetlbfs,libgcc bash" do_patch[depends] += "virtual/kernel:do_shared_workdir" +do_compile[depends] += "virtual/kernel:do_install" -inherit linux-kernel-base kernel-arch ptest +inherit linux-kernel-base module-base kernel-arch ptest siteinfo S = "${WORKDIR}/${BP}" +DEBUG_PREFIX_MAP:remove = "-fcanon-prefix-map" + TEST_LIST = "\ ${@bb.utils.filter('PACKAGECONFIG', 'bpf firmware vm', d)} \ rtc \ " - EXTRA_OEMAKE = '\ CROSS_COMPILE=${TARGET_PREFIX} \ ARCH=${ARCH} \ CC="${CC}" \ - CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS}" \ AR="${AR}" \ LD="${LD}" \ + LLVM=1 \ + CONFIG_CC_IS_GCC= \ + CONFIG_CC_IS_CLANG=y \ + CONFIG_CC_IMPLICIT_FALLTHROUGH= \ + CLANG="clang -fno-stack-protector -target ${TARGET_ARCH} ${TOOLCHAIN_OPTIONS} -isystem ${S} -D__WORDSIZE=\'64\' -Wno-error=unused-command-line-argument" \ + HOSTCC="clang -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++ ${BUILD_CFLAGS} ${BUILD_LDFLAGS} -Wno-error=unused-command-line-argument" \ + HOSTLD="clang ${BUILD_LDFLAGS} -unwindlib=libgcc -rtlib=libgcc -stdlib=libstdc++" \ DESTDIR="${D}" \ MACHINE="${ARCH}" \ + V=1 \ ' KERNEL_SELFTEST_SRC ?= "Makefile \ @@ -66,7 +75,6 @@ KERNEL_SELFTEST_SRC ?= "Makefile \ arch \ LICENSES \ " - do_compile() { if [ ${@bb.utils.contains('PACKAGECONFIG', 'bpf', 'True', 'False', d)} = 'True' ]; then if [ ${@bb.utils.contains('DEPENDS', 'clang-native', 'True', 'False', d)} = 'False' ]; then @@ -74,7 +82,17 @@ do_compile() { either install it and add it to HOSTTOOLS, or add clang-native from meta-clang to dependency" fi fi + mkdir -p ${S}/include/config ${S}/bits + touch ${S}/include/config/auto.conf + if [ "${SITEINFO_BITS}" != "32" ]; then + for f in long-double endianness floatn struct_rwlock; do + cp ${RECIPE_SYSROOT}${includedir}/bits/$f-64.h ${S}/bits/$f-32.h + done + fi oe_runmake -C ${S} headers + sed -i -e 's|^all: docs|all:|' ${S}/tools/testing/selftests/bpf/Makefile + sed -i -e '/mrecord-mcount/d' ${S}/Makefile + sed -i -e '/Wno-alloc-size-larger-than/d' ${S}/Makefile for i in ${TEST_LIST} do oe_runmake -C ${S}/tools/testing/selftests/${i} @@ -133,9 +151,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" INHIBIT_PACKAGE_DEBUG_SPLIT="1" FILES:${PN} += "/usr/kernel-selftest" -RDEPENDS:${PN} += "python3 perl" +RDEPENDS:${PN} += "python3 perl perl-module-io-handle" # tools/testing/selftests/vm/Makefile doesn't respect LDFLAGS and tools/testing/selftests/Makefile explicitly overrides to empty -INSANE_SKIP:${PN} += "ldflags" +INSANE_SKIP:${PN} += "ldflags libdir" SECURITY_CFLAGS = "" COMPATIBLE_HOST:libc-musl = 'null' diff --git a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest index d40b9576d8..0903d097e1 100755 --- a/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest +++ b/meta-oe/recipes-kernel/kernel-selftest/kernel-selftest/run-ptest @@ -1,11 +1,7 @@ #!/bin/sh -export PATH=$PATH:/usr/kernel-selftest/bpf - -# test_align -test_align | grep "12 pass" &> /dev/null +/usr/kernel-selftest/run_kselftest.sh -s if [ $? == 0 ]; then - echo "[PASS]: test_align" + echo "PASS: kernel-selftest" else - echo "[FAIL]: test_align" + echo "[FAIL]: kernel-selftest" fi - From patchwork Thu Oct 5 21:36:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 31747 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 122B4E92FC8 for ; Thu, 5 Oct 2023 21:36:45 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.28044.1696541795523662500 for ; Thu, 05 Oct 2023 14:36:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=muJKjlTB; spf=pass (domain: gmail.com, ip: 209.85.214.179, mailfrom: raj.khem@gmail.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1c60778a3bfso11905655ad.1 for ; Thu, 05 Oct 2023 14:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696541795; x=1697146595; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+k/ZSIjEiYkNTVVg8aUTmKtakLNWGkTotwHV1CgRIwo=; b=muJKjlTBSs3djCo84dUJvwGCzZhdOoLr4BY9r9BvdIXzBTI8RiH1C7MCX3LiIkgfYl XK8/458yFnFLrt0FB5L3uGOBZ6SwMob/tXgEoNLN0kbRxCe7Dy7EhhZwGvUO8OlML4bb bZv5rpIf6AtcGOYzBQAVCqSWpA5RrFBb/IpxZEcLcq9lBfgRwOJNhmWnLHqKrwr+rxv1 eEkhUaJDKr7oA2frxgOYqdLTP34Y8dip6wjZsWmDfBaawLIdOruCWixXD6YlJalH++Si K1VNOQJKnqGehpwqCW669Yr6Nqb1390pXIz2rtv1Nzfr23kABvWYr20b8JpNKLjp5IKw 5liQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696541795; x=1697146595; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+k/ZSIjEiYkNTVVg8aUTmKtakLNWGkTotwHV1CgRIwo=; b=KJ31U8z8ayUvUNwDpcBcOe3X5akMoZQzwnyz8yJG1VF374wFhWR2Lsxz1Xb/6N/lLW Sji8uQlOGX50CuXJOHMy0BUuMTeuIimIFmk64x6Q8mm75taEpDK11YvIDdsQ9lGUraN4 tZLT1DYc4CZn6beDMUOYEQmXRm2yNN3uSb3Bl2fHgTtGuY0x4kGaolKzVim0KQj88Jfd qpVFKNVh1VW8OwYF/jfTRitwr2supgCKX3CY1GnNMoUiAneWhbNd9AANQAPHqz2vDHPm rk9tJdzSmXF02d/j5D6N/PuVTMuJyTMC2YVVnOW5I0HyBmlS+/5APl/D2pT4HJNHrztc qZjQ== X-Gm-Message-State: AOJu0Yw8sOnYkGIk4ZNQS/FaKpMwAu2X41D2HRcoTYti9OU4hKLHSp8c 97e2NUpOZ1AMCgIZfAsW41LoJzbFNDmKcw== X-Google-Smtp-Source: AGHT+IFVlR8Bf90/TMXuo1AKlKECmLMPHrjpsrr/2y8a7qpJ1X2QewRry0XEef7wcEPyUmfNdWgMTQ== X-Received: by 2002:a17:903:228f:b0:1c7:1fbc:b9e7 with SMTP id b15-20020a170903228f00b001c71fbcb9e7mr7269686plh.43.1696541794753; Thu, 05 Oct 2023 14:36:34 -0700 (PDT) Received: from apollo.hsd1.ca.comcast.net ([2601:646:9100:2cb0::7f07]) by smtp.gmail.com with ESMTPSA id jc20-20020a17090325d400b001c613b4aa33sm2233225plb.287.2023.10.05.14.36.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 05 Oct 2023 14:36:34 -0700 (PDT) From: Khem Raj To: openembedded-devel@lists.openembedded.org Cc: Khem Raj Subject: [meta-oe][PATCH 2/2] ptest-packagelists-meta-oe: Add kernel-selftest to x86/x86-64 images Date: Thu, 5 Oct 2023 14:36:31 -0700 Message-ID: <20231005213631.390714-2-raj.khem@gmail.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231005213631.390714-1-raj.khem@gmail.com> References: <20231005213631.390714-1-raj.khem@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 05 Oct 2023 21:36:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105363 Test run for 10+ minutes so they belong to slow testset Signed-off-by: Khem Raj --- meta-oe/conf/include/ptest-packagelists-meta-oe.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc index 81094bf9a5..a2b2ce4bc9 100644 --- a/meta-oe/conf/include/ptest-packagelists-meta-oe.inc +++ b/meta-oe/conf/include/ptest-packagelists-meta-oe.inc @@ -50,10 +50,12 @@ PTESTS_SLOW_META_OE = "\ rsyslog \ mariadb \ " +PTESTS_SLOW_META_OE:append:x86 = " kernel-selftest" +PTESTS_SLOW_META_OE:append:x86-64 = " kernel-selftest" +PTESTS_SLOW_META_OE:remove:libc-musl = "kernel-selftest" PTESTS_PROBLEMS_META_OE ="\ jemalloc \ - kernel-selftest \ keyutils \ libdbi-perl \ libgpiod \