From patchwork Sun Mar 1 22:09:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 444877 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 D1B8314015A for ; Mon, 2 Mar 2015 09:10:21 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=ekr+IJrA; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752764AbbCAWKS (ORCPT ); Sun, 1 Mar 2015 17:10:18 -0500 Received: from mail-ig0-f171.google.com ([209.85.213.171]:35643 "EHLO mail-ig0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752613AbbCAWKQ (ORCPT ); Sun, 1 Mar 2015 17:10:16 -0500 Received: by igqa13 with SMTP id a13so12789491igq.0 for ; Sun, 01 Mar 2015 14:10:15 -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=YXeH+/y63ge3uBlic8uCKILAW+WILlj5+WOsOkSAjYI=; b=ekr+IJrAJtYsP1/f3P016hUJr0D93pg9xP+jdJr6GfYg7/FbgVkhO5417GRPEqpmAU xm6ZA7SdUbNeNxzHQmiFIiNVO0lhNcHY27g3LfPpagBo4nRhzyvRFsuS8vbcoVwYsFsC Mb/FyLYoX+eUbN9Ky12/myxbccmqsIzKl9H2oV72sxNOk+We2UdWBD/RduWU8Fx2PNWP RFDd93wMJ8F16pPkHkg3DeLZ4KmUqH8PaLcTTpAZ/LrL4NyJ7CcTai7f8Xek5rqLU6ub 7Hwm7NbwYsENLWKmCduhVPyKJZ6Go5oIXLOFDo88dX/zAAArHNDQLg9wjCBuCElO4SLK i4qw== 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=YXeH+/y63ge3uBlic8uCKILAW+WILlj5+WOsOkSAjYI=; b=dfiZDHi1IeS1+RCj28n+lAUJ2oGfz9XsQnolBTlRLwGuFsbwEeOrqrAY/hHWnkaF7j FqDKgHHM/8SrNQwDbG1vPfy9409fOoTIMs39D9QLNwP9nVPW6pN5Ye3RtoKfRw+EVLEM GTYeGPfS6B1MyN85Ulb3DpzPLW6HMm/8unVUoTcRLpzyCttRor6rLFww+xJpm6nCfHb4 WCfdss0ml30ZinAKiNTfa5mTaFyznz6W2iP0+oQr9TjmyYdTA73MnlEvEF1BRJitjdjq JY9krAiX/PfpvdfQNaB1W5ygrPK8eW2U+WCP+A2oIH3VvPY+BjTt3Iy2AC9tbAHqKJlg jNFA== X-Gm-Message-State: ALoCoQmiJ8lPHpswbhxoPV+usgudkAwkHU0hzdn86VKmHkTNSoeJ1CfxSKBlcXWfVFTE3Q8/A2mf X-Received: by 10.107.153.193 with SMTP id b184mr33060346ioe.85.1425247815079; Sun, 01 Mar 2015 14:10:15 -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.14 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Mar 2015 14:10:14 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org, eric.dumazet@gmail.com, fw@strlen.de Subject: [PATCH net-next 2/6] sched: Eliminate use of flow_keys in sch_choke Date: Sun, 1 Mar 2015 14:09:45 -0800 Message-Id: <1425247789-21211-3-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 In choke_match_flow compare skb_get_hash values for the skbuffs instead of explicitly matching keys after calling flow_dissector. Signed-off-by: Tom Herbert --- net/sched/sch_choke.c | 32 ++------------------------------ 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/net/sched/sch_choke.c b/net/sched/sch_choke.c index c009eb9..8faa375 100644 --- a/net/sched/sch_choke.c +++ b/net/sched/sch_choke.c @@ -18,7 +18,6 @@ #include #include #include -#include /* CHOKe stateless AQM for fair bandwidth allocation @@ -133,16 +132,8 @@ static void choke_drop_by_idx(struct Qdisc *sch, unsigned int idx) --sch->q.qlen; } -/* private part of skb->cb[] that a qdisc is allowed to use - * is limited to QDISC_CB_PRIV_LEN bytes. - * As a flow key might be too large, we store a part of it only. - */ -#define CHOKE_K_LEN min_t(u32, sizeof(struct flow_keys), QDISC_CB_PRIV_LEN - 3) - struct choke_skb_cb { u16 classid; - u8 keys_valid; - u8 keys[QDISC_CB_PRIV_LEN - 3]; }; static inline struct choke_skb_cb *choke_skb_cb(const struct sk_buff *skb) @@ -169,26 +160,8 @@ static u16 choke_get_classid(const struct sk_buff *skb) static bool choke_match_flow(struct sk_buff *skb1, struct sk_buff *skb2) { - struct flow_keys temp; - - if (skb1->protocol != skb2->protocol) - return false; - - if (!choke_skb_cb(skb1)->keys_valid) { - choke_skb_cb(skb1)->keys_valid = 1; - skb_flow_dissect(skb1, &temp); - memcpy(&choke_skb_cb(skb1)->keys, &temp, CHOKE_K_LEN); - } - - if (!choke_skb_cb(skb2)->keys_valid) { - choke_skb_cb(skb2)->keys_valid = 1; - skb_flow_dissect(skb2, &temp); - memcpy(&choke_skb_cb(skb2)->keys, &temp, CHOKE_K_LEN); - } - - return !memcmp(&choke_skb_cb(skb1)->keys, - &choke_skb_cb(skb2)->keys, - CHOKE_K_LEN); + return (skb1->protocol == skb2->protocol && + skb_get_hash(skb1) == skb_get_hash(skb2)); } /* @@ -279,7 +252,6 @@ static int choke_enqueue(struct sk_buff *skb, struct Qdisc *sch) goto other_drop; /* Packet was eaten by filter */ } - choke_skb_cb(skb)->keys_valid = 0; /* Compute average queue usage (see RED) */ q->vars.qavg = red_calc_qavg(p, &q->vars, sch->q.qlen); if (red_is_idling(&q->vars))