mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qht: drop ht argument from qht iterators

Browse Source 
Accessing the HT from an iterator results almost always
in a deadlock. Given that only one qht-internal function
uses this argument, drop it from the interface.

Suggested-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Emilio G. Cota <cota@braap.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Emilio G. Cota 2018-09-10 13:06:12 -04:00 committed by Richard Henderson
parent ca8897a44c
commit 78255ba2cc
5 changed files with 31 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
accel/tcg/translate-all.c
View File

@ -1282,8 +1282,7 @@ void tb_flush(CPUState *cpu)
*/ */
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
static void static void do_tb_invalidate_check(void *p, uint32_t hash, void *userp)
do_tb_invalidate_check(struct qht *ht, void *p, uint32_t hash, void *userp)
{ {
TranslationBlock *tb = p; TranslationBlock *tb = p;
target_ulong addr = *(target_ulong *)userp; target_ulong addr = *(target_ulong *)userp;
@ -1304,8 +1303,7 @@ static void tb_invalidate_check(target_ulong address)
qht_iter(&tb_ctx.htable, do_tb_invalidate_check, &address); qht_iter(&tb_ctx.htable, do_tb_invalidate_check, &address);
} }
static void static void do_tb_page_check(void *p, uint32_t hash, void *userp)
do_tb_page_check(struct qht *ht, void *p, uint32_t hash, void *userp)
{ {
TranslationBlock *tb = p; TranslationBlock *tb = p;
int flags1, flags2; int flags1, flags2;

5
include/qemu/qht.h
View File

@ -43,9 +43,8 @@ struct qht_stats {
}; };
typedef bool (*qht_lookup_func_t)(const void *obj, const void *userp); typedef bool (*qht_lookup_func_t)(const void *obj, const void *userp);
typedef void (*qht_iter_func_t)(struct qht *ht, void *p, uint32_t h, void *up); typedef void (*qht_iter_func_t)(void *p, uint32_t h, void *up);
typedef bool (*qht_iter_bool_func_t)(struct qht *ht, void *p, uint32_t h, typedef bool (*qht_iter_bool_func_t)(void *p, uint32_t h, void *up);
void *up);
#define QHT_MODE_AUTO_RESIZE 0x1 /* auto-resize when heavily loaded */ #define QHT_MODE_AUTO_RESIZE 0x1 /* auto-resize when heavily loaded */
#define QHT_MODE_RAW_MUTEXES 0x2 /* bypass the profiler (QSP) */ #define QHT_MODE_RAW_MUTEXES 0x2 /* bypass the profiler (QSP) */

6
tests/test-qht.c
View File

@ -98,7 +98,7 @@ static void check(int a, int b, bool expected)
qht_statistics_destroy(&stats); qht_statistics_destroy(&stats);
} }
static void count_func(struct qht *ht, void *p, uint32_t hash, void *userp) static void count_func(void *p, uint32_t hash, void *userp)
{ {
unsigned int *curr = userp; unsigned int *curr = userp;
@ -122,7 +122,7 @@ static void iter_check(unsigned int count)
g_assert_cmpuint(curr, ==, count); g_assert_cmpuint(curr, ==, count);
} }
static void sum_func(struct qht *ht, void *p, uint32_t hash, void *userp) static void sum_func(void *p, uint32_t hash, void *userp)
{ {
uint32_t *sum = userp; uint32_t *sum = userp;
uint32_t a = *(uint32_t *)p; uint32_t a = *(uint32_t *)p;
@ -138,7 +138,7 @@ static void iter_sum_check(unsigned int expected)
g_assert_cmpuint(sum, ==, expected); g_assert_cmpuint(sum, ==, expected);
} }
static bool rm_mod_func(struct qht *ht, void *p, uint32_t hash, void *userp) static bool rm_mod_func(void *p, uint32_t hash, void *userp)
{ {
uint32_t a = *(uint32_t *)p; uint32_t a = *(uint32_t *)p;
unsigned int mod = *(unsigned int *)userp; unsigned int mod = *(unsigned int *)userp;

29
util/qht.c
View File

@ -746,7 +746,7 @@ bool qht_remove(struct qht *ht, const void *p, uint32_t hash)
return ret; return ret;
} }
static inline void qht_bucket_iter(struct qht *ht, struct qht_bucket *head, static inline void qht_bucket_iter(struct qht_bucket *head,
const struct qht_iter *iter, void *userp) const struct qht_iter *iter, void *userp)
{ {
struct qht_bucket *b = head; struct qht_bucket *b = head;
@ -759,10 +759,10 @@ static inline void qht_bucket_iter(struct qht *ht, struct qht_bucket *head,
} }
switch (iter->type) { switch (iter->type) {
case QHT_ITER_VOID: case QHT_ITER_VOID:
iter->f.retvoid(ht, b->pointers[i], b->hashes[i], userp); iter->f.retvoid(b->pointers[i], b->hashes[i], userp);
break; break;
case QHT_ITER_RM: case QHT_ITER_RM:
if (iter->f.retbool(ht, b->pointers[i], b->hashes[i], userp)) { if (iter->f.retbool(b->pointers[i], b->hashes[i], userp)) {
/* replace i with the last valid element in the bucket */ /* replace i with the last valid element in the bucket */
seqlock_write_begin(&head->sequence); seqlock_write_begin(&head->sequence);
qht_bucket_remove_entry(b, i); qht_bucket_remove_entry(b, i);
@ -782,14 +782,14 @@ static inline void qht_bucket_iter(struct qht *ht, struct qht_bucket *head,
} }
/* call with all of the map's locks held */ /* call with all of the map's locks held */
static inline void qht_map_iter__all_locked(struct qht *ht, struct qht_map *map, static inline void qht_map_iter__all_locked(struct qht_map *map,
const struct qht_iter *iter, const struct qht_iter *iter,
void *userp) void *userp)
{ {
size_t i; size_t i;
for (i = 0; i < map->n_buckets; i++) { for (i = 0; i < map->n_buckets; i++) {
qht_bucket_iter(ht, &map->buckets[i], iter, userp); qht_bucket_iter(&map->buckets[i], iter, userp);
} }
} }
@ -800,8 +800,7 @@ do_qht_iter(struct qht *ht, const struct qht_iter *iter, void *userp)
map = atomic_rcu_read(&ht->map); map = atomic_rcu_read(&ht->map);
qht_map_lock_buckets(map); qht_map_lock_buckets(map);
/* Note: ht here is merely for carrying ht->mode; ht->map won't be read */ qht_map_iter__all_locked(map, iter, userp);
qht_map_iter__all_locked(ht, map, iter, userp);
qht_map_unlock_buckets(map); qht_map_unlock_buckets(map);
} }
@ -825,9 +824,16 @@ void qht_iter_remove(struct qht *ht, qht_iter_bool_func_t func, void *userp)
do_qht_iter(ht, &iter, userp); do_qht_iter(ht, &iter, userp);
} }
static void qht_map_copy(struct qht *ht, void *p, uint32_t hash, void *userp) struct qht_map_copy_data {
struct qht *ht;
struct qht_map *new;
};
static void qht_map_copy(void *p, uint32_t hash, void *userp)
{ {
struct qht_map *new = userp; struct qht_map_copy_data *data = userp;
struct qht *ht = data->ht;
struct qht_map *new = data->new;
struct qht_bucket *b = qht_map_to_bucket(new, hash); struct qht_bucket *b = qht_map_to_bucket(new, hash);
/* no need to acquire b->lock because no thread has seen this map yet */ /* no need to acquire b->lock because no thread has seen this map yet */
@ -845,6 +851,7 @@ static void qht_do_resize_reset(struct qht *ht, struct qht_map *new, bool reset)
.f.retvoid = qht_map_copy, .f.retvoid = qht_map_copy,
.type = QHT_ITER_VOID, .type = QHT_ITER_VOID,
}; };
struct qht_map_copy_data data;
old = ht->map; old = ht->map;
qht_map_lock_buckets(old); qht_map_lock_buckets(old);
@ -859,7 +866,9 @@ static void qht_do_resize_reset(struct qht *ht, struct qht_map *new, bool reset)
} }
g_assert(new->n_buckets != old->n_buckets); g_assert(new->n_buckets != old->n_buckets);
qht_map_iter__all_locked(ht, old, &iter, new); data.ht = ht;
data.new = new;
qht_map_iter__all_locked(old, &iter, &data);
qht_map_debug__all_locked(new); qht_map_debug__all_locked(new);
atomic_rcu_set(&ht->map, new); atomic_rcu_set(&ht->map, new);

