ipv6: add inet6_rt_del_notify()

Move the body of inet6_rt_notify() to __inet6_rt_notify() and give it the deletion reason. inet6_rt_notify() keeps its prototype, so the route addition path does not change. Add inet6_rt_del_notify() and call it from fib6_del_route(). RTA_DEL_REASON now reaches user space on RTM_DELROUTE for routes the kernel deleted on its own.

Yuyang Huang committed 3 months ago

Commit 09f19ce1 parent 1e6a83a3 files · +19 −5Browse files

Unified · Split

3 files

include/net/ip6_fib.h +2 −0
net/ipv6/ip6_fib.c +1 −1
net/ipv6/route.c +16 −4

include/net/ip6_fib.h+2−0

@@ -533,6 +533,8 @@ static inline void fib6_rt_update(struct net net, struct fib6_info rt, · 532 unmodified lines
533	#endif	533	#endif
534	void inet6_rt_notify(int event, struct fib6_info rt, struct nl_info info,	534	void inet6_rt_notify(int event, struct fib6_info rt, struct nl_info info,
535	unsigned int flags);	535	unsigned int flags);
		536	void inet6_rt_del_notify(struct fib6_info rt, struct nl_info info,
		537	enum rt_del_reason del_reason);
536		538
537	void fib6_age_exceptions(struct fib6_info rt, struct fib6_gc_args gc_args,	539	void fib6_age_exceptions(struct fib6_info rt, struct fib6_gc_args gc_args,
538	unsigned long now);	540	unsigned long now);

net/ipv6/ip6_fib.c+1−1

@@ -2057,7 +2057,7 @@ static void fib6_del_route(struct fib6_table table, struct fib6_node fn, · 2056 unmodified lines
2057	call_fib6_entry_notifiers_replace(net, replace_rt);	2057	call_fib6_entry_notifiers_replace(net, replace_rt);
2058	}	2058	}
2059	if (!info->skip_notify)	2059	if (!info->skip_notify)
2060	inet6_rt_notify(RTM_DELROUTE, rt, info, 0);	2060	inet6_rt_del_notify(rt, info, del_reason);
2061		2061
2062	fib6_info_release(rt);	2062	fib6_info_release(rt);
2063	}	2063	}

net/ipv6/route.c+16−4

 	return err;
 }
-void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,
+static void __inet6_rt_notify(int event, struct fib6_info *rt,
-		     unsigned int nlm_flags)
+			      struct nl_info *info, unsigned int nlm_flags,
+			      enum rt_del_reason del_reason)
 {
 	struct net *net = info->nl_net;
 	struct sk_buff *skb;
 		goto errout;
 	err = rt6_fill_node(net, skb, rt, NULL, NULL, NULL, 0,
-			    event, info->portid, seq, nlm_flags,
+			    event, info->portid, seq, nlm_flags, del_reason);
-			    RT_DEL_REASON_UNSPEC);
 	if (err < 0) {
 		kfree_skb(skb);
 		/* -EMSGSIZE implies needed space grew under us. */
 	rtnl_set_sk_err(net, RTNLGRP_IPV6_ROUTE, err);
 }
+void inet6_rt_notify(int event, struct fib6_info *rt, struct nl_info *info,
+		     unsigned int nlm_flags)
+{
+	__inet6_rt_notify(event, rt, info, nlm_flags, RT_DEL_REASON_UNSPEC);
+}
+void inet6_rt_del_notify(struct fib6_info *rt, struct nl_info *info,
+			 enum rt_del_reason del_reason)
+{
+	__inet6_rt_notify(RTM_DELROUTE, rt, info, 0, del_reason);
+}
 void fib6_rt_update(struct net *net, struct fib6_info *rt,
 		    struct nl_info *info)
 {

ipv6: add inet6_rt_del_notify()

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code