From patchwork Wed May 17 18:33:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kui-Feng Lee X-Patchwork-Id: 13245527 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 87A804420 for ; Wed, 17 May 2023 18:34:01 +0000 (UTC) Received: from mail-yw1-x1129.google.com (mail-yw1-x1129.google.com [IPv6:2607:f8b0:4864:20::1129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5FCA77D91 for ; Wed, 17 May 2023 11:33:56 -0700 (PDT) Received: by mail-yw1-x1129.google.com with SMTP id 00721157ae682-561a41db2c0so13308087b3.3 for ; Wed, 17 May 2023 11:33:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684348435; x=1686940435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a9SePqv2sA4WBykfynVUqE0c5GYx2e/4PQNghak+by8=; b=nsraTLdjXcUz0D4PVLHFd9qh5fMRUvCK60Zi1QhgtCD9z7wxfXVjucQwUitvKrXoqC 8R11fsgk30WwzYgiSn05vzQQdoexy3BVyy3H/p5NNbQOf5NRulpVv7+cKJc1ZBt1Z0YJ UtsW1pw7p6cN/zf4bZx1Ikyr8/MXNlR2PiTqsozHaczveH8L6hv+qnD4et5+vUj9Vnpw 2WhTPTHK/YhFU38uokkIUvG7u9oMwFgROTIUd7y/fT88uhHelVnk3PmrKZyQoBJ6BF0i rXtoiltSX3dqS13jOZb5m81ARdH0Vn6w1jRDcOnAJmkeMzgkTaoeTFr//wG1CHu71e/5 0mMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684348435; x=1686940435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a9SePqv2sA4WBykfynVUqE0c5GYx2e/4PQNghak+by8=; b=lbFnrQu38nwKHy/V1ijhqCNNcknOZAkzOUCCsSKxQORithqVgmOf+PkjwiEd7Bi+Lm qn97VSY/80n8rKLyVxZIQvGCP46F2sfInwcEGOJNk3IoxhfrYb4zETxHtLx4imKau5Qw 7IDk4gNwC11hOwVgf7p4OFmxtCCjrk/ZM4wcBAkttFGVhoKbApViEY+FJ0rylAqkJRnB c7zL0ArzUof3S8gZV1EiVjkvVaIyTSuO5Xlixxe2IMJEhzAZYlwY8wIL6KVUdAC5Ktpp Doiu7Ini+pGueaNT1fcoZ7XLpcavVVg6rWTykdynsu2DeyRwfcjWhRVV/fb3QjezIFmb 1tpg== X-Gm-Message-State: AC+VfDx79bNdzIEOfxDMX7+pTGLKRWYEUIRHQzZ8tqr7oHWe0bAZF2/Z 66PRiszjJMA+Cemb8ys8jjyJkzQ1VBSelg== X-Google-Smtp-Source: ACHHUZ6F0ta/1i3ntNx0u6ru+veREAAlv/rU1zRMHKnUCGjUFWecZ3YbzEpGuXU6kBcwh9JHdn/9Sg== X-Received: by 2002:a81:7442:0:b0:55d:6adf:3e8e with SMTP id p63-20020a817442000000b0055d6adf3e8emr35871985ywc.42.1684348435074; Wed, 17 May 2023 11:33:55 -0700 (PDT) Received: from kickker.attlocal.net ([2600:1700:6cf8:1240:d976:e286:fb8b:a4e3]) by smtp.gmail.com with ESMTPSA id p6-20020a0dcd06000000b0055a72f6a462sm853521ywd.19.2023.05.17.11.33.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 11:33:54 -0700 (PDT) From: Kui-Feng Lee X-Google-Original-From: Kui-Feng Lee To: netdev@vger.kernel.org, ast@kernel.org, martin.lau@linux.dev, kernel-team@meta.com, davem@davemloft.net, dsahern@kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: Kui-Feng Lee Subject: [RFC PATCH net-next v2 1/2] net: Remove expired routes with separated timers. Date: Wed, 17 May 2023 11:33:36 -0700 Message-Id: <20230517183337.190591-2-kuifeng@meta.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230517183337.190591-1-kuifeng@meta.com> References: <20230517183337.190591-1-kuifeng@meta.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC FIB6 GC walks tries of fib6_tables to remove expired routes. Walking a tree can be expensive if the number of routes in a table is big. Creating a separated timer for each route that can expire will avoid this potential issue. Signed-off-by: Kui-Feng Lee --- include/net/ip6_fib.h | 19 ++++------ net/ipv6/addrconf.c | 8 ++-- net/ipv6/ip6_fib.c | 88 ++++++++++++++++++++++++++++++++++++------- net/ipv6/ndisc.c | 2 +- net/ipv6/route.c | 6 +-- 5 files changed, 91 insertions(+), 32 deletions(-) diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 05e6f756feaf..850995306718 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -161,6 +161,8 @@ struct fib6_nh { struct rt6_exception_bucket __rcu *rt6i_exception_bucket; }; +struct fib6_info_timer; + struct fib6_info { struct fib6_table *fib6_table; struct fib6_info __rcu *fib6_next; @@ -179,6 +181,7 @@ struct fib6_info { refcount_t fib6_ref; unsigned long expires; + struct fib6_info_timer *timer; struct dst_metrics *fib6_metrics; #define fib6_pmtu fib6_metrics->metrics[RTAX_MTU-1] @@ -247,18 +250,11 @@ static inline bool fib6_requires_src(const struct fib6_info *rt) return rt->fib6_src.plen > 0; } -static inline void fib6_clean_expires(struct fib6_info *f6i) -{ - f6i->fib6_flags &= ~RTF_EXPIRES; - f6i->expires = 0; -} +void fib6_clean_expires(struct fib6_info *f6i); -static inline void fib6_set_expires(struct fib6_info *f6i, - unsigned long expires) -{ - f6i->expires = expires; - f6i->fib6_flags |= RTF_EXPIRES; -} +void fib6_set_expires(struct net *net, + struct fib6_info *f6i, + unsigned long expires); static inline bool fib6_check_expired(const struct fib6_info *f6i) { @@ -388,6 +384,7 @@ struct fib6_table { struct inet_peer_base tb6_peers; unsigned int flags; unsigned int fib_seq; + struct hlist_head tb6_timer_hlist; #define RT6_TABLE_HAS_DFLT_ROUTER BIT(0) }; diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index 3797917237d0..13e2366613c4 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c @@ -1254,7 +1254,8 @@ cleanup_prefix_route(struct inet6_ifaddr *ifp, unsigned long expires, ip6_del_rt(dev_net(ifp->idev->dev), f6i, false); else { if (!(f6i->fib6_flags & RTF_EXPIRES)) - fib6_set_expires(f6i, expires); + fib6_set_expires(dev_net(ifp->idev->dev), + f6i, expires); fib6_info_release(f6i); } } @@ -2762,7 +2763,8 @@ void addrconf_prefix_rcv(struct net_device *dev, u8 *opt, int len, bool sllao) rt = NULL; } else if (addrconf_finite_timeout(rt_expires)) { /* not infinity */ - fib6_set_expires(rt, jiffies + rt_expires); + fib6_set_expires(net, rt, + jiffies + rt_expires); } else { fib6_clean_expires(rt); } @@ -4723,7 +4725,7 @@ static int modify_prefix_route(struct inet6_ifaddr *ifp, if (!expires) fib6_clean_expires(f6i); else - fib6_set_expires(f6i, expires); + fib6_set_expires(dev_net(ifp->idev->dev), f6i, expires); fib6_info_release(f6i); } diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 2438da5ff6da..8a10a0355816 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include @@ -54,6 +55,12 @@ struct fib6_cleaner { #define FWS_INIT FWS_L #endif +struct fib6_info_timer { + struct timer_list timer; + struct fib6_info *f6i; + struct net *net; +}; + static struct fib6_info *fib6_find_prefix(struct net *net, struct fib6_table *table, struct fib6_node *fn); @@ -144,6 +151,66 @@ static __be32 addr_bit_set(const void *token, int fn_bit) addr[fn_bit >> 5]; } +static void f6i_gc_timer_cb(struct timer_list *t) +{ + struct fib6_info_timer *timer; + struct nl_info info = { + .nlh = NULL, + }; + struct fib6_info *f6i; + int res; + + timer = from_timer(timer, t, timer); + info.nl_net = timer->net; + f6i = timer->f6i; + spin_lock(&f6i->fib6_table->tb6_lock); + + res = fib6_del(f6i, &info); + if (res != 0) { +#if RT6_DEBUG >= 2 + pr_debug("%s: del failed: rt=%p@%p err=%d\n", + __func__, f6i, + rcu_access_pointer(f6i->fib6_node), + res); +#endif + } + + spin_unlock(&f6i->fib6_table->tb6_lock); + + fib6_info_release(f6i); +} + +void fib6_clean_expires(struct fib6_info *f6i) +{ + f6i->fib6_flags &= ~RTF_EXPIRES; + f6i->expires = 0; + if (!f6i->timer) + return; + if (try_to_del_timer_sync(&f6i->timer->timer) == 1) + fib6_info_release(f6i); +} + +void fib6_set_expires(struct net *net,struct fib6_info *f6i, + unsigned long expires) +{ + f6i->expires = expires; + f6i->fib6_flags |= RTF_EXPIRES; + if (!f6i->timer) { + f6i->timer = kzalloc(sizeof(*f6i->timer), GFP_ATOMIC); + if (!f6i->timer) { + /* XXX: error handling */ + panic("fib6_set_expires: kzalloc failed"); + return; + } + f6i->timer->f6i = f6i; + f6i->timer->net = net; + timer_setup(&f6i->timer->timer, f6i_gc_timer_cb, 0); + } + fib6_info_hold(f6i); + if (mod_timer(&f6i->timer->timer, expires) == 1) + fib6_info_release(f6i); +} + struct fib6_info *fib6_info_alloc(gfp_t gfp_flags, bool with_fib6_nh) { struct fib6_info *f6i; @@ -175,6 +242,7 @@ void fib6_info_destroy_rcu(struct rcu_head *head) fib6_nh_release(f6i->fib6_nh); ip_fib_metrics_put(f6i->fib6_metrics); + kfree(f6i->timer); kfree(f6i); } EXPORT_SYMBOL_GPL(fib6_info_destroy_rcu); @@ -246,6 +314,7 @@ static struct fib6_table *fib6_alloc_table(struct net *net, u32 id) net->ipv6.fib6_null_entry); table->tb6_root.fn_flags = RTN_ROOT | RTN_TL_ROOT | RTN_RTINFO; inet_peer_base_init(&table->tb6_peers); + INIT_HLIST_HEAD(&table->tb6_timer_hlist); } return table; @@ -1120,7 +1189,8 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt, if (!(rt->fib6_flags & RTF_EXPIRES)) fib6_clean_expires(iter); else - fib6_set_expires(iter, rt->expires); + fib6_set_expires(info->nl_net, + iter, rt->expires); if (rt->fib6_pmtu) fib6_metric_set(iter, RTAX_MTU, @@ -2025,6 +2095,9 @@ int fib6_del(struct fib6_info *rt, struct nl_info *info) if (rt == cur) { if (fib6_requires_src(cur)) fib6_routes_require_src_dec(info->nl_net); + if (cur->timer && + try_to_del_timer_sync(&cur->timer->timer) == 1) + fib6_info_release(cur); fib6_del_route(table, fn, rtp, info); return 0; } @@ -2290,19 +2363,6 @@ static int fib6_age(struct fib6_info *rt, void *arg) struct fib6_gc_args *gc_args = arg; unsigned long now = jiffies; - /* - * check addrconf expiration here. - * Routes are expired even if they are in use. - */ - - if (rt->fib6_flags & RTF_EXPIRES && rt->expires) { - if (time_after(now, rt->expires)) { - RT6_TRACE("expiring %p\n", rt); - return -1; - } - gc_args->more++; - } - /* Also age clones in the exception table. * Note, that clones are aged out * only if they are not in use now. diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 18634ebd20a4..1d4cf7f73097 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1407,7 +1407,7 @@ static enum skb_drop_reason ndisc_router_discovery(struct sk_buff *skb) } if (rt) - fib6_set_expires(rt, jiffies + (HZ * lifetime)); + fib6_set_expires(net, rt, jiffies + (HZ * lifetime)); if (in6_dev->cnf.accept_ra_min_hop_limit < 256 && ra_msg->icmph.icmp6_hop_limit) { if (in6_dev->cnf.accept_ra_min_hop_limit <= ra_msg->icmph.icmp6_hop_limit) { diff --git a/net/ipv6/route.c b/net/ipv6/route.c index e3aec46bd466..87721a2a91b6 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -990,7 +990,7 @@ int rt6_route_rcv(struct net_device *dev, u8 *opt, int len, if (!addrconf_finite_timeout(lifetime)) fib6_clean_expires(rt); else - fib6_set_expires(rt, jiffies + HZ * lifetime); + fib6_set_expires(net, rt, jiffies + HZ * lifetime); fib6_info_release(rt); } @@ -3755,8 +3755,8 @@ static struct fib6_info *ip6_route_info_create(struct fib6_config *cfg, rt->dst_nocount = true; if (cfg->fc_flags & RTF_EXPIRES) - fib6_set_expires(rt, jiffies + - clock_t_to_jiffies(cfg->fc_expires)); + fib6_set_expires(net, rt, jiffies + + clock_t_to_jiffies(cfg->fc_expires)); else fib6_clean_expires(rt); From patchwork Wed May 17 18:33:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kui-Feng Lee X-Patchwork-Id: 13245528 X-Patchwork-Delegate: kuba@kernel.org Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net [23.128.96.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 701E24420 for ; Wed, 17 May 2023 18:34:05 +0000 (UTC) Received: from mail-yw1-x1136.google.com (mail-yw1-x1136.google.com [IPv6:2607:f8b0:4864:20::1136]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 944FF5BAD for ; Wed, 17 May 2023 11:33:58 -0700 (PDT) Received: by mail-yw1-x1136.google.com with SMTP id 00721157ae682-55a5a830238so9372067b3.3 for ; Wed, 17 May 2023 11:33:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684348437; x=1686940437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JtozvIAKkoLPO+flUQzpxULmHQX5KeSkwId44pChVCc=; b=jDkYLPUEaoH7mSrnRmrFba8rPW8aj7oZGcwzeIZS0VUomvnBrJQRvG7DmH+36NfLdL lf2/XE7EUekukrNgooPjnKA8XnIljM64xeA6FdEVMyBLU5HJ4rxaMnkBVhORROyYK2wM 9hvC8F4bARRQiQXQUhtgu65QTnGRsqRCsrfBzMtUkbYesjFmL+SEp7cSNxKSs95WqxPp Jqvk4w8RJcpatLEbLZb7kqk49wf4p8bGWVoavxqL2dKhWjzqOO6uL7RxeB9EZ5mD+WHB zmCfHKC5rH58h7H0XUK/UBqmqbldLhMcQC7eCmirjpdUXh3TXZ8FGi9/Vi2LUfpWY78q l1nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684348437; x=1686940437; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JtozvIAKkoLPO+flUQzpxULmHQX5KeSkwId44pChVCc=; b=dYQ8IZiuOlD09rIUeKFOTW084j9rTBPXyI77WFxcFEheeoIsmRcxsxKrUt7v1umxDF kKtssrDZJpGxktSCT1zZx7hNVIt6Yu2i46JOzKxg8Em5ryEd+FQLkyw9iazrjlyCfsVE bCN2pYYh0/tLl88UbhmgqsiR107YyP0SybB2yHv3qtycSjUbwkYZhzeRxyZfefBJbN5n aKTCP520DSX0Z5xSXZKTsC1rgVujEDMmgWylPK0v1M/pT1UCp7JpkfQJ1MSO/vSLUxDJ D6E+wffQ6KWLKHnlFyzhQ2X5kmw7T/Ld7M7y6BmOumyCeWiEhi6izimHXIlcGL1kLxO0 Bklw== X-Gm-Message-State: AC+VfDzCSz2y1kszeKrhFl22yTTVFYJmk1Mv/1NWZZcRjieJW14gsZa2 I2yqGOfJy2qhdUYaalCVfLDa8BMp7NTBIw== X-Google-Smtp-Source: ACHHUZ55l8VaO9iAaPDZ+F1A+IrUvDFrZMiiTJ72Ur6/75yBvAyJ+ln/T0mvqn/6w2RugxxwadHLSA== X-Received: by 2002:a0d:ca16:0:b0:561:8350:babb with SMTP id m22-20020a0dca16000000b005618350babbmr5429173ywd.49.1684348436339; Wed, 17 May 2023 11:33:56 -0700 (PDT) Received: from kickker.attlocal.net ([2600:1700:6cf8:1240:d976:e286:fb8b:a4e3]) by smtp.gmail.com with ESMTPSA id p6-20020a0dcd06000000b0055a72f6a462sm853521ywd.19.2023.05.17.11.33.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 May 2023 11:33:56 -0700 (PDT) From: Kui-Feng Lee X-Google-Original-From: Kui-Feng Lee To: netdev@vger.kernel.org, ast@kernel.org, martin.lau@linux.dev, kernel-team@meta.com, davem@davemloft.net, dsahern@kernel.org, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com Cc: Kui-Feng Lee Subject: [RFC PATCH net-next v2 2/2] net: Remove unused code and variables. Date: Wed, 17 May 2023 11:33:37 -0700 Message-Id: <20230517183337.190591-3-kuifeng@meta.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230517183337.190591-1-kuifeng@meta.com> References: <20230517183337.190591-1-kuifeng@meta.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net X-Patchwork-Delegate: kuba@kernel.org X-Patchwork-State: RFC Since GC has been removed, some functions and variables are useless. That includes some sysctl variables that control GC. Signed-off-by: Kui-Feng Lee --- include/net/ip6_fib.h | 2 - include/net/ip6_route.h | 2 - include/net/netns/ipv6.h | 6 --- net/ipv6/ip6_fib.c | 74 ------------------------- net/ipv6/ndisc.c | 2 - net/ipv6/route.c | 114 ++------------------------------------- 6 files changed, 4 insertions(+), 196 deletions(-) diff --git a/include/net/ip6_fib.h b/include/net/ip6_fib.h index 850995306718..5c7dea981e7a 100644 --- a/include/net/ip6_fib.h +++ b/include/net/ip6_fib.h @@ -495,8 +495,6 @@ void fib6_rt_update(struct net *net, struct fib6_info *rt, void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info, unsigned int flags); -void fib6_run_gc(unsigned long expires, struct net *net, bool force); - void fib6_gc_cleanup(void); int fib6_init(void); diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index 3556595ce59a..d99c09ea1859 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -152,8 +152,6 @@ u32 rt6_multipath_hash(const struct net *net, const struct flowi6 *fl6, struct dst_entry *icmp6_dst_alloc(struct net_device *dev, struct flowi6 *fl6); -void fib6_force_start_gc(struct net *net); - struct fib6_info *addrconf_f6i_alloc(struct net *net, struct inet6_dev *idev, const struct in6_addr *addr, bool anycast, gfp_t gfp_flags); diff --git a/include/net/netns/ipv6.h b/include/net/netns/ipv6.h index 3cceb3e9320b..64e7d3944637 100644 --- a/include/net/netns/ipv6.h +++ b/include/net/netns/ipv6.h @@ -20,12 +20,8 @@ struct netns_sysctl_ipv6 { struct ctl_table_header *frags_hdr; struct ctl_table_header *xfrm6_hdr; #endif - int flush_delay; int ip6_rt_max_size; - int ip6_rt_gc_min_interval; - int ip6_rt_gc_timeout; int ip6_rt_gc_interval; - int ip6_rt_gc_elasticity; int ip6_rt_mtu_expires; int ip6_rt_min_advmss; u32 multipath_hash_fields; @@ -70,14 +66,12 @@ struct netns_ipv6 { struct fib6_info *fib6_null_entry; struct rt6_info *ip6_null_entry; struct rt6_statistics *rt6_stats; - struct timer_list ip6_fib_timer; struct hlist_head *fib_table_hash; struct fib6_table *fib6_main_tbl; struct list_head fib6_walkers; rwlock_t fib6_walker_lock; spinlock_t fib6_gc_lock; atomic_t ip6_rt_gc_expire; - unsigned long ip6_rt_last_gc; unsigned char flowlabel_has_excl; #ifdef CONFIG_IPV6_MULTIPLE_TABLES bool fib6_has_custom_rules; diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 8a10a0355816..fe720bda1ec0 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -77,8 +77,6 @@ static int fib6_walk_continue(struct fib6_walker *w); * result of redirects, path MTU changes, etc. */ -static void fib6_gc_timer_cb(struct timer_list *t); - #define FOR_WALKERS(net, w) \ list_for_each_entry(w, &(net)->ipv6.fib6_walkers, lh) @@ -1391,21 +1389,6 @@ static int fib6_add_rt2node(struct fib6_node *fn, struct fib6_info *rt, return 0; } -static void fib6_start_gc(struct net *net, struct fib6_info *rt) -{ - if (!timer_pending(&net->ipv6.ip6_fib_timer) && - (rt->fib6_flags & RTF_EXPIRES)) - mod_timer(&net->ipv6.ip6_fib_timer, - jiffies + net->ipv6.sysctl.ip6_rt_gc_interval); -} - -void fib6_force_start_gc(struct net *net) -{ - if (!timer_pending(&net->ipv6.ip6_fib_timer)) - mod_timer(&net->ipv6.ip6_fib_timer, - jiffies + net->ipv6.sysctl.ip6_rt_gc_interval); -} - static void __fib6_update_sernum_upto_root(struct fib6_info *rt, int sernum) { @@ -1549,7 +1532,6 @@ int fib6_add(struct fib6_node *root, struct fib6_info *rt, if (rt->nh) list_add(&rt->nh_list, &rt->nh->f6i_list); __fib6_update_sernum_upto_root(rt, fib6_new_sernum(info->nl_net)); - fib6_start_gc(info->nl_net, rt); } out: @@ -2354,59 +2336,6 @@ static void fib6_flush_trees(struct net *net) __fib6_clean_all(net, NULL, new_sernum, NULL, false); } -/* - * Garbage collection - */ - -static int fib6_age(struct fib6_info *rt, void *arg) -{ - struct fib6_gc_args *gc_args = arg; - unsigned long now = jiffies; - - /* Also age clones in the exception table. - * Note, that clones are aged out - * only if they are not in use now. - */ - rt6_age_exceptions(rt, gc_args, now); - - return 0; -} - -void fib6_run_gc(unsigned long expires, struct net *net, bool force) -{ - struct fib6_gc_args gc_args; - unsigned long now; - - if (force) { - spin_lock_bh(&net->ipv6.fib6_gc_lock); - } else if (!spin_trylock_bh(&net->ipv6.fib6_gc_lock)) { - mod_timer(&net->ipv6.ip6_fib_timer, jiffies + HZ); - return; - } - gc_args.timeout = expires ? (int)expires : - net->ipv6.sysctl.ip6_rt_gc_interval; - gc_args.more = 0; - - fib6_clean_all(net, fib6_age, &gc_args); - now = jiffies; - net->ipv6.ip6_rt_last_gc = now; - - if (gc_args.more) - mod_timer(&net->ipv6.ip6_fib_timer, - round_jiffies(now - + net->ipv6.sysctl.ip6_rt_gc_interval)); - else - del_timer(&net->ipv6.ip6_fib_timer); - spin_unlock_bh(&net->ipv6.fib6_gc_lock); -} - -static void fib6_gc_timer_cb(struct timer_list *t) -{ - struct net *arg = from_timer(arg, t, ipv6.ip6_fib_timer); - - fib6_run_gc(0, arg, true); -} - static int __net_init fib6_net_init(struct net *net) { size_t size = sizeof(struct hlist_head) * FIB6_TABLE_HASHSZ; @@ -2423,7 +2352,6 @@ static int __net_init fib6_net_init(struct net *net) spin_lock_init(&net->ipv6.fib6_gc_lock); rwlock_init(&net->ipv6.fib6_walker_lock); INIT_LIST_HEAD(&net->ipv6.fib6_walkers); - timer_setup(&net->ipv6.ip6_fib_timer, fib6_gc_timer_cb, 0); net->ipv6.rt6_stats = kzalloc(sizeof(*net->ipv6.rt6_stats), GFP_KERNEL); if (!net->ipv6.rt6_stats) @@ -2481,8 +2409,6 @@ static void fib6_net_exit(struct net *net) { unsigned int i; - del_timer_sync(&net->ipv6.ip6_fib_timer); - for (i = 0; i < FIB6_TABLE_HASHSZ; i++) { struct hlist_head *head = &net->ipv6.fib_table_hash[i]; struct hlist_node *tmp; diff --git a/net/ipv6/ndisc.c b/net/ipv6/ndisc.c index 1d4cf7f73097..714e4fd8c13d 100644 --- a/net/ipv6/ndisc.c +++ b/net/ipv6/ndisc.c @@ -1869,7 +1869,6 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, switch (event) { case NETDEV_CHANGEADDR: neigh_changeaddr(&nd_tbl, dev); - fib6_run_gc(0, net, false); fallthrough; case NETDEV_UP: idev = in6_dev_get(dev); @@ -1898,7 +1897,6 @@ static int ndisc_netdev_event(struct notifier_block *this, unsigned long event, break; case NETDEV_DOWN: neigh_ifdown(&nd_tbl, dev); - fib6_run_gc(0, net, false); break; case NETDEV_NOTIFY_PEERS: ndisc_send_unsol_na(dev); diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 87721a2a91b6..fd04f8c08c0a 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -91,7 +91,6 @@ static struct dst_entry *ip6_negative_advice(struct dst_entry *); static void ip6_dst_destroy(struct dst_entry *); static void ip6_dst_ifdown(struct dst_entry *, struct net_device *dev, int how); -static void ip6_dst_gc(struct dst_ops *ops); static int ip6_pkt_discard(struct sk_buff *skb); static int ip6_pkt_discard_out(struct net *net, struct sock *sk, struct sk_buff *skb); @@ -249,8 +248,7 @@ static void ip6_confirm_neigh(const struct dst_entry *dst, const void *daddr) static struct dst_ops ip6_dst_ops_template = { .family = AF_INET6, - .gc = ip6_dst_gc, - .gc_thresh = 1024, + .gc_thresh = ~0, .check = ip6_dst_check, .default_advmss = ip6_default_advmss, .mtu = ip6_mtu, @@ -1724,7 +1722,6 @@ static int rt6_insert_exception(struct rt6_info *nrt, spin_lock_bh(&f6i->fib6_table->tb6_lock); fib6_update_sernum(net, f6i); spin_unlock_bh(&f6i->fib6_table->tb6_lock); - fib6_force_start_gc(net); } return err; @@ -3283,28 +3280,6 @@ struct dst_entry *icmp6_dst_alloc(struct net_device *dev, return dst; } -static void ip6_dst_gc(struct dst_ops *ops) -{ - struct net *net = container_of(ops, struct net, ipv6.ip6_dst_ops); - int rt_min_interval = net->ipv6.sysctl.ip6_rt_gc_min_interval; - int rt_elasticity = net->ipv6.sysctl.ip6_rt_gc_elasticity; - int rt_gc_timeout = net->ipv6.sysctl.ip6_rt_gc_timeout; - unsigned long rt_last_gc = net->ipv6.ip6_rt_last_gc; - unsigned int val; - int entries; - - if (time_after(rt_last_gc + rt_min_interval, jiffies)) - goto out; - - fib6_run_gc(atomic_inc_return(&net->ipv6.ip6_rt_gc_expire), net, true); - entries = dst_entries_get_slow(ops); - if (entries < ops->gc_thresh) - atomic_set(&net->ipv6.ip6_rt_gc_expire, rt_gc_timeout >> 1); -out: - val = atomic_read(&net->ipv6.ip6_rt_gc_expire); - atomic_set(&net->ipv6.ip6_rt_gc_expire, val - (val >> rt_elasticity)); -} - static int ip6_nh_lookup_table(struct net *net, struct fib6_config *cfg, const struct in6_addr *gw_addr, u32 tbid, int flags, struct fib6_result *res) @@ -6319,25 +6294,6 @@ static int rt6_stats_seq_show(struct seq_file *seq, void *v) #ifdef CONFIG_SYSCTL -static int ipv6_sysctl_rtcache_flush(struct ctl_table *ctl, int write, - void *buffer, size_t *lenp, loff_t *ppos) -{ - struct net *net; - int delay; - int ret; - if (!write) - return -EINVAL; - - net = (struct net *)ctl->extra1; - delay = net->ipv6.sysctl.flush_delay; - ret = proc_dointvec(ctl, write, buffer, lenp, ppos); - if (ret) - return ret; - - fib6_run_gc(delay <= 0 ? 0 : (unsigned long)delay, net, delay > 0); - return 0; -} - static struct ctl_table ipv6_route_table_template[] = { { .procname = "max_size", @@ -6346,48 +6302,6 @@ static struct ctl_table ipv6_route_table_template[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { - .procname = "gc_thresh", - .data = &ip6_dst_ops_template.gc_thresh, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, - { - .procname = "flush", - .data = &init_net.ipv6.sysctl.flush_delay, - .maxlen = sizeof(int), - .mode = 0200, - .proc_handler = ipv6_sysctl_rtcache_flush - }, - { - .procname = "gc_min_interval", - .data = &init_net.ipv6.sysctl.ip6_rt_gc_min_interval, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, - { - .procname = "gc_timeout", - .data = &init_net.ipv6.sysctl.ip6_rt_gc_timeout, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, - { - .procname = "gc_interval", - .data = &init_net.ipv6.sysctl.ip6_rt_gc_interval, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_jiffies, - }, - { - .procname = "gc_elasticity", - .data = &init_net.ipv6.sysctl.ip6_rt_gc_elasticity, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec, - }, { .procname = "mtu_expires", .data = &init_net.ipv6.sysctl.ip6_rt_mtu_expires, @@ -6402,13 +6316,6 @@ static struct ctl_table ipv6_route_table_template[] = { .mode = 0644, .proc_handler = proc_dointvec, }, - { - .procname = "gc_min_interval_ms", - .data = &init_net.ipv6.sysctl.ip6_rt_gc_min_interval, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = proc_dointvec_ms_jiffies, - }, { .procname = "skip_notify_on_dev_down", .data = &init_net.ipv6.sysctl.skip_notify_on_dev_down, @@ -6431,17 +6338,9 @@ struct ctl_table * __net_init ipv6_route_sysctl_init(struct net *net) if (table) { table[0].data = &net->ipv6.sysctl.ip6_rt_max_size; - table[1].data = &net->ipv6.ip6_dst_ops.gc_thresh; - table[2].data = &net->ipv6.sysctl.flush_delay; - table[2].extra1 = net; - table[3].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval; - table[4].data = &net->ipv6.sysctl.ip6_rt_gc_timeout; - table[5].data = &net->ipv6.sysctl.ip6_rt_gc_interval; - table[6].data = &net->ipv6.sysctl.ip6_rt_gc_elasticity; - table[7].data = &net->ipv6.sysctl.ip6_rt_mtu_expires; - table[8].data = &net->ipv6.sysctl.ip6_rt_min_advmss; - table[9].data = &net->ipv6.sysctl.ip6_rt_gc_min_interval; - table[10].data = &net->ipv6.sysctl.skip_notify_on_dev_down; + table[1].data = &net->ipv6.sysctl.ip6_rt_mtu_expires; + table[2].data = &net->ipv6.sysctl.ip6_rt_min_advmss; + table[3].data = &net->ipv6.sysctl.skip_notify_on_dev_down; /* Don't export sysctls to unprivileged users */ if (net->user_ns != &init_user_ns) @@ -6504,12 +6403,7 @@ static int __net_init ip6_route_net_init(struct net *net) #endif #endif - net->ipv6.sysctl.flush_delay = 0; net->ipv6.sysctl.ip6_rt_max_size = INT_MAX; - net->ipv6.sysctl.ip6_rt_gc_min_interval = HZ / 2; - net->ipv6.sysctl.ip6_rt_gc_timeout = 60*HZ; - net->ipv6.sysctl.ip6_rt_gc_interval = 30*HZ; - net->ipv6.sysctl.ip6_rt_gc_elasticity = 9; net->ipv6.sysctl.ip6_rt_mtu_expires = 10*60*HZ; net->ipv6.sysctl.ip6_rt_min_advmss = IPV6_MIN_MTU - 20 - 40; net->ipv6.sysctl.skip_notify_on_dev_down = 0;