]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
net/smc: handle ioctls SIOCINQ, SIOCOUTQ, and SIOCOUTQNSD
authorUrsula Braun <ubraun@linux.ibm.com>
Wed, 2 May 2018 14:56:46 +0000 (16:56 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 2 May 2018 17:29:12 +0000 (13:29 -0400)
SIOCINQ returns the amount of unread data in the RMB.
SIOCOUTQ returns the amount of unsent or unacked sent data in the send
buffer.
SIOCOUTQNSD returns the amount of data prepared for sending, but
not yet sent.

Signed-off-by: Ursula Braun <ubraun@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/smc/af_smc.c

index 961b8eff95538c31b9b49422c1c19f63884ae4ae..823ea33715759fe6b3a0d7a23c99006e2de26b86 100644 (file)
@@ -29,6 +29,7 @@
 #include <net/sock.h>
 #include <net/tcp.h>
 #include <net/smc.h>
+#include <asm/ioctls.h>
 
 #include "smc.h"
 #include "smc_clc.h"
@@ -1389,12 +1390,38 @@ static int smc_ioctl(struct socket *sock, unsigned int cmd,
                     unsigned long arg)
 {
        struct smc_sock *smc;
+       int answ;
 
        smc = smc_sk(sock->sk);
-       if (smc->use_fallback)
+       if (smc->use_fallback) {
+               if (!smc->clcsock)
+                       return -EBADF;
                return smc->clcsock->ops->ioctl(smc->clcsock, cmd, arg);
-       else
-               return sock_no_ioctl(sock, cmd, arg);
+       }
+       switch (cmd) {
+       case SIOCINQ: /* same as FIONREAD */
+               if (smc->sk.sk_state == SMC_LISTEN)
+                       return -EINVAL;
+               answ = atomic_read(&smc->conn.bytes_to_rcv);
+               break;
+       case SIOCOUTQ:
+               /* output queue size (not send + not acked) */
+               if (smc->sk.sk_state == SMC_LISTEN)
+                       return -EINVAL;
+               answ = smc->conn.sndbuf_size -
+                                       atomic_read(&smc->conn.sndbuf_space);
+               break;
+       case SIOCOUTQNSD:
+               /* output queue size (not send only) */
+               if (smc->sk.sk_state == SMC_LISTEN)
+                       return -EINVAL;
+               answ = smc_tx_prepared_sends(&smc->conn);
+               break;
+       default:
+               return -ENOIOCTLCMD;
+       }
+
+       return put_user(answ, (int __user *)arg);
 }
 
 static ssize_t smc_sendpage(struct socket *sock, struct page *page,