Commit f6005caf authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf thread: Add reference count checking 



Modify struct declaration and accessor functions for the reference
count checkers additional layer of indirection. Make sure pid_cmp in
builtin-sched.c uses the underlying/original struct in pointer
arithmetic, and not the temporary get/put indirection.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ali Saidi <alisaidi@amazon.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Brian Robbins <brianrob@linux.microsoft.com>
Cc: Changbin Du <changbin.du@huawei.com>
Cc: Dmitrii Dolgov <9erthalion6@gmail.com>
Cc: Fangrui Song <maskray@google.com>
Cc: German Gomez <german.gomez@arm.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Ivan Babrou <ivan@cloudflare.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: K Prateek Nayak <kprateek.nayak@amd.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Miguel Ojeda <ojeda@kernel.org>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Steinar H. Gunderson <sesse@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: Will Deacon <will@kernel.org>
Cc: Yang Jihong <yangjihong1@huawei.com>
Cc: Ye Xingchen <ye.xingchen@zte.com.cn>
Cc: Yuan Can <yuancan@huawei.com>
Cc: coresight@lists.linaro.org
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20230608232823.4027869-8-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 0dd5041c

tools/perf/builtin-sched.c

+2 −2
Original line number Diff line number Diff line
@@ -1385,7 +1385,7 @@ static int pid_cmp(struct work_atoms *l, struct work_atoms *r) 
{

	pid_t l_tid, r_tid;



	if (l->thread == r->thread)

	if (RC_CHK_ACCESS(l->thread) == RC_CHK_ACCESS(r->thread))

		return 0;

	l_tid = thread__tid(l->thread);

	r_tid = thread__tid(r->thread);
@@ -1393,7 +1393,7 @@ static int pid_cmp(struct work_atoms *l, struct work_atoms *r) 
		return -1;

	if (l_tid > r_tid)

		return 1;

	return (int)(l->thread - r->thread);

	return (int)(RC_CHK_ACCESS(l->thread) - RC_CHK_ACCESS(r->thread));

}



static int avg_cmp(struct work_atoms *l, struct work_atoms *r)

tools/perf/tests/hists_link.c

+1 −1
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static int find_sample(struct sample *samples, size_t nr_samples, 
		       struct thread *t, struct map *m, struct symbol *s)

{

	while (nr_samples--) {

		if (samples->thread == t &&

		if (RC_CHK_ACCESS(samples->thread) == RC_CHK_ACCESS(t) &&

		    RC_CHK_ACCESS(samples->map) == RC_CHK_ACCESS(m) &&

		    samples->sym == s)

			return 1;

tools/perf/ui/hist.c

+4 −1
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include "../util/sort.h"

#include "../util/evsel.h"

#include "../util/evlist.h"

#include "../util/thread.h"

#include "../util/util.h"



/* hist period print (hpp) functions */
@@ -274,7 +275,9 @@ static int __hpp__sort_acc(struct hist_entry *a, struct hist_entry *b, 
		if (ret)

			return ret;



		if (a->thread != b->thread || !hist_entry__has_callchains(a) || !symbol_conf.use_callchain)

		if ((a->thread == NULL ? NULL : RC_CHK_ACCESS(a->thread)) !=

		    (b->thread == NULL ? NULL : RC_CHK_ACCESS(b->thread)) ||

		    !hist_entry__has_callchains(a) || !symbol_conf.use_callchain)

			return 0;



		ret = b->callchain->max_depth - a->callchain->max_depth;

tools/perf/util/hist.c

+1 −1
Original line number Diff line number Diff line
@@ -2124,7 +2124,7 @@ static bool hists__filter_entry_by_thread(struct hists *hists, 
					  struct hist_entry *he)

{

	if (hists->thread_filter != NULL &&

	    he->thread != hists->thread_filter) {

	    RC_CHK_ACCESS(he->thread) != RC_CHK_ACCESS(hists->thread_filter)) {

		he->filtered |= (1 << HIST_FILTER__THREAD);

		return true;

	}

tools/perf/util/machine.c

+1 −1
Original line number Diff line number Diff line
@@ -2055,7 +2055,7 @@ static void __machine__remove_thread(struct machine *machine, struct thread_rb_n 
	if (!nd)

		nd = thread_rb_node__find(th, &threads->entries.rb_root);



	if (threads->last_match == th)

	if (threads->last_match && RC_CHK_ACCESS(threads->last_match) == RC_CHK_ACCESS(th))

		threads__set_last_match(threads, NULL);



	if (lock)