From patchwork Fri Jul 26 23:15:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pravin B Shelar X-Patchwork-Id: 262353 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 096022C00F6 for ; Sat, 27 Jul 2013 09:15:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760240Ab3GZXPL (ORCPT ); Fri, 26 Jul 2013 19:15:11 -0400 Received: from na3sys009aog104.obsmtp.com ([74.125.149.73]:46596 "HELO na3sys009aog104.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1760207Ab3GZXPG (ORCPT ); Fri, 26 Jul 2013 19:15:06 -0400 Received: from mail-pd0-f179.google.com ([209.85.192.179]) (using TLSv1) by na3sys009aob104.postini.com ([74.125.148.12]) with SMTP ID DSNKUfMC+TvcQ4zwQ0vanBTre9aIGVaAAKcd@postini.com; Fri, 26 Jul 2013 16:15:06 PDT Received: by mail-pd0-f179.google.com with SMTP id v10so3241477pde.10 for ; Fri, 26 Jul 2013 16:15:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=k2ldYloHbmMy4srvHGl0pWeM8HhktDsM2m4fPvapdsw=; b=EDtMiKWvP3X498hhJOLA6dO1PQx4rkiL5MkwEFNniNOXPHbUTKs5yiHKgQNGjPPsUn TyQSzw/aXbny3hhxkjfSSC9KapuPZfKuIUcRZp8aHS7Q8TmCSAcx5Ten9LfpZvfcDVdz 4DRKrtBFWPkQGQe5Qtyi++mCKy085Mq7gZTKnHqKhLg0HLFWl52VTVNvcO32+ZBwcpdD B6kf85A8BJHjXrG2PrvojEZQky5+4QTpLGKCwTa/gKqjZ+qCDBIjxqUfmeDYG6myuiUM ++GydK8IJooxxybLkNybgqSqQEZVgYs3BvJ/vKIf5Onk2MNWx2yom1K3dmJ6TJfKgnM1 cAyg== X-Received: by 10.66.155.163 with SMTP id vx3mr56788568pab.67.1374880505767; Fri, 26 Jul 2013 16:15:05 -0700 (PDT) X-Received: by 10.66.155.163 with SMTP id vx3mr56788560pab.67.1374880505677; Fri, 26 Jul 2013 16:15:05 -0700 (PDT) Received: from localhost ([75.98.92.113]) by mx.google.com with ESMTPSA id ep4sm62316020pbd.35.2013.07.26.16.15.04 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 26 Jul 2013 16:15:04 -0700 (PDT) From: Pravin B Shelar To: netdev@vger.kernel.org Cc: stephen@networkplumber.org, Pravin B Shelar Subject: [PATCH net-next v4 4/7] vxlan: Factor out vxlan send api. Date: Fri, 26 Jul 2013 16:15:03 -0700 Message-Id: <1374880503-2998-1-git-send-email-pshelar@nicira.com> X-Mailer: git-send-email 1.8.2.135.g7b592fa X-Gm-Message-State: ALoCoQlqaWtGRslvbgfLdqSPyJwV0I3fU35sF6HKKEAwqPksYExY74ZDw04JYhGMCb7wlv5uIbGxRNvkVJNPjQricr/g7TviY+/Oroh9rSHqK6w1dKl2tGwGFcTs8OIsFa9PgGD5OH9ZYGAoEu3RL0mbkcfY6tYwqCrFB0k0rtFcyzhgN8YmX/4= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Following patch allows more code sharing between vxlan and ovs-vxlan. Signed-off-by: Pravin B Shelar --- v1-v2: - revert back to original names. --- drivers/net/vxlan.c | 91 ++++++++++++++++++++++++++++++--------------------- include/net/vxlan.h | 7 ++++ 2 files changed, 61 insertions(+), 37 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index 71892b5..2178c3c 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1058,11 +1058,8 @@ static void vxlan_sock_put(struct sk_buff *skb) } /* On transmit, associate with the tunnel socket */ -static void vxlan_set_owner(struct net_device *dev, struct sk_buff *skb) +static void vxlan_set_owner(struct sock *sk, struct sk_buff *skb) { - struct vxlan_dev *vxlan = netdev_priv(dev); - struct sock *sk = vxlan->vh->vs->sock->sk; - skb_orphan(skb); sock_hold(sk); skb->sk = sk; @@ -1074,9 +1071,9 @@ static void vxlan_set_owner(struct net_device *dev, struct sk_buff *skb) * better and maybe available from hardware * secondary choice is to use jhash on the Ethernet header */ -static __be16 vxlan_src_port(const struct vxlan_dev *vxlan, struct sk_buff *skb) +__be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb) { - unsigned int range = (vxlan->port_max - vxlan->port_min) + 1; + unsigned int range = (port_max - port_min) + 1; u32 hash; hash = skb_get_rxhash(skb); @@ -1084,8 +1081,9 @@ static __be16 vxlan_src_port(const struct vxlan_dev *vxlan, struct sk_buff *skb) hash = jhash(skb->data, 2 * ETH_ALEN, (__force u32) skb->protocol); - return htons((((u64) hash * range) >> 32) + vxlan->port_min); + return htons((((u64) hash * range) >> 32) + port_min); } +EXPORT_SYMBOL_GPL(vxlan_src_port); static int handle_offloads(struct sk_buff *skb) { @@ -1101,6 +1099,45 @@ static int handle_offloads(struct sk_buff *skb) return 0; } +int vxlan_xmit_skb(struct net *net, struct vxlan_handler *vh, + struct rtable *rt, struct sk_buff *skb, + __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df, + __be16 src_port, __be16 dst_port, __be32 vni) +{ + struct vxlanhdr *vxh; + struct udphdr *uh; + int err; + + if (!skb->encapsulation) { + skb_reset_inner_headers(skb); + skb->encapsulation = 1; + } + + vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh)); + vxh->vx_flags = htonl(VXLAN_FLAGS); + vxh->vx_vni = vni; + + __skb_push(skb, sizeof(*uh)); + skb_reset_transport_header(skb); + uh = udp_hdr(skb); + + uh->dest = dst_port; + uh->source = src_port; + + uh->len = htons(skb->len); + uh->check = 0; + + vxlan_set_owner(vh->vs->sock->sk, skb); + + err = handle_offloads(skb); + if (err) + return err; + + return iptunnel_xmit(net, rt, skb, src, dst, + IPPROTO_UDP, tos, ttl, df); +} +EXPORT_SYMBOL_GPL(vxlan_xmit_skb); + /* Bypass encapsulation if the destination is local */ static void vxlan_encap_bypass(struct sk_buff *skb, struct vxlan_dev *src_vxlan, struct vxlan_dev *dst_vxlan) @@ -1138,8 +1175,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, struct vxlan_dev *vxlan = netdev_priv(dev); struct rtable *rt; const struct iphdr *old_iph; - struct vxlanhdr *vxh; - struct udphdr *uh; struct flowi4 fl4; __be32 dst; __be16 src_port, dst_port; @@ -1161,11 +1196,6 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, goto drop; } - if (!skb->encapsulation) { - skb_reset_inner_headers(skb); - skb->encapsulation = 1; - } - /* Need space for new headers (invalidates iph ptr) */ if (skb_cow_head(skb, VXLAN_HEADROOM)) goto drop; @@ -1180,7 +1210,7 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, if (tos == 1) tos = ip_tunnel_get_dsfield(old_iph, skb); - src_port = vxlan_src_port(vxlan, skb); + src_port = vxlan_src_port(vxlan->port_min, vxlan->port_max, skb); memset(&fl4, 0, sizeof(fl4)); fl4.flowi4_oif = rdst->remote_ifindex; @@ -1197,9 +1227,8 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, if (rt->dst.dev == dev) { netdev_dbg(dev, "circular route to %pI4\n", &dst); - ip_rt_put(rt); dev->stats.collisions++; - goto tx_error; + goto rt_tx_error; } /* Bypass encapsulation if the destination is local */ @@ -1214,30 +1243,16 @@ static void vxlan_xmit_one(struct sk_buff *skb, struct net_device *dev, vxlan_encap_bypass(skb, vxlan, dst_vxlan); return; } - vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh)); - vxh->vx_flags = htonl(VXLAN_FLAGS); - vxh->vx_vni = htonl(vni << 8); - - __skb_push(skb, sizeof(*uh)); - skb_reset_transport_header(skb); - uh = udp_hdr(skb); - - uh->dest = dst_port; - uh->source = src_port; - - uh->len = htons(skb->len); - uh->check = 0; - - vxlan_set_owner(dev, skb); - - if (handle_offloads(skb)) - goto drop; tos = ip_tunnel_ecn_encap(tos, old_iph, skb); ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); - err = iptunnel_xmit(dev_net(dev), rt, skb, fl4.saddr, dst, - IPPROTO_UDP, tos, ttl, df); + err = vxlan_xmit_skb(dev_net(dev), vxlan->vh, rt, skb, + fl4.saddr, dst, tos, ttl, df, + src_port, dst_port, htonl(vni << 8)); + + if (err < 0) + goto rt_tx_error; iptunnel_xmit_stats(err, &dev->stats, dev->tstats); return; @@ -1246,6 +1261,8 @@ drop: dev->stats.tx_dropped++; goto tx_free; +rt_tx_error: + ip_rt_put(rt); tx_error: dev->stats.tx_errors++; tx_free: diff --git a/include/net/vxlan.h b/include/net/vxlan.h index 5794bf7..2c82c75 100644 --- a/include/net/vxlan.h +++ b/include/net/vxlan.h @@ -37,4 +37,11 @@ struct vxlan_handler *vxlan_handler_add(struct net *net, __be16 portno, vxlan_rcv_t *rcv, void *data, int priority, bool force_create); +int vxlan_xmit_skb(struct net *net, struct vxlan_handler *vh, + struct rtable *rt, struct sk_buff *skb, + __be32 src, __be32 dst, __u8 tos, __u8 ttl, __be16 df, + __be16 src_port, __be16 dst_port, __be32 vni); + +__be16 vxlan_src_port(__u16 port_min, __u16 port_max, struct sk_buff *skb); + #endif