From nobody Mon Apr 29 21:48:55 2024 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; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1560700175; cv=none; d=zoho.com; s=zohoarc; b=BeAwkZGbEmgYEmmB5Zf8hEtpfQlZivCcwDvGywdU6cWfvaZVRPBDV2qHKnyknHcDalQWZ9cU4wfvtZuT4iehunDNmqQzPIfpYpm2iUkkw4m+lssCnBS84YcMn3JyrmXFOp69IUsSIkzIr9kDBJdloRLFIaMZRAquG0t23BRRWGA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560700175; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=fSdnndxrrXMEMBXFKd7NbExocZr7w4wUshoNuM37gUk=; b=b7e8CxRh+1veeT++G+vPu47XsSUFCefqOKcxxQSZP6WqzVWFVLgFuK6p/h9VErRs6zmU2zQLlLwzuOr8HJFbb5iRViyvHv6eBkEVebUy2YYM2CIFm0JLn1BNnHt65qf09rAecwhlYh01KX/AerfAJ3TEh88WR4fBT7ONgxeFnFU= ARC-Authentication-Results: i=1; mx.zoho.com; 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 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 1560700175147942.410083311271; Sun, 16 Jun 2019 08:49:35 -0700 (PDT) Received: from localhost ([::1]:41128 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcXFV-0000KO-8w for importer@patchew.org; Sun, 16 Jun 2019 11:39:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53306) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcXER-0007Zv-CJ for qemu-devel@nongnu.org; Sun, 16 Jun 2019 11:38:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcXEQ-0005oM-1D for qemu-devel@nongnu.org; Sun, 16 Jun 2019 11:38:11 -0400 Received: from mga05.intel.com ([192.55.52.43]:22919) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcXEP-0005dT-Lv for qemu-devel@nongnu.org; Sun, 16 Jun 2019 11:38:09 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jun 2019 08:38:03 -0700 Received: from tao-optiplex-7060.sh.intel.com ([10.239.13.104]) by FMSMGA003.fm.intel.com with ESMTP; 16 Jun 2019 08:38:01 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Sun, 16 Jun 2019 23:35:24 +0800 Message-Id: <20190616153525.27072-2-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190616153525.27072-1-tao3.xu@intel.com> References: <20190616153525.27072-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v3 1/2] x86/cpu: Add support for UMONITOR/UMWAIT/TPAUSE 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: cohuck@redhat.com, kvm@vger.kernel.org, mst@redhat.com, jingqi.liu@intel.com, tao3.xu@intel.com, mtosatti@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" UMONITOR, UMWAIT and TPAUSE are a set of user wait instructions. This patch adds support for user wait instructions in KVM. Availability of the user wait instructions is indicated by the presence of the CPUID feature flag WAITPKG CPUID.0x07.0x0:ECX[5]. User wait instructions may be executed at any privilege level, and use IA32_UMWAIT_CONTROL MSR to set the maximum time. The patch enable the umonitor, umwait and tpause features in KVM. Because umwait and tpause can put a (psysical) CPU into a power saving state, by default we dont't expose it to kvm and enable it only when guest CPUID has it. And use QEMU command-line "-overcommit cpu-pm=3Don" (enable_cpu_pm is enabled), a VM can use UMONITOR, UMWAIT and TPAUSE instructions. If the instruction causes a delay, the amount of time delayed is called here the physical delay. The physical delay is first computed by determining the virtual delay (the time to delay relative to the VM=E2=80=99s timestamp counter). Otherwise, UMONITOR, UMWAIT and TPAUSE= cause an invalid-opcode exception(#UD). The release document ref below link: https://software.intel.com/sites/default/files/\ managed/39/c5/325462-sdm-vol-1-2abcd-3abcd.pdf Co-developed-by: Jingqi Liu Signed-off-by: Jingqi Liu Signed-off-by: Tao Xu --- changes in v3: Simplify the patches, expose user wait instructions when the guest has CPUID (Paolo) --- target/i386/cpu.c | 3 ++- target/i386/cpu.h | 1 + target/i386/kvm.c | 4 ++++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index fbed2eb804..0fb86c90db 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -1060,7 +1060,7 @@ static FeatureWordInfo feature_word_info[FEATURE_WORD= S] =3D { .type =3D CPUID_FEATURE_WORD, .feat_names =3D { NULL, "avx512vbmi", "umip", "pku", - NULL /* ospke */, NULL, "avx512vbmi2", NULL, + NULL /* ospke */, "waitpkg", "avx512vbmi2", NULL, "gfni", "vaes", "vpclmulqdq", "avx512vnni", "avx512bitalg", NULL, "avx512-vpopcntdq", NULL, "la57", NULL, NULL, NULL, @@ -5222,6 +5222,7 @@ static void x86_cpu_realizefn(DeviceState *dev, Error= **errp) host_cpuid(5, 0, &cpu->mwait.eax, &cpu->mwait.ebx, &cpu->mwait.ecx, &cpu->mwait.edx); env->features[FEAT_1_ECX] |=3D CPUID_EXT_MONITOR; + env->features[FEAT_7_0_ECX] |=3D CPUID_7_0_ECX_WAITPKG; } } =20 diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 0732e059ec..2f7c57a3c2 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -670,6 +670,7 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_7_0_ECX_UMIP (1U << 2) #define CPUID_7_0_ECX_PKU (1U << 3) #define CPUID_7_0_ECX_OSPKE (1U << 4) +#define CPUID_7_0_ECX_WAITPKG (1U << 5) /* UMONITOR/UMWAIT/TPAUSE Instruc= tions */ #define CPUID_7_0_ECX_VBMI2 (1U << 6) /* Additional VBMI Instrs */ #define CPUID_7_0_ECX_GFNI (1U << 8) #define CPUID_7_0_ECX_VAES (1U << 9) diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 6899061b4e..3efdb90f11 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -388,6 +388,10 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uin= t32_t function, if (host_tsx_blacklisted()) { ret &=3D ~(CPUID_7_0_EBX_RTM | CPUID_7_0_EBX_HLE); } + } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_ECX) { + if (enable_cpu_pm) { + ret |=3D CPUID_7_0_ECX_WAITPKG; + } } else if (function =3D=3D 7 && index =3D=3D 0 && reg =3D=3D R_EDX) { /* * Linux v4.17-v4.20 incorrectly return ARCH_CAPABILITIES on SVM h= osts. --=20 2.20.1 From nobody Mon Apr 29 21:48:55 2024 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; 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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1560700125; cv=none; d=zoho.com; s=zohoarc; b=oV3yvFKi4gQa7nV++kWvJdGp8gecaXmI1N2f2sMYux/B8NBLSRh2QZg3RBh4o0VzyxtpousX1ro07KPfb6JlXeYoC+QMI0wVO/9mSjh4vDAy4xCPDnOnhMKk553wmNezwGTEezqa1Y9yzejO4VJ3SniNMHHKPYg4AyvVlZHJEHM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560700125; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=xncQPRgaPrIb7pRhdS890sv0bpfhdz0C3wI2gFX0SfE=; b=dW7gz0HLorRi+38p+Es90ILUTJgx3R4YuMKLAJAjMEdDbAVLXhEFtaaQoPN79Q4ZAYzu+eCLOKVzlTs4gzcZu9hvcTWwAmdENuTfektdYKZYyzVVEnMHk4Rvchc2Wuqt2b6PaWR9x6ZObZu7B8qZS6LsiXBHeJSfAQx7iSUmy4s= ARC-Authentication-Results: i=1; mx.zoho.com; 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 header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560700125355784.870537481836; Sun, 16 Jun 2019 08:48:45 -0700 (PDT) Received: from localhost ([::1]:41132 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcXFb-0000ZS-L5 for importer@patchew.org; Sun, 16 Jun 2019 11:39:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53332) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hcXEX-0007f4-2L for qemu-devel@nongnu.org; Sun, 16 Jun 2019 11:38:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hcXEV-0005wh-Vy for qemu-devel@nongnu.org; Sun, 16 Jun 2019 11:38:17 -0400 Received: from mga05.intel.com ([192.55.52.43]:22920) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hcXEV-0005hK-NH for qemu-devel@nongnu.org; Sun, 16 Jun 2019 11:38:15 -0400 Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 Jun 2019 08:38:05 -0700 Received: from tao-optiplex-7060.sh.intel.com ([10.239.13.104]) by FMSMGA003.fm.intel.com with ESMTP; 16 Jun 2019 08:38:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Tao Xu To: pbonzini@redhat.com, rth@twiddle.net, ehabkost@redhat.com Date: Sun, 16 Jun 2019 23:35:25 +0800 Message-Id: <20190616153525.27072-3-tao3.xu@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190616153525.27072-1-tao3.xu@intel.com> References: <20190616153525.27072-1-tao3.xu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 192.55.52.43 Subject: [Qemu-devel] [PATCH v3 2/2] target/i386: Add support for save/load IA32_UMWAIT_CONTROL MSR 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: cohuck@redhat.com, kvm@vger.kernel.org, mst@redhat.com, jingqi.liu@intel.com, tao3.xu@intel.com, mtosatti@redhat.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" UMWAIT and TPAUSE instructions use IA32_UMWAIT_CONTROL at MSR index E1H to determines the maximum time in TSC-quanta that the processor can reside in either C0.1 or C0.2. This patch is to Add support for save/load IA32_UMWAIT_CONTROL MSR in guest. Co-developed-by: Jingqi Liu Signed-off-by: Jingqi Liu Signed-off-by: Tao Xu --- no changes in v3: --- target/i386/cpu.h | 2 ++ target/i386/kvm.c | 13 +++++++++++++ target/i386/machine.c | 20 ++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 2f7c57a3c2..eb98b2e54a 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -450,6 +450,7 @@ typedef enum X86Seg { =20 #define MSR_IA32_BNDCFGS 0x00000d90 #define MSR_IA32_XSS 0x00000da0 +#define MSR_IA32_UMWAIT_CONTROL 0xe1 =20 #define XSTATE_FP_BIT 0 #define XSTATE_SSE_BIT 1 @@ -1348,6 +1349,7 @@ typedef struct CPUX86State { uint16_t fpregs_format_vmstate; =20 uint64_t xss; + uint64_t umwait; =20 TPRAccess tpr_access_type; } CPUX86State; diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 3efdb90f11..506c7cd038 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -91,6 +91,7 @@ static bool has_msr_hv_stimer; static bool has_msr_hv_frequencies; static bool has_msr_hv_reenlightenment; static bool has_msr_xss; +static bool has_msr_umwait; static bool has_msr_spec_ctrl; static bool has_msr_virt_ssbd; static bool has_msr_smi_count; @@ -1486,6 +1487,9 @@ static int kvm_get_supported_msrs(KVMState *s) case MSR_IA32_XSS: has_msr_xss =3D true; break; + case MSR_IA32_UMWAIT_CONTROL: + has_msr_umwait =3D true; + break; case HV_X64_MSR_CRASH_CTL: has_msr_hv_crash =3D true; break; @@ -2023,6 +2027,9 @@ static int kvm_put_msrs(X86CPU *cpu, int level) if (has_msr_xss) { kvm_msr_entry_add(cpu, MSR_IA32_XSS, env->xss); } + if (has_msr_umwait) { + kvm_msr_entry_add(cpu, MSR_IA32_UMWAIT_CONTROL, env->umwait); + } if (has_msr_spec_ctrl) { kvm_msr_entry_add(cpu, MSR_IA32_SPEC_CTRL, env->spec_ctrl); } @@ -2416,6 +2423,9 @@ static int kvm_get_msrs(X86CPU *cpu) if (has_msr_xss) { kvm_msr_entry_add(cpu, MSR_IA32_XSS, 0); } + if (has_msr_umwait) { + kvm_msr_entry_add(cpu, MSR_IA32_UMWAIT_CONTROL, 0); + } if (has_msr_spec_ctrl) { kvm_msr_entry_add(cpu, MSR_IA32_SPEC_CTRL, 0); } @@ -2665,6 +2675,9 @@ static int kvm_get_msrs(X86CPU *cpu) case MSR_IA32_XSS: env->xss =3D msrs[i].data; break; + case MSR_IA32_UMWAIT_CONTROL: + env->umwait =3D msrs[i].data; + break; default: if (msrs[i].index >=3D MSR_MC0_CTL && msrs[i].index < MSR_MC0_CTL + (env->mcg_cap & 0xff) * 4) { diff --git a/target/i386/machine.c b/target/i386/machine.c index 4aff1a763f..db388b6b85 100644 --- a/target/i386/machine.c +++ b/target/i386/machine.c @@ -810,6 +810,25 @@ static const VMStateDescription vmstate_xss =3D { } }; =20 +static bool umwait_needed(void *opaque) +{ + X86CPU *cpu =3D opaque; + CPUX86State *env =3D &cpu->env; + + return env->umwait !=3D 0; +} + +static const VMStateDescription vmstate_umwait =3D { + .name =3D "cpu/umwait", + .version_id =3D 1, + .minimum_version_id =3D 1, + .needed =3D umwait_needed, + .fields =3D (VMStateField[]) { + VMSTATE_UINT64(env.umwait, X86CPU), + VMSTATE_END_OF_LIST() + } +}; + #ifdef TARGET_X86_64 static bool pkru_needed(void *opaque) { @@ -1100,6 +1119,7 @@ VMStateDescription vmstate_x86_cpu =3D { &vmstate_msr_hyperv_reenlightenment, &vmstate_avx512, &vmstate_xss, + &vmstate_umwait, &vmstate_tsc_khz, &vmstate_msr_smi_count, #ifdef TARGET_X86_64 --=20 2.20.1