From patchwork Fri Aug 1 14:52:39 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 34708 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 13F65202A1 for ; Fri, 1 Aug 2014 14:54:45 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf20452817oag.4 for ; Fri, 01 Aug 2014 07:54:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:cc:subject :precedence:list-id:list-unsubscribe:list-post:list-help :list-subscribe:mime-version:sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:list-archive :content-type:content-transfer-encoding; bh=p/NI7A6d21sqQrW3py50Y6DXldNnqnEkKWMKkz1Ut1c=; b=SzDeLTnFfPJYMSpUIo3XGz7xi7MF/B18SOVKsyP77PzBOrjXh2ysYXpTZBaN3gwJBy +K/G0iZPdBrewoRKVBNjR6CoaRhzSp08W8iNwCODzWhzAMjeXJ3K7fdZ+jrscxzrtMGI Oqv+DgacvVEaQYqDitKaK07O1H8gcLxAIx7OYbh8k0Fzul7RIBE3BbVSnU1Y8j2SEHsw AOrLPEh6u2gqopdnimm4J0eheDYkHkRaLq+yYVDI36lvzlage0EbrbKYhx9O59dtQXIh FH1Yjo2pVgwWPWggkvm2imZYtvDU/GLiYogEFQvHJla4XYaejXOOVosFS++vOrUXb2LW s+qA== X-Gm-Message-State: ALoCoQkqZpRx0vKimlYPBBDK/rfYd3z3ElrGAST7JKTvfYIOGlgbveqf/gonEZaF17GJQBxG7aX1 X-Received: by 10.182.107.135 with SMTP id hc7mr2323641obb.48.1406904884494; Fri, 01 Aug 2014 07:54:44 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.83.50 with SMTP id i47ls1368584qgd.38.gmail; Fri, 01 Aug 2014 07:54:44 -0700 (PDT) X-Received: by 10.52.137.51 with SMTP id qf19mr2084534vdb.97.1406904884293; Fri, 01 Aug 2014 07:54:44 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id hf3si7447551veb.101.2014.08.01.07.54.44 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:54:44 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so6694225vcb.22 for ; Fri, 01 Aug 2014 07:54:44 -0700 (PDT) X-Received: by 10.220.50.8 with SMTP id x8mr6884482vcf.18.1406904884212; Fri, 01 Aug 2014 07:54:44 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp117117vcb; Fri, 1 Aug 2014 07:54:43 -0700 (PDT) X-Received: by 10.42.214.207 with SMTP id hb15mr7826822icb.30.1406904883240; Fri, 01 Aug 2014 07:54:43 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id dr20si22856240icb.98.2014.08.01.07.54.42 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 01 Aug 2014 07:54:43 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XDECM-0008Ij-8S; Fri, 01 Aug 2014 14:52:46 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XDECK-0008IT-QK for xen-devel@lists.xenproject.org; Fri, 01 Aug 2014 14:52:44 +0000 Received: from [85.158.137.68:61299] by server-2.bemta-3.messagelabs.com id CF/A5-09149-CB9ABD35; Fri, 01 Aug 2014 14:52:44 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-3.tower-31.messagelabs.com!1406904763!11390519!1 X-Originating-IP: [209.85.212.182] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 24989 invoked from network); 1 Aug 2014 14:52:43 -0000 Received: from mail-wi0-f182.google.com (HELO mail-wi0-f182.google.com) (209.85.212.182) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 1 Aug 2014 14:52:43 -0000 Received: by mail-wi0-f182.google.com with SMTP id d1so1496942wiv.15 for ; Fri, 01 Aug 2014 07:52:43 -0700 (PDT) X-Received: by 10.194.6.101 with SMTP id z5mr8967871wjz.79.1406904762887; Fri, 01 Aug 2014 07:52:42 -0700 (PDT) Received: from localhost.localdomain (cpc8-cmbg15-2-0-cust169.5-4.cable.virginm.net. [86.30.140.170]) by mx.google.com with ESMTPSA id 19sm21468056wjz.3.2014.08.01.07.52.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Aug 2014 07:52:41 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 1 Aug 2014 15:52:39 +0100 Message-Id: <1406904759-3833-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.9.3 Cc: Juergen Gross , Keir Fraser , ian.campbell@citrix.com, Ian Jackson , Julien Grall , tim@xen.org, George Dunlap , stefano.stabellini@citrix.com, Jan Beulich Subject: [Xen-devel] [PATCH] xen: domain_update_node_affinity: Correct the ASSERT X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: julien.grall@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: The commit bac6334b5 "move domain to cpupool0 before destroying it" make Xen crashes when a domain is destroyed with d->vcpus allocated but no VCPU initialized. Assertion '!cpumask_empty(dom_cpumask)' failed at domain.c:452 Xen call trace: [<00207bd8>] domain_update_node_affinity+0x10c/0x238 (PC) [<00000004>] 00000004 (LR) [<00226870>] sched_move_domain+0x3cc/0x42c [<0020925c>] domain_kill+0xc8/0x178 [<00206a0c>] do_domctl+0xaac/0x15e4 [<002529c0>] do_trap_hypervisor+0xc5c/0xf94 [<002559f0>] return_from_trap+0/0x4 Fix the ASSERT to check if d->vcpu is allocated and VCPU 0 is initialized. Signed-off-by: Julien Grall Reviewed-by: Dario Faggioli Cc: George Dunlap Cc: Juergen Gross Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan --- This patch should be backported to Xen 4.4 Changes in v2: - Add specify the offended commit ID in the message --- xen/common/domain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/domain.c b/xen/common/domain.c index d7a84cf..188b769 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -449,7 +449,7 @@ void domain_update_node_affinity(struct domain *d) } /* Filter out non-online cpus */ cpumask_and(dom_cpumask, dom_cpumask, online); - ASSERT(!cpumask_empty(dom_cpumask)); + ASSERT( !d->vcpu || !d->vcpu[0] || !cpumask_empty(dom_cpumask)); /* And compute the intersection between hard, online and soft */ cpumask_and(dom_cpumask_soft, dom_cpumask_soft, dom_cpumask);