From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932510AbdBGXfY convert rfc822-to-8bit (ORCPT ); Tue, 7 Feb 2017 18:35:24 -0500 Received: from userp1050.oracle.com ([156.151.31.82]:36816 "EHLO userp1050.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754698AbdBGXfM (ORCPT ); Tue, 7 Feb 2017 18:35:12 -0500 Subject: Re: [PATCH v2] xen-netfront: Improve error handling during initialization To: Ross Lagerwall , xen-devel@lists.xenproject.org References: <1486479312-18424-1-git-send-email-ross.lagerwall@citrix.com> Cc: netdev@vger.kernel.org, Juergen Gross , linux-kernel@vger.kernel.org, wei.liu2@citrix.com From: Boris Ostrovsky Message-ID: <7c5ef464-59c7-e99f-7d79-3ecad6dfd6c3@oracle.com> Date: Tue, 7 Feb 2017 18:33:23 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1486479312-18424-1-git-send-email-ross.lagerwall@citrix.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8BIT X-Source-IP: userp1040.oracle.com [156.151.31.81] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 02/07/2017 09:55 AM, Ross Lagerwall wrote: > This fixes a crash when running out of grant refs when creating many > queues across many netdevs. > > * If creating queues fails (i.e. there are no grant refs available), > call xenbus_dev_fatal() to ensure that the xenbus device is set to the > closed state. > * If no queues are created, don't call xennet_disconnect_backend as > netdev->real_num_tx_queues will not have been set correctly. > * If setup_netfront() fails, ensure that all the queues created are > cleaned up, not just those that have been set up. > * If any queues were set up and an error occurs, call > xennet_destroy_queues() to clean up the napi context. > * If any fatal error occurs, unregister and destroy the netdev to avoid > leaving around a half setup network device. > > Signed-off-by: Ross Lagerwall > --- > > Changed in V2: > * Retested on top of v4.10-rc7 + "xen-netfront: Delete rx_refill_timer > in xennet_disconnect_backend()". > * Don't move setup_timer as it is not necessary. > > drivers/net/xen-netfront.c | 33 +++++++++++++++------------------ > 1 file changed, 15 insertions(+), 18 deletions(-) > > diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c > index 722fe9f..5399a86 100644 > --- a/drivers/net/xen-netfront.c > +++ b/drivers/net/xen-netfront.c > @@ -1823,27 +1823,23 @@ static int talk_to_netback(struct xenbus_device *dev, > xennet_destroy_queues(info); > > err = xennet_create_queues(info, &num_queues); > - if (err < 0) > - goto destroy_ring; > + if (err < 0) { > + xenbus_dev_fatal(dev, err, "creating queues"); > + if (num_queues > 0) { > + goto destroy_ring; The only way for us to have (err<0) && (num_queues>0) is when we get a -ENOMEM right at the top, isn't it? So there is nothing to disconnect or destroy, it seems to me. And if that's true you can directly 'goto out'. -boris > + } else { > + kfree(info->queues); > + info->queues = NULL; > + goto out; > + } > + } > > /* Create shared ring, alloc event channel -- for each queue */ > for (i = 0; i < num_queues; ++i) { > queue = &info->queues[i]; > err = setup_netfront(dev, queue, feature_split_evtchn); > - if (err) { > - /* setup_netfront() will tidy up the current > - * queue on error, but we need to clean up > - * those already allocated. > - */ > - if (i > 0) { > - rtnl_lock(); > - netif_set_real_num_tx_queues(info->netdev, i); > - rtnl_unlock(); > - goto destroy_ring; > - } else { > - goto out; > - } > - } > + if (err) > + goto destroy_ring; > } > > again: > @@ -1933,9 +1929,10 @@ static int talk_to_netback(struct xenbus_device *dev, > xenbus_transaction_end(xbt, 1); > destroy_ring: > xennet_disconnect_backend(info); > - kfree(info->queues); > - info->queues = NULL; > + xennet_destroy_queues(info); > out: > + unregister_netdev(info->netdev); > + xennet_free_netdev(info->netdev); > return err; > } > From mboxrd@z Thu Jan 1 00:00:00 1970 From: Boris Ostrovsky Subject: Re: [PATCH v2] xen-netfront: Improve error handling during initialization Date: Tue, 7 Feb 2017 18:33:23 -0500 Message-ID: <7c5ef464-59c7-e99f-7d79-3ecad6dfd6c3@oracle.com> References: <1486479312-18424-1-git-send-email-ross.lagerwall@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Cc: Juergen Gross , netdev@vger.kernel.org, wei.liu2@citrix.com, linux-kernel@vger.kernel.org To: Ross Lagerwall , xen-devel@lists.xenproject.org Return-path: In-Reply-To: <1486479312-18424-1-git-send-email-ross.lagerwall@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" List-Id: netdev.vger.kernel.org T24gMDIvMDcvMjAxNyAwOTo1NSBBTSwgUm9zcyBMYWdlcndhbGwgd3JvdGU6Cj4gVGhpcyBmaXhl cyBhIGNyYXNoIHdoZW4gcnVubmluZyBvdXQgb2YgZ3JhbnQgcmVmcyB3aGVuIGNyZWF0aW5nIG1h bnkKPiBxdWV1ZXMgYWNyb3NzIG1hbnkgbmV0ZGV2cy4KPgo+ICogSWYgY3JlYXRpbmcgcXVldWVz IGZhaWxzIChpLmUuIHRoZXJlIGFyZSBubyBncmFudCByZWZzIGF2YWlsYWJsZSksCj4gY2FsbCB4 ZW5idXNfZGV2X2ZhdGFsKCkgdG8gZW5zdXJlIHRoYXQgdGhlIHhlbmJ1cyBkZXZpY2UgaXMgc2V0 IHRvIHRoZQo+IGNsb3NlZCBzdGF0ZS4KPiAqIElmIG5vIHF1ZXVlcyBhcmUgY3JlYXRlZCwgZG9u J3QgY2FsbCB4ZW5uZXRfZGlzY29ubmVjdF9iYWNrZW5kIGFzCj4gbmV0ZGV2LT5yZWFsX251bV90 eF9xdWV1ZXMgd2lsbCBub3QgaGF2ZSBiZWVuIHNldCBjb3JyZWN0bHkuCj4gKiBJZiBzZXR1cF9u ZXRmcm9udCgpIGZhaWxzLCBlbnN1cmUgdGhhdCBhbGwgdGhlIHF1ZXVlcyBjcmVhdGVkIGFyZQo+ IGNsZWFuZWQgdXAsIG5vdCBqdXN0IHRob3NlIHRoYXQgaGF2ZSBiZWVuIHNldCB1cC4KPiAqIElm IGFueSBxdWV1ZXMgd2VyZSBzZXQgdXAgYW5kIGFuIGVycm9yIG9jY3VycywgY2FsbAo+IHhlbm5l dF9kZXN0cm95X3F1ZXVlcygpIHRvIGNsZWFuIHVwIHRoZSBuYXBpIGNvbnRleHQuCj4gKiBJZiBh bnkgZmF0YWwgZXJyb3Igb2NjdXJzLCB1bnJlZ2lzdGVyIGFuZCBkZXN0cm95IHRoZSBuZXRkZXYg dG8gYXZvaWQKPiBsZWF2aW5nIGFyb3VuZCBhIGhhbGYgc2V0dXAgbmV0d29yayBkZXZpY2UuCj4K PiBTaWduZWQtb2ZmLWJ5OiBSb3NzIExhZ2Vyd2FsbCA8cm9zcy5sYWdlcndhbGxAY2l0cml4LmNv bT4KPiAtLS0KPgo+IENoYW5nZWQgaW4gVjI6Cj4gKiBSZXRlc3RlZCBvbiB0b3Agb2YgdjQuMTAt cmM3ICsgInhlbi1uZXRmcm9udDogRGVsZXRlIHJ4X3JlZmlsbF90aW1lcgo+ICAgaW4geGVubmV0 X2Rpc2Nvbm5lY3RfYmFja2VuZCgpIi4KPiAqIERvbid0IG1vdmUgc2V0dXBfdGltZXIgYXMgaXQg aXMgbm90IG5lY2Vzc2FyeS4KPgo+ICBkcml2ZXJzL25ldC94ZW4tbmV0ZnJvbnQuYyB8IDMzICsr KysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgMTUgaW5z ZXJ0aW9ucygrKSwgMTggZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQv eGVuLW5ldGZyb250LmMgYi9kcml2ZXJzL25ldC94ZW4tbmV0ZnJvbnQuYwo+IGluZGV4IDcyMmZl OWYuLjUzOTlhODYgMTAwNjQ0Cj4gLS0tIGEvZHJpdmVycy9uZXQveGVuLW5ldGZyb250LmMKPiAr KysgYi9kcml2ZXJzL25ldC94ZW4tbmV0ZnJvbnQuYwo+IEBAIC0xODIzLDI3ICsxODIzLDIzIEBA IHN0YXRpYyBpbnQgdGFsa190b19uZXRiYWNrKHN0cnVjdCB4ZW5idXNfZGV2aWNlICpkZXYsCj4g IAkJeGVubmV0X2Rlc3Ryb3lfcXVldWVzKGluZm8pOwo+ICAKPiAgCWVyciA9IHhlbm5ldF9jcmVh dGVfcXVldWVzKGluZm8sICZudW1fcXVldWVzKTsKPiAtCWlmIChlcnIgPCAwKQo+IC0JCWdvdG8g ZGVzdHJveV9yaW5nOwo+ICsJaWYgKGVyciA8IDApIHsKPiArCQl4ZW5idXNfZGV2X2ZhdGFsKGRl diwgZXJyLCAiY3JlYXRpbmcgcXVldWVzIik7Cj4gKwkJaWYgKG51bV9xdWV1ZXMgPiAwKSB7Cj4g KwkJCWdvdG8gZGVzdHJveV9yaW5nOwoKVGhlIG9ubHkgd2F5IGZvciB1cyB0byBoYXZlIChlcnI8 MCkgJiYgKG51bV9xdWV1ZXM+MCkgaXMgd2hlbiB3ZSBnZXQgYQotRU5PTUVNIHJpZ2h0IGF0IHRo ZSB0b3AsIGlzbid0IGl0PyBTbyB0aGVyZSBpcyBub3RoaW5nIHRvIGRpc2Nvbm5lY3Qgb3IKZGVz dHJveSwgaXQgc2VlbXMgdG8gbWUuIEFuZCBpZiB0aGF0J3MgdHJ1ZSB5b3UgY2FuIGRpcmVjdGx5 ICdnb3RvIG91dCcuCgotYm9yaXMKCj4gKwkJfSBlbHNlIHsKPiArCQkJa2ZyZWUoaW5mby0+cXVl dWVzKTsKPiArCQkJaW5mby0+cXVldWVzID0gTlVMTDsKPiArCQkJZ290byBvdXQ7Cj4gKwkJfQo+ ICsJfQo+ICAKPiAgCS8qIENyZWF0ZSBzaGFyZWQgcmluZywgYWxsb2MgZXZlbnQgY2hhbm5lbCAt LSBmb3IgZWFjaCBxdWV1ZSAqLwo+ICAJZm9yIChpID0gMDsgaSA8IG51bV9xdWV1ZXM7ICsraSkg ewo+ICAJCXF1ZXVlID0gJmluZm8tPnF1ZXVlc1tpXTsKPiAgCQllcnIgPSBzZXR1cF9uZXRmcm9u dChkZXYsIHF1ZXVlLCBmZWF0dXJlX3NwbGl0X2V2dGNobik7Cj4gLQkJaWYgKGVycikgewo+IC0J CQkvKiBzZXR1cF9uZXRmcm9udCgpIHdpbGwgdGlkeSB1cCB0aGUgY3VycmVudAo+IC0JCQkgKiBx dWV1ZSBvbiBlcnJvciwgYnV0IHdlIG5lZWQgdG8gY2xlYW4gdXAKPiAtCQkJICogdGhvc2UgYWxy ZWFkeSBhbGxvY2F0ZWQuCj4gLQkJCSAqLwo+IC0JCQlpZiAoaSA+IDApIHsKPiAtCQkJCXJ0bmxf bG9jaygpOwo+IC0JCQkJbmV0aWZfc2V0X3JlYWxfbnVtX3R4X3F1ZXVlcyhpbmZvLT5uZXRkZXYs IGkpOwo+IC0JCQkJcnRubF91bmxvY2soKTsKPiAtCQkJCWdvdG8gZGVzdHJveV9yaW5nOwo+IC0J CQl9IGVsc2Ugewo+IC0JCQkJZ290byBvdXQ7Cj4gLQkJCX0KPiAtCQl9Cj4gKwkJaWYgKGVycikK PiArCQkJZ290byBkZXN0cm95X3Jpbmc7Cj4gIAl9Cj4gIAo+ICBhZ2FpbjoKPiBAQCAtMTkzMyw5 ICsxOTI5LDEwIEBAIHN0YXRpYyBpbnQgdGFsa190b19uZXRiYWNrKHN0cnVjdCB4ZW5idXNfZGV2 aWNlICpkZXYsCj4gIAl4ZW5idXNfdHJhbnNhY3Rpb25fZW5kKHhidCwgMSk7Cj4gICBkZXN0cm95 X3Jpbmc6Cj4gIAl4ZW5uZXRfZGlzY29ubmVjdF9iYWNrZW5kKGluZm8pOwo+IC0Ja2ZyZWUoaW5m by0+cXVldWVzKTsKPiAtCWluZm8tPnF1ZXVlcyA9IE5VTEw7Cj4gKwl4ZW5uZXRfZGVzdHJveV9x dWV1ZXMoaW5mbyk7Cj4gICBvdXQ6Cj4gKwl1bnJlZ2lzdGVyX25ldGRldihpbmZvLT5uZXRkZXYp Owo+ICsJeGVubmV0X2ZyZWVfbmV0ZGV2KGluZm8tPm5ldGRldik7Cj4gIAlyZXR1cm4gZXJyOwo+ ICB9Cj4gIAoKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f XwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8v bGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK