Commit f361bdde authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'rhashtable-dups' 



Herbert Xu says:

====================
rhashtable: rhashtable with duplicate objects

v3 fixes a bug in the remove path that causes the element count
to decrease when it shouldn't, leading to a gigantic hash table
when it underflows.

v2 contains a reworked insertion slowpath to ensure that the
spinlock for the table we're inserting into is taken.

This series contains two patches.  The first adds the rhlist
interface and the second converts mac80211 to use it.  If this
works out I'll then proceed to convert the other insecure_elasticity
users over to this.

I've tested the rhlist code with test_rhashtable but I haven't
tested the mac80211 conversion.  So please give it a go and see
if it still works.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents fd07160b 83e7e4ce

include/linux/rhashtable.h

+377 −114
Original line number Diff line number Diff line 
/*

 * Resizable, Scalable, Concurrent Hash Table

 *

 * Copyright (c) 2015 Herbert Xu <herbert@gondor.apana.org.au>

 * Copyright (c) 2015-2016 Herbert Xu <herbert@gondor.apana.org.au>

 * Copyright (c) 2014-2015 Thomas Graf <tgraf@suug.ch>

 * Copyright (c) 2008-2014 Patrick McHardy <kaber@trash.net>

 *
@@ -53,6 +53,11 @@ struct rhash_head { 
	struct rhash_head __rcu		*next;

};



struct rhlist_head {

	struct rhash_head		rhead;

	struct rhlist_head __rcu	*next;

};



/**

 * struct bucket_table - Table of hash buckets

 * @size: Number of hash buckets
@@ -137,6 +142,7 @@ struct rhashtable_params { 
 * @key_len: Key length for hashfn

 * @elasticity: Maximum chain length before rehash

 * @p: Configuration parameters

 * @rhlist: True if this is an rhltable

 * @run_work: Deferred worker to expand/shrink asynchronously

 * @mutex: Mutex to protect current/future table swapping

 * @lock: Spin lock to protect walker list
@@ -147,11 +153,20 @@ struct rhashtable { 
	unsigned int			key_len;

	unsigned int			elasticity;

	struct rhashtable_params	p;

	bool				rhlist;

	struct work_struct		run_work;

	struct mutex                    mutex;

	spinlock_t			lock;

};



/**

 * struct rhltable - Hash table with duplicate objects in a list

 * @ht: Underlying rhtable

 */

struct rhltable {

	struct rhashtable ht;

};



/**

 * struct rhashtable_walker - Hash table walker

 * @list: List entry on list of walkers
@@ -163,9 +178,10 @@ struct rhashtable_walker { 
};



/**

 * struct rhashtable_iter - Hash table iterator, fits into netlink cb

 * struct rhashtable_iter - Hash table iterator

 * @ht: Table to iterate through

 * @p: Current pointer

 * @list: Current hash list pointer

 * @walker: Associated rhashtable walker

 * @slot: Current slot

 * @skip: Number of entries to skip in slot
@@ -173,6 +189,7 @@ struct rhashtable_walker { 
struct rhashtable_iter {

	struct rhashtable *ht;

	struct rhash_head *p;

	struct rhlist_head *list;

	struct rhashtable_walker walker;

	unsigned int slot;

	unsigned int skip;
@@ -339,13 +356,11 @@ static inline int lockdep_rht_bucket_is_held(const struct bucket_table *tbl, 


int rhashtable_init(struct rhashtable *ht,

		    const struct rhashtable_params *params);

int rhltable_init(struct rhltable *hlt,

		  const struct rhashtable_params *params);



struct bucket_table *rhashtable_insert_slow(struct rhashtable *ht,

					    const void *key,

					    struct rhash_head *obj,

					    struct bucket_table *old_tbl,

					    void **data);

int rhashtable_insert_rehash(struct rhashtable *ht, struct bucket_table *tbl);

void *rhashtable_insert_slow(struct rhashtable *ht, const void *key,

			     struct rhash_head *obj);



void rhashtable_walk_enter(struct rhashtable *ht,

			   struct rhashtable_iter *iter);
@@ -507,6 +522,31 @@ void rhashtable_destroy(struct rhashtable *ht); 
	rht_for_each_entry_rcu_continue(tpos, pos, (tbl)->buckets[hash],\

					tbl, hash, member)



/**

 * rhl_for_each_rcu - iterate over rcu hash table list

 * @pos:	the &struct rlist_head to use as a loop cursor.

 * @list:	the head of the list

 *

 * This hash chain list-traversal primitive should be used on the

 * list returned by rhltable_lookup.

 */

