From patchwork Fri Jul 25 15:30:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 34292 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f200.google.com (mail-pd0-f200.google.com [209.85.192.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 437B0235AB for ; Fri, 25 Jul 2014 15:32:21 +0000 (UTC) Received: by mail-pd0-f200.google.com with SMTP id w10sf27828856pde.7 for ; Fri, 25 Jul 2014 08:32:20 -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=M4F0+zbeYy0FDgGIiU5OCqO9Poie7J9Iw7VSOSHhaW8=; b=Xg7vt2hg1Rl8PK1kkpxiK2lBuLppy2+wsfGh9vE+tyooJZe5pOj/fuMdt+7BXeqEuM OHx2yu8Kp0iwsb3debk4ioFR37PP0I09SqJ25kJdBhUedJPIPnzB/WMybewFCdoBegyi xGvF574TrfJeo4QGqbW/IuBwD8eOnx0pAbR7v9mMvWMUjBcZQ3PkCKXpGKVt3jaL9kb1 BYHHJCaQ9xaSi587duzHEwc13XEpLuH3jHfZ8VltWX3lPxQwHPw8GdPEUTv6sHBx1ui0 4fieEycyy8UCeAC6pgBiRjmZrGly6tBiAtLrjG7BA1ImC53R80aEBjsXRSaa96oPUVpG H8Hg== X-Gm-Message-State: ALoCoQmlcZxtLQb9xSvrJt092bLcgVDXq4bSKmwxJL8NIiaqvdSAA0O+UtyimkkOO9QgitXRPHgv X-Received: by 10.66.219.226 with SMTP id pr2mr8395187pac.47.1406302340342; Fri, 25 Jul 2014 08:32:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.82.167 with SMTP id h36ls1309286qgd.77.gmail; Fri, 25 Jul 2014 08:32:20 -0700 (PDT) X-Received: by 10.220.251.134 with SMTP id ms6mr22147106vcb.10.1406302340033; Fri, 25 Jul 2014 08:32:20 -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 da7si7702224vec.28.2014.07.25.08.32.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 25 Jul 2014 08:32:20 -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 hy4so7485868vcb.8 for ; Fri, 25 Jul 2014 08:32:19 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr3320728vca.45.1406302339860; Fri, 25 Jul 2014 08:32:19 -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 tc5csp46684vcb; Fri, 25 Jul 2014 08:32:19 -0700 (PDT) X-Received: by 10.42.110.79 with SMTP id o15mr22570222icp.42.1406302339370; Fri, 25 Jul 2014 08:32:19 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id w4si3739012igr.4.2014.07.25.08.32.18 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 25 Jul 2014 08:32:19 -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 1XAhRt-0004os-Gv; Fri, 25 Jul 2014 15:30:21 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XAhRs-0004om-EH for xen-devel@lists.xenproject.org; Fri, 25 Jul 2014 15:30:20 +0000 Received: from [85.158.143.35:13728] by server-2.bemta-4.messagelabs.com id 4A/6A-04525-B0872D35; Fri, 25 Jul 2014 15:30:19 +0000 X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-14.tower-21.messagelabs.com!1406302218!20271542!1 X-Originating-IP: [209.85.212.172] 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 16602 invoked from network); 25 Jul 2014 15:30:18 -0000 Received: from mail-wi0-f172.google.com (HELO mail-wi0-f172.google.com) (209.85.212.172) by server-14.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 25 Jul 2014 15:30:18 -0000 Received: by mail-wi0-f172.google.com with SMTP id n3so1186691wiv.5 for ; Fri, 25 Jul 2014 08:30:18 -0700 (PDT) X-Received: by 10.194.185.113 with SMTP id fb17mr22790364wjc.117.1406302217216; Fri, 25 Jul 2014 08:30:17 -0700 (PDT) Received: from belegaer.uk.xensource.com ([185.25.64.249]) by mx.google.com with ESMTPSA id fs17sm26143101wjc.6.2014.07.25.08.30.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Jul 2014 08:30:16 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Fri, 25 Jul 2014 16:30:04 +0100 Message-Id: <1406302204-13992-1-git-send-email-julien.grall@linaro.org> X-Mailer: git-send-email 1.7.10.4 Cc: Juergen Gross , Keir Fraser , ian.campbell@citrix.com, Ian Jackson , Dario Faggioli , 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 "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 Cc: George Dunlap Cc: Dario Faggioli Cc: Juergen Gross Cc: Ian Campbell Cc: Ian Jackson Cc: Jan Beulich Cc: Keir Fraser Cc: Tim Deegan Reviewed-by: Dario Faggioli --- This patch should be backported to Xen 4.4 --- 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);