From patchwork Tue Apr 17 08:24:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 899128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; 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=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="u2fnAj8j"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40QJGk2hRjz9rxs for ; Tue, 17 Apr 2018 18:25:34 +1000 (AEST) Received: from localhost ([::1]:51175 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8Lvg-00004x-9P for incoming@patchwork.ozlabs.org; Tue, 17 Apr 2018 04:25:32 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34119) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1f8LvM-0008WH-Bd for qemu-devel@nongnu.org; Tue, 17 Apr 2018 04:25:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1f8LvH-0007XF-E0 for qemu-devel@nongnu.org; Tue, 17 Apr 2018 04:25:12 -0400 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:43231) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1f8LvH-0007Wv-6L for qemu-devel@nongnu.org; Tue, 17 Apr 2018 04:25:07 -0400 Received: by mail-pf0-x241.google.com with SMTP id j11so5269330pff.10 for ; Tue, 17 Apr 2018 01:25:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XVSG9d7pg+5YKYwjCswFJB/OXMMtRi0/P2TDSW15KXs=; b=u2fnAj8juPV+HPV/wRLIct+loRss/Z7K7y3rSJ7Pw+V8eNB0/bx3zock7nTv+Tymq+ baEMfcr6EacRlvbJ7blWcFOt91/GddF2JiNOldnZWIoHKK4QW98li0Pf2vqOEoBb09CL 8OrVOwqz5qx+e/nL9rbR2Z40l048toR0PhHln8qUnU8/4pA4AcMGd6nDKdPOKUw9ZNHI q0I8XDJIpGb//B10ebSY5HWgI/NmtBUEcMtds7oWRKL0NHmRN128Ht70zCPvMwzFic/i mU/8xRBnxHhVlsJpcs/1EnWn0DXjmkumLgkcAwfbOOMup8pjjr30lLyiEeI1OulDHbnD cXRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=XVSG9d7pg+5YKYwjCswFJB/OXMMtRi0/P2TDSW15KXs=; b=bBW2LG3i7nMwfgST0Dfio3MeAn+edSBJA7H8yDDVZ77HhLTJ13SU09IQa5QA2+nm4W uhPGL1QBMnWBBrBA1Arf8AZg4NVtpZmz/bX606ArLdC3Hm45pYPGLmLW72Y1b5MHMQ3f XA0DbUazOAE4FqCmVa6ffaG8m1EX/lrWe6j9HzMxmdNgHDkIyi0jS0DTO5BQUckO1PWx 3H9Hc/yz6RrXiECaCp6Vb8CNQZ9wtAheJifwQx+idNLyUtpOwn6bhtyXUYjy1Alh4kAh S7YLne71R6ZDbVpsL5jqHgvhUyQBmrDpwaPLQcpCyaYIIk2nAn/uUX9+qAq2L5g2Tork Akyw== X-Gm-Message-State: ALQs6tAowZ6javm58L+RuLSiINOLhsLP0dCFKas82esygYK9MlP2pE+8 FBdO20zlEgZpdYIHBbvCIQEsUQ== X-Google-Smtp-Source: AIpwx49awkweMhExg+JZWMkedkAW0dFA9OJny5T23n5TwfWg5EqvZVgloafywt9NLK1Albm+43Cb0Q== X-Received: by 10.101.90.194 with SMTP id d2mr1035965pgt.352.1523953505924; Tue, 17 Apr 2018 01:25:05 -0700 (PDT) Received: from localhost.localdomain ([203.205.141.123]) by smtp.googlemail.com with ESMTPSA id c3sm30151077pfd.28.2018.04.17.01.25.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 17 Apr 2018 01:25:05 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Tue, 17 Apr 2018 01:24:15 -0700 Message-Id: <1523953455-28053-1-git-send-email-wanpengli@tencent.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::241 Subject: [Qemu-devel] [PATCH RESEND v2] i386/kvm: add support for KVM_CAP_X86_DISABLE_EXITS 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: Paolo Bonzini , Eduardo Habkost , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Wanpeng Li This patch adds support for KVM_CAP_X86_DISABLE_EXITS. Provides userspace with per-VM capability(KVM_CAP_X86_DISABLE_EXITS) to not intercept MWAIT/HLT/PAUSE in order that to improve latency in some workloads. Cc: Paolo Bonzini Cc: Radim Krčmář Cc: Eduardo Habkost Signed-off-by: Wanpeng Li --- linux-headers/linux/kvm.h | 6 +++++- target/i386/cpu.h | 2 ++ target/i386/kvm.c | 16 ++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/linux-headers/linux/kvm.h b/linux-headers/linux/kvm.h index a167be8..857df15 100644 --- a/linux-headers/linux/kvm.h +++ b/linux-headers/linux/kvm.h @@ -925,7 +925,7 @@ struct kvm_ppc_resize_hpt { #define KVM_CAP_S390_GS 140 #define KVM_CAP_S390_AIS 141 #define KVM_CAP_SPAPR_TCE_VFIO 142 -#define KVM_CAP_X86_GUEST_MWAIT 143 +#define KVM_CAP_X86_DISABLE_EXITS 143 #define KVM_CAP_ARM_USER_IRQ 144 #define KVM_CAP_S390_CMMA_MIGRATION 145 #define KVM_CAP_PPC_FWNMI 146 @@ -1508,6 +1508,10 @@ struct kvm_assigned_msix_entry { #define KVM_X2APIC_API_USE_32BIT_IDS (1ULL << 0) #define KVM_X2APIC_API_DISABLE_BROADCAST_QUIRK (1ULL << 1) +#define KVM_X86_DISABLE_EXITS_MWAIT (1 << 0) +#define KVM_X86_DISABLE_EXITS_HLT (1 << 1) +#define KVM_X86_DISABLE_EXITS_PAUSE (1 << 2) + /* Available with KVM_CAP_ARM_USER_IRQ */ /* Bits for run->s.regs.device_irq_level */ diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 1b219fa..965de1b 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -685,6 +685,8 @@ typedef uint32_t FeatureWordArray[FEATURE_WORDS]; #define CPUID_7_0_EDX_AVX512_4FMAPS (1U << 3) /* AVX512 Multiply Accumulation Single Precision */ #define CPUID_7_0_EDX_SPEC_CTRL (1U << 26) /* Speculation Control */ +#define KVM_PV_UNHALT (1U << 7) + #define KVM_HINTS_DEDICATED (1U << 0) #define CPUID_8000_0008_EBX_IBPB (1U << 12) /* Indirect Branch Prediction Barrier */ diff --git a/target/i386/kvm.c b/target/i386/kvm.c index 6c49954..3e99830 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -1029,6 +1029,22 @@ int kvm_arch_init_vcpu(CPUState *cs) } } + if (env->features[FEAT_KVM_HINTS] & KVM_HINTS_DEDICATED) { + int disable_exits = kvm_check_extension(cs->kvm_state, KVM_CAP_X86_DISABLE_EXITS); + + if (disable_exits) { + disable_exits &= (KVM_X86_DISABLE_EXITS_MWAIT | + KVM_X86_DISABLE_EXITS_HLT | + KVM_X86_DISABLE_EXITS_PAUSE); + if (env->user_features[FEAT_KVM] & KVM_PV_UNHALT) { + disable_exits &= ~KVM_X86_DISABLE_EXITS_HLT; + } + } + if (kvm_vm_enable_cap(cs->kvm_state, KVM_CAP_X86_DISABLE_EXITS, 0, disable_exits)) { + error_report("kvm: DISABLE EXITS not supported"); + } + } + qemu_add_vm_change_state_handler(cpu_update_state, env); c = cpuid_find_entry(&cpuid_data.cpuid, 1, 0);