From nobody Sat Nov 15 02:13:23 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1592953375; cv=none; d=zohomail.com; s=zohoarc; b=MO3BHlobCex56fLrg5VKPi6PvQK6gijmRV7eps3oi1RMkgy/2KsLfaPvL7QTclbHo8d5aW5FOw2uX8VkgK38OyPooJ8yU3wxqsMS86NQjKrwGmQsN8NByRQXH5nVV3yl2iUTGm0x6YkVkGWN2k0Gfp5jetQI3ged/x7zL4+COF0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592953375; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=dSxfIsiKAOAuOkcH6/6KkAm1SJMN+fb41ElIwudmlpc=; b=MUnubB0mFJLCqBZKyppolHu+imw19bAYJDKgVrNO0hVUFmks8iYT1f8i7P41Frqlktxo17VKd5vtHNY6mI54h1kcrMvLkZmAkcTH9A2syYH4uv/iE6fF3WAOI6RCZiwZXQGyv3uN+rk7aJpDUWOxOOWKam8CIBGye/t1LF98ouI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592953375347332.6029243140424; Tue, 23 Jun 2020 16:02:55 -0700 (PDT) Received: from localhost ([::1]:56808 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnrwL-0002yp-KO for importer@patchew.org; Tue, 23 Jun 2020 19:02:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48176) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnruv-0001jg-8T for qemu-devel@nongnu.org; Tue, 23 Jun 2020 19:01:26 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36120 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jnrus-00020F-1Z for qemu-devel@nongnu.org; Tue, 23 Jun 2020 19:01:23 -0400 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-258-TlDUT0zNOF2W3H6FnjZElg-1; Tue, 23 Jun 2020 19:01:18 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 503B7107ACF2; Tue, 23 Jun 2020 23:01:17 +0000 (UTC) Received: from localhost (ovpn-113-247.phx2.redhat.com [10.3.113.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 111725C1D4; Tue, 23 Jun 2020 23:01:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1592953280; 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=dSxfIsiKAOAuOkcH6/6KkAm1SJMN+fb41ElIwudmlpc=; b=T9jsu/6/vmW7ko9hCgfcWleTjt8YjgY7PI3Oc1+P+MI5M0qIyWOfxR7YtYDoFfbRVsreI9 u/ZKe5oFFmo7+DaGTAgGcNetRt/Tc4/4KsT0oQj/uIZBLxZdyi93OWWdEz60UNILkWzC25 xasSrFgavufaY9femhDmj7s+cn6SAFs= X-MC-Unique: TlDUT0zNOF2W3H6FnjZElg-1 From: Eduardo Habkost To: qemu-devel@nongnu.org Subject: [PATCH] i386: Mask SVM features if nested SVM is disabled Date: Tue, 23 Jun 2020 19:01:16 -0400 Message-Id: <20200623230116.277409-1-ehabkost@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.120; envelope-from=ehabkost@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/23 01:53:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: Yanan Fu , Eduardo Habkost , "Dr. David Alan Gilbert" , Babu Moger , Paolo Bonzini , Igor Mammedov , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" QEMU incorrectly validates FEAT_SVM feature flags against GET_SUPPORTED_CPUID even if SVM features are being masked out by cpu_x86_cpuid(). This can make QEMU print warnings on most AMD CPU models, even when SVM nesting is disabled (which is the default). This bug was never detected before because of a Linux KVM bug: until Linux v5.6, KVM was not filtering out SVM features in GET_SUPPORTED_CPUID when nested was disabled. This KVM bug was fixed in Linux v5.7-rc1, on Linux commit a50718cc3f43 ("KVM: nSVM: Expose SVM features to L1 iff nested is enabled"). Fix the problem by adding a CPUID_EXT3_SVM dependency to all FEAT_SVM feature flags in the feature_dependencies table. Reported-by: Yanan Fu Signed-off-by: Eduardo Habkost --- target/i386/cpu.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b1b311baa2..a9edcaf531 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1404,6 +1404,10 @@ static FeatureDep feature_dependencies[] =3D { .from =3D { FEAT_VMX_SECONDARY_CTLS, VMX_SECONDARY_EXEC_ENABLE_VM= FUNC }, .to =3D { FEAT_VMX_VMFUNC, ~0ull }, }, + { + .from =3D { FEAT_8000_0001_ECX, CPUID_EXT3_SVM }, + .to =3D { FEAT_SVM, ~0ull }, + }, }; =20 typedef struct X86RegisterInfo32 { --=20 2.26.2