From: Jason Wang <jasowang@redhat.com> To: mst@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Jason Wang <jasowang@redhat.com> Subject: [PATCH net-next 5/8] tun: support receiving skb through msg_control Date: Tue, 21 Mar 2017 12:04:44 +0800 [thread overview] Message-ID: <1490069087-4783-6-git-send-email-jasowang@redhat.com> (raw) In-Reply-To: <1490069087-4783-1-git-send-email-jasowang@redhat.com> This patch makes tun_recvmsg() can receive from skb from its caller through msg_control. Vhost_net will be the first user. Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/net/tun.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 70dd9ec..a82bced 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1498,9 +1498,8 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock, static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, struct iov_iter *to, - int noblock) + int noblock, struct sk_buff *skb) { - struct sk_buff *skb; ssize_t ret; int err; @@ -1509,10 +1508,12 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, if (!iov_iter_count(to)) return 0; - /* Read frames from ring */ - skb = tun_ring_recv(tfile, noblock, &err); - if (!skb) - return err; + if (!skb) { + /* Read frames from ring */ + skb = tun_ring_recv(tfile, noblock, &err); + if (!skb) + return err; + } ret = tun_put_user(tun, tfile, skb, to); if (unlikely(ret < 0)) @@ -1532,7 +1533,7 @@ static ssize_t tun_chr_read_iter(struct kiocb *iocb, struct iov_iter *to) if (!tun) return -EBADFD; - ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK); + ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK, NULL); ret = min_t(ssize_t, ret, len); if (ret > 0) iocb->ki_pos = ret; @@ -1634,7 +1635,8 @@ static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len, SOL_PACKET, TUN_TX_TIMESTAMP); goto out; } - ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT); + ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT, + m->msg_control); if (ret > (ssize_t)total_len) { m->msg_flags |= MSG_TRUNC; ret = flags & MSG_TRUNC ? ret : total_len; -- 2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: Jason Wang <jasowang@redhat.com> To: mst@redhat.com, kvm@vger.kernel.org, virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 5/8] tun: support receiving skb through msg_control Date: Tue, 21 Mar 2017 12:04:44 +0800 [thread overview] Message-ID: <1490069087-4783-6-git-send-email-jasowang@redhat.com> (raw) In-Reply-To: <1490069087-4783-1-git-send-email-jasowang@redhat.com> This patch makes tun_recvmsg() can receive from skb from its caller through msg_control. Vhost_net will be the first user. Signed-off-by: Jason Wang <jasowang@redhat.com> --- drivers/net/tun.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 70dd9ec..a82bced 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -1498,9 +1498,8 @@ static struct sk_buff *tun_ring_recv(struct tun_file *tfile, int noblock, static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, struct iov_iter *to, - int noblock) + int noblock, struct sk_buff *skb) { - struct sk_buff *skb; ssize_t ret; int err; @@ -1509,10 +1508,12 @@ static ssize_t tun_do_read(struct tun_struct *tun, struct tun_file *tfile, if (!iov_iter_count(to)) return 0; - /* Read frames from ring */ - skb = tun_ring_recv(tfile, noblock, &err); - if (!skb) - return err; + if (!skb) { + /* Read frames from ring */ + skb = tun_ring_recv(tfile, noblock, &err); + if (!skb) + return err; + } ret = tun_put_user(tun, tfile, skb, to); if (unlikely(ret < 0)) @@ -1532,7 +1533,7 @@ static ssize_t tun_chr_read_iter(struct kiocb *iocb, struct iov_iter *to) if (!tun) return -EBADFD; - ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK); + ret = tun_do_read(tun, tfile, to, file->f_flags & O_NONBLOCK, NULL); ret = min_t(ssize_t, ret, len); if (ret > 0) iocb->ki_pos = ret; @@ -1634,7 +1635,8 @@ static int tun_recvmsg(struct socket *sock, struct msghdr *m, size_t total_len, SOL_PACKET, TUN_TX_TIMESTAMP); goto out; } - ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT); + ret = tun_do_read(tun, tfile, &m->msg_iter, flags & MSG_DONTWAIT, + m->msg_control); if (ret > (ssize_t)total_len) { m->msg_flags |= MSG_TRUNC; ret = flags & MSG_TRUNC ? ret : total_len; -- 2.7.4
next prev parent reply other threads:[~2017-03-21 4:16 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-03-21 4:04 [PATCH net-next 0/8] vhost-net rx batching Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-21 4:04 ` [PATCH net-next 1/8] ptr_ring: introduce batch dequeuing Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-21 10:25 ` Sergei Shtylyov 2017-03-22 3:16 ` Jason Wang 2017-03-22 3:16 ` Jason Wang 2017-03-22 13:43 ` Michael S. Tsirkin 2017-03-22 13:43 ` Michael S. Tsirkin 2017-03-23 5:33 ` Jason Wang 2017-03-23 5:33 ` Jason Wang 2017-03-21 4:04 ` [PATCH net-next 2/8] skb_array: " Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-21 4:04 ` [PATCH net-next 3/8] tun: export skb_array Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-21 4:04 ` [PATCH net-next 4/8] tap: " Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-21 4:04 ` Jason Wang [this message] 2017-03-21 4:04 ` [PATCH net-next 5/8] tun: support receiving skb through msg_control Jason Wang 2017-03-21 4:04 ` [PATCH net-next 6/8] tap: support receiving skb from msg_control Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-21 4:04 ` [PATCH net-next 7/8] vhost_net: try batch dequing from skb array Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-22 14:16 ` Michael S. Tsirkin 2017-03-22 14:16 ` Michael S. Tsirkin 2017-03-23 5:34 ` Jason Wang 2017-03-23 5:34 ` Jason Wang 2017-03-29 9:58 ` Jason Wang 2017-03-29 9:58 ` Jason Wang 2017-03-29 10:46 ` Pankaj Gupta 2017-03-29 10:46 ` Pankaj Gupta 2017-03-29 10:53 ` Jason Wang 2017-03-29 10:53 ` Jason Wang 2017-03-29 21:47 ` Michael S. Tsirkin 2017-03-29 21:47 ` Michael S. Tsirkin 2017-03-21 4:04 ` [PATCH net-next 8/8] vhost_net: use lockless peeking for skb array during busy polling Jason Wang 2017-03-21 4:04 ` Jason Wang 2017-03-29 12:07 ` Michael S. Tsirkin 2017-03-29 12:07 ` Michael S. Tsirkin 2017-03-30 2:16 ` Jason Wang 2017-03-30 2:33 ` Michael S. Tsirkin 2017-03-30 2:33 ` Michael S. Tsirkin 2017-03-30 3:53 ` Jason Wang 2017-03-30 3:53 ` Jason Wang 2017-03-30 2:16 ` Jason 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=1490069087-4783-6-git-send-email-jasowang@redhat.com \ --to=jasowang@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ --cc=virtualization@lists.linux-foundation.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.