From patchwork Fri Nov 8 15:40:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1192007 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.b="bEmk9xP1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 478l3X0p3xz9sNT for ; Sat, 9 Nov 2019 02:45:44 +1100 (AEDT) Received: from localhost ([::1]:56590 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT6SD-0001AY-JH for incoming@patchwork.ozlabs.org; Fri, 08 Nov 2019 10:45:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53177) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iT6NT-0005HV-Rd for qemu-devel@nongnu.org; Fri, 08 Nov 2019 10:40:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iT6NS-0008Ob-Oz for qemu-devel@nongnu.org; Fri, 08 Nov 2019 10:40:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:37023 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iT6NS-0008OI-Le for qemu-devel@nongnu.org; Fri, 08 Nov 2019 10:40:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573227646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q9MqMidwocG5LVaShmKq/hsFgYzFcJ9+Fw5EvQqr+60=; b=bEmk9xP17kgiK0bMqPaDq52AJ7bFX864FX40Otj/MpIkIh4XnWooZFUk7QeTSb5bjctjWa 7sbnGGuREUjWXTd3dDgKkxYIJYO8+22vW3Y9kTOw6mmGZV0zufR5fMW4CCnFaZWRrJ1jXW orHCUuL9qyNHrGiGh1RCHAL8OJPXSJ4= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-88-hN3oEJEQOoOv7w6KXFZf0Q-1; Fri, 08 Nov 2019 10:40:42 -0500 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 95E25107ACC4; Fri, 8 Nov 2019 15:40:41 +0000 (UTC) Received: from thinkpad.redhat.com (unknown [10.36.117.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id D49FC5DA81; Fri, 8 Nov 2019 15:40:36 +0000 (UTC) From: Laurent Vivier To: qemu-devel@nongnu.org Subject: [PATCH] spapr: Fix VSMT mode when it is not supported by the kernel Date: Fri, 8 Nov 2019 16:40:35 +0100 Message-Id: <20191108154035.12913-1-lvivier@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-MC-Unique: hN3oEJEQOoOv7w6KXFZf0Q-1 X-Mimecast-Spam-Score: 0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , =?utf-8?b?THVrw6HFoSBEb2t0b3I=?= , Juan Quintela , Greg Kurz , "Dr . David Alan Gilbert" , qemu-ppc@nongnu.org, clg@kaod.org, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Commit 29cb4187497d sets by default the VSMT to smp_threads, but older kernels (< 4.13) don't support that. We can reasonably restore previous behavior with this kernel to allow to run QEMU as before. If VSMT is not supported, VSMT will be set to MAX(8, smp_threads) as it is done for previous machine types (< pseries-4.2) Fixes: 29cb4187497d ("spapr: Set VSMT to smp_threads by default") Cc: groug@kaod.org Reported-by: Lukáš Doktor Signed-off-by: Laurent Vivier --- hw/ppc/spapr.c | 2 +- target/ppc/kvm.c | 5 +++++ target/ppc/kvm_ppc.h | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 94f9d27096af..f6c8ad1eda32 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2522,7 +2522,7 @@ static void spapr_set_vsmt_mode(SpaprMachineState *spapr, Error **errp) goto out; } /* In this case, spapr->vsmt has been set by the command line */ - } else if (!smc->smp_threads_vsmt) { + } else if (!smc->smp_threads_vsmt || !kvmppc_check_smt_possible()) { /* * Default VSMT value is tricky, because we need it to be as * consistent as possible (for migration), but this requires diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 7d2e8969ac5f..40ed59881167 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2060,6 +2060,11 @@ void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy) } } +bool kvmppc_check_smt_possible(void) +{ + return kvm_enabled() && cap_ppc_smt_possible; +} + int kvmppc_smt_threads(void) { return cap_ppc_smt ? cap_ppc_smt : 1; diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h index 98bd7d5da6d6..c9629a416b0b 100644 --- a/target/ppc/kvm_ppc.h +++ b/target/ppc/kvm_ppc.h @@ -27,6 +27,7 @@ void kvmppc_enable_h_page_init(void); void kvmppc_set_papr(PowerPCCPU *cpu); int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr); void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy); +bool kvmppc_check_smt_possible(void); int kvmppc_smt_threads(void); void kvmppc_hint_smt_possible(Error **errp); int kvmppc_set_smt_threads(int smt); @@ -159,6 +160,11 @@ static inline void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy) { } +static inline bool kvmppc_check_smt_possible(void) +{ + return false; +} + static inline int kvmppc_smt_threads(void) { return 1;