{"id":807353,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807353/?format=json","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.0/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20170829232711.1465-7-tom@quantonium.net>","date":"2017-08-29T23:27:11","name":"[v2,net-next,6/6] vxlan: support flow dissect","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"db81d2e1f2fd129388590d0db284d814e8e96a35","submitter":{"id":72064,"url":"http://patchwork.ozlabs.org/api/1.0/people/72064/?format=json","name":"Tom Herbert","email":"tom@quantonium.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.0/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170829232711.1465-7-tom@quantonium.net/mbox/","series":[{"id":503,"url":"http://patchwork.ozlabs.org/api/1.0/series/503/?format=json","date":"2017-08-29T23:27:05","name":"flow_dissector: Protocol specific flow dissector offload","version":2,"mbox":"http://patchwork.ozlabs.org/series/503/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807353/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=quantonium-net.20150623.gappssmtp.com\n\theader.i=@quantonium-net.20150623.gappssmtp.com\n\theader.b=\"QLDEk5yX\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhlDN3lrnz9sMN\n\tfor ;\n\tWed, 30 Aug 2017 09:27:48 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751871AbdH2X1r (ORCPT );\n\tTue, 29 Aug 2017 19:27:47 -0400","from mail-pf0-f179.google.com ([209.85.192.179]:35107 \"EHLO\n\tmail-pf0-f179.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751843AbdH2X1p (ORCPT\n\t); Tue, 29 Aug 2017 19:27:45 -0400","by mail-pf0-f179.google.com with SMTP id g13so14380907pfm.2\n\tfor ; Tue, 29 Aug 2017 16:27:45 -0700 (PDT)","from localhost.localdomain (67-207-98-108.static.wiline.com.\n\t[67.207.98.108]) by smtp.gmail.com with ESMTPSA id\n\tr73sm6445593pfa.143.2017.08.29.16.27.43\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 29 Aug 2017 16:27:44 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=quantonium-net.20150623.gappssmtp.com; s=20150623;\n\th=from:to:cc:subject:date:message-id:in-reply-to:references;\n\tbh=tOEilnMu9QhBVwIu+aq+gsUL+CyWxH2nfBAYSvCa/z0=;\n\tb=QLDEk5yXdJ8D2Ir5r9vLMty1HRrpXDbwDNult4uLVqSRFgvb9XyXG4pPXEtQ78KBYY\n\tMdvXRaVshMYwjxqOCzclCSMwWIcaCEmn33JliEtc6+fgAd+oYqqfTq3V2nnhvWk7C//k\n\twgkaQtQHTTQhVUoUXZVRFR8Ats2FVQV2o53U3CTG7Xzb/3t/fmOVaChV9tWMZWqsvtZs\n\twNCrjAfVWnpVMbxHh/UFPx1ZM1sd07CwD9EOyV86REAgrUzDAmxF+3twesUL/1poLgTk\n\tj7Q3FsAkIXhxt1MGa/DGPX1NDmzcvLNM8lLUdo4AIlSRPyNyLJ8eNkTtryUaZkynqpSG\n\tVM5Q==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n\t:references;\n\tbh=tOEilnMu9QhBVwIu+aq+gsUL+CyWxH2nfBAYSvCa/z0=;\n\tb=KTstTl/FWnbnbGYqnEb2D1/WQkTJX7SH4FzijT05KxIOu+uq9axjO5hn2hY8mrfHeO\n\t9GsgpR15lMn1sMj8vu7k+DM923TUhUVZbzLyOkJZ8XOwf7pNKxh4KOo5H+IzA5JS+S1D\n\te9f9P+M9bhh7QLHcc6Wpry9jG8C4TP48MZ5UaAoAJzSYDTEaEw3gDzXu73kdgBWuYOVS\n\tOUAhlUGbu+3MXp+OScshvI0sChe4MzsxER1wLLF1krK7jz7YggY4Gc/fAxLx0TnnKkUN\n\tNj9nDSPyPSv5KIhRpaQTxFj0fmZPf6jPW8wZtrxsNe1R/mj8vM3RjETcq4cWFup7D+ul\n\tidcA==","X-Gm-Message-State":"AHYfb5hFvhK7NftTMaRzxUqaw3U0/2Xt8eIPWHlJsyC1KRORMar10py1\n\t+DUlVKibMD5zTCW9","X-Received":"by 10.99.125.82 with SMTP id m18mr1958092pgn.118.1504049265205; \n\tTue, 29 Aug 2017 16:27:45 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, Tom Herbert ","Subject":"[PATCH v2 net-next 6/6] vxlan: support flow dissect","Date":"Tue, 29 Aug 2017 16:27:11 -0700","Message-Id":"<20170829232711.1465-7-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170829232711.1465-1-tom@quantonium.net>","References":"<20170829232711.1465-1-tom@quantonium.net>","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Populate offload flow_dissect callback appropriately for VXLAN and\nVXLAN-GPE.\n\nSigned-off-by: Tom Herbert \n---\n drivers/net/vxlan.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 50 insertions(+)","diff":"diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c\nindex ae3a1da703c2..41e50de40af4 100644\n--- a/drivers/net/vxlan.c\n+++ b/drivers/net/vxlan.c\n@@ -1336,6 +1336,55 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph,\n \treturn err <= 1;\n }\n \n+static enum flow_dissect_ret vxlan_flow_dissect(struct sock *sk,\n+\t\t\tconst struct sk_buff *skb,\n+\t\t\tstruct flow_dissector_key_control *key_control,\n+\t\t\tstruct flow_dissector *flow_dissector,\n+\t\t\tvoid *target_container, void *data,\n+\t\t\t__be16 *p_proto, u8 *p_ip_proto, int *p_nhoff,\n+\t\t\tint *p_hlen, unsigned int flags)\n+{\n+\t__be16 protocol = htons(ETH_P_TEB);\n+\tstruct vxlanhdr *vhdr, _vhdr;\n+\tstruct vxlan_sock *vs;\n+\n+\tvhdr = __skb_header_pointer(skb, *p_nhoff + sizeof(struct udphdr),\n+\t\t\t\t sizeof(_vhdr), data, *p_hlen, &_vhdr);\n+\tif (!vhdr)\n+\t\treturn FLOW_DISSECT_RET_OUT_BAD;\n+\n+\tvs = rcu_dereference_sk_user_data(sk);\n+\tif (!vs)\n+\t\treturn FLOW_DISSECT_RET_OUT_BAD;\n+\n+\tif (vs->flags & VXLAN_F_GPE) {\n+\t\tstruct vxlanhdr_gpe *gpe = (struct vxlanhdr_gpe *)vhdr;\n+\n+\t\t/* Need to have Next Protocol set for interfaces in GPE mode. */\n+\t\tif (gpe->version != 0 || !gpe->np_applied || gpe->oam_flag)\n+\t\t\treturn FLOW_DISSECT_RET_CONTINUE;\n+\n+\t\tswitch (gpe->next_protocol) {\n+\t\tcase VXLAN_GPE_NP_IPV4:\n+\t\t\tprotocol = htons(ETH_P_IP);\n+\t\t\tbreak;\n+\t\tcase VXLAN_GPE_NP_IPV6:\n+\t\t\tprotocol = htons(ETH_P_IPV6);\n+\t\t\tbreak;\n+\t\tcase VXLAN_GPE_NP_ETHERNET:\n+\t\t\tprotocol = htons(ETH_P_TEB);\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn FLOW_DISSECT_RET_CONTINUE;\n+\t\t}\n+\t}\n+\n+\t*p_nhoff += sizeof(struct udphdr) + sizeof(_vhdr);\n+\t*p_proto = protocol;\n+\n+\treturn FLOW_DISSECT_RET_PROTO_AGAIN;\n+}\n+\n /* Callback from net/ipv4/udp.c to receive packets */\n static int vxlan_rcv(struct sock *sk, struct sk_buff *skb)\n {\n@@ -2864,6 +2913,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6,\n \ttunnel_cfg.encap_destroy = NULL;\n \ttunnel_cfg.gro_receive = vxlan_gro_receive;\n \ttunnel_cfg.gro_complete = vxlan_gro_complete;\n+\ttunnel_cfg.flow_dissect = vxlan_flow_dissect;\n \n \tsetup_udp_tunnel_sock(net, sock, &tunnel_cfg);\n \n","prefixes":["v2","net-next","6/6"]}