From patchwork Wed Oct 27 20:59:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalesh Singh X-Patchwork-Id: 12588077 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A905DC433EF for ; Wed, 27 Oct 2021 21:00:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 823F760EFE for ; Wed, 27 Oct 2021 21:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239220AbhJ0VCZ (ORCPT ); Wed, 27 Oct 2021 17:02:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49492 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238798AbhJ0VCZ (ORCPT ); Wed, 27 Oct 2021 17:02:25 -0400 Received: from mail-qk1-x749.google.com (mail-qk1-x749.google.com [IPv6:2607:f8b0:4864:20::749]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8AD02C061745 for ; Wed, 27 Oct 2021 13:59:59 -0700 (PDT) Received: by mail-qk1-x749.google.com with SMTP id v14-20020a05620a0f0e00b0043355ed67d1so2531316qkl.7 for ; Wed, 27 Oct 2021 13:59:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:cc; bh=0GIbMz2nXytWEz1I//ilSEDA+vtJktC6KJwGcIeR3HQ=; b=WqC05lhqiNrvpuMTIPv4xuxZe1CYBGBTK/Dju6//MpTCOO3cE9JTJQS8+4MSbiH4ne fF+WTJ6eQ9HYI08zSQQERMu3qFzou499RsN2dcG97QC3ryg+rstVgT3ac+cAOsJo4t6/ fkQ24AbgXBerzeKy1TLX2fSKIjhvUQ05W7ZlSsC2YzKBhwuEikTYo65yhsIJW/OIkznQ CwzQP2KjtCDpEQp8Q7JIwoNjguJJDnLF1tnyuR51QARzXnltts3q4KvHf3LUxt1Z2Yl1 OjHoZEoaw+Mah+eIxDsaxViRL2GifZNf6GUL75xKTN2ftJ+9L4mrz7zsxADz6UnoSgV5 GytA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:cc; bh=0GIbMz2nXytWEz1I//ilSEDA+vtJktC6KJwGcIeR3HQ=; b=TwKjA5sbVNLZd8XUJGH0QPvlqdQiH5BbG2hHVJccAXjVYpBULkVIdhO6uUHTUM3aCD RHlAhFSE5nTnEbLs2H+6BOt4agDUcwFLa6/4YRgtPj1VQ1ZDPa8UfF+IKMmEAXdgmwTO DY001d2FRViDA4nWNkvDYl9XqqcpJy2rV/O4vx39WEYDgjB9HDHCdJCxn2aKsNXhFqEV CzDPUj5Fztu86nQr5ixxI96RpozZ0e8Py2k6842/o5o1DpN79NMVFZexepxaHeyyqKp4 FW1QBPcpty0hOCf+X3yUdwl5gC7jjX/JBlMmPZi0YV3zKpuhqA2Ti2XP4cuqkbFw6yj4 SXqg== X-Gm-Message-State: AOAM530fDx+YYzLbRW3ql9L0BfjhvtYwnY1wfdoPi3hh8NWxc2klzLLq H/lUJfdsOHXK0sFAy9S4Z8lCM4wUj9qK/7J10Q== X-Google-Smtp-Source: ABdhPJxDwW2S7YdUya+jCM5lkK9C0VdJjk4Vq1uieuMPS+sXbR9F9YxF+rPyacRwAxu4kvLVzDCY1qBTzybkFJvdvw== X-Received: from kaleshsingh.mtv.corp.google.com ([2620:15c:211:200:ac51:b6be:9b51:3a7c]) (user=kaleshsingh job=sendgmr) by 2002:a05:622a:50a:: with SMTP id l10mr127848qtx.73.1635368398653; Wed, 27 Oct 2021 13:59:58 -0700 (PDT) Date: Wed, 27 Oct 2021 13:59:08 -0700 In-Reply-To: <20211027205919.1648553-1-kaleshsingh@google.com> Message-Id: <20211027205919.1648553-2-kaleshsingh@google.com> Mime-Version: 1.0 References: <20211027205919.1648553-1-kaleshsingh@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH 1/3] tracing/histogram: Document hist trigger variables From: Kalesh Singh Cc: surenb@google.com, hridya@google.com, namhyung@kernel.org, kernel-team@android.com, rostedt@goodmis.org, mhiramat@kernel.org, Kalesh Singh , Ingo Molnar , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Update the tracefs README to describe how hist trigger variables can be created. Signed-off-by: Kalesh Singh Acked-by: Masami Hiramatsu --- kernel/trace/trace.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index bc677cd64224..c41b3786401d 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5628,6 +5628,7 @@ static const char readme_msg[] = #ifdef CONFIG_HIST_TRIGGERS " hist trigger\t- If set, event hits are aggregated into a hash table\n" "\t Format: hist:keys=\n" + "\t [:=[,=...]]\n" "\t [:values=]\n" "\t [:sort=]\n" "\t [:size=#entries]\n" @@ -5639,6 +5640,16 @@ static const char readme_msg[] = "\t common_timestamp - to record current timestamp\n" "\t common_cpu - to record the CPU the event happened on\n" "\n" + "\t A hist trigger variable can be:\n" + "\t - a reference to a field e.g. x=current_timestamp,\n" + "\t - a reference to another variable e.g. y=$x,\n" + "\t - a numeric literal: e.g. ms_per_sec=1000,\n" + "\t - an arithmetic expression: e.g. time_secs=current_timestamp/1000\n" + "\n" + "\t hist trigger aritmethic expressions support addition(+), subtraction(-),\n" + "\t multiplication(*) and division(/) operators. An operand can be either a\n" + "\t variable reference, field or numeric literal.\n" + "\n" "\t When a matching event is hit, an entry is added to a hash\n" "\t table using the key(s) and value(s) named, and the value of a\n" "\t sum called 'hitcount' is incremented. Keys and values\n" From patchwork Wed Oct 27 20:59:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalesh Singh X-Patchwork-Id: 12588079 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 900F4C433EF for ; Wed, 27 Oct 2021 21:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7733E6109E for ; Wed, 27 Oct 2021 21:00:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244127AbhJ0VCk (ORCPT ); Wed, 27 Oct 2021 17:02:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244148AbhJ0VCj (ORCPT ); Wed, 27 Oct 2021 17:02:39 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C55FC061745 for ; Wed, 27 Oct 2021 14:00:13 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id z25-20020a637e19000000b002a2d8fce9dcso2132816pgc.14 for ; Wed, 27 Oct 2021 14:00:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:cc; bh=HUT1jrky2QfADSJBqDyxkAfRQl5Gv0by2m5wgHaMIGI=; b=mzwlor0IxbDrHZ832vmIGDKIRLJHzHXUSJ+qdT2DtWDviVCexFW2Qe8impwSet4coq S4aBLll36JwfUZ0gqCf5lbUBGExW7TtD/lNHf6y0uehgpOWapnxLldAKOjCrcOePTkm/ mDL4xvBzxSu+0wFXm6YAi8zdjwMxqyhAQLYU35M4Be/Vmq0iVgdyPxtL6QT4WK/WoyBM fs1S5OL+TRwbXL5B71gULUE004KsnUgIC9LhxuM1/IYIu/iBAllYQcad9ifv0hbLwTSJ zqGvmhEGGDsWWeG1s+Wp2Slb9lC8V1rxGDo9GPrrnUuTJv6tA+Ts2ht8U7FSzyyTxwx3 g5IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:cc; bh=HUT1jrky2QfADSJBqDyxkAfRQl5Gv0by2m5wgHaMIGI=; b=kJ4ZB5cKhuySHTxv2BQxyOHmmefTlcbU6aZSEB9mswP1Cw660NGiN2+jYagPickYXP iaAzlp+9S56x7wETjNJYWkLG4rbZTdqA5BHq4dEDrzUutJ12SqJm4AZatMAtXJu5T/zX dvgDT35KFr8GIFuFm/V/tz4GFEhIKHsLvJNLCZBY6u9Scj9MvSEuh+CJ2nG3GJr8aaQN 3ObPkIwcCc+huUzStB6r5kaV2zau3ZOCknJjyZ0NnEx1qqpwZrwmdMLaPhkBiqs3WNnE STHCehc7QEto53fzXp2G9e94y6WCdD+nz3bjHxcZ9sSWiXgR/MpMZm3qNfGMAeQ5SqaN 6tzg== X-Gm-Message-State: AOAM530zWB/lsaZ2LHapI1CX7CUZKMrtwZaIq/0I6ZF9YP639E2ecgk7 CxIRPdjlgrCgnoKExFcabPu4hXJIytsm7K3sNA== X-Google-Smtp-Source: ABdhPJyt1iASH+IucgMJThPeB51NN/4FBps+l+So2s0vMdIMzts3wP5OX9ju5lRJ6tRUzwOJXqQYArg5WvNtJO4qjg== X-Received: from kaleshsingh.mtv.corp.google.com ([2620:15c:211:200:ac51:b6be:9b51:3a7c]) (user=kaleshsingh job=sendgmr) by 2002:a05:6a00:2387:b0:47c:134e:4848 with SMTP id f7-20020a056a00238700b0047c134e4848mr37555pfc.74.1635368412797; Wed, 27 Oct 2021 14:00:12 -0700 (PDT) Date: Wed, 27 Oct 2021 13:59:09 -0700 In-Reply-To: <20211027205919.1648553-1-kaleshsingh@google.com> Message-Id: <20211027205919.1648553-3-kaleshsingh@google.com> Mime-Version: 1.0 References: <20211027205919.1648553-1-kaleshsingh@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH 2/3] tracing/kselftests: Remove triggers with references before their definitions From: Kalesh Singh Cc: surenb@google.com, hridya@google.com, namhyung@kernel.org, kernel-team@android.com, rostedt@goodmis.org, mhiramat@kernel.org, Kalesh Singh , Ingo Molnar , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org If an event trigger references a variable defined in another trigger, it has to be removed before the trigger that defines the variable is removed. Signed-off-by: Kalesh Singh --- tools/testing/selftests/ftrace/test.d/functions | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/testing/selftests/ftrace/test.d/functions b/tools/testing/selftests/ftrace/test.d/functions index 000fd05e84b1..bd9e85f4d626 100644 --- a/tools/testing/selftests/ftrace/test.d/functions +++ b/tools/testing/selftests/ftrace/test.d/functions @@ -22,6 +22,15 @@ reset_trigger_file() { file=`echo $line | cut -f1 -d:` echo "!$cmd" >> $file done + + # remove triggers with references next + grep -H '\$' $@ | + while read line; do + cmd=`echo $line | cut -f2- -d: | cut -f1 -d"["` + file=`echo $line | cut -f1 -d:` + echo "!$cmd" >> $file + done + grep -Hv ^# $@ | while read line; do cmd=`echo $line | cut -f2- -d: | cut -f1 -d"["` From patchwork Wed Oct 27 20:59:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kalesh Singh X-Patchwork-Id: 12588081 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81C3CC433FE for ; Wed, 27 Oct 2021 21:00:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6C0336109E for ; Wed, 27 Oct 2021 21:00:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S244161AbhJ0VCx (ORCPT ); Wed, 27 Oct 2021 17:02:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237236AbhJ0VCx (ORCPT ); Wed, 27 Oct 2021 17:02:53 -0400 Received: from mail-pg1-x549.google.com (mail-pg1-x549.google.com [IPv6:2607:f8b0:4864:20::549]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EF89C061570 for ; Wed, 27 Oct 2021 14:00:27 -0700 (PDT) Received: by mail-pg1-x549.google.com with SMTP id w13-20020a63934d000000b002a2935891daso2136491pgm.15 for ; Wed, 27 Oct 2021 14:00:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:cc; bh=SdbyZiNQ4LiMxmB2YhYdQuIseQ920FQ9o4MrrCvG7tM=; b=dHaDKVwDNSZBeGyeNhMjTQIOFLsMxJ8Nd5psJlS/RRb39poaQwp3vTOEMJghwBPmwZ YrU7vuea9ypx0AdSkZsH0z3FKZadGC7VEqoi5ltjkC74PwR8a0tZphDp/ehkh3PQwrQ6 9bO1NDO7GTiZyH/vx+qu8h9AB7Tyx2+dMTvm6ozruam1hJ1hOiw4L98B0t9+vopLBHA9 Yr1R5PLstW6gSlsg0eykjELz/DeivF720v1CFY6AAeCYX5i+leDARtf4jvcoKTJry69K NjheHNzPe88PP15hppLg2gs7BNkTlSsXNXZs0y/OVFLkcl550VG03iV42OZTISA1+pFM 2xxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:cc; bh=SdbyZiNQ4LiMxmB2YhYdQuIseQ920FQ9o4MrrCvG7tM=; b=MxliLbqxl6X+vYU6oa6lE5JjEuYv9NmTM4vDMOuu1VuKk0Y4oZyTcNHVN0PvhJkx5Y DJ7iKZP0SVojy3OkGodp+BqmyOYsZlVOjkgDypRJMxZLENDNaM+690jJofvZE5HOtTC5 wLrd2wieidmhX4p7Yx5n9I4cqcVTmRDXotZZOpcXF3u3E6BqGe7YWoOewDx5l0j4ln2w Q//RJ+3GsJs197DyXA3L7t2KHlOf9UM0Pw9YJ6JG+sEXVcgb3lnodm12xovp3nD5GFjl 0Bwr0Kv1jm7u9J0ZcuTu6hkRd6mRzNmgCsVeIv90iHYlIag1Q1o/hrD+GyMVamyRFHJW VeUA== X-Gm-Message-State: AOAM530odIgsxEFCbKqFfcj8zJsuGlCKrFkmKnGaAAX1RyCpt5vpfkXR z3gEawva+zLQPRSLOc5fgs2g9x6tRK0XsZkjIw== X-Google-Smtp-Source: ABdhPJzk+4wCnwzsBsYgw3jRdzH6WJEm2BS0UpBvlX8mr693q5unlLTnR17AAmB4YJ5xCOfVMUDKQPMO2AVZiCNLiA== X-Received: from kaleshsingh.mtv.corp.google.com ([2620:15c:211:200:ac51:b6be:9b51:3a7c]) (user=kaleshsingh job=sendgmr) by 2002:a05:6a00:8d0:b0:44c:26e6:1c13 with SMTP id s16-20020a056a0008d000b0044c26e61c13mr60235pfu.28.1635368426770; Wed, 27 Oct 2021 14:00:26 -0700 (PDT) Date: Wed, 27 Oct 2021 13:59:10 -0700 In-Reply-To: <20211027205919.1648553-1-kaleshsingh@google.com> Message-Id: <20211027205919.1648553-4-kaleshsingh@google.com> Mime-Version: 1.0 References: <20211027205919.1648553-1-kaleshsingh@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v5 3/3] tracing/selftests: Add tests for hist trigger expression parsing From: Kalesh Singh Cc: surenb@google.com, hridya@google.com, namhyung@kernel.org, kernel-team@android.com, rostedt@goodmis.org, mhiramat@kernel.org, Kalesh Singh , Ingo Molnar , Shuah Khan , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org To: unlisted-recipients:; (no To-header on input) Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Add tests for the parsing of hist trigger expressions; and to validate expression evaluation. Signed-off-by: Kalesh Singh Acked-by: Masami Hiramatsu --- Changes in v5: - Add README pattern to requires tag, per Masami Changes in v3: - Remove .sym-offset error check tests Changes in v2: - Add Namhyung's Reviewed-by - Update comment to clarify err_pos in "Too many subexpressions" test .../trigger/trigger-hist-expressions.tc | 72 +++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc 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 new file mode 100644 index 000000000000..9690f9f809e7 --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/trigger/trigger-hist-expressions.tc @@ -0,0 +1,72 @@ +#!/bin/sh +# 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 + + +fail() { #msg + echo $1 + exit_fail +} + +get_hist_var() { #var_name hist_path + hist_output=`grep -m1 "$1: " $2` + hitcount=`echo $hist_output | awk '{ for (i=1; i<=NF; ++i) { if ($i ~ "hitcount:") print $(i+1)} }'` + var_sum=`echo $hist_output | awk '{ for (i=1; i<=NF; ++i) { if ($i ~ "'$1':") print $(i+1)} }'` + var_val=$(( var_sum / hitcount )) + echo $var_val +} + +test_hist_expr() { # test_name expression expected_val + reset_trigger + + echo "Test hist trigger expressions - $1" + + echo "hist:keys=common_pid:x=$2" > events/sched/sched_process_fork/trigger + echo 'hist:keys=common_pid:vals=$x' >> events/sched/sched_process_fork/trigger + for i in `seq 1 10` ; do ( echo "forked" > /dev/null); done + + actual=`get_hist_var x events/sched/sched_process_fork/hist` + + if [ $actual != $3 ]; then + fail "Failed hist trigger expression evaluation: Expression: $2 Expected: $3, Actual: $actual" + fi + + reset_trigger +} + +check_error() { # test_name command-with-error-pos-by-^ + reset_trigger + + echo "Test hist trigger expressions - $1" + ftrace_errlog_check 'hist:sched:sched_process_fork' "$2" 'events/sched/sched_process_fork/trigger' + + reset_trigger +} + +test_hist_expr "Variable assignment" "123" "123" + +test_hist_expr "Subtraction not associative" "16-8-4-2" "2" + +test_hist_expr "Division not associative" "64/8/4/2" "1" + +test_hist_expr "Same precedence operators (+,-) evaluated left to right" "16-8+4+2" "14" + +test_hist_expr "Same precedence operators (*,/) evaluated left to right" "4*3/2*2" "12" + +test_hist_expr "Multiplication evaluated before addition/subtraction" "4+3*2-2" "8" + +test_hist_expr "Division evaluated before addition/subtraction" "4+6/2-2" "5" + +# Division by zero returns -1 +test_hist_expr "Handles division by zero" "3/0" "-1" + +# err pos for "too many subexpressions" is dependent on where +# the last subexpression was detected. This can vary depending +# on how the expression tree was generated. +check_error "Too many subexpressions" 'hist:keys=common_pid:x=32+^10*3/20-4' +check_error "Too many subexpressions" 'hist:keys=common_pid:x=^1+2+3+4+5' + +check_error "Unary minus not supported in subexpression" 'hist:keys=common_pid:x=-(^1)+2' + +exit 0