* Re: [PATCH net 1/2] vhost_net: fix ubuf refcount incorrectly when sendmsg fails [not found] ` <5e2ecf3d0f07b864d307b9f0425b7b7fe8bf4d2c.1608024547.git.wangyunjian@huawei.com> @ 2020-12-15 2:45 ` Willem de Bruijn 0 siblings, 0 replies; 4+ messages in thread From: Willem de Bruijn @ 2020-12-15 2:45 UTC (permalink / raw) To: wangyunjian Cc: Willem de Bruijn, Michael S. Tsirkin, Network Development, Lilijun (Jerry), virtualization, xudingke, huangbin (J), chenchanghu On Mon, Dec 14, 2020 at 8:59 PM wangyunjian <wangyunjian@huawei.com> wrote: > > From: Yunjian Wang <wangyunjian@huawei.com> > > Currently the vhost_zerocopy_callback() maybe be called to decrease > the refcount when sendmsg fails in tun. The error handling in vhost > handle_tx_zerocopy() will try to decrease the same refcount again. > This is wrong. To fix this issue, we only call vhost_net_ubuf_put() > when vq->heads[nvq->desc].len == VHOST_DMA_IN_PROGRESS. > > Fixes: 4477138fa0ae ("tun: properly test for IFF_UP") > Fixes: 90e33d459407 ("tun: enable napi_gro_frags() for TUN/TAP driver") > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> Patch looks good to me. Thanks. But I think the right Fixes tag would be Fixes: 0690899b4d45 ("tun: experimental zero copy tx support") _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <4be47d3a325983f1bfc39f11f0e015767dd2aa3c.1608024547.git.wangyunjian@huawei.com>]
* Re: [PATCH net 2/2] vhost_net: fix high cpu load when sendmsg fails [not found] ` <4be47d3a325983f1bfc39f11f0e015767dd2aa3c.1608024547.git.wangyunjian@huawei.com> @ 2020-12-15 4:09 ` Jason Wang [not found] ` <34EFBCA9F01B0748BEB6B629CE643AE60DB82A73@DGGEMM533-MBX.china.huawei.com> 0 siblings, 1 reply; 4+ messages in thread From: Jason Wang @ 2020-12-15 4:09 UTC (permalink / raw) To: wangyunjian, netdev, mst, willemdebruijn.kernel Cc: xudingke, brian.huangbin, jerry.lilijun, chenchanghu, virtualization On 2020/12/15 上午9:48, wangyunjian wrote: > From: Yunjian Wang <wangyunjian@huawei.com> > > Currently we break the loop and wake up the vhost_worker when > sendmsg fails. When the worker wakes up again, we'll meet the > same error. This will cause high CPU load. To fix this issue, > we can skip this description by ignoring the error. When we > exceeds sndbuf, the return value of sendmsg is -EAGAIN. In > the case we don't skip the description and don't drop packet. > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > --- > drivers/vhost/net.c | 21 +++++++++------------ > 1 file changed, 9 insertions(+), 12 deletions(-) > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c > index c8784dfafdd7..f966592d8900 100644 > --- a/drivers/vhost/net.c > +++ b/drivers/vhost/net.c > @@ -827,16 +827,13 @@ static void handle_tx_copy(struct vhost_net *net, struct socket *sock) > msg.msg_flags &= ~MSG_MORE; > } > > - /* TODO: Check specific error and bomb out unless ENOBUFS? */ > err = sock->ops->sendmsg(sock, &msg, len); > - if (unlikely(err < 0)) { > + if (unlikely(err == -EAGAIN)) { > vhost_discard_vq_desc(vq, 1); > vhost_net_enable_vq(net, vq); > break; > - } As I've pointed out in last version. If you don't discard descriptor, you probably need to add the head to used ring. Otherwise this descriptor will be always inflight that may confuse drivers. > - if (err != len) > - pr_debug("Truncated TX packet: len %d != %zd\n", > - err, len); > + } else if (unlikely(err < 0 || err != len)) It looks to me err != len covers err < 0. Thanks > + vq_err(vq, "Fail to sending packets err : %d, len : %zd\n", err, len); > done: > vq->heads[nvq->done_idx].id = cpu_to_vhost32(vq, head); > vq->heads[nvq->done_idx].len = 0; > @@ -922,7 +919,6 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock) > msg.msg_flags &= ~MSG_MORE; > } > > - /* TODO: Check specific error and bomb out unless ENOBUFS? */ > err = sock->ops->sendmsg(sock, &msg, len); > if (unlikely(err < 0)) { > if (zcopy_used) { > @@ -931,13 +927,14 @@ static void handle_tx_zerocopy(struct vhost_net *net, struct socket *sock) > nvq->upend_idx = ((unsigned)nvq->upend_idx - 1) > % UIO_MAXIOV; > } > - vhost_discard_vq_desc(vq, 1); > - vhost_net_enable_vq(net, vq); > - break; > + if (err == -EAGAIN) { > + vhost_discard_vq_desc(vq, 1); > + vhost_net_enable_vq(net, vq); > + break; > + } > } > if (err != len) > - pr_debug("Truncated TX packet: " > - " len %d != %zd\n", err, len); > + vq_err(vq, "Fail to sending packets err : %d, len : %zd\n", err, len); > if (!zcopy_used) > vhost_add_used_and_signal(&net->dev, vq, head, 0); > else _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <34EFBCA9F01B0748BEB6B629CE643AE60DB82A73@DGGEMM533-MBX.china.huawei.com>]
* Re: [PATCH net 2/2] vhost_net: fix high cpu load when sendmsg fails [not found] ` <34EFBCA9F01B0748BEB6B629CE643AE60DB82A73@DGGEMM533-MBX.china.huawei.com> @ 2020-12-16 5:56 ` Jason Wang [not found] ` <34EFBCA9F01B0748BEB6B629CE643AE60DB8408A@DGGEMM533-MBX.china.huawei.com> 0 siblings, 1 reply; 4+ messages in thread From: Jason Wang @ 2020-12-16 5:56 UTC (permalink / raw) To: wangyunjian Cc: willemdebruijn kernel, mst, netdev, Lilijun (Jerry), virtualization, xudingke, huangbin (J), chenchanghu ----- Original Message ----- > > > > -----Original Message----- > > From: Jason Wang [mailto:jasowang@redhat.com] > > Sent: Tuesday, December 15, 2020 12:10 PM > > To: wangyunjian <wangyunjian@huawei.com>; netdev@vger.kernel.org; > > mst@redhat.com; willemdebruijn.kernel@gmail.com > > Cc: virtualization@lists.linux-foundation.org; Lilijun (Jerry) > > <jerry.lilijun@huawei.com>; chenchanghu <chenchanghu@huawei.com>; > > xudingke <xudingke@huawei.com>; huangbin (J) > > <brian.huangbin@huawei.com> > > Subject: Re: [PATCH net 2/2] vhost_net: fix high cpu load when sendmsg > > fails > > > > > > On 2020/12/15 上午9:48, wangyunjian wrote: > > > From: Yunjian Wang <wangyunjian@huawei.com> > > > > > > Currently we break the loop and wake up the vhost_worker when sendmsg > > > fails. When the worker wakes up again, we'll meet the same error. This > > > will cause high CPU load. To fix this issue, we can skip this > > > description by ignoring the error. When we exceeds sndbuf, the return > > > value of sendmsg is -EAGAIN. In the case we don't skip the description > > > and don't drop packet. > > > > > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > > > --- > > > drivers/vhost/net.c | 21 +++++++++------------ > > > 1 file changed, 9 insertions(+), 12 deletions(-) > > > > > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index > > > c8784dfafdd7..f966592d8900 100644 > > > --- a/drivers/vhost/net.c > > > +++ b/drivers/vhost/net.c > > > @@ -827,16 +827,13 @@ static void handle_tx_copy(struct vhost_net *net, > > struct socket *sock) > > > msg.msg_flags &= ~MSG_MORE; > > > } > > > > > > - /* TODO: Check specific error and bomb out unless ENOBUFS? */ > > > err = sock->ops->sendmsg(sock, &msg, len); > > > - if (unlikely(err < 0)) { > > > + if (unlikely(err == -EAGAIN)) { > > > vhost_discard_vq_desc(vq, 1); > > > vhost_net_enable_vq(net, vq); > > > break; > > > - } > > > > > > As I've pointed out in last version. If you don't discard descriptor, you > > probably > > need to add the head to used ring. Otherwise this descriptor will be always > > inflight that may confuse drivers. > > Sorry for missing the comment. > > After deleting discard descriptor and break, the next processing will be the > same > as the normal success of sendmsg(), and vhost_zerocopy_signal_used() or > vhost_add_used_and_signal() method will be called to add the head to used > ring. It's the next head not the one that contains the buggy packet? Thanks > > Thanks > > > > > > > - if (err != len) > > > - pr_debug("Truncated TX packet: len %d != %zd\n", > > > - err, len); > > > + } else if (unlikely(err < 0 || err != len)) > > > > > > It looks to me err != len covers err < 0. > > OK > > > > > Thanks > > > > > > > + vq_err(vq, "Fail to sending packets err : %d, len : %zd\n", err, > > > +len); > > > done: > > > vq->heads[nvq->done_idx].id = cpu_to_vhost32(vq, head); > > > vq->heads[nvq->done_idx].len = 0; > > > @@ -922,7 +919,6 @@ static void handle_tx_zerocopy(struct vhost_net > > *net, struct socket *sock) > > > msg.msg_flags &= ~MSG_MORE; > > > } > > > > > > - /* TODO: Check specific error and bomb out unless ENOBUFS? */ > > > err = sock->ops->sendmsg(sock, &msg, len); > > > if (unlikely(err < 0)) { > > > if (zcopy_used) { > > > @@ -931,13 +927,14 @@ static void handle_tx_zerocopy(struct vhost_net > > *net, struct socket *sock) > > > nvq->upend_idx = ((unsigned)nvq->upend_idx - 1) > > > % UIO_MAXIOV; > > > } > > > - vhost_discard_vq_desc(vq, 1); > > > - vhost_net_enable_vq(net, vq); > > > - break; > > > + if (err == -EAGAIN) { > > > + vhost_discard_vq_desc(vq, 1); > > > + vhost_net_enable_vq(net, vq); > > > + break; > > > + } > > > } > > > if (err != len) > > > - pr_debug("Truncated TX packet: " > > > - " len %d != %zd\n", err, len); > > > + vq_err(vq, "Fail to sending packets err : %d, len : %zd\n", err, > > > +len); > > > if (!zcopy_used) > > > vhost_add_used_and_signal(&net->dev, vq, head, 0); > > > else > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <34EFBCA9F01B0748BEB6B629CE643AE60DB8408A@DGGEMM533-MBX.china.huawei.com>]
* Re: [PATCH net 2/2] vhost_net: fix high cpu load when sendmsg fails [not found] ` <34EFBCA9F01B0748BEB6B629CE643AE60DB8408A@DGGEMM533-MBX.china.huawei.com> @ 2020-12-16 7:47 ` Jason Wang 0 siblings, 0 replies; 4+ messages in thread From: Jason Wang @ 2020-12-16 7:47 UTC (permalink / raw) To: wangyunjian Cc: willemdebruijn kernel, mst, netdev, Lilijun (Jerry), virtualization, xudingke, huangbin (J), chenchanghu ----- Original Message ----- > > -----Original Message----- > > From: Jason Wang [mailto:jasowang@redhat.com] > > Sent: Wednesday, December 16, 2020 1:57 PM > > To: wangyunjian <wangyunjian@huawei.com> > > Cc: netdev@vger.kernel.org; mst@redhat.com; willemdebruijn kernel > > <willemdebruijn.kernel@gmail.com>; > > virtualization@lists.linux-foundation.org; > > Lilijun (Jerry) <jerry.lilijun@huawei.com>; chenchanghu > > <chenchanghu@huawei.com>; xudingke <xudingke@huawei.com>; huangbin (J) > > <brian.huangbin@huawei.com> > > Subject: Re: [PATCH net 2/2] vhost_net: fix high cpu load when sendmsg > > fails > > > > > > > > ----- Original Message ----- > > > > > > > > > > -----Original Message----- > > > > From: Jason Wang [mailto:jasowang@redhat.com] > > > > Sent: Tuesday, December 15, 2020 12:10 PM > > > > To: wangyunjian <wangyunjian@huawei.com>; netdev@vger.kernel.org; > > > > mst@redhat.com; willemdebruijn.kernel@gmail.com > > > > Cc: virtualization@lists.linux-foundation.org; Lilijun (Jerry) > > > > <jerry.lilijun@huawei.com>; chenchanghu <chenchanghu@huawei.com>; > > > > xudingke <xudingke@huawei.com>; huangbin (J) > > > > <brian.huangbin@huawei.com> > > > > Subject: Re: [PATCH net 2/2] vhost_net: fix high cpu load when sendmsg > > > > fails > > > > > > > > > > > > On 2020/12/15 上午9:48, wangyunjian wrote: > > > > > From: Yunjian Wang <wangyunjian@huawei.com> > > > > > > > > > > Currently we break the loop and wake up the vhost_worker when > > sendmsg > > > > > fails. When the worker wakes up again, we'll meet the same error. > > > > > This > > > > > will cause high CPU load. To fix this issue, we can skip this > > > > > description by ignoring the error. When we exceeds sndbuf, the return > > > > > value of sendmsg is -EAGAIN. In the case we don't skip the > > > > > description > > > > > and don't drop packet. > > > > > > > > > > Signed-off-by: Yunjian Wang <wangyunjian@huawei.com> > > > > > --- > > > > > drivers/vhost/net.c | 21 +++++++++------------ > > > > > 1 file changed, 9 insertions(+), 12 deletions(-) > > > > > > > > > > diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c index > > > > > c8784dfafdd7..f966592d8900 100644 > > > > > --- a/drivers/vhost/net.c > > > > > +++ b/drivers/vhost/net.c > > > > > @@ -827,16 +827,13 @@ static void handle_tx_copy(struct vhost_net > > *net, > > > > struct socket *sock) > > > > > msg.msg_flags &= ~MSG_MORE; > > > > > } > > > > > > > > > > - /* TODO: Check specific error and bomb out unless ENOBUFS? > > */ > > > > > err = sock->ops->sendmsg(sock, &msg, len); > > > > > - if (unlikely(err < 0)) { > > > > > + if (unlikely(err == -EAGAIN)) { > > > > > vhost_discard_vq_desc(vq, 1); > > > > > vhost_net_enable_vq(net, vq); > > > > > break; > > > > > - } > > > > > > > > > > > > As I've pointed out in last version. If you don't discard descriptor, > > > > you > > > > probably > > > > need to add the head to used ring. Otherwise this descriptor will be > > > > always > > > > inflight that may confuse drivers. > > > > > > Sorry for missing the comment. > > > > > > After deleting discard descriptor and break, the next processing will be > > > the > > > same > > > as the normal success of sendmsg(), and vhost_zerocopy_signal_used() or > > > vhost_add_used_and_signal() method will be called to add the head to used > > > ring. > > > > It's the next head not the one that contains the buggy packet? > > In the modified code logic, the head added to used ring is exectly the > one that contains the buggy packet. -ENOTEA :( You're right, I misread the code. Thanks > > Thanks > > > > > Thanks > > > > > > > > Thanks > > > > > > > > > > > > > - if (err != len) > > > > > - pr_debug("Truncated TX packet: len %d != %zd\n", > > > > > - err, len); > > > > > + } else if (unlikely(err < 0 || err != len)) > > > > > > > > > > > > It looks to me err != len covers err < 0. > > > > > > OK > > > > > > > > > > > Thanks > > > > > > > > > > > > > + vq_err(vq, "Fail to sending packets err : %d, len : %zd\n", > > err, > > > > > +len); > > > > > done: > > > > > vq->heads[nvq->done_idx].id = cpu_to_vhost32(vq, head); > > > > > vq->heads[nvq->done_idx].len = 0; > > > > > @@ -922,7 +919,6 @@ static void handle_tx_zerocopy(struct vhost_net > > > > *net, struct socket *sock) > > > > > msg.msg_flags &= ~MSG_MORE; > > > > > } > > > > > > > > > > - /* TODO: Check specific error and bomb out unless ENOBUFS? > > */ > > > > > err = sock->ops->sendmsg(sock, &msg, len); > > > > > if (unlikely(err < 0)) { > > > > > if (zcopy_used) { > > > > > @@ -931,13 +927,14 @@ static void handle_tx_zerocopy(struct > > vhost_net > > > > *net, struct socket *sock) > > > > > nvq->upend_idx = ((unsigned)nvq->upend_idx - 1) > > > > > % UIO_MAXIOV; > > > > > } > > > > > - vhost_discard_vq_desc(vq, 1); > > > > > - vhost_net_enable_vq(net, vq); > > > > > - break; > > > > > + if (err == -EAGAIN) { > > > > > + vhost_discard_vq_desc(vq, 1); > > > > > + vhost_net_enable_vq(net, vq); > > > > > + break; > > > > > + } > > > > > } > > > > > if (err != len) > > > > > - pr_debug("Truncated TX packet: " > > > > > - " len %d != %zd\n", err, len); > > > > > + vq_err(vq, "Fail to sending packets err : %d, len : %zd\n", > > err, > > > > > +len); > > > > > if (!zcopy_used) > > > > > vhost_add_used_and_signal(&net->dev, vq, head, 0); > > > > > else > > > > > > > > _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization ^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-12-16 7:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <cover.1608024547.git.wangyunjian@huawei.com>
[not found] ` <5e2ecf3d0f07b864d307b9f0425b7b7fe8bf4d2c.1608024547.git.wangyunjian@huawei.com>
2020-12-15 2:45 ` [PATCH net 1/2] vhost_net: fix ubuf refcount incorrectly when sendmsg fails Willem de Bruijn
[not found] ` <4be47d3a325983f1bfc39f11f0e015767dd2aa3c.1608024547.git.wangyunjian@huawei.com>
2020-12-15 4:09 ` [PATCH net 2/2] vhost_net: fix high cpu load " Jason Wang
[not found] ` <34EFBCA9F01B0748BEB6B629CE643AE60DB82A73@DGGEMM533-MBX.china.huawei.com>
2020-12-16 5:56 ` Jason Wang
[not found] ` <34EFBCA9F01B0748BEB6B629CE643AE60DB8408A@DGGEMM533-MBX.china.huawei.com>
2020-12-16 7:47 ` Jason Wang
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).