#define rhl_for_each_rcu(pos, list)					\

	for (pos = list; pos; pos = rcu_dereference_raw(pos->next))



/**

 * rhl_for_each_entry_rcu - iterate over rcu hash table list of given type

 * @tpos:	the type * to use as a loop cursor.

 * @pos:	the &struct rlist_head to use as a loop cursor.

 * @list:	the head of the list

 * @member:	name of the &struct rlist_head within the hashable struct.

 *

 * This hash chain list-traversal primitive should be used on the

 * list returned by rhltable_lookup.

 */

#define rhl_for_each_entry_rcu(tpos, pos, list, member)			\

	for (pos = list; pos && rht_entry(tpos, pos, member);		\

	     pos = rcu_dereference_raw(pos->next))



static inline int rhashtable_compare(struct rhashtable_compare_arg *arg,

				     const void *obj)

{
@@ -516,18 +556,8 @@ static inline int rhashtable_compare(struct rhashtable_compare_arg *arg, 
	return memcmp(ptr + ht->p.key_offset, arg->key, ht->p.key_len);

}



/**

 * rhashtable_lookup_fast - search hash table, inlined version

 * @ht:		hash table

 * @key:	the pointer to the key

 * @params:	hash table parameters

 *

 * Computes the hash value for the key and traverses the bucket chain looking

 * for a entry with an identical key. The first matching entry is returned.

 *

 * Returns the first entry on which the compare function returned true.

 */

static inline void *rhashtable_lookup_fast(

/* Internal function, do not use. */

static inline struct rhash_head *__rhashtable_lookup(

	struct rhashtable *ht, const void *key,

	const struct rhashtable_params params)

{
@@ -539,8 +569,6 @@ static inline void *rhashtable_lookup_fast( 
	struct rhash_head *he;

	unsigned int hash;



	rcu_read_lock();



	tbl = rht_dereference_rcu(ht->tbl, ht);

restart:

	hash = rht_key_hashfn(ht, tbl, key, params);
@@ -549,8 +577,7 @@ restart: 
		    params.obj_cmpfn(&arg, rht_obj(ht, he)) :

		    rhashtable_compare(&arg, rht_obj(ht, he)))

			continue;

		rcu_read_unlock();

		return rht_obj(ht, he);

		return he;

	}



	/* Ensure we see any new tables. */
@@ -559,96 +586,165 @@ restart: 
	tbl = rht_dereference_rcu(tbl->future_tbl, ht);

	if (unlikely(tbl))

		goto restart;

	rcu_read_unlock();



	return NULL;

}



/**

 * rhashtable_lookup - search hash table

 * @ht:		hash table

 * @key:	the pointer to the key

 * @params:	hash table parameters

 *

 * Computes the hash value for the key and traverses the bucket chain looking

 * for a entry with an identical key. The first matching entry is returned.

 *

 * This must only be called under the RCU read lock.

 *

 * Returns the first entry on which the compare function returned true.

 */

static inline void *rhashtable_lookup(

	struct rhashtable *ht, const void *key,

	const struct rhashtable_params params)

{

	struct rhash_head *he = __rhashtable_lookup(ht, key, params);



	return he ? rht_obj(ht, he) : NULL;

}



/**

 * rhashtable_lookup_fast - search hash table, without RCU read lock

 * @ht:		hash table

 * @key:	the pointer to the key

 * @params:	hash table parameters

 *

 * Computes the hash value for the key and traverses the bucket chain looking

 * for a entry with an identical key. The first matching entry is returned.

 *

 * Only use this function when you have other mechanisms guaranteeing

 * that the object won't go away after the RCU read lock is released.

 *

 * Returns the first entry on which the compare function returned true.

 */

static inline void *rhashtable_lookup_fast(

	struct rhashtable *ht, const void *key,

	const struct rhashtable_params params)

{

	void *obj;



	rcu_read_lock();

	obj = rhashtable_lookup(ht, key, params);

	rcu_read_unlock();



	return obj;

}



/**

 * rhltable_lookup - search hash list table

 * @hlt:	hash table

 * @key:	the pointer to the key

 * @params:	hash table parameters

 *

 * Computes the hash value for the key and traverses the bucket chain looking

 * for a entry with an identical key.  All matching entries are returned

 * in a list.

 *

 * This must only be called under the RCU read lock.

 *

 * Returns the list of entries that match the given key.

 */

static inline struct rhlist_head *rhltable_lookup(

	struct rhltable *hlt, const void *key,

	const struct rhashtable_params params)

{

	struct rhash_head *he = __rhashtable_lookup(&hlt->ht, key, params);



	return he ? container_of(he, struct rhlist_head, rhead) : NULL;

}



/* Internal function, please use rhashtable_insert_fast() instead. This

 * function returns the existing element already in hashes in there is a clash,

 * otherwise it returns an error via ERR_PTR().

 */

static inline void *__rhashtable_insert_fast(

	struct rhashtable *ht, const void *key, struct rhash_head *obj,

	const struct rhashtable_params params)

	const struct rhashtable_params params, bool rhlist)

