mirror of
https://github.com/FEX-Emu/linux.git
synced 2025-01-14 05:12:17 +00:00
8b00f46951
When introducing reference counting for struct thread instances I forgot
to remove the synthetic threads from the machine's rbtree so that it
then the threads would have just one reference and thus the
thread__put() replacing the thread__delete() really turns into a
thread__delete() (thread->refcnt == 1 at thread__put() time) and thus
drop the thread->mg refcount, as expected by the this test.
Fix it by calling machine__remove_thread() (the counterpart of
machine__findnew_thread()) on all the synthetic threads after the
checks that involves the rbtree were done.
Before:
# perf test -v mg
30: Test thread mg sharing :
--- start ---
test child forked, pid 26995
FAILED tests/thread-mg-share.c:68 wrong refcnt (4 != 3)
test child finished with -1
---- end ----
Test thread mg sharing: FAILED!
#
After:
# perf test mg
30: Test thread mg sharing: Ok
#
Fixes: b91fc39f4ad7 ("perf machine: Protect the machine->threads with a rwlock")
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-uoqq0fjei90ohhhcboz6ay33@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
99 lines
2.6 KiB
C
99 lines
2.6 KiB
C
#include "tests.h"
|
|
#include "machine.h"
|
|
#include "thread.h"
|
|
#include "map.h"
|
|
#include "debug.h"
|
|
|
|
int test__thread_mg_share(void)
|
|
{
|
|
struct machines machines;
|
|
struct machine *machine;
|
|
|
|
/* thread group */
|
|
struct thread *leader;
|
|
struct thread *t1, *t2, *t3;
|
|
struct map_groups *mg;
|
|
|
|
/* other process */
|
|
struct thread *other, *other_leader;
|
|
struct map_groups *other_mg;
|
|
|
|
/*
|
|
* This test create 2 processes abstractions (struct thread)
|
|
* with several threads and checks they properly share and
|
|
* maintain map groups info (struct map_groups).
|
|
*
|
|
* thread group (pid: 0, tids: 0, 1, 2, 3)
|
|
* other group (pid: 4, tids: 4, 5)
|
|
*/
|
|
|
|
machines__init(&machines);
|
|
machine = &machines.host;
|
|
|
|
/* create process with 4 threads */
|
|
leader = machine__findnew_thread(machine, 0, 0);
|
|
t1 = machine__findnew_thread(machine, 0, 1);
|
|
t2 = machine__findnew_thread(machine, 0, 2);
|
|
t3 = machine__findnew_thread(machine, 0, 3);
|
|
|
|
/* and create 1 separated process, without thread leader */
|
|
other = machine__findnew_thread(machine, 4, 5);
|
|
|
|
TEST_ASSERT_VAL("failed to create threads",
|
|
leader && t1 && t2 && t3 && other);
|
|
|
|
mg = leader->mg;
|
|
TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 4);
|
|
|
|
/* test the map groups pointer is shared */
|
|
TEST_ASSERT_VAL("map groups don't match", mg == t1->mg);
|
|
TEST_ASSERT_VAL("map groups don't match", mg == t2->mg);
|
|
TEST_ASSERT_VAL("map groups don't match", mg == t3->mg);
|
|
|
|
/*
|
|
* Verify the other leader was created by previous call.
|
|
* It should have shared map groups with no change in
|
|
* refcnt.
|
|
*/
|
|
other_leader = machine__find_thread(machine, 4, 4);
|
|
TEST_ASSERT_VAL("failed to find other leader", other_leader);
|
|
|
|
/*
|
|
* Ok, now that all the rbtree related operations were done,
|
|
* lets remove all of them from there so that we can do the
|
|
* refcounting tests.
|
|
*/
|
|
machine__remove_thread(machine, leader);
|
|
machine__remove_thread(machine, t1);
|
|
machine__remove_thread(machine, t2);
|
|
machine__remove_thread(machine, t3);
|
|
machine__remove_thread(machine, other);
|
|
machine__remove_thread(machine, other_leader);
|
|
|
|
other_mg = other->mg;
|
|
TEST_ASSERT_EQUAL("wrong refcnt", other_mg->refcnt, 2);
|
|
|
|
TEST_ASSERT_VAL("map groups don't match", other_mg == other_leader->mg);
|
|
|
|
/* release thread group */
|
|
thread__put(leader);
|
|
TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 3);
|
|
|
|
thread__put(t1);
|
|
TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 2);
|
|
|
|
thread__put(t2);
|
|
TEST_ASSERT_EQUAL("wrong refcnt", mg->refcnt, 1);
|
|
|
|
thread__put(t3);
|
|
|
|
/* release other group */
|
|
thread__put(other_leader);
|
|
TEST_ASSERT_EQUAL("wrong refcnt", other_mg->refcnt, 1);
|
|
|
|
thread__put(other);
|
|
|
|
machines__exit(&machines);
|
|
return 0;
|
|
}
|