Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/807352/?format=api
{ "id": 807352, "url": "http://patchwork.ozlabs.org/api/patches/807352/?format=api", "web_url": "http://patchwork.ozlabs.org/project/netdev/patch/20170829232711.1465-5-tom@quantonium.net/", "project": { "id": 7, "url": "http://patchwork.ozlabs.org/api/projects/7/?format=api", "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-5-tom@quantonium.net>", "list_archive_url": null, "date": "2017-08-29T23:27:09", "name": "[v2,net-next,4/6] udp: flow dissector offload", "commit_ref": null, "pull_url": null, "state": "changes-requested", "archived": true, "hash": "4c7f259c1f580351e6c70cd18016c79481429b60", "submitter": { "id": 72064, "url": "http://patchwork.ozlabs.org/api/people/72064/?format=api", "name": "Tom Herbert", "email": "tom@quantonium.net" }, "delegate": { "id": 34, "url": "http://patchwork.ozlabs.org/api/users/34/?format=api", "username": "davem", "first_name": "David", "last_name": "Miller", "email": "davem@davemloft.net" }, "mbox": "http://patchwork.ozlabs.org/project/netdev/patch/20170829232711.1465-5-tom@quantonium.net/mbox/", "series": [ { "id": 503, "url": "http://patchwork.ozlabs.org/api/series/503/?format=api", "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/807352/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/807352/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<netdev-owner@vger.kernel.org>", "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=<UNKNOWN>)", "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=\"UuWEwBWD\"; dkim-atps=neutral" ], "Received": [ "from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xhlDM57vCz9s9Y\n\tfor <patchwork-incoming@ozlabs.org>;\n\tWed, 30 Aug 2017 09:27:47 +1000 (AEST)", "(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751858AbdH2X1q (ORCPT <rfc822;patchwork-incoming@ozlabs.org>);\n\tTue, 29 Aug 2017 19:27:46 -0400", "from mail-pg0-f41.google.com ([74.125.83.41]:33421 \"EHLO\n\tmail-pg0-f41.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751757AbdH2X1l (ORCPT\n\t<rfc822;netdev@vger.kernel.org>); Tue, 29 Aug 2017 19:27:41 -0400", "by mail-pg0-f41.google.com with SMTP id t3so15023940pgt.0\n\tfor <netdev@vger.kernel.org>; Tue, 29 Aug 2017 16:27:41 -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.39\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tTue, 29 Aug 2017 16:27:39 -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=g4FGqZyNDMtIoZbf77PyMcmyPWIfC76DMZ9RgxEvxkQ=;\n\tb=UuWEwBWDfTxkwqXk1qm1UgSK4Ob/3XhHXt4ACFWBs1Pj5qpFOY6qOE7bYEDGeg0vzG\n\thMQRoC3Qi5T+/Cf+bR9EQUiLNIv613wKdlnOqKPisAocfilOK0awIoklVUQzgLhMf/ZS\n\tQxtxiS6iDbdV+mllfq0byr+cAeIzDgddGNhp4btZv9C+58VbbOK6EIhUIxI838FEN5Ze\n\tR6yDyofjzZmh+aTKli4OtXHLXpCu3lc/6xQih/03lkzFkQwTHtMSavp5f9YwqOXM21kl\n\tv60cEpcuHjL5EFweWGRTjHP/jLRCCyjKWO5mu0Ij2qyfD2SttmXwW2/Xr+9CIdEkXnfA\n\tULHg==", "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=g4FGqZyNDMtIoZbf77PyMcmyPWIfC76DMZ9RgxEvxkQ=;\n\tb=KV93XpqDEL6i2c5BWKIFpG6WzGBsB7BUTU6gFMGqZXiZKat9Zx19zG3JuF8dtBvZzF\n\tGgDp/ankNkuN9p7Heja+u0DeO0E3hBaR+Ad8Yv/p+IDqP44l/kYkZo0oUM8thAZuM5GR\n\tvLDE7vFUX4itwI2W4uWuaOoHjT5Osj2zz5MBrX5+n800gMRxxUKN5LgAHY5F2+T+Mi5I\n\t7NjRJcUDY56Qzoe5p9GDDJC5k5rYULawybHazYToCeNV7nt3QwfLWbKJW1y8A7MEkRHK\n\tUsSUrXtt8LwcGVoyGLOo8z1HMLJKmmm5/qU2FP/OfFsh03LROeezQgjaskJstD9j3sCh\n\tcuOA==", "X-Gm-Message-State": "AHYfb5gZJHMR6TCJ4byY8OBczT65nLbbqzUFKtlEX8n+YfxSDKr86mGP\n\tdkp4feEvZXWcnwxb", "X-Received": "by 10.84.194.195 with SMTP id h61mr2388507pld.371.1504049260934; \n\tTue, 29 Aug 2017 16:27:40 -0700 (PDT)", "From": "Tom Herbert <tom@quantonium.net>", "To": "davem@davemloft.net", "Cc": "netdev@vger.kernel.org, Tom Herbert <tom@quantonium.net>", "Subject": "[PATCH v2 net-next 4/6] udp: flow dissector offload", "Date": "Tue, 29 Aug 2017 16:27:09 -0700", "Message-Id": "<20170829232711.1465-5-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": "<netdev.vger.kernel.org>", "X-Mailing-List": "netdev@vger.kernel.org" }, "content": "Add support to perform UDP specific flow dissection. This is\nprimarily intended for dissecting encapsulated packets in UDP\nencapsulation.\n\nThis patch adds a flow_dissect offload for UDP4 and UDP6. The backend\nfunction performs a socket lookup and calls the flow_dissect function\nif a socket is found.\n\nSigned-off-by: Tom Herbert <tom@quantonium.net>\n---\n include/linux/udp.h | 8 ++++++++\n include/net/udp.h | 8 ++++++++\n include/net/udp_tunnel.h | 8 ++++++++\n net/ipv4/udp_offload.c | 45 +++++++++++++++++++++++++++++++++++++++++++++\n net/ipv4/udp_tunnel.c | 1 +\n net/ipv6/udp_offload.c | 13 +++++++++++++\n 6 files changed, 83 insertions(+)", "diff": "diff --git a/include/linux/udp.h b/include/linux/udp.h\nindex eaea63bc79bb..2e90b189ef6a 100644\n--- a/include/linux/udp.h\n+++ b/include/linux/udp.h\n@@ -79,6 +79,14 @@ struct udp_sock {\n \tint\t\t\t(*gro_complete)(struct sock *sk,\n \t\t\t\t\t\tstruct sk_buff *skb,\n \t\t\t\t\t\tint nhoff);\n+\t/* Flow dissector function for a UDP socket */\n+\tenum flow_dissect_ret (*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/* udp_recvmsg try to use this before splicing sk_receive_queue */\n \tstruct sk_buff_head\treader_queue ____cacheline_aligned_in_smp;\ndiff --git a/include/net/udp.h b/include/net/udp.h\nindex f3d1de6f0983..499e4faf8b14 100644\n--- a/include/net/udp.h\n+++ b/include/net/udp.h\n@@ -174,6 +174,14 @@ struct sk_buff **udp_gro_receive(struct sk_buff **head, struct sk_buff *skb,\n \t\t\t\t struct udphdr *uh, udp_lookup_t lookup);\n int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup);\n \n+enum flow_dissect_ret udp_flow_dissect(const struct sk_buff *skb,\n+\t\t\tudp_lookup_t lookup,\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 static inline struct udphdr *udp_gro_udphdr(struct sk_buff *skb)\n {\n \tstruct udphdr *uh;\ndiff --git a/include/net/udp_tunnel.h b/include/net/udp_tunnel.h\nindex 10cce0dd4450..b7102e0f41a9 100644\n--- a/include/net/udp_tunnel.h\n+++ b/include/net/udp_tunnel.h\n@@ -69,6 +69,13 @@ typedef struct sk_buff **(*udp_tunnel_gro_receive_t)(struct sock *sk,\n \t\t\t\t\t\t struct sk_buff *skb);\n typedef int (*udp_tunnel_gro_complete_t)(struct sock *sk, struct sk_buff *skb,\n \t\t\t\t\t int nhoff);\n+typedef enum flow_dissect_ret (*udp_tunnel_flow_dissect_t)(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 struct udp_tunnel_sock_cfg {\n \tvoid *sk_user_data; /* user data used by encap_rcv call back */\n@@ -78,6 +85,7 @@ struct udp_tunnel_sock_cfg {\n \tudp_tunnel_encap_destroy_t encap_destroy;\n \tudp_tunnel_gro_receive_t gro_receive;\n \tudp_tunnel_gro_complete_t gro_complete;\n+\tudp_tunnel_flow_dissect_t flow_dissect;\n };\n \n /* Setup the given (UDP) sock to receive UDP encapsulated packets */\ndiff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c\nindex 97658bfc1b58..7f0a7ed4a6f7 100644\n--- a/net/ipv4/udp_offload.c\n+++ b/net/ipv4/udp_offload.c\n@@ -328,11 +328,56 @@ static int udp4_gro_complete(struct sk_buff *skb, int nhoff)\n \treturn udp_gro_complete(skb, nhoff, udp4_lib_lookup_skb);\n }\n \n+enum flow_dissect_ret udp_flow_dissect(const struct sk_buff *skb,\n+\t\t\tudp_lookup_t lookup,\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+\tenum flow_dissect_ret ret = FLOW_DISSECT_RET_CONTINUE;\n+\tstruct udphdr *uh, _uh;\n+\tstruct sock *sk;\n+\n+\tuh = __skb_header_pointer(skb, *p_nhoff, sizeof(_uh), data,\n+\t\t\t\t *p_hlen, &_uh);\n+\tif (!uh)\n+\t\treturn FLOW_DISSECT_RET_OUT_BAD;\n+\n+\trcu_read_lock();\n+\n+\tsk = (*lookup)(skb, uh->source, uh->dest);\n+\n+\tif (sk && udp_sk(sk)->flow_dissect)\n+\t\tret = udp_sk(sk)->flow_dissect(sk, skb, key_control,\n+\t\t\t\t\t flow_dissector, target_container,\n+\t\t\t\t\t data, p_proto, p_ip_proto,\n+\t\t\t\t\t p_nhoff, p_hlen, flags);\n+\trcu_read_unlock();\n+\n+\treturn ret;\n+}\n+EXPORT_SYMBOL(udp_flow_dissect);\n+\n+static enum flow_dissect_ret udp4_flow_dissect(const 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+\treturn udp_flow_dissect(skb, udp4_lib_lookup_skb, key_control,\n+\t\t\t\tflow_dissector, target_container, data,\n+\t\t\t\tp_proto, p_ip_proto, p_nhoff, p_hlen, flags);\n+}\n+\n static const struct net_offload udpv4_offload = {\n \t.callbacks = {\n \t\t.gso_segment = udp4_tunnel_segment,\n \t\t.gro_receive =\tudp4_gro_receive,\n \t\t.gro_complete =\tudp4_gro_complete,\n+\t\t.flow_dissect = udp4_flow_dissect,\n \t},\n };\n \ndiff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c\nindex 6539ff15e9a3..a4eec2a044d2 100644\n--- a/net/ipv4/udp_tunnel.c\n+++ b/net/ipv4/udp_tunnel.c\n@@ -71,6 +71,7 @@ void setup_udp_tunnel_sock(struct net *net, struct socket *sock,\n \tudp_sk(sk)->encap_destroy = cfg->encap_destroy;\n \tudp_sk(sk)->gro_receive = cfg->gro_receive;\n \tudp_sk(sk)->gro_complete = cfg->gro_complete;\n+\tudp_sk(sk)->flow_dissect = cfg->flow_dissect;\n \n \tudp_tunnel_encap_enable(sock);\n }\ndiff --git a/net/ipv6/udp_offload.c b/net/ipv6/udp_offload.c\nindex 455fd4e39333..99ade504eaf7 100644\n--- a/net/ipv6/udp_offload.c\n+++ b/net/ipv6/udp_offload.c\n@@ -73,11 +73,24 @@ static int udp6_gro_complete(struct sk_buff *skb, int nhoff)\n \treturn udp_gro_complete(skb, nhoff, udp6_lib_lookup_skb);\n }\n \n+static enum flow_dissect_ret udp6_flow_dissect(const 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+\treturn udp_flow_dissect(skb, udp6_lib_lookup_skb, key_control,\n+\t\t\t\tflow_dissector, target_container, data,\n+\t\t\t\tp_proto, p_ip_proto, p_nhoff, p_hlen, flags);\n+}\n+\n static const struct net_offload udpv6_offload = {\n \t.callbacks = {\n \t\t.gso_segment\t=\tudp6_tunnel_segment,\n \t\t.gro_receive\t=\tudp6_gro_receive,\n \t\t.gro_complete\t=\tudp6_gro_complete,\n+\t\t.flow_dissect\t=\tudp6_flow_dissect,\n \t},\n };\n \n", "prefixes": [ "v2", "net-next", "4/6" ] }