aboutsummaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorDenis V. Lunev <den@openvz.org>2007-10-11 00:15:29 -0400
committerDavid S. Miller <davem@davemloft.net>2007-10-11 00:15:29 -0400
commitcd40b7d3983c708aabe3d3008ec64ffce56d33b0 (patch)
tree0d6fe9cfd2f03fdeee126e317d4bfb145afc458d /net/core
parentaed815601f3f95281ab3a01f7e2cbe1bd54285a0 (diff)
[NET]: make netlink user -> kernel interface synchronious
This patch make processing netlink user -> kernel messages synchronious. This change was inspired by the talk with Alexey Kuznetsov about current netlink messages processing. He says that he was badly wrong when introduced asynchronious user -> kernel communication. The call netlink_unicast is the only path to send message to the kernel netlink socket. But, unfortunately, it is also used to send data to the user. Before this change the user message has been attached to the socket queue and sk->sk_data_ready was called. The process has been blocked until all pending messages were processed. The bad thing is that this processing may occur in the arbitrary process context. This patch changes nlk->data_ready callback to get 1 skb and force packet processing right in the netlink_unicast. Kernel -> user path in netlink_unicast remains untouched. EINTR processing for in netlink_run_queue was changed. It forces rtnl_lock drop, but the process remains in the cycle until the message will be fully processed. So, there is no need to use this kludges now. Signed-off-by: Denis V. Lunev <den@openvz.org> Acked-by: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/rtnetlink.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index 471d2d9f8ea..1072d16696c 100644
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1312,15 +1312,11 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
1312 return doit(skb, nlh, (void *)&rta_buf[0]); 1312 return doit(skb, nlh, (void *)&rta_buf[0]);
1313} 1313}
1314 1314
1315static void rtnetlink_rcv(struct sock *sk, int len) 1315static void rtnetlink_rcv(struct sk_buff *skb)
1316{ 1316{
1317 unsigned int qlen = 0; 1317 rtnl_lock();
1318 1318 netlink_rcv_skb(skb, &rtnetlink_rcv_msg);
1319 do { 1319 rtnl_unlock();
1320 rtnl_lock();
1321 qlen = netlink_run_queue(sk, qlen, &rtnetlink_rcv_msg);
1322 rtnl_unlock();
1323 } while (qlen);
1324} 1320}
1325 1321
1326static int rtnetlink_event(struct notifier_block *this, unsigned long event, void *ptr) 1322static int rtnetlink_event(struct notifier_block *this, unsigned long event, void *ptr)