Revert "net: simplify sock_poll_wait"

This reverts commit dd979b4df817e9976f18fb6f9d134d6bc4a3c317.

This broke tcp_poll for SMC fallback: An AF_SMC socket establishes an
internal TCP socket for the initial handshake with the remote peer.
Whenever the SMC connection can not be established this TCP socket is
used as a fallback. All socket operations on the SMC socket are then
forwarded to the TCP socket. In case of poll, the file->private_data
pointer references the SMC socket because the TCP socket has no file
assigned. This causes tcp_poll to wait on the wrong socket.

Signed-off-by: Karsten Graul <kgraul@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/crypto/af_alg.c b/crypto/af_alg.c
index b053179..17eb09d 100644 (file)
--- a/crypto/af_alg.c
+++ b/crypto/af_alg.c
@@ -1071,7 +1071,7 @@ __poll_t af_alg_poll(struct file *file, struct socket *sock,
        struct af_alg_ctx *ctx = ask->private;
        __poll_t mask;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        if (!ctx->more || ctx->used)

diff --git a/include/net/sock.h b/include/net/sock.h
index 2440f8b..f665d74 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -2059,14 +2059,20 @@ static inline bool skwq_has_sleeper(struct socket_wq *wq)
 /**
  * sock_poll_wait - place memory barrier behind the poll_wait call.
  * @filp:           file
+ * @sock:           socket to wait on
  * @p:              poll_table
  *
  * See the comments in the wq_has_sleeper function.
+ *
+ * Do not derive sock from filp->private_data here. An SMC socket establishes
+ * an internal TCP socket that is used in the fallback case. All socket
+ * operations on the SMC socket are then forwarded to the TCP socket. In case of
+ * poll, the filp->private_data pointer references the SMC socket because the
+ * TCP socket has no file assigned.
  */
-static inline void sock_poll_wait(struct file *filp, poll_table *p)
+static inline void sock_poll_wait(struct file *filp, struct socket *sock,
+                                 poll_table *p)
 {
-       struct socket *sock = filp->private_data;
-
        if (!poll_does_not_wait(p)) {
                poll_wait(filp, &sock->wq->wait, p);
                /* We need to be sure we are in sync with the

diff --git a/net/atm/common.c b/net/atm/common.c
index 9f8cb0d..a38c174 100644 (file)
--- a/net/atm/common.c
+++ b/net/atm/common.c
@@ -653,7 +653,7 @@ __poll_t vcc_poll(struct file *file, struct socket *sock, poll_table *wait)
        struct atm_vcc *vcc;
        __poll_t mask;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        vcc = ATM_SD(sock);

diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index d18965f..416717c 100644 (file)
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -941,7 +941,7 @@ static __poll_t caif_poll(struct file *file,
        __poll_t mask;
        struct caifsock *cf_sk = container_of(sk, struct caifsock, sk);
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        /* exceptional events? */

diff --git a/net/core/datagram.c b/net/core/datagram.c
index 9aac0d6..6a034eb 100644 (file)
--- a/net/core/datagram.c
+++ b/net/core/datagram.c
@@ -837,7 +837,7 @@ __poll_t datagram_poll(struct file *file, struct socket *sock,
        struct sock *sk = sock->sk;
        __poll_t mask;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        /* exceptional events? */

diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 875858c..43733ac 100644 (file)
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -325,7 +325,7 @@ __poll_t dccp_poll(struct file *file, struct socket *sock,
        __poll_t mask;
        struct sock *sk = sock->sk;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        if (sk->sk_state == DCCP_LISTEN)
                return inet_csk_listen_poll(sk);
 

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index b8ba8fa..1834818 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -507,7 +507,7 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
        const struct tcp_sock *tp = tcp_sk(sk);
        int state;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
 
        state = inet_sk_state_load(sk);
        if (state == TCP_LISTEN)

diff --git a/net/iucv/af_iucv.c b/net/iucv/af_iucv.c
index 45115c1..0bed4cc 100644 (file)
--- a/net/iucv/af_iucv.c
+++ b/net/iucv/af_iucv.c
@@ -1504,7 +1504,7 @@ __poll_t iucv_sock_poll(struct file *file, struct socket *sock,
        struct sock *sk = sock->sk;
        __poll_t mask = 0;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
 
        if (sk->sk_state == IUCV_LISTEN)
                return iucv_accept_poll(sk);

diff --git a/net/nfc/llcp_sock.c b/net/nfc/llcp_sock.c
index dd4adf8..ae29627 100644 (file)
--- a/net/nfc/llcp_sock.c
+++ b/net/nfc/llcp_sock.c
@@ -556,7 +556,7 @@ static __poll_t llcp_sock_poll(struct file *file, struct socket *sock,
 
        pr_debug("%p\n", sk);
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
 
        if (sk->sk_state == LLCP_LISTEN)
                return llcp_accept_poll(sk);

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 013dbcb..64362d0 100644 (file)
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -756,7 +756,7 @@ static __poll_t rxrpc_poll(struct file *file, struct socket *sock,
        struct rxrpc_sock *rx = rxrpc_sk(sk);
        __poll_t mask;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        /* the socket is readable if there are any messages waiting on the Rx

diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c
index 0152317..80e2119 100644 (file)
--- a/net/smc/af_smc.c
+++ b/net/smc/af_smc.c
@@ -1543,7 +1543,7 @@ static __poll_t smc_poll(struct file *file, struct socket *sock,
                        mask |= EPOLLERR;
        } else {
                if (sk->sk_state != SMC_CLOSED)
-                       sock_poll_wait(file, wait);
+                       sock_poll_wait(file, sock, wait);
                if (sk->sk_err)
                        mask |= EPOLLERR;
                if ((sk->sk_shutdown == SHUTDOWN_MASK) ||

diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index de09f51..636e613 100644 (file)
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -717,7 +717,7 @@ static __poll_t tipc_poll(struct file *file, struct socket *sock,
        struct tipc_sock *tsk = tipc_sk(sk);
        __poll_t revents = 0;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
 
        if (sk->sk_shutdown & RCV_SHUTDOWN)
                revents |= EPOLLRDHUP | EPOLLIN | EPOLLRDNORM;

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 98d34fb..74d1eed 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -2642,7 +2642,7 @@ static __poll_t unix_poll(struct file *file, struct socket *sock, poll_table *wa
        struct sock *sk = sock->sk;
        __poll_t mask;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        /* exceptional events? */
@@ -2679,7 +2679,7 @@ static __poll_t unix_dgram_poll(struct file *file, struct socket *sock,
        unsigned int writable;
        __poll_t mask;
 
-       sock_poll_wait(file, wait);
+       sock_poll_wait(file, sock, wait);
        mask = 0;
 
        /* exceptional events? */