From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 15BDB12F5A7; Tue, 23 Jan 2024 00:17:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969038; cv=none; b=naGOuWEUIFSrjfl2XCY/kpY7TSF9CEwdox+gfj0Kv8kJna97iuys7O6b1N2UazTG0M40BO2WOk9Q96kOj7t9G71IexKtQHQvwpnaOnH9c0IidDiQ9t+gG38hLliJiaTEc5pCD8LiSXBeGQiBfoRw4kkUK+VVcxiWTz80u3Fqg8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705969038; c=relaxed/simple; bh=HPgA4p6wrujnM06m1fvllXGl/+DVtPmx/oV2/kDHXUg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bColTnz1A6ersrm/7UMACCOfnMtMnXWwVYRkCBlZpi2h5rzfXR+nVwGdT21J6HWYeawkhBkGfPvqnVhJY3QCV2HllXaThT4hxLAMaIb55ucuyX6E/scGBtybP6IuXtkbiSjPqkB9KvP/uxt46E4biBGQDHEqaYM7gUDau/4tYKA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YmOzRch+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="YmOzRch+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id B6847C433C7; Tue, 23 Jan 2024 00:17:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705969037; bh=HPgA4p6wrujnM06m1fvllXGl/+DVtPmx/oV2/kDHXUg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YmOzRch+e1eNqaxhv8czGDnblNacxwTnNuv/phW9IWO0fz7GG5z8gvMOJWu7wczt8 KsDs1EQOsEl0pLgMHrBHIjs4DCTvispx4Z3r/C/6kAJx9E/wmagUzbNtu7vQqq5ZAO DcBmlpPZv2i9+3qY/SkaMZB4SusR/ZxxsUcUshIs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jiri Olsa , Adrian Hunter , Namhyung Kim , Song Liu , Arnaldo Carvalho de Melo , Sasha Levin Subject: [PATCH 5.4 174/194] perf record: Move sb_evlist to struct record Date: Mon, 22 Jan 2024 15:58:24 -0800 Message-ID: <20240122235726.679908033@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235719.206965081@linuxfoundation.org> References: <20240122235719.206965081@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arnaldo Carvalho de Melo [ Upstream commit bc477d7983e345262757568ec27be0395dc2fe73 ] Where state related to a 'perf record' session is grouped. Acked-by: Jiri Olsa Cc: Adrian Hunter Cc: Namhyung Kim Cc: Song Liu Link: http://lore.kernel.org/lkml/20200429131106.27974-2-acme@kernel.org Signed-off-by: Arnaldo Carvalho de Melo Stable-dep-of: 9c51f8788b5d ("perf env: Avoid recursively taking env->bpf_progs.lock") Signed-off-by: Sasha Levin --- tools/perf/builtin-record.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 454e275cd5df..7fc3dadfa156 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -80,6 +80,7 @@ struct record { struct auxtrace_record *itr; struct evlist *evlist; struct perf_session *session; + struct evlist *sb_evlist; int realtime_prio; bool no_buildid; bool no_buildid_set; @@ -1343,7 +1344,6 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) struct perf_data *data = &rec->data; struct perf_session *session; bool disabled = false, draining = false; - struct evlist *sb_evlist = NULL; int fd; float ratio = 0; @@ -1455,9 +1455,9 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) } if (!opts->no_bpf_event) - bpf_event__add_sb_event(&sb_evlist, &session->header.env); + bpf_event__add_sb_event(&rec->sb_evlist, &session->header.env); - if (perf_evlist__start_sb_thread(sb_evlist, &rec->opts.target)) { + if (perf_evlist__start_sb_thread(rec->sb_evlist, &rec->opts.target)) { pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n"); opts->no_bpf_event = true; } @@ -1731,7 +1731,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) perf_session__delete(session); if (!opts->no_bpf_event) - perf_evlist__stop_sb_thread(sb_evlist); + perf_evlist__stop_sb_thread(rec->sb_evlist); return status; } -- 2.43.0