11
util/qsp.c
View File

@ -533,7 +533,7 @@ static gint qsp_tree_cmp(gconstpointer ap, gconstpointer bp, gpointer up)
} }
} }
static void qsp_sort(struct qht *ht, void *p, uint32_t h, void *userp) static void qsp_sort(void *p, uint32_t h, void *userp)
{ {
QSPEntry *e = p; QSPEntry *e = p;
GTree *tree = userp; GTree *tree = userp;
@ -541,7 +541,7 @@ static void qsp_sort(struct qht *ht, void *p, uint32_t h, void *userp)
g_tree_insert(tree, e, NULL); g_tree_insert(tree, e, NULL);
} }
static void qsp_aggregate(struct qht *global_ht, void *p, uint32_t h, void *up) static void qsp_aggregate(void *p, uint32_t h, void *up)
{ {
struct qht *ht = up; struct qht *ht = up;
const QSPEntry *e = p; const QSPEntry *e = p;
@ -553,7 +553,7 @@ static void qsp_aggregate(struct qht *global_ht, void *p, uint32_t h, void *up)
qsp_entry_aggregate(agg, e); qsp_entry_aggregate(agg, e);
} }
static void qsp_iter_diff(struct qht *orig, void *p, uint32_t hash, void *htp) static void qsp_iter_diff(void *p, uint32_t hash, void *htp)
{ {
struct qht *ht = htp; struct qht *ht = htp;
QSPEntry *old = p; QSPEntry *old = p;
@ -583,8 +583,7 @@ static void qsp_diff(struct qht *orig, struct qht *new)
qht_iter(orig, qsp_iter_diff, new); qht_iter(orig, qsp_iter_diff, new);
} }
static void static void qsp_iter_callsite_coalesce(void *p, uint32_t h, void *htp)
qsp_iter_callsite_coalesce(struct qht *orig, void *p, uint32_t h, void *htp)
{ {
struct qht *ht = htp; struct qht *ht = htp;
QSPEntry *old = p; QSPEntry *old = p;
@ -603,7 +602,7 @@ qsp_iter_callsite_coalesce(struct qht *orig, void *p, uint32_t h, void *htp)
e->n_acqs += old->n_acqs; e->n_acqs += old->n_acqs;
} }
static void qsp_ht_delete(struct qht *ht, void *p, uint32_t h, void *htp) static void qsp_ht_delete(void *p, uint32_t h, void *htp)
{ {
g_free(p); g_free(p);
} }