Received: by 2002:ac0:a581:0:0:0:0:0 with SMTP id m1-v6csp3081574imm; Sun, 1 Jul 2018 11:51:02 -0700 (PDT) X-Google-Smtp-Source: AAOMgpe4h8IvlJn8Rb6tzu2xBPogWNkEuB7bUCi88W5rGbL4AQ6tk1of8M1eN286ThJki7vjQoQT X-Received: by 2002:a63:5922:: with SMTP id n34-v6mr4432822pgb.113.1530471061964; Sun, 01 Jul 2018 11:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1530471061; cv=none; d=google.com; s=arc-20160816; b=jSA1skO6DwmA6AsxpkgJmiGVyiR9NtLmvKSaGeQUIlCL/IjLlBcwIeVvHL9uxTivlo eFH/TYvja++Rcb1uTsnvY4kHNXT5KpozOJfOvlVGG/VOGZXrPfaorCOjzKkVsX/kHmc+ abiIMta6+lETFsANbuguL+Nz7V9ACYTXwQuYo+yIIK6CYRIkxxjvfAY5icMdcv3MXDGC P3JWQqrERg1KKkFw4F0EfpR7MbQgPc2HZ7FZjjGSqUhlnFVeqe5AJ6m2+YUZsZVJ23Xz VZsdKgrIwdx8oIiZjAth5VOuWtlukMviXC3mnPcs1mkyk3j23eESv8UuByMVsurMYdGw US7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=+cCi+Y9K/aQhW6r1BveIQgHIji40OpWCpv/FYVA2uRU=; b=KclqN/P3SWsfhuPxUXScBv6ufSBHXYj/OovQnnP/hIFXD+I23oUhoGS3J51KjsmJcA TSsUBPRHylyTpNdribginZjygtZomrGgUt2Pn2efbxWn96AlM+3IJx9Mtgfy5rFDe3p3 kRTlaUC9BfHZpx3IWA2QJ7xoRNvphEmiFZHHwQHonZ9Q3XRMBIzYHHK6BRPt04YLks4N nlsMFovj44ppdFxO6hr7UrhWaRpBM5Srj7i3vggi2huPXUHvg41He5IZa9edU3EcFvwX QKQbC8JdpvlDYKYsus7pqf2qEGyR30YYCSrncK5k+QtNwY0min87J46TMJ/NtLFrYkX4 QqKA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d5-v6si14086134plo.3.2018.07.01.11.50.47; Sun, 01 Jul 2018 11:51:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752642AbeGASuA (ORCPT + 99 others); Sun, 1 Jul 2018 14:50:00 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59652 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752560AbeGAQLQ (ORCPT ); Sun, 1 Jul 2018 12:11:16 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3963CAEF; Sun, 1 Jul 2018 16:11:15 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tom Zanussi , Masami Hiramatsu , "Steven Rostedt (VMware)" , Sasha Levin Subject: [PATCH 3.18 14/85] selftests: ftrace: Add a testcase for multiple actions on trigger Date: Sun, 1 Jul 2018 18:01:32 +0200 Message-Id: <20180701153122.920384149@linuxfoundation.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20180701153122.365061142@linuxfoundation.org> References: <20180701153122.365061142@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu [ Upstream commit 25aa50e0ca397a5e5d4d6fcecefa8107877d1dd0 ] Add a testcase for multiple actions with different parameters on an event trigger, which has been fixed by commit 192c283e93bd ("tracing: Add action comparisons when testing matching hist triggers"). Link: http://lkml.kernel.org/r/152292055227.15769.6327959816123227152.stgit@devbox Reviewed-by: Tom Zanussi Tested-by: Tom Zanussi Signed-off-by: Masami Hiramatsu Signed-off-by: Steven Rostedt (VMware) Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc | 44 ++++++++++ 1 file changed, 44 insertions(+) create mode 100644 tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/trigger/inter-event/trigger-multi-actions-accept.tc @@ -0,0 +1,44 @@ +#!/bin/sh +# description: event trigger - test multiple actions on hist trigger + + +do_reset() { + reset_trigger + echo > set_event + clear_trace +} + +fail() { #msg + do_reset + echo $1 + exit_fail +} + +if [ ! -f set_event ]; then + echo "event tracing is not supported" + exit_unsupported +fi + +if [ ! -f synthetic_events ]; then + echo "synthetic event is not supported" + exit_unsupported +fi + +clear_synthetic_events +reset_tracer +do_reset + +echo "Test multiple actions on hist trigger" +echo 'wakeup_latency u64 lat; pid_t pid' >> synthetic_events +TRIGGER1=events/sched/sched_wakeup/trigger +TRIGGER2=events/sched/sched_switch/trigger + +echo 'hist:keys=pid:ts0=common_timestamp.usecs if comm=="cyclictest"' > $TRIGGER1 +echo 'hist:keys=next_pid:wakeup_lat=common_timestamp.usecs-$ts0 if next_comm=="cyclictest"' >> $TRIGGER2 +echo 'hist:keys=next_pid:onmatch(sched.sched_wakeup).wakeup_latency(sched.sched_switch.$wakeup_lat,next_pid) if next_comm=="cyclictest"' >> $TRIGGER2 +echo 'hist:keys=next_pid:onmatch(sched.sched_wakeup).wakeup_latency(sched.sched_switch.$wakeup_lat,prev_pid) if next_comm=="cyclictest"' >> $TRIGGER2 +echo 'hist:keys=next_pid if next_comm=="cyclictest"' >> $TRIGGER2 + +do_reset + +exit 0