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;
From:   Kim Phillips <kim.phillips@amd.com>
To:     Arnaldo Carvalho de Melo <acme@redhat.com>, kim.phillips@amd.com
Cc:     linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
        Alexander Shishkin <alexander.shishkin@linux.intel.com>,
        Boris Ostrovsky <boris.ostrovsky@oracle.com>,
        Ian Rogers <irogers@google.com>,
        Ingo Molnar <mingo@redhat.com>, Jiri Olsa <jolsa@redhat.com>,
        Joao Martins <joao.m.martins@oracle.com>,
        Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Michael Petlan <mpetlan@redhat.com>,
        Namhyung Kim <namhyung@kernel.org>,
        Peter Zijlstra <peterz@infradead.org>,
        Robert Richter <robert.richter@amd.com>,
        Stephane Eranian <eranian@google.com>
Subject: [PATCH 1/2] perf evsel: Make evsel__env always return a valid env
Date:   Mon,  4 Oct 2021 16:41:13 -0500
Message-Id: <20211004214114.188477-1-kim.phillips@amd.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?B0fVePb4QjEtrvhSobzWyD7oltC3M+unyX0dpBI1jFdnooa1BT1DwYS8fsuU?=
 =?us-ascii?Q?f0x6hMBzrJa4MxRWz7mU4Sns8ohBf+oYTzbun03F1aafsk3sLMwtFvzxG1Kz?=
 =?us-ascii?Q?6SB3mQHtCXnqRbZRierGG0eCTgIY+feMwQ/FBDi0A1xbMq6Lzn76I3+GNReE?=
 =?us-ascii?Q?JzH54Yu9/PmXMRUBFpXN3UCWNjBkNJhimsbAuOtEpK5/wRywMfb2Lg/Zsn1H?=
 =?us-ascii?Q?prGCS/UTvgwToyztJAgKKGAdhyrOt85plLhQohUF5Us65e8HDDi11Ks1KJWt?=
 =?us-ascii?Q?LoXC97mD3rOKe2cx1OtQSsVh2PeL+3iCS9s+IzuXMmXNl7tyu06Mo1U2STRq?=
 =?us-ascii?Q?ylpbF3V3rscls5ET8u3Ax0Q3nWB9+XlCKE4OmnseXJcrtpzEp5w+zzA39sbB?=
 =?us-ascii?Q?sii/UtUPebdhfJ3YfXa4u6AMuQsDbhQb55AN1BTwlwyZfZZPIRdo275HAe2b?=
 =?us-ascii?Q?ys0iBVo4KOi4kvNZ5F6YTzjXIO6CCb1pRfuJaHesGwjhvoUEw4iwUzby++Gx?=
 =?us-ascii?Q?DPjsnNycwe0Hz4QVseVqgI3gBT0RlYR4hkQPTkv1XAwvAc+K/mXlHLdE2INk?=
 =?us-ascii?Q?BCu+ApDaGREE4zC31OwXl1TK31w1KaN5inf0Hhj3FwAzVTga+fk0GR7vYouQ?=
 =?us-ascii?Q?PlPw6+yrxpeWwWQkUxw4QXo8IW5WnmpBOt335T/aHHd2+IQ5QIBVgg+kteEP?=
 =?us-ascii?Q?pYKX3vMIST6CGTFOll9x08Lm/C4Tv2kzhkaIr5Dp0s72HYZ5PkPQFEaZPcfm?=
 =?us-ascii?Q?KYdDFAXDgzbLV0V9FBAZRu9jD0pycB9XUL97xMijT/oenBp7fweybNarxBn3?=
 =?us-ascii?Q?MThN7vACOugnxjiHI/xgRacmkt8BlYnzL59X0SMDKJ4D8XlHygBwx/BUJDHt?=
 =?us-ascii?Q?AyV1GsZ9gmEd6KKAPNZPsW1lnjEwxVbOSRYbIodCeuyFtz6PO0KVszeuvOQM?=
 =?us-ascii?Q?aEMAJjna3ShN91DPq/xb7PS5qTyCKxVBFpuJFmpWclB5olNOIjQTtLWkQww8?=
 =?us-ascii?Q?cZg6ty45wniT7bgfCcDThKlBEJT4PeNbb7vGJvx1vkZpjbuHakQEQYjLV3qW?=
 =?us-ascii?Q?4QTrT+TjWGf3hBhd69f3vf/B1vkl3d5A1K4bXvOAxUf44QRrw+MjhhOviy5i?=
 =?us-ascii?Q?wY2CsEFcokWyaBfR93Ehac6G2OoyJR+taEr1OzsoXutSFtvSdXv8uybgx+eH?=
 =?us-ascii?Q?6l99+Cpa7Usq6YYT3cqxGqkyXIjDv8Ef2KzB/fkUG7WtlqkGYsXyP+YU+VC/?=
 =?us-ascii?Q?VxpHdtBMAu2/FxhWJt7SRHJTW0/VG2Nnmdx697Xq4mePPhPNWClgHNg8GaM3?=
 =?us-ascii?Q?QsEwx9omnbkPVAeSBqZrQTeO?=
X-OriginatorOrg: amd.com
X-MS-Exchange-CrossTenant-Network-Message-Id: ab9b4e2f-765b-4bf8-a0d7-08d9877fbb51
X-MS-Exchange-CrossTenant-AuthSource: BN8PR12MB3505.namprd12.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Oct 2021 21:41:32.4060
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YiwXplgao2OPtSkWHmJT+Wnj5N7VLAAz9jVz4ZNIILZbWHqyG7Q/3nlr+kC3F0c06Jdxua6YVm5raRFLDWgWog==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN7PR12MB2772
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

It's possible to have an evsel and evsel->evlist populated without
an evsel->evlist->env, when, e.g., cmd_record is in its error path.

Future patches will add support for evsel__open_strerror to be able
to customize error messaging based on perf_env__{arch,cpuid}, so
let's have evsel__env return &perf_env instead of NULL in that case.

Signed-off-by: Kim Phillips <kim.phillips@amd.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: Ian Rogers <irogers@google.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Joao Martins <joao.m.martins@oracle.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Michael Petlan <mpetlan@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Robert Richter <robert.richter@amd.com>
Cc: Stephane Eranian <eranian@google.com>
---
 tools/perf/util/evsel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index dbfeceb2546c..b915840690d4 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2857,7 +2857,7 @@ int evsel__open_strerror(struct evsel *evsel, struct target *target,
 
 struct perf_env *evsel__env(struct evsel *evsel)
 {
-	if (evsel && evsel->evlist)
+	if (evsel && evsel->evlist && evsel->evlist->env)
 		return evsel->evlist->env;
 	return &perf_env;
 }
-- 
2.31.1