Skip to content

Commit 5f56f40

Browse files
tracywwnjdavem330
authored andcommitted
net: introduce DST_NOGC in dst_release() to destroy dst based on refcnt
The current mechanism of freeing dst is a bit complicated. dst has its ref count and when user grabs the reference to the dst, the ref count is properly taken in most cases except in IPv4/IPv6/decnet/xfrm routing code due to some historic reasons. If the reference to dst is always taken properly, we should be able to simplify the logic in dst_release() to destroy dst when dst->__refcnt drops from 1 to 0. And this should be the only condition to determine if we can call dst_destroy(). And as dst is always ref counted, there is no need for a dst garbage list to hold the dst entries that already get removed by the routing code but are still held by other users. And the task to periodically check the list to free dst if ref count become 0 is also not needed anymore. This patch introduces a temporary flag DST_NOGC(no garbage collector). If it is set in the dst, dst_release() will call dst_destroy() when dst->__refcnt drops to 0. dst_hold_safe() will also check for this flag and do atomic_inc_not_zero() similar as DST_NOCACHE to avoid double free issue. This temporary flag is mainly used so that we can make the transition component by component without breaking other parts. This flag will be removed after all components are properly transitioned. This patch also introduces a new function dst_release_immediate() which destroys dst without waiting on the rcu when refcnt drops to 0. It will be used in later patches. Follow-up patches will correct all the places to properly take ref count on dst and mark DST_NOGC. dst_release() or dst_release_immediate() will be used to release the dst instead of dst_free() and its related functions. And final clean-up patch will remove the DST_NOGC flag. Signed-off-by: Wei Wang <weiwan@google.com> Acked-by: Martin KaFai Lau <kafai@fb.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 1dbe325 commit 5f56f40

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

include/net/dst.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ struct dst_entry {
5858
#define DST_XFRM_TUNNEL 0x0080
5959
#define DST_XFRM_QUEUE 0x0100
6060
#define DST_METADATA 0x0200
61+
#define DST_NOGC 0x0400
6162

6263
short error;
6364

@@ -278,6 +279,8 @@ static inline struct dst_entry *dst_clone(struct dst_entry *dst)
278279

279280
void dst_release(struct dst_entry *dst);
280281

282+
void dst_release_immediate(struct dst_entry *dst);
283+
281284
static inline void refdst_drop(unsigned long refdst)
282285
{
283286
if (!(refdst & SKB_DST_NOREF))
@@ -334,7 +337,7 @@ static inline void skb_dst_force(struct sk_buff *skb)
334337
*/
335338
static inline bool dst_hold_safe(struct dst_entry *dst)
336339
{
337-
if (dst->flags & DST_NOCACHE)
340+
if (dst->flags & (DST_NOCACHE | DST_NOGC))
338341
return atomic_inc_not_zero(&dst->__refcnt);
339342
dst_hold(dst);
340343
return true;

net/core/dst.c

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -300,18 +300,34 @@ void dst_release(struct dst_entry *dst)
300300
{
301301
if (dst) {
302302
int newrefcnt;
303-
unsigned short nocache = dst->flags & DST_NOCACHE;
303+
unsigned short destroy_after_rcu = dst->flags &
304+
(DST_NOCACHE | DST_NOGC);
304305

305306
newrefcnt = atomic_dec_return(&dst->__refcnt);
306307
if (unlikely(newrefcnt < 0))
307308
net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
308309
__func__, dst, newrefcnt);
309-
if (!newrefcnt && unlikely(nocache))
310+
if (!newrefcnt && unlikely(destroy_after_rcu))
310311
call_rcu(&dst->rcu_head, dst_destroy_rcu);
311312
}
312313
}
313314
EXPORT_SYMBOL(dst_release);
314315

316+
void dst_release_immediate(struct dst_entry *dst)
317+
{
318+
if (dst) {
319+
int newrefcnt;
320+
321+
newrefcnt = atomic_dec_return(&dst->__refcnt);
322+
if (unlikely(newrefcnt < 0))
323+
net_warn_ratelimited("%s: dst:%p refcnt:%d\n",
324+
__func__, dst, newrefcnt);
325+
if (!newrefcnt)
326+
dst_destroy(dst);
327+
}
328+
}
329+
EXPORT_SYMBOL(dst_release_immediate);
330+
315331
u32 *dst_cow_metrics_generic(struct dst_entry *dst, unsigned long old)
316332
{
317333
struct dst_metrics *p = kmalloc(sizeof(*p), GFP_ATOMIC);

0 commit comments

Comments
 (0)