Skip to content

Commit 744500d

Browse files
luigix25davem330
authored andcommitted
vsock: add support for SIOCOUTQ ioctl
Add support for ioctl(s) in AF_VSOCK. The only ioctl available is SIOCOUTQ/TIOCOUTQ, which returns the number of unsent bytes in the socket. This information is transport-specific and is delegated to them using a callback. Suggested-by: Daan De Meyer <[email protected]> Signed-off-by: Luigi Leonardi <[email protected]> Reviewed-by: Stefano Garzarella <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5fe164f commit 744500d

File tree

2 files changed

+58
-3
lines changed

2 files changed

+58
-3
lines changed

include/net/af_vsock.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -169,6 +169,9 @@ struct vsock_transport {
169169
void (*notify_buffer_size)(struct vsock_sock *, u64 *);
170170
int (*notify_set_rcvlowat)(struct vsock_sock *vsk, int val);
171171

172+
/* SIOCOUTQ ioctl */
173+
ssize_t (*unsent_bytes)(struct vsock_sock *vsk);
174+
172175
/* Shutdown. */
173176
int (*shutdown)(struct vsock_sock *, int);
174177

net/vmw_vsock/af_vsock.c

Lines changed: 55 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
#include <net/sock.h>
113113
#include <net/af_vsock.h>
114114
#include <uapi/linux/vm_sockets.h>
115+
#include <uapi/asm-generic/ioctls.h>
115116

116117
static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
117118
static void vsock_sk_destruct(struct sock *sk);
@@ -1292,6 +1293,57 @@ int vsock_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
12921293
}
12931294
EXPORT_SYMBOL_GPL(vsock_dgram_recvmsg);
12941295

1296+
static int vsock_do_ioctl(struct socket *sock, unsigned int cmd,
1297+
int __user *arg)
1298+
{
1299+
struct sock *sk = sock->sk;
1300+
struct vsock_sock *vsk;
1301+
int ret;
1302+
1303+
vsk = vsock_sk(sk);
1304+
1305+
switch (cmd) {
1306+
case SIOCOUTQ: {
1307+
ssize_t n_bytes;
1308+
1309+
if (!vsk->transport || !vsk->transport->unsent_bytes) {
1310+
ret = -EOPNOTSUPP;
1311+
break;
1312+
}
1313+
1314+
if (sock_type_connectible(sk->sk_type) && sk->sk_state == TCP_LISTEN) {
1315+
ret = -EINVAL;
1316+
break;
1317+
}
1318+
1319+
n_bytes = vsk->transport->unsent_bytes(vsk);
1320+
if (n_bytes < 0) {
1321+
ret = n_bytes;
1322+
break;
1323+
}
1324+
1325+
ret = put_user(n_bytes, arg);
1326+
break;
1327+
}
1328+
default:
1329+
ret = -ENOIOCTLCMD;
1330+
}
1331+
1332+
return ret;
1333+
}
1334+
1335+
static int vsock_ioctl(struct socket *sock, unsigned int cmd,
1336+
unsigned long arg)
1337+
{
1338+
int ret;
1339+
1340+
lock_sock(sock->sk);
1341+
ret = vsock_do_ioctl(sock, cmd, (int __user *)arg);
1342+
release_sock(sock->sk);
1343+
1344+
return ret;
1345+
}
1346+
12951347
static const struct proto_ops vsock_dgram_ops = {
12961348
.family = PF_VSOCK,
12971349
.owner = THIS_MODULE,
@@ -1302,7 +1354,7 @@ static const struct proto_ops vsock_dgram_ops = {
13021354
.accept = sock_no_accept,
13031355
.getname = vsock_getname,
13041356
.poll = vsock_poll,
1305-
.ioctl = sock_no_ioctl,
1357+
.ioctl = vsock_ioctl,
13061358
.listen = sock_no_listen,
13071359
.shutdown = vsock_shutdown,
13081360
.sendmsg = vsock_dgram_sendmsg,
@@ -2286,7 +2338,7 @@ static const struct proto_ops vsock_stream_ops = {
22862338
.accept = vsock_accept,
22872339
.getname = vsock_getname,
22882340
.poll = vsock_poll,
2289-
.ioctl = sock_no_ioctl,
2341+
.ioctl = vsock_ioctl,
22902342
.listen = vsock_listen,
22912343
.shutdown = vsock_shutdown,
22922344
.setsockopt = vsock_connectible_setsockopt,
@@ -2308,7 +2360,7 @@ static const struct proto_ops vsock_seqpacket_ops = {
23082360
.accept = vsock_accept,
23092361
.getname = vsock_getname,
23102362
.poll = vsock_poll,
2311-
.ioctl = sock_no_ioctl,
2363+
.ioctl = vsock_ioctl,
23122364
.listen = vsock_listen,
23132365
.shutdown = vsock_shutdown,
23142366
.setsockopt = vsock_connectible_setsockopt,

0 commit comments

Comments
 (0)