From patchwork Fri Jun 16 17:47:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Wang X-Patchwork-Id: 776922 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 3wq7DJ4cTRz9s8N for ; Sat, 17 Jun 2017 03:49:36 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="kUMosUMc"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752672AbdFPRte (ORCPT ); Fri, 16 Jun 2017 13:49:34 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33404 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752469AbdFPRs1 (ORCPT ); Fri, 16 Jun 2017 13:48:27 -0400 Received: by mail-pf0-f196.google.com with SMTP id w12so7568147pfk.0 for ; Fri, 16 Jun 2017 10:48:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ihCwwV1zozIgOIyTVuP3dpNIu5h4aJjOBzEgV/rR2Bo=; b=kUMosUMctTJ0c7fud76RsKnCkZY29oWdzp1YI99yPYjDvsf3ntKX1QIYd81+R3zf+A dx6rVqqntPenbYWeVF3g+kjBOSTTZ2eqJIljwN1/riog3u47dgEib4LibjJb+QOL4/c9 PNiJHAI5/h8nqyl87njDmZQFqLiEyK5K4cuuOgc9ulkMuF+HNllr6kx61O/ExdL389FP EO9i7A6nW8A3snvymUupIpvS3FxhQIUTGj6UyvLCMn/zUygvljS+K0k6+RfaMeLNKj98 x3KVyX70Fd79ZfWQBHsym6IhvnrbNzet9dMJ9thRq7tEWVSDnjPkgoeUFKbyr8/70tXF bTiA== 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=ihCwwV1zozIgOIyTVuP3dpNIu5h4aJjOBzEgV/rR2Bo=; b=O2mJEIkze83HnBiLeYQxW+L+OxKkUfY9a/eZupTiYXv2mFlhT/qMFpC362KIp9aF9Q XWZI9fQgYaIQMdKXu6d+rpu//JcsjZGYwIHWxQzXehsAellECyuR4ULjYngosRLFB1ar kV3XlslYPJiIq/L1SALXH7Du1j/qdLp2Dsfdoa/5PG2sMCGXl1Lww3QIBEK3PX5C5yL0 G5S1w5qlLCg+uB9y43EQvmNs8TpxP5ZOfxlLaYGE7un0tn6/DMULtvI9muFTo6SuiE5+ rqaSvA5gThK7kwRurr+iOTLF0A0AX2gSixo73SZIbBaORMhoF+vzDd4J3cIS/jLEz9EV VHgQ== X-Gm-Message-State: AKS2vOxoJj55W0x397amge+VrjBYnosiqbxM5TQ4uKIbSMqP6dLDaiuT Fbsge0+ATZkI06R9KAE= X-Received: by 10.84.164.165 with SMTP id w34mr13993874pla.54.1497635306992; Fri, 16 Jun 2017 10:48:26 -0700 (PDT) Received: from weiwan0.mtv.corp.google.com ([100.123.230.66]) by smtp.gmail.com with ESMTPSA id v62sm5292290pfb.124.2017.06.16.10.48.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Jun 2017 10:48:26 -0700 (PDT) From: Wei Wang To: David Miller , netdev@vger.kernel.org Cc: Eric Dumazet , Martin KaFai Lau , Wei Wang Subject: [PATCH net-next 09/21] ipv4: mark DST_NOGC and remove the operation of dst_free() Date: Fri, 16 Jun 2017 10:47:32 -0700 Message-Id: <20170616174744.139688-10-tracywwnj@gmail.com> X-Mailer: git-send-email 2.13.1.518.g3df882009-goog In-Reply-To: <20170616174744.139688-1-tracywwnj@gmail.com> References: <20170616174744.139688-1-tracywwnj@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Wei Wang With the previous preparation patches, we are ready to get rid of the dst gc operation in ipv4 code and release dst based on refcnt only. So this patch adds DST_NOGC flag for all IPv4 dst and remove the calls to dst_free(). At this point, all dst created in ipv4 code do not use the dst gc anymore and will be destroyed at the point when refcnt drops to 0. Signed-off-by: Wei Wang Acked-by: Martin KaFai Lau --- net/ipv4/fib_semantics.c | 6 ++---- net/ipv4/route.c | 15 +++------------ 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index f163fa0a1164..ff47ea1408fe 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -153,8 +153,7 @@ static void rt_fibinfo_free(struct rtable __rcu **rtp) */ dst_dev_put(&rt->dst); - dst_release(&rt->dst); - dst_free(&rt->dst); + dst_release_immediate(&rt->dst); } static void free_nh_exceptions(struct fib_nh *nh) @@ -198,8 +197,7 @@ static void rt_fibinfo_free_cpus(struct rtable __rcu * __percpu *rtp) rt = rcu_dereference_protected(*per_cpu_ptr(rtp, cpu), 1); if (rt) { dst_dev_put(&rt->dst); - dst_release(&rt->dst); - dst_free(&rt->dst); + dst_release_immediate(&rt->dst); } } free_percpu(rtp); diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 903a12c601ac..80b30c2bf47d 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -589,11 +589,6 @@ static void ip_rt_build_flow_key(struct flowi4 *fl4, const struct sock *sk, build_sk_flow_key(fl4, sk); } -static inline void rt_free(struct rtable *rt) -{ - call_rcu(&rt->dst.rcu_head, dst_rcu_free); -} - static DEFINE_SPINLOCK(fnhe_lock); static void fnhe_flush_routes(struct fib_nh_exception *fnhe) @@ -605,14 +600,12 @@ static void fnhe_flush_routes(struct fib_nh_exception *fnhe) RCU_INIT_POINTER(fnhe->fnhe_rth_input, NULL); dst_dev_put(&rt->dst); dst_release(&rt->dst); - rt_free(rt); } rt = rcu_dereference(fnhe->fnhe_rth_output); if (rt) { RCU_INIT_POINTER(fnhe->fnhe_rth_output, NULL); dst_dev_put(&rt->dst); dst_release(&rt->dst); - rt_free(rt); } } @@ -1341,7 +1334,6 @@ static bool rt_bind_exception(struct rtable *rt, struct fib_nh_exception *fnhe, if (orig) { dst_dev_put(&orig->dst); dst_release(&orig->dst); - rt_free(orig); } ret = true; } @@ -1374,7 +1366,6 @@ static bool rt_cache_route(struct fib_nh *nh, struct rtable *rt) if (orig) { dst_dev_put(&orig->dst); dst_release(&orig->dst); - rt_free(orig); } } else { dst_release(&rt->dst); @@ -1505,7 +1496,8 @@ struct rtable *rt_dst_alloc(struct net_device *dev, rt = dst_alloc(&ipv4_dst_ops, dev, 1, DST_OBSOLETE_FORCE_CHK, (will_cache ? 0 : (DST_HOST | DST_NOCACHE)) | (nopolicy ? DST_NOPOLICY : 0) | - (noxfrm ? DST_NOXFRM : 0)); + (noxfrm ? DST_NOXFRM : 0) | + DST_NOGC); if (rt) { rt->rt_genid = rt_genid_ipv4(dev_net(dev)); @@ -2511,7 +2503,7 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or struct rtable *ort = (struct rtable *) dst_orig; struct rtable *rt; - rt = dst_alloc(&ipv4_dst_blackhole_ops, NULL, 1, DST_OBSOLETE_NONE, 0); + rt = dst_alloc(&ipv4_dst_blackhole_ops, NULL, 1, DST_OBSOLETE_NONE, DST_NOGC); if (rt) { struct dst_entry *new = &rt->dst; @@ -2534,7 +2526,6 @@ struct dst_entry *ipv4_blackhole_route(struct net *net, struct dst_entry *dst_or rt->rt_uses_gateway = ort->rt_uses_gateway; INIT_LIST_HEAD(&rt->rt_uncached); - dst_free(new); } dst_release(dst_orig);