Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E368D330B2F for ; Tue, 10 Feb 2026 07:30:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.21 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770708624; cv=none; b=cdAtxq309eqnRyQHmkqMK5gzgobbFA8QsDAj5VlX2kBZcu4NVK5ib+kqHIJyfwUZrNY01fsojw+2VLKW/wkcx4piVWjnwiSmIqH3hA+xj2Ouw5RxPWovSVRu6Kcueb6NUIosCyEN8ipfFACGGPymkgDdccgbxFHAQFPZ0pxq8Ys= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770708624; c=relaxed/simple; bh=bkxxnCSWasqzl4BwY4SfrzYfepMb9ikusxFGVrsSAjE=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Bxsdhuz4ctMpEcZH1GZSW7gtM0fK/TMsjKULq8CZCUlyIMwI77QGh3DFFPC+SjtI+ALESm8WC1p0xPFwW5S1pRQVDXATaYas8jFzIuR/lwZ97yCQUAW/sfYQT4hkSYy9c8yrY8qsKHz7aRwzqorCN8oqQFxDSPsbMhfipqvFdkY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=BUwA8B6l; arc=none smtp.client-ip=198.175.65.21 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="BUwA8B6l" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1770708623; x=1802244623; h=message-id:date:mime-version:subject:to:cc:references: from:in-reply-to:content-transfer-encoding; bh=bkxxnCSWasqzl4BwY4SfrzYfepMb9ikusxFGVrsSAjE=; b=BUwA8B6lLTj0kN3kl+cejnxPGZrYFOmAFU1bLoIDzi//NEKEDZ+bBSKD KSTuTH2H5/juKqRwduqmCrrzrdHUqLizUBsje+/KYBs3MW1qRuVF2bivQ 7Fs4H42G0DI287swc2qK+PLb+Y+FiMc9nICyU2Xy1yoq0hQB6UJZnOfZQ prl59sNhA9J4zRLtKl4Ce0bo3pmBtmTDO6VnuWB/MVE7Gzq43/37Cq4NY pv5Lem0yHcpUMfC9IFV4Rvqm1RIrzgpe07irGfiKkZKYB2JzZt1/yHPYk xR06ufKqhiIleMssJ2Lgdwkbcuvm61ImWjgvYaJcq1TRAHkculxZBAfYn g==; X-CSE-ConnectionGUID: RcLNl93GTxev/Yb2NW60Dg== X-CSE-MsgGUID: CLZ5vbXvRG+Atx+gqxhCOA== X-IronPort-AV: E=McAfee;i="6800,10657,11696"; a="71728959" X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="71728959" Received: from orviesa008.jf.intel.com ([10.64.159.148]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2026 23:30:22 -0800 X-CSE-ConnectionGUID: Abr3k+VpR7OjOiVPAgnZfg== X-CSE-MsgGUID: PTSTsl53RqmlZUhTlU6hBw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.21,283,1763452800"; d="scan'208";a="211869368" Received: from qianm-mobl2.ccr.corp.intel.com (HELO [10.238.1.184]) ([10.238.1.184]) by orviesa008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Feb 2026 23:30:20 -0800 Message-ID: <576b57e3-92df-4a35-ba7c-00bf12833313@linux.intel.com> Date: Tue, 10 Feb 2026 15:30:16 +0800 Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH V2 11/11] target/i386: Disable guest PEBS capability when not enabled To: Zide Chen , qemu-devel@nongnu.org, kvm@vger.kernel.org, Paolo Bonzini , Zhao Liu , Peter Xu , Fabiano Rosas Cc: Xiaoyao Li , Dongli Zhang References: <20260128231003.268981-1-zide.chen@intel.com> <20260128231003.268981-12-zide.chen@intel.com> Content-Language: en-US From: "Mi, Dapeng" In-Reply-To: <20260128231003.268981-12-zide.chen@intel.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 1/29/2026 7:09 AM, Zide Chen wrote: > When PMU is disabled, guest CPUID must not advertise Debug Store > support. Clear both CPUID.01H:EDX[21] (DS) and CPUID.01H:ECX[2] > (DS64) in this case. > > Set IA32_MISC_ENABLE[12] (PEBS_UNAVAILABLE) when Debug Store is not > exposed to the guest. > > Note: Do not infer that PEBS is unsupported from > IA32_PERF_CAPABILITIES[11:8] (PEBS_FMT) being 0. A value of 0 is a > valid PEBS record format on some CPUs. > > Signed-off-by: Zide Chen > --- > V2: > - New patch. > > target/i386/cpu.c | 6 ++++++ > target/i386/cpu.h | 1 + > 2 files changed, 7 insertions(+) > > diff --git a/target/i386/cpu.c b/target/i386/cpu.c > index ec6f49916de3..445361ab7a06 100644 > --- a/target/i386/cpu.c > +++ b/target/i386/cpu.c > @@ -9180,6 +9180,10 @@ static void x86_cpu_reset_hold(Object *obj, ResetType type) > env->msr_ia32_misc_enable |= MSR_IA32_MISC_ENABLE_MWAIT; > } > > + if (!(env->features[FEAT_1_EDX] & CPUID_DTS)) { > + env->msr_ia32_misc_enable |= MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL; > + } > + > memset(env->dr, 0, sizeof(env->dr)); > env->dr[6] = DR6_FIXED_1; > env->dr[7] = DR7_FIXED_1; > @@ -9474,6 +9478,8 @@ void x86_cpu_expand_features(X86CPU *cpu, Error **errp) > env->features[FEAT_1_ECX] &= ~CPUID_EXT_PDCM; > } > > + env->features[FEAT_1_ECX] &= ~CPUID_EXT_DTES64; > + env->features[FEAT_1_EDX] &= ~CPUID_DTS; Strictly speaking, we need to check BTS as well before clearing DS. BTS also depends on DS. > env->features[FEAT_7_0_EDX] &= ~CPUID_7_0_EDX_ARCH_LBR; > } > > diff --git a/target/i386/cpu.h b/target/i386/cpu.h > index 5ab107dfa29f..0fecf561173e 100644 > --- a/target/i386/cpu.h > +++ b/target/i386/cpu.h > @@ -483,6 +483,7 @@ typedef enum X86Seg { > /* Indicates good rep/movs microcode on some processors: */ > #define MSR_IA32_MISC_ENABLE_FASTSTRING (1ULL << 0) > #define MSR_IA32_MISC_ENABLE_BTS_UNAVAIL (1ULL << 11) > +#define MSR_IA32_MISC_ENABLE_PEBS_UNAVAIL (1ULL << 12) > #define MSR_IA32_MISC_ENABLE_MWAIT (1ULL << 18) > #define MSR_IA32_MISC_ENABLE_DEFAULT (MSR_IA32_MISC_ENABLE_FASTSTRING |\ > MSR_IA32_MISC_ENABLE_BTS_UNAVAIL)