From patchwork Sat Feb 28 03:11: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: 444567 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 90411140151 for ; Sat, 28 Feb 2015 14:12:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=google.com header.i=@google.com header.b=aDWGpxhR; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751959AbbB1DMu (ORCPT ); Fri, 27 Feb 2015 22:12:50 -0500 Received: from mail-ie0-f175.google.com ([209.85.223.175]:39362 "EHLO mail-ie0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751542AbbB1DMt (ORCPT ); Fri, 27 Feb 2015 22:12:49 -0500 Received: by iecvy18 with SMTP id vy18so35751384iec.6 for ; Fri, 27 Feb 2015 19:12:48 -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=DD1CAFuhcJ1CpgsAmJjgty/m8+R6PXCUMoOuT6BpXJw=; b=aDWGpxhRGA4sRvEUcEktDWOaGsLVycA2zr8s0trCrjvd1rHmM+V+MxLjz0FXqEc724 Itu/Jy6dvKQSdSy7hBVmAZhHuJWjd/RBbqi4JKpEudkrMQdCL07l7veUB57jys5Y76xY Sm/MFZOJvP2whO/PXQyjt6fAcZkswxEP9ffjNsqjcIltijLkcKjpkc16m5wa9v5Dyy5f m5j4VIOfj7RagILG13bSnuej0IQnfXkpfXJxZDHpCaVBvxCbMeur/rlF6BVezEquhjRq i7j/7LrB+Iz44oM46K45kKk5swAdSda43ThkeF75GT6Pq4Net4j7j8FfM9FM/KW9Y6n/ OHOA== 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=DD1CAFuhcJ1CpgsAmJjgty/m8+R6PXCUMoOuT6BpXJw=; b=WJ61OV93ZIeNGb3AXAGf3/dG5gh2DDJknA59zRySTDGoufkF/QHiqSoc8Lkiuk5fG0 O+j7bAvmumNQkssaGaqOF04ypWzhENopDrEyBqpryr5umiGZ4D6kP8mo1R5Z80QlJudl 1Z0sJB6B68f1b94iXZNBhvuC3a9ot0Gxcy3naR79/s/szsyuImBJsDel4CiSZQS8Y7Yt 8oN1SeTw7lOrvcW0qJnibx+nlaqq/DX0jHa3A7mA0GUvsoVZTJtnMYTbuSMpnYOs6Jmj ItKNrULZFmSgWVC3w4DkmvmN44EgoTFdB8fDVs5NHNwtjDdl03tpVNALdD0gn2C7RPXH 166A== X-Gm-Message-State: ALoCoQmGD0V9zGAb0Sgat5QwUtt5KstIxxvvjW9VBXdru9ZdBMSU4x45O033I9kTDBy6hSR4Vg49 X-Received: by 10.107.134.160 with SMTP id q32mr23237943ioi.70.1425093168889; Fri, 27 Feb 2015 19:12:48 -0800 (PST) Received: from tomh.mtv.corp.google.com ([172.18.117.126]) by mx.google.com with ESMTPSA id y142sm3530442iod.25.2015.02.27.19.12.48 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 27 Feb 2015 19:12:48 -0800 (PST) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH net-next 2/6] flow_dissector: Include ip_proto in hash computation Date: Fri, 27 Feb 2015 19:11:45 -0800 Message-Id: <1425093109-1077-3-git-send-email-therbert@google.com> X-Mailer: git-send-email 2.2.0.rc0.207.ga3a616c In-Reply-To: <1425093109-1077-1-git-send-email-therbert@google.com> References: <1425093109-1077-1-git-send-email-therbert@google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Fold ip_proto into dst when computing hash. This provides a more standard 5-tuple hash. Signed-off-by: Tom Herbert --- net/core/flow_dissector.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 2c35c02..f73a248 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -276,6 +276,7 @@ static __always_inline u32 __flow_hash_3words(u32 a, u32 b, u32 c) static inline u32 __flow_hash_from_keys(struct flow_keys *keys) { u32 hash; + u32 extra; /* get a consistent hash (same value on both flow directions) */ if (((__force u32)keys->dst < (__force u32)keys->src) || @@ -285,7 +286,8 @@ static inline u32 __flow_hash_from_keys(struct flow_keys *keys) swap(keys->port16[0], keys->port16[1]); } - hash = __flow_hash_3words((__force u32)keys->dst, + extra = keys->ip_proto; + hash = __flow_hash_3words((__force u32)keys->dst ^ extra, (__force u32)keys->src, (__force u32)keys->ports); if (!hash)