From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6613224234 for ; Sat, 28 Jun 2025 04:51:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751086269; cv=none; b=YJohNTwu+sf4PIxZisKo71abFnx8Uo5s8DdR/bJzp9FntB2+C6p9aFIGY4692iiEfVx8dHaqvI8jHNdYvNRsWCKG5uQlSM0RX1/AwZmU5eCT/Mqt7j8yvrywcXRRvDMz42alra8UXGHO7LnnFq7zyk7UNnw62bYxnXi3nW53dlM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751086269; c=relaxed/simple; bh=Wqv10aBltPBXUHLr9USn9Z7UE0yIqyWqu3PrwUYHbiI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=sTb2uq020wJEw3Vzi0Inhk+doa9f+KUWN0+LNrkPJyPVvHPDgFm4u9R/ArT+cetOEcwsRrSODx7qz1d9d6ZSiyOvOXl9mOE31uB8jTnty7x4PTSSTBJStlVAeDar2oBNNOdTUUCGkCeRZ4n/y+PwyfaYmpRhxQOW9u0VG6Iws7Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=cFUaKxYT; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="cFUaKxYT" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-237e6963f70so36733365ad.2 for ; Fri, 27 Jun 2025 21:51:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1751086266; x=1751691066; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=TT9zT2536gJjOZ4EIQ6l60zD2zdNSDXQaYMi8NYa5Ek=; b=cFUaKxYTHEx3hZHRPpKyPcw8MTjoVpaX/9uri5VU8ktfSe1BEVpsqJ3VE39pTsaIGI 3gjP8Po8pxXgWqXObXR+y85IEoMWcdJp0gPozq5y9XwsnTsr6ZA999o5+oY5oEgkFaXu gXOa3MUcnad0u8udH2Dkk+VxjSlXOqxnlbNC2ElHYWx1Pb3OLJEIbepTYnPUxWgEZnEN 48fqRr63uJ3RTb4xglZ2z4RqmQOsk29UvsLZdvkW1vHG6rDHsL9f4QLbMv8vNsX7M6jf VSxz8Iv5QkUEyyxQ+CutTqGhe0VvYfRT53M4btsKrL/phkO/rJnlx3RD1f2gupVPK4fD wBuQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751086266; x=1751691066; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=TT9zT2536gJjOZ4EIQ6l60zD2zdNSDXQaYMi8NYa5Ek=; b=pfjvTMussz1c+i8nQ8UxeMRI8x8RVj0OGsZCnx8XsqNvpPZko1V5zROS9pQJITyAJW 3icJMjuK0ewmcmsQ9rn/bsbFJxmWCKUb2sdUap0GMCliTiM4LAqHwOqHLs2dlpTEbli2 6+UiH9dm/zrJIp4V0Idp+HA+rhuMloFxyLRT/glKY2fWCHbWPAOYXeZqicV5fI8EdBad tD8znX06svMs3nxVjmzrtdmf4172HG4vdD4QujvxGwFXzX/hkA6RhCooQyw6V1hCyT2P rCxUy9ryPu54r0K6G54mufNegPHterUeQiJxfj3tmdli+Bpl+JrrQbBqFqkyPgX4H1Xk IQeQ== X-Forwarded-Encrypted: i=1; AJvYcCW8Tavl/L2sE+mk5b/5Q+7kxDK48Z9A8xxcmihVrgQFHK36XJPJfMhr/YggCJ5wtLZys0d3SktEpee2uw7t+b96@vger.kernel.org X-Gm-Message-State: AOJu0Yy9yFrZu4X3CCvwFSqX9xFA8iV+vM99cvXPQgDipdL/iE1i7CJO CCQ1DR3bInu34ydzzfqFnEVj6zYke6suLmXJ5sPVg9E5h+GVW8cZvqJLwNQbDfuiAljKtw7w+sm YOQu4Ytfdpg== X-Google-Smtp-Source: AGHT+IH+KbSHYBqzmLEU1hrbmakGCU2JwYO5D/JSKx+kk6D+KFS8VGHUVFIV2JLOJ7PQwIr4Gzdzdb8sHtJc X-Received: from pjbeu16.prod.google.com ([2002:a17:90a:f950:b0:311:6040:2c7a]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a8c:b0:237:f76f:ce34 with SMTP id d9443c01a7336-23ac40e02a2mr85189075ad.15.1751086266211; Fri, 27 Jun 2025 21:51:06 -0700 (PDT) Date: Fri, 27 Jun 2025 21:50:07 -0700 In-Reply-To: <20250628045017.1361563-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-perf-users@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250628045017.1361563-1-irogers@google.com> X-Mailer: git-send-email 2.50.0.727.gbf7dc18ff4-goog Message-ID: <20250628045017.1361563-14-irogers@google.com> Subject: [PATCH v5 13/23] perf test: Avoid use perf_env From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , "Masami Hiramatsu (Google)" , Ravi Bangoria , Charlie Jenkins , Colin Ian King , Andi Kleen , Dmitry Vyukov , Graham Woodward , Ilkka Koskinen , Zhongqiu Han , Yicong Yang , Athira Rajeev , Kajol Jain , Li Huafei , "Steinar H. Gunderson" , Stephen Brennan , Chun-Tse Shao , Yujie Liu , "Dr. David Alan Gilbert" , Levi Yun , Howard Chu , Weilin Wang , Thomas Falcon , Matt Fleming , Veronika Molnarova , "=?UTF-8?q?Krzysztof=20=C5=81opatowski?=" , Zixian Cai , Steve Clevenger , Ben Gainey , Chaitanya S Prakash , Martin Liska , "=?UTF-8?q?Martin=20Li=C5=A1ka?=" , Song Liu , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="UTF-8" The perf_env global variable holds the host perf_env data but its use is hit and miss. Switch to using local perf_env variables and ensure scoped perf_env__init and perf_env__exit. This loses command line setting of the perf_env, but this doesn't matter for tests. So the perf_env is fully initialized, clear it with memset in perf_env__init. Signed-off-by: Ian Rogers --- tools/perf/tests/code-reading.c | 5 +++- tools/perf/tests/dlfilter-test.c | 50 ++++++++++++++++++-------------- tools/perf/util/env.c | 1 + 3 files changed, 33 insertions(+), 23 deletions(-) diff --git a/tools/perf/tests/code-reading.c b/tools/perf/tests/code-reading.c index cf6edbe697b2..4b2461e93b2b 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -651,11 +651,13 @@ static int do_test_code_reading(bool try_kcore) struct dso *dso; const char *events[] = { "cycles", "cycles:u", "cpu-clock", "cpu-clock:u", NULL }; int evidx = 0; + struct perf_env host_env; pid = getpid(); machine = machine__new_host(); - machine->env = &perf_env; + perf_env__init(&host_env); + machine->env = &host_env; ret = machine__create_kernel_maps(machine); if (ret < 0) { @@ -798,6 +800,7 @@ static int do_test_code_reading(bool try_kcore) perf_cpu_map__put(cpus); perf_thread_map__put(threads); machine__delete(machine); + perf_env__exit(&host_env); return err; } diff --git a/tools/perf/tests/dlfilter-test.c b/tools/perf/tests/dlfilter-test.c index 54f59d1246bc..6427e3382711 100644 --- a/tools/perf/tests/dlfilter-test.c +++ b/tools/perf/tests/dlfilter-test.c @@ -319,11 +319,12 @@ static int run_perf_script(struct test_data *td) static int test__dlfilter_test(struct test_data *td) { + struct perf_env host_env; u64 sample_type = TEST_SAMPLE_TYPE; pid_t pid = 12345; pid_t tid = 12346; u64 id = 99; - int err; + int err = TEST_OK; if (get_dlfilters_path(td->name, td->dlfilters, PATH_MAX)) return test_result("dlfilters not found", TEST_SKIP); @@ -353,37 +354,42 @@ static int test__dlfilter_test(struct test_data *td) pr_debug("Creating new host machine structure\n"); td->machine = machine__new_host(); - td->machine->env = &perf_env; + perf_env__init(&host_env); + td->machine->env = &host_env; td->fd = creat(td->perf_data_file_name, 0644); if (td->fd < 0) return test_result("Failed to create test perf.data file", TEST_FAIL); err = perf_header__write_pipe(td->fd); - if (err < 0) - return test_result("perf_header__write_pipe() failed", TEST_FAIL); - + if (err < 0) { + err = test_result("perf_header__write_pipe() failed", TEST_FAIL); + goto out; + } err = write_attr(td, sample_type, &id); - if (err) - return test_result("perf_event__synthesize_attr() failed", TEST_FAIL); - - if (write_comm(td->fd, pid, tid, "test-prog")) - return TEST_FAIL; - - if (write_mmap(td->fd, pid, tid, MAP_START, 0x10000, 0, td->prog_file_name)) - return TEST_FAIL; - - if (write_sample(td, sample_type, id, pid, tid) != TEST_OK) - return TEST_FAIL; - + if (err) { + err = test_result("perf_event__synthesize_attr() failed", TEST_FAIL); + goto out; + } + if (write_comm(td->fd, pid, tid, "test-prog")) { + err = TEST_FAIL; + goto out; + } + if (write_mmap(td->fd, pid, tid, MAP_START, 0x10000, 0, td->prog_file_name)) { + err = TEST_FAIL; + goto out; + } + if (write_sample(td, sample_type, id, pid, tid) != TEST_OK) { + err = TEST_FAIL; + goto out; + } if (verbose > 1) system_cmd("%s script -i %s -D", td->perf, td->perf_data_file_name); - err = run_perf_script(td); - if (err) - return TEST_FAIL; - - return TEST_OK; + err = run_perf_script(td) ? TEST_FAIL : TEST_OK; +out: + perf_env__exit(&host_env); + return err; } static void unlink_path(const char *path) diff --git a/tools/perf/util/env.c b/tools/perf/util/env.c index 05a4f2657d72..887a6fb7104e 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -271,6 +271,7 @@ void perf_env__exit(struct perf_env *env) void perf_env__init(struct perf_env *env) { + memset(env, 0, sizeof(*env)); #ifdef HAVE_LIBBPF_SUPPORT env->bpf_progs.infos = RB_ROOT; env->bpf_progs.btfs = RB_ROOT; -- 2.50.0.727.gbf7dc18ff4-goog