From patchwork Thu Sep 28 23:52:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 819787 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=quantonium-net.20150623.gappssmtp.com header.i=@quantonium-net.20150623.gappssmtp.com header.b="CBV66bhD"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y3BNF0n8Nz9sP1 for ; Fri, 29 Sep 2017 09:53:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752024AbdI1XxR (ORCPT ); Thu, 28 Sep 2017 19:53:17 -0400 Received: from mail-pg0-f46.google.com ([74.125.83.46]:50717 "EHLO mail-pg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752008AbdI1XxO (ORCPT ); Thu, 28 Sep 2017 19:53:14 -0400 Received: by mail-pg0-f46.google.com with SMTP id p5so1774636pgn.7 for ; Thu, 28 Sep 2017 16:53:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quantonium-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=yNwn4H1x9xNz16l0pgj/7MrQtL11truhNgqYO5ISZks=; b=CBV66bhD+DIvwLF4qBRRrYjJ5/c/KDL93r9SiJpCvhYxhuh26Yr5KKtOZOABww8soN ZZkixRTRudEfDdPvJoZy46whhOljIckqxqRZk1ZZ1ayCsJWA0DA5bnVQgtQWMv0Z3URv HemfZyfRk6JL4PhUTJ6lXvLuVjO72wG1iTK+jqCJAyJOp3aRVTwpDgmqJH1efn4GiD2B pnOy13tw/hDtO5+LIAfeDYUoQm2Bi3ZjWopPqJcWq0QYFoFpKEulV2z8pvuK7q4wk1Qk R4T4hXqW6mYsfb0G/rUdS5Igk+Kh+HQF/JNGEDoUsQlGtORN6RYxbplxGcbvTfc4x1OR kkyA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=yNwn4H1x9xNz16l0pgj/7MrQtL11truhNgqYO5ISZks=; b=CUpEA1ZMH6+d+ophgUUoUXc7OcJYuK/J+JcMQ1x4G2CGZvSMSHt94LqQhbSXa492gf LluZEmI3LYYd/bDy9ZAFR9jco/B10dU1Gkt6n+FberHtZf2ewaDKm0hH/o0InRUfdMfs NwY7ayHLBAh4qO1rQTs9/jssfsf8ADRsiMisywJLKkAQPPUqvoQAQCAQ6Vcx+X0Idrky TfEvdKF0IKFERXB9tlOFDP2fMXTw3CsuoCqqu9SSmayQSkUqc+d5XCfW6QljuSw7YKV4 ZFUCqc1L9K8B89M+AQ0XhgO5jRnNiqmMgSsxOmPc79iw0rEu5GTO2TVHHCTY/RPq3SKv kA9Q== X-Gm-Message-State: AHPjjUjohNEvXhCUdrRZNPtAqRk7SfQ69z4AfdgjD4/2/DJaFEAVpufh DDtEhWOJEZbYIdIcioyDVC9hcg== X-Google-Smtp-Source: AOwi7QAiyHVsEleVzMVfno3ENyKH+3bIjxpmP+iqba74qsO3sdE24KsiCn0oklqNB+8ksg4jrcSLlQ== X-Received: by 10.84.216.69 with SMTP id f5mr5364264plj.172.1506642794480; Thu, 28 Sep 2017 16:53:14 -0700 (PDT) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id k67sm3874023pga.46.2017.09.28.16.53.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 16:53:13 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v4 net-next 8/8] vxlan: support flow dissect Date: Thu, 28 Sep 2017 16:52:30 -0700 Message-Id: <20170928235230.22158-9-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170928235230.22158-1-tom@quantonium.net> References: <20170928235230.22158-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Populate offload flow_dissect callback appropriately for VXLAN and VXLAN-GPE. Signed-off-by: Tom Herbert --- drivers/net/vxlan.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index d7c49cf1d5e9..80227050b2d4 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1327,6 +1327,45 @@ static bool vxlan_ecn_decapsulate(struct vxlan_sock *vs, void *oiph, return err <= 1; } +static enum flow_dissect_ret vxlan_flow_dissect(struct sock *sk, + const struct sk_buff *skb, + struct flow_dissector_key_control *key_control, + struct flow_dissector *flow_dissector, + void *target_container, void *data, + __be16 *p_proto, u8 *p_ip_proto, int *p_nhoff, + int *p_hlen, unsigned int flags) +{ + __be16 protocol = htons(ETH_P_TEB); + struct vxlanhdr *vhdr, _vhdr; + struct vxlan_sock *vs; + + vhdr = __skb_header_pointer(skb, *p_nhoff + sizeof(struct udphdr), + sizeof(_vhdr), data, *p_hlen, &_vhdr); + if (!vhdr) + return FLOW_DISSECT_RET_OUT_BAD; + + vs = rcu_dereference_sk_user_data(sk); + if (!vs) + return FLOW_DISSECT_RET_OUT_BAD; + + if (vs->flags & VXLAN_F_GPE) { + struct vxlanhdr_gpe *gpe = (struct vxlanhdr_gpe *)vhdr; + + /* Need to have Next Protocol set for interfaces in GPE mode. */ + if (gpe->version != 0 || !gpe->np_applied || gpe->oam_flag) + return FLOW_DISSECT_RET_CONTINUE; + + protocol = tun_p_from_eth_p(gpe->next_protocol); + if (!protocol) + return FLOW_DISSECT_RET_CONTINUE; + } + + *p_nhoff += sizeof(struct udphdr) + sizeof(_vhdr); + *p_proto = protocol; + + return FLOW_DISSECT_RET_PROTO_AGAIN; +} + /* Callback from net/ipv4/udp.c to receive packets */ static int vxlan_rcv(struct sock *sk, struct sk_buff *skb) { @@ -2846,6 +2885,7 @@ static struct vxlan_sock *vxlan_socket_create(struct net *net, bool ipv6, tunnel_cfg.encap_destroy = NULL; tunnel_cfg.gro_receive = vxlan_gro_receive; tunnel_cfg.gro_complete = vxlan_gro_complete; + tunnel_cfg.flow_dissect = vxlan_flow_dissect; setup_udp_tunnel_sock(net, sock, &tunnel_cfg);