From patchwork Wed Oct 19 23:03:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 684357 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 3sznYS5Yjnz9sBR for ; Thu, 20 Oct 2016 10:03:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754520AbcJSXDh (ORCPT ); Wed, 19 Oct 2016 19:03:37 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:41311 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754202AbcJSXDg (ORCPT ); Wed, 19 Oct 2016 19:03:36 -0400 Received: from pps.filterd (m0089730.ppops.net [127.0.0.1]) by m0089730.ppops.net (8.16.0.17/8.16.0.17) with SMTP id u9JMwQET031016 for ; Wed, 19 Oct 2016 16:03:35 -0700 Received: from mail.thefacebook.com ([199.201.64.23]) by m0089730.ppops.net with ESMTP id 266gn3ggew-2 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 19 Oct 2016 16:03:34 -0700 Received: from mx-out.facebook.com (192.168.52.123) by PRN-CHUB12.TheFacebook.com (192.168.16.22) with Microsoft SMTP Server (TLS) id 14.3.294.0; Wed, 19 Oct 2016 16:03:24 -0700 Received: from facebook.com (2401:db00:21:6030:face:0:92:0) by mx-out.facebook.com (10.223.100.99) with ESMTP id 3ce14050965011e68ab824be05956610-4fff6a50 for ; Wed, 19 Oct 2016 16:03:24 -0700 Received: by devvm855.prn2.facebook.com (Postfix, from userid 12345) id F198B3E0502; Wed, 19 Oct 2016 16:03:23 -0700 (PDT) From: Tom Herbert To: , CC: Subject: [PATCH v4 net-next 6/7] udp: UDP tunnel flow dissection infrastructure Date: Wed, 19 Oct 2016 16:03:08 -0700 Message-ID: <20161019230309.3746853-7-tom@herbertland.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161019230309.3746853-1-tom@herbertland.com> References: <20161019230309.3746853-1-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:, , definitions=2016-10-19_18:, , signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add infrastructure to allow UDP tunnels to setup flow dissecion. Signed-off-by: Tom Herbert --- include/net/udp_tunnel.h | 5 +++++ net/ipv4/udp_tunnel.c | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h index 02c5be0..81d2584 100644 --- a/include/net/udp_tunnel.h +++ b/include/net/udp_tunnel.h @@ -69,6 +69,10 @@ typedef struct sk_buff **(*udp_tunnel_gro_receive_t)(struct sock *sk, struct sk_buff *skb); typedef int (*udp_tunnel_gro_complete_t)(struct sock *sk, struct sk_buff *skb, int nhoff); +typedef int (*udp_tunnel_flow_dissect_t)(struct sock *sk, + const struct sk_buff *skb, + void *data, int hlen, int *nhoff, + u8 *ip_proto, __be16 *proto); struct udp_tunnel_sock_cfg { void *sk_user_data; /* user data used by encap_rcv call back */ @@ -78,6 +82,7 @@ struct udp_tunnel_sock_cfg { udp_tunnel_encap_destroy_t encap_destroy; udp_tunnel_gro_receive_t gro_receive; udp_tunnel_gro_complete_t gro_complete; + udp_tunnel_flow_dissect_t flow_dissect; }; /* Setup the given (UDP) sock to receive UDP encapsulated packets */ diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c index 58bd39f..4459288 100644 --- a/net/ipv4/udp_tunnel.c +++ b/net/ipv4/udp_tunnel.c @@ -72,6 +72,11 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock, udp_sk(sk)->gro_receive = cfg->gro_receive; udp_sk(sk)->gro_complete = cfg->gro_complete; + if (cfg->flow_dissect) { + udp_sk(sk)->flow_dissect = cfg->flow_dissect; + udp_flow_dissect_enable(); + } + udp_tunnel_encap_enable(sock); } EXPORT_SYMBOL_GPL(setup_udp_tunnel_sock);