From patchwork Mon Dec 4 18:31:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 844366 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="ZahvmJYd"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yrD4k6zlYz9sDB for ; Tue, 5 Dec 2017 05:32:22 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752512AbdLDScV (ORCPT ); Mon, 4 Dec 2017 13:32:21 -0500 Received: from mail-pf0-f193.google.com ([209.85.192.193]:42597 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752474AbdLDScO (ORCPT ); Mon, 4 Dec 2017 13:32:14 -0500 Received: by mail-pf0-f193.google.com with SMTP id d23so9152155pfe.9 for ; Mon, 04 Dec 2017 10:32:13 -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=d/QJT6njugrYqF0K0XaCtGyNJRR/2kvqSJU5c3qg+3E=; b=ZahvmJYde098zBALSOv7hbyH4DifEpo/ZPmv+vkkXcCMuxdXBxlHYtrWgDHvCDeNQ3 GykSAJn7gKf98LCRASbkLILEb8GP/bFcXaWGZDTU/sD+/g+q8RUihqamKlfsEc7ix/aU 1YqNl3m+ZLMTb0Zk+ie1znM43RkQ+YHU5R6c4QBcly9AoZ4J3ovHpKgapN6BYEoT993r 9XSLWowOF7xXSVX3B6iCbF/0pLPcEQi2xx2rtnQOYlyos3QPYf0UUtwTnjGbko0Pb98y 16SGjbLa0npqk49RIElY3z3UjllpmJtCBWR0jdA0WdRT6VrLwsJ+FZ5tHXSvm72HuT65 hjpA== 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=d/QJT6njugrYqF0K0XaCtGyNJRR/2kvqSJU5c3qg+3E=; b=FslvLCtRx/n+r2SDPEEqLvIhjm2/b91qLB+du0qRqTvX8bN7JCvwHyjLuJ2a0P3BM2 9tJLgHd26Hn6PjkbIjx9jOT2AWu9srI65jj/P++RTrbBwM8nyRDI+Gs90bUpX55lSlA/ u+jjqIsUvpHQ7FYq93L2rNYxN47iq3Vm41HKpvlmSTde+zeSD9otejJegh4L+I4gGSRk ynMuP79CtVUg2wt0et65I6H9pmnjH/D7QchQITkyn085zkWNoBOBsAiMUYlSq6ICn7Nn dTvNTFdIrnuRUwdpTyVLwSZGO1lPxk1fyeqW225ZxgQeOlyISZ+H+zatlDAzloS29uCZ 8ZMw== X-Gm-Message-State: AJaThX50jvSL9qZUJNIQ/qvP4lsC2stk79wb0KxZTm6k42U81F0NyuQx fxlq3nhJFEVnqC9734qzBMCLyQ== X-Google-Smtp-Source: AGs4zMb+oTFlVaErpaaOxT+BaolJecJ6QCZdPtCbQlSPfaQHKQjWYG1HhHb/w7LHj6QqTEgHu5kG+w== X-Received: by 10.101.80.138 with SMTP id r10mr13672136pgp.428.1512412333553; Mon, 04 Dec 2017 10:32:13 -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 z2sm3558962pgu.17.2017.12.04.10.32.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 04 Dec 2017 10:32:12 -0800 (PST) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, herbert@gondor.apana.org.au, rohit@quantonium.net, Tom Herbert Subject: [PATCH v2 net-next 3/5] rhashtable: abstract out function to get hash Date: Mon, 4 Dec 2017 10:31:43 -0800 Message-Id: <20171204183145.3277-4-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171204183145.3277-1-tom@quantonium.net> References: <20171204183145.3277-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 542b1b265ac4..c9df2527e0cd 100644 --- a/include/linux/rhashtable.h +++ b/include/linux/rhashtable.h @@ -240,34 +240,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); }