From patchwork Wed Mar 4 18:40:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 446371 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3C99C140146 for ; Thu, 5 Mar 2015 05:40:34 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=UOMtZ5S2; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759496AbbCDSk1 (ORCPT ); Wed, 4 Mar 2015 13:40:27 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:40457 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759219AbbCDSk0 (ORCPT ); Wed, 4 Mar 2015 13:40:26 -0500 Received: by iecrp18 with SMTP id rp18so1780396iec.7 for ; Wed, 04 Mar 2015 10:40:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:subject:date:message-id:in-reply-to:references; bh=lO5CyKC5r3oaBfk0TlsG2TrOxEU2Ol/k5z6x8KctdFY=; b=UOMtZ5S2nO4SJ5vmQfZ5B5CTd4jkSJ8dhgcBt2+Omk2Qk4rX6cO2HNWMHd9njAfU1I x1ur+GFSW0i+kL69jIjRP805kz1PzMdy0xYLdva+AOxa2vMMgAMX7y7iNkTH7nAcfHMM TR4h9RNEjE2/JMzhWqEPNcm4JWdjfTl1NkGKTk5dFd7HOzR6LlpZV4aprku+UWrV3wSM NZvzqKr/9x+D5jXZk4WRBm8Ms+dCJ8tUVy8qGLXjTqnWKYg1xMVsMwnAlV9aPPKctV4X FIZf7wdupd0BslKFIgxWnxhaRyIlu2jcVCi+2g1Vwq4lUK+LSHi7C7gOxFeQzeqJ7isG MEQQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lO5CyKC5r3oaBfk0TlsG2TrOxEU2Ol/k5z6x8KctdFY=; b=h5k2qs6Hy1pkxYVTPsh+r/P+IszljabSFBvb0RrP929UVnx+udZQksK1K4bn9NzvzU 0F9Nkfl4mY/7nth5HFKmpVaybYHK415Ewnu4kg8STIBnTSuFo+O9AurhTHCDi3MH424A j+bcMtwOlyIATQONq7qmRkLoBleVbRWTIbJn+WI8upTtZc0H6EsoMxQwryLmSDvXZo+X YfWH8up8EJebXJH63T20KX3nDGu5FoXcitCuJH9IWWc1piB/veAoZFIAZKPgYnD6AwEF t9RJun6MHQF/ehOVipbMNUxPo8GRaJTF3iQhvzp0NRUevdPsff4QIWNc7u7b9in6JUgz fGTg== X-Gm-Message-State: ALoCoQnDLkxbF0HQlNoDPKSaZPUs6rZmSeaXrHbvQwO6RJklSH9+3aGlkKAzNkqL8VhrZjq87heW X-Received: by 10.107.16.42 with SMTP id y42mr14482914ioi.41.1425494425399; Wed, 04 Mar 2015 10:40:25 -0800 (PST) Received: from tomh.mtv.corp.google.com ([172.18.117.126]) by mx.google.com with ESMTPSA id qr1sm11161752igb.18.2015.03.04.10.40.24 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Mar 2015 10:40:25 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org, eric.dumazet@gmail.com, fw@strlen.de Subject: [PATCH net-next 4/6] sched: Eliminate use of flow_keys in sch_hhf Date: Wed, 4 Mar 2015 10:40:02 -0800 Message-Id: <1425494404-24114-5-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1425494404-24114-1-git-send-email-therbert@google.com> References: <1425494404-24114-1-git-send-email-therbert@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Call qdisc_skb_get_hash instead of doing skb_flow_dissect and then jhash by hand. Signed-off-by: Tom Herbert --- net/sched/sch_hhf.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/net/sched/sch_hhf.c b/net/sched/sch_hhf.c index 15d3aab..9d15cb6 100644 --- a/net/sched/sch_hhf.c +++ b/net/sched/sch_hhf.c @@ -9,7 +9,6 @@ #include #include #include -#include #include #include @@ -176,22 +175,6 @@ static u32 hhf_time_stamp(void) return jiffies; } -static unsigned int skb_hash(const struct hhf_sched_data *q, - const struct sk_buff *skb) -{ - struct flow_keys keys; - unsigned int hash; - - if (skb->sk && skb->sk->sk_hash) - return skb->sk->sk_hash; - - skb_flow_dissect(skb, &keys); - hash = jhash_3words((__force u32)keys.dst, - (__force u32)keys.src ^ keys.ip_proto, - (__force u32)keys.ports, q->perturbation); - return hash; -} - /* Looks up a heavy-hitter flow in a chaining list of table T. */ static struct hh_flow_state *seek_list(const u32 hash, struct list_head *head, @@ -280,7 +263,7 @@ static enum wdrr_bucket_idx hhf_classify(struct sk_buff *skb, struct Qdisc *sch) } /* Get hashed flow-id of the skb. */ - hash = skb_hash(q, skb); + hash = skb_get_hash_perturb(skb, q->perturbation); /* Check if this packet belongs to an already established HH flow. */ flow_pos = hash & HHF_BIT_MASK;