Merge tag 'xfs-6.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux

[thirdparty/kernel/stable.git] / lib / rhashtable.c

diff --git a/lib/rhashtable.c b/lib/rhashtable.c
index 6ae2ba8e06a2138d77e6b0d5f51c67e17658b1a7..dbbed19f8fff99f4fb58889a76a40eaac330f51a 100644 (file)
--- a/lib/rhashtable.c
+++ b/lib/rhashtable.c
@@ -130,7 +130,8 @@ static union nested_table *nested_table_alloc(struct rhashtable *ht,
        if (ntbl)
                return ntbl;
 
-       ntbl = kzalloc(PAGE_SIZE, GFP_ATOMIC);
+       ntbl = alloc_hooks_tag(ht->alloc_tag,
+                       kmalloc_noprof(PAGE_SIZE, GFP_ATOMIC|__GFP_ZERO));
 
        if (ntbl && leaf) {
                for (i = 0; i < PAGE_SIZE / sizeof(ntbl[0]); i++)
@@ -157,7 +158,8 @@ static struct bucket_table *nested_bucket_table_alloc(struct rhashtable *ht,
 
        size = sizeof(*tbl) + sizeof(tbl->buckets[0]);
 
-       tbl = kzalloc(size, gfp);
+       tbl = alloc_hooks_tag(ht->alloc_tag,
+                       kmalloc_noprof(size, gfp|__GFP_ZERO));
        if (!tbl)
                return NULL;
 
@@ -181,7 +183,9 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht,
        int i;
        static struct lock_class_key __key;
 
-       tbl = kvzalloc(struct_size(tbl, buckets, nbuckets), gfp);
+       tbl = alloc_hooks_tag(ht->alloc_tag,
+                       kvmalloc_node_noprof(struct_size(tbl, buckets, nbuckets),
+                                            gfp|__GFP_ZERO, NUMA_NO_NODE));
 
        size = nbuckets;
 
@@ -1016,7 +1020,7 @@ static u32 rhashtable_jhash2(const void *key, u32 length, u32 seed)
  *     .obj_hashfn = my_hash_fn,
  * };
  */
-int rhashtable_init(struct rhashtable *ht,
+int rhashtable_init_noprof(struct rhashtable *ht,
                    const struct rhashtable_params *params)
 {
        struct bucket_table *tbl;
@@ -1031,6 +1035,8 @@ int rhashtable_init(struct rhashtable *ht,
        spin_lock_init(&ht->lock);
        memcpy(&ht->p, params, sizeof(*params));
 
+       alloc_tag_record(ht->alloc_tag);
+
        if (params->min_size)
                ht->p.min_size = roundup_pow_of_two(params->min_size);
 
@@ -1076,7 +1082,7 @@ int rhashtable_init(struct rhashtable *ht,
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(rhashtable_init);
+EXPORT_SYMBOL_GPL(rhashtable_init_noprof);
 
 /**
  * rhltable_init - initialize a new hash list table
@@ -1087,15 +1093,15 @@ EXPORT_SYMBOL_GPL(rhashtable_init);
  *
  * See documentation for rhashtable_init.
  */
-int rhltable_init(struct rhltable *hlt, const struct rhashtable_params *params)
+int rhltable_init_noprof(struct rhltable *hlt, const struct rhashtable_params *params)
 {
        int err;
 
-       err = rhashtable_init(&hlt->ht, params);
+       err = rhashtable_init_noprof(&hlt->ht, params);
        hlt->ht.rhlist = true;
        return err;
 }
-EXPORT_SYMBOL_GPL(rhltable_init);
+EXPORT_SYMBOL_GPL(rhltable_init_noprof);
 
 static void rhashtable_free_one(struct rhashtable *ht, struct rhash_head *obj,
                                void (*free_fn)(void *ptr, void *arg),