net: wire up support for file_operations->uring_cmd()

Support for SOCKET_URING_OP_SIOCINQ and SOCKET_URING_OP_SIOCOUTQ
for tcp/udp/raw ipv4/ipv6.

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/include/net/raw.h b/include/net/raw.h
index 8ad8df5948536483c3467bff68ec0796b0712e67..fbaa123c245857a423466d69fc9f7fc7db9231f5 100644 (file)
--- a/include/net/raw.h
+++ b/include/net/raw.h
@@ -82,4 +82,7 @@ static inline bool raw_sk_bound_dev_eq(struct net *net, int bound_dev_if,
 #endif
 }
 
+int raw_uring_cmd(struct sock *sk, struct sock_uring_cmd *scmd,
+                 enum io_uring_cmd_flags flags);
+
 #endif /* _RAW_H */

diff --git a/include/net/sock.h b/include/net/sock.h
index 129d200bccb46581f9959a8ee553acbed94466cf..d0fbd366887aa5601f313c0b6d76c07fc9cf37aa 100644 (file)
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -1146,6 +1146,9 @@ struct proto {
 
        int                     (*ioctl)(struct sock *sk, int cmd,
                                         unsigned long arg);
+       int                     (*uring_cmd)(struct sock *sk,
+                                       struct sock_uring_cmd *scmd,
+                                       enum io_uring_cmd_flags flags);
        int                     (*init)(struct sock *sk);
        void                    (*destroy)(struct sock *sk);
        void                    (*shutdown)(struct sock *sk, int how);

diff --git a/include/net/tcp.h b/include/net/tcp.h
index 78d13c88720fda50e3f1880ac741cea1985ef3e9..8174d9752e52f5f06151e76343c9ed7d1fee53e2 100644 (file)
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
@@ -350,6 +350,8 @@ void tcp_twsk_destructor(struct sock *sk);
 ssize_t tcp_splice_read(struct socket *sk, loff_t *ppos,
                        struct pipe_inode_info *pipe, size_t len,
                        unsigned int flags);
+int tcp_uring_cmd(struct sock *sk, struct sock_uring_cmd *scmd,
+                       enum io_uring_cmd_flags flags);
 
 void tcp_enter_quickack_mode(struct sock *sk, unsigned int max_quickacks);
 static inline void tcp_dec_quickack_mode(struct sock *sk,

diff --git a/include/net/udp.h b/include/net/udp.h
index 877832bed4713a011a514a2f6f522728c8c89e20..362224fe83fe269828eaccdfb4ce73f2fc0f9ca1 100644 (file)
--- a/include/net/udp.h
+++ b/include/net/udp.h
@@ -326,6 +326,8 @@ struct sock *__udp6_lib_lookup(struct net *net,
                               struct sk_buff *skb);
 struct sock *udp6_lib_lookup_skb(const struct sk_buff *skb,
                                 __be16 sport, __be16 dport);
+int udp_uring_cmd(struct sock *sk, struct sock_uring_cmd *scmd,
+                       enum io_uring_cmd_flags flags);
 
 /* UDP uses skb->dev_scratch to cache as much information as possible and avoid
  * possibly multiple cache miss on dequeue()

diff --git a/include/uapi/linux/net.h b/include/uapi/linux/net.h
index 4dabec6bd957d604dd3f18f7b9896c82a789eb87..2f1ccbace8fa3ac6aa9c623662f8491068f48283 100644 (file)
--- a/include/uapi/linux/net.h
+++ b/include/uapi/linux/net.h
@@ -19,6 +19,7 @@
 #ifndef _UAPI_LINUX_NET_H
 #define _UAPI_LINUX_NET_H
 
+#include <linux/types.h>
 #include <linux/socket.h>
 #include <asm/socket.h>
 
@@ -55,4 +56,16 @@ typedef enum {
 
 #define __SO_ACCEPTCON (1 << 16)       /* performed a listen           */
 
+enum {
+       SOCKET_URING_OP_SIOCINQ         = 0,
+       SOCKET_URING_OP_SIOCOUTQ,
+};
+
+struct sock_uring_cmd {
+       __u16   op;
+       __u16   unused[13];
+       __u64   reserved;               /* will be overwritten by core */
+       __u64   unused2[2];
+};
+
 #endif /* _UAPI_LINUX_NET_H */

diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index 50a73178d63a841a60bf2fdb441b846df775874a..585c8b246ea1d1705222f94b304c646ea07e4fae 100644 (file)
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -878,6 +878,29 @@ static int raw_getsockopt(struct sock *sk, int level, int optname,
        return do_raw_getsockopt(sk, level, optname, optval, optlen);
 }
 
+int raw_uring_cmd(struct sock *sk, struct sock_uring_cmd *scmd,
+                 enum io_uring_cmd_flags flags)
+{
+       switch (scmd->op) {
+       case SOCKET_URING_OP_SIOCOUTQ:
+               return sk_wmem_alloc_get(sk);
+       case SOCKET_URING_OP_SIOCINQ: {
+               struct sk_buff *skb;
+               int amount = 0;
+
+               spin_lock_bh(&sk->sk_receive_queue.lock);
+               skb = skb_peek(&sk->sk_receive_queue);
+               if (skb)
+                       amount = skb->len;
+               spin_unlock_bh(&sk->sk_receive_queue.lock);
+               return amount;
+               }
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+EXPORT_SYMBOL_GPL(raw_uring_cmd);
+
 static int raw_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
        switch (cmd) {
@@ -956,6 +979,7 @@ struct proto raw_prot = {
        .release_cb        = ip4_datagram_release_cb,
        .hash              = raw_hash_sk,
        .unhash            = raw_unhash_sk,
+       .uring_cmd         = raw_uring_cmd,
        .obj_size          = sizeof(struct raw_sock),
        .useroffset        = offsetof(struct raw_sock, filter),
        .usersize          = sizeof_field(struct raw_sock, filter),

diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 32545ecf2ab105739e9a751b5202a7b3c9d6b22e..9d12cb138256dae50fec3578c2ffd7b2e2d7acbd 100644 (file)
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -602,6 +602,40 @@ __poll_t tcp_poll(struct file *file, struct socket *sock, poll_table *wait)
 }
 EXPORT_SYMBOL(tcp_poll);
 
+int tcp_uring_cmd(struct sock *sk, struct sock_uring_cmd *scmd,
+                 enum io_uring_cmd_flags flags)
+{
+       struct tcp_sock *tp = tcp_sk(sk);
+       bool slow;
+       int ret;
+
+       switch (scmd->op) {
+       case SOCKET_URING_OP_SIOCINQ:
+               if (sk->sk_state == TCP_LISTEN)
+                       return -EINVAL;
+
+               slow = lock_sock_fast(sk);
+               ret = tcp_inq(sk);
+               unlock_sock_fast(sk, slow);
+               break;
+       case SOCKET_URING_OP_SIOCOUTQ:
+               if (sk->sk_state == TCP_LISTEN)
+                       return -EINVAL;
+
+               if ((1 << sk->sk_state) & (TCPF_SYN_SENT | TCPF_SYN_RECV))
+                       ret = 0;
+               else
+                       ret = READ_ONCE(tp->write_seq) - tp->snd_una;
+               break;
+       default:
+               ret = -EOPNOTSUPP;
+               break;
+       }
+
+       return ret;
+}
+EXPORT_SYMBOL_GPL(tcp_uring_cmd);
+
 int tcp_ioctl(struct sock *sk, int cmd, unsigned long arg)
 {
        struct tcp_sock *tp = tcp_sk(sk);

diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 777306b5bc224d6e36da13641b5cdf4f0dba81fd..ca3c2654a3518b5b248af9147b4d1f9d8b3d58ad 100644 (file)
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -2788,6 +2788,7 @@ struct proto tcp_prot = {
        .disconnect             = tcp_disconnect,
        .accept                 = inet_csk_accept,
        .ioctl                  = tcp_ioctl,
+       .uring_cmd              = tcp_uring_cmd,
        .init                   = tcp_v4_init_sock,
        .destroy                = tcp_v4_destroy_sock,
        .shutdown               = tcp_shutdown,

diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index 69ea76578abb95c613ef20f4fc0751e1ff81ac7b..088634271d92b5fddc9453f2580c04914bd2ffc7 100644 (file)
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -1676,6 +1676,20 @@ static int first_packet_length(struct sock *sk)
        return res;
 }
 
+int udp_uring_cmd(struct sock *sk, struct sock_uring_cmd *scmd,
+                 enum io_uring_cmd_flags flags)
+{
+       switch (scmd->op) {
+       case SOCKET_URING_OP_SIOCINQ:
+               return max_t(int, 0, first_packet_length(sk));
+       case SOCKET_URING_OP_SIOCOUTQ:
+               return sk_wmem_alloc_get(sk);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+EXPORT_SYMBOL_GPL(udp_uring_cmd);
+
 /*
  *     IOCTL requests applicable to the UDP protocol
  */
@@ -2832,6 +2846,7 @@ struct proto udp_prot = {
        .connect                = ip4_datagram_connect,
        .disconnect             = udp_disconnect,
        .ioctl                  = udp_ioctl,
+       .uring_cmd              = udp_uring_cmd,
        .init                   = udp_init_sock,
        .destroy                = udp_destroy_sock,
        .setsockopt             = udp_setsockopt,

diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c
index 1f56d9aae5892bc958e19be49d8bcbf544c1d318..50f1e8189482393629917925da1b8762c06f9f7d 100644 (file)
--- a/net/ipv6/raw.c
+++ b/net/ipv6/raw.c
@@ -1235,6 +1235,7 @@ struct proto rawv6_prot = {
        .connect           = ip6_datagram_connect_v6_only,
        .disconnect        = __udp_disconnect,
        .ioctl             = rawv6_ioctl,
+       .uring_cmd         = raw_uring_cmd,
        .init              = rawv6_init_sk,
        .setsockopt        = rawv6_setsockopt,
        .getsockopt        = rawv6_getsockopt,

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 0e1509b02cb3065d5841b55c7ea54fa4d668585b..e86af3503a4bf19f895258cb0e779f61d237b8e2 100644 (file)
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -2116,6 +2116,7 @@ struct proto tcpv6_prot = {
        .disconnect             = tcp_disconnect,
        .accept                 = inet_csk_accept,
        .ioctl                  = tcp_ioctl,
+       .uring_cmd              = tcp_uring_cmd,
        .init                   = tcp_v6_init_sock,
        .destroy                = tcp_v6_destroy_sock,
        .shutdown               = tcp_shutdown,

diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c
index b9f3dfdd238344b5d55c4bf46d05433a17c3a4b3..881ae4a1cdda096de37ff9085cb6a383c41d677e 100644 (file)
--- a/net/ipv6/udp.c
+++ b/net/ipv6/udp.c
@@ -1701,6 +1701,7 @@ struct proto udpv6_prot = {
        .connect                = ip6_datagram_connect,
        .disconnect             = udp_disconnect,
        .ioctl                  = udp_ioctl,
+       .uring_cmd              = udp_uring_cmd,
        .init                   = udp_init_sock,
        .destroy                = udpv6_destroy_sock,
        .setsockopt             = udpv6_setsockopt,