From patchwork Mon May 4 23:02:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 467864 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 AF37114075F for ; Tue, 5 May 2015 09:03:16 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751916AbbEDXDN (ORCPT ); Mon, 4 May 2015 19:03:13 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:48802 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751025AbbEDXDA (ORCPT ); Mon, 4 May 2015 19:03:00 -0400 Received: from pps.filterd (m0004003 [127.0.0.1]) by mx0b-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t44MwSNr024730 for ; Mon, 4 May 2015 16:03:00 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by mx0b-00082601.pphosted.com with ESMTP id 1u6h34879s-2 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Mon, 04 May 2015 16:03:00 -0700 Received: from mx-out.facebook.com (192.168.52.13) by PRN-CHUB08.TheFacebook.com (192.168.16.18) with Microsoft SMTP Server (TLS) id 14.3.195.1; Mon, 4 May 2015 16:02:59 -0700 Received: from facebook.com (2401:db00:20:702e:face:0:23:0) by mx-out.facebook.com (10.212.232.59) with ESMTP id b5345590f2b111e498f40002c991e86a-9ffe91e0 for ; Mon, 04 May 2015 16:02:59 -0700 Received: by devrs030.prn2.facebook.com (Postfix, from userid 12345) id B76D2AE05A8; Mon, 4 May 2015 16:02:58 -0700 (PDT) From: Tom Herbert To: , Subject: [PATCH net-next 4/6] net: Add IPv6 flow label to flow_keys Date: Mon, 4 May 2015 16:02:38 -0700 Message-ID: <1430780560-2758924-5-git-send-email-tom@herbertland.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1430780560-2758924-1-git-send-email-tom@herbertland.com> References: <1430780560-2758924-1-git-send-email-tom@herbertland.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68, 1.0.33, 0.0.0000 definitions=2015-05-04_05:2015-05-04, 2015-05-04, 1970-01-01 signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In flow_dissector set the flow label in flow_keys for IPv6. This also removes the shortcircuiting of flow dissection when a non-zero label is present, the flow label can be considered to provide additional entropy for a hash. Signed-off-by: Tom Herbert --- include/net/flow_keys.h | 3 ++- net/core/flow_dissector.c | 15 +-------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/include/net/flow_keys.h b/include/net/flow_keys.h index 14298e2..906d47a 100644 --- a/include/net/flow_keys.h +++ b/include/net/flow_keys.h @@ -26,7 +26,8 @@ struct flow_keys { __be16 n_proto; u8 ip_proto; u8 padding; - u32 vlan_id:12; + u32 vlan_id:12, + flow_label:20; union { __be32 ports; diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index 148b989..de71e42 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -102,7 +102,6 @@ ip: case htons(ETH_P_IPV6): { const struct ipv6hdr *iph; struct ipv6hdr _iph; - __be32 flow_label; ipv6: iph = __skb_header_pointer(skb, nhoff, sizeof(_iph), data, hlen, &_iph); @@ -118,19 +117,7 @@ ipv6: iph_to_flow_copy_v6addrs(flow, iph); - flow_label = ip6_flowlabel(iph); - if (flow_label) { - /* Awesome, IPv6 packet has a flow label so we can - * use that to represent the ports without any - * further dissection. - */ - flow->n_proto = proto; - flow->ip_proto = ip_proto; - flow->ports = flow_label; - flow->thoff = (u16)nhoff; - - return true; - } + flow->flow_label = ntohl(ip6_flowlabel(iph)); break; }