{"id":807349,"url":"http://patchwork.ozlabs.org/api/1.2/patches/807349/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170829232711.1465-2-tom@quantonium.net/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/1.2/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,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170829232711.1465-2-tom@quantonium.net>","list_archive_url":null,"date":"2017-08-29T23:27:06","name":"[v2,net-next,1/6] flow_dissector: Move ETH_P_TEB processing to main switch","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"5457a2a1eaadbf363395958f6288280ca3370133","submitter":{"id":72064,"url":"http://patchwork.ozlabs.org/api/1.2/people/72064/?format=json","name":"Tom Herbert","email":"tom@quantonium.net"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/1.2/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-2-tom@quantonium.net/mbox/","series":[{"id":503,"url":"http://patchwork.ozlabs.org/api/1.2/series/503/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=503","date":"2017-08-29T23:27:05","name":"flow_dissector: Protocol specific flow dissector offload","version":2,"mbox":"http://patchwork.ozlabs.org/series/503/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/807349/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807349/checks/","tags":{},"related":[],"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=\"WK0o+cAh\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhlD91pJZz9s9Y\n\tfor ;\n\tWed, 30 Aug 2017 09:27:37 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751708AbdH2X1e (ORCPT );\n\tTue, 29 Aug 2017 19:27:34 -0400","from mail-pg0-f42.google.com ([74.125.83.42]:33396 \"EHLO\n\tmail-pg0-f42.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751240AbdH2X1d (ORCPT\n\t); Tue, 29 Aug 2017 19:27:33 -0400","by mail-pg0-f42.google.com with SMTP id t3so15023119pgt.0\n\tfor ; Tue, 29 Aug 2017 16:27:33 -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.31\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 29 Aug 2017 16:27:31 -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=nc7lwlnlaH4kyZGaYqmPkwW3JQYoj9ibJs1x/HQfdPQ=;\n\tb=WK0o+cAhvwF5I1H1kY1vRyDCe0BwkAkDWqhotdJryLS8ZHhNB6vmBccXNe4pKwABJw\n\tUX0T4yCesFU0rcXqc61YHkJdYKME8h5j4D2IY41cVu/V4jQbfzpfqUJ0YlXdVmCWY+mB\n\t2ti/KoOBn1QlW+DjXsSYkwUmy9c1Jq9tOuDK3IFHLrjc9lcPNEfMJckMkeo15GEb/rEL\n\tJMx01ZfEL8E2oQWu14vRJDam/tf3WUuIYqf4tS4aj0thj49LOmjLIhGhJONXNGndodBs\n\t0gYWcgUyKLc5SRjos+4hKBX/kzW+BssOZs4/54bZFQAtNhPp/WTxNfjOJw6HAtTkDFp7\n\tQmfA==","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=nc7lwlnlaH4kyZGaYqmPkwW3JQYoj9ibJs1x/HQfdPQ=;\n\tb=bTYMk+q2aqtzq4HgHVRV5GrBRJCs+XzZL67rB8RTuPkyhVk517fgKJy/BkePe98XAQ\n\tCt002tr4vm8TE+WfwyI6rW72nnmCMDS2yfRr+h06LbDXg3WvuHw9tnRoMuEw+fqD6S5w\n\t+sgiLkBusROfGm643OFnyPNJNd4HCocl+vFawOCQm4hG50CRLUS6toTxgGxxFGtdHKJh\n\tV7aBKSuA7+E3t2Pz/YPUly/4BzxHrNsSCUcrNbKTVziNmyRF/JyqwYa4o5ByURVzUNeY\n\tTmKB4ZlX7HdSjZ9oqFXfAkjLOVBgkcoB6jl4XRi8KuEmYyLyV94DC4SBZfsHZuN7E4Yu\n\tt5sw==","X-Gm-Message-State":"AHYfb5gt994L+LwhNXDgkAUxNOhbpzYPdgKprQXsrsNWBxZFGI3K7yf5\n\tSI0XnhfCDVJdT84j","X-Received":"by 10.99.37.133 with SMTP id l127mr1917314pgl.452.1504049252621; \n\tTue, 29 Aug 2017 16:27:32 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, Tom Herbert ","Subject":"[PATCH v2 net-next 1/6] flow_dissector: Move ETH_P_TEB processing\n\tto main switch","Date":"Tue, 29 Aug 2017 16:27:06 -0700","Message-Id":"<20170829232711.1465-2-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":"Support for processing TEB is currently in GRE flow dissection as a\nspecial case. This can be moved to be a case the main proto switch in\n__skb_flow_dissect.\n\nSigned-off-by: Tom Herbert \n---\n net/core/flow_dissector.c | 44 +++++++++++++++++++++++---------------------\n 1 file changed, 23 insertions(+), 21 deletions(-)","diff":"diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c\nindex e2eaa1ff948d..12302acdb073 100644\n--- a/net/core/flow_dissector.c\n+++ b/net/core/flow_dissector.c\n@@ -288,27 +288,8 @@ __skb_flow_dissect_gre(const struct sk_buff *skb,\n \tif (hdr->flags & GRE_SEQ)\n \t\toffset += sizeof(((struct pptp_gre_header *) 0)->seq);\n \n-\tif (gre_ver == 0) {\n-\t\tif (*p_proto == htons(ETH_P_TEB)) {\n-\t\t\tconst struct ethhdr *eth;\n-\t\t\tstruct ethhdr _eth;\n-\n-\t\t\teth = __skb_header_pointer(skb, *p_nhoff + offset,\n-\t\t\t\t\t\t sizeof(_eth),\n-\t\t\t\t\t\t data, *p_hlen, &_eth);\n-\t\t\tif (!eth)\n-\t\t\t\treturn FLOW_DISSECT_RET_OUT_BAD;\n-\t\t\t*p_proto = eth->h_proto;\n-\t\t\toffset += sizeof(*eth);\n-\n-\t\t\t/* Cap headers that we access via pointers at the\n-\t\t\t * end of the Ethernet header as our maximum alignment\n-\t\t\t * at that point is only 2 bytes.\n-\t\t\t */\n-\t\t\tif (NET_IP_ALIGN)\n-\t\t\t\t*p_hlen = *p_nhoff + offset;\n-\t\t}\n-\t} else { /* version 1, must be PPTP */\n+\t/* version 1, must be PPTP */\n+\tif (gre_ver == 1) {\n \t\tu8 _ppp_hdr[PPP_HDRLEN];\n \t\tu8 *ppp_hdr;\n \n@@ -573,6 +554,27 @@ bool __skb_flow_dissect(const struct sk_buff *skb,\n \n \t\tbreak;\n \t}\n+\tcase htons(ETH_P_TEB): {\n+\t\tconst struct ethhdr *eth;\n+\t\tstruct ethhdr _eth;\n+\n+\t\teth = __skb_header_pointer(skb, nhoff, sizeof(_eth),\n+\t\t\t\t\t data, hlen, &_eth);\n+\t\tif (!eth)\n+\t\t\tgoto out_bad;\n+\n+\t\tproto = eth->h_proto;\n+\t\tnhoff += sizeof(*eth);\n+\n+\t\t/* Cap headers that we access via pointers at the\n+\t\t * end of the Ethernet header as our maximum alignment\n+\t\t * at that point is only 2 bytes.\n+\t\t */\n+\t\tif (NET_IP_ALIGN)\n+\t\t\thlen = nhoff;\n+\n+\t\tgoto proto_again;\n+\t}\n \tcase htons(ETH_P_8021AD):\n \tcase htons(ETH_P_8021Q): {\n \t\tconst struct vlan_hdr *vlan;\n","prefixes":["v2","net-next","1/6"]}