From patchwork Wed Mar 4 18:40:04 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 446373 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 8606B140146 for ; Thu, 5 Mar 2015 05:40:35 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=aUOsWMZb; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759684AbbCDSkc (ORCPT ); Wed, 4 Mar 2015 13:40:32 -0500 Received: from mail-ie0-f182.google.com ([209.85.223.182]:33735 "EHLO mail-ie0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759394AbbCDSk3 (ORCPT ); Wed, 4 Mar 2015 13:40:29 -0500 Received: by iecar1 with SMTP id ar1so69668422iec.0 for ; Wed, 04 Mar 2015 10:40:29 -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=vq4U8prvTS0Dr1QuqDe4Nu4Fto2xHFnQIHaqUudWbq4=; b=aUOsWMZb7V8wmt4/U45qGysM2/sMn2f23Z6uGrIQABkFVcgnOgJCOgQxXAP3nc0QYx 9fKd163QwUEU67Br47Kz9Oa1Nul/bcNOBD4kYelfKCl5IruqyqPonHZ0Y8A0i1shT/61 moJQFzGfEvHO3nicIcr1186diVJIbwTxosmDf0SNxIaAGDza+KuVJ3aSlN5dtmVwlHJj DutZWO2w4JU+NsiwqV6njwGPEZPUS3YJYXD8PFq8smxhjGm/jafFJ3s0GtEyd4qgIlXG UVdUwXWxhcncl0x9OhdUVL8hqXb8Grg5zoMOM76jDKPFB5mgwI3WZkbSd8ZbASJ1uLVf P1kA== 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=vq4U8prvTS0Dr1QuqDe4Nu4Fto2xHFnQIHaqUudWbq4=; b=M49B/ugly9GpgmhE2DYFnlTg5Z/Eq79dFEki6jKM79eiKgr30URakT2f+JqGLIx/Tg m0LuiYNVA73bP0k2smE5/m2ORQ7w4+E5YtWdeUAUUgGAx7+CtLuGCidpei72xcox4BMY a0kS4qRXBJuGVgV4dYznC9a/BuyH9gm0xYcIgbTj6uy8G8gPjMS2760BYwp8wDlYBc0k Lo7XpzEJIZqYOLkNJoaLDnaiVo8q/tUW7cXxSB1UwRkP9wTFJJjZgPI6haERy7sHZ6ep MwBPhN0GGraiITPboV85RGT60qk4Jch9IQh/cPkMcic3xFUqTkoGXA6QgTMHAhskf9NB QDAA== X-Gm-Message-State: ALoCoQlcB1mWiESYWMgErNN5xdD0Sv3suWnqUH9AAe2f3hzCbznr0Tra4lFsdEWeec/48Vp3zQy6 X-Received: by 10.107.164.15 with SMTP id n15mr13831040ioe.82.1425494429043; Wed, 04 Mar 2015 10:40:29 -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.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 04 Mar 2015 10:40:28 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org, eric.dumazet@gmail.com, fw@strlen.de Subject: [PATCH net-next 6/6] sched: Eliminate use of flow_keys in sch_sfq Date: Wed, 4 Mar 2015 10:40:04 -0800 Message-Id: <1425494404-24114-7-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_sfq.c | 29 +++-------------------------- 1 file changed, 3 insertions(+), 26 deletions(-) diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c index b877140..e7ed8a5 100644 --- a/net/sched/sch_sfq.c +++ b/net/sched/sch_sfq.c @@ -23,7 +23,6 @@ #include #include #include -#include #include @@ -156,30 +155,10 @@ static inline struct sfq_head *sfq_dep_head(struct sfq_sched_data *q, sfq_index return &q->dep[val - SFQ_MAX_FLOWS]; } -/* - * In order to be able to quickly rehash our queue when timer changes - * q->perturbation, we store flow_keys in skb->cb[] - */ -struct sfq_skb_cb { - struct flow_keys keys; -}; - -static inline struct sfq_skb_cb *sfq_skb_cb(const struct sk_buff *skb) -{ - qdisc_cb_private_validate(skb, sizeof(struct sfq_skb_cb)); - return (struct sfq_skb_cb *)qdisc_skb_cb(skb)->data; -} - static unsigned int sfq_hash(const struct sfq_sched_data *q, - const struct sk_buff *skb) + struct sk_buff *skb) { - const struct flow_keys *keys = &sfq_skb_cb(skb)->keys; - unsigned int hash; - - hash = jhash_3words((__force u32)keys->dst, - (__force u32)keys->src ^ keys->ip_proto, - (__force u32)keys->ports, q->perturbation); - return hash & (q->divisor - 1); + return skb_get_hash_perturb(skb, q->perturbation) & (q->divisor - 1); } static unsigned int sfq_classify(struct sk_buff *skb, struct Qdisc *sch, @@ -196,10 +175,8 @@ static unsigned int sfq_classify(struct sk_buff *skb, struct Qdisc *sch, return TC_H_MIN(skb->priority); fl = rcu_dereference_bh(q->filter_list); - if (!fl) { - skb_flow_dissect(skb, &sfq_skb_cb(skb)->keys); + if (!fl) return sfq_hash(q, skb) + 1; - } *qerr = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; result = tc_classify(skb, fl, &res);