From patchwork Mon Jan 21 17:17:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Shaia X-Patchwork-Id: 214236 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ABF462C007C for ; Tue, 22 Jan 2013 04:18:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756099Ab3AURRz (ORCPT ); Mon, 21 Jan 2013 12:17:55 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:18587 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754726Ab3AURRy convert rfc822-to-8bit (ORCPT ); Mon, 21 Jan 2013 12:17:54 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by aserp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0LHHo4N026921 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Jan 2013 17:17:51 GMT Received: from acsmt356.oracle.com (acsmt356.oracle.com [141.146.40.156]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0LHHntG018408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Jan 2013 17:17:50 GMT Received: from abhmt105.oracle.com (abhmt105.oracle.com [141.146.116.57]) by acsmt356.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0LHHnea018007; Mon, 21 Jan 2013 11:17:49 -0600 MIME-Version: 1.0 Message-ID: <5757e54b-902b-4338-8ac9-43857cd1906c@default> Date: Mon, 21 Jan 2013 09:17:49 -0800 (PST) From: Yuval Shaia To: , , Subject: [PATCH] Add support for netconsole driver used on bridge device with VIF attached X-Mailer: Zimbra on Oracle Beehive Content-Disposition: inline X-Source-IP: ucsinet21.oracle.com [156.151.31.93] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When starting a VM which has virtual interface attached to the same bridge (i.e vif = [type=netfront,bridge=xenbr0'] in vm.cfg) which is used for netconsole the following message appears (after about 60 seconds) and VM creation operation fails. Error: Device 0 (vif) could not be connected. Hotplug scripts not working. Note: When trying to do the opposite, i.e. first create VM and then run netconsole we got the error #524 - vif2.0 doesn't support polling, aborting. As i see it, netconsole driver requires ndo_poll_controller from the device's controlling driver (function __netpoll_setup in net/core/netpoll.c), a thing that is not supported currently in xen_netback driver which is the driver that runs on dom0 and serve VM's virtual interface. The following patch (to latest kernel) fix this bug by adding implementation to ndo_poll_controller. 0001-Add-support-for-netconsole-driver-used-on-bridge-dev.patch 0 2001 From: Yuval Date: Tue, 8 Jan 2013 10:08:45 +0200 Subject: [PATCH] Add support for netconsole driver used on bridge device with VIF attached Signed-off-by: Yuval --- drivers/net/xen-netback/interface.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 601ae2a..10751f5 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c @@ -179,6 +179,13 @@ static u32 xenvif_fix_features(struct net_device *dev, u32 features) return features; } +static void xenvif_poll_controller(struct net_device *dev) +{ + disable_irq(dev->irq); + xenvif_interrupt(dev->irq, dev); + enable_irq(dev->irq); +} + static const struct xenvif_stat { char name[ETH_GSTRING_LEN]; u16 offset; @@ -237,6 +244,7 @@ static const struct net_device_ops xenvif_netdev_ops = { .ndo_stop = xenvif_close, .ndo_change_mtu = xenvif_change_mtu, .ndo_fix_features = xenvif_fix_features, + .ndo_poll_controller = xenvif_poll_controller, }; struct xenvif *xenvif_alloc(struct device *parent, domid_t domid,