From patchwork Wed Feb 1 15:50:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Lagerwall X-Patchwork-Id: 9550005 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A035B60415 for ; Wed, 1 Feb 2017 15:53:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FB6D28449 for ; Wed, 1 Feb 2017 15:53:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 826652845B; Wed, 1 Feb 2017 15:53:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 34DF128449 for ; Wed, 1 Feb 2017 15:53:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYxBl-0000rt-R0; Wed, 01 Feb 2017 15:51:17 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYxBk-0000rn-KE for xen-devel@lists.xenproject.org; Wed, 01 Feb 2017 15:51:16 +0000 Received: from [85.158.143.35] by server-9.bemta-6.messagelabs.com id DD/54-27165-3F302985; Wed, 01 Feb 2017 15:51:15 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrDLMWRWlGSWpSXmKPExsXitHSDve5n5kk RBhdmyFt83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBnP3yxmLVgjUXHs7lW2BsZpIl2MnBwSAv4S m7euZQGx2QQMJG5d+s7cxcjBISKgInF7r0EXIxcHs8AFRomf304wgtQIC3hLHJz+lQmkhgWoZ tZjHpAwr4CHxJb58xghRspJ3DzXyQxiCwmoSbxdfoYFokZQ4uTMJ2A2s4CExMEXL5gnMHLPQp KahSS1gJFpFaNGcWpRWWqRrqGhXlJRZnpGSW5iZo6uoYGZXm5qcXFiempOYlKxXnJ+7iZGYCg wAMEOxk/LAg4xSnIwKYnyxj+YGCHEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgreFaVKEkGBRanpq RVpmDjAoYdISHDxKIry5IGne4oLE3OLMdIjUKUZFKXHeFJCEAEgiozQPrg0WCZcYZaWEeRmBD hHiKUgtys0sQZV/xSjOwagkzNsHMoUnM68EbvoroMVMQIvdX/WBLC5JREhJNTCy/91QoVVz6H 1mtoP75Y644IT3NrYBCxeZMYr4XGRbdWvHp8z+kOg7f31vsJ+NTV1yu4hhcd/noNtb1/Vef+D P2Dh5eqnyzp98l3UPLBErj7+kenb/qzte5XKHJN5uT+q0K57369MFxv12x5JXSFrs+hGgtUnK w+PhraWtkf5HjF5cjPg/0e+lEktxRqKhFnNRcSIAMUCVMX8CAAA= X-Env-Sender: prvs=198257350=ross.lagerwall@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1485964273!48968995!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11145 invoked from network); 1 Feb 2017 15:51:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 1 Feb 2017 15:51:15 -0000 X-IronPort-AV: E=Sophos;i="5.33,320,1477958400"; d="scan'208";a="412383267" From: Ross Lagerwall To: Date: Wed, 1 Feb 2017 15:50:22 +0000 Message-ID: <1485964222-1501-1-git-send-email-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 Cc: Juergen Gross , wei.liu2@citrix.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Ross Lagerwall , Boris Ostrovsky Subject: [Xen-devel] [PATCH] xen-netfront: Improve error handling during initialization X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Improve error handling during initialization. This fixes a crash when running out of grant refs when creating many queues across many netdevs. * Delay timer creation so that if initializing a queue fails, the timer has not been setup yet. * 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 stop the timer and 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 --- drivers/net/xen-netfront.c | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 8315fe7..8ca85af 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1596,9 +1596,6 @@ static int xennet_init_queue(struct netfront_queue *queue) spin_lock_init(&queue->tx_lock); spin_lock_init(&queue->rx_lock); - setup_timer(&queue->rx_refill_timer, rx_refill_timeout, - (unsigned long)queue); - snprintf(queue->name, sizeof(queue->name), "%s-q%u", queue->info->netdev->name, queue->id); @@ -1632,6 +1629,9 @@ static int xennet_init_queue(struct netfront_queue *queue) goto exit_free_tx; } + setup_timer(&queue->rx_refill_timer, rx_refill_timeout, + (unsigned long)queue); + return 0; exit_free_tx: @@ -1822,27 +1822,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; + } 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: @@ -1932,9 +1928,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; }