{

	struct rhashtable_compare_arg arg = {

		.ht = ht,

		.key = key,

	};

	struct bucket_table *tbl, *new_tbl;

	struct rhash_head __rcu **pprev;

	struct bucket_table *tbl;

	struct rhash_head *head;

	spinlock_t *lock;

	unsigned int elasticity;

	unsigned int hash;

	void *data = NULL;

	int err;

	int elasticity;

	void *data;



restart:

	rcu_read_lock();



	tbl = rht_dereference_rcu(ht->tbl, ht);



	/* All insertions must grab the oldest table containing

	 * the hashed bucket that is yet to be rehashed.

	 */

	for (;;) {

	hash = rht_head_hashfn(ht, tbl, obj, params);

	lock = rht_bucket_lock(tbl, hash);

	spin_lock_bh(lock);



		if (tbl->rehash <= hash)

			break;



	if (unlikely(rht_dereference_bucket(tbl->future_tbl, tbl, hash))) {

slow_path:

		spin_unlock_bh(lock);

		tbl = rht_dereference_rcu(tbl->future_tbl, ht);

		rcu_read_unlock();

		return rhashtable_insert_slow(ht, key, obj);

	}



	new_tbl = rht_dereference_rcu(tbl->future_tbl, ht);

	if (unlikely(new_tbl)) {

		tbl = rhashtable_insert_slow(ht, key, obj, new_tbl, &data);

		if (!IS_ERR_OR_NULL(tbl))

			goto slow_path;

	elasticity = ht->elasticity;

	pprev = &tbl->buckets[hash];

	rht_for_each(head, tbl, hash) {

		struct rhlist_head *plist;

		struct rhlist_head *list;



		err = PTR_ERR(tbl);

		if (err == -EEXIST)

			err = 0;

		elasticity--;

		if (!key ||

		    (params.obj_cmpfn ?

		     params.obj_cmpfn(&arg, rht_obj(ht, head)) :

		     rhashtable_compare(&arg, rht_obj(ht, head))))

			continue;



		goto out;

	}

		data = rht_obj(ht, head);



	err = -E2BIG;

	if (unlikely(rht_grow_above_max(ht, tbl)))

		if (!rhlist)

			goto out;



	if (unlikely(rht_grow_above_100(ht, tbl))) {

slow_path:

		spin_unlock_bh(lock);

		err = rhashtable_insert_rehash(ht, tbl);

		rcu_read_unlock();

		if (err)

			return ERR_PTR(err);



		goto restart;

		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);

		rcu_assign_pointer(*pprev, obj);



		goto good;

	}



	err = 0;

	elasticity = ht->elasticity;

	rht_for_each(head, tbl, hash) {

		if (key &&

		    unlikely(!(params.obj_cmpfn ?

			       params.obj_cmpfn(&arg, rht_obj(ht, head)) :

			       rhashtable_compare(&arg, rht_obj(ht, head))))) {

			data = rht_obj(ht, head);

	if (elasticity <= 0)

		goto slow_path;



	data = ERR_PTR(-E2BIG);

	if (unlikely(rht_grow_above_max(ht, tbl)))

		goto out;

		}

		if (!--elasticity)



	if (unlikely(rht_grow_above_100(ht, tbl)))

		goto slow_path;

	}



	head = rht_dereference_bucket(tbl->buckets[hash], tbl, hash);



	RCU_INIT_POINTER(obj->next, head);

	if (rhlist) {

		struct rhlist_head *list;



		list = container_of(obj, struct rhlist_head, rhead);

		RCU_INIT_POINTER(list->next, NULL);

	}



	rcu_assign_pointer(tbl->buckets[hash], obj);
@@ -656,11 +752,14 @@ slow_path: 
	if (rht_grow_above_75(ht, tbl))

		schedule_work(&ht->run_work);



good:

	data = NULL;



out:

	spin_unlock_bh(lock);

	rcu_read_unlock();



	return err ? ERR_PTR(err) : data;

	return data;

}



/**
@@ -685,13 +784,65 @@ static inline int rhashtable_insert_fast( 
{

	void *ret;



	ret = __rhashtable_insert_fast(ht, NULL, obj, params);

	ret = __rhashtable_insert_fast(ht, NULL, obj, params, false);

	if (IS_ERR(ret))

		return PTR_ERR(ret);



	return ret == NULL ? 0 : -EEXIST;

}



/**

 * rhltable_insert_key - insert object into hash list table

 * @hlt:	hash list table

 * @key:	the pointer to the key

 * @list:	pointer to hash list head inside object

 * @params:	hash table parameters

 *

 * Will take a per bucket spinlock to protect against mutual mutations

 * on the same bucket. Multiple insertions may occur in parallel unless

 * they map to the same bucket lock.

 *

 * It is safe to call this function from atomic context.

 *

 * Will trigger an automatic deferred table resizing if the size grows

 * beyond the watermark indicated by grow_decision() which can be passed

 * to rhashtable_init().

 */

static inline int rhltable_insert_key(

	struct rhltable *hlt, const void *key, struct rhlist_head *list,

	const struct rhashtable_params params)

{

	return PTR_ERR(__rhashtable_insert_fast(&hlt->ht, key, &list->rhead,

						params, true));

}



/**

 * rhltable_insert - insert object into hash list table

 * @hlt:	hash list table

 * @list:	pointer to hash list head inside object

 * @params:	hash table parameters

 *

 * Will take a per bucket spinlock to protect against mutual mutations

 * on the same bucket. Multiple insertions may occur in parallel unless

 * they map to the same bucket lock.

 *

 * It is safe to call this function from atomic context.

 *

 * Will trigger an automatic deferred table resizing if the size grows

 * beyond the watermark indicated by grow_decision() which can be passed

 * to rhashtable_init().

 */

static inline int rhltable_insert(

	struct rhltable *hlt, struct rhlist_head *list,

	const struct rhashtable_params params)

{

	const char *key = rht_obj(&hlt->ht, &list->rhead);



	key += params.key_offset;



	return rhltable_insert_key(hlt, key, list, params);

}



/**

 * rhashtable_lookup_insert_fast - lookup and insert object into hash table

 * @ht:		hash table
@@ -722,7 +873,8 @@ static inline int rhashtable_lookup_insert_fast( 


	BUG_ON(ht->p.obj_hashfn);



	ret = __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj, params);

	ret = __rhashtable_insert_fast(ht, key + ht->p.key_offset, obj, params,

				       false);

	if (IS_ERR(ret))

		return PTR_ERR(ret);
@@ -759,7 +911,7 @@ static inline int rhashtable_lookup_insert_key( 


	BUG_ON(!ht->p.obj_hashfn || !key);



	ret = __rhashtable_insert_fast(ht, key, obj, params);

	ret = __rhashtable_insert_fast(ht, key, obj, params, false);

	if (IS_ERR(ret))

		return PTR_ERR(ret);
@@ -783,13 +935,14 @@ static inline void *rhashtable_lookup_get_insert_key( 
{

	BUG_ON(!ht->p.obj_hashfn || !key);



	return __rhashtable_insert_fast(ht, key, obj, params);

	return __rhashtable_insert_fast(ht, key, obj, params, false);

}



/* Internal function, please use rhashtable_remove_fast() instead */

static inline int __rhashtable_remove_fast(

static inline int __rhashtable_remove_fast_one(

	struct rhashtable *ht, struct bucket_table *tbl,

	struct rhash_head *obj, const struct rhashtable_params params)

	struct rhash_head *obj, const struct rhashtable_params params,

	bool rhlist)

{

	struct rhash_head __rcu **pprev;

	struct rhash_head *he;
@@ -804,18 +957,86 @@ static inline int __rhashtable_remove_fast( 


	pprev = &tbl->buckets[hash];

	rht_for_each(he, tbl, hash) {

		struct rhlist_head *list;



		list = container_of(he, struct rhlist_head, rhead);



		if (he != obj) {

			struct rhlist_head __rcu **lpprev;



			pprev = &he->next;



			if (!rhlist)

				continue;



			do {

				lpprev = &list->next;

				list = rht_dereference_bucket(list->next,

							      tbl, hash);

			} while (list && obj != &list->rhead);



			if (!list)

				continue;



			list = rht_dereference_bucket(list->next, tbl, hash);

			RCU_INIT_POINTER(*lpprev, list);

			err = 0;

			break;

		}



		rcu_assign_pointer(*pprev, obj->next);

		obj = rht_dereference_bucket(obj->next, tbl, hash);

		err = 1;



		if (rhlist) {

			list = rht_dereference_bucket(list->next, tbl, hash);

			if (list) {

				RCU_INIT_POINTER(list->rhead.next, obj);

				obj = &list->rhead;

				err = 0;

			}

		}



		rcu_assign_pointer(*pprev, obj);

		break;

	}



	spin_unlock_bh(lock);



	if (err > 0) {

		atomic_dec(&ht->nelems);

		if (unlikely(ht->p.automatic_shrinking &&

			     rht_shrink_below_30(ht, tbl)))

			schedule_work(&ht->run_work);

		err = 0;

	}



	return err;

}



/* Internal function, please use rhashtable_remove_fast() instead */

static inline int __rhashtable_remove_fast(

	struct rhashtable *ht, struct rhash_head *obj,

	const struct rhashtable_params params, bool rhlist)

{

	struct bucket_table *tbl;

	int err;



	rcu_read_lock();



	tbl = rht_dereference_rcu(ht->tbl, ht);



	/* Because we have already taken (and released) the bucket

	 * lock in old_tbl, if we find that future_tbl is not yet

	 * visible then that guarantees the entry to still be in

	 * the old tbl if it exists.

	 */

	while ((err = __rhashtable_remove_fast_one(ht, tbl, obj, params,

						   rhlist)) &&

	       (tbl = rht_dereference_rcu(tbl->future_tbl, ht)))

		;



	rcu_read_unlock();



	return err;

}
@@ -838,34 +1059,29 @@ static inline int rhashtable_remove_fast( 
	struct rhashtable *ht, struct rhash_head *obj,

	const struct rhashtable_params params)

{

	struct bucket_table *tbl;

	int err;



	rcu_read_lock();



	tbl = rht_dereference_rcu(ht->tbl, ht);

	return __rhashtable_remove_fast(ht, obj, params, false);

}



	/* Because we have already taken (and released) the bucket

	 * lock in old_tbl, if we find that future_tbl is not yet

	 * visible then that guarantees the entry to still be in

	 * the old tbl if it exists.

/**

 * rhltable_remove - remove object from hash list table

 * @hlt:	hash list table

 * @list:	pointer to hash list head inside object

 * @params:	hash table parameters

 *

 * Since the hash chain is single linked, the removal operation needs to

 * walk the bucket chain upon removal. The removal operation is thus

 * considerable slow if the hash table is not correctly sized.

 *

 * Will automatically shrink the table via rhashtable_expand() if the

 * shrink_decision function specified at rhashtable_init() returns true.

 *

 * Returns zero on success, -ENOENT if the entry could not be found.

 */

	while ((err = __rhashtable_remove_fast(ht, tbl, obj, params)) &&

	       (tbl = rht_dereference_rcu(tbl->future_tbl, ht)))

		;



	if (err)

		goto out;



	atomic_dec(&ht->nelems);

	if (unlikely(ht->p.automatic_shrinking &&

		     rht_shrink_below_30(ht, tbl)))

		schedule_work(&ht->run_work);



out:

	rcu_read_unlock();



	return err;

static inline int rhltable_remove(

	struct rhltable *hlt, struct rhlist_head *list,

	const struct rhashtable_params params)

{

	return __rhashtable_remove_fast(&hlt->ht, &list->rhead, params, true);

}



/* Internal function, please use rhashtable_replace_fast() instead */
@@ -958,4 +1174,51 @@ static inline int rhashtable_walk_init(struct rhashtable *ht, 
	return 0;

}



/**

 * rhltable_walk_enter - Initialise an iterator

 * @hlt:	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.

 *

 * This function may sleep so you must not call it from interrupt

 * context or with spin locks held.

 *

 * You must call rhashtable_walk_exit after this function returns.

 */

static inline void rhltable_walk_enter(struct rhltable *hlt,

				       struct rhashtable_iter *iter)

{

	return rhashtable_walk_enter(&hlt->ht, iter);

}



/**

 * rhltable_free_and_destroy - free elements and destroy hash list table

 * @hlt:	the hash list table to destroy

 * @free_fn:	callback to release resources of element

 * @arg:	pointer passed to free_fn

 *

 * See documentation for rhashtable_free_and_destroy.

 */

static inline void rhltable_free_and_destroy(struct rhltable *hlt,

					     void (*free_fn)(void *ptr,

							     void *arg),

					     void *arg)

{

	return rhashtable_free_and_destroy(&hlt->ht, free_fn, arg);

}



static inline void rhltable_destroy(struct rhltable *hlt)

{

	return rhltable_free_and_destroy(hlt, NULL, NULL);

}



#endif /* _LINUX_RHASHTABLE_H */

lib/rhashtable.c

+206 −52

File changed.

Preview size limit exceeded, changes collapsed.

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1213,7 +1213,7 @@ struct ieee80211_local { 
	spinlock_t tim_lock;

	unsigned long num_sta;

	struct list_head sta_list;

	struct rhashtable sta_hash;

	struct rhltable sta_hash;

	struct timer_list sta_cleanup;

	int sta_generation;

net/mac80211/rx.c

+2 −5
Original line number Diff line number Diff line
@@ -4003,7 +4003,7 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, 
	__le16 fc;

	struct ieee80211_rx_data rx;

	struct ieee80211_sub_if_data *prev;

	struct rhash_head *tmp;

	struct rhlist_head *tmp;

	int err = 0;



	fc = ((struct ieee80211_hdr *)skb->data)->frame_control;
@@ -4046,13 +4046,10 @@ static void __ieee80211_rx_handle_packet(struct ieee80211_hw *hw, 
		goto out;

	} else if (ieee80211_is_data(fc)) {

		struct sta_info *sta, *prev_sta;

		const struct bucket_table *tbl;



		prev_sta = NULL;



		tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);



		for_each_sta_info(local, tbl, hdr->addr2, sta, tmp) {

		for_each_sta_info(local, hdr->addr2, sta, tmp) {

			if (!prev_sta) {

				prev_sta = sta;

				continue;

net/mac80211/sta_info.c

+21 −31
Original line number Diff line number Diff line
@@ -67,12 +67,10 @@ 


static const struct rhashtable_params sta_rht_params = {

	.nelem_hint = 3, /* start small */

	.insecure_elasticity = true, /* Disable chain-length checks. */

	.automatic_shrinking = true,

	.head_offset = offsetof(struct sta_info, hash_node),

	.key_offset = offsetof(struct sta_info, addr),

	.key_len = ETH_ALEN,

	.hashfn = sta_addr_hash,

	.max_size = CONFIG_MAC80211_STA_HASH_MAX_SIZE,

};
@@ -80,7 +78,7 @@ static const struct rhashtable_params sta_rht_params = { 
static int sta_info_hash_del(struct ieee80211_local *local,

			     struct sta_info *sta)

{

	return rhashtable_remove_fast(&local->sta_hash, &sta->hash_node,

	return rhltable_remove(&local->sta_hash, &sta->hash_node,

			       sta_rht_params);

}
@@ -157,19 +155,22 @@ static void cleanup_single_sta(struct sta_info *sta) 
	sta_info_free(local, sta);

}



struct rhlist_head *sta_info_hash_lookup(struct ieee80211_local *local,

					 const u8 *addr)

{

	return rhltable_lookup(&local->sta_hash, addr, sta_rht_params);

}



/* protected by RCU */

struct sta_info *sta_info_get(struct ieee80211_sub_if_data *sdata,

			      const u8 *addr)

{

	struct ieee80211_local *local = sdata->local;

	struct rhlist_head *tmp;

	struct sta_info *sta;

	struct rhash_head *tmp;

	const struct bucket_table *tbl;



	rcu_read_lock();

	tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);



	for_each_sta_info(local, tbl, addr, sta, tmp) {

	for_each_sta_info(local, addr, sta, tmp) {

		if (sta->sdata == sdata) {

			rcu_read_unlock();

			/* this is safe as the caller must already hold
@@ -190,14 +191,11 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata, 
				  const u8 *addr)

{

	struct ieee80211_local *local = sdata->local;

	struct rhlist_head *tmp;

	struct sta_info *sta;

	struct rhash_head *tmp;

	const struct bucket_table *tbl;



	rcu_read_lock();

	tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);



	for_each_sta_info(local, tbl, addr, sta, tmp) {

	for_each_sta_info(local, addr, sta, tmp) {

		if (sta->sdata == sdata ||

		    (sta->sdata->bss && sta->sdata->bss == sdata->bss)) {

			rcu_read_unlock();
@@ -263,7 +261,7 @@ void sta_info_free(struct ieee80211_local *local, struct sta_info *sta) 
static int sta_info_hash_add(struct ieee80211_local *local,

			     struct sta_info *sta)

{

	return rhashtable_insert_fast(&local->sta_hash, &sta->hash_node,

	return rhltable_insert(&local->sta_hash, &sta->hash_node,

			       sta_rht_params);

}
@@ -453,9 +451,9 @@ static int sta_info_insert_check(struct sta_info *sta) 
		    is_multicast_ether_addr(sta->sta.addr)))

		return -EINVAL;



	/* Strictly speaking this isn't necessary as we hold the mutex, but

	 * the rhashtable code can't really deal with that distinction. We

	 * do require the mutex for correctness though.

	/* The RCU read lock is required by rhashtable due to

	 * asynchronous resize/rehash.  We also require the mutex

	 * for correctness.

	 */

	rcu_read_lock();

	lockdep_assert_held(&sdata->local->sta_mtx);
@@ -1043,16 +1041,11 @@ static void sta_info_cleanup(unsigned long data) 
		  round_jiffies(jiffies + STA_INFO_CLEANUP_INTERVAL));

}



u32 sta_addr_hash(const void *key, u32 length, u32 seed)

{

	return jhash(key, ETH_ALEN, seed);

}



int sta_info_init(struct ieee80211_local *local)

{

	int err;



	err = rhashtable_init(&local->sta_hash, &sta_rht_params);

	err = rhltable_init(&local->sta_hash, &sta_rht_params);

	if (err)

		return err;
@@ -1068,7 +1061,7 @@ int sta_info_init(struct ieee80211_local *local) 
void sta_info_stop(struct ieee80211_local *local)

{

	del_timer_sync(&local->sta_cleanup);

	rhashtable_destroy(&local->sta_hash);

	rhltable_destroy(&local->sta_hash);

}
@@ -1138,17 +1131,14 @@ struct ieee80211_sta *ieee80211_find_sta_by_ifaddr(struct ieee80211_hw *hw, 
						   const u8 *localaddr)

{

	struct ieee80211_local *local = hw_to_local(hw);

	struct rhlist_head *tmp;

	struct sta_info *sta;

	struct rhash_head *tmp;

	const struct bucket_table *tbl;



	tbl = rht_dereference_rcu(local->sta_hash.tbl, &local->sta_hash);



	/*

	 * Just return a random station if localaddr is NULL

	 * ... first in list.

	 */

	for_each_sta_info(local, tbl, addr, sta, tmp) {

	for_each_sta_info(local, addr, sta, tmp) {

		if (localaddr &&

		    !ether_addr_equal(sta->sdata->vif.addr, localaddr))

			continue;

CRA Git | Maintained and supported by SUSTech CRA and CCSE