mirror of
https://github.com/torvalds/linux.git
synced 2024-11-08 21:21:47 +00:00
b67bfe0d42
I'm not sure why, but the hlist for each entry iterators were conceived list_for_each_entry(pos, head, member) The hlist ones were greedy and wanted an extra parameter: hlist_for_each_entry(tpos, pos, head, member) Why did they need an extra pos parameter? I'm not quite sure. Not only they don't really need it, it also prevents the iterator from looking exactly like the list iterator, which is unfortunate. Besides the semantic patch, there was some manual work required: - Fix up the actual hlist iterators in linux/list.h - Fix up the declaration of other iterators based on the hlist ones. - A very small amount of places were using the 'node' parameter, this was modified to use 'obj->member' instead. - Coccinelle didn't handle the hlist_for_each_entry_safe iterator properly, so those had to be fixed up manually. The semantic patch which is mostly the work of Peter Senna Tschudin is here: @@ iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host; type T; expression a,c,d,e; identifier b; statement S; @@ -T b; <+... when != b ( hlist_for_each_entry(a, - b, c, d) S | hlist_for_each_entry_continue(a, - b, c) S | hlist_for_each_entry_from(a, - b, c) S | hlist_for_each_entry_rcu(a, - b, c, d) S | hlist_for_each_entry_rcu_bh(a, - b, c, d) S | hlist_for_each_entry_continue_rcu_bh(a, - b, c) S | for_each_busy_worker(a, c, - b, d) S | ax25_uid_for_each(a, - b, c) S | ax25_for_each(a, - b, c) S | inet_bind_bucket_for_each(a, - b, c) S | sctp_for_each_hentry(a, - b, c) S | sk_for_each(a, - b, c) S | sk_for_each_rcu(a, - b, c) S | sk_for_each_from -(a, b) +(a) S + sk_for_each_from(a) S | sk_for_each_safe(a, - b, c, d) S | sk_for_each_bound(a, - b, c) S | hlist_for_each_entry_safe(a, - b, c, d, e) S | hlist_for_each_entry_continue_rcu(a, - b, c) S | nr_neigh_for_each(a, - b, c) S | nr_neigh_for_each_safe(a, - b, c, d) S | nr_node_for_each(a, - b, c) S | nr_node_for_each_safe(a, - b, c, d) S | - for_each_gfn_sp(a, c, d, b) S + for_each_gfn_sp(a, c, d) S | - for_each_gfn_indirect_valid_sp(a, c, d, b) S + for_each_gfn_indirect_valid_sp(a, c, d) S | for_each_host(a, - b, c) S | for_each_host_safe(a, - b, c, d) S | for_each_mesh_entry(a, - b, c, d) S ) ...+> [akpm@linux-foundation.org: drop bogus change from net/ipv4/raw.c] [akpm@linux-foundation.org: drop bogus hunk from net/ipv6/raw.c] [akpm@linux-foundation.org: checkpatch fixes] [akpm@linux-foundation.org: fix warnings] [akpm@linux-foudnation.org: redo intrusive kvm changes] Tested-by: Peter Senna Tschudin <peter.senna@gmail.com> Acked-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com> Signed-off-by: Sasha Levin <sasha.levin@oracle.com> Cc: Wu Fengguang <fengguang.wu@intel.com> Cc: Marcelo Tosatti <mtosatti@redhat.com> Cc: Gleb Natapov <gleb@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
209 lines
5.4 KiB
C
209 lines
5.4 KiB
C
/**************************************************************************
|
|
*
|
|
* Copyright 2006 Tungsten Graphics, Inc., Bismarck, ND. USA.
|
|
* All Rights Reserved.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the
|
|
* "Software"), to deal in the Software without restriction, including
|
|
* without limitation the rights to use, copy, modify, merge, publish,
|
|
* distribute, sub license, and/or sell copies of the Software, and to
|
|
* permit persons to whom the Software is furnished to do so, subject to
|
|
* the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the
|
|
* next paragraph) shall be included in all copies or substantial portions
|
|
* of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
|
|
* THE COPYRIGHT HOLDERS, AUTHORS AND/OR ITS SUPPLIERS BE LIABLE FOR ANY CLAIM,
|
|
* DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
|
|
* OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
|
|
* USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
*
|
|
*
|
|
**************************************************************************/
|
|
/*
|
|
* Simple open hash tab implementation.
|
|
*
|
|
* Authors:
|
|
* Thomas Hellström <thomas-at-tungstengraphics-dot-com>
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_hashtab.h>
|
|
#include <linux/hash.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/export.h>
|
|
|
|
int drm_ht_create(struct drm_open_hash *ht, unsigned int order)
|
|
{
|
|
unsigned int size = 1 << order;
|
|
|
|
ht->order = order;
|
|
ht->table = NULL;
|
|
if (size <= PAGE_SIZE / sizeof(*ht->table))
|
|
ht->table = kcalloc(size, sizeof(*ht->table), GFP_KERNEL);
|
|
else
|
|
ht->table = vzalloc(size*sizeof(*ht->table));
|
|
if (!ht->table) {
|
|
DRM_ERROR("Out of memory for hash table\n");
|
|
return -ENOMEM;
|
|
}
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_ht_create);
|
|
|
|
void drm_ht_verbose_list(struct drm_open_hash *ht, unsigned long key)
|
|
{
|
|
struct drm_hash_item *entry;
|
|
struct hlist_head *h_list;
|
|
unsigned int hashed_key;
|
|
int count = 0;
|
|
|
|
hashed_key = hash_long(key, ht->order);
|
|
DRM_DEBUG("Key is 0x%08lx, Hashed key is 0x%08x\n", key, hashed_key);
|
|
h_list = &ht->table[hashed_key];
|
|
hlist_for_each_entry(entry, h_list, head)
|
|
DRM_DEBUG("count %d, key: 0x%08lx\n", count++, entry->key);
|
|
}
|
|
|
|
static struct hlist_node *drm_ht_find_key(struct drm_open_hash *ht,
|
|
unsigned long key)
|
|
{
|
|
struct drm_hash_item *entry;
|
|
struct hlist_head *h_list;
|
|
unsigned int hashed_key;
|
|
|
|
hashed_key = hash_long(key, ht->order);
|
|
h_list = &ht->table[hashed_key];
|
|
hlist_for_each_entry(entry, h_list, head) {
|
|
if (entry->key == key)
|
|
return &entry->head;
|
|
if (entry->key > key)
|
|
break;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
static struct hlist_node *drm_ht_find_key_rcu(struct drm_open_hash *ht,
|
|
unsigned long key)
|
|
{
|
|
struct drm_hash_item *entry;
|
|
struct hlist_head *h_list;
|
|
unsigned int hashed_key;
|
|
|
|
hashed_key = hash_long(key, ht->order);
|
|
h_list = &ht->table[hashed_key];
|
|
hlist_for_each_entry_rcu(entry, h_list, head) {
|
|
if (entry->key == key)
|
|
return &entry->head;
|
|
if (entry->key > key)
|
|
break;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
int drm_ht_insert_item(struct drm_open_hash *ht, struct drm_hash_item *item)
|
|
{
|
|
struct drm_hash_item *entry;
|
|
struct hlist_head *h_list;
|
|
struct hlist_node *parent;
|
|
unsigned int hashed_key;
|
|
unsigned long key = item->key;
|
|
|
|
hashed_key = hash_long(key, ht->order);
|
|
h_list = &ht->table[hashed_key];
|
|
parent = NULL;
|
|
hlist_for_each_entry(entry, h_list, head) {
|
|
if (entry->key == key)
|
|
return -EINVAL;
|
|
if (entry->key > key)
|
|
break;
|
|
parent = &entry->head;
|
|
}
|
|
if (parent) {
|
|
hlist_add_after_rcu(parent, &item->head);
|
|
} else {
|
|
hlist_add_head_rcu(&item->head, h_list);
|
|
}
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_ht_insert_item);
|
|
|
|
/*
|
|
* Just insert an item and return any "bits" bit key that hasn't been
|
|
* used before.
|
|
*/
|
|
int drm_ht_just_insert_please(struct drm_open_hash *ht, struct drm_hash_item *item,
|
|
unsigned long seed, int bits, int shift,
|
|
unsigned long add)
|
|
{
|
|
int ret;
|
|
unsigned long mask = (1 << bits) - 1;
|
|
unsigned long first, unshifted_key;
|
|
|
|
unshifted_key = hash_long(seed, bits);
|
|
first = unshifted_key;
|
|
do {
|
|
item->key = (unshifted_key << shift) + add;
|
|
ret = drm_ht_insert_item(ht, item);
|
|
if (ret)
|
|
unshifted_key = (unshifted_key + 1) & mask;
|
|
} while(ret && (unshifted_key != first));
|
|
|
|
if (ret) {
|
|
DRM_ERROR("Available key bit space exhausted\n");
|
|
return -EINVAL;
|
|
}
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_ht_just_insert_please);
|
|
|
|
int drm_ht_find_item(struct drm_open_hash *ht, unsigned long key,
|
|
struct drm_hash_item **item)
|
|
{
|
|
struct hlist_node *list;
|
|
|
|
list = drm_ht_find_key_rcu(ht, key);
|
|
if (!list)
|
|
return -EINVAL;
|
|
|
|
*item = hlist_entry(list, struct drm_hash_item, head);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_ht_find_item);
|
|
|
|
int drm_ht_remove_key(struct drm_open_hash *ht, unsigned long key)
|
|
{
|
|
struct hlist_node *list;
|
|
|
|
list = drm_ht_find_key(ht, key);
|
|
if (list) {
|
|
hlist_del_init_rcu(list);
|
|
return 0;
|
|
}
|
|
return -EINVAL;
|
|
}
|
|
|
|
int drm_ht_remove_item(struct drm_open_hash *ht, struct drm_hash_item *item)
|
|
{
|
|
hlist_del_init_rcu(&item->head);
|
|
return 0;
|
|
}
|
|
EXPORT_SYMBOL(drm_ht_remove_item);
|
|
|
|
void drm_ht_remove(struct drm_open_hash *ht)
|
|
{
|
|
if (ht->table) {
|
|
if ((PAGE_SIZE / sizeof(*ht->table)) >> ht->order)
|
|
kfree(ht->table);
|
|
else
|
|
vfree(ht->table);
|
|
ht->table = NULL;
|
|
}
|
|
}
|
|
EXPORT_SYMBOL(drm_ht_remove);
|