From patchwork Sun Mar 1 22:09:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 444881 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 3427C14015A for ; Mon, 2 Mar 2015 09:10:37 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=Tg4+bCn5; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753204AbbCAWKc (ORCPT ); Sun, 1 Mar 2015 17:10:32 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:40484 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752933AbbCAWKX (ORCPT ); Sun, 1 Mar 2015 17:10:23 -0500 Received: by iebtr6 with SMTP id tr6so43328241ieb.7 for ; Sun, 01 Mar 2015 14:10:22 -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=RdePRqHeeALHdQvG0v6eLndkyxwxMsNQnKrZ4NTr/nk=; b=Tg4+bCn5Jfa9UCIDwCwdqktb4SiSy3DyHoTi5DTqq+p2v7MvjbfPpSqCREm9gIu3wd xiM+/BhRVGGH3FJTzDVTqMn7ji4qTLdIdyn2VSoKYOjo1Dtj6BshNsXgEk9YAVP/rIwR jm0UU1mlgTHDmbdrxz8xQwSJNHsyfQCdg/7gP25N+tFlaAxwwzxqF2r+TYhr2dYKX2ap XqoDrQaKaU74rfUJhSFgRJoTPyXc3tbKHwv2FMAhLwLNNtxCh3eD2Davsm/Cz+Kr3SyA vMUUdz0zVYqwWYFlm8H4dT2Eqiu5ewH790FPHQ93M93GYe1Wqlo5Nbc88YUTPH96ocrB jHjw== 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=RdePRqHeeALHdQvG0v6eLndkyxwxMsNQnKrZ4NTr/nk=; b=TeGGijINcA1Znw4Tp+oO8lsIPamDIMjH2QMDUFMzP/EQzxlBRZUdXt+gFW9kJKM6WM PKhg7i4L/5cAMQBRy5QmTDGXcn9/Cjf2hCONxXz9xkEMe8Y6LttP7v0g/teBZ1ed+xqR 987xDlA+iITjl5yF7zUeKsWTE+WAHbiass3V7RjLrZMelx7qpgLHbNxV/RJ0CssOC9sQ PaOX10TskdYfGf3hmq22g1Fda13ANEBYMX7Dh7TUupnR69EhDwK+jDKdDTzijPIHNp5H MbZq0w97a2q37fL8ZHgTrQ5G2fygUREzL6eMeZJ1M/We+qNfpnj66w8XHXoEVMNjlgvS vKBA== X-Gm-Message-State: ALoCoQl8HnnozTnbNIithWB9IRbaN4Ef2OX2tRJQHdam8w2PHgZHXZ8V/ajyI25OY3/rln9YH3hY X-Received: by 10.43.160.200 with SMTP id md8mr27142745icc.70.1425247822668; Sun, 01 Mar 2015 14:10:22 -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.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 Mar 2015 14:10:22 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org, eric.dumazet@gmail.com, fw@strlen.de Subject: [PATCH net-next 5/6] sched: Eliminate use of flow_keys in sch_sfb Date: Sun, 1 Mar 2015 14:09:48 -0800 Message-Id: <1425247789-21211-6-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_sfb.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 5819dd8..402d051 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c @@ -26,7 +26,6 @@ #include #include #include -#include /* * SFB uses two B[l][n] : L x N arrays of bins (L levels, N bins per level) @@ -285,9 +284,9 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) int i; u32 p_min = ~0; u32 minqlen = ~0; - u32 r, slot, salt, sfbhash; + u32 r, sfbhash; + u32 slot = q->slot; int ret = NET_XMIT_SUCCESS | __NET_XMIT_BYPASS; - struct flow_keys keys; if (unlikely(sch->q.qlen >= q->limit)) { qdisc_qstats_overlimit(sch); @@ -309,22 +308,17 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) fl = rcu_dereference_bh(q->filter_list); if (fl) { + u32 salt; + /* If using external classifiers, get result and record it. */ if (!sfb_classify(skb, fl, &ret, &salt)) goto other_drop; - keys.src = salt; - keys.dst = 0; - keys.ports = 0; + sfbhash = jhash_1word(salt, q->bins[q->slot].perturbation); } else { - skb_flow_dissect(skb, &keys); + sfbhash = skb_get_hash_perturb(skb, q->bins[slot].perturbation); } - slot = q->slot; - sfbhash = jhash_3words((__force u32)keys.dst, - (__force u32)keys.src, - (__force u32)keys.ports, - q->bins[slot].perturbation); if (!sfbhash) sfbhash = 1; sfb_skb_cb(skb)->hashes[slot] = sfbhash; @@ -356,10 +350,8 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch) if (unlikely(p_min >= SFB_MAX_PROB)) { /* Inelastic flow */ if (q->double_buffering) { - sfbhash = jhash_3words((__force u32)keys.dst, - (__force u32)keys.src, - (__force u32)keys.ports, - q->bins[slot].perturbation); + sfbhash = skb_get_hash_perturb(skb, + q->bins[slot].perturbation); if (!sfbhash) sfbhash = 1; sfb_skb_cb(skb)->hashes[slot] = sfbhash;