Commit 9e46fb65 authored by Ido Schimmel's avatar Ido Schimmel Committed by David S. Miller
Browse files

nexthop: Restart nexthop dump based on last dumped nexthop identifier 



Currently, a multi-part nexthop dump is restarted based on the number of
nexthops that have been dumped so far. This can result in a lot of
nexthops not being dumped when nexthops are simultaneously deleted:

 # ip nexthop | wc -l
 65536
 # ip nexthop flush
 Dump was interrupted and may be inconsistent.
 Flushed 36040 nexthops
 # ip nexthop | wc -l
 29496

Instead, restart the dump based on the nexthop identifier (fixed number)
of the last successfully dumped nexthop:

 # ip nexthop | wc -l
 65536
 # ip nexthop flush
 Dump was interrupted and may be inconsistent.
 Flushed 65536 nexthops
 # ip nexthop | wc -l
 0

Reported-by: default avatarMaksym Yaremchuk <maksymy@nvidia.com>
Tested-by: default avatarMaksym Yaremchuk <maksymy@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Reviewed-by: default avatarPetr Machata <petrm@nvidia.com>
Reviewed-by: default avatarDavid Ahern <dsahern@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 56aa7b21

net/ipv4/nexthop.c

+6 −8
Original line number Diff line number Diff line
@@ -3140,26 +3140,24 @@ static int rtm_dump_walk_nexthops(struct sk_buff *skb, 
				  void *data)

{

	struct rb_node *node;

	int idx = 0, s_idx;

	int s_idx;

	int err;



	s_idx = ctx->idx;

	for (node = rb_first(root); node; node = rb_next(node)) {

		struct nexthop *nh;



		if (idx < s_idx)

			goto cont;



		nh = rb_entry(node, struct nexthop, rb_node);

		ctx->idx = idx;

		if (nh->id < s_idx)

			continue;



		ctx->idx = nh->id;

		err = nh_cb(skb, cb, nh, data);

		if (err)

			return err;

cont:

		idx++;

	}



	ctx->idx = idx;

	ctx->idx++;

	return 0;

}