{"id":807192,"url":"http://patchwork.ozlabs.org/api/1.0/patches/807192/?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":"<20170829171942.8974-6-tom@quantonium.net>","date":"2017-08-29T17:19:41","name":"[net-next,5/6] fou: Support flow dissection","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":true,"hash":"93357d1b3e8f9b31e0b8db29b8de961e2e9ef5aa","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/20170829171942.8974-6-tom@quantonium.net/mbox/","series":[{"id":418,"url":"http://patchwork.ozlabs.org/api/1.0/series/418/?format=json","date":"2017-08-29T17:19:36","name":"flow_dissector: Protocol specific flow dissector offload","version":1,"mbox":"http://patchwork.ozlabs.org/series/418/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/807192/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=\"icPe2kot\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhb4Y12Kgz9t2v\n\tfor ;\n\tWed, 30 Aug 2017 03:20:29 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751353AbdH2RU1 (ORCPT );\n\tTue, 29 Aug 2017 13:20:27 -0400","from mail-pg0-f53.google.com ([74.125.83.53]:37689 \"EHLO\n\tmail-pg0-f53.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751242AbdH2RUW (ORCPT\n\t); Tue, 29 Aug 2017 13:20:22 -0400","by mail-pg0-f53.google.com with SMTP id 83so12546994pgb.4\n\tfor ; Tue, 29 Aug 2017 10:20:22 -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\tg63sm5694902pfb.79.2017.08.29.10.20.20\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 29 Aug 2017 10:20:21 -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=kKIbFCtWDbRxeWwC3ZaYIVGgRn2kvLOfYB1ZN1pqGns=;\n\tb=icPe2kotFj57ncSh/rRdQ+GbtixtWuQmV/sDziHyyk/bRtmw5R/kZbl7ggcbH6iToe\n\txviCcbEoIEjA+Oc4i4nLIatTCDXbdXdTBfaqYB3fB/qnqakiK0BN3rjBYH6L8jgRxNpW\n\tuTQCPXVM5jTfmYjEgZmZmCxjZhpwbvK8RlmpZZsBwq6R6+cl1c9ESfVoXDo/TV3qPAtR\n\tLZCNsYoLhjoMlE1prE4KTQcx3oaEA24Qlsh234SNBDCN629crzMwuM35BzE5MOrGkoYr\n\tgFpkTic8TyeTZY/r+WNnMxqJPcMt+Vf1zod0XupTfLoUKnX7dVyfKUipqO0b8ln84kQa\n\t0lIw==","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=kKIbFCtWDbRxeWwC3ZaYIVGgRn2kvLOfYB1ZN1pqGns=;\n\tb=KTbZhYznVm84lBzYq3xaC6bLu8xh0W2KziD844s2ehPubIdMVOkZ9rtyB1ciibiWVs\n\tBWdvIWHW1vtLCp20CPz+KNLp1XK+rSxV8FmfmLCsgTUu0NtnMCAb8dvS9iowceMeVdnr\n\t4/151sa/3f610VQjyPj4WLIOxiggA8LmWgknHYLAJLWtYeBiUIzWIYrgTVyAqkxUi3JT\n\tfDRv2LwbdW4f2qyKIjya3SkR0DiAk7k8iLrhBPtovDT4TyRH24nrcXtbDG5yxn590LhO\n\tzPEase1WRw0lz0jrUtTYkinDuZrpIRLYBPhZ/CusDZPZ50uz3+Yhwvtr5YgG+NwRELUh\n\tmtkg==","X-Gm-Message-State":"AHYfb5i8gCazA8u8KSUcTpWLnz8mu7sEygjc83T/+eUyyf87WXg77Fvj\n\t0rmekjmkCpZGpyJE+6g=","X-Received":"by 10.84.217.11 with SMTP id o11mr1296911pli.245.1504027221870; \n\tTue, 29 Aug 2017 10:20:21 -0700 (PDT)","From":"Tom Herbert ","To":"davem@davemloft.net","Cc":"netdev@vger.kernel.org, Tom Herbert ","Subject":"[PATCH net-next 5/6] fou: Support flow dissection","Date":"Tue, 29 Aug 2017 10:19:41 -0700","Message-Id":"<20170829171942.8974-6-tom@quantonium.net>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20170829171942.8974-1-tom@quantonium.net>","References":"<20170829171942.8974-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 callabck appropriately for fou and gue.\n---\n net/ipv4/fou.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n 1 file changed, 63 insertions(+)","diff":"diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c\nindex 1540db65241a..a831dd49fb28 100644\n--- a/net/ipv4/fou.c\n+++ b/net/ipv4/fou.c\n@@ -282,6 +282,20 @@ static int fou_gro_complete(struct sock *sk, struct sk_buff *skb,\n \treturn err;\n }\n \n+static enum flow_dissect_ret fou_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*p_ip_proto = fou_from_sock(sk)->protocol;\n+\t*p_nhoff += sizeof(struct udphdr);\n+\n+\treturn FLOW_DISSECT_RET_IPPROTO_AGAIN;\n+}\n+\n static struct guehdr *gue_gro_remcsum(struct sk_buff *skb, unsigned int off,\n \t\t\t\t struct guehdr *guehdr, void *data,\n \t\t\t\t size_t hdrlen, struct gro_remcsum *grc,\n@@ -500,6 +514,53 @@ static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)\n \treturn err;\n }\n \n+static enum flow_dissect_ret gue_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+\tstruct guehdr *guehdr, _guehdr;\n+\n+\tguehdr = __skb_header_pointer(skb, *p_nhoff + sizeof(struct udphdr),\n+\t\t\t\t sizeof(_guehdr), data, *p_hlen, &_guehdr);\n+\tif (!guehdr)\n+\t\treturn FLOW_DISSECT_RET_OUT_BAD;\n+\n+\tswitch (guehdr->version) {\n+\tcase 0:\n+\t\tif (unlikely(guehdr->control))\n+\t\t\treturn FLOW_DISSECT_RET_CONTINUE;\n+\n+\t\t*p_ip_proto = guehdr->proto_ctype;\n+\t\t*p_nhoff += sizeof(struct udphdr) +\n+\t\t sizeof(*guehdr) + (guehdr->hlen << 2);\n+\n+\t\tbreak;\n+\tcase 1:\n+\t\tswitch (((struct iphdr *)guehdr)->version) {\n+\t\tcase 4:\n+\t\t\t*p_ip_proto = IPPROTO_IPIP;\n+\t\t\tbreak;\n+\t\tcase 6:\n+\t\t\t*p_ip_proto = IPPROTO_IPV6;\n+\t\t\tbreak;\n+\t\tdefault:\n+\t\t\treturn FLOW_DISSECT_RET_CONTINUE;\n+\t\t}\n+\n+\t\t*p_nhoff += sizeof(struct udphdr);\n+\n+\t\tbreak;\n+\tdefault:\n+\t\treturn FLOW_DISSECT_RET_CONTINUE;\n+\t}\n+\n+\treturn FLOW_DISSECT_RET_IPPROTO_AGAIN;\n+}\n+\n static int fou_add_to_port_list(struct net *net, struct fou *fou)\n {\n \tstruct fou_net *fn = net_generic(net, fou_net_id);\n@@ -570,12 +631,14 @@ static int fou_create(struct net *net, struct fou_cfg *cfg,\n \t\ttunnel_cfg.encap_rcv = fou_udp_recv;\n \t\ttunnel_cfg.gro_receive = fou_gro_receive;\n \t\ttunnel_cfg.gro_complete = fou_gro_complete;\n+\t\ttunnel_cfg.flow_dissect = fou_flow_dissect;\n \t\tfou->protocol = cfg->protocol;\n \t\tbreak;\n \tcase FOU_ENCAP_GUE:\n \t\ttunnel_cfg.encap_rcv = gue_udp_recv;\n \t\ttunnel_cfg.gro_receive = gue_gro_receive;\n \t\ttunnel_cfg.gro_complete = gue_gro_complete;\n+\t\ttunnel_cfg.flow_dissect = gue_flow_dissect;\n \t\tbreak;\n \tdefault:\n \t\terr = -EINVAL;\n","prefixes":["net-next","5/6"]}