From patchwork Sun Mar 1 22:09:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 444878 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 9C14714015A for ; Mon, 2 Mar 2015 09:10:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=T0rDr6ak; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752927AbbCAWKW (ORCPT ); Sun, 1 Mar 2015 17:10:22 -0500 Received: from mail-ig0-f181.google.com ([209.85.213.181]:44674 "EHLO mail-ig0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752613AbbCAWKT (ORCPT ); Sun, 1 Mar 2015 17:10:19 -0500 Received: by igdh15 with SMTP id h15so12748988igd.3 for ; Sun, 01 Mar 2015 14:10:18 -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=S+nZLi5EQ1Cs3P0BAegZYdq4rdK05kOv737ViTBXpbg=; b=T0rDr6akx61CIM9ps/l4jT1QRJVvso3AAfpPbCcj5NUshZ5UHtKfb/t931sDhN3h6y 6ckVrjZZVSKMQgNl61RwSiq/pfbC6LSNGyj5kAOi3vYgKs+kdcfxsqsCswk5ii7QbgsR N8IRqH91fOcXTEXN1OCyZbF/EHAfOzuRMRtse4NtqJB1Pvk0vyaOqmkz3wJxfsXt8eij wdILbSrf8CQARMRQssfFamojCxZvlV/NjpCXyM8jBNLl745xd5INfy4tzPL0XMxGw0rG 3z1t6AhTO8pl9GU1DrTWqhj6Sqwf6u9NtzrKIjI160b4706j3rR7vK0/di+M3o6wa2CV Gd1w== 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=S+nZLi5EQ1Cs3P0BAegZYdq4rdK05kOv737ViTBXpbg=; b=G7LOi34D9K06hR/fy+clzos9g/rogHiClcM39UOz60O71in+RNh2Nk+iF9wGGCs8U4 gy4WkgVsZQhdBywqFDllDZJigc5sVZNT5RXHMadKgqiv3zSJYUezlbqMZDbXe6/SHOCi hqDEL8ju6B0hqSsEL7ORizXupevKBdiNQsse8mVDtlBpcGqOX5jBMZJGG0B4FiJrLWIQ 0YRD8wM8V4cQSw0edp6wED8asZ7ZshVqDARwZq0Fb9s0E+/eESV6yEjqwznUoQeuTGok tQSa9IA66BeIroQ3xhU1LaHSCjJuaY7koGZ3Ix6rKu8r2rIhEGXIUA/fPJlPKmDGTLc4 SUwg== X-Gm-Message-State: ALoCoQkuEQ8hlQmyQVaNTTs54VBYsdefQYIo6E+ghwEiN64CzABJ6JXVnGulLMeMp7c0/CZr6yAq X-Received: by 10.107.148.197 with SMTP id w188mr32970978iod.73.1425247818674; Sun, 01 Mar 2015 14:10:18 -0800 (PST) Received: from tomh.mtv.corp.google.com ([172.18.117.126]) by mx.google.com with ESMTPSA id a196sm6834456ioe.41.2015.03.01.14.10.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Mar 2015 14:10:18 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org, eric.dumazet@gmail.com, fw@strlen.de Subject: [PATCH net-next 3/6] sched: Eliminate use of flow_keys in sch_fq_codel Date: Sun, 1 Mar 2015 14:09:46 -0800 Message-Id: <1425247789-21211-4-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1425247789-21211-1-git-send-email-therbert@google.com> References: <1425247789-21211-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_fq_codel.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c index 1e52dec..a6fc53d 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c @@ -23,7 +23,6 @@ #include #include #include -#include #include /* Fair Queue CoDel. @@ -68,15 +67,9 @@ struct fq_codel_sched_data { }; static unsigned int fq_codel_hash(const struct fq_codel_sched_data *q, - const struct sk_buff *skb) + struct sk_buff *skb) { - struct flow_keys keys; - unsigned int 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); + u32 hash = skb_get_hash_perturb(skb, q->perturbation); return reciprocal_scale(hash, q->flows_cnt); }