From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752134AbdBTAMW (ORCPT ); Sun, 19 Feb 2017 19:12:22 -0500 Received: from mx1.redhat.com ([209.132.183.28]:47192 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751684AbdBTAMU (ORCPT ); Sun, 19 Feb 2017 19:12:20 -0500 Date: Mon, 20 Feb 2017 02:12:18 +0200 From: "Michael S. Tsirkin" To: John Fastabend Cc: Jason Wang , virtualization@lists.linux-foundation.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH net-next] virito-net: set queues after reset during xdp_set Message-ID: <20170220013627-mutt-send-email-mst@kernel.org> References: <1487149689-28957-1-git-send-email-jasowang@redhat.com> <58A681E7.80907@gmail.com> <58A787AB.6000201@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <58A787AB.6000201@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Mon, 20 Feb 2017 00:12:21 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, Feb 17, 2017 at 03:30:51PM -0800, John Fastabend wrote: > On 17-02-16 09:10 PM, Jason Wang wrote: > > > > > > On 2017年02月17日 12:53, John Fastabend wrote: > >> On 17-02-15 01:08 AM, Jason Wang wrote: > >>> We set queues before reset which will cause a crash[1]. This is > >>> because is_xdp_raw_buffer_queue() depends on the old xdp queue pairs > >>> number to do the correct detection. So fix this by: > >>> > >>> - set queues after reset, to keep the old vi->curr_queue_pairs. (in > >>> fact setting queues before reset does not works since after feature > >>> set, all queue pairs were enabled by default during reset). > >>> - change xdp_queue_pairs only after virtnet_reset() is succeed. > >>> > >>> [1] > >> I'm guessing this occurs when enabling XDP while receiving lots of traffic? > > > > I hit this then disabling XDP while receiving lots of traffic. > > > > [...] > > >>> + vi->xdp_queue_pairs = xdp_qp; > >> But xdp_queue_pairs is being used to detect if we should allocate the XDP > >> headroom. If we move it here do we have a set of buffers in the ring without > >> the proper headroom when we assign the xdp program below? > > > > Right, so how about passing xdp_queue_pairs as a parameter to virtnet_reset(). > > Then virtnet_reset() can set it after _remove_vq_common() but before > > virtnet_restore_up()? > > > > Thanks > > > > Sounds like a reasonable fix to me. I'm fine with that. > >> > >>> + } > >>> + > >>> + err = _virtnet_set_queues(vi, curr_qp + xdp_qp); > >>> + if (err) { > >>> + dev_warn(&dev->dev, "XDP Device queue allocation failure.\n"); > >>> + goto virtio_queue_err; > >>> } > >>> netif_set_real_num_rx_queues(dev, curr_qp + xdp_qp); > >>> @@ -1844,17 +1844,18 @@ static int virtnet_xdp_set(struct net_device *dev, > >>> struct bpf_prog *prog) > >>> return 0; > >> Thanks, > >> John > >> > > From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael S. Tsirkin" Subject: Re: [PATCH net-next] virito-net: set queues after reset during xdp_set Date: Mon, 20 Feb 2017 02:12:18 +0200 Message-ID: <20170220013627-mutt-send-email-mst@kernel.org> References: <1487149689-28957-1-git-send-email-jasowang@redhat.com> <58A681E7.80907@gmail.com> <58A787AB.6000201@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org To: John Fastabend Return-path: Content-Disposition: inline In-Reply-To: <58A787AB.6000201@gmail.com> 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 List-Id: netdev.vger.kernel.org T24gRnJpLCBGZWIgMTcsIDIwMTcgYXQgMDM6MzA6NTFQTSAtMDgwMCwgSm9obiBGYXN0YWJlbmQg d3JvdGU6Cj4gT24gMTctMDItMTYgMDk6MTAgUE0sIEphc29uIFdhbmcgd3JvdGU6Cj4gPiAKPiA+ IAo+ID4gT24gMjAxN+W5tDAy5pyIMTfml6UgMTI6NTMsIEpvaG4gRmFzdGFiZW5kIHdyb3RlOgo+ ID4+IE9uIDE3LTAyLTE1IDAxOjA4IEFNLCBKYXNvbiBXYW5nIHdyb3RlOgo+ID4+PiBXZSBzZXQg cXVldWVzIGJlZm9yZSByZXNldCB3aGljaCB3aWxsIGNhdXNlIGEgY3Jhc2hbMV0uIFRoaXMgaXMK PiA+Pj4gYmVjYXVzZSBpc194ZHBfcmF3X2J1ZmZlcl9xdWV1ZSgpIGRlcGVuZHMgb24gdGhlIG9s ZCB4ZHAgcXVldWUgcGFpcnMKPiA+Pj4gbnVtYmVyIHRvIGRvIHRoZSBjb3JyZWN0IGRldGVjdGlv bi4gU28gZml4IHRoaXMgYnk6Cj4gPj4+Cj4gPj4+IC0gc2V0IHF1ZXVlcyBhZnRlciByZXNldCwg dG8ga2VlcCB0aGUgb2xkIHZpLT5jdXJyX3F1ZXVlX3BhaXJzLiAoaW4KPiA+Pj4gICAgZmFjdCBz ZXR0aW5nIHF1ZXVlcyBiZWZvcmUgcmVzZXQgZG9lcyBub3Qgd29ya3Mgc2luY2UgYWZ0ZXIgZmVh dHVyZQo+ID4+PiAgICBzZXQsIGFsbCBxdWV1ZSBwYWlycyB3ZXJlIGVuYWJsZWQgYnkgZGVmYXVs dCBkdXJpbmcgcmVzZXQpLgo+ID4+PiAtIGNoYW5nZSB4ZHBfcXVldWVfcGFpcnMgb25seSBhZnRl ciB2aXJ0bmV0X3Jlc2V0KCkgaXMgc3VjY2VlZC4KPiA+Pj4KPiA+Pj4gWzFdCj4gPj4gSSdtIGd1 ZXNzaW5nIHRoaXMgb2NjdXJzIHdoZW4gZW5hYmxpbmcgWERQIHdoaWxlIHJlY2VpdmluZyBsb3Rz IG9mIHRyYWZmaWM/Cj4gPiAKPiA+IEkgaGl0IHRoaXMgdGhlbiBkaXNhYmxpbmcgWERQIHdoaWxl IHJlY2VpdmluZyBsb3RzIG9mIHRyYWZmaWMuCj4gPiAKPiAKPiBbLi4uXQo+IAo+ID4+PiArICAg ICAgICB2aS0+eGRwX3F1ZXVlX3BhaXJzID0geGRwX3FwOwo+ID4+IEJ1dCB4ZHBfcXVldWVfcGFp cnMgaXMgYmVpbmcgdXNlZCB0byBkZXRlY3QgaWYgd2Ugc2hvdWxkIGFsbG9jYXRlIHRoZSBYRFAK PiA+PiBoZWFkcm9vbS4gSWYgd2UgbW92ZSBpdCBoZXJlIGRvIHdlIGhhdmUgYSBzZXQgb2YgYnVm ZmVycyBpbiB0aGUgcmluZyB3aXRob3V0Cj4gPj4gdGhlIHByb3BlciBoZWFkcm9vbSB3aGVuIHdl IGFzc2lnbiB0aGUgeGRwIHByb2dyYW0gYmVsb3c/Cj4gPiAKPiA+IFJpZ2h0LCBzbyBob3cgYWJv dXQgcGFzc2luZyB4ZHBfcXVldWVfcGFpcnMgYXMgYSBwYXJhbWV0ZXIgdG8gdmlydG5ldF9yZXNl dCgpLgo+ID4gVGhlbiB2aXJ0bmV0X3Jlc2V0KCkgY2FuIHNldCBpdCBhZnRlciBfcmVtb3ZlX3Zx X2NvbW1vbigpIGJ1dCBiZWZvcmUKPiA+IHZpcnRuZXRfcmVzdG9yZV91cCgpPwo+ID4gCj4gPiBU aGFua3MKPiA+IAo+IAo+IFNvdW5kcyBsaWtlIGEgcmVhc29uYWJsZSBmaXggdG8gbWUuCgpJJ20g ZmluZSB3aXRoIHRoYXQuCgo+ID4+Cj4gPj4+ICsgICAgfQo+ID4+PiArCj4gPj4+ICsgICAgZXJy ID0gX3ZpcnRuZXRfc2V0X3F1ZXVlcyh2aSwgY3Vycl9xcCArIHhkcF9xcCk7Cj4gPj4+ICsgICAg aWYgKGVycikgewo+ID4+PiArICAgICAgICBkZXZfd2FybigmZGV2LT5kZXYsICJYRFAgRGV2aWNl IHF1ZXVlIGFsbG9jYXRpb24gZmFpbHVyZS5cbiIpOwo+ID4+PiArICAgICAgICBnb3RvIHZpcnRp b19xdWV1ZV9lcnI7Cj4gPj4+ICAgICAgIH0KPiA+Pj4gICAgICAgICBuZXRpZl9zZXRfcmVhbF9u dW1fcnhfcXVldWVzKGRldiwgY3Vycl9xcCArIHhkcF9xcCk7Cj4gPj4+IEBAIC0xODQ0LDE3ICsx ODQ0LDE4IEBAIHN0YXRpYyBpbnQgdmlydG5ldF94ZHBfc2V0KHN0cnVjdCBuZXRfZGV2aWNlICpk ZXYsCj4gPj4+IHN0cnVjdCBicGZfcHJvZyAqcHJvZykKPiA+Pj4gICAgICAgICByZXR1cm4gMDsK PiA+PiBUaGFua3MsCj4gPj4gSm9obgo+ID4+Cj4gPiAKX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX18KVmlydHVhbGl6YXRpb24gbWFpbGluZyBsaXN0ClZpcnR1 YWxpemF0aW9uQGxpc3RzLmxpbnV4LWZvdW5kYXRpb24ub3JnCmh0dHBzOi8vbGlzdHMubGludXhm b3VuZGF0aW9uLm9yZy9tYWlsbWFuL2xpc3RpbmZvL3ZpcnR1YWxpemF0aW9u