Re: [PATCH 2/5] lib/rhashtable: guarantee initial hashtable allocation
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: 2018-06-02 04:42:08
Also in:
lkml
On Fri, Jun 01, 2018 at 09:01:22AM -0700, Davidlohr Bueso wrote:
quoted hunk ↗ jump to hunk
diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 05a4b1b8b8ce..ae17da6f0c75 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c@@ -175,7 +175,7 @@ static struct bucket_table *bucket_table_alloc(struct rhashtable *ht, int i; size = sizeof(*tbl) + nbuckets * sizeof(tbl->buckets[0]); - if (gfp != GFP_KERNEL) + if ((gfp & ~__GFP_NOFAIL) != GFP_KERNEL) tbl = kzalloc(size, gfp | __GFP_NOWARN | __GFP_NORETRY); else tbl = kvzalloc(size, gfp);
There's another GFP_KERNEL check in this function that needs the same treatment.
quoted hunk ↗ jump to hunk
@@ -1067,9 +1067,16 @@ int rhashtable_init(struct rhashtable *ht, } } + /* + * 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. + */ tbl = bucket_table_alloc(ht, size, GFP_KERNEL); - if (tbl == NULL) - return -ENOMEM; + if (unlikely(tbl == NULL)) { + size = min_t(u16, ht->p.min_size, HASH_MIN_SIZE);
You mean max_t? Thanks, -- Email: Herbert Xu [off-list ref] Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt