From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-239000-1516217798-2-333974050447562215 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES unknown, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='de', MailFrom='org' X-Spam-charsets: X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-api-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1516217792; b=WghmzqkcAHADyw+3FOkjz2rt0ezCSFjgDZLXv2doVqSHzp3 NTiWGBpvknnNYBuOFtMRSJQg5UrNCk1eWObNsAes2NgavIw1UeMZ2cymFZNH/nNo ZDINhpFcmGvBlVJjCGADhO3rErm5Cbci84ns8/zatMBdLM9S87Uh5VB3XXSZyoE7 A7kKHSvnNs7vqg2rpwdiCFpJVThrimgm1m5sKX6kwgp9MYklv6ixm9GDNPmwdnyr 3Mo7tLBmvfOjJLOuYf26KBInRJDkinaVhkbDPnlN4y8tdjh1ybE8lyvjrnLscJrx OgBdJJ4vRU6kuc32hidSGmRX84B3bhCWK1U6JLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:sender:list-id; s=arctest; t=1516217792; bh=+pJAEjU1EYvBLgV4TArK+WxOlW3mFjih8P4zMt0gLQU=; b=XO6ARAd3TvQ5 d9+CqBPjdOkKKLTRGkCkAF6jlu4wLXopUtnm0dWi3zVD3tI18wnA2Dp3NLYT0a7U HC4fvCUCLFw6/ELs1Z2Da7D+/AJ+jH+WAsoi00hn63jMSizwpDTxpndHp7+Lo1y6 9WSucJYZq7KbOH2CGyomFYzznfA1jqQ0LagChzZ2snaHJoLbgzhwpwAcUyzAaLkB A1i6cBKYhZVTvwPo3JgdQJGL/B0XRCweLrdiH5EFWEWKDLIQhn3WqJcE11QR1BrX 6LS+iH7CdeEUP2pS9LXvN4+jKiwVcD7igsfIhgNdD+p/IeoqK0pUWPuuwwVX5Qwh qjsypcNS5Q== ARC-Authentication-Results: i=1; mx1.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=apwLKoTJ x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes Authentication-Results: mx1.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered; 2048-bit rsa key sha256) header.d=infradead.org header.i=@infradead.org header.b=apwLKoTJ x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=bombadil.20170209; dmarc=none (p=none,has-list-id=yes,d=none) header.from=lst.de; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-api-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=lst.de header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752680AbeAQT2v (ORCPT ); Wed, 17 Jan 2018 14:28:51 -0500 Received: from bombadil.infradead.org ([65.50.211.133]:38097 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753732AbeAQT2s (ORCPT ); Wed, 17 Jan 2018 14:28:48 -0500 From: Christoph Hellwig To: viro@zeniv.linux.org.uk Cc: Avi Kivity , linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, netdev@vger.kernel.org, linux-api@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 18/36] net/tcp: convert to ->poll_mask Date: Wed, 17 Jan 2018 20:27:24 +0100 Message-Id: <20180117192742.710-19-hch@lst.de> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180117192742.710-1-hch@lst.de> References: <20180117192742.710-1-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-api-owner@vger.kernel.org X-Mailing-List: linux-api@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: Signed-off-by: Christoph Hellwig --- include/net/tcp.h | 4 ++-- net/ipv4/af_inet.c | 3 ++- net/ipv4/tcp.c | 33 ++++++++++++++------------------- net/ipv6/af_inet6.c | 3 ++- 4 files changed, 20 insertions(+), 23 deletions(-) diff --git a/include/net/tcp.h b/include/net/tcp.h index 50b21a49d870..75b3ce444b1c 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h @@ -387,8 +387,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 f00499a46927..2a362198a03e 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c @@ -934,7 +934,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 c4a7ee7f6721..4d88c765cfcc 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -486,35 +486,30 @@ static void tcp_tx_timestamp(struct sock *sk, u16 tsflags) } } +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); + 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_rps_record_flow(sk); - - sock_poll_wait(file, sk_sleep(sk), wait); - state = 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; - /* * POLLHUP is certainly not done right. But poll() doesn't * have a notion of HUP in just one direction, and for a @@ -595,7 +590,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 c9441ca45399..cccbb6e6603a 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@ -544,7 +544,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 */ -- 2.14.2