From patchwork Sat Sep 9 09:36:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 13378020 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE4D6EEB585 for ; Sat, 9 Sep 2023 09:36:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343592AbjIIJgs (ORCPT ); Sat, 9 Sep 2023 05:36:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33736 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242654AbjIIJgs (ORCPT ); Sat, 9 Sep 2023 05:36:48 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9ECB170C; Sat, 9 Sep 2023 02:36:43 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EFBAAC433C7; Sat, 9 Sep 2023 09:36:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694252203; bh=4lA4gs1BoSf0LFV5Kr3xZk1bIv2mhOACwkEIbfVvETQ=; h=From:To:Cc:Subject:Date:From; b=mGpd7cBk4XO62AABDlchiIZ3xYiP4eO7Xv/E4yMSjRs2T/4yqilcOi2V9uRmCsAIe Ys4EDgpmij9TrynbvxfgpMu9LibmQTB99VtzBODXBr4E6yXgJTNLl1axG99b6yEoY1 8w2TOpfK/9EMmw/KYFujLA0WKvzmWWymPIdBl0WpMtE21igWS9aNxnrDDcyigTb+Tv 1AKdgLkqdXsiI50/QR/Q2wwGRIxBYsyFzJYLbdK5uXO6bK84JbFxAvpeQQB5e7PTEv S+9chqKN+vvKFID7GqLf3UKLauKLDa9PRa6WWUg+rR7x+NhIYr0fnub6+AZPJE6n64 62G/Hqe2ji5sw== From: "Masami Hiramatsu (Google)" To: Shuah Khan Cc: Steven Rostedt , Mark Brown , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [FIX PATCH] selftests: tracing: Fix to unmount tracefs for recovering environment Date: Sat, 9 Sep 2023 18:36:39 +0900 Message-Id: <169425219871.184380.8584599358250186540.stgit@devnote2> X-Mailer: git-send-email 2.34.1 User-Agent: StGit/0.19 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org From: Masami Hiramatsu (Google) Fix to unmount the tracefs if the ftracetest mounted it for recovering system environment. If the tracefs is already mounted, this does nothing. Suggested-by: Mark Brown Link: https://lore.kernel.org/all/29fce076-746c-4650-8358-b4e0fa215cf7@sirena.org.uk/ Fixes: cbd965bde74c ("ftrace/selftests: Return the skip code when tracing directory not configured in kernel") Signed-off-by: Masami Hiramatsu (Google) --- tools/testing/selftests/ftrace/ftracetest | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tools/testing/selftests/ftrace/ftracetest b/tools/testing/selftests/ftrace/ftracetest index cb5f18c06593..89c212d82256 100755 --- a/tools/testing/selftests/ftrace/ftracetest +++ b/tools/testing/selftests/ftrace/ftracetest @@ -31,6 +31,9 @@ err_ret=1 # kselftest skip code is 4 err_skip=4 +# umount required +UMOUNT_DIR="" + # cgroup RT scheduling prevents chrt commands from succeeding, which # induces failures in test wakeup tests. Disable for the duration of # the tests. @@ -45,6 +48,9 @@ setup() { cleanup() { echo $sched_rt_runtime_orig > $sched_rt_runtime + if [ "${UMOUNT_DIR}" ]; then + umount ${UMOUNT_DIR} ||: + fi } errexit() { # message @@ -160,11 +166,13 @@ if [ -z "$TRACING_DIR" ]; then mount -t tracefs nodev /sys/kernel/tracing || errexit "Failed to mount /sys/kernel/tracing" TRACING_DIR="/sys/kernel/tracing" + UMOUNT_DIR=${TRACING_DIR} # If debugfs exists, then so does /sys/kernel/debug elif [ -d "/sys/kernel/debug" ]; then mount -t debugfs nodev /sys/kernel/debug || errexit "Failed to mount /sys/kernel/debug" TRACING_DIR="/sys/kernel/debug/tracing" + UMOUNT_DIR=${TRACING_DIR} else err_ret=$err_skip errexit "debugfs and tracefs are not configured in this kernel"