From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C04DC4CED1 for ; Thu, 3 Oct 2019 16:28:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 17EDF21783 for ; Thu, 3 Oct 2019 16:28:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120088; bh=0hsYqkua7Amw8NXUD4oWNn9p7PeLlwgDiZhYrqNPV9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=B73phjYbJ8mghdxwiP0o2FDIQf3TqTGy9TanOOVbNYBheZuwgGXWVaASqTrP5Pp9q UcyHdUXurR4MSiCtx45NgZjoNIMnMEONlZ87IecCQK/rUC9S6rM470hZFNxrQQrRaG nnadJnfySZ9dtcKHB3/ooow2jH1cO5d6PFp7PGAA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391465AbfJCQ2H (ORCPT ); Thu, 3 Oct 2019 12:28:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:60380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391360AbfJCQ2D (ORCPT ); Thu, 3 Oct 2019 12:28:03 -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 CF9E5215EA; Thu, 3 Oct 2019 16:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570120082; bh=0hsYqkua7Amw8NXUD4oWNn9p7PeLlwgDiZhYrqNPV9Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BxgiZ1VXX97M1ZKHGGj1AV3rXb7H7rS8LvDqF241bfG1x1/pO2W4t8RBF5BysVCu/ 5fY5MSwA0+TMTjIwHim9IUUHQvUc78tybAOvq8wt1afElTPOBWQKMXpI4g3edPK4PW ujXPF8kJRfcn38DNUiJbmTYaZQ/30LxNQUZQfXqo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Adrian Hunter , Jiri Olsa , =?UTF-8?q?Luis=20Cl=C3=A1udio=20Gon=C3=A7alves?= , Namhyung Kim , Taeung Song , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.2 091/313] perf config: Honour $PERF_CONFIG env var to specify alternate .perfconfig Date: Thu, 3 Oct 2019 17:51:09 +0200 Message-Id: <20191003154541.822692059@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154533.590915454@linuxfoundation.org> References: <20191003154533.590915454@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnaldo Carvalho de Melo [ Upstream commit 61a461fcbd62d42c29a1ea6a9cc3838ad9f49401 ] We had this comment in Documentation/perf_counter/config.c, i.e. since when we got this from the git sources, but never really did that getenv("PERF_CONFIG"), do it now as I need to disable whatever ~/.perfconfig root has so that tests parsing tool output are done for the expected default output or that we specify an alternate config file that when read will make the tools produce expected output. Cc: Adrian Hunter Cc: Jiri Olsa Cc: Luis Cláudio Gonçalves Cc: Namhyung Kim Cc: Taeung Song Fixes: 078006012401 ("perf_counter tools: add in basic glue from Git") Link: https://lkml.kernel.org/n/tip-jo209zac9rut0dz1rqvbdlgm@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Sasha Levin --- tools/perf/perf.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/perf/perf.c b/tools/perf/perf.c index 72df4b6fa36fd..4c45cdf38adae 100644 --- a/tools/perf/perf.c +++ b/tools/perf/perf.c @@ -440,6 +440,9 @@ int main(int argc, const char **argv) srandom(time(NULL)); + /* Setting $PERF_CONFIG makes perf read _only_ the given config file. */ + config_exclusive_filename = getenv("PERF_CONFIG"); + err = perf_config(perf_default_config, NULL); if (err) return err; -- 2.20.1