diff options
| author | Xuan Zhuo <xuanzhuo@linux.alibaba.com> | 2020-12-01 21:56:57 +0800 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-12-03 01:14:14 +0100 |
| commit | f5da54187e33dce9bea63170667dbb0ca8d98194 (patch) | |
| tree | 89213db4773977f0fb2e9d2575f4ef8428a4e499 /net | |
| parent | 156c9b70dbfb83eeeff39e9202eb5f8bb6d0fd04 (diff) | |
| download | linux-f5da54187e33dce9bea63170667dbb0ca8d98194.tar.gz linux-f5da54187e33dce9bea63170667dbb0ca8d98194.tar.bz2 linux-f5da54187e33dce9bea63170667dbb0ca8d98194.zip | |
xsk: Replace datagram_poll by sock_poll_wait
datagram_poll will judge the current socket status (EPOLLIN, EPOLLOUT)
based on the traditional socket information (eg: sk_wmem_alloc), but
this does not apply to xsk. So this patch uses sock_poll_wait instead of
datagram_poll, and the mask is calculated by xsk_poll.
Fixes: c497176cb2e4 ("xsk: add Rx receive functions and poll support")
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/e82f4697438cd63edbf271ebe1918db8261b7c09.1606555939.git.xuanzhuo@linux.alibaba.com
Diffstat (limited to 'net')
| -rw-r--r-- | net/xdp/xsk.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index b7b039bd9d03..9bbfd8adbb73 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -471,11 +471,13 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) static __poll_t xsk_poll(struct file *file, struct socket *sock, struct poll_table_struct *wait) { - __poll_t mask = datagram_poll(file, sock, wait); + __poll_t mask = 0; struct sock *sk = sock->sk; struct xdp_sock *xs = xdp_sk(sk); struct xsk_buff_pool *pool; + sock_poll_wait(file, sock, wait); + if (unlikely(!xsk_is_bound(xs))) return mask; |