From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D036C47404 for ; Mon, 7 Oct 2019 14:04:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F3D4206C2 for ; Mon, 7 Oct 2019 14:04:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cKyDL7AB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727958AbfJGOEO (ORCPT ); Mon, 7 Oct 2019 10:04:14 -0400 Received: from mail-lj1-f196.google.com ([209.85.208.196]:35845 "EHLO mail-lj1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727685AbfJGOEO (ORCPT ); Mon, 7 Oct 2019 10:04:14 -0400 Received: by mail-lj1-f196.google.com with SMTP id v24so13811791ljj.3; Mon, 07 Oct 2019 07:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=7sEOczYia3KOKHGEcMhkwGMtTevaZ3R4NRuGCoRYvdA=; b=cKyDL7ABIR1BUZNmXm35gwM0xfdn5S4tvmbrFqSfzpRqMBMrRRJmldvuXRH2OIH5KR 7Wa5BdkX7uuiZJqDi17puIjACYQqO+BBV6Y/E9ctsbau6M3XPSMGP1unSpNVGwn6ROgC C8/dcdwkbN2TMvoGO8ZJQQJGMh4SHRfosL7+Eu7GHng0xmHIiH+t1vOaON1lyWLL/cl3 E94i1Q8IN2C0+TX6it6guD6PaUgVkVrxLcQlzx5EhPREY2QlKnGaS7fYMfR9BUBNlhtk Mh4y+7Y0qMDe6c+LWH8CL3QGZAqq9lV4L29fSuCD5veS/RtX3WzQLh7w+cm/dxqDpLSa 4Weg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=7sEOczYia3KOKHGEcMhkwGMtTevaZ3R4NRuGCoRYvdA=; b=bQBoNPDmFUJ1urepwQ16FrrcIIxgzfvQaNIkDv7VD35QXHoA7j/uDczg1SwLzGpOJk N/nHRz9KPc6KuSMY25IT5AVSCXnXy9yjT16hnDoqOZWaigkCX7zo2q7xLNArQnjw61fg DCxcpxSkmMAKRk2Kpj0/1ipTs+cfaGm/6moqKTmQd6m9sw7+7gv2JGfLAPJuI7JkUBMI XgT9QWZAGVKv7F5X8GIOEvOC6WzWgw7Sq9qrw54l1zCrKn0TnYDFvu2Hd0qiK3TYKf9W Z3Csmhz6tGJ5PJ9jQskf6MWfdRoGamr7jNh8zbZrCRjg22YC3X9c5zrncP72lJGa1Cta ZZTw== X-Gm-Message-State: APjAAAULrP+mr3evoXoFAzvdxPG7WbUcfMdlFOYaA2j8QOi2AX9diIBC orA0pW0e8qhHFA+5TPaxdLMdrCoxWB3jsB2W9P8tUQ== X-Google-Smtp-Source: APXvYqz9rauiSGXNFl9949c8WXsIKrXSSJ2p9Te0Emowvi+R4IoeeF0Fnh2b41vtw5Od7As9Ba6IikYV7IL9gHnaNt4= X-Received: by 2002:a2e:8ed2:: with SMTP id e18mr9988415ljl.180.1570457049844; Mon, 07 Oct 2019 07:04:09 -0700 (PDT) MIME-Version: 1.0 References: <20191006184515.23048-1-jcfaracco@gmail.com> <20191006184515.23048-3-jcfaracco@gmail.com> <20191007034402-mutt-send-email-mst@kernel.org> In-Reply-To: <20191007034402-mutt-send-email-mst@kernel.org> From: Julio Faracco Date: Mon, 7 Oct 2019 11:03:58 -0300 Message-ID: Subject: Re: [PATCH RFC net-next 2/2] drivers: net: virtio_net: Add tx_timeout function To: "Michael S. Tsirkin" Cc: netdev@vger.kernel.org, Jason Wang , davem@davemloft.net, virtualization@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Daiane Mendes Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em seg, 7 de out de 2019 =C3=A0s 04:51, Michael S. Tsirkin = escreveu: > > On Sun, Oct 06, 2019 at 03:45:15PM -0300, jcfaracco@gmail.com wrote: > > From: Julio Faracco > > > > To enable dev_watchdog, virtio_net should have a tx_timeout defined > > (.ndo_tx_timeout). This is only a skeleton to throw a warn message. It > > notifies the event in some specific queue of device. This function > > still counts tx_timeout statistic and consider this event as an error > > (one error per queue), reporting it. > > > > Signed-off-by: Julio Faracco > > Signed-off-by: Daiane Mendes > > Cc: Jason Wang > > --- > > drivers/net/virtio_net.c | 27 +++++++++++++++++++++++++++ > > 1 file changed, 27 insertions(+) > > > > diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c > > index 27f9b212c9f5..4b703b4b9441 100644 > > --- a/drivers/net/virtio_net.c > > +++ b/drivers/net/virtio_net.c > > @@ -2585,6 +2585,29 @@ static int virtnet_set_features(struct net_devic= e *dev, > > return 0; > > } > > > > +static void virtnet_tx_timeout(struct net_device *dev) > > +{ > > + struct virtnet_info *vi =3D netdev_priv(dev); > > + u32 i; > > + > > + /* find the stopped queue the same way dev_watchdog() does */ > > not really - the watchdog actually looks at trans_start. The comments are wrong. It is the negative logic from dev_watchdog. Watchdog requires queue stopped AND timeout. If the queue is not stopped, this queue does not reached a timeout event. So, continue... Do not report a timeout. > > > + for (i =3D 0; i < vi->curr_queue_pairs; i++) { > > + struct send_queue *sq =3D &vi->sq[i]; > > + > > + if (!netif_xmit_stopped(netdev_get_tx_queue(dev, i))) > > + continue; > > + > > + u64_stats_update_begin(&sq->stats.syncp); > > + sq->stats.tx_timeouts++; > > + u64_stats_update_end(&sq->stats.syncp); > > + > > + netdev_warn(dev, "TX timeout on send queue: %d, sq: %s, v= q: %d, name: %s\n", > > + i, sq->name, sq->vq->index, sq->vq->name); > > this seems to assume any running queue is timed out. > doesn't look right. > > also - there's already a warning in this case in the core. do we need ano= ther one? Here, it can be a debug message if the idea is enhance debugging informatio= n. Other enhancements can be done to enable or disable debug messages. Using ethtool methods for instance. > > > + dev->stats.tx_errors++; > > > > > + } > > +} > > + > > static const struct net_device_ops virtnet_netdev =3D { > > .ndo_open =3D virtnet_open, > > .ndo_stop =3D virtnet_close, > > @@ -2600,6 +2623,7 @@ static const struct net_device_ops virtnet_netdev= =3D { > > .ndo_features_check =3D passthru_features_check, > > .ndo_get_phys_port_name =3D virtnet_get_phys_port_name, > > .ndo_set_features =3D virtnet_set_features, > > + .ndo_tx_timeout =3D virtnet_tx_timeout, > > }; > > > > static void virtnet_config_changed_work(struct work_struct *work) > > @@ -3018,6 +3042,9 @@ static int virtnet_probe(struct virtio_device *vd= ev) > > dev->netdev_ops =3D &virtnet_netdev; > > dev->features =3D NETIF_F_HIGHDMA; > > > > + /* Set up dev_watchdog cycle. */ > > + dev->watchdog_timeo =3D 5 * HZ; > > + > > Seems to be still broken with napi_tx =3D false. > > > dev->ethtool_ops =3D &virtnet_ethtool_ops; > > SET_NETDEV_DEV(dev, &vdev->dev); > > > > -- > > 2.21.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julio Faracco Subject: Re: [PATCH RFC net-next 2/2] drivers: net: virtio_net: Add tx_timeout function Date: Mon, 7 Oct 2019 11:03:58 -0300 Message-ID: References: <20191006184515.23048-1-jcfaracco@gmail.com> <20191006184515.23048-3-jcfaracco@gmail.com> <20191007034402-mutt-send-email-mst@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20191007034402-mutt-send-email-mst@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: virtualization-bounces@lists.linux-foundation.org Errors-To: virtualization-bounces@lists.linux-foundation.org To: "Michael S. Tsirkin" Cc: Daiane Mendes , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org, davem@davemloft.net List-Id: virtualization@lists.linuxfoundation.org RW0gc2VnLCA3IGRlIG91dCBkZSAyMDE5IMOgcyAwNDo1MSwgTWljaGFlbCBTLiBUc2lya2luIDxt c3RAcmVkaGF0LmNvbT4gZXNjcmV2ZXU6Cj4KPiBPbiBTdW4sIE9jdCAwNiwgMjAxOSBhdCAwMzo0 NToxNVBNIC0wMzAwLCBqY2ZhcmFjY29AZ21haWwuY29tIHdyb3RlOgo+ID4gRnJvbTogSnVsaW8g RmFyYWNjbyA8amNmYXJhY2NvQGdtYWlsLmNvbT4KPiA+Cj4gPiBUbyBlbmFibGUgZGV2X3dhdGNo ZG9nLCB2aXJ0aW9fbmV0IHNob3VsZCBoYXZlIGEgdHhfdGltZW91dCBkZWZpbmVkCj4gPiAoLm5k b190eF90aW1lb3V0KS4gVGhpcyBpcyBvbmx5IGEgc2tlbGV0b24gdG8gdGhyb3cgYSB3YXJuIG1l c3NhZ2UuIEl0Cj4gPiBub3RpZmllcyB0aGUgZXZlbnQgaW4gc29tZSBzcGVjaWZpYyBxdWV1ZSBv ZiBkZXZpY2UuIFRoaXMgZnVuY3Rpb24KPiA+IHN0aWxsIGNvdW50cyB0eF90aW1lb3V0IHN0YXRp c3RpYyBhbmQgY29uc2lkZXIgdGhpcyBldmVudCBhcyBhbiBlcnJvcgo+ID4gKG9uZSBlcnJvciBw ZXIgcXVldWUpLCByZXBvcnRpbmcgaXQuCj4gPgo+ID4gU2lnbmVkLW9mZi1ieTogSnVsaW8gRmFy YWNjbyA8amNmYXJhY2NvQGdtYWlsLmNvbT4KPiA+IFNpZ25lZC1vZmYtYnk6IERhaWFuZSBNZW5k ZXMgPGRubWVuZGVzNzZAZ21haWwuY29tPgo+ID4gQ2M6IEphc29uIFdhbmcgPGphc293YW5nQHJl ZGhhdC5jb20+Cj4gPiAtLS0KPiA+ICBkcml2ZXJzL25ldC92aXJ0aW9fbmV0LmMgfCAyNyArKysr KysrKysrKysrKysrKysrKysrKysrKysKPiA+ICAxIGZpbGUgY2hhbmdlZCwgMjcgaW5zZXJ0aW9u cygrKQo+ID4KPiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC92aXJ0aW9fbmV0LmMgYi9kcml2 ZXJzL25ldC92aXJ0aW9fbmV0LmMKPiA+IGluZGV4IDI3ZjliMjEyYzlmNS4uNGI3MDNiNGI5NDQx IDEwMDY0NAo+ID4gLS0tIGEvZHJpdmVycy9uZXQvdmlydGlvX25ldC5jCj4gPiArKysgYi9kcml2 ZXJzL25ldC92aXJ0aW9fbmV0LmMKPiA+IEBAIC0yNTg1LDYgKzI1ODUsMjkgQEAgc3RhdGljIGlu dCB2aXJ0bmV0X3NldF9mZWF0dXJlcyhzdHJ1Y3QgbmV0X2RldmljZSAqZGV2LAo+ID4gICAgICAg cmV0dXJuIDA7Cj4gPiAgfQo+ID4KPiA+ICtzdGF0aWMgdm9pZCB2aXJ0bmV0X3R4X3RpbWVvdXQo c3RydWN0IG5ldF9kZXZpY2UgKmRldikKPiA+ICt7Cj4gPiArICAgICBzdHJ1Y3QgdmlydG5ldF9p bmZvICp2aSA9IG5ldGRldl9wcml2KGRldik7Cj4gPiArICAgICB1MzIgaTsKPiA+ICsKPiA+ICsg ICAgIC8qIGZpbmQgdGhlIHN0b3BwZWQgcXVldWUgdGhlIHNhbWUgd2F5IGRldl93YXRjaGRvZygp IGRvZXMgKi8KPgo+IG5vdCByZWFsbHkgLSB0aGUgd2F0Y2hkb2cgYWN0dWFsbHkgbG9va3MgYXQg dHJhbnNfc3RhcnQuCgpUaGUgY29tbWVudHMgYXJlIHdyb25nLiBJdCBpcyB0aGUgbmVnYXRpdmUg bG9naWMgZnJvbSBkZXZfd2F0Y2hkb2cuCldhdGNoZG9nIHJlcXVpcmVzIHF1ZXVlIHN0b3BwZWQg QU5EIHRpbWVvdXQuCgpJZiB0aGUgcXVldWUgaXMgbm90IHN0b3BwZWQsIHRoaXMgcXVldWUgZG9l cyBub3QgcmVhY2hlZCBhIHRpbWVvdXQgZXZlbnQuClNvLCBjb250aW51ZS4uLiBEbyBub3QgcmVw b3J0IGEgdGltZW91dC4KCj4KPiA+ICsgICAgIGZvciAoaSA9IDA7IGkgPCB2aS0+Y3Vycl9xdWV1 ZV9wYWlyczsgaSsrKSB7Cj4gPiArICAgICAgICAgICAgIHN0cnVjdCBzZW5kX3F1ZXVlICpzcSA9 ICZ2aS0+c3FbaV07Cj4gPiArCj4gPiArICAgICAgICAgICAgIGlmICghbmV0aWZfeG1pdF9zdG9w cGVkKG5ldGRldl9nZXRfdHhfcXVldWUoZGV2LCBpKSkpCj4gPiArICAgICAgICAgICAgICAgICAg ICAgY29udGludWU7Cj4gPiArCj4gPiArICAgICAgICAgICAgIHU2NF9zdGF0c191cGRhdGVfYmVn aW4oJnNxLT5zdGF0cy5zeW5jcCk7Cj4gPiArICAgICAgICAgICAgIHNxLT5zdGF0cy50eF90aW1l b3V0cysrOwo+ID4gKyAgICAgICAgICAgICB1NjRfc3RhdHNfdXBkYXRlX2VuZCgmc3EtPnN0YXRz LnN5bmNwKTsKPiA+ICsKPiA+ICsgICAgICAgICAgICAgbmV0ZGV2X3dhcm4oZGV2LCAiVFggdGlt ZW91dCBvbiBzZW5kIHF1ZXVlOiAlZCwgc3E6ICVzLCB2cTogJWQsIG5hbWU6ICVzXG4iLAo+ID4g KyAgICAgICAgICAgICAgICAgICAgICAgICBpLCBzcS0+bmFtZSwgc3EtPnZxLT5pbmRleCwgc3Et PnZxLT5uYW1lKTsKPgo+IHRoaXMgc2VlbXMgdG8gYXNzdW1lIGFueSBydW5uaW5nIHF1ZXVlIGlz IHRpbWVkIG91dC4KPiBkb2Vzbid0IGxvb2sgcmlnaHQuCj4KPiBhbHNvIC0gdGhlcmUncyBhbHJl YWR5IGEgd2FybmluZyBpbiB0aGlzIGNhc2UgaW4gdGhlIGNvcmUuIGRvIHdlIG5lZWQgYW5vdGhl ciBvbmU/CgpIZXJlLCBpdCBjYW4gYmUgYSBkZWJ1ZyBtZXNzYWdlIGlmIHRoZSBpZGVhIGlzIGVu aGFuY2UgZGVidWdnaW5nIGluZm9ybWF0aW9uLgpPdGhlciBlbmhhbmNlbWVudHMgY2FuIGJlIGRv bmUgdG8gZW5hYmxlIG9yIGRpc2FibGUgZGVidWcgbWVzc2FnZXMuClVzaW5nIGV0aHRvb2wgbWV0 aG9kcyBmb3IgaW5zdGFuY2UuCgo+Cj4gPiArICAgICAgICAgICAgIGRldi0+c3RhdHMudHhfZXJy b3JzKys7Cj4KPgo+Cj4gPiArICAgICB9Cj4gPiArfQo+ID4gKwo+ID4gIHN0YXRpYyBjb25zdCBz dHJ1Y3QgbmV0X2RldmljZV9vcHMgdmlydG5ldF9uZXRkZXYgPSB7Cj4gPiAgICAgICAubmRvX29w ZW4gICAgICAgICAgICA9IHZpcnRuZXRfb3BlbiwKPiA+ICAgICAgIC5uZG9fc3RvcCAgICAgICAg ICAgID0gdmlydG5ldF9jbG9zZSwKPiA+IEBAIC0yNjAwLDYgKzI2MjMsNyBAQCBzdGF0aWMgY29u c3Qgc3RydWN0IG5ldF9kZXZpY2Vfb3BzIHZpcnRuZXRfbmV0ZGV2ID0gewo+ID4gICAgICAgLm5k b19mZWF0dXJlc19jaGVjayAgICAgPSBwYXNzdGhydV9mZWF0dXJlc19jaGVjaywKPiA+ICAgICAg IC5uZG9fZ2V0X3BoeXNfcG9ydF9uYW1lID0gdmlydG5ldF9nZXRfcGh5c19wb3J0X25hbWUsCj4g PiAgICAgICAubmRvX3NldF9mZWF0dXJlcyAgICAgICA9IHZpcnRuZXRfc2V0X2ZlYXR1cmVzLAo+ ID4gKyAgICAgLm5kb190eF90aW1lb3V0ICAgICAgICAgPSB2aXJ0bmV0X3R4X3RpbWVvdXQsCj4g PiAgfTsKPiA+Cj4gPiAgc3RhdGljIHZvaWQgdmlydG5ldF9jb25maWdfY2hhbmdlZF93b3JrKHN0 cnVjdCB3b3JrX3N0cnVjdCAqd29yaykKPiA+IEBAIC0zMDE4LDYgKzMwNDIsOSBAQCBzdGF0aWMg aW50IHZpcnRuZXRfcHJvYmUoc3RydWN0IHZpcnRpb19kZXZpY2UgKnZkZXYpCj4gPiAgICAgICBk ZXYtPm5ldGRldl9vcHMgPSAmdmlydG5ldF9uZXRkZXY7Cj4gPiAgICAgICBkZXYtPmZlYXR1cmVz ID0gTkVUSUZfRl9ISUdIRE1BOwo+ID4KPiA+ICsgICAgIC8qIFNldCB1cCBkZXZfd2F0Y2hkb2cg Y3ljbGUuICovCj4gPiArICAgICBkZXYtPndhdGNoZG9nX3RpbWVvID0gNSAqIEhaOwo+ID4gKwo+ Cj4gU2VlbXMgdG8gYmUgc3RpbGwgYnJva2VuIHdpdGggbmFwaV90eCA9IGZhbHNlLgo+Cj4gPiAg ICAgICBkZXYtPmV0aHRvb2xfb3BzID0gJnZpcnRuZXRfZXRodG9vbF9vcHM7Cj4gPiAgICAgICBT RVRfTkVUREVWX0RFVihkZXYsICZ2ZGV2LT5kZXYpOwo+ID4KPiA+IC0tCj4gPiAyLjIxLjAKX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KVmlydHVhbGl6YXRp b24gbWFpbGluZyBsaXN0ClZpcnR1YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3Jn Cmh0dHBzOi8vbGlzdHMubGludXhmb3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3ZpcnR1 YWxpemF0aW9u