Skip to content

Commit

Permalink
af_unix: implement ->read_sock() for sockmap
Browse files Browse the repository at this point in the history
Implement ->read_sock() for AF_UNIX datagram socket, it is
pretty much similar to udp_read_sock().

Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jakub Sitnicki <jakub@cloudflare.com>
Cc: Lorenz Bauer <lmb@cloudflare.com>
Signed-off-by: Cong Wang <cong.wang@bytedance.com>
  • Loading branch information
Cong Wang committed Apr 19, 2021
1 parent cdf0e80 commit a631aa0
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions net/unix/af_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -661,6 +661,7 @@ static ssize_t unix_stream_splice_read(struct socket *, loff_t *ppos,
unsigned int flags);
static int unix_dgram_sendmsg(struct socket *, struct msghdr *, size_t);
static int unix_dgram_recvmsg(struct socket *, struct msghdr *, size_t, int);
int unix_read_sock(struct sock *sk, read_descriptor_t *desc, sk_read_actor_t recv_actor);
static int unix_dgram_connect(struct socket *, struct sockaddr *,
int, int);
static int unix_seqpacket_sendmsg(struct socket *, struct msghdr *, size_t);
Expand Down Expand Up @@ -738,6 +739,7 @@ static const struct proto_ops unix_dgram_ops = {
.listen = sock_no_listen,
.shutdown = unix_shutdown,
.sendmsg = unix_dgram_sendmsg,
.read_sock = unix_read_sock,
.recvmsg = unix_dgram_recvmsg,
.mmap = sock_no_mmap,
.sendpage = sock_no_sendpage,
Expand Down Expand Up @@ -2183,6 +2185,41 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
return err;
}

int unix_read_sock(struct sock *sk, read_descriptor_t *desc,
sk_read_actor_t recv_actor)
{
int copied = 0;

while (1) {
struct unix_sock *u = unix_sk(sk);
struct sk_buff *skb;
int used, err;

mutex_lock(&u->iolock);
skb = skb_recv_datagram(sk, 0, 1, &err);
if (!skb) {
mutex_unlock(&u->iolock);
return err;
}

used = recv_actor(desc, skb, 0, skb->len);
if (used <= 0) {
if (!copied)
copied = used;
mutex_unlock(&u->iolock);
break;
} else if (used <= skb->len) {
copied += used;
}
mutex_unlock(&u->iolock);

if (!desc->count)
break;
}

return copied;
}

/*
* Sleep until more data has arrived. But check for races..
*/
Expand Down

0 comments on commit a631aa0

Please sign in to comment.