Commit a66e3656 authored Sep 10, 2015 by Daniel Borkmann Committed by David S. Miller Sep 09, 2015

netlink, mmap: don't walk rx ring on poll if receive queue non-empty

In case of netlink mmap, there can be situations where received frames
have to be placed into the normal receive queue. The ring buffer indicates
this through NL_MMAP_STATUS_COPY, so the user is asked to pick them up
via recvmsg(2) syscall, and to put the slot back to NL_MMAP_STATUS_UNUSED.

Commit 0ef70770 ("netlink: rx mmap: fix POLLIN condition") changed
polling, so that we walk in the worst case the whole ring through the
new netlink_has_valid_frame(), for example, when the ring would have no
NL_MMAP_STATUS_VALID, but at least one NL_MMAP_STATUS_COPY frame.

Since we do a datagram_poll() already earlier to pick up a mask that could
possibly contain POLLIN | POLLRDNORM already (due to NL_MMAP_STATUS_COPY),
we can skip checking the rx ring entirely.

In case the kernel is compiled with !CONFIG_NETLINK_MMAP, then all this is
irrelevant anyway as netlink_poll() is just defined as datagram_poll().

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent f2be053c

net/netlink/af_netlink.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -674,12 +674,19 @@ static unsigned int netlink_poll(struct file file, struct socket sock,

		mask = datagram_poll(file, sock, wait);

		/* We could already have received frames in the normal receive
		* queue, that will show up as NL_MMAP_STATUS_COPY in the ring,
		* so if mask contains pollin/etc already, there's no point
		* walking the ring.
		*/
		if ((mask & (POLLIN \| POLLRDNORM)) != (POLLIN \| POLLRDNORM)) {
		spin_lock_bh(&sk->sk_receive_queue.lock);
		if (nlk->rx_ring.pg_vec) {
		if (netlink_has_valid_frame(&nlk->rx_ring))
		mask \|= POLLIN \| POLLRDNORM;
		}
		spin_unlock_bh(&sk->sk_receive_queue.lock);
		}

		spin_lock_bh(&sk->sk_write_queue.lock);
		if (nlk->tx_ring.pg_vec) {

Admin message