From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1795030311; b=Nj2l0vVt7OsJovufizKV9m5AIa16E8dadC4SLcV1t9hgo2MPFPCcbtCJbu8DkyB0rkpZ w1MJHsuOJAfWgkg7j+GsEK9wo4dFT86hBrKiruwnMfUvQktgFxapVIGjqUarywXK2Se78 nCWGoNcxbYInupNTBAyEu6CGfiL1GabyKcPhQNbaCiH4oQGcSyiF5pp6Yj/BAC70oRF57 K6XSANQcIjBI7lJpe9sI4hJ8I6I3gSHAUMaxbKP/GzjCH/RwbRaf/CoNmqNajQlsAWLHH Uq1A6XShMg1Q4TDSNGAvXy8oA5temELhUbi66Grxlc7xf4e1lbTkSnxWV3f2JRrGLZQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795030311; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=iQbwBUmaUNGIjWVN8wzzXjGn3SaKPdRhetZpjlIAVxk=; b=YNtBZ6+Vsz2q+NLokzh/NPPJ+uJJudTRpi9pTUA9mSc6QG0ImE1euko+y1wECxomvdqN HsrfZ+5os93jyXtUooQKGsdPUtHtKnvGypv3sjwhvF1aLinvg0/5ikatbrTAc13Abk0JR 0buzewMm3CYG2W7chskH0NNruotx+zdU6uwlkCOOVJzn2xuI8N91Vxox3seWV61YU8VR5 Gt2Fr28CIjmnU9NzQU0g+h03VbS17zXSkjrpKLwG2dGWjXMWRAzUPVFSvmfFJ9IyuJzhB iyXvQbWmnWuKK8MBI7PLF2J+c4DHFt70DbWyqXX7XHwLKpZ957e5b195YgQmCbYFu7g== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h4wUxa3n; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1C3F9606A7CA; Wed, 18 Nov 2026 19:31:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=h4wUxa3n Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6E3B31F000C4; Wed, 18 Nov 2026 19:31:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795030311; bh=iQbwBUmaUNGIjWVN8wzzXjGn3SaKPdRhetZpjlIAVxk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=h4wUxa3nb6loteC4UCGOyL51aFuKTMayOUF/y/lKARjgkoHqLgEIhkkhUPe76KkbC vnD6BViBRmdFQj2T2AGsW3+QFXcLsamWtdquXEEF16mYZOVa9tKsh4L6/CW5hOXnqU uQSdeToWG7XAo9QV7EzfNlKJQ7G8B0V/EnLF8Pls= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Ian Rogers , Namhyung Kim , Sasha Levin Subject: [PATCH 6.12 0660/1756] perf test: Avoid use perf_env Date: Wed, 18 Nov 2026 15:46:27 +0100 Message-ID: <20261118150035.280612934@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150007.957976754@linuxfoundation.org> References: <20261118150007.957976754@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: patches@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Ian Rogers [ Upstream commit 5a156353e55e994627ac584e90b3b802e51e1ee2 ] 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 Link: https://lore.kernel.org/r/20250724163302.596743-13-irogers@google.com Signed-off-by: Namhyung Kim Stable-dep-of: 58bf7b7af359 ("perf test code-reading: Fix duplicate kernel maps and machine leak") Signed-off-by: Sasha Levin --- 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 638816544c3f6..8d40541abf681 100644 --- a/tools/perf/tests/code-reading.c +++ b/tools/perf/tests/code-reading.c @@ -561,11 +561,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) { @@ -708,6 +710,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 54f59d1246bc5..6427e3382711f 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 d981b6f4bc5ea..47d6110da4658 100644 --- a/tools/perf/util/env.c +++ b/tools/perf/util/env.c @@ -252,6 +252,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.53.0