2019-06-04 11:11:33 +03:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-only
|
2014-08-02 13:47:44 +04:00
|
|
|
/*
|
|
|
|
* Resizable, Scalable, Concurrent Hash Table
|
|
|
|
*
|
2015-03-20 13:57:00 +03:00
|
|
|
* Copyright (c) 2015 Herbert Xu <herbert@gondor.apana.org.au>
|
2015-02-05 04:03:32 +03:00
|
|
|
* Copyright (c) 2014-2015 Thomas Graf <tgraf@suug.ch>
|
2014-08-02 13:47:44 +04:00
|
|
|
* Copyright (c) 2008-2014 Patrick McHardy <kaber@trash.net>
|
|
|
|
*
|
|
|
|
* Code partially derived from nft_hash
|
2015-03-20 13:57:00 +03:00
|
|
|
* Rewritten with rehash code from br_multicast plus single list
|
|
|
|
* pointer as suggested by Josh Triplett
|
2014-08-02 13:47:44 +04:00
|
|
|
*/
|
|
|
|
|
2015-05-15 06:30:47 +03:00
|
|
|
#include <linux/atomic.h>
|
2014-08-02 13:47:44 +04:00
|
|
|
#include <linux/kernel.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/log2.h>
|
2015-02-26 18:20:34 +03:00
|
|
|
#include <linux/sched.h>
|
2017-02-04 03:27:20 +03:00
|
|
|
#include <linux/rculist.h>
|
2014-08-02 13:47:44 +04:00
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/vmalloc.h>
|
|
|
|
#include <linux/mm.h>
|
2014-12-10 18:33:11 +03:00
|
|
|
#include <linux/jhash.h>
|
2014-08-02 13:47:44 +04:00
|
|
|
#include <linux/random.h>
|
|
|
|
#include <linux/rhashtable.h>
|
2015-02-09 06:04:03 +03:00
|
|
|
#include <linux/err.h>
|
2015-06-06 23:07:23 +03:00
|
|
|
#include <linux/export.h>
|
2014-08-02 13:47:44 +04:00
|
|
|
|
|
|
|
#define HASH_DEFAULT_SIZE 64UL
|
2015-03-18 12:01:16 +03:00
|
|
|
#define HASH_MIN_SIZE 4U
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
union nested_table {
|
|
|
|
union nested_table __rcu *table;
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head *bucket;
|
2017-02-11 14:26:47 +03:00
|
|
|
};
|
|
|
|
|
2015-03-10 01:27:55 +03:00
|
|
|
static u32 head_hashfn(struct rhashtable *ht,
|
2015-01-03 01:00:14 +03:00
|
|
|
const struct bucket_table *tbl,
|
|
|
|
const struct rhash_head *he)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
2015-03-20 13:57:00 +03:00
|
|
|
return rht_head_hashfn(ht, tbl, he, ht->p);
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
|
|
|
|
2015-02-05 04:03:34 +03:00
|
|
|
#ifdef CONFIG_PROVE_LOCKING
|
|
|
|
#define ASSERT_RHT_MUTEX(HT) BUG_ON(!lockdep_rht_mutex_is_held(HT))
|
|
|
|
|
|
|
|
int lockdep_rht_mutex_is_held(struct rhashtable *ht)
|
|
|
|
{
|
|
|
|
return (debug_locks) ? lockdep_is_held(&ht->mutex) : 1;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(lockdep_rht_mutex_is_held);
|
|
|
|
|
|
|
|
int lockdep_rht_bucket_is_held(const struct bucket_table *tbl, u32 hash)
|
|
|
|
{
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
if (!debug_locks)
|
|
|
|
return 1;
|
|
|
|
if (unlikely(tbl->nest))
|
|
|
|
return 1;
|
rhashtable: use BIT(0) for locking.
As reported by Guenter Roeck, the new bit-locking using
BIT(1) doesn't work on the m68k architecture. m68k only requires
2-byte alignment for words and longwords, so there is only one
unused bit in pointers to structs - We current use two, one for the
NULLS marker at the end of the linked list, and one for the bit-lock
in the head of the list.
The two uses don't need to conflict as we never need the head of the
list to be a NULLS marker - the marker is only needed to check if an
object has moved to a different table, and the bucket head cannot
move. The NULLS marker is only needed in a ->next pointer.
As we already have different types for the bucket head pointer (struct
rhash_lock_head) and the ->next pointers (struct rhash_head), it is
fairly easy to treat the lsb differently in each.
So: Initialize buckets heads to NULL, and use the lsb for locking.
When loading the pointer from the bucket head, if it is NULL (ignoring
the lock big), report as being the expected NULLS marker.
When storing a value into a bucket head, if it is a NULLS marker,
store NULL instead.
And convert all places that used bit 1 for locking, to use bit 0.
Fixes: 8f0db018006a ("rhashtable: use bit_spin_locks to protect hash bucket.")
Reported-by: Guenter Roeck <linux@roeck-us.net>
Tested-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-12 04:52:08 +03:00
|
|
|
return bit_spin_is_locked(0, (unsigned long *)&tbl->buckets[hash]);
|
2015-02-05 04:03:34 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(lockdep_rht_bucket_is_held);
|
|
|
|
#else
|
|
|
|
#define ASSERT_RHT_MUTEX(HT)
|
|
|
|
#endif
|
|
|
|
|
2020-06-03 11:12:43 +03:00
|
|
|
static inline union nested_table *nested_table_top(
|
|
|
|
const struct bucket_table *tbl)
|
|
|
|
{
|
|
|
|
/* The top-level bucket entry does not need RCU protection
|
|
|
|
* because it's set at the same time as tbl->nest.
|
|
|
|
*/
|
|
|
|
return (void *)rcu_dereference_protected(tbl->buckets[0], 1);
|
|
|
|
}
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
static void nested_table_free(union nested_table *ntbl, unsigned int size)
|
|
|
|
{
|
|
|
|
const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *));
|
|
|
|
const unsigned int len = 1 << shift;
|
|
|
|
unsigned int i;
|
|
|
|
|
2020-06-03 11:12:43 +03:00
|
|
|
ntbl = rcu_dereference_protected(ntbl->table, 1);
|
2017-02-11 14:26:47 +03:00
|
|
|
if (!ntbl)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (size > len) {
|
|
|
|
size >>= shift;
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
nested_table_free(ntbl + i, size);
|
|
|
|
}
|
|
|
|
|
|
|
|
kfree(ntbl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void nested_bucket_table_free(const struct bucket_table *tbl)
|
|
|
|
{
|
|
|
|
unsigned int size = tbl->size >> tbl->nest;
|
|
|
|
unsigned int len = 1 << tbl->nest;
|
|
|
|
union nested_table *ntbl;
|
|
|
|
unsigned int i;
|
|
|
|
|
2020-06-03 11:12:43 +03:00
|
|
|
ntbl = nested_table_top(tbl);
|
2017-02-11 14:26:47 +03:00
|
|
|
|
|
|
|
for (i = 0; i < len; i++)
|
|
|
|
nested_table_free(ntbl + i, size);
|
|
|
|
|
|
|
|
kfree(ntbl);
|
|
|
|
}
|
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
static void bucket_table_free(const struct bucket_table *tbl)
|
|
|
|
{
|
2017-02-11 14:26:47 +03:00
|
|
|
if (tbl->nest)
|
|
|
|
nested_bucket_table_free(tbl);
|
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
kvfree(tbl);
|
|
|
|
}
|
|
|
|
|
2015-03-14 05:57:23 +03:00
|
|
|
static void bucket_table_free_rcu(struct rcu_head *head)
|
|
|
|
{
|
|
|
|
bucket_table_free(container_of(head, struct bucket_table, rcu));
|
|
|
|
}
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
static union nested_table *nested_table_alloc(struct rhashtable *ht,
|
|
|
|
union nested_table __rcu **prev,
|
2018-06-18 05:52:50 +03:00
|
|
|
bool leaf)
|
2017-02-11 14:26:47 +03:00
|
|
|
{
|
|
|
|
union nested_table *ntbl;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
ntbl = rcu_dereference(*prev);
|
|
|
|
if (ntbl)
|
|
|
|
return ntbl;
|
|
|
|
|
|
|
|
ntbl = kzalloc(PAGE_SIZE, GFP_ATOMIC);
|
|
|
|
|
2018-06-18 05:52:50 +03:00
|
|
|
if (ntbl && leaf) {
|
|
|
|
for (i = 0; i < PAGE_SIZE / sizeof(ntbl[0]); i++)
|
2018-06-18 05:52:50 +03:00
|
|
|
INIT_RHT_NULLS_HEAD(ntbl[i].bucket);
|
2017-02-11 14:26:47 +03:00
|
|
|
}
|
|
|
|
|
2019-05-16 10:19:48 +03:00
|
|
|
if (cmpxchg((union nested_table **)prev, NULL, ntbl) == NULL)
|
2019-04-02 02:07:45 +03:00
|
|
|
return ntbl;
|
|
|
|
/* Raced with another thread. */
|
|
|
|
kfree(ntbl);
|
|
|
|
return rcu_dereference(*prev);
|
2017-02-11 14:26:47 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static struct bucket_table *nested_bucket_table_alloc(struct rhashtable *ht,
|
|
|
|
size_t nbuckets,
|
|
|
|
gfp_t gfp)
|
|
|
|
{
|
|
|
|
const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *));
|
|
|
|
struct bucket_table *tbl;
|
|
|
|
size_t size;
|
|
|
|
|
|
|
|
if (nbuckets < (1 << (shift + 1)))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
size = sizeof(*tbl) + sizeof(tbl->buckets[0]);
|
|
|
|
|
|
|
|
tbl = kzalloc(size, gfp);
|
|
|
|
if (!tbl)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!nested_table_alloc(ht, (union nested_table __rcu **)tbl->buckets,
|
2018-06-18 05:52:50 +03:00
|
|
|
false)) {
|
2017-02-11 14:26:47 +03:00
|
|
|
kfree(tbl);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
tbl->nest = (ilog2(nbuckets) - 1) % shift + 1;
|
|
|
|
|
|
|
|
return tbl;
|
|
|
|
}
|
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
|
2015-03-23 16:50:27 +03:00
|
|
|
size_t nbuckets,
|
|
|
|
gfp_t gfp)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
2015-02-20 02:53:38 +03:00
|
|
|
struct bucket_table *tbl = NULL;
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
size_t size;
|
2015-01-03 01:00:21 +03:00
|
|
|
int i;
|
2019-04-02 02:07:45 +03:00
|
|
|
static struct lock_class_key __key;
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2019-04-12 02:43:06 +03:00
|
|
|
tbl = kvzalloc(struct_size(tbl, buckets, nbuckets), gfp);
|
2017-02-11 14:26:47 +03:00
|
|
|
|
|
|
|
size = nbuckets;
|
|
|
|
|
2018-08-22 08:01:48 +03:00
|
|
|
if (tbl == NULL && (gfp & ~__GFP_NOFAIL) != GFP_KERNEL) {
|
2017-02-11 14:26:47 +03:00
|
|
|
tbl = nested_bucket_table_alloc(ht, nbuckets, gfp);
|
|
|
|
nbuckets = 0;
|
|
|
|
}
|
2018-08-22 08:01:48 +03:00
|
|
|
|
2014-08-02 13:47:44 +04:00
|
|
|
if (tbl == NULL)
|
|
|
|
return NULL;
|
|
|
|
|
2019-04-02 02:07:45 +03:00
|
|
|
lockdep_init_map(&tbl->dep_map, "rhashtable_bucket", &__key, 0);
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
tbl->size = size;
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2019-03-21 06:42:40 +03:00
|
|
|
rcu_head_init(&tbl->rcu);
|
2015-03-14 05:57:20 +03:00
|
|
|
INIT_LIST_HEAD(&tbl->walkers);
|
|
|
|
|
2017-06-08 05:47:13 +03:00
|
|
|
tbl->hash_rnd = get_random_u32();
|
2015-03-14 05:57:22 +03:00
|
|
|
|
2015-01-03 01:00:21 +03:00
|
|
|
for (i = 0; i < nbuckets; i++)
|
2018-06-18 05:52:50 +03:00
|
|
|
INIT_RHT_NULLS_HEAD(tbl->buckets[i]);
|
2015-01-03 01:00:21 +03:00
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
return tbl;
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
|
|
|
|
2015-03-23 16:50:26 +03:00
|
|
|
static struct bucket_table *rhashtable_last_table(struct rhashtable *ht,
|
|
|
|
struct bucket_table *tbl)
|
|
|
|
{
|
|
|
|
struct bucket_table *new_tbl;
|
|
|
|
|
|
|
|
do {
|
|
|
|
new_tbl = tbl;
|
|
|
|
tbl = rht_dereference_rcu(tbl->future_tbl, ht);
|
|
|
|
} while (tbl);
|
|
|
|
|
|
|
|
return new_tbl;
|
|
|
|
}
|
|
|
|
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
static int rhashtable_rehash_one(struct rhashtable *ht,
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **bkt,
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
unsigned int old_hash)
|
2015-02-05 04:03:32 +03:00
|
|
|
{
|
2015-03-11 01:43:48 +03:00
|
|
|
struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht);
|
2018-06-18 05:52:50 +03:00
|
|
|
struct bucket_table *new_tbl = rhashtable_last_table(ht, old_tbl);
|
2017-02-11 14:26:47 +03:00
|
|
|
int err = -EAGAIN;
|
2015-03-11 01:43:48 +03:00
|
|
|
struct rhash_head *head, *next, *entry;
|
2019-04-12 04:52:07 +03:00
|
|
|
struct rhash_head __rcu **pprev = NULL;
|
2015-03-24 16:18:17 +03:00
|
|
|
unsigned int new_hash;
|
2015-03-11 01:43:48 +03:00
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
if (new_tbl->nest)
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
err = -ENOENT;
|
|
|
|
|
2019-04-12 04:52:08 +03:00
|
|
|
rht_for_each_from(entry, rht_ptr(bkt, old_tbl, old_hash),
|
|
|
|
old_tbl, old_hash) {
|
2015-03-11 01:43:48 +03:00
|
|
|
err = 0;
|
|
|
|
next = rht_dereference_bucket(entry->next, old_tbl, old_hash);
|
|
|
|
|
|
|
|
if (rht_is_a_nulls(next))
|
|
|
|
break;
|
2015-02-05 04:03:32 +03:00
|
|
|
|
2015-03-11 01:43:48 +03:00
|
|
|
pprev = &entry->next;
|
|
|
|
}
|
2015-02-05 04:03:32 +03:00
|
|
|
|
2015-03-11 01:43:48 +03:00
|
|
|
if (err)
|
|
|
|
goto out;
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2015-03-11 01:43:48 +03:00
|
|
|
new_hash = head_hashfn(ht, new_tbl, entry);
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2019-04-02 02:07:45 +03:00
|
|
|
rht_lock_nested(new_tbl, &new_tbl->buckets[new_hash], SINGLE_DEPTH_NESTING);
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2019-04-12 04:52:08 +03:00
|
|
|
head = rht_ptr(new_tbl->buckets + new_hash, new_tbl, new_hash);
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2015-09-22 11:51:52 +03:00
|
|
|
RCU_INIT_POINTER(entry->next, head);
|
2015-02-05 04:03:32 +03:00
|
|
|
|
2019-04-02 02:07:45 +03:00
|
|
|
rht_assign_unlock(new_tbl, &new_tbl->buckets[new_hash], entry);
|
2015-01-03 01:00:20 +03:00
|
|
|
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
if (pprev)
|
|
|
|
rcu_assign_pointer(*pprev, next);
|
|
|
|
else
|
|
|
|
/* Need to preserved the bit lock. */
|
2019-04-12 04:52:08 +03:00
|
|
|
rht_assign_locked(bkt, next);
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2015-03-11 01:43:48 +03:00
|
|
|
out:
|
|
|
|
return err;
|
|
|
|
}
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
static int rhashtable_rehash_chain(struct rhashtable *ht,
|
2015-03-24 16:18:17 +03:00
|
|
|
unsigned int old_hash)
|
2015-03-11 01:43:48 +03:00
|
|
|
{
|
|
|
|
struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht);
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **bkt = rht_bucket_var(old_tbl, old_hash);
|
2017-02-11 14:26:47 +03:00
|
|
|
int err;
|
2015-03-11 01:43:48 +03:00
|
|
|
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
if (!bkt)
|
|
|
|
return 0;
|
2019-04-02 02:07:45 +03:00
|
|
|
rht_lock(old_tbl, bkt);
|
2015-02-05 04:03:32 +03:00
|
|
|
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
while (!(err = rhashtable_rehash_one(ht, bkt, old_hash)))
|
2015-03-11 01:43:48 +03:00
|
|
|
;
|
2017-02-11 14:26:47 +03:00
|
|
|
|
2019-03-21 06:42:40 +03:00
|
|
|
if (err == -ENOENT)
|
2017-02-11 14:26:47 +03:00
|
|
|
err = 0;
|
2019-04-02 02:07:45 +03:00
|
|
|
rht_unlock(old_tbl, bkt);
|
2017-02-11 14:26:47 +03:00
|
|
|
|
|
|
|
return err;
|
2015-01-03 01:00:20 +03:00
|
|
|
}
|
|
|
|
|
2015-03-23 16:50:26 +03:00
|
|
|
static int rhashtable_rehash_attach(struct rhashtable *ht,
|
|
|
|
struct bucket_table *old_tbl,
|
|
|
|
struct bucket_table *new_tbl)
|
2015-01-03 01:00:20 +03:00
|
|
|
{
|
2015-03-11 01:43:48 +03:00
|
|
|
/* Make insertions go into the new, empty table right away. Deletions
|
|
|
|
* and lookups will be attempted in both tables until we synchronize.
|
2018-06-18 05:52:50 +03:00
|
|
|
* As cmpxchg() provides strong barriers, we do not need
|
|
|
|
* rcu_assign_pointer().
|
2015-03-11 01:43:48 +03:00
|
|
|
*/
|
|
|
|
|
2019-05-16 10:19:48 +03:00
|
|
|
if (cmpxchg((struct bucket_table **)&old_tbl->future_tbl, NULL,
|
|
|
|
new_tbl) != NULL)
|
2018-06-18 05:52:50 +03:00
|
|
|
return -EEXIST;
|
2015-03-23 16:50:26 +03:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int rhashtable_rehash_table(struct rhashtable *ht)
|
|
|
|
{
|
|
|
|
struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht);
|
|
|
|
struct bucket_table *new_tbl;
|
|
|
|
struct rhashtable_walker *walker;
|
2015-03-24 16:18:17 +03:00
|
|
|
unsigned int old_hash;
|
2017-02-11 14:26:47 +03:00
|
|
|
int err;
|
2015-03-23 16:50:26 +03:00
|
|
|
|
|
|
|
new_tbl = rht_dereference(old_tbl->future_tbl, ht);
|
|
|
|
if (!new_tbl)
|
|
|
|
return 0;
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
for (old_hash = 0; old_hash < old_tbl->size; old_hash++) {
|
|
|
|
err = rhashtable_rehash_chain(ht, old_hash);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2018-03-31 22:58:48 +03:00
|
|
|
cond_resched();
|
2017-02-11 14:26:47 +03:00
|
|
|
}
|
2015-03-11 01:43:48 +03:00
|
|
|
|
|
|
|
/* Publish the new table pointer. */
|
|
|
|
rcu_assign_pointer(ht->tbl, new_tbl);
|
|
|
|
|
2015-03-24 01:53:17 +03:00
|
|
|
spin_lock(&ht->lock);
|
2015-03-14 05:57:20 +03:00
|
|
|
list_for_each_entry(walker, &old_tbl->walkers, list)
|
|
|
|
walker->tbl = NULL;
|
|
|
|
|
2015-03-11 01:43:48 +03:00
|
|
|
/* Wait for readers. All new readers will see the new
|
|
|
|
* table, and thus no references to the old table will
|
|
|
|
* remain.
|
2019-03-21 06:42:40 +03:00
|
|
|
* We do this inside the locked region so that
|
|
|
|
* rhashtable_walk_stop() can use rcu_head_after_call_rcu()
|
|
|
|
* to check if it should not re-link the table.
|
2015-03-11 01:43:48 +03:00
|
|
|
*/
|
2015-03-14 05:57:23 +03:00
|
|
|
call_rcu(&old_tbl->rcu, bucket_table_free_rcu);
|
2019-03-21 06:42:40 +03:00
|
|
|
spin_unlock(&ht->lock);
|
2015-03-23 16:50:26 +03:00
|
|
|
|
|
|
|
return rht_dereference(new_tbl->future_tbl, ht) ? -EAGAIN : 0;
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
static int rhashtable_rehash_alloc(struct rhashtable *ht,
|
|
|
|
struct bucket_table *old_tbl,
|
|
|
|
unsigned int size)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
2017-02-11 14:26:47 +03:00
|
|
|
struct bucket_table *new_tbl;
|
2015-03-23 16:50:26 +03:00
|
|
|
int err;
|
2014-08-02 13:47:44 +04:00
|
|
|
|
|
|
|
ASSERT_RHT_MUTEX(ht);
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
new_tbl = bucket_table_alloc(ht, size, GFP_KERNEL);
|
2014-08-02 13:47:44 +04:00
|
|
|
if (new_tbl == NULL)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
2015-03-23 16:50:26 +03:00
|
|
|
err = rhashtable_rehash_attach(ht, old_tbl, new_tbl);
|
|
|
|
if (err)
|
|
|
|
bucket_table_free(new_tbl);
|
|
|
|
|
|
|
|
return err;
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* rhashtable_shrink - Shrink hash table while allowing concurrent lookups
|
|
|
|
* @ht: the hash table to shrink
|
|
|
|
*
|
2015-03-23 16:50:25 +03:00
|
|
|
* This function shrinks the hash table to fit, i.e., the smallest
|
|
|
|
* size would not cause it to expand right away automatically.
|
2014-08-02 13:47:44 +04:00
|
|
|
*
|
2015-01-03 01:00:20 +03:00
|
|
|
* The caller must ensure that no concurrent resizing occurs by holding
|
|
|
|
* ht->mutex.
|
|
|
|
*
|
2014-08-02 13:47:44 +04:00
|
|
|
* The caller must ensure that no concurrent table mutations take place.
|
|
|
|
* It is however valid to have concurrent lookups if they are RCU protected.
|
2015-01-03 01:00:20 +03:00
|
|
|
*
|
|
|
|
* It is valid to have concurrent insertions and deletions protected by per
|
|
|
|
* bucket locks or concurrent RCU protected lookups and traversals.
|
2014-08-02 13:47:44 +04:00
|
|
|
*/
|
2015-03-23 16:50:26 +03:00
|
|
|
static int rhashtable_shrink(struct rhashtable *ht)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
2017-02-11 14:26:47 +03:00
|
|
|
struct bucket_table *old_tbl = rht_dereference(ht->tbl, ht);
|
2016-08-12 21:10:44 +03:00
|
|
|
unsigned int nelems = atomic_read(&ht->nelems);
|
|
|
|
unsigned int size = 0;
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2016-08-12 21:10:44 +03:00
|
|
|
if (nelems)
|
|
|
|
size = roundup_pow_of_two(nelems * 3 / 2);
|
2015-03-23 16:50:25 +03:00
|
|
|
if (size < ht->p.min_size)
|
|
|
|
size = ht->p.min_size;
|
|
|
|
|
|
|
|
if (old_tbl->size <= size)
|
|
|
|
return 0;
|
|
|
|
|
2015-03-23 16:50:26 +03:00
|
|
|
if (rht_dereference(old_tbl->future_tbl, ht))
|
|
|
|
return -EEXIST;
|
|
|
|
|
2017-02-11 14:26:47 +03:00
|
|
|
return rhashtable_rehash_alloc(ht, old_tbl, size);
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
static void rht_deferred_worker(struct work_struct *work)
|
|
|
|
{
|
|
|
|
struct rhashtable *ht;
|
|
|
|
struct bucket_table *tbl;
|
2015-03-23 16:50:26 +03:00
|
|
|
int err = 0;
|
2015-01-03 01:00:20 +03:00
|
|
|
|
rhashtable: Fix race in rhashtable_destroy() and use regular work_struct
When we put our declared work task in the global workqueue with
schedule_delayed_work(), its delay parameter is always zero.
Therefore, we should define a regular work in rhashtable structure
instead of a delayed work.
By the way, we add a condition to check whether resizing functions
are NULL before cancelling the work, avoiding to cancel an
uninitialized work.
Lastly, while we wait for all work items we submitted before to run
to completion with cancel_delayed_work(), ht->mutex has been taken in
rhashtable_destroy(). Moreover, cancel_delayed_work() doesn't return
until all work items are accomplished, and when work items are
scheduled, the work's function - rht_deferred_worker() will be called.
However, as rht_deferred_worker() also needs to acquire the lock,
deadlock might happen at the moment as the lock is already held before.
So if the cancel work function is moved out of the lock covered scope,
this will avoid the deadlock.
Fixes: 97defe1 ("rhashtable: Per bucket locks & deferred expansion/shrinking")
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Thomas Graf <tgraf@suug.ch>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-16 06:13:09 +03:00
|
|
|
ht = container_of(work, struct rhashtable, run_work);
|
2015-01-03 01:00:20 +03:00
|
|
|
mutex_lock(&ht->mutex);
|
2015-02-03 23:33:22 +03:00
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
tbl = rht_dereference(ht->tbl, ht);
|
2015-03-23 16:50:26 +03:00
|
|
|
tbl = rhashtable_last_table(ht, tbl);
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2015-03-12 17:28:40 +03:00
|
|
|
if (rht_grow_above_75(ht, tbl))
|
2017-02-11 14:26:47 +03:00
|
|
|
err = rhashtable_rehash_alloc(ht, tbl, tbl->size * 2);
|
2015-03-24 23:42:19 +03:00
|
|
|
else if (ht->p.automatic_shrinking && rht_shrink_below_30(ht, tbl))
|
2017-02-11 14:26:47 +03:00
|
|
|
err = rhashtable_shrink(ht);
|
|
|
|
else if (tbl->nest)
|
|
|
|
err = rhashtable_rehash_alloc(ht, tbl, tbl->size);
|
2015-03-23 16:50:26 +03:00
|
|
|
|
2019-03-21 04:39:52 +03:00
|
|
|
if (!err || err == -EEXIST) {
|
|
|
|
int nerr;
|
|
|
|
|
|
|
|
nerr = rhashtable_rehash_table(ht);
|
|
|
|
err = err ?: nerr;
|
|
|
|
}
|
2015-03-23 16:50:26 +03:00
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
mutex_unlock(&ht->mutex);
|
2015-03-23 16:50:26 +03:00
|
|
|
|
|
|
|
if (err)
|
|
|
|
schedule_work(&ht->run_work);
|
2015-01-03 01:00:20 +03:00
|
|
|
}
|
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
static int rhashtable_insert_rehash(struct rhashtable *ht,
|
|
|
|
struct bucket_table *tbl)
|
2015-03-23 16:50:28 +03:00
|
|
|
{
|
|
|
|
struct bucket_table *old_tbl;
|
|
|
|
struct bucket_table *new_tbl;
|
|
|
|
unsigned int size;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
old_tbl = rht_dereference_rcu(ht->tbl, ht);
|
|
|
|
|
|
|
|
size = tbl->size;
|
|
|
|
|
2015-12-03 15:41:29 +03:00
|
|
|
err = -EBUSY;
|
|
|
|
|
2015-03-23 16:50:28 +03:00
|
|
|
if (rht_grow_above_75(ht, tbl))
|
|
|
|
size *= 2;
|
2015-04-22 10:41:46 +03:00
|
|
|
/* Do not schedule more than one rehash */
|
|
|
|
else if (old_tbl != tbl)
|
2015-12-03 15:41:29 +03:00
|
|
|
goto fail;
|
|
|
|
|
|
|
|
err = -ENOMEM;
|
2015-03-23 16:50:28 +03:00
|
|
|
|
2018-08-22 08:01:45 +03:00
|
|
|
new_tbl = bucket_table_alloc(ht, size, GFP_ATOMIC | __GFP_NOWARN);
|
2015-12-03 15:41:29 +03:00
|
|
|
if (new_tbl == NULL)
|
|
|
|
goto fail;
|
2015-03-23 16:50:28 +03:00
|
|
|
|
|
|
|
err = rhashtable_rehash_attach(ht, tbl, new_tbl);
|
|
|
|
if (err) {
|
|
|
|
bucket_table_free(new_tbl);
|
|
|
|
if (err == -EEXIST)
|
|
|
|
err = 0;
|
|
|
|
} else
|
|
|
|
schedule_work(&ht->run_work);
|
|
|
|
|
|
|
|
return err;
|
2015-12-03 15:41:29 +03:00
|
|
|
|
|
|
|
fail:
|
|
|
|
/* Do not fail the insert if someone else did a rehash. */
|
2018-06-18 05:52:50 +03:00
|
|
|
if (likely(rcu_access_pointer(tbl->future_tbl)))
|
2015-12-03 15:41:29 +03:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* Schedule async rehash to retry allocation in process context. */
|
|
|
|
if (err == -ENOMEM)
|
|
|
|
schedule_work(&ht->run_work);
|
|
|
|
|
|
|
|
return err;
|
2015-03-23 16:50:28 +03:00
|
|
|
}
|
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
static void *rhashtable_lookup_one(struct rhashtable *ht,
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **bkt,
|
2016-09-19 14:00:09 +03:00
|
|
|
struct bucket_table *tbl, unsigned int hash,
|
|
|
|
const void *key, struct rhash_head *obj)
|
2015-03-20 13:57:00 +03:00
|
|
|
{
|
2016-09-19 14:00:09 +03:00
|
|
|
struct rhashtable_compare_arg arg = {
|
|
|
|
.ht = ht,
|
|
|
|
.key = key,
|
|
|
|
};
|
2019-04-12 04:52:07 +03:00
|
|
|
struct rhash_head __rcu **pprev = NULL;
|
2015-03-20 13:57:00 +03:00
|
|
|
struct rhash_head *head;
|
2016-09-19 14:00:09 +03:00
|
|
|
int elasticity;
|
2015-03-20 13:57:00 +03:00
|
|
|
|
2017-04-16 03:55:09 +03:00
|
|
|
elasticity = RHT_ELASTICITY;
|
2019-04-12 04:52:08 +03:00
|
|
|
rht_for_each_from(head, rht_ptr(bkt, tbl, hash), tbl, hash) {
|
2016-09-19 14:00:09 +03:00
|
|
|
struct rhlist_head *list;
|
|
|
|
struct rhlist_head *plist;
|
|
|
|
|
|
|
|
elasticity--;
|
|
|
|
if (!key ||
|
|
|
|
(ht->p.obj_cmpfn ?
|
|
|
|
ht->p.obj_cmpfn(&arg, rht_obj(ht, head)) :
|
2018-03-04 18:29:48 +03:00
|
|
|
rhashtable_compare(&arg, rht_obj(ht, head)))) {
|
|
|
|
pprev = &head->next;
|
2016-09-19 14:00:09 +03:00
|
|
|
continue;
|
2018-03-04 18:29:48 +03:00
|
|
|
}
|
2016-09-19 14:00:09 +03:00
|
|
|
|
|
|
|
if (!ht->rhlist)
|
|
|
|
return rht_obj(ht, head);
|
|
|
|
|
|
|
|
list = container_of(obj, struct rhlist_head, rhead);
|
|
|
|
plist = container_of(head, struct rhlist_head, rhead);
|
|
|
|
|
|
|
|
RCU_INIT_POINTER(list->next, plist);
|
|
|
|
head = rht_dereference_bucket(head->next, tbl, hash);
|
|
|
|
RCU_INIT_POINTER(list->rhead.next, head);
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
if (pprev)
|
|
|
|
rcu_assign_pointer(*pprev, obj);
|
|
|
|
else
|
|
|
|
/* Need to preserve the bit lock */
|
2019-04-12 04:52:08 +03:00
|
|
|
rht_assign_locked(bkt, obj);
|
2016-09-19 14:00:09 +03:00
|
|
|
|
|
|
|
return NULL;
|
2016-08-24 13:31:31 +03:00
|
|
|
}
|
2015-03-20 13:57:00 +03:00
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
if (elasticity <= 0)
|
|
|
|
return ERR_PTR(-EAGAIN);
|
|
|
|
|
|
|
|
return ERR_PTR(-ENOENT);
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct bucket_table *rhashtable_insert_one(struct rhashtable *ht,
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **bkt,
|
2016-09-19 14:00:09 +03:00
|
|
|
struct bucket_table *tbl,
|
|
|
|
unsigned int hash,
|
|
|
|
struct rhash_head *obj,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct bucket_table *new_tbl;
|
|
|
|
struct rhash_head *head;
|
|
|
|
|
|
|
|
if (!IS_ERR_OR_NULL(data))
|
|
|
|
return ERR_PTR(-EEXIST);
|
2015-05-15 06:30:47 +03:00
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
if (PTR_ERR(data) != -EAGAIN && PTR_ERR(data) != -ENOENT)
|
|
|
|
return ERR_CAST(data);
|
2015-03-23 16:50:28 +03:00
|
|
|
|
2018-06-18 05:52:50 +03:00
|
|
|
new_tbl = rht_dereference_rcu(tbl->future_tbl, ht);
|
2016-09-19 14:00:09 +03:00
|
|
|
if (new_tbl)
|
|
|
|
return new_tbl;
|
|
|
|
|
|
|
|
if (PTR_ERR(data) != -ENOENT)
|
|
|
|
return ERR_CAST(data);
|
|
|
|
|
|
|
|
if (unlikely(rht_grow_above_max(ht, tbl)))
|
|
|
|
return ERR_PTR(-E2BIG);
|
|
|
|
|
|
|
|
if (unlikely(rht_grow_above_100(ht, tbl)))
|
|
|
|
return ERR_PTR(-EAGAIN);
|
2015-03-20 13:57:00 +03:00
|
|
|
|
2019-04-12 04:52:08 +03:00
|
|
|
head = rht_ptr(bkt, tbl, hash);
|
2015-03-20 13:57:00 +03:00
|
|
|
|
|
|
|
RCU_INIT_POINTER(obj->next, head);
|
2016-09-19 14:00:09 +03:00
|
|
|
if (ht->rhlist) {
|
|
|
|
struct rhlist_head *list;
|
|
|
|
|
|
|
|
list = container_of(obj, struct rhlist_head, rhead);
|
|
|
|
RCU_INIT_POINTER(list->next, NULL);
|
|
|
|
}
|
2015-03-20 13:57:00 +03:00
|
|
|
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
/* bkt is always the head of the list, so it holds
|
|
|
|
* the lock, which we need to preserve
|
|
|
|
*/
|
2019-04-12 04:52:08 +03:00
|
|
|
rht_assign_locked(bkt, obj);
|
2015-03-20 13:57:00 +03:00
|
|
|
|
|
|
|
atomic_inc(&ht->nelems);
|
2016-09-19 14:00:09 +03:00
|
|
|
if (rht_grow_above_75(ht, tbl))
|
|
|
|
schedule_work(&ht->run_work);
|
2015-03-20 13:57:00 +03:00
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
return NULL;
|
|
|
|
}
|
2015-03-20 13:57:00 +03:00
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
static void *rhashtable_try_insert(struct rhashtable *ht, const void *key,
|
|
|
|
struct rhash_head *obj)
|
|
|
|
{
|
|
|
|
struct bucket_table *new_tbl;
|
|
|
|
struct bucket_table *tbl;
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **bkt;
|
2016-09-19 14:00:09 +03:00
|
|
|
unsigned int hash;
|
|
|
|
void *data;
|
|
|
|
|
2019-03-21 06:42:40 +03:00
|
|
|
new_tbl = rcu_dereference(ht->tbl);
|
2016-09-19 14:00:09 +03:00
|
|
|
|
2019-03-21 06:42:40 +03:00
|
|
|
do {
|
2016-09-19 14:00:09 +03:00
|
|
|
tbl = new_tbl;
|
|
|
|
hash = rht_head_hashfn(ht, tbl, obj, ht->p);
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
if (rcu_access_pointer(tbl->future_tbl))
|
|
|
|
/* Failure is OK */
|
|
|
|
bkt = rht_bucket_var(tbl, hash);
|
|
|
|
else
|
|
|
|
bkt = rht_bucket_insert(ht, tbl, hash);
|
|
|
|
if (bkt == NULL) {
|
|
|
|
new_tbl = rht_dereference_rcu(tbl->future_tbl, ht);
|
|
|
|
data = ERR_PTR(-EAGAIN);
|
|
|
|
} else {
|
2019-04-02 02:07:45 +03:00
|
|
|
rht_lock(tbl, bkt);
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
data = rhashtable_lookup_one(ht, bkt, tbl,
|
|
|
|
hash, key, obj);
|
|
|
|
new_tbl = rhashtable_insert_one(ht, bkt, tbl,
|
|
|
|
hash, obj, data);
|
|
|
|
if (PTR_ERR(new_tbl) != -EEXIST)
|
|
|
|
data = ERR_CAST(new_tbl);
|
|
|
|
|
2019-04-02 02:07:45 +03:00
|
|
|
rht_unlock(tbl, bkt);
|
rhashtable: use bit_spin_locks to protect hash bucket.
This patch changes rhashtables to use a bit_spin_lock on BIT(1) of the
bucket pointer to lock the hash chain for that bucket.
The benefits of a bit spin_lock are:
- no need to allocate a separate array of locks.
- no need to have a configuration option to guide the
choice of the size of this array
- locking cost is often a single test-and-set in a cache line
that will have to be loaded anyway. When inserting at, or removing
from, the head of the chain, the unlock is free - writing the new
address in the bucket head implicitly clears the lock bit.
For __rhashtable_insert_fast() we ensure this always happens
when adding a new key.
- even when lockings costs 2 updates (lock and unlock), they are
in a cacheline that needs to be read anyway.
The cost of using a bit spin_lock is a little bit of code complexity,
which I think is quite manageable.
Bit spin_locks are sometimes inappropriate because they are not fair -
if multiple CPUs repeatedly contend of the same lock, one CPU can
easily be starved. This is not a credible situation with rhashtable.
Multiple CPUs may want to repeatedly add or remove objects, but they
will typically do so at different buckets, so they will attempt to
acquire different locks.
As we have more bit-locks than we previously had spinlocks (by at
least a factor of two) we can expect slightly less contention to
go with the slightly better cache behavior and reduced memory
consumption.
To enhance type checking, a new struct is introduced to represent the
pointer plus lock-bit
that is stored in the bucket-table. This is "struct rhash_lock_head"
and is empty. A pointer to this needs to be cast to either an
unsigned lock, or a "struct rhash_head *" to be useful.
Variables of this type are most often called "bkt".
Previously "pprev" would sometimes point to a bucket, and sometimes a
->next pointer in an rhash_head. As these are now different types,
pprev is NULL when it would have pointed to the bucket. In that case,
'blk' is used, together with correct locking protocol.
Signed-off-by: NeilBrown <neilb@suse.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2019-04-02 02:07:45 +03:00
|
|
|
}
|
2019-03-21 06:42:40 +03:00
|
|
|
} while (!IS_ERR_OR_NULL(new_tbl));
|
2016-09-19 14:00:09 +03:00
|
|
|
|
|
|
|
if (PTR_ERR(data) == -EAGAIN)
|
|
|
|
data = ERR_PTR(rhashtable_insert_rehash(ht, tbl) ?:
|
|
|
|
-EAGAIN);
|
|
|
|
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
|
|
|
void *rhashtable_insert_slow(struct rhashtable *ht, const void *key,
|
|
|
|
struct rhash_head *obj)
|
|
|
|
{
|
|
|
|
void *data;
|
|
|
|
|
|
|
|
do {
|
|
|
|
rcu_read_lock();
|
|
|
|
data = rhashtable_try_insert(ht, key, obj);
|
|
|
|
rcu_read_unlock();
|
|
|
|
} while (PTR_ERR(data) == -EAGAIN);
|
|
|
|
|
|
|
|
return data;
|
2015-03-20 13:57:00 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_insert_slow);
|
|
|
|
|
2015-02-03 23:33:23 +03:00
|
|
|
/**
|
2016-08-18 11:50:56 +03:00
|
|
|
* rhashtable_walk_enter - Initialise an iterator
|
2015-02-03 23:33:23 +03:00
|
|
|
* @ht: Table to walk over
|
|
|
|
* @iter: Hash table Iterator
|
|
|
|
*
|
|
|
|
* This function prepares a hash table walk.
|
|
|
|
*
|
|
|
|
* Note that if you restart a walk after rhashtable_walk_stop you
|
|
|
|
* may see the same object twice. Also, you may miss objects if
|
|
|
|
* there are removals in between rhashtable_walk_stop and the next
|
|
|
|
* call to rhashtable_walk_start.
|
|
|
|
*
|
|
|
|
* For a completely stable walk you should construct your own data
|
|
|
|
* structure outside the hash table.
|
|
|
|
*
|
2018-04-24 01:29:13 +03:00
|
|
|
* This function may be called from any process context, including
|
|
|
|
* non-preemptable context, but cannot be called from softirq or
|
|
|
|
* hardirq context.
|
2015-02-03 23:33:23 +03:00
|
|
|
*
|
2016-08-18 11:50:56 +03:00
|
|
|
* You must call rhashtable_walk_exit after this function returns.
|
2015-02-03 23:33:23 +03:00
|
|
|
*/
|
2016-08-18 11:50:56 +03:00
|
|
|
void rhashtable_walk_enter(struct rhashtable *ht, struct rhashtable_iter *iter)
|
2015-02-03 23:33:23 +03:00
|
|
|
{
|
|
|
|
iter->ht = ht;
|
|
|
|
iter->p = NULL;
|
|
|
|
iter->slot = 0;
|
|
|
|
iter->skip = 0;
|
2017-12-04 21:31:42 +03:00
|
|
|
iter->end_of_table = 0;
|
2015-02-03 23:33:23 +03:00
|
|
|
|
2015-12-16 11:45:54 +03:00
|
|
|
spin_lock(&ht->lock);
|
2016-08-18 11:50:56 +03:00
|
|
|
iter->walker.tbl =
|
2015-12-19 05:45:28 +03:00
|
|
|
rcu_dereference_protected(ht->tbl, lockdep_is_held(&ht->lock));
|
2016-08-18 11:50:56 +03:00
|
|
|
list_add(&iter->walker.list, &iter->walker.tbl->walkers);
|
2015-12-16 11:45:54 +03:00
|
|
|
spin_unlock(&ht->lock);
|
2015-02-03 23:33:23 +03:00
|
|
|
}
|
2016-08-18 11:50:56 +03:00
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_enter);
|
2015-02-03 23:33:23 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* rhashtable_walk_exit - Free an iterator
|
|
|
|
* @iter: Hash table Iterator
|
|
|
|
*
|
2019-02-14 17:03:27 +03:00
|
|
|
* This function frees resources allocated by rhashtable_walk_enter.
|
2015-02-03 23:33:23 +03:00
|
|
|
*/
|
|
|
|
void rhashtable_walk_exit(struct rhashtable_iter *iter)
|
|
|
|
{
|
2015-12-16 11:45:54 +03:00
|
|
|
spin_lock(&iter->ht->lock);
|
2016-08-18 11:50:56 +03:00
|
|
|
if (iter->walker.tbl)
|
|
|
|
list_del(&iter->walker.list);
|
2015-12-16 11:45:54 +03:00
|
|
|
spin_unlock(&iter->ht->lock);
|
2015-02-03 23:33:23 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_exit);
|
|
|
|
|
|
|
|
/**
|
2017-12-04 21:31:41 +03:00
|
|
|
* rhashtable_walk_start_check - Start a hash table walk
|
2015-02-03 23:33:23 +03:00
|
|
|
* @iter: Hash table iterator
|
|
|
|
*
|
2017-09-19 13:41:37 +03:00
|
|
|
* Start a hash table walk at the current iterator position. Note that we take
|
|
|
|
* the RCU lock in all cases including when we return an error. So you must
|
|
|
|
* always call rhashtable_walk_stop to clean up.
|
2015-02-03 23:33:23 +03:00
|
|
|
*
|
|
|
|
* Returns zero if successful.
|
|
|
|
*
|
|
|
|
* Returns -EAGAIN if resize event occured. Note that the iterator
|
|
|
|
* will rewind back to the beginning and you may use it immediately
|
|
|
|
* by calling rhashtable_walk_next.
|
2017-12-04 21:31:41 +03:00
|
|
|
*
|
|
|
|
* rhashtable_walk_start is defined as an inline variant that returns
|
|
|
|
* void. This is preferred in cases where the caller would ignore
|
|
|
|
* resize events and always continue.
|
2015-02-03 23:33:23 +03:00
|
|
|
*/
|
2017-12-04 21:31:41 +03:00
|
|
|
int rhashtable_walk_start_check(struct rhashtable_iter *iter)
|
2015-03-16 12:42:27 +03:00
|
|
|
__acquires(RCU)
|
2015-02-03 23:33:23 +03:00
|
|
|
{
|
2015-03-14 05:57:20 +03:00
|
|
|
struct rhashtable *ht = iter->ht;
|
2018-04-24 01:29:13 +03:00
|
|
|
bool rhlist = ht->rhlist;
|
2015-03-14 05:57:20 +03:00
|
|
|
|
2015-12-16 11:45:54 +03:00
|
|
|
rcu_read_lock();
|
2015-03-14 05:57:20 +03:00
|
|
|
|
2015-12-16 11:45:54 +03:00
|
|
|
spin_lock(&ht->lock);
|
2016-08-18 11:50:56 +03:00
|
|
|
if (iter->walker.tbl)
|
|
|
|
list_del(&iter->walker.list);
|
2015-12-16 11:45:54 +03:00
|
|
|
spin_unlock(&ht->lock);
|
2015-03-14 05:57:20 +03:00
|
|
|
|
2018-04-24 01:29:13 +03:00
|
|
|
if (iter->end_of_table)
|
|
|
|
return 0;
|
|
|
|
if (!iter->walker.tbl) {
|
2016-08-18 11:50:56 +03:00
|
|
|
iter->walker.tbl = rht_dereference_rcu(ht->tbl, ht);
|
2018-04-24 01:29:13 +03:00
|
|
|
iter->slot = 0;
|
|
|
|
iter->skip = 0;
|
2015-02-03 23:33:23 +03:00
|
|
|
return -EAGAIN;
|
|
|
|
}
|
|
|
|
|
2018-04-24 01:29:13 +03:00
|
|
|
if (iter->p && !rhlist) {
|
|
|
|
/*
|
|
|
|
* We need to validate that 'p' is still in the table, and
|
|
|
|
* if so, update 'skip'
|
|
|
|
*/
|
|
|
|
struct rhash_head *p;
|
|
|
|
int skip = 0;
|
|
|
|
rht_for_each_rcu(p, iter->walker.tbl, iter->slot) {
|
|
|
|
skip++;
|
|
|
|
if (p == iter->p) {
|
|
|
|
iter->skip = skip;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
iter->p = NULL;
|
|
|
|
} else if (iter->p && rhlist) {
|
|
|
|
/* Need to validate that 'list' is still in the table, and
|
|
|
|
* if so, update 'skip' and 'p'.
|
|
|
|
*/
|
|
|
|
struct rhash_head *p;
|
|
|
|
struct rhlist_head *list;
|
|
|
|
int skip = 0;
|
|
|
|
rht_for_each_rcu(p, iter->walker.tbl, iter->slot) {
|
|
|
|
for (list = container_of(p, struct rhlist_head, rhead);
|
|
|
|
list;
|
|
|
|
list = rcu_dereference(list->next)) {
|
|
|
|
skip++;
|
|
|
|
if (list == iter->list) {
|
|
|
|
iter->p = p;
|
2018-07-02 19:35:34 +03:00
|
|
|
iter->skip = skip;
|
2018-04-24 01:29:13 +03:00
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
iter->p = NULL;
|
|
|
|
}
|
|
|
|
found:
|
2015-02-03 23:33:23 +03:00
|
|
|
return 0;
|
|
|
|
}
|
2017-12-04 21:31:41 +03:00
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_start_check);
|
2015-02-03 23:33:23 +03:00
|
|
|
|
|
|
|
/**
|
2017-12-04 21:31:42 +03:00
|
|
|
* __rhashtable_walk_find_next - Find the next element in a table (or the first
|
|
|
|
* one in case of a new walk).
|
|
|
|
*
|
2015-02-03 23:33:23 +03:00
|
|
|
* @iter: Hash table iterator
|
|
|
|
*
|
2017-12-04 21:31:42 +03:00
|
|
|
* Returns the found object or NULL when the end of the table is reached.
|
2015-02-03 23:33:23 +03:00
|
|
|
*
|
2017-12-04 21:31:42 +03:00
|
|
|
* Returns -EAGAIN if resize event occurred.
|
2015-02-03 23:33:23 +03:00
|
|
|
*/
|
2017-12-04 21:31:42 +03:00
|
|
|
static void *__rhashtable_walk_find_next(struct rhashtable_iter *iter)
|
2015-02-03 23:33:23 +03:00
|
|
|
{
|
2016-08-18 11:50:56 +03:00
|
|
|
struct bucket_table *tbl = iter->walker.tbl;
|
2016-09-19 14:00:09 +03:00
|
|
|
struct rhlist_head *list = iter->list;
|
2015-02-03 23:33:23 +03:00
|
|
|
struct rhashtable *ht = iter->ht;
|
|
|
|
struct rhash_head *p = iter->p;
|
2016-09-19 14:00:09 +03:00
|
|
|
bool rhlist = ht->rhlist;
|
2015-02-03 23:33:23 +03:00
|
|
|
|
2017-12-04 21:31:42 +03:00
|
|
|
if (!tbl)
|
|
|
|
return NULL;
|
2015-02-03 23:33:23 +03:00
|
|
|
|
|
|
|
for (; iter->slot < tbl->size; iter->slot++) {
|
|
|
|
int skip = iter->skip;
|
|
|
|
|
|
|
|
rht_for_each_rcu(p, tbl, iter->slot) {
|
2016-09-19 14:00:09 +03:00
|
|
|
if (rhlist) {
|
|
|
|
list = container_of(p, struct rhlist_head,
|
|
|
|
rhead);
|
|
|
|
do {
|
|
|
|
if (!skip)
|
|
|
|
goto next;
|
|
|
|
skip--;
|
|
|
|
list = rcu_dereference(list->next);
|
|
|
|
} while (list);
|
|
|
|
|
|
|
|
continue;
|
|
|
|
}
|
2015-02-03 23:33:23 +03:00
|
|
|
if (!skip)
|
|
|
|
break;
|
|
|
|
skip--;
|
|
|
|
}
|
|
|
|
|
|
|
|
next:
|
|
|
|
if (!rht_is_a_nulls(p)) {
|
|
|
|
iter->skip++;
|
|
|
|
iter->p = p;
|
2016-09-19 14:00:09 +03:00
|
|
|
iter->list = list;
|
|
|
|
return rht_obj(ht, rhlist ? &list->rhead : p);
|
2015-02-03 23:33:23 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
iter->skip = 0;
|
|
|
|
}
|
|
|
|
|
2015-07-06 16:51:20 +03:00
|
|
|
iter->p = NULL;
|
|
|
|
|
2015-03-23 16:50:19 +03:00
|
|
|
/* Ensure we see any new tables. */
|
|
|
|
smp_rmb();
|
|
|
|
|
2016-08-18 11:50:56 +03:00
|
|
|
iter->walker.tbl = rht_dereference_rcu(tbl->future_tbl, ht);
|
|
|
|
if (iter->walker.tbl) {
|
2015-02-03 23:33:23 +03:00
|
|
|
iter->slot = 0;
|
|
|
|
iter->skip = 0;
|
|
|
|
return ERR_PTR(-EAGAIN);
|
2017-12-04 21:31:42 +03:00
|
|
|
} else {
|
|
|
|
iter->end_of_table = true;
|
2015-02-03 23:33:23 +03:00
|
|
|
}
|
|
|
|
|
2015-05-05 03:22:53 +03:00
|
|
|
return NULL;
|
2015-02-03 23:33:23 +03:00
|
|
|
}
|
2017-12-04 21:31:42 +03:00
|
|
|
|
|
|
|
/**
|
|
|
|
* rhashtable_walk_next - Return the next object and advance the iterator
|
|
|
|
* @iter: Hash table iterator
|
|
|
|
*
|
|
|
|
* Note that you must call rhashtable_walk_stop when you are finished
|
|
|
|
* with the walk.
|
|
|
|
*
|
|
|
|
* Returns the next object or NULL when the end of the table is reached.
|
|
|
|
*
|
|
|
|
* Returns -EAGAIN if resize event occurred. Note that the iterator
|
|
|
|
* will rewind back to the beginning and you may continue to use it.
|
|
|
|
*/
|
|
|
|
void *rhashtable_walk_next(struct rhashtable_iter *iter)
|
|
|
|
{
|
|
|
|
struct rhlist_head *list = iter->list;
|
|
|
|
struct rhashtable *ht = iter->ht;
|
|
|
|
struct rhash_head *p = iter->p;
|
|
|
|
bool rhlist = ht->rhlist;
|
|
|
|
|
|
|
|
if (p) {
|
|
|
|
if (!rhlist || !(list = rcu_dereference(list->next))) {
|
|
|
|
p = rcu_dereference(p->next);
|
|
|
|
list = container_of(p, struct rhlist_head, rhead);
|
|
|
|
}
|
|
|
|
if (!rht_is_a_nulls(p)) {
|
|
|
|
iter->skip++;
|
|
|
|
iter->p = p;
|
|
|
|
iter->list = list;
|
|
|
|
return rht_obj(ht, rhlist ? &list->rhead : p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* At the end of this slot, switch to next one and then find
|
|
|
|
* next entry from that point.
|
|
|
|
*/
|
|
|
|
iter->skip = 0;
|
|
|
|
iter->slot++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return __rhashtable_walk_find_next(iter);
|
|
|
|
}
|
2015-02-03 23:33:23 +03:00
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_next);
|
|
|
|
|
2017-12-04 21:31:42 +03:00
|
|
|
/**
|
|
|
|
* rhashtable_walk_peek - Return the next object but don't advance the iterator
|
|
|
|
* @iter: Hash table iterator
|
|
|
|
*
|
|
|
|
* Returns the next object or NULL when the end of the table is reached.
|
|
|
|
*
|
|
|
|
* Returns -EAGAIN if resize event occurred. Note that the iterator
|
|
|
|
* will rewind back to the beginning and you may continue to use it.
|
|
|
|
*/
|
|
|
|
void *rhashtable_walk_peek(struct rhashtable_iter *iter)
|
|
|
|
{
|
|
|
|
struct rhlist_head *list = iter->list;
|
|
|
|
struct rhashtable *ht = iter->ht;
|
|
|
|
struct rhash_head *p = iter->p;
|
|
|
|
|
|
|
|
if (p)
|
|
|
|
return rht_obj(ht, ht->rhlist ? &list->rhead : p);
|
|
|
|
|
|
|
|
/* No object found in current iter, find next one in the table. */
|
|
|
|
|
|
|
|
if (iter->skip) {
|
|
|
|
/* A nonzero skip value points to the next entry in the table
|
|
|
|
* beyond that last one that was found. Decrement skip so
|
|
|
|
* we find the current value. __rhashtable_walk_find_next
|
|
|
|
* will restore the original value of skip assuming that
|
|
|
|
* the table hasn't changed.
|
|
|
|
*/
|
|
|
|
iter->skip--;
|
|
|
|
}
|
|
|
|
|
|
|
|
return __rhashtable_walk_find_next(iter);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_peek);
|
|
|
|
|
2015-02-03 23:33:23 +03:00
|
|
|
/**
|
|
|
|
* rhashtable_walk_stop - Finish a hash table walk
|
|
|
|
* @iter: Hash table iterator
|
|
|
|
*
|
2017-09-19 13:41:37 +03:00
|
|
|
* Finish a hash table walk. Does not reset the iterator to the start of the
|
|
|
|
* hash table.
|
2015-02-03 23:33:23 +03:00
|
|
|
*/
|
|
|
|
void rhashtable_walk_stop(struct rhashtable_iter *iter)
|
2015-03-16 12:42:27 +03:00
|
|
|
__releases(RCU)
|
2015-02-03 23:33:23 +03:00
|
|
|
{
|
2015-03-14 05:57:20 +03:00
|
|
|
struct rhashtable *ht;
|
2016-08-18 11:50:56 +03:00
|
|
|
struct bucket_table *tbl = iter->walker.tbl;
|
2015-03-14 05:57:20 +03:00
|
|
|
|
|
|
|
if (!tbl)
|
2015-03-15 13:12:04 +03:00
|
|
|
goto out;
|
2015-03-14 05:57:20 +03:00
|
|
|
|
|
|
|
ht = iter->ht;
|
|
|
|
|
2015-03-24 01:53:17 +03:00
|
|
|
spin_lock(&ht->lock);
|
2019-03-21 06:42:40 +03:00
|
|
|
if (rcu_head_after_call_rcu(&tbl->rcu, bucket_table_free_rcu))
|
|
|
|
/* This bucket table is being freed, don't re-link it. */
|
2016-08-18 11:50:56 +03:00
|
|
|
iter->walker.tbl = NULL;
|
2019-03-21 06:42:40 +03:00
|
|
|
else
|
|
|
|
list_add(&iter->walker.list, &tbl->walkers);
|
2015-03-24 01:53:17 +03:00
|
|
|
spin_unlock(&ht->lock);
|
2015-03-14 05:57:20 +03:00
|
|
|
|
2015-03-15 13:12:04 +03:00
|
|
|
out:
|
|
|
|
rcu_read_unlock();
|
2015-02-03 23:33:23 +03:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_walk_stop);
|
|
|
|
|
2015-03-20 13:56:59 +03:00
|
|
|
static size_t rounded_hashtable_size(const struct rhashtable_params *params)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
2018-07-16 23:26:13 +03:00
|
|
|
size_t retsize;
|
|
|
|
|
|
|
|
if (params->nelem_hint)
|
|
|
|
retsize = max(roundup_pow_of_two(params->nelem_hint * 4 / 3),
|
|
|
|
(unsigned long)params->min_size);
|
|
|
|
else
|
|
|
|
retsize = max(HASH_DEFAULT_SIZE,
|
|
|
|
(unsigned long)params->min_size);
|
|
|
|
|
|
|
|
return retsize;
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
|
|
|
|
2015-03-23 16:50:21 +03:00
|
|
|
static u32 rhashtable_jhash2(const void *key, u32 length, u32 seed)
|
|
|
|
{
|
|
|
|
return jhash2(key, length, seed);
|
|
|
|
}
|
|
|
|
|
2014-08-02 13:47:44 +04:00
|
|
|
/**
|
|
|
|
* rhashtable_init - initialize a new hash table
|
|
|
|
* @ht: hash table to be initialized
|
|
|
|
* @params: configuration parameters
|
|
|
|
*
|
|
|
|
* Initializes a new hash table based on the provided configuration
|
|
|
|
* parameters. A table can be configured either with a variable or
|
|
|
|
* fixed length key:
|
|
|
|
*
|
|
|
|
* Configuration Example 1: Fixed length keys
|
|
|
|
* struct test_obj {
|
|
|
|
* int key;
|
|
|
|
* void * my_member;
|
|
|
|
* struct rhash_head node;
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
* struct rhashtable_params params = {
|
|
|
|
* .head_offset = offsetof(struct test_obj, node),
|
|
|
|
* .key_offset = offsetof(struct test_obj, key),
|
|
|
|
* .key_len = sizeof(int),
|
2014-12-10 18:33:11 +03:00
|
|
|
* .hashfn = jhash,
|
2014-08-02 13:47:44 +04:00
|
|
|
* };
|
|
|
|
*
|
|
|
|
* Configuration Example 2: Variable length keys
|
|
|
|
* struct test_obj {
|
|
|
|
* [...]
|
|
|
|
* struct rhash_head node;
|
|
|
|
* };
|
|
|
|
*
|
2015-03-25 16:07:45 +03:00
|
|
|
* u32 my_hash_fn(const void *data, u32 len, u32 seed)
|
2014-08-02 13:47:44 +04:00
|
|
|
* {
|
|
|
|
* struct test_obj *obj = data;
|
|
|
|
*
|
|
|
|
* return [... hash ...];
|
|
|
|
* }
|
|
|
|
*
|
|
|
|
* struct rhashtable_params params = {
|
|
|
|
* .head_offset = offsetof(struct test_obj, node),
|
2014-12-10 18:33:11 +03:00
|
|
|
* .hashfn = jhash,
|
2014-08-02 13:47:44 +04:00
|
|
|
* .obj_hashfn = my_hash_fn,
|
|
|
|
* };
|
|
|
|
*/
|
2015-03-20 13:56:59 +03:00
|
|
|
int rhashtable_init(struct rhashtable *ht,
|
|
|
|
const struct rhashtable_params *params)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
|
|
|
struct bucket_table *tbl;
|
|
|
|
size_t size;
|
|
|
|
|
2015-03-23 16:50:21 +03:00
|
|
|
if ((!params->key_len && !params->obj_hashfn) ||
|
2015-03-20 13:57:00 +03:00
|
|
|
(params->obj_hashfn && !params->obj_cmpfn))
|
2014-08-02 13:47:44 +04:00
|
|
|
return -EINVAL;
|
|
|
|
|
2015-01-03 01:00:20 +03:00
|
|
|
memset(ht, 0, sizeof(*ht));
|
|
|
|
mutex_init(&ht->mutex);
|
2015-03-24 01:53:17 +03:00
|
|
|
spin_lock_init(&ht->lock);
|
2015-01-03 01:00:20 +03:00
|
|
|
memcpy(&ht->p, params, sizeof(*params));
|
|
|
|
|
2015-03-20 01:31:13 +03:00
|
|
|
if (params->min_size)
|
|
|
|
ht->p.min_size = roundup_pow_of_two(params->min_size);
|
|
|
|
|
2017-04-27 08:44:51 +03:00
|
|
|
/* Cap total entries at 2^31 to avoid nelems overflow. */
|
|
|
|
ht->max_elems = 1u << 31;
|
2017-04-28 09:10:48 +03:00
|
|
|
|
|
|
|
if (params->max_size) {
|
|
|
|
ht->p.max_size = rounddown_pow_of_two(params->max_size);
|
|
|
|
if (ht->p.max_size < ht->max_elems / 2)
|
|
|
|
ht->max_elems = ht->p.max_size * 2;
|
|
|
|
}
|
2017-04-27 08:44:51 +03:00
|
|
|
|
2017-05-01 23:18:01 +03:00
|
|
|
ht->p.min_size = max_t(u16, ht->p.min_size, HASH_MIN_SIZE);
|
2015-03-20 01:31:13 +03:00
|
|
|
|
2018-07-16 23:26:13 +03:00
|
|
|
size = rounded_hashtable_size(&ht->p);
|
2015-12-16 13:13:14 +03:00
|
|
|
|
2015-03-23 16:50:21 +03:00
|
|
|
ht->key_len = ht->p.key_len;
|
|
|
|
if (!params->hashfn) {
|
|
|
|
ht->p.hashfn = jhash;
|
|
|
|
|
|
|
|
if (!(ht->key_len & (sizeof(u32) - 1))) {
|
|
|
|
ht->key_len /= sizeof(u32);
|
|
|
|
ht->p.hashfn = rhashtable_jhash2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-08-22 08:01:48 +03:00
|
|
|
/*
|
|
|
|
* This is api initialization and thus we need to guarantee the
|
|
|
|
* initial rhashtable allocation. Upon failure, retry with the
|
|
|
|
* smallest possible size with __GFP_NOFAIL semantics.
|
|
|
|
*/
|
2015-03-23 16:50:27 +03:00
|
|
|
tbl = bucket_table_alloc(ht, size, GFP_KERNEL);
|
2018-08-22 08:01:48 +03:00
|
|
|
if (unlikely(tbl == NULL)) {
|
|
|
|
size = max_t(u16, ht->p.min_size, HASH_MIN_SIZE);
|
|
|
|
tbl = bucket_table_alloc(ht, size, GFP_KERNEL | __GFP_NOFAIL);
|
|
|
|
}
|
2014-08-02 13:47:44 +04:00
|
|
|
|
2015-01-07 08:41:57 +03:00
|
|
|
atomic_set(&ht->nelems, 0);
|
2015-03-12 17:28:40 +03:00
|
|
|
|
2014-08-02 13:47:44 +04:00
|
|
|
RCU_INIT_POINTER(ht->tbl, tbl);
|
|
|
|
|
2015-02-25 18:31:54 +03:00
|
|
|
INIT_WORK(&ht->run_work, rht_deferred_worker);
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2014-08-02 13:47:44 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_init);
|
|
|
|
|
2016-09-19 14:00:09 +03:00
|
|
|
/**
|
|
|
|
* rhltable_init - initialize a new hash list table
|
|
|
|
* @hlt: hash list table to be initialized
|
|
|
|
* @params: configuration parameters
|
|
|
|
*
|
|
|
|
* Initializes a new hash list table.
|
|
|
|
*
|
|
|
|
* See documentation for rhashtable_init.
|
|
|
|
*/
|
|
|
|
int rhltable_init(struct rhltable *hlt, const struct rhashtable_params *params)
|
|
|
|
{
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = rhashtable_init(&hlt->ht, params);
|
|
|
|
hlt->ht.rhlist = true;
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rhltable_init);
|
|
|
|
|
|
|
|
static void rhashtable_free_one(struct rhashtable *ht, struct rhash_head *obj,
|
|
|
|
void (*free_fn)(void *ptr, void *arg),
|
|
|
|
void *arg)
|
|
|
|
{
|
|
|
|
struct rhlist_head *list;
|
|
|
|
|
|
|
|
if (!ht->rhlist) {
|
|
|
|
free_fn(rht_obj(ht, obj), arg);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
list = container_of(obj, struct rhlist_head, rhead);
|
|
|
|
do {
|
|
|
|
obj = &list->rhead;
|
|
|
|
list = rht_dereference(list->next, ht);
|
|
|
|
free_fn(rht_obj(ht, obj), arg);
|
|
|
|
} while (list);
|
|
|
|
}
|
|
|
|
|
2014-08-02 13:47:44 +04:00
|
|
|
/**
|
2015-03-24 16:18:20 +03:00
|
|
|
* rhashtable_free_and_destroy - free elements and destroy hash table
|
2014-08-02 13:47:44 +04:00
|
|
|
* @ht: the hash table to destroy
|
2015-03-24 16:18:20 +03:00
|
|
|
* @free_fn: callback to release resources of element
|
|
|
|
* @arg: pointer passed to free_fn
|
2014-08-02 13:47:44 +04:00
|
|
|
*
|
2015-03-24 16:18:20 +03:00
|
|
|
* Stops an eventual async resize. If defined, invokes free_fn for each
|
|
|
|
* element to releasal resources. Please note that RCU protected
|
|
|
|
* readers may still be accessing the elements. Releasing of resources
|
|
|
|
* must occur in a compatible manner. Then frees the bucket array.
|
|
|
|
*
|
|
|
|
* This function will eventually sleep to wait for an async resize
|
|
|
|
* to complete. The caller is responsible that no further write operations
|
|
|
|
* occurs in parallel.
|
2014-08-02 13:47:44 +04:00
|
|
|
*/
|
2015-03-24 16:18:20 +03:00
|
|
|
void rhashtable_free_and_destroy(struct rhashtable *ht,
|
|
|
|
void (*free_fn)(void *ptr, void *arg),
|
|
|
|
void *arg)
|
2014-08-02 13:47:44 +04:00
|
|
|
{
|
rhashtable: add restart routine in rhashtable_free_and_destroy()
rhashtable_free_and_destroy() cancels re-hash deferred work
then walks and destroys elements. at this moment, some elements can be
still in future_tbl. that elements are not destroyed.
test case:
nft_rhash_destroy() calls rhashtable_free_and_destroy() to destroy
all elements of sets before destroying sets and chains.
But rhashtable_free_and_destroy() doesn't destroy elements of future_tbl.
so that splat occurred.
test script:
%cat test.nft
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
%while :; do nft -f test.nft; done
Splat looks like:
[ 200.795603] kernel BUG at net/netfilter/nf_tables_api.c:1363!
[ 200.806944] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI
[ 200.812253] CPU: 1 PID: 1582 Comm: nft Not tainted 4.17.0+ #24
[ 200.820297] Hardware name: To be filled by O.E.M. To be filled by O.E.M./Aptio CRB, BIOS 5.6.5 07/08/2015
[ 200.830309] RIP: 0010:nf_tables_chain_destroy.isra.34+0x62/0x240 [nf_tables]
[ 200.838317] Code: 43 50 85 c0 74 26 48 8b 45 00 48 8b 4d 08 ba 54 05 00 00 48 c7 c6 60 6d 29 c0 48 c7 c7 c0 65 29 c0 4c 8b 40 08 e8 58 e5 fd f8 <0f> 0b 48 89 da 48 b8 00 00 00 00 00 fc ff
[ 200.860366] RSP: 0000:ffff880118dbf4d0 EFLAGS: 00010282
[ 200.866354] RAX: 0000000000000061 RBX: ffff88010cdeaf08 RCX: 0000000000000000
[ 200.874355] RDX: 0000000000000061 RSI: 0000000000000008 RDI: ffffed00231b7e90
[ 200.882361] RBP: ffff880118dbf4e8 R08: ffffed002373bcfb R09: ffffed002373bcfa
[ 200.890354] R10: 0000000000000000 R11: ffffed002373bcfb R12: dead000000000200
[ 200.898356] R13: dead000000000100 R14: ffffffffbb62af38 R15: dffffc0000000000
[ 200.906354] FS: 00007fefc31fd700(0000) GS:ffff88011b800000(0000) knlGS:0000000000000000
[ 200.915533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 200.922355] CR2: 0000557f1c8e9128 CR3: 0000000106880000 CR4: 00000000001006e0
[ 200.930353] Call Trace:
[ 200.932351] ? nf_tables_commit+0x26f6/0x2c60 [nf_tables]
[ 200.939525] ? nf_tables_setelem_notify.constprop.49+0x1a0/0x1a0 [nf_tables]
[ 200.947525] ? nf_tables_delchain+0x6e0/0x6e0 [nf_tables]
[ 200.952383] ? nft_add_set_elem+0x1700/0x1700 [nf_tables]
[ 200.959532] ? nla_parse+0xab/0x230
[ 200.963529] ? nfnetlink_rcv_batch+0xd06/0x10d0 [nfnetlink]
[ 200.968384] ? nfnetlink_net_init+0x130/0x130 [nfnetlink]
[ 200.975525] ? debug_show_all_locks+0x290/0x290
[ 200.980363] ? debug_show_all_locks+0x290/0x290
[ 200.986356] ? sched_clock_cpu+0x132/0x170
[ 200.990352] ? find_held_lock+0x39/0x1b0
[ 200.994355] ? sched_clock_local+0x10d/0x130
[ 200.999531] ? memset+0x1f/0x40
V2:
- free all tables requested by Herbert Xu
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-08 05:55:51 +03:00
|
|
|
struct bucket_table *tbl, *next_tbl;
|
2015-03-24 16:18:20 +03:00
|
|
|
unsigned int i;
|
2015-01-03 01:00:20 +03:00
|
|
|
|
2015-02-25 18:31:54 +03:00
|
|
|
cancel_work_sync(&ht->run_work);
|
2015-01-03 01:00:20 +03:00
|
|
|
|
rhashtable: Fix race in rhashtable_destroy() and use regular work_struct
When we put our declared work task in the global workqueue with
schedule_delayed_work(), its delay parameter is always zero.
Therefore, we should define a regular work in rhashtable structure
instead of a delayed work.
By the way, we add a condition to check whether resizing functions
are NULL before cancelling the work, avoiding to cancel an
uninitialized work.
Lastly, while we wait for all work items we submitted before to run
to completion with cancel_delayed_work(), ht->mutex has been taken in
rhashtable_destroy(). Moreover, cancel_delayed_work() doesn't return
until all work items are accomplished, and when work items are
scheduled, the work's function - rht_deferred_worker() will be called.
However, as rht_deferred_worker() also needs to acquire the lock,
deadlock might happen at the moment as the lock is already held before.
So if the cancel work function is moved out of the lock covered scope,
this will avoid the deadlock.
Fixes: 97defe1 ("rhashtable: Per bucket locks & deferred expansion/shrinking")
Signed-off-by: Ying Xue <ying.xue@windriver.com>
Cc: Thomas Graf <tgraf@suug.ch>
Acked-by: Thomas Graf <tgraf@suug.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-16 06:13:09 +03:00
|
|
|
mutex_lock(&ht->mutex);
|
2015-03-24 16:18:20 +03:00
|
|
|
tbl = rht_dereference(ht->tbl, ht);
|
rhashtable: add restart routine in rhashtable_free_and_destroy()
rhashtable_free_and_destroy() cancels re-hash deferred work
then walks and destroys elements. at this moment, some elements can be
still in future_tbl. that elements are not destroyed.
test case:
nft_rhash_destroy() calls rhashtable_free_and_destroy() to destroy
all elements of sets before destroying sets and chains.
But rhashtable_free_and_destroy() doesn't destroy elements of future_tbl.
so that splat occurred.
test script:
%cat test.nft
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
%while :; do nft -f test.nft; done
Splat looks like:
[ 200.795603] kernel BUG at net/netfilter/nf_tables_api.c:1363!
[ 200.806944] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI
[ 200.812253] CPU: 1 PID: 1582 Comm: nft Not tainted 4.17.0+ #24
[ 200.820297] Hardware name: To be filled by O.E.M. To be filled by O.E.M./Aptio CRB, BIOS 5.6.5 07/08/2015
[ 200.830309] RIP: 0010:nf_tables_chain_destroy.isra.34+0x62/0x240 [nf_tables]
[ 200.838317] Code: 43 50 85 c0 74 26 48 8b 45 00 48 8b 4d 08 ba 54 05 00 00 48 c7 c6 60 6d 29 c0 48 c7 c7 c0 65 29 c0 4c 8b 40 08 e8 58 e5 fd f8 <0f> 0b 48 89 da 48 b8 00 00 00 00 00 fc ff
[ 200.860366] RSP: 0000:ffff880118dbf4d0 EFLAGS: 00010282
[ 200.866354] RAX: 0000000000000061 RBX: ffff88010cdeaf08 RCX: 0000000000000000
[ 200.874355] RDX: 0000000000000061 RSI: 0000000000000008 RDI: ffffed00231b7e90
[ 200.882361] RBP: ffff880118dbf4e8 R08: ffffed002373bcfb R09: ffffed002373bcfa
[ 200.890354] R10: 0000000000000000 R11: ffffed002373bcfb R12: dead000000000200
[ 200.898356] R13: dead000000000100 R14: ffffffffbb62af38 R15: dffffc0000000000
[ 200.906354] FS: 00007fefc31fd700(0000) GS:ffff88011b800000(0000) knlGS:0000000000000000
[ 200.915533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 200.922355] CR2: 0000557f1c8e9128 CR3: 0000000106880000 CR4: 00000000001006e0
[ 200.930353] Call Trace:
[ 200.932351] ? nf_tables_commit+0x26f6/0x2c60 [nf_tables]
[ 200.939525] ? nf_tables_setelem_notify.constprop.49+0x1a0/0x1a0 [nf_tables]
[ 200.947525] ? nf_tables_delchain+0x6e0/0x6e0 [nf_tables]
[ 200.952383] ? nft_add_set_elem+0x1700/0x1700 [nf_tables]
[ 200.959532] ? nla_parse+0xab/0x230
[ 200.963529] ? nfnetlink_rcv_batch+0xd06/0x10d0 [nfnetlink]
[ 200.968384] ? nfnetlink_net_init+0x130/0x130 [nfnetlink]
[ 200.975525] ? debug_show_all_locks+0x290/0x290
[ 200.980363] ? debug_show_all_locks+0x290/0x290
[ 200.986356] ? sched_clock_cpu+0x132/0x170
[ 200.990352] ? find_held_lock+0x39/0x1b0
[ 200.994355] ? sched_clock_local+0x10d/0x130
[ 200.999531] ? memset+0x1f/0x40
V2:
- free all tables requested by Herbert Xu
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-08 05:55:51 +03:00
|
|
|
restart:
|
2015-03-24 16:18:20 +03:00
|
|
|
if (free_fn) {
|
|
|
|
for (i = 0; i < tbl->size; i++) {
|
|
|
|
struct rhash_head *pos, *next;
|
|
|
|
|
2018-03-31 22:58:48 +03:00
|
|
|
cond_resched();
|
2019-04-12 04:52:08 +03:00
|
|
|
for (pos = rht_ptr_exclusive(rht_bucket(tbl, i)),
|
2015-03-24 16:18:20 +03:00
|
|
|
next = !rht_is_a_nulls(pos) ?
|
|
|
|
rht_dereference(pos->next, ht) : NULL;
|
|
|
|
!rht_is_a_nulls(pos);
|
|
|
|
pos = next,
|
|
|
|
next = !rht_is_a_nulls(pos) ?
|
|
|
|
rht_dereference(pos->next, ht) : NULL)
|
2016-09-19 14:00:09 +03:00
|
|
|
rhashtable_free_one(ht, pos, free_fn, arg);
|
2015-03-24 16:18:20 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
rhashtable: add restart routine in rhashtable_free_and_destroy()
rhashtable_free_and_destroy() cancels re-hash deferred work
then walks and destroys elements. at this moment, some elements can be
still in future_tbl. that elements are not destroyed.
test case:
nft_rhash_destroy() calls rhashtable_free_and_destroy() to destroy
all elements of sets before destroying sets and chains.
But rhashtable_free_and_destroy() doesn't destroy elements of future_tbl.
so that splat occurred.
test script:
%cat test.nft
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
%while :; do nft -f test.nft; done
Splat looks like:
[ 200.795603] kernel BUG at net/netfilter/nf_tables_api.c:1363!
[ 200.806944] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI
[ 200.812253] CPU: 1 PID: 1582 Comm: nft Not tainted 4.17.0+ #24
[ 200.820297] Hardware name: To be filled by O.E.M. To be filled by O.E.M./Aptio CRB, BIOS 5.6.5 07/08/2015
[ 200.830309] RIP: 0010:nf_tables_chain_destroy.isra.34+0x62/0x240 [nf_tables]
[ 200.838317] Code: 43 50 85 c0 74 26 48 8b 45 00 48 8b 4d 08 ba 54 05 00 00 48 c7 c6 60 6d 29 c0 48 c7 c7 c0 65 29 c0 4c 8b 40 08 e8 58 e5 fd f8 <0f> 0b 48 89 da 48 b8 00 00 00 00 00 fc ff
[ 200.860366] RSP: 0000:ffff880118dbf4d0 EFLAGS: 00010282
[ 200.866354] RAX: 0000000000000061 RBX: ffff88010cdeaf08 RCX: 0000000000000000
[ 200.874355] RDX: 0000000000000061 RSI: 0000000000000008 RDI: ffffed00231b7e90
[ 200.882361] RBP: ffff880118dbf4e8 R08: ffffed002373bcfb R09: ffffed002373bcfa
[ 200.890354] R10: 0000000000000000 R11: ffffed002373bcfb R12: dead000000000200
[ 200.898356] R13: dead000000000100 R14: ffffffffbb62af38 R15: dffffc0000000000
[ 200.906354] FS: 00007fefc31fd700(0000) GS:ffff88011b800000(0000) knlGS:0000000000000000
[ 200.915533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 200.922355] CR2: 0000557f1c8e9128 CR3: 0000000106880000 CR4: 00000000001006e0
[ 200.930353] Call Trace:
[ 200.932351] ? nf_tables_commit+0x26f6/0x2c60 [nf_tables]
[ 200.939525] ? nf_tables_setelem_notify.constprop.49+0x1a0/0x1a0 [nf_tables]
[ 200.947525] ? nf_tables_delchain+0x6e0/0x6e0 [nf_tables]
[ 200.952383] ? nft_add_set_elem+0x1700/0x1700 [nf_tables]
[ 200.959532] ? nla_parse+0xab/0x230
[ 200.963529] ? nfnetlink_rcv_batch+0xd06/0x10d0 [nfnetlink]
[ 200.968384] ? nfnetlink_net_init+0x130/0x130 [nfnetlink]
[ 200.975525] ? debug_show_all_locks+0x290/0x290
[ 200.980363] ? debug_show_all_locks+0x290/0x290
[ 200.986356] ? sched_clock_cpu+0x132/0x170
[ 200.990352] ? find_held_lock+0x39/0x1b0
[ 200.994355] ? sched_clock_local+0x10d/0x130
[ 200.999531] ? memset+0x1f/0x40
V2:
- free all tables requested by Herbert Xu
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-08 05:55:51 +03:00
|
|
|
next_tbl = rht_dereference(tbl->future_tbl, ht);
|
2015-03-24 16:18:20 +03:00
|
|
|
bucket_table_free(tbl);
|
rhashtable: add restart routine in rhashtable_free_and_destroy()
rhashtable_free_and_destroy() cancels re-hash deferred work
then walks and destroys elements. at this moment, some elements can be
still in future_tbl. that elements are not destroyed.
test case:
nft_rhash_destroy() calls rhashtable_free_and_destroy() to destroy
all elements of sets before destroying sets and chains.
But rhashtable_free_and_destroy() doesn't destroy elements of future_tbl.
so that splat occurred.
test script:
%cat test.nft
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
table ip aa {
map map1 {
type ipv4_addr : verdict;
elements = {
0 : jump a0,
1 : jump a0,
2 : jump a0,
3 : jump a0,
4 : jump a0,
5 : jump a0,
6 : jump a0,
7 : jump a0,
8 : jump a0,
9 : jump a0,
}
}
chain a0 {
}
}
flush ruleset
%while :; do nft -f test.nft; done
Splat looks like:
[ 200.795603] kernel BUG at net/netfilter/nf_tables_api.c:1363!
[ 200.806944] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI
[ 200.812253] CPU: 1 PID: 1582 Comm: nft Not tainted 4.17.0+ #24
[ 200.820297] Hardware name: To be filled by O.E.M. To be filled by O.E.M./Aptio CRB, BIOS 5.6.5 07/08/2015
[ 200.830309] RIP: 0010:nf_tables_chain_destroy.isra.34+0x62/0x240 [nf_tables]
[ 200.838317] Code: 43 50 85 c0 74 26 48 8b 45 00 48 8b 4d 08 ba 54 05 00 00 48 c7 c6 60 6d 29 c0 48 c7 c7 c0 65 29 c0 4c 8b 40 08 e8 58 e5 fd f8 <0f> 0b 48 89 da 48 b8 00 00 00 00 00 fc ff
[ 200.860366] RSP: 0000:ffff880118dbf4d0 EFLAGS: 00010282
[ 200.866354] RAX: 0000000000000061 RBX: ffff88010cdeaf08 RCX: 0000000000000000
[ 200.874355] RDX: 0000000000000061 RSI: 0000000000000008 RDI: ffffed00231b7e90
[ 200.882361] RBP: ffff880118dbf4e8 R08: ffffed002373bcfb R09: ffffed002373bcfa
[ 200.890354] R10: 0000000000000000 R11: ffffed002373bcfb R12: dead000000000200
[ 200.898356] R13: dead000000000100 R14: ffffffffbb62af38 R15: dffffc0000000000
[ 200.906354] FS: 00007fefc31fd700(0000) GS:ffff88011b800000(0000) knlGS:0000000000000000
[ 200.915533] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 200.922355] CR2: 0000557f1c8e9128 CR3: 0000000106880000 CR4: 00000000001006e0
[ 200.930353] Call Trace:
[ 200.932351] ? nf_tables_commit+0x26f6/0x2c60 [nf_tables]
[ 200.939525] ? nf_tables_setelem_notify.constprop.49+0x1a0/0x1a0 [nf_tables]
[ 200.947525] ? nf_tables_delchain+0x6e0/0x6e0 [nf_tables]
[ 200.952383] ? nft_add_set_elem+0x1700/0x1700 [nf_tables]
[ 200.959532] ? nla_parse+0xab/0x230
[ 200.963529] ? nfnetlink_rcv_batch+0xd06/0x10d0 [nfnetlink]
[ 200.968384] ? nfnetlink_net_init+0x130/0x130 [nfnetlink]
[ 200.975525] ? debug_show_all_locks+0x290/0x290
[ 200.980363] ? debug_show_all_locks+0x290/0x290
[ 200.986356] ? sched_clock_cpu+0x132/0x170
[ 200.990352] ? find_held_lock+0x39/0x1b0
[ 200.994355] ? sched_clock_local+0x10d/0x130
[ 200.999531] ? memset+0x1f/0x40
V2:
- free all tables requested by Herbert Xu
Signed-off-by: Taehee Yoo <ap420073@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
2018-07-08 05:55:51 +03:00
|
|
|
if (next_tbl) {
|
|
|
|
tbl = next_tbl;
|
|
|
|
goto restart;
|
|
|
|
}
|
2015-01-03 01:00:20 +03:00
|
|
|
mutex_unlock(&ht->mutex);
|
2014-08-02 13:47:44 +04:00
|
|
|
}
|
2015-03-24 16:18:20 +03:00
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_free_and_destroy);
|
|
|
|
|
|
|
|
void rhashtable_destroy(struct rhashtable *ht)
|
|
|
|
{
|
|
|
|
return rhashtable_free_and_destroy(ht, NULL, NULL);
|
|
|
|
}
|
2014-08-02 13:47:44 +04:00
|
|
|
EXPORT_SYMBOL_GPL(rhashtable_destroy);
|
2017-02-11 14:26:47 +03:00
|
|
|
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **__rht_bucket_nested(const struct bucket_table *tbl,
|
|
|
|
unsigned int hash)
|
2017-02-11 14:26:47 +03:00
|
|
|
{
|
|
|
|
const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *));
|
|
|
|
unsigned int index = hash & ((1 << tbl->nest) - 1);
|
|
|
|
unsigned int size = tbl->size >> tbl->nest;
|
|
|
|
unsigned int subhash = hash;
|
|
|
|
union nested_table *ntbl;
|
|
|
|
|
2020-06-03 11:12:43 +03:00
|
|
|
ntbl = nested_table_top(tbl);
|
2017-02-25 17:39:50 +03:00
|
|
|
ntbl = rht_dereference_bucket_rcu(ntbl[index].table, tbl, hash);
|
2017-02-11 14:26:47 +03:00
|
|
|
subhash >>= tbl->nest;
|
|
|
|
|
|
|
|
while (ntbl && size > (1 << shift)) {
|
|
|
|
index = subhash & ((1 << shift) - 1);
|
2017-02-25 17:39:50 +03:00
|
|
|
ntbl = rht_dereference_bucket_rcu(ntbl[index].table,
|
|
|
|
tbl, hash);
|
2017-02-11 14:26:47 +03:00
|
|
|
size >>= shift;
|
|
|
|
subhash >>= shift;
|
|
|
|
}
|
|
|
|
|
2019-04-02 02:07:45 +03:00
|
|
|
if (!ntbl)
|
|
|
|
return NULL;
|
2017-02-11 14:26:47 +03:00
|
|
|
|
|
|
|
return &ntbl[subhash].bucket;
|
|
|
|
|
|
|
|
}
|
2019-04-02 02:07:45 +03:00
|
|
|
EXPORT_SYMBOL_GPL(__rht_bucket_nested);
|
|
|
|
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **rht_bucket_nested(const struct bucket_table *tbl,
|
|
|
|
unsigned int hash)
|
2019-04-02 02:07:45 +03:00
|
|
|
{
|
2019-05-16 10:19:46 +03:00
|
|
|
static struct rhash_lock_head *rhnull;
|
2019-04-02 02:07:45 +03:00
|
|
|
|
|
|
|
if (!rhnull)
|
|
|
|
INIT_RHT_NULLS_HEAD(rhnull);
|
|
|
|
return __rht_bucket_nested(tbl, hash) ?: &rhnull;
|
|
|
|
}
|
2017-02-11 14:26:47 +03:00
|
|
|
EXPORT_SYMBOL_GPL(rht_bucket_nested);
|
|
|
|
|
2019-05-16 10:19:46 +03:00
|
|
|
struct rhash_lock_head **rht_bucket_nested_insert(struct rhashtable *ht,
|
|
|
|
struct bucket_table *tbl,
|
|
|
|
unsigned int hash)
|
2017-02-11 14:26:47 +03:00
|
|
|
{
|
|
|
|
const unsigned int shift = PAGE_SHIFT - ilog2(sizeof(void *));
|
|
|
|
unsigned int index = hash & ((1 << tbl->nest) - 1);
|
|
|
|
unsigned int size = tbl->size >> tbl->nest;
|
|
|
|
union nested_table *ntbl;
|
|
|
|
|
2020-06-03 11:12:43 +03:00
|
|
|
ntbl = nested_table_top(tbl);
|
2017-02-11 14:26:47 +03:00
|
|
|
hash >>= tbl->nest;
|
|
|
|
ntbl = nested_table_alloc(ht, &ntbl[index].table,
|
2018-06-18 05:52:50 +03:00
|
|
|
size <= (1 << shift));
|
2017-02-11 14:26:47 +03:00
|
|
|
|
|
|
|
while (ntbl && size > (1 << shift)) {
|
|
|
|
index = hash & ((1 << shift) - 1);
|
|
|
|
size >>= shift;
|
|
|
|
hash >>= shift;
|
|
|
|
ntbl = nested_table_alloc(ht, &ntbl[index].table,
|
2018-06-18 05:52:50 +03:00
|
|
|
size <= (1 << shift));
|
2017-02-11 14:26:47 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (!ntbl)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
return &ntbl[hash].bucket;
|
|
|
|
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(rht_bucket_nested_insert);
|