From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753366AbcEWRXo (ORCPT ); Mon, 23 May 2016 13:23:44 -0400 Received: from lists.s-osg.org ([54.187.51.154]:60639 "EHLO lists.s-osg.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751125AbcEWRXm (ORCPT ); Mon, 23 May 2016 13:23:42 -0400 To: torvalds@linux-foundation.org Cc: LKML , linux-kselftest@vger.kernel.org, Shuah Khan From: Shuah Khan Subject: [GIT PULL] Kselftest updates for 4.7-rc1 Message-ID: <57433C8F.8020703@osg.samsung.com> Date: Mon, 23 May 2016 11:23:27 -0600 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.7.2 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------080207050500040401050607" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This is a multi-part message in MIME format. --------------080207050500040401050607 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hi Linus, Could you please the following Kselftest update for 4.7-rc1. diff attached. thanks, -- Shuah --------------------------------------------------------------------------------- The following changes since commit f55532a0c0b8bb6148f4e07853b876ef73bc69ca: Linux 4.6-rc1 (2016-03-26 16:03:24 -0700) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-4.7-rc1 for you to fetch changes up to 6eab37daf0ec1077fd612ff27ab513db20f33767: tools: testing: define the _GNU_SOURCE macro (2016-05-16 09:06:17 -0600) ---------------------------------------------------------------- linux-kselftest-4.7-rc1 This update for Kselftest adds: - a new ftrace testcase - fixes for ftrace and intel_pstate tests ---------------------------------------------------------------- Muhammad Falak R Wani (1): tools: testing: define the _GNU_SOURCE macro Namhyung Kim (2): kselftests/ftrace: Detect tracefs mount point kselftests/ftrace: Add a test case for event pid filtering tools/testing/selftests/ftrace/ftracetest | 9 ++- .../selftests/ftrace/test.d/event/event-pid.tc | 72 ++++++++++++++++++++++ tools/testing/selftests/intel_pstate/run.sh | 2 +- 3 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 tools/testing/selftests/ftrace/test.d/event/event-pid.tc --------------------------------------------------------------------------------- -- Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) shuahkh@osg.samsung.com --------------080207050500040401050607 Content-Type: text/x-patch; name="4.7-rc1_pull_req.diff" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="4.7-rc1_pull_req.diff" diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/se= lftests/ftrace/ftracetest index da48812..4c6a0bf 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -88,7 +88,12 @@ parse_opts() { # opts =20 # Parameters DEBUGFS_DIR=3D`grep debugfs /proc/mounts | cut -f2 -d' ' | head -1` -TRACING_DIR=3D$DEBUGFS_DIR/tracing +if [ -z "$DEBUGFS_DIR" ]; then + TRACING_DIR=3D`grep tracefs /proc/mounts | cut -f2 -d' ' | head -1` +else + TRACING_DIR=3D$DEBUGFS_DIR/tracing +fi + TOP_DIR=3D`absdir $0` TEST_DIR=3D$TOP_DIR/test.d TEST_CASES=3D`find_testcases $TEST_DIR` @@ -102,7 +107,7 @@ parse_opts $* [ $DEBUG -ne 0 ] && set -x =20 # Verify parameters -if [ -z "$DEBUGFS_DIR" -o ! -d "$TRACING_DIR" ]; then +if [ -z "$TRACING_DIR" -o ! -d "$TRACING_DIR" ]; then errexit "No ftrace directory found" fi =20 diff --git a/tools/testing/selftests/ftrace/test.d/event/event-pid.tc b/t= ools/testing/selftests/ftrace/test.d/event/event-pid.tc new file mode 100644 index 0000000..d4ab27b --- /dev/null +++ b/tools/testing/selftests/ftrace/test.d/event/event-pid.tc @@ -0,0 +1,72 @@ +#!/bin/sh +# description: event tracing - restricts events based on pid + +do_reset() { + echo > set_event + echo > set_event_pid + echo 0 > options/event-fork + clear_trace +} + +fail() { #msg + do_reset + echo $1 + exit $FAIL +} + +yield() { + ping localhost -c 1 || sleep .001 || usleep 1 || sleep 1 +} + +if [ ! -f set_event -o ! -d events/sched ]; then + echo "event tracing is not supported" + exit_unsupported +fi + +if [ ! -f set_event_pid ]; then + echo "event pid filtering is not supported" + exit_unsupported +fi + +reset_tracer +do_reset + +echo 1 > events/sched/sched_switch/enable + +yield + +count=3D`cat trace | grep sched_switch | wc -l` +if [ $count -eq 0 ]; then + fail "sched_switch events are not recorded" +fi + +do_reset + +read mypid rest < /proc/self/stat + +echo $mypid > set_event_pid +echo 'sched:sched_switch' > set_event + +yield + +count=3D`cat trace | grep sched_switch | grep -v "pid=3D$mypid" | wc -l`= +if [ $count -ne 0 ]; then + fail "sched_switch events from other task are recorded" +fi + +do_reset + +echo $mypid > set_event_pid +echo 1 > options/event-fork +echo 1 > events/sched/sched_switch/enable + +yield + +count=3D`cat trace | grep sched_switch | grep -v "pid=3D$mypid" | wc -l`= +if [ $count -eq 0 ]; then + fail "sched_switch events from other task are not recorded" +fi + +do_reset + +exit 0 diff --git a/tools/testing/selftests/intel_pstate/run.sh b/tools/testing/= selftests/intel_pstate/run.sh index bdaf37e..7868c10 100755 --- a/tools/testing/selftests/intel_pstate/run.sh +++ b/tools/testing/selftests/intel_pstate/run.sh @@ -32,7 +32,7 @@ EVALUATE_ONLY=3D0 max_cpus=3D$(($(nproc)-1)) =20 # compile programs -gcc -o aperf aperf.c -lm +gcc aperf.c -Wall -D_GNU_SOURCE -o aperf -lm [ $? -ne 0 ] && echo "Problem compiling aperf.c." && exit 1 gcc -o msr msr.c -lm [ $? -ne 0 ] && echo "Problem compiling msr.c." && exit 1 --------------080207050500040401050607--