From patchwork Thu Feb 8 09:42:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 870782 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zcYD91C1yz9sNx for ; Thu, 8 Feb 2018 20:43:37 +1100 (AEDT) Received: from localhost ([::1]:35872 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejijv-0002eI-7A for incoming@patchwork.ozlabs.org; Thu, 08 Feb 2018 04:43:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57104) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ejijO-0002dc-78 for qemu-devel@nongnu.org; Thu, 08 Feb 2018 04:43:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ejijL-0001jb-2O for qemu-devel@nongnu.org; Thu, 08 Feb 2018 04:43:02 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:41256 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ejijK-0001jM-UR; Thu, 08 Feb 2018 04:42:59 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3579387AD2; Thu, 8 Feb 2018 09:42:48 +0000 (UTC) Received: from thinkpad.redhat.com (ovpn-204-80.brq.redhat.com [10.40.204.80]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2630B1006EA5; Thu, 8 Feb 2018 09:42:41 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Date: Thu, 8 Feb 2018 10:42:41 +0100 Message-Id: <20180208094241.13839-1-lvivier@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 08 Feb 2018 09:42:48 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.1]); Thu, 08 Feb 2018 09:42:48 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lvivier@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2] spapr: check smp_threads <= vsmt X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-ppc@nongnu.org, Greg Kurz , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We ignore silently the value of smp_threads when we set the default VSMT value, and if smp_threads is greater than VSMT kernel is going into trouble later. Fixes: 8904e5a750 ("spapr: Adjust default VSMT value for better migration compatibility") Signed-off-by: Laurent Vivier Reviewed-by: Greg Kurz --- Notes: v2: display a specific error message when the default VSMT is used fix subject hw/ppc/spapr.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 32a876be56..11de276cd5 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2311,6 +2311,12 @@ static void spapr_set_vsmt_mode(sPAPRMachineState *spapr, Error **errp) * overwhelmingly common case in production systems. */ spapr->vsmt = 8; + if (spapr->vsmt < smp_threads) { + error_setg(&local_err, "Cannot support %d threads/core" + " because it must be <= to default VSMT mode (%d)", + smp_threads, spapr->vsmt); + goto out; + } } /* KVM: If necessary, set the SMT mode: */