From: Wei Wang <tracywwnj@gmail.com>
To: David Miller <davem@davemloft.net>, netdev@vger.kernel.org
Cc: Eric Dumazet <edumazet@google.com>,
Martin KaFai Lau <kafai@fb.com>, Wei Wang <weiwan@google.com>
Subject: [PATCH net-next 05/21] net: introduce a new function dst_dev_put()
Date: Fri, 16 Jun 2017 10:47:28 -0700 [thread overview]
Message-ID: <20170616174744.139688-6-tracywwnj@gmail.com> (raw)
In-Reply-To: <20170616174744.139688-1-tracywwnj@gmail.com>
From: Wei Wang <weiwan@google.com>
This function should be called when removing routes from fib tree after
the dst gc is no longer in use.
We first mark DST_OBSOLETE_DEAD on this dst to make sure next
dst_ops->check() fails and returns NULL.
Secondly, as we no longer keep the gc_list, we need to properly
release dst->dev right at the moment when the dst is removed from
the fib/fib6 tree.
It does the following:
1. change dst->input and output pointers to dst_discard/dst_dscard_out to
discard all packets
2. replace dst->dev with loopback interface
Signed-off-by: Wei Wang <weiwan@google.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
---
include/net/dst.h | 1 +
net/core/dst.c | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/include/net/dst.h b/include/net/dst.h
index 2735d5a1e774..11d779803c0d 100644
--- a/include/net/dst.h
+++ b/include/net/dst.h
@@ -428,6 +428,7 @@ void dst_init(struct dst_entry *dst, struct dst_ops *ops,
unsigned short flags);
void __dst_free(struct dst_entry *dst);
struct dst_entry *dst_destroy(struct dst_entry *dst);
+void dst_dev_put(struct dst_entry *dst);
static inline void dst_free(struct dst_entry *dst)
{
diff --git a/net/core/dst.c b/net/core/dst.c
index 551834c3363f..2031f778bf2a 100644
--- a/net/core/dst.c
+++ b/net/core/dst.c
@@ -296,6 +296,29 @@ static void dst_destroy_rcu(struct rcu_head *head)
__dst_free(dst);
}
+/* Operations to mark dst as DEAD and clean up the net device referenced
+ * by dst:
+ * 1. put the dst under loopback interface and discard all tx/rx packets
+ * on this route.
+ * 2. release the net_device
+ * This function should be called when removing routes from the fib tree
+ * in preparation for a NETDEV_DOWN/NETDEV_UNREGISTER event and also to
+ * make the next dst_ops->check() fail.
+ */
+void dst_dev_put(struct dst_entry *dst)
+{
+ struct net_device *dev = dst->dev;
+
+ dst->obsolete = DST_OBSOLETE_DEAD;
+ if (dst->ops->ifdown)
+ dst->ops->ifdown(dst, dev, true);
+ dst->input = dst_discard;
+ dst->output = dst_discard_out;
+ dst->dev = dev_net(dst->dev)->loopback_dev;
+ dev_hold(dst->dev);
+ dev_put(dev);
+}
+
void dst_release(struct dst_entry *dst)
{
if (dst) {
--
2.13.1.518.g3df882009-goog
next prev parent reply other threads:[~2017-06-16 17:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-16 17:47 [PATCH net-next 00/21] remove dst garbage collector logic Wei Wang
2017-06-16 17:47 ` [PATCH net-next 01/21] ipv6: remove unnecessary dst_hold() in ip6_fragment() Wei Wang
2017-06-16 17:47 ` [PATCH net-next 02/21] udp: call dst_hold_safe() in udp_sk_rx_set_dst() Wei Wang
2017-06-16 19:02 ` David Miller
2017-06-16 19:06 ` Wei Wang
2017-06-16 17:47 ` [PATCH net-next 03/21] net: use loopback dev when generating blackhole route Wei Wang
2017-06-16 17:47 ` [PATCH net-next 04/21] net: introduce DST_NOGC in dst_release() to destroy dst based on refcnt Wei Wang
2017-06-16 17:47 ` Wei Wang [this message]
2017-06-16 17:47 ` [PATCH net-next 06/21] ipv4: take dst->__refcnt when caching dst in fib Wei Wang
2017-06-16 17:47 ` [PATCH net-next 07/21] ipv4: call dst_dev_put() properly Wei Wang
2017-06-16 17:47 ` [PATCH net-next 08/21] ipv4: call dst_hold_safe() properly Wei Wang
2017-06-16 17:47 ` [PATCH net-next 09/21] ipv4: mark DST_NOGC and remove the operation of dst_free() Wei Wang
2017-06-16 17:47 ` [PATCH net-next 10/21] ipv6: take dst->__refcnt for insertion into fib6 tree Wei Wang
2017-06-16 17:47 ` [PATCH net-next 11/21] ipv6: call dst_dev_put() properly Wei Wang
2017-06-17 14:14 ` kbuild test robot
2017-06-16 17:47 ` [PATCH net-next 12/21] ipv6: call dst_hold_safe() properly Wei Wang
2017-06-16 17:47 ` [PATCH net-next 13/21] ipv6: mark DST_NOGC and remove the operation of dst_free() Wei Wang
2017-06-16 17:47 ` [PATCH net-next 14/21] ipv6: get rid of icmp6 dst garbage collector Wei Wang
2017-06-16 17:47 ` [PATCH net-next 15/21] xfrm: take refcnt of dst when creating struct xfrm_dst bundle Wei Wang
2017-06-16 17:47 ` [PATCH net-next 16/21] decnet: take dst->__refcnt when struct dn_route is created Wei Wang
2017-06-17 16:21 ` kbuild test robot
2017-06-16 17:47 ` [PATCH net-next 17/21] net: remove dst gc related code Wei Wang
2017-06-16 17:47 ` [PATCH net-next 18/21] net: remove DST_NOGC flag Wei Wang
2017-06-16 17:47 ` [PATCH net-next 19/21] net: remove DST_NOCACHE flag Wei Wang
2017-06-16 17:47 ` [PATCH net-next 20/21] net: reorder all the dst flags Wei Wang
2017-06-16 17:47 ` [PATCH net-next 21/21] net: add debug atomic_inc_not_zero() in dst_hold() Wei Wang
2017-06-16 19:07 ` [PATCH net-next 00/21] remove dst garbage collector logic David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170616174744.139688-6-tracywwnj@gmail.com \
--to=tracywwnj@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kafai@fb.com \
--cc=netdev@vger.kernel.org \
--cc=weiwan@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).