aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
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/xfrm
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/xfrm')
-rw-r--r--net/xfrm/xfrm_user.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index 5238f6a8dfad..d41588d101d0 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -1895,16 +1895,11 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh)
1895 return link->doit(skb, nlh, attrs); 1895 return link->doit(skb, nlh, attrs);
1896} 1896}
1897 1897
1898static void xfrm_netlink_rcv(struct sock *sk, int len) 1898static void xfrm_netlink_rcv(struct sk_buff *skb)
1899{ 1899{
1900 unsigned int qlen = 0; 1900 mutex_lock(&xfrm_cfg_mutex);
1901 1901 netlink_rcv_skb(skb, &xfrm_user_rcv_msg);
1902 do { 1902 mutex_unlock(&xfrm_cfg_mutex);
1903 mutex_lock(&xfrm_cfg_mutex);
1904 qlen = netlink_run_queue(sk, qlen, &xfrm_user_rcv_msg);
1905 mutex_unlock(&xfrm_cfg_mutex);
1906
1907 } while (qlen);
1908} 1903}
1909 1904
1910static inline size_t xfrm_expire_msgsize(void) 1905static inline size_t xfrm_expire_msgsize(void)