From patchwork Thu Dec 30 12:56:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joe Jin X-Patchwork-Id: 440641 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oBUMBEnV000490 for ; Thu, 30 Dec 2010 22:12:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752048Ab0L3M5c (ORCPT ); Thu, 30 Dec 2010 07:57:32 -0500 Received: from rcsinet10.oracle.com ([148.87.113.121]:26368 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751064Ab0L3M5b (ORCPT ); Thu, 30 Dec 2010 07:57:31 -0500 Received: from rcsinet13.oracle.com (rcsinet13.oracle.com [148.87.113.125]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id oBUCvNJA018973 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 30 Dec 2010 12:57:24 GMT Received: from acsmt353.oracle.com (acsmt353.oracle.com [141.146.40.153]) by rcsinet13.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id oBUCKu4w029064; Thu, 30 Dec 2010 12:57:22 GMT Received: from abhmt002.oracle.com by acsmt355.oracle.com with ESMTP id 890048831293713784; Thu, 30 Dec 2010 04:56:24 -0800 Received: from stbeehive.oracle.com (/10.182.120.49) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Thu, 30 Dec 2010 04:56:23 -0800 Date: Thu, 30 Dec 2010 20:56:16 +0800 From: Joe Jin To: jeremy@goop.org, ian.campbell@citrix.com, Andrew Morton Cc: linux-fbdev@vger.kernel.org, xen-devel@lists.xensource.com, linux-kernel@vger.kernel.org, gurudas.pai@oracle.com, greg.marsden@oracle.com, guru.anbalagane@oracle.com, joe.jin@oracle.com Subject: [patch] xenfb: fix xenfb suspend/resume race Message-ID: <20101230125616.GA31537@joejin-pc.cn.oracle.com> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i Sender: linux-fbdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Dec 2010 22:12:56 +0000 (UTC) diff --git a/drivers/video/xen-fbfront.c b/drivers/video/xen-fbfront.c index dc72563..367fb1c 100644 --- a/drivers/video/xen-fbfront.c +++ b/drivers/video/xen-fbfront.c @@ -561,26 +561,24 @@ static void xenfb_init_shared_page(struct xenfb_info *info, static int xenfb_connect_backend(struct xenbus_device *dev, struct xenfb_info *info) { - int ret, evtchn; + int ret, evtchn, irq; struct xenbus_transaction xbt; ret = xenbus_alloc_evtchn(dev, &evtchn); if (ret) return ret; - ret = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler, + irq = bind_evtchn_to_irqhandler(evtchn, xenfb_event_handler, 0, dev->devicetype, info); - if (ret < 0) { + if (irq < 0) { xenbus_free_evtchn(dev, evtchn); xenbus_dev_fatal(dev, ret, "bind_evtchn_to_irqhandler"); - return ret; + return irq; } - info->irq = ret; - again: ret = xenbus_transaction_start(&xbt); if (ret) { xenbus_dev_fatal(dev, ret, "starting transaction"); - return ret; + goto unbind_irq; } ret = xenbus_printf(xbt, dev->nodename, "page-ref", "%lu", virt_to_mfn(info->page)); @@ -602,15 +600,20 @@ static int xenfb_connect_backend(struct xenbus_device *dev, if (ret == -EAGAIN) goto again; xenbus_dev_fatal(dev, ret, "completing transaction"); - return ret; + goto unbind_irq; } xenbus_switch_state(dev, XenbusStateInitialised); + info->irq = irq; return 0; error_xenbus: xenbus_transaction_end(xbt, 1); xenbus_dev_fatal(dev, ret, "writing xenstore"); + unbind_irq: + printk(KERN_ERR "xenfb_connect_backend failed!\n"); + unbind_from_irqhandler(irq, info); + xenbus_free_evtchn(dev, evtchn); return ret; }