From patchwork Thu Oct 26 19:09:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 830886 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="hsugSLFR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yNGmF1474z9s7f for ; Fri, 27 Oct 2017 06:10:05 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751771AbdJZTKC (ORCPT ); Thu, 26 Oct 2017 15:10:02 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:47333 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751236AbdJZTJ7 (ORCPT ); Thu, 26 Oct 2017 15:09:59 -0400 Received: by mail-pf0-f196.google.com with SMTP id z11so3187559pfk.4 for ; Thu, 26 Oct 2017 12:09:59 -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=atgSc7cSWpfP0yeG8RydMP5L2g1hZzx81Z5EoLNlTI8=; b=hsugSLFRC7TvC7N460JMd50zMnA/FWHRzcRQev3QX36clV06rJ8/zBJEIplPXi09OJ 8DFZ94WoRTzJCzfSDO0Ecsw/tAJkCs3mi4XgJoOMsqUTa6x0XAWq0Q9vq77GXMMOJ6bw Ro7AhVzw4QYPdVtIQOTFmSOZe2UuuLXwPZ0Ia34Q5fplEmf1thfH/w9K64TJTp/IbAft Ycz9m9WO5WjKhrb9Nh5CHBAaBjlxX0BLqyHc9WVlQtnJTjutF9mfoaS4p+FTQYQXpIU3 3zNqBJpeDFdRN9pqQSkrgkrxWtAJ67/zXzen6B5gJxhf78thR/oqn1hwa6yEorb6GllP 72Ow== 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=atgSc7cSWpfP0yeG8RydMP5L2g1hZzx81Z5EoLNlTI8=; b=APCvZ8Qu+A10Gdg36HadUIMrcg8YiokNZM3rmHlJsGLKK5vPfAEI7rhPR1RTEyGGcB MHbo7QjbW0x/i6w0vMi2yUWdE5m3zzgIVmjkfOTZyOjt5WAJ2qRYZd2BPjS2g0AQGTNi QiU/4DyW+VuXxFiI635hzn88Mq7vEzUmmjUqT4l25Si6/ESWHAmpR6vWv4MMdkZV4X9l Q4fra7/s70pFHnl2Wy06H1kHeKZOgQyS2t09EKNy6DczXAAtDtJscJsy5Ez/oBsVEbNi aDlRijS+1d4b68Nb1xA0DT0UtXI0bPTY7LH7Aahg3Wrqqe4J1cbkDdWjiYAVctsGImuu CYgA== X-Gm-Message-State: AMCzsaVycwq5VcPjnfD/SzJ8sgoTp8kNP+F6iwA0LtsPbTiGTgQ0lIlN JA2VrGjtKp7z0mhvKmayt2rimg== X-Google-Smtp-Source: ABhQp+TC+FVfa0ciMlGF1UGvKGvDnIKjEu4yJNuvr9XZ0JOasoWcdjvu23bEVPmtLMRj3csBygDDtQ== X-Received: by 10.98.196.93 with SMTP id y90mr6330833pff.34.1509044998595; Thu, 26 Oct 2017 12:09:58 -0700 (PDT) Received: from localhost.localdomain (67-207-98-108.static.wiline.com. [67.207.98.108]) by smtp.gmail.com with ESMTPSA id j1sm11071502pfc.169.2017.10.26.12.09.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:09:57 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net Cc: pablo@netfilter.org, laforge@gnumonks.org, aschultz@tpip.net, netdev@vger.kernel.org, rohit@quantonium.net, Tom Herbert Subject: [PATCH v6 net-next 02/12] vxlan: Call common functions to get tunnel routes Date: Thu, 26 Oct 2017 12:09:19 -0700 Message-Id: <20171026190929.11619-3-tom@quantonium.net> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171026190929.11619-1-tom@quantonium.net> References: <20171026190929.11619-1-tom@quantonium.net> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Call ip_tunnel_get_route and ip6_tnl_get_route to handle getting a route and dealing with the dst_cache. Signed-off-by: Tom Herbert --- drivers/net/vxlan.c | 84 ++++------------------------------------------------- 1 file changed, 5 insertions(+), 79 deletions(-) diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c index d7c49cf1d5e9..810caa9adf37 100644 --- a/drivers/net/vxlan.c +++ b/drivers/net/vxlan.c @@ -1867,47 +1867,11 @@ static struct rtable *vxlan_get_route(struct vxlan_dev *vxlan, struct net_device struct dst_cache *dst_cache, const struct ip_tunnel_info *info) { - bool use_cache = ip_tunnel_dst_cache_usable(skb, info); - struct rtable *rt = NULL; - struct flowi4 fl4; - if (!sock4) return ERR_PTR(-EIO); - if (tos && !info) - use_cache = false; - if (use_cache) { - rt = dst_cache_get_ip4(dst_cache, saddr); - if (rt) - return rt; - } - - memset(&fl4, 0, sizeof(fl4)); - fl4.flowi4_oif = oif; - fl4.flowi4_tos = RT_TOS(tos); - fl4.flowi4_mark = skb->mark; - fl4.flowi4_proto = IPPROTO_UDP; - fl4.daddr = daddr; - fl4.saddr = *saddr; - fl4.fl4_dport = dport; - fl4.fl4_sport = sport; - - rt = ip_route_output_key(vxlan->net, &fl4); - if (likely(!IS_ERR(rt))) { - if (rt->dst.dev == dev) { - netdev_dbg(dev, "circular route to %pI4\n", &daddr); - ip_rt_put(rt); - return ERR_PTR(-ELOOP); - } - - *saddr = fl4.saddr; - if (use_cache) - dst_cache_set_ip4(dst_cache, &rt->dst, fl4.saddr); - } else { - netdev_dbg(dev, "no route to %pI4\n", &daddr); - return ERR_PTR(-ENETUNREACH); - } - return rt; + return ip_tunnel_get_route(dev, skb, IPPROTO_UDP, oif, tos, daddr, + saddr, dport, sport, dst_cache, info); } #if IS_ENABLED(CONFIG_IPV6) @@ -1922,50 +1886,12 @@ static struct dst_entry *vxlan6_get_route(struct vxlan_dev *vxlan, struct dst_cache *dst_cache, const struct ip_tunnel_info *info) { - bool use_cache = ip_tunnel_dst_cache_usable(skb, info); - struct dst_entry *ndst; - struct flowi6 fl6; - int err; - if (!sock6) return ERR_PTR(-EIO); - if (tos && !info) - use_cache = false; - if (use_cache) { - ndst = dst_cache_get_ip6(dst_cache, saddr); - if (ndst) - return ndst; - } - - memset(&fl6, 0, sizeof(fl6)); - fl6.flowi6_oif = oif; - fl6.daddr = *daddr; - fl6.saddr = *saddr; - fl6.flowlabel = ip6_make_flowinfo(RT_TOS(tos), label); - fl6.flowi6_mark = skb->mark; - fl6.flowi6_proto = IPPROTO_UDP; - fl6.fl6_dport = dport; - fl6.fl6_sport = sport; - - err = ipv6_stub->ipv6_dst_lookup(vxlan->net, - sock6->sock->sk, - &ndst, &fl6); - if (unlikely(err < 0)) { - netdev_dbg(dev, "no route to %pI6\n", daddr); - return ERR_PTR(-ENETUNREACH); - } - - if (unlikely(ndst->dev == dev)) { - netdev_dbg(dev, "circular route to %pI6\n", daddr); - dst_release(ndst); - return ERR_PTR(-ELOOP); - } - - *saddr = fl6.saddr; - if (use_cache) - dst_cache_set_ip6(dst_cache, ndst, saddr); - return ndst; + return ip6_tnl_get_route(dev, skb, sock6->sock->sk, IPPROTO_UDP, oif, + tos, label, daddr, saddr, dport, sport, + dst_cache, info); } #endif