From patchwork Sat Apr 11 01:54:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin KaFai Lau X-Patchwork-Id: 460302 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 C7DC11402F9 for ; Sat, 11 Apr 2015 11:55:00 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=fb.com header.i=@fb.com header.b=amSp6/bc; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932752AbbDKByy (ORCPT ); Fri, 10 Apr 2015 21:54:54 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:30047 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755178AbbDKByd (ORCPT ); Fri, 10 Apr 2015 21:54:33 -0400 Received: from pps.filterd (m0044010 [127.0.0.1]) by mx0a-00082601.pphosted.com (8.14.5/8.14.5) with SMTP id t3B1oRhC003376 for ; Fri, 10 Apr 2015 18:54:33 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=facebook; bh=RiJCb41K57Ut4DelEI4pY8V0++jy8F1xMVMS3g480PM=; b=amSp6/bcPfA8bjG6M8NnL+L70VSKhf/WTROgK+hvV7YShBj8uS7OlzJ0JFfeZbkIiyM4 xLuQiIJFjChrMptBfXB5TtNkGZp6loYkTnP4PXhHG69bVGHcnCO1bjy9cNBSOm+atsuN j6+yE1YwFgSgs8NLCBtBoZQkAMdF+2+Q/Ss= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 1tpk020nx4-1 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT) for ; Fri, 10 Apr 2015 18:54:33 -0700 Received: from mx-out.facebook.com (192.168.52.13) by PRN-CHUB11.TheFacebook.com (192.168.16.21) with Microsoft SMTP Server (TLS) id 14.3.195.1; Fri, 10 Apr 2015 18:54:32 -0700 Received: from facebook.com (2401:db00:20:7029:face:0:33:0) by mx-out.facebook.com (10.212.232.63) with ESMTP id b195be78dfed11e4a80d0002c992ebde-33bf82c0 for ; Fri, 10 Apr 2015 18:54:30 -0700 Received: by devbig242.prn2.facebook.com (Postfix, from userid 6611) id BCD061F355B; Fri, 10 Apr 2015 18:54:29 -0700 (PDT) From: Martin KaFai Lau To: CC: Hannes Frederic Sowa , Subject: [RFC PATCH 09/10] ipv6: Break up ip6_rt_copy() Date: Fri, 10 Apr 2015 18:54:12 -0700 Message-ID: <1428717253-1006248-10-git-send-email-kafai@fb.com> X-Mailer: git-send-email 1.8.1 In-Reply-To: <1428717253-1006248-1-git-send-email-kafai@fb.com> References: <1428717253-1006248-1-git-send-email-kafai@fb.com> X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.13.68, 1.0.33, 0.0.0000 definitions=2015-04-10_07:2015-04-10, 2015-04-10, 1970-01-01 signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch breaks up ip6_rt_copy() into ip6_rt_copy_init() and ip6_rt_cache_alloc(). In the later patch, we need to create a percpu rt6_info copy. Hence, refactor the common rt6_info init codes to ip6_rt_copy_init(). Signed-off-by: Martin KaFai Lau Reviewed-by: Hannes Frederic Sowa --- net/ipv6/route.c | 76 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 61ce45e..665e41c 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -72,8 +72,11 @@ enum rt6_nud_state { RT6_NUD_SUCCEED = 1 }; -static struct rt6_info *ip6_rt_copy(struct rt6_info *ort, - const struct in6_addr *dest); +static void ip6_rt_copy_init(struct rt6_info *rt, + struct rt6_info *ort, + const struct in6_addr *dest); +static struct rt6_info *ip6_rt_cache_alloc(struct rt6_info *ort, + const struct in6_addr *dest); static struct dst_entry *ip6_dst_check(struct dst_entry *dst, u32 cookie); static unsigned int ip6_default_advmss(const struct dst_entry *dst); static unsigned int ip6_mtu(const struct dst_entry *dst); @@ -903,11 +906,9 @@ static struct rt6_info *ip6_pmtu_rt_cache_alloc(struct rt6_info *ort, * Clone the route. */ - rt = ip6_rt_copy(ort, daddr); + rt = ip6_rt_cache_alloc(ort, daddr); if (rt) { - rt->rt6i_flags |= RTF_CACHE; - if (!(ort->rt6i_flags & (RTF_NONEXTHOP | RTF_GATEWAY))) { if (ort->rt6i_dst.plen != 128 && ipv6_addr_equal(&ort->rt6i_dst.addr, daddr)) @@ -1913,7 +1914,7 @@ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_bu NEIGH_UPDATE_F_ISROUTER)) ); - nrt = ip6_rt_copy(rt, &msg->dest); + nrt = ip6_rt_cache_alloc(rt, &msg->dest); if (!nrt) goto out; @@ -1945,39 +1946,50 @@ out: * Misc support functions */ -static struct rt6_info *ip6_rt_copy(struct rt6_info *ort, - const struct in6_addr *dest) +static void ip6_rt_copy_init(struct rt6_info *rt, + struct rt6_info *ort, + const struct in6_addr *dest) { - struct net *net = dev_net(ort->dst.dev); - struct rt6_info *rt = ip6_dst_alloc(net, ort->dst.dev, 0, - ort->rt6i_table); - - if (rt) { - rt->dst.input = ort->dst.input; - rt->dst.output = ort->dst.output; + if (dest) { rt->dst.flags |= DST_HOST; - rt->rt6i_dst.addr = *dest; rt->rt6i_dst.plen = 128; - if (ort->dst.flags & DST_HOST) - dst_cow_metrics_generic(&rt->dst, rt->dst._metrics); - dst_copy_metrics(&rt->dst, &ort->dst); - rt->dst.error = ort->dst.error; - rt->rt6i_idev = ort->rt6i_idev; - if (rt->rt6i_idev) - in6_dev_hold(rt->rt6i_idev); - rt->dst.lastuse = jiffies; - rt->rt6i_gateway = ort->rt6i_gateway; - rt->rt6i_flags = ort->rt6i_flags; - rt6_set_from(rt, ort); - rt->rt6i_metric = 0; + } else { + memcpy(&rt->rt6i_dst, &ort->rt6i_dst, sizeof(rt->rt6i_dst)); + } + rt->dst.input = ort->dst.input; + rt->dst.output = ort->dst.output; + rt->dst.error = ort->dst.error; + rt->rt6i_idev = ort->rt6i_idev; + if (rt->rt6i_idev) + in6_dev_hold(rt->rt6i_idev); + rt->dst.lastuse = jiffies; + rt->rt6i_gateway = ort->rt6i_gateway; + rt->rt6i_flags = ort->rt6i_flags; + rt->rt6i_metric = ort->rt6i_metric; #ifdef CONFIG_IPV6_SUBTREES - memcpy(&rt->rt6i_src, &ort->rt6i_src, sizeof(struct rt6key)); + rt->rt6i_src = ort->rt6i_src; #endif - memcpy(&rt->rt6i_prefsrc, &ort->rt6i_prefsrc, sizeof(struct rt6key)); - rt->rt6i_table = ort->rt6i_table; - } + rt->rt6i_prefsrc = ort->rt6i_prefsrc; + rt->rt6i_table = ort->rt6i_table; +} + +static struct rt6_info *ip6_rt_cache_alloc(struct rt6_info *ort, + const struct in6_addr *dest) +{ + struct rt6_info *rt = ip6_dst_alloc(dev_net(ort->dst.dev), ort->dst.dev, + 0, ort->rt6i_table); + + if (!rt) + return NULL; + ip6_rt_copy_init(rt, ort, dest); + if (ort->dst.flags & DST_HOST) + dst_cow_metrics_generic(&rt->dst, rt->dst._metrics); + dst_copy_metrics(&rt->dst, &ort->dst); + rt->rt6i_flags |= RTF_CACHE; + rt6_set_from(rt, ort); + rt->rt6i_metric = 0; return rt; }