From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ian Rogers <irogers@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Mark Rutland <mark.rutland@arm.com>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>,
Adrian Hunter <adrian.hunter@intel.com>,
linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v1] perf test: Fix maps use after put
Date: Thu, 20 Apr 2023 08:23:44 -0300 [thread overview]
Message-ID: <ZEEgwKYMaA9iTgFA@kernel.org> (raw)
In-Reply-To: <20230420030430.489243-1-irogers@google.com>
Em Wed, Apr 19, 2023 at 08:04:30PM -0700, Ian Rogers escreveu:
> Fix a use after put reference count issue. maps is copied from leader,
> but the leader is put on line 79 and then maps is used to read the
> reference count below - so a use after put, with the put of maps
> happening within thread__put. Fix by reversing the order of puts so
> that the leader is put last.
>
> To explain the reference count checker, I wrote this up as a little
> example here:
> https://perf.wiki.kernel.org/index.php/Reference_Count_Checking
>
> Note, the bug was introduced by the committer and wasn't present in
> the original reference count patch set.
Yes, the bug predated your patch and is detected by the reference count
checking you contributed.
This was just part of splitting up your series into smaller chunks, in
this case either we fix the problem detected while developing this
reference counting infrastructure or fix it later after the merged
infrastructure, when built with EXTRA_CFLAGS="-DREFCNT_CHECKING=1"
detects it when running 'perf test'.
Thanks for providing the separate patch fixing it.
Applied.
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/tests/thread-maps-share.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/tools/perf/tests/thread-maps-share.c b/tools/perf/tests/thread-maps-share.c
> index 75ce8aedfc78..858e725318a9 100644
> --- a/tools/perf/tests/thread-maps-share.c
> +++ b/tools/perf/tests/thread-maps-share.c
> @@ -76,16 +76,16 @@ static int test__thread_maps_share(struct test_suite *test __maybe_unused, int s
> TEST_ASSERT_VAL("maps don't match", RC_CHK_ACCESS(other_maps) == RC_CHK_ACCESS(other_leader->maps));
>
> /* release thread group */
> - thread__put(leader);
> + thread__put(t3);
> TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(maps__refcnt(maps)), 3);
>
> - thread__put(t1);
> + thread__put(t2);
> TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(maps__refcnt(maps)), 2);
>
> - thread__put(t2);
> + thread__put(t1);
> TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(maps__refcnt(maps)), 1);
>
> - thread__put(t3);
> + thread__put(leader);
>
> /* release other group */
> thread__put(other_leader);
> --
> 2.40.0.634.g4ca3ef3211-goog
>
--
- Arnaldo
prev parent reply other threads:[~2023-04-20 11:25 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-20 3:04 [PATCH v1] perf test: Fix maps use after put Ian Rogers
2023-04-20 11:23 ` Arnaldo Carvalho de Melo [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZEEgwKYMaA9iTgFA@kernel.org \
--to=acme@kernel.org \
--cc=adrian.hunter@intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=irogers@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@redhat.com \
--cc=namhyung@kernel.org \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).