From patchwork Wed Aug 20 20:53:16 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= X-Patchwork-Id: 4753911 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BDD819F3B4 for ; Wed, 20 Aug 2014 20:55:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F36D2200E7 for ; Wed, 20 Aug 2014 20:55:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 16C7320136 for ; Wed, 20 Aug 2014 20:55:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753309AbaHTUyW (ORCPT ); Wed, 20 Aug 2014 16:54:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:24243 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752921AbaHTUyU (ORCPT ); Wed, 20 Aug 2014 16:54:20 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s7KKsBtc025282 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 20 Aug 2014 16:54:11 -0400 Received: from potion (dhcp-1-113.brq.redhat.com [10.34.1.113]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with SMTP id s7KKs8bf021550; Wed, 20 Aug 2014 16:54:08 -0400 Received: by potion (sSMTP sendmail emulation); Wed, 20 Aug 2014 22:54:07 +0200 From: =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Paolo Bonzini , Gleb Natapov , Raghavendra KT , Vinod Chegu , Hui-Zhi , Christian Borntraeger Subject: [PATCH v2 5/6] KVM: trace kvm_ple_window Date: Wed, 20 Aug 2014 22:53:16 +0200 Message-Id: <1408567997-21222-6-git-send-email-rkrcmar@redhat.com> In-Reply-To: <1408567997-21222-1-git-send-email-rkrcmar@redhat.com> References: <1408567997-21222-1-git-send-email-rkrcmar@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,HK_RANDOM_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Tracepoint for dynamic PLE window, fired on every potential change. Signed-off-by: Radim Kr?má? Reviewed-by: Paolo Bonzini --- arch/x86/kvm/trace.h | 25 +++++++++++++++++++++++++ arch/x86/kvm/vmx.c | 8 +++++--- arch/x86/kvm/x86.c | 1 + 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/trace.h b/arch/x86/kvm/trace.h index e850a7d..4b8e6cb 100644 --- a/arch/x86/kvm/trace.h +++ b/arch/x86/kvm/trace.h @@ -848,6 +848,31 @@ TRACE_EVENT(kvm_track_tsc, __print_symbolic(__entry->host_clock, host_clocks)) ); +TRACE_EVENT(kvm_ple_window, + TP_PROTO(int grow, unsigned int vcpu_id, int new, int old), + TP_ARGS(grow, vcpu_id, new, old), + + TP_STRUCT__entry( + __field( int, grow ) + __field( unsigned int, vcpu_id ) + __field( int, new ) + __field( int, old ) + ), + + TP_fast_assign( + __entry->grow = grow; + __entry->vcpu_id = vcpu_id; + __entry->new = new; + __entry->old = old; + ), + + TP_printk("vcpu %u: ple_window %d %s %d", + __entry->vcpu_id, + __entry->new, + __entry->grow ? "<+" : "<-", + __entry->old) +); + #endif /* CONFIG_X86_64 */ #endif /* _TRACE_KVM_H */ diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c index e63d7ac..f63ac5d 100644 --- a/arch/x86/kvm/vmx.c +++ b/arch/x86/kvm/vmx.c @@ -5728,15 +5728,17 @@ static int __shrink_ple_window(int val, int shrinker, int minimum) static void modify_ple_window(struct kvm_vcpu *vcpu, int grow) { struct vcpu_vmx *vmx = to_vmx(vcpu); + int old = vmx->ple_window; int new; if (grow) - new = __grow_ple_window(vmx->ple_window); + new = __grow_ple_window(old) else - new = __shrink_ple_window(vmx->ple_window, ple_window_shrink, - ple_window); + new = __shrink_ple_window(old, ple_window_shrink, ple_window); vmx->ple_window = max(new, ple_window); + + trace_kvm_ple_window(grow, vcpu->vcpu_id, vmx->ple_window, old); } #define grow_ple_window(vcpu) modify_ple_window(vcpu, 1) #define shrink_ple_window(vcpu) modify_ple_window(vcpu, 0) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 5696ee7..814b20c 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -7648,3 +7648,4 @@ EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_invlpga); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_skinit); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_nested_intercepts); EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_write_tsc_offset); +EXPORT_TRACEPOINT_SYMBOL_GPL(kvm_ple_window);