From patchwork Fri Dec 1 00:03:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 843260 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="qYcc8wfL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynvd440Xlz9sNd for ; Fri, 1 Dec 2017 11:03:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751844AbdLAADt (ORCPT ); Thu, 30 Nov 2017 19:03:49 -0500 Received: from mail-pg0-f65.google.com ([74.125.83.65]:44473 "EHLO mail-pg0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751748AbdLAADr (ORCPT ); Thu, 30 Nov 2017 19:03:47 -0500 Received: by mail-pg0-f65.google.com with SMTP id j9so3696373pgc.11 for ; Thu, 30 Nov 2017 16:03:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=chJu3zlR6Jkvmt0Uwo54N+d+Hb7tZpV6QmjxsgjgOhQ=; b=qYcc8wfLtyJ7JFLdXb/oDRyEHKkVdij2trNeD9UqaJCpay4ix3npmrww7S8rOoo7PG p/smHzXaCgxp9SD8BaiB42yNX5o7dowhfdv6Sgqo1c4Qn4AKLH+O25BimsURq+adyOO6 U3r2Q0owLPnEiEnopmwE22MLkvUvSDvkg9fyN9i/2TMWrzpS8j5j44hMc5vvLNB0wmrX V0B4BcAlQGkHhSm4KKgV7Ly28aib/twhNfgiq1mIBsYXPJxxILf503www3xCc5hh0r3+ xrnVYTCv9bRBnIdLsXwvFMTxsUxNgkMh6WfocV+K+0UOn3EvtGxCpyt16BsZXa4JZvDV R+TA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=chJu3zlR6Jkvmt0Uwo54N+d+Hb7tZpV6QmjxsgjgOhQ=; b=Kyr1z1bAF3B/4oKdUNaQDNFHXnzLwZQ2k3tv/trd4wP6jCuHHdUku9vNPnrwkZBn0y wbiVO7Kijznuro9C4NzS2ry8uGarATrTEODWCFzMWT4zx0YYO1R8McSxdeSegwOyACwk Z4VBj2Yxbtnewalnco3KbBpTY/4p9QNvGIKHRa+8Oow0fEd/P7UgGVz0Nn4ut78S6drm p8z5iJltsBQyAZfzW/bNz9Uu7u/bB2mzEs2EFxqZJygutOutBELLnsezmfdAty5CSL11 qd/H4P3oy3zXFBsPDH0bn5apEk29ztW6ZDNT+jxtlHm0hDbI8//kOVtB64U1Ia38tClH Ym3A== X-Gm-Message-State: AJaThX7d5k6LzFWCJolQHRpnR+PzukeCpbi7uUSqbcqoX1Y36RzHiXKo CrFK29SW9EJYgCs/kCyB58SFnA== X-Google-Smtp-Source: AGs4zMbvmr+wagZol3ELgob8F50ooP6KGmpP4bXyiidjWsCKBLi7S3xZMz6lyz2AoaRexOtqDi6niA== X-Received: by 10.98.55.3 with SMTP id e3mr8206089pfa.63.1512086626487; Thu, 30 Nov 2017 16:03:46 -0800 (PST) Received: from localhost.localdomain (c-73-162-13-107.hsd1.ca.comcast.net. [73.162.13.107]) by smtp.gmail.com with ESMTPSA id s66sm10510569pfd.74.2017.11.30.16.03.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 30 Nov 2017 16:03:45 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, rohit@quantonium.net, herbert@gondor.apana.org.au, Tom Herbert Subject: [PATCH net-next 3/5] rhashtable: abstract out function to get hash Date: Thu, 30 Nov 2017 16:03:03 -0800 Message-Id: <20171201000305.2392-4-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171201000305.2392-1-tom@quantonium.net> References: <20171201000305.2392-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Split out most of rht_key_hashfn which is calculating the hash into its own function. This way the hash function can be called separately to get the hash value. Acked-by: Thomas Graf Signed-off-by: Tom Herbert --- include/linux/rhashtable.h | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/include/linux/rhashtable.h b/include/linux/rhashtable.h index 7f3e674e127a..61d0fd707d12 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -239,34 +239,42 @@ static inline unsigned int rht_bucket_index(const struct bucket_table *tbl, return (hash >> RHT_HASH_RESERVED_SPACE) & (tbl->size - 1); } -static inline unsigned int rht_key_hashfn( - struct rhashtable *ht, const struct bucket_table *tbl, - const void *key, const struct rhashtable_params params) +static inline unsigned int rht_key_get_hash(struct rhashtable *ht, + const void *key, const struct rhashtable_params params, + unsigned int hash_rnd) { unsigned int hash; /* params must be equal to ht->p if it isn't constant. */ if (!__builtin_constant_p(params.key_len)) - hash = ht->p.hashfn(key, ht->key_len, tbl->hash_rnd); + hash = ht->p.hashfn(key, ht->key_len, hash_rnd); else if (params.key_len) { unsigned int key_len = params.key_len; if (params.hashfn) - hash = params.hashfn(key, key_len, tbl->hash_rnd); + hash = params.hashfn(key, key_len, hash_rnd); else if (key_len & (sizeof(u32) - 1)) - hash = jhash(key, key_len, tbl->hash_rnd); + hash = jhash(key, key_len, hash_rnd); else - hash = jhash2(key, key_len / sizeof(u32), - tbl->hash_rnd); + hash = jhash2(key, key_len / sizeof(u32), hash_rnd); } else { unsigned int key_len = ht->p.key_len; if (params.hashfn) - hash = params.hashfn(key, key_len, tbl->hash_rnd); + hash = params.hashfn(key, key_len, hash_rnd); else - hash = jhash(key, key_len, tbl->hash_rnd); + hash = jhash(key, key_len, hash_rnd); } + return hash; +} + +static inline unsigned int rht_key_hashfn( + struct rhashtable *ht, const struct bucket_table *tbl, + const void *key, const struct rhashtable_params params) +{ + unsigned int hash = rht_key_get_hash(ht, key, params, tbl->hash_rnd); + return rht_bucket_index(tbl, hash); }