From patchwork Mon Jul 16 20:26:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Davidlohr Bueso X-Patchwork-Id: 944585 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=stgolabs.net Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 41Tw0z2tFsz9s21 for ; Tue, 17 Jul 2018 06:26:27 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729849AbeGPUzW (ORCPT ); Mon, 16 Jul 2018 16:55:22 -0400 Received: from mx2.suse.de ([195.135.220.15]:49056 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728290AbeGPUzW (ORCPT ); Mon, 16 Jul 2018 16:55:22 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 5ACA5AD90; Mon, 16 Jul 2018 20:26:19 +0000 (UTC) Date: Mon, 16 Jul 2018 13:26:13 -0700 From: Davidlohr Bueso To: Herbert Xu Cc: akpm@linux-foundation.org, tgraf@suug.ch, linux-kernel@vger.kernel.org, Davidlohr Bueso , netdev@vger.kernel.org Subject: [PATCH resend -next] lib/rhashtable: consider param->min_size when setting initial table size Message-ID: <20180716202613.u6f3l3adrgjvs4wk@linux-r8p5> References: <20180714062516.30433-1-dave@stgolabs.net> <20180716000046.yscgnpr256qhm2qg@gondor.apana.org.au> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20180716000046.yscgnpr256qhm2qg@gondor.apana.org.au> User-Agent: NeoMutt/20170912 (1.9.0) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org rhashtable_init() currently does not take into account the user-passed min_size parameter unless param->nelem_hint is set as well. As such, the default size (number of buckets) will always be HASH_DEFAULT_SIZE even if the smallest allowed size is larger than that. Remediate this by unconditionally calling into rounded_hashtable_size() and handling things accordingly. Signed-off-by: Davidlohr Bueso Acked-by: Herbert Xu --- Resending per Herbert's request with Cc to netdev. lib/rhashtable.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/rhashtable.c b/lib/rhashtable.c index 62d3a976614e..310e29b51507 100644 --- a/lib/rhashtable.c +++ b/lib/rhashtable.c @@ -953,8 +953,16 @@ EXPORT_SYMBOL_GPL(rhashtable_walk_stop); static size_t rounded_hashtable_size(const struct rhashtable_params *params) { - return max(roundup_pow_of_two(params->nelem_hint * 4 / 3), - (unsigned long)params->min_size); + 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; } static u32 rhashtable_jhash2(const void *key, u32 length, u32 seed) @@ -1010,8 +1018,6 @@ int rhashtable_init(struct rhashtable *ht, struct bucket_table *tbl; size_t size; - size = HASH_DEFAULT_SIZE; - if ((!params->key_len && !params->obj_hashfn) || (params->obj_hashfn && !params->obj_cmpfn)) return -EINVAL; @@ -1035,8 +1041,7 @@ int rhashtable_init(struct rhashtable *ht, ht->p.min_size = max_t(u16, ht->p.min_size, HASH_MIN_SIZE); - if (params->nelem_hint) - size = rounded_hashtable_size(&ht->p); + size = rounded_hashtable_size(&ht->p); if (params->locks_mul) ht->p.locks_mul = roundup_pow_of_two(params->locks_mul);