From: Cong Wang <xiyou.wangcong@gmail.com>
To: netdev@vger.kernel.org
Cc: bpf@vger.kernel.org, jiang.wang@bytedance.com,
duanxiongchun@bytedance.com, wangdongdong.6@bytedance.com,
Cong Wang <cong.wang@bytedance.com>,
John Fastabend <john.fastabend@gmail.com>,
Daniel Borkmann <daniel@iogearbox.net>,
Jakub Sitnicki <jakub@cloudflare.com>,
Lorenz Bauer <lmb@cloudflare.com>
Subject: [Patch bpf-next v3 02/10] af_unix: implement ->read_sock() for sockmap
Date: Sun, 25 Apr 2021 19:49:53 -0700 [thread overview]
Message-ID: <20210426025001.7899-3-xiyou.wangcong@gmail.com> (raw)
In-Reply-To: <20210426025001.7899-1-xiyou.wangcong@gmail.com>
From: Cong Wang <cong.wang@bytedance.com>
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>
---
net/unix/af_unix.c | 38 ++++++++++++++++++++++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 5a31307ceb76..f4dc22db371d 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -661,6 +661,8 @@ 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);
+static 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);
@@ -738,6 +740,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,
@@ -2183,6 +2186,41 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg,
return err;
}
+static 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..
*/
--
2.25.1
next prev parent reply other threads:[~2021-04-26 2:50 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-26 2:49 [Patch bpf-next v3 00/10] sockmap: add sockmap support to Unix datagram socket Cong Wang
2021-04-26 2:49 ` [Patch bpf-next v3 01/10] sock_map: relax config dependency to CONFIG_NET Cong Wang
2021-04-26 2:49 ` Cong Wang [this message]
2021-05-05 17:14 ` [Patch bpf-next v3 02/10] af_unix: implement ->read_sock() for sockmap Jakub Sitnicki
2021-05-07 1:00 ` Cong Wang
2021-05-11 5:34 ` John Fastabend
2021-05-18 4:46 ` Cong Wang
2021-05-18 5:11 ` John Fastabend
2021-04-26 2:49 ` [Patch bpf-next v3 03/10] af_unix: implement ->psock_update_sk_prot() Cong Wang
2021-05-06 13:04 ` Jakub Sitnicki
2021-05-07 0:55 ` Cong Wang
2021-04-26 2:49 ` [Patch bpf-next v3 04/10] af_unix: set TCP_ESTABLISHED for datagram sockets too Cong Wang
2021-05-07 8:18 ` Jakub Sitnicki
2021-05-08 20:41 ` Cong Wang
2021-04-26 2:49 ` [Patch bpf-next v3 05/10] af_unix: implement unix_dgram_bpf_recvmsg() Cong Wang
2021-05-07 13:29 ` Jakub Sitnicki
2021-05-08 20:43 ` Cong Wang
2021-04-26 2:49 ` [Patch bpf-next v3 06/10] sock_map: update sock type checks for AF_UNIX Cong Wang
2021-04-26 2:49 ` [Patch bpf-next v3 07/10] selftests/bpf: factor out udp_socketpair() Cong Wang
2021-04-26 2:49 ` [Patch bpf-next v3 08/10] selftests/bpf: factor out add_to_sockmap() Cong Wang
2021-04-26 2:50 ` [Patch bpf-next v3 09/10] selftests/bpf: add a test case for unix sockmap Cong Wang
2021-04-26 2:50 ` [Patch bpf-next v3 10/10] selftests/bpf: add test cases for redirection between udp and unix Cong Wang
2021-05-07 14:07 ` [Patch bpf-next v3 00/10] sockmap: add sockmap support to Unix datagram socket Jakub Sitnicki
2021-05-08 22:27 ` Cong Wang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210426025001.7899-3-xiyou.wangcong@gmail.com \
--to=xiyou.wangcong@gmail.com \
--cc=bpf@vger.kernel.org \
--cc=cong.wang@bytedance.com \
--cc=daniel@iogearbox.net \
--cc=duanxiongchun@bytedance.com \
--cc=jakub@cloudflare.com \
--cc=jiang.wang@bytedance.com \
--cc=john.fastabend@gmail.com \
--cc=lmb@cloudflare.com \
--cc=netdev@vger.kernel.org \
--cc=wangdongdong.6@bytedance.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).