From patchwork Fri Mar 16 14:36:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wanpeng Li X-Patchwork-Id: 886866 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="jUSjd7NR"; 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 402p3c1MHkz9sDX for ; Sat, 17 Mar 2018 01:38:20 +1100 (AEDT) Received: from localhost ([::1]:57468 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewqUs-0001L5-0i for incoming@patchwork.ozlabs.org; Fri, 16 Mar 2018 10:38:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44083) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ewqUQ-0001IR-7s for qemu-devel@nongnu.org; Fri, 16 Mar 2018 10:37:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ewqUM-0005ar-9c for qemu-devel@nongnu.org; Fri, 16 Mar 2018 10:37:50 -0400 Received: from mail-pg0-x244.google.com ([2607:f8b0:400e:c05::244]:32825) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ewqUM-0005aF-3T for qemu-devel@nongnu.org; Fri, 16 Mar 2018 10:37:46 -0400 Received: by mail-pg0-x244.google.com with SMTP id g12so4151419pgs.0 for ; Fri, 16 Mar 2018 07:37:45 -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=II55rPp4zyZwDtO3/meKPj5h0pokEMItz0HjYQdQ0yc=; b=jUSjd7NRA80zshBGCY4YGAhWjYw5o0JS0tHP/lTpYSycCCO4W6mHRdqZ9A1iPDVj02 YRO56jK1QRnmcv/yeMltOkU2evyKO1YXBdz60j5jgt/Af6kPTGYllFPPMdZHsQ+eQl01 kdtTC8GsuVbpNuvsQMbatiWGaYuigmKFA+J72QPXK3UuwqPAJfcgyYxR8o78O9knm1kW evZN07vcKOuQVr1hdH50ugRd3/qc0v/OwrUnj9BtAKlWYFRpuj/Tgbdumj8TZPe9ujhS zcgTK+9ORjx1siIWh14T7rKTrQ9d9AWPT9VHJgXzM1ly72sZezqaryiFL2mhnuTEZ/mO yekQ== 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=II55rPp4zyZwDtO3/meKPj5h0pokEMItz0HjYQdQ0yc=; b=F9qtqmoht9xA65aMbDeoHxMwE4L9zCIPhJooWTuGcUn0gJCH2g/hL5dj14fmOMyefh doATy11pCa4DkxSWFuzM6YIjudGJeuesT/sxWUDOwiliDm9a3NqkaOIRhqQ3hlQ6NrYe wfAdDaKAd4D1DPfxQvS1DIu+tc2MU6ipkXxdETTorPWpOlSqxSKRMZSb7ltOyLUssNrZ ytHLPg0RTCa7UhWaVh8Diys7ohnv4ensd/nmNrXEXSBW9wpTOXT+RjSc2ZUK9VvAI1g8 oUM4q15Ialbu/FKJmvnK7+ix7jLfAgilDShidd90UPTuTwZPTPoW3bdZ0jB3jb557GnY 61HA== X-Gm-Message-State: AElRT7HGl6PLQycs9qOa/3ScQy1dkDzZZfY7JMAMjPqGEZ+6X1p4wavb MsIVCBZjaIGPuM+DxyEa4nxmFQ== X-Google-Smtp-Source: AG47ELsfQED7bsWj7G8fPI3PklKdv++eBra9zk5KktkfS59j5wTnpQURvG7YREkiLPv4pRaPzBYpNQ== X-Received: by 10.98.208.197 with SMTP id p188mr1755797pfg.221.1521211064730; Fri, 16 Mar 2018 07:37:44 -0700 (PDT) Received: from localhost.localdomain ([45.248.77.205]) by smtp.googlemail.com with ESMTPSA id s68sm13417482pgb.43.2018.03.16.07.37.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 16 Mar 2018 07:37:44 -0700 (PDT) From: Wanpeng Li X-Google-Original-From: Wanpeng Li To: qemu-devel@nongnu.org, kvm@vger.kernel.org Date: Fri, 16 Mar 2018 07:36:42 -0700 Message-Id: <1521211002-4529-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:c05::244 Subject: [Qemu-devel] [PATCH] 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/kvm.c | 12 ++++++++++++ 2 files changed, 17 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/kvm.c b/target/i386/kvm.c index d23fff1..95ed9eb 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -999,6 +999,18 @@ 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 (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);