From: Eric Dumazet <eric.dumazet@gmail.com>
To: Christoph Hellwig <hch@lst.de>, viro@zeniv.linux.org.uk
Cc: Avi Kivity <avi@scylladb.com>,
linux-aio@kvack.org, linux-fsdevel@vger.kernel.org,
netdev@vger.kernel.org, linux-api@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 14/32] net/tcp: convert to ->poll_mask
Date: Fri, 11 May 2018 06:13:11 -0700 [thread overview]
Message-ID: <96284b0e-0d4e-a944-4fd5-933d12cf53cb@gmail.com> (raw)
In-Reply-To: <20180511110803.10910-15-hch@lst.de>
On 05/11/2018 04:07 AM, Christoph Hellwig wrote:
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
> include/net/tcp.h | 4 ++--
> net/ipv4/af_inet.c | 3 ++-
> net/ipv4/tcp.c | 31 ++++++++++++++-----------------
> net/ipv6/af_inet6.c | 3 ++-
> 4 files changed, 20 insertions(+), 21 deletions(-)
>
> diff --git a/include/net/tcp.h b/include/net/tcp.h
> index 9c9b3768b350..d4d72ea9128d 100644
> --- a/include/net/tcp.h
> +++ b/include/net/tcp.h
> @@ -388,8 +388,8 @@ bool tcp_peer_is_proven(struct request_sock *req, struct dst_entry *dst);
> void tcp_close(struct sock *sk, long timeout);
> void tcp_init_sock(struct sock *sk);
> void tcp_init_transfer(struct sock *sk, int bpf_op);
> -__poll_t tcp_poll(struct file *file, struct socket *sock,
> - struct poll_table_struct *wait);
> +struct wait_queue_head *tcp_get_poll_head(struct socket *sock, __poll_t events);
> +__poll_t tcp_poll_mask(struct socket *sock, __poll_t events);
> int tcp_getsockopt(struct sock *sk, int level, int optname,
> char __user *optval, int __user *optlen);
> int tcp_setsockopt(struct sock *sk, int level, int optname,
> diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c
> index eaed0367e669..220b51347526 100644
> --- a/net/ipv4/af_inet.c
> +++ b/net/ipv4/af_inet.c
> @@ -986,7 +986,8 @@ const struct proto_ops inet_stream_ops = {
> .socketpair = sock_no_socketpair,
> .accept = inet_accept,
> .getname = inet_getname,
> - .poll = tcp_poll,
> + .get_poll_head = tcp_get_poll_head,
> + .poll_mask = tcp_poll_mask,
> .ioctl = inet_ioctl,
> .listen = inet_listen,
> .shutdown = inet_shutdown,
> diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
> index 9ce1c726185e..6ec0e7a13581 100644
> --- a/net/ipv4/tcp.c
> +++ b/net/ipv4/tcp.c
> @@ -493,33 +493,30 @@ static inline bool tcp_stream_is_readable(const struct tcp_sock *tp,
> sk->sk_prot->stream_memory_read(sk) : false);
> }
>
> +struct wait_queue_head *tcp_get_poll_head(struct socket *sock, __poll_t events)
> +{
> + sock_poll_busy_loop(sock, events);
> + sock_rps_record_flow(sock->sk);
Why are you adding sock_rps_record_flow() ?
> + return sk_sleep(sock->sk);
> +}
> +EXPORT_SYMBOL(tcp_get_poll_head);
> +
> /*
> - * Wait for a TCP event.
> - *
> - * Note that we don't need to lock the socket, as the upper poll layers
> - * take care of normal races (between the test and the event) and we don't
> - * go look at any of the socket buffers directly.
> + * Socket is not locked. We are protected from async events by poll logic and
> + * correct handling of state changes made by other threads is impossible in
> + * any case.
> */
> -__poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
> +__poll_t tcp_poll_mask(struct socket *sock, __poll_t events)
> {
> - __poll_t mask;
> struct sock *sk = sock->sk;
> const struct tcp_sock *tp = tcp_sk(sk);
> + __poll_t mask = 0;
> int state;
>
> - sock_poll_wait(file, sk_sleep(sk), wait);
> -
> state = inet_sk_state_load(sk);
> if (state == TCP_LISTEN)
> return inet_csk_listen_poll(sk);
>
> - /* Socket is not locked. We are protected from async events
> - * by poll logic and correct handling of state changes
> - * made by other threads is impossible in any case.
> - */
> -
> - mask = 0;
> -
> /*
> * EPOLLHUP is certainly not done right. But poll() doesn't
> * have a notion of HUP in just one direction, and for a
> @@ -600,7 +597,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
>
> return mask;
> }
> -EXPORT_SYMBOL(tcp_poll);
> +EXPORT_SYMBOL(tcp_poll_mask);
>
> int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
> {
> diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c
> index 8da0b513f188..a43d967eeca5 100644
> --- a/net/ipv6/af_inet6.c
> +++ b/net/ipv6/af_inet6.c
> @@ -571,7 +571,8 @@ const struct proto_ops inet6_stream_ops = {
> .socketpair = sock_no_socketpair, /* a do nothing */
> .accept = inet_accept, /* ok */
> .getname = inet6_getname,
> - .poll = tcp_poll, /* ok */
> + .get_poll_head = tcp_get_poll_head,
> + .poll_mask = tcp_poll_mask, /* ok */
> .ioctl = inet6_ioctl, /* must change */
> .listen = inet_listen, /* ok */
> .shutdown = inet_shutdown, /* ok */
>
next prev parent reply other threads:[~2018-05-11 13:13 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-11 11:07 aio poll and a new in-kernel poll API V10 Christoph Hellwig
2018-05-11 11:07 ` [PATCH 01/32] fs: unexport poll_schedule_timeout Christoph Hellwig
2018-05-11 11:07 ` [PATCH 02/32] fs: cleanup do_pollfd Christoph Hellwig
2018-05-11 11:07 ` [PATCH 03/32] fs: update documentation to mention __poll_t and match the code Christoph Hellwig
2018-05-11 11:07 ` [PATCH 04/32] fs: add new vfs_poll and file_can_poll helpers Christoph Hellwig
2018-05-11 11:07 ` [PATCH 05/32] fs: introduce new ->get_poll_head and ->poll_mask methods Christoph Hellwig
2018-05-11 11:07 ` [PATCH 06/32] aio: simplify KIOCB_KEY handling Christoph Hellwig
2018-05-11 11:07 ` [PATCH 07/32] aio: simplify cancellation Christoph Hellwig
2018-05-11 11:07 ` [PATCH 08/32] aio: replace kiocb_set_cancel_fn with a cancel_kiocb file operation Christoph Hellwig
2018-05-11 11:07 ` [PATCH 09/32] aio: add delayed cancel support Christoph Hellwig
2018-05-11 11:07 ` [PATCH 10/32] aio: implement IOCB_CMD_POLL Christoph Hellwig
2018-05-11 11:07 ` [PATCH 11/32] net: refactor socket_poll Christoph Hellwig
2018-05-11 11:07 ` [PATCH 12/32] net: add support for ->poll_mask in proto_ops Christoph Hellwig
2018-05-11 11:07 ` [PATCH 13/32] net: remove sock_no_poll Christoph Hellwig
2018-05-11 11:07 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-05-11 13:13 ` Eric Dumazet [this message]
2018-05-12 10:09 ` Christoph Hellwig
2018-05-11 11:07 ` [PATCH 15/32] net/unix: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 16/32] net: convert datagram_poll users tp ->poll_mask Christoph Hellwig
2018-05-11 11:07 ` [PATCH 17/32] net/dccp: convert to ->poll_mask Christoph Hellwig
2018-05-11 11:07 ` [PATCH 18/32] net/atm: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 19/32] net/vmw_vsock: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 20/32] net/tipc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 21/32] net/sctp: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 22/32] net/bluetooth: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 23/32] net/caif: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 24/32] net/nfc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 25/32] net/phonet: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 26/32] net/iucv: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 27/32] net/rxrpc: " Christoph Hellwig
2018-05-11 11:07 ` [PATCH 28/32] crypto: af_alg: " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 29/32] pipe: " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 30/32] eventfd: switch " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 31/32] timerfd: convert " Christoph Hellwig
2018-05-11 11:08 ` [PATCH 32/32] random: " Christoph Hellwig
-- strict thread matches above, loose matches on Subject: below --
2018-05-15 19:48 aio poll and a new in-kernel poll API V11 Christoph Hellwig
2018-05-15 19:48 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
2018-03-30 15:07 aio poll and a new in-kernel poll API V9 Christoph Hellwig
2018-03-30 15:07 ` [PATCH 14/32] net/tcp: convert to ->poll_mask Christoph Hellwig
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=96284b0e-0d4e-a944-4fd5-933d12cf53cb@gmail.com \
--to=eric.dumazet@gmail.com \
--cc=avi@scylladb.com \
--cc=hch@lst.de \
--cc=linux-aio@kvack.org \
--cc=linux-api@vger.kernel.org \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).