From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH] x86: Avoid tripping watchdog when constructing dom0 Date: Thu, 11 Jun 2015 14:07:23 +0100 Message-ID: <5579880B.1080008@citrix.com> References: <1434027810-27194-1-git-send-email-ross.lagerwall@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1434027810-27194-1-git-send-email-ross.lagerwall@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ross Lagerwall , xen-devel@lists.xen.org Cc: Keir Fraser , Jan Beulich List-Id: xen-devel@lists.xenproject.org On 11/06/15 14:03, Ross Lagerwall wrote: > Constructing dom0 may take a few seconds, particularly if the slow VESA > graphics terminal is used. Process pending softirqs a few times to avoid > tripping a watchdog with a short timeout. > > Signed-off-by: Ross Lagerwall Reviewed-by: Andrew Cooper > --- > xen/arch/x86/domain_build.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c > index 03e4bfe..98d27f2 100644 > --- a/xen/arch/x86/domain_build.c > +++ b/xen/arch/x86/domain_build.c > @@ -930,6 +930,8 @@ int __init construct_dom0( > BUG_ON(d->vcpu[0] == NULL); > BUG_ON(v->is_initialised); > > + process_pending_softirqs(); > + > printk("*** LOADING DOMAIN 0 ***\n"); > > d->max_pages = ~0U; > @@ -946,6 +948,8 @@ int __init construct_dom0( > if ( (rc = elf_xen_parse(&elf, &parms)) != 0 ) > goto out; > > + process_pending_softirqs(); > + > /* compatibility check */ > compatible = 0; > compat32 = 0; > @@ -1167,6 +1171,8 @@ int __init construct_dom0( > _p(v_start), _p(v_end)); > printk(" ENTRY ADDRESS: %p\n", _p(parms.virt_entry)); > > + process_pending_softirqs(); > + > mpt_alloc = (vpt_start - v_start) + pfn_to_paddr(alloc_spfn); > if ( vinitrd_start ) > mpt_alloc -= PAGE_ALIGN(initrd_len);