Commit ead05e8f authored by Elena Reshetova's avatar Elena Reshetova Committed by Arnaldo Carvalho de Melo

perf map: Convert map_groups.refcnt from atomic_t to refcount_t

The refcount_t type and corresponding API should be used instead of
atomic_t when the variable is used as a reference counter.

This allows to avoid accidental refcounter overflows that might lead to
use-after-free situations.
Signed-off-by: default avatarElena Reshetova <elena.reshetova@intel.com>
Signed-off-by: default avatarDavid Windsor <dwindsor@gmail.com>
Signed-off-by: default avatarHans Liljestrand <ishkamiel@gmail.com>
Signed-off-by: default avatarKees Kook <keescook@chromium.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: David Windsor <dwindsor@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Hans Liljestrand <ishkamiel@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kees Kook <keescook@chromium.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Matija Glavinic Pecotic <matija.glavinic-pecotic.ext@nokia.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: alsa-devel@alsa-project.org
Link: http://lkml.kernel.org/r/1487691303-31858-7-git-send-email-elena.reshetova@intel.com
[ Did the missing conversion of tests/thread-mg-share.c too ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e3a42cdd
...@@ -43,7 +43,7 @@ int test__thread_mg_share(int subtest __maybe_unused) ...@@ -43,7 +43,7 @@ int test__thread_mg_share(int subtest __maybe_unused)
leader && t1 && t2 && t3 && other); leader && t1 && t2 && t3 && other);
mg = leader->mg; mg = leader->mg;
TEST_ASSERT_EQUAL("wrong refcnt", atomic_read(&mg->refcnt), 4); TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&mg->refcnt), 4);
/* test the map groups pointer is shared */ /* 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 == t1->mg);
...@@ -71,25 +71,25 @@ int test__thread_mg_share(int subtest __maybe_unused) ...@@ -71,25 +71,25 @@ int test__thread_mg_share(int subtest __maybe_unused)
machine__remove_thread(machine, other_leader); machine__remove_thread(machine, other_leader);
other_mg = other->mg; other_mg = other->mg;
TEST_ASSERT_EQUAL("wrong refcnt", atomic_read(&other_mg->refcnt), 2); TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&other_mg->refcnt), 2);
TEST_ASSERT_VAL("map groups don't match", other_mg == other_leader->mg); TEST_ASSERT_VAL("map groups don't match", other_mg == other_leader->mg);
/* release thread group */ /* release thread group */
thread__put(leader); thread__put(leader);
TEST_ASSERT_EQUAL("wrong refcnt", atomic_read(&mg->refcnt), 3); TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&mg->refcnt), 3);
thread__put(t1); thread__put(t1);
TEST_ASSERT_EQUAL("wrong refcnt", atomic_read(&mg->refcnt), 2); TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&mg->refcnt), 2);
thread__put(t2); thread__put(t2);
TEST_ASSERT_EQUAL("wrong refcnt", atomic_read(&mg->refcnt), 1); TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&mg->refcnt), 1);
thread__put(t3); thread__put(t3);
/* release other group */ /* release other group */
thread__put(other_leader); thread__put(other_leader);
TEST_ASSERT_EQUAL("wrong refcnt", atomic_read(&other_mg->refcnt), 1); TEST_ASSERT_EQUAL("wrong refcnt", refcount_read(&other_mg->refcnt), 1);
thread__put(other); thread__put(other);
......
...@@ -485,7 +485,7 @@ void map_groups__init(struct map_groups *mg, struct machine *machine) ...@@ -485,7 +485,7 @@ void map_groups__init(struct map_groups *mg, struct machine *machine)
maps__init(&mg->maps[i]); maps__init(&mg->maps[i]);
} }
mg->machine = machine; mg->machine = machine;
atomic_set(&mg->refcnt, 1); refcount_set(&mg->refcnt, 1);
} }
static void __maps__purge(struct maps *maps) static void __maps__purge(struct maps *maps)
...@@ -547,7 +547,7 @@ void map_groups__delete(struct map_groups *mg) ...@@ -547,7 +547,7 @@ void map_groups__delete(struct map_groups *mg)
void map_groups__put(struct map_groups *mg) void map_groups__put(struct map_groups *mg)
{ {
if (mg && atomic_dec_and_test(&mg->refcnt)) if (mg && refcount_dec_and_test(&mg->refcnt))
map_groups__delete(mg); map_groups__delete(mg);
} }
......
...@@ -67,7 +67,7 @@ struct maps { ...@@ -67,7 +67,7 @@ struct maps {
struct map_groups { struct map_groups {
struct maps maps[MAP__NR_TYPES]; struct maps maps[MAP__NR_TYPES];
struct machine *machine; struct machine *machine;
atomic_t refcnt; refcount_t refcnt;
}; };
struct map_groups *map_groups__new(struct machine *machine); struct map_groups *map_groups__new(struct machine *machine);
...@@ -77,7 +77,7 @@ bool map_groups__empty(struct map_groups *mg); ...@@ -77,7 +77,7 @@ bool map_groups__empty(struct map_groups *mg);
static inline struct map_groups *map_groups__get(struct map_groups *mg) static inline struct map_groups *map_groups__get(struct map_groups *mg)
{ {
if (mg) if (mg)
atomic_inc(&mg->refcnt); refcount_inc(&mg->refcnt);
return mg; return mg;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment