Received: by 2002:a17:90a:bc8d:0:0:0:0 with SMTP id x13csp1571968pjr; Mon, 18 May 2020 16:44:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx2wsbZtX6Y5NsiTWWCslTDemexGZOF10N9Q64IQPVBAzkyC40cEmVatH/jvYWLRcsr/AXK X-Received: by 2002:a50:cfcb:: with SMTP id i11mr16381570edk.262.1589845464211; Mon, 18 May 2020 16:44:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1589845464; cv=none; d=google.com; s=arc-20160816; b=LAmAekwWCncaWkqUb6APM4YIZCytFpYwcGxOpMvGLI3QgREECJvw7GXoV/lIi+G80H xDXBThl1V0Jq8FNcnry+yAtWr3b38BqaZTSklwEeNO7pg+AqYJwZh+7iaCfcGvkdaV5+ 5cVJIyxDNSG3m6c2atOXrf0AHy36BVJ872N1z6NjwT7gxqR4YDs3z43bVYIoh65QhrDz u9YvbF69gSYezNJT5K1BqcWoDoIyIaBffMJ1qqE76S/+unU7bH9FEc2ViuEum2X5AiVM AaTXCgiwckEpLzvpzNEKKkgSv3w9KEK71jMRIa5sBRSnPf4rHXS9fI6kt02BTpg2+H19 SX2A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=grQNaAPlHi73EcbGpPdU/W91AdAXVIJ2n3wl96opAzM=; b=y1iIwjHm6Jum4VCJmHkrDCAWDJVM9eepbf9m/HKPNgWejoLtfQoNlD98eUCLBKuRSO 4iGBpqpt/X67Ba9ukk+JHt2Lmele4mirL67MB0LpYESOHuMPin+0yoAgRPTKByKnk8J3 ioXufRgVjEgx2Fg2LE3ukIN3CMzIgvXnsdx0TGKzeBPkBrbCt0Ircwu4QoIne5nHrHy4 CMmuAe3lFkTrbeHhEWzQdm+QxAIfmXbLdgqH6mE6q3iTCF+y3bRO1FX1VjmlLkz3qbow Jzw/nJFfd1VtkWZeuHP0KVBShkcRbLnW32WVw0/56ZMlFgatDMAhWbkDySk8BJ+WmXTs scSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="BMyKWB/q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d18si6618255edx.18.2020.05.18.16.44.01; Mon, 18 May 2020 16:44:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="BMyKWB/q"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731215AbgERRxz (ORCPT + 99 others); Mon, 18 May 2020 13:53:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:58140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731195AbgERRxx (ORCPT ); Mon, 18 May 2020 13:53:53 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5A2AF20715; Mon, 18 May 2020 17:53:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1589824432; bh=e923IeQUkDFGtCFMSIPljVav9gG9Zf2cBBiEpAXaqGA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BMyKWB/qmGrpgNfHqpwXO87ICT86JvGrRISHUOAmzj9jwwnsrLnr9X25lI5qO5JGv cZLGvFHPuVVA6ovYmoOeDdx1UWqMrcPCmSDpJz9tgDyhx3yTkKZLnMQekAR+i0ntAl YvlMz5hWPdAKigmqv7+155bu3k7KbhQqVr05IzRs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alan Maguire , "Steven Rostedt (VMware)" , Shuah Khan , Sasha Levin Subject: [PATCH 5.4 010/147] ftrace/selftests: workaround cgroup RT scheduling issues Date: Mon, 18 May 2020 19:35:33 +0200 Message-Id: <20200518173514.751474980@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200518173513.009514388@linuxfoundation.org> References: <20200518173513.009514388@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alan Maguire [ Upstream commit 57c4cfd4a2eef8f94052bd7c0fce0981f74fb213 ] wakeup_rt.tc and wakeup.tc tests in tracers/ subdirectory fail due to the chrt command returning: chrt: failed to set pid 0's policy: Operation not permitted. To work around this, temporarily disable grout RT scheduling during ftracetest execution. Restore original value on test run completion. With these changes in place, both tests consistently pass. Fixes: c575dea2c1a5 ("selftests/ftrace: Add wakeup_rt tracer testcase") Fixes: c1edd060b413 ("selftests/ftrace: Add wakeup tracer testcase") Signed-off-by: Alan Maguire Acked-by: Steven Rostedt (VMware) Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/ftrace/ftracetest | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index 063ecb290a5a3..144308a757b70 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -29,8 +29,25 @@ err_ret=1 # kselftest skip code is 4 err_skip=4 +# cgroup RT scheduling prevents chrt commands from succeeding, which +# induces failures in test wakeup tests. Disable for the duration of +# the tests. + +readonly sched_rt_runtime=/proc/sys/kernel/sched_rt_runtime_us + +sched_rt_runtime_orig=$(cat $sched_rt_runtime) + +setup() { + echo -1 > $sched_rt_runtime +} + +cleanup() { + echo $sched_rt_runtime_orig > $sched_rt_runtime +} + errexit() { # message echo "Error: $1" 1>&2 + cleanup exit $err_ret } @@ -39,6 +56,8 @@ if [ `id -u` -ne 0 ]; then errexit "this must be run by root user" fi +setup + # Utilities absdir() { # file_path (cd `dirname $1`; pwd) @@ -235,6 +254,7 @@ TOTAL_RESULT=0 INSTANCE= CASENO=0 + testcase() { # testfile CASENO=$((CASENO+1)) desc=`grep "^#[ \t]*description:" $1 | cut -f2 -d:` @@ -406,5 +426,7 @@ prlog "# of unsupported: " `echo $UNSUPPORTED_CASES | wc -w` prlog "# of xfailed: " `echo $XFAILED_CASES | wc -w` prlog "# of undefined(test bug): " `echo $UNDEFINED_CASES | wc -w` +cleanup + # if no error, return 0 exit $TOTAL_RESULT -- 2.20.1