From patchwork Thu Sep 28 21:48:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 819764 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="IYAiTfDM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y37cY5fpsz9sP1 for ; Fri, 29 Sep 2017 07:49:01 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751917AbdI1Vs7 (ORCPT ); Thu, 28 Sep 2017 17:48:59 -0400 Received: from mail-pf0-f177.google.com ([209.85.192.177]:56296 "EHLO mail-pf0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751819AbdI1Vs4 (ORCPT ); Thu, 28 Sep 2017 17:48:56 -0400 Received: by mail-pf0-f177.google.com with SMTP id r71so1495538pfe.12 for ; Thu, 28 Sep 2017 14:48:56 -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=IYAiTfDMy04LaWyS9UGHo+BbZB7S+EFAYXBo+QBJBzulMjY2BM7ws4CfKOuPhGRype aetSfUEr04kaukSWnEOGHXnc+SuYM3/1W5iOr3nTF8yio7HsWMnGwMxLZEtxOxdFnZzk Dz4fFNiF/ayA7hJpe33M6zPN5Pgnvuq8AzI/najnudq2SdIT29OMftEyxklCpFRwXFOy fWfFl9xPFTPPsY6XJFGfGVC2wDcvPUSHUETDUZYqbm2LWFsoGutzE+w82975ojmAJ68l eBN1nUw+rbw/omiuBVSH2s2fODH+sj7rNJQDU9PNKoTYiKmlSFWOORLZWrnMV0xw7M9+ QWSQ== 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=t5W0MJOv+j43WOIBUnL1sFopHjztvrm30abTdKVAx2nA//YrttJ/NeRWYmTuvOvSfT 433hIV0GpqtvYQUKX4X9aVTietcu+3zmztXZhvBRlnJqbJ61Nl0+KfMCwskVhNP/IBuC u+KJKwHIK8VL1Rnp9JPP1XZEjWkgGhdu/5uQRVJtmQOE1WX4I4KwjPTwgsU/U/CLvwuE ZQnnb57vbSMBTZ2AZF48Q3xgLtMdxX/Lz5pawObeUXrRlY/jy4184UgdPBhvtuE/O244 ak71ZyoeJlO0YAr2wgxVzjNJ8yeYUuA/IUeyKT1krflCmUVDs9iLT9MnzPFtynR9e8Xl 6Fpw== X-Gm-Message-State: AHPjjUiDkhyoUqIwj0c4FTXtcCkVgIE0k+wnYqrsyvZFWxvzxYj/+Cm6 XNysf/wUTbXN+tIrCu8roGXPxw== X-Google-Smtp-Source: AOwi7QChHE2pb7foOncXfq04cxIfC0r2LZmdvCpAZzJXAbZT6VAsuD3btSZvnWE7Hi4ZhwWvzsmCIw== X-Received: by 10.84.129.193 with SMTP id b59mr4936381plb.147.1506635335815; Thu, 28 Sep 2017 14:48:55 -0700 (PDT) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id f8sm3540310pgs.7.2017.09.28.14.48.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Sep 2017 14:48:54 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v3 net-next 8/8] vxlan: support flow dissect Date: Thu, 28 Sep 2017 14:48:23 -0700 Message-Id: <20170928214823.2426-8-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170928214823.2426-1-tom@quantonium.net> References: <20170928214823.2426-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);