| Message ID | 7a1a6fc83cfa3bf2af8fffa31b5e9b2b14078d9f.1560987611.git.sbrivio@redhat.com |
|---|---|
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
| Series | Fix listing (IPv4, IPv6) and flushing (IPv6) of cached route exceptions | expand |
On 6/19/19 5:59 PM, Stefano Brivio wrote: > In the next patch, we are going to add optional dump of exceptions to > rt6_dump_route(). > > Change the return code of rt6_dump_route() to accomodate partial node > dumps: we might dump multiple routes per node, and might be able to dump > only a given number of them, so fib6_dump_node() will need to know how > many routes have been dumped on partial dump, to restart the dump from the > point where it was interrupted. > > Note that fib6_dump_node() is the only caller and already handles all > non-negative return codes as success: those become -1 to signal that we're > done with the node. If we fail, return 0, as we were unable to dump the > single route in the node, but we're not done with it. > > Signed-off-by: Stefano Brivio <sbrivio@redhat.com> > --- > v6: New patch > > net/ipv6/ip6_fib.c | 2 +- > net/ipv6/route.c | 16 ++++++++++------ > 2 files changed, 11 insertions(+), 7 deletions(-) > Reviewed-by: David Ahern <dsahern@gmail.com>
diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c index 2baca6ef9e01..0e9a2ec69336 100644 --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@ -464,7 +464,7 @@ static int fib6_dump_node(struct fib6_walker *w) for_each_fib6_walker_rt(w) { res = rt6_dump_route(rt, w->args); - if (res < 0) { + if (res >= 0) { /* Frame is full, suspend walking */ w->leaf = rt; return 1; diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 86859023cd01..1282f5a55b08 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -5503,6 +5503,7 @@ static bool fib6_info_uses_dev(const struct fib6_info *f6i, return false; } +/* Return -1 if done with node, number of handled routes on partial dump */ int rt6_dump_route(struct fib6_info *rt, void *p_arg) { struct rt6_rtnl_dump_arg *arg = (struct rt6_rtnl_dump_arg *) p_arg; @@ -5511,25 +5512,28 @@ int rt6_dump_route(struct fib6_info *rt, void *p_arg) struct net *net = arg->net; if (rt == net->ipv6.fib6_null_entry) - return 0; + return -1; if ((filter->flags & RTM_F_PREFIX) && !(rt->fib6_flags & RTF_PREFIX_RT)) { /* success since this is not a prefix route */ - return 1; + return -1; } if (filter->filter_set) { if ((filter->rt_type && rt->fib6_type != filter->rt_type) || (filter->dev && !fib6_info_uses_dev(rt, filter->dev)) || (filter->protocol && rt->fib6_protocol != filter->protocol)) { - return 1; + return -1; } flags |= NLM_F_DUMP_FILTERED; } - return rt6_fill_node(net, arg->skb, rt, NULL, NULL, NULL, 0, - RTM_NEWROUTE, NETLINK_CB(arg->cb->skb).portid, - arg->cb->nlh->nlmsg_seq, flags); + if (rt6_fill_node(net, arg->skb, rt, NULL, NULL, NULL, 0, RTM_NEWROUTE, + NETLINK_CB(arg->cb->skb).portid, + arg->cb->nlh->nlmsg_seq, flags)) + return 0; + + return -1; } static int inet6_rtm_valid_getroute_req(struct sk_buff *skb,
In the next patch, we are going to add optional dump of exceptions to rt6_dump_route(). Change the return code of rt6_dump_route() to accomodate partial node dumps: we might dump multiple routes per node, and might be able to dump only a given number of them, so fib6_dump_node() will need to know how many routes have been dumped on partial dump, to restart the dump from the point where it was interrupted. Note that fib6_dump_node() is the only caller and already handles all non-negative return codes as success: those become -1 to signal that we're done with the node. If we fail, return 0, as we were unable to dump the single route in the node, but we're not done with it. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> --- v6: New patch net/ipv6/ip6_fib.c | 2 +- net/ipv6/route.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-)