From patchwork Thu Mar 27 01:56:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shuah Khan X-Patchwork-Id: 14030716 Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0663C4A07 for ; Thu, 27 Mar 2025 01:56:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743040598; cv=none; b=EysYyps1l6IjLq07+OL7hHLcVZSIgHr8/I6BqZ0mqP78LSejX+Jp2hG293JAuP9+U/F5+iuWHJEYCmYFX3aGMMajoeSaRU8P8wCEgvcqAUeBwhgbGTsSMeDlh5jUq8HEPTUN+ac5AME9cBzQ94thu3XrjGGL/lwp2X8Vt1vxoxE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743040598; c=relaxed/simple; bh=WKJ7mWmFPBRxnpOR+VELzor0tgJoOHyTl8l3Kv+8PXE=; h=Content-Type:Message-ID:Date:MIME-Version:To:Cc:From:Subject; b=CFONXFh4NB8JNtXmf1wwe+jKe40cZP/NbHR//T0jHoh21r1LeBgtqiqEUlf9zVH9J9F3hS1KOT1cSmSfedozowfa7VtQDa3vWgidAGOK6YjTeOFGjJhfn4+ugTyHik6uB4fy08yY3SLiolPq0DZdGQfiCOKoZaO9Qc82NIeDAZI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org; spf=pass smtp.mailfrom=linuxfoundation.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Td912i5f; arc=none smtp.client-ip=209.85.166.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linuxfoundation.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Td912i5f" Received: by mail-il1-f180.google.com with SMTP id e9e14a558f8ab-3ce868498d3so1332065ab.3 for ; Wed, 26 Mar 2025 18:56:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1743040595; x=1743645395; darn=vger.kernel.org; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=xZBduPTfPN2uX9BOGMKyaZKiJagAob/jle2PtKYLtCo=; b=Td912i5fB7u53D5+ekTl5vo2/phHXSzMxShg+pCkLhmmITUpzlO8Wu9DbvvCzo5Yc5 u7rLvl0qkgIpdD1CLfO4gApl/TKnZhQEGTz+yySnJB8YsQD6JJO08R0T1GbuWjgwK/qZ 0wYuHIxpKr61lIEJ5J2sX6IzGN+3iI9OBlITk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1743040595; x=1743645395; h=subject:from:cc:to:content-language:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xZBduPTfPN2uX9BOGMKyaZKiJagAob/jle2PtKYLtCo=; b=Qu7MHt2+xJs5BlXrpMIdZ2N3TuIZH1YueBAV4Y9rRP1JcW57VmJU6+7T1uoUljZlQD ttkjGLJ2PFBTSDY0T7ZUfhftA/GxUYqdrUSG/Ba+sS8dczjBget8Hd6N47kHTYuI4ADK GtUlVM0IJB/SO00lhp2KppnPPFFe8h+6gWmbCnBExj36U/V8hNPaf+fxKbQsSm/9X0ax qZTjencY5Np5F0O51xQE+vyMbuFZ6N5Mxj/GOm3ESgy8zsHvVgflLFCKSLnBbbskEm79 zPoB4K2iOqH6XnFuomJMjA2HTbm6TrB6f5t5YoulDdNiGru2iQooekGBgOq1rxZRjb8E Toww== X-Forwarded-Encrypted: i=1; AJvYcCXVBv5WAAdD02BdCIlGm4FWzmO6JdJCaWxbxIFEdMMGJwgnRPurGzPq+prqo6rMZjdie5UflVhtl78wtpD2xIk=@vger.kernel.org X-Gm-Message-State: AOJu0YxRwnG/BmumLYSf16zQiF5xQnQlV2vpfmSejLC/A+qrryc9p9xO 4jFToO04xMYbpEW/XuJjfeGb9yOaJ9J2OATi4CbHPgxwASgSI6Y/dTCaGqi9Nuw= X-Gm-Gg: ASbGncti/0Fxim968CkvfMzdN8/3nSkiMjlBa1OnRFSEggvrLLM7lbo0IRR818Mk0Kz 5Tvl3E3rc5ryVP9eaFUqDPRZAomHZGyTNywbgcHoQoeOBzhRsM8Byr32kQBTnETWUclkXTGPyQh 1yuYi6PmYjIEUvSarsAablL6QGvA0CXh6jIngBou4jS2kQ0JsDRxxhQShkz2HaochKgFYbJGtLn iA4Ud4MJFaSyolWOHiFnESx2WxcgDfPd/K7NdCNT30Ax2OLyyIhYjZyjHSo5I5IOZP7a8PO0Nfg msY2Wp1aiY5XDZsyS9yTlAWXVEFqrnRogy5i5zlVW8w9tucSiOBjGBrXCGU/gOAw1J60nNDkeEG 9u8ho/OslvwItzSSzfLQqH+Dk2AY= X-Google-Smtp-Source: AGHT+IFHH5FCZeAU3GsafVf2mIwuSdTM1q+8MhrR4QLDXzNQa7OTITQUnueUudOIgDgDhtrJrFvpNQ== X-Received: by 2002:a05:6e02:1f05:b0:3d3:fdb8:1799 with SMTP id e9e14a558f8ab-3d5cce2c7bdmr26412595ab.22.1743040594829; Wed, 26 Mar 2025 18:56:34 -0700 (PDT) Received: from ?IPV6:2607:fb90:350f:48e4:8567:efb1:9883:10ae? ([2607:fb90:350f:48e4:8567:efb1:9883:10ae]) by smtp.gmail.com with ESMTPSA id 8926c6da1cb9f-4f2cbdd0871sm3100635173.42.2025.03.26.18.56.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 26 Mar 2025 18:56:34 -0700 (PDT) Message-ID: Date: Wed, 26 Mar 2025 19:56:31 -0600 Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Content-Language: en-US To: Linus Torvalds Cc: shuah , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org From: Shuah Khan Subject: [GIT PULL] Kselftest next update for Linux 6.15-rc1 Hi Linus, Please pull the following kselftest next update for Linux 6.15-rc1. Fixes bugs and cleans up code in tracing, ftrace, and user_events tests. Adds missing executables to ftrace gitignore. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit a64dcfb451e254085a7daee5fe51bf22959d52d3: Linux 6.14-rc2 (2025-02-09 12:45:03 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-next-6.15-rc1 for you to fetch changes up to 82ef781f24ac26f4aa71f02d7624c439ab8389a7: selftests/ftrace: add 'poll' binary to gitignore (2025-03-04 08:51:17 -0700) ---------------------------------------------------------------- linux_kselftest-next-6.15-rc1 Fixes bugs and cleans up code in tracing, ftrace, and user_events tests. Adds missing executables to ftrace gitignore. ---------------------------------------------------------------- Bharadwaj Raju (1): selftests/ftrace: add 'poll' binary to gitignore Heiko Carstens (1): selftests/ftrace: Use readelf to find entry point in uprobe test Steven Rostedt (3): selftests/tracing: Test only toplevel README file not the instances selftests/ftrace: Clean up triggers after setting them selftests/tracing: Allow some more tests to run in instances Yiqian Xun (1): selftests/user_events: Fix failures caused by test code tools/testing/selftests/ftrace/.gitignore | 1 + .../selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc | 10 +++++++--- tools/testing/selftests/ftrace/test.d/functions | 8 +++++++- .../test.d/trigger/inter-event/trigger-action-hist-xfail.tc | 1 + .../test.d/trigger/inter-event/trigger-onchange-action-hist.tc | 3 +++ .../test.d/trigger/inter-event/trigger-snapshot-action-hist.tc | 3 +++ .../ftrace/test.d/trigger/trigger-hist-expressions.tc | 1 + tools/testing/selftests/user_events/dyn_test.c | 2 ++ 8 files changed, 25 insertions(+), 4 deletions(-) ---------------------------------------------------------------- diff --git a/tools/testing/selftests/ftrace/.gitignore b/tools/testing/selftests/ftrace/.gitignore index 2659417cb2c7..4d7fcb828850 100644 --- a/tools/testing/selftests/ftrace/.gitignore +++ b/tools/testing/selftests/ftrace/.gitignore @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only logs +poll diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc index 86c76679c56e..f2048c244526 100644 --- a/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc +++ b/tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc @@ -3,14 +3,18 @@ # description: Generic dynamic event - add/remove/test uprobe events # requires: uprobe_events +if ! which readelf > /dev/null 2>&1 ; then + echo "No readelf found. skipped." + exit_unresolved +fi + echo 0 > events/enable echo > dynamic_events REALBIN=`readlink -f /bin/sh` +ENTRYPOINT=`readelf -h ${REALBIN} | grep Entry | sed -e 's/[^0]*//'` -echo 'cat /proc/$$/maps' | /bin/sh | \ - grep "r-xp .*${REALBIN}$" | \ - awk '{printf "p:myevent %s:0x%s\n", $6,$3 }' >> uprobe_events +echo "p:myevent ${REALBIN}:${ENTRYPOINT}" >> uprobe_events grep -q myevent uprobe_events test -d events/uprobes/myevent diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions index 84d6a9c7ad67..a1052bf460fc 100644 --- a/tools/testing/selftests/ftrace/test.d/functions +++ b/tools/testing/selftests/ftrace/test.d/functions @@ -156,7 +156,13 @@ check_requires() { # Check required files and tracers exit_unsupported fi elif [ "$r" != "$i" ]; then - if ! grep -Fq "$r" README ; then + # If this is an instance, check the top directory + if echo $TRACING_DIR | grep -q "/instances/"; then + test="$TRACING_DIR/../.." + else + test=$TRACING_DIR + fi + if ! grep -Fq "$r" $test/README ; then echo "Required feature pattern \"$r\" is not in README." exit_unsupported fi diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc index 1590d6bfb857..20a35fea13f8 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-action-hist-xfail.tc @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger expected fail actions # requires: set_event snapshot "snapshot()":README +# flags: instance fail() { #msg echo $1 diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc index 91339c130832..55ab0270e5f7 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-onchange-action-hist.tc @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger onchange action # requires: set_event "onchange(var)":README ping:program +# flags: instance fail() { #msg echo $1 @@ -19,4 +20,6 @@ if ! grep -q "changed:" events/sched/sched_waking/hist; then fail "Failed to create onchange action inter-event histogram" fi +echo '!hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio) if comm=="ping"' >> events/sched/sched_waking/trigger + exit 0 diff --git a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc index 147967e86584..9eb37c2fa417 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-snapshot-action-hist.tc @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test inter-event histogram trigger snapshot action # requires: set_event snapshot events/sched/sched_process_fork/hist "onchange(var)":README "snapshot()":README ping:program +# flags: instance fail() { #msg echo $1 @@ -27,4 +28,6 @@ if ! grep -q "comm=ping" snapshot; then fail "Failed to create snapshot action inter-event histogram" fi +echo '!hist:keys=comm:newprio=prio:onchange($newprio).save(comm,prio):onchange($newprio).snapshot() if comm=="ping"' >> events/sched/sched_waking/trigger + exit 0 diff --git a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc index 05ffba299dbf..0ebda2068a00 100644 --- a/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc @@ -2,6 +2,7 @@ # SPDX-License-Identifier: GPL-2.0 # description: event trigger - test histogram expression parsing # requires: set_event events/sched/sched_process_fork/trigger events/sched/sched_process_fork/hist error_log "=":README +# flags: instance fail() { #msg diff --git a/tools/testing/selftests/user_events/dyn_test.c b/tools/testing/selftests/user_events/dyn_test.c index bdf9ab127488..54c9412f8dee 100644 --- a/tools/testing/selftests/user_events/dyn_test.c +++ b/tools/testing/selftests/user_events/dyn_test.c @@ -127,6 +127,8 @@ static int parse_abi(int *check, const char *value) close(fd); + wait_for_delete(); + return ret; }