From patchwork Mon Jan 21 16:34:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Shaia X-Patchwork-Id: 214207 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 118292C0080 for ; Tue, 22 Jan 2013 03:35:01 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752683Ab3AUQe5 (ORCPT ); Mon, 21 Jan 2013 11:34:57 -0500 Received: from userp1040.oracle.com ([156.151.31.81]:47716 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752338Ab3AUQe4 (ORCPT ); Mon, 21 Jan 2013 11:34:56 -0500 Received: from ucsinet21.oracle.com (ucsinet21.oracle.com [156.151.31.93]) by userp1040.oracle.com (Sentrion-MTA-4.2.2/Sentrion-MTA-4.2.2) with ESMTP id r0LGYmD4031334 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 21 Jan 2013 16:34:49 GMT Received: from acsmt358.oracle.com (acsmt358.oracle.com [141.146.40.158]) by ucsinet21.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id r0LGYlWo009386 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 21 Jan 2013 16:34:48 GMT Received: from abhmt112.oracle.com (abhmt112.oracle.com [141.146.116.64]) by acsmt358.oracle.com (8.12.11.20060308/8.12.11) with ESMTP id r0LGYlKl023821; Mon, 21 Jan 2013 10:34:47 -0600 Received: from [10.175.14.14] (/10.175.14.14) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 21 Jan 2013 08:34:47 -0800 Message-ID: <50FD6E17.1010309@oracle.com> Date: Mon, 21 Jan 2013 18:34:31 +0200 From: yuval.shaia@oracle.com Organization: Oracle Corporation User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:17.0) Gecko/20130107 Thunderbird/17.0.2 MIME-Version: 1.0 To: ian.campbell@citrix.com, xen-devel@lists.xensource.com, netdev@vger.kernel.org Subject: [PATCH] Add support for netconsole driver used on bridge device with, VIF attached 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. 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(+) 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, 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];