lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 060/346] xsk: Fix xsk_poll()s return type
    Date
    From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>

    [ Upstream commit 5d946c5abbaf68083fa6a41824dd79e1f06286d8 ]

    xsk_poll() is defined as returning 'unsigned int' but the
    .poll method is declared as returning '__poll_t', a bitwise type.

    Fix this by using the proper return type and using the EPOLL
    constants instead of the POLL ones, as required for __poll_t.

    Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
    Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
    Acked-by: Björn Töpel <bjorn.topel@intel.com>
    Link: https://lore.kernel.org/bpf/20191120001042.30830-1-luc.vanoostenryck@gmail.com
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    net/xdp/xsk.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c
    index 9ff2ab63e6392..6bb0649c028c4 100644
    --- a/net/xdp/xsk.c
    +++ b/net/xdp/xsk.c
    @@ -289,17 +289,17 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
    return (xs->zc) ? xsk_zc_xmit(sk) : xsk_generic_xmit(sk, m, total_len);
    }

    -static unsigned int xsk_poll(struct file *file, struct socket *sock,
    +static __poll_t xsk_poll(struct file *file, struct socket *sock,
    struct poll_table_struct *wait)
    {
    - unsigned int mask = datagram_poll(file, sock, wait);
    + __poll_t mask = datagram_poll(file, sock, wait);
    struct sock *sk = sock->sk;
    struct xdp_sock *xs = xdp_sk(sk);

    if (xs->rx && !xskq_empty_desc(xs->rx))
    - mask |= POLLIN | POLLRDNORM;
    + mask |= EPOLLIN | EPOLLRDNORM;
    if (xs->tx && !xskq_full_desc(xs->tx))
    - mask |= POLLOUT | POLLWRNORM;
    + mask |= EPOLLOUT | EPOLLWRNORM;

    return mask;
    }
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 14:25    [W:3.957 / U:0.592 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site