From nobody Sun Nov 9 23:03:41 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552118056292535.8105458230797; Fri, 8 Mar 2019 23:54:16 -0800 (PST) Received: from localhost ([127.0.0.1]:55315 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wo9-0007nu-AS for importer@patchew.org; Sat, 09 Mar 2019 02:54:13 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47275) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2Wig-0003t5-22 for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2Wie-0000UU-4W for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:33 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:36876) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h2Wic-0000Pd-6G for qemu-devel@nongnu.org; Sat, 09 Mar 2019 02:48:31 -0500 Received: by mail-wm1-x32f.google.com with SMTP id x10so14099387wmg.2 for ; Fri, 08 Mar 2019 23:48:28 -0800 (PST) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id 11sm5252294wmg.27.2019.03.08.23.48.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Mar 2019 23:48:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=adXagn2OnV312ZWQcd9hoEeDPAMN44SnRuCEEhj/Dk0=; b=mXjrvHHOn5na9PvYGqxho5P5GAFoQH7KtYnhNvhJcgbj125BJSUFQ6mwnZaV8VvehU aM7MBzO+Si4h+XJ/7MpU0IhkUM/yFhjRxdp1cUFq7kQ0O4IYpMxqRssZpiE7X67hF19V D72wXY6qCfxgyEbatZIarV/eBiOp5P/MakLWXkJR8wBHUNuixXeEW7MWkPmZBqt2bstE wT1KSW0vs9JV49tdlsKshoa5a75QVXdNvvFV3S/c/4LeLryyS2YHrnAV99poY72sV8Z4 pSyXnvFgRFKJtEi/AiFyzOVcD14fPrqsEVv9vfbpA6kPmFoFySUV4/AKPskas6u40U20 joVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=adXagn2OnV312ZWQcd9hoEeDPAMN44SnRuCEEhj/Dk0=; b=Ij/LUdzIwCslicwZG4WRSAVpAE9ZzbW62qKZLoMwO3b9JfbZFI67Ox9btopDbo3e4T 9sy5Egnp8fEnD0ZWhJ/7M8J/dJJ9WWA/kv5IKrQlvORfg2PAMNdr0MhdTcsXXtViNdJd f5i25bCVtNV6QmdnTlHchmC04qAoDiRRKiO9ADH6lhoixJudC2TcAgXCR86iEkRL7C0Z Zhn1ii0oMZvgWZAKcn8z1U5R28oiFZkYmEwJ1pIsSEEzsyc2UwXmvMWqHejWPJKWgwsz w1D473e9FXVRMUL/dufWdhFV84fgDJ6pVz9QLDNqwuq1lOLlup3dl4nkNh+2dNyxoeY4 HnRA== X-Gm-Message-State: APjAAAUzEn972QiXX+sxcy+Vi24GU4mQzc0weF9JxmBUBGzLo3EQdloo MJN0iPS2Siu4pn/DksjBp8igFPDH X-Google-Smtp-Source: APXvYqy0TWHuj8vNaAidaFmdMgjVjpJjBneWieD9ARKBTMNjJKlw0gl3+8zwQxCfMyh/zp2wpWc9lQ== X-Received: by 2002:a1c:9957:: with SMTP id b84mr11810762wme.95.1552117706970; Fri, 08 Mar 2019 23:48:26 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Sat, 9 Mar 2019 08:48:01 +0100 Message-Id: <1552117698-12355-9-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> References: <1552117698-12355-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PULL 08/25] i386: extended the cpuid_level when Intel PT is enabled 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: Luwei Kang , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Luwei Kang Intel Processor Trace required CPUID[0x14] but the cpuid_level have no change when create a kvm guest with e.g. "-cpu qemu64,+intel-pt". Signed-off-by: Eduardo Habkost Signed-off-by: Luwei Kang Message-Id: <1548805979-12321-1-git-send-email-luwei.kang@intel.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 1 + target/i386/cpu.c | 9 +++++++++ target/i386/cpu.h | 3 +++ 3 files changed, 13 insertions(+) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 9c8f833..c6d047b 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -136,6 +136,7 @@ GlobalProperty pc_compat_3_1[] =3D { { "Icelake-Client" "-" TYPE_X86_CPU, "mpx", "on" }, { "Icelake-Server" "-" TYPE_X86_CPU, "mpx", "on" }, { "Cascadelake-Server" "-" TYPE_X86_CPU, "stepping", "5" }, + { TYPE_X86_CPU, "x-intel-pt-auto-level", "off" }, }; const size_t pc_compat_3_1_len =3D G_N_ELEMENTS(pc_compat_3_1); =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index d3aa6a8..d90c01a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -5031,6 +5031,13 @@ static void x86_cpu_expand_features(X86CPU *cpu, Err= or **errp) x86_cpu_adjust_feat_level(cpu, FEAT_C000_0001_EDX); x86_cpu_adjust_feat_level(cpu, FEAT_SVM); x86_cpu_adjust_feat_level(cpu, FEAT_XSAVE); + + /* Intel Processor Trace requires CPUID[0x14] */ + if ((env->features[FEAT_7_0_EBX] & CPUID_7_0_EBX_INTEL_PT) && + kvm_enabled() && cpu->intel_pt_auto_level) { + x86_cpu_adjust_level(cpu, &cpu->env.cpuid_min_level, 0x14); + } + /* SVM requires CPUID[0x8000000A] */ if (env->features[FEAT_8000_0001_ECX] & CPUID_EXT3_SVM) { x86_cpu_adjust_level(cpu, &env->cpuid_min_xlevel, 0x8000000A); @@ -5824,6 +5831,8 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_INT32("x-hv-max-vps", X86CPU, hv_max_vps, -1), DEFINE_PROP_BOOL("x-hv-synic-kvm-only", X86CPU, hyperv_synic_kvm_only, false), + DEFINE_PROP_BOOL("x-intel-pt-auto-level", X86CPU, intel_pt_auto_level, + true), DEFINE_PROP_END_OF_LIST() }; =20 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 95112b9..83fb522 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1454,6 +1454,9 @@ struct X86CPU { /* Enable auto level-increase for all CPUID leaves */ bool full_cpuid_auto_level; =20 + /* Enable auto level-increase for Intel Processor Trace leave */ + bool intel_pt_auto_level; + /* if true fill the top bits of the MTRR_PHYSMASKn variable range */ bool fill_mtrr_mask; =20 --=20 1.8.3.1