From mboxrd@z Thu Jan 1 00:00:00 1970 From: Christoph Hellwig Subject: [PATCH 4/5] net: remove sock_poll_busy_loop Date: Fri, 27 Jul 2018 16:02:13 +0200 Message-ID: <20180727140214.1938-5-hch@lst.de> References: <20180727140214.1938-1-hch@lst.de> To: netdev@vger.kernel.org Return-path: Received: from bombadil.infradead.org ([198.137.202.133]:34510 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730475AbeG0PYe (ORCPT ); Fri, 27 Jul 2018 11:24:34 -0400 Received: from 089144192124.atnat0001.highway.a1.net ([89.144.192.124] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1fj3K7-0007yl-VL for netdev@vger.kernel.org; Fri, 27 Jul 2018 14:02:28 +0000 In-Reply-To: <20180727140214.1938-1-hch@lst.de> Sender: netdev-owner@vger.kernel.org List-ID: There is no point in hiding this logic in a helper. Also remove the useless events != 0 check and only busy loop once we know we actually have a poll method. Signed-off-by: Christoph Hellwig --- include/net/busy_poll.h | 9 --------- net/socket.c | 5 ++++- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index c5187438af38..25d762cf47f2 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h @@ -121,15 +121,6 @@ static inline void sk_busy_loop(struct sock *sk, int nonblock) #endif } -static inline void sock_poll_busy_loop(struct socket *sock, __poll_t events) -{ - if (sk_can_busy_loop(sock->sk) && - events && (events & POLL_BUSY_LOOP)) { - /* once, only if requested by syscall */ - sk_busy_loop(sock->sk, 1); - } -} - /* if this socket can poll_ll, tell the system call */ static inline __poll_t sock_poll_busy_flag(struct socket *sock) { diff --git a/net/socket.c b/net/socket.c index 39e0afbdd797..399d2ccec89d 100644 --- a/net/socket.c +++ b/net/socket.c @@ -1130,9 +1130,12 @@ static __poll_t sock_poll(struct file *file, poll_table *wait) struct socket *sock = file->private_data; __poll_t events = poll_requested_events(wait); - sock_poll_busy_loop(sock, events); if (!sock->ops->poll) return 0; + + /* poll once if requested by the syscall */ + if (sk_can_busy_loop(sock->sk) && (events & POLL_BUSY_LOOP)) + sk_busy_loop(sock->sk, 1); return sock->ops->poll(file, sock, wait) | sock_poll_busy_flag(sock); } -- 2.18.0