From patchwork Mon Aug 10 13:26:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhichao Huang X-Patchwork-Id: 6984221 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 99B379F344 for ; Mon, 10 Aug 2015 13:27:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B7B4F20734 for ; Mon, 10 Aug 2015 13:27:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C602B2070A for ; Mon, 10 Aug 2015 13:27:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754398AbbHJN1s (ORCPT ); Mon, 10 Aug 2015 09:27:48 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33053 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754371AbbHJN1o (ORCPT ); Mon, 10 Aug 2015 09:27:44 -0400 Received: by pabyb7 with SMTP id yb7so106839420pab.0 for ; Mon, 10 Aug 2015 06:27:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7+Aj7Zcfwy7VPiJ0r8wecn1cmTwfNh9ybF+Zmj3LyS0=; b=dwEP9vZgiuez9P/lNVFu/HkojvNZ949uD0bEpZSR4GzpIwxD3r3w/86uUIUGJNxlvr qVLyXWKfypgsWOZSn5OvrVq2lNHEcjMsvFi23M4CDeS/VIDoteNHR43D79ZnZvJKpngd VDDydiamudQ9/wffxYr8D81G9ImTUC1FnQYIOnOTejrxXHCzcN1A8/DJOpZLvREfHwyt 1W/xcS4wF6PFCoNvLx+4TqLCkrpdpGJ6GvasN35+VK8eHQWyXSYUrPjLTYm/hU4kosSo Tb7yjOuo9SK8hqKQ5oTvrbcnrkFLaEDR+4IrShZsDP7Upf8kMxNIwXUvMsaVYePTm7eu 8YEg== X-Gm-Message-State: ALoCoQlLLfIriK3ieCX1lKX2CDhPtlgwbGBuaS+MLTzuYdRQccI3pSU0cdiHsoHpz63P7rUP7rIJ X-Received: by 10.66.248.9 with SMTP id yi9mr43878688pac.149.1439213264182; Mon, 10 Aug 2015 06:27:44 -0700 (PDT) Received: from localhost ([199.168.112.128]) by smtp.gmail.com with ESMTPSA id zn9sm17002050pac.11.2015.08.10.06.27.41 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Aug 2015 06:27:43 -0700 (PDT) From: Zhichao Huang To: kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, christoffer.dall@linaro.org, marc.zyngier@arm.com, alex.bennee@linaro.org, will.deacon@arm.com Cc: huangzhichao@huawei.com, Zhichao Huang Subject: [PATCH v4 08/15] KVM: arm: add a trace event for cp14 traps Date: Mon, 10 Aug 2015 21:26:00 +0800 Message-Id: <1439213167-8988-9-git-send-email-zhichao.huang@linaro.org> X-Mailer: git-send-email 1.9.5.msysgit.1 In-Reply-To: <1439213167-8988-1-git-send-email-zhichao.huang@linaro.org> References: <1439213167-8988-1-git-send-email-zhichao.huang@linaro.org> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 There are too many cp15 traps, so we don't reuse the cp15 trace event but add a new trace event to trace the access of debug registers. Signed-off-by: Zhichao Huang Acked-by: Christoffer Dall --- arch/arm/kvm/coproc.c | 14 ++++++++++++++ arch/arm/kvm/trace.h | 30 ++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/arch/arm/kvm/coproc.c b/arch/arm/kvm/coproc.c index 2164f4e..d15b250 100644 --- a/arch/arm/kvm/coproc.c +++ b/arch/arm/kvm/coproc.c @@ -643,6 +643,13 @@ int kvm_handle_cp_64(struct kvm_vcpu *vcpu, params.Rt2 = (kvm_vcpu_get_hsr(vcpu) >> 10) & 0xf; params.CRm = 0; + if (global == cp14_regs) + trace_kvm_emulate_cp14_imp(params.Op1, params.Rt1, params.CRn, + params.CRm, params.Op2, params.is_write); + else + trace_kvm_emulate_cp15_imp(params.Op1, params.Rt1, params.CRn, + params.CRm, params.Op2, params.is_write); + if (!emulate_cp(vcpu, ¶ms, target_specific, nr_specific)) return 1; if (!emulate_cp(vcpu, ¶ms, global, nr_global)) @@ -680,6 +687,13 @@ int kvm_handle_cp_32(struct kvm_vcpu *vcpu, params.Op2 = (kvm_vcpu_get_hsr(vcpu) >> 17) & 0x7; params.Rt2 = 0; + if (global == cp14_regs) + trace_kvm_emulate_cp14_imp(params.Op1, params.Rt1, params.CRn, + params.CRm, params.Op2, params.is_write); + else + trace_kvm_emulate_cp15_imp(params.Op1, params.Rt1, params.CRn, + params.CRm, params.Op2, params.is_write); + if (!emulate_cp(vcpu, ¶ms, target_specific, nr_specific)) return 1; if (!emulate_cp(vcpu, ¶ms, global, nr_global)) diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h index 0ec3539..988da03 100644 --- a/arch/arm/kvm/trace.h +++ b/arch/arm/kvm/trace.h @@ -159,6 +159,36 @@ TRACE_EVENT(kvm_emulate_cp15_imp, __entry->CRm, __entry->Op2) ); +/* Architecturally implementation defined CP14 register access */ +TRACE_EVENT(kvm_emulate_cp14_imp, + TP_PROTO(unsigned long Op1, unsigned long Rt1, unsigned long CRn, + unsigned long CRm, unsigned long Op2, bool is_write), + TP_ARGS(Op1, Rt1, CRn, CRm, Op2, is_write), + + TP_STRUCT__entry( + __field( unsigned int, Op1 ) + __field( unsigned int, Rt1 ) + __field( unsigned int, CRn ) + __field( unsigned int, CRm ) + __field( unsigned int, Op2 ) + __field( bool, is_write ) + ), + + TP_fast_assign( + __entry->is_write = is_write; + __entry->Op1 = Op1; + __entry->Rt1 = Rt1; + __entry->CRn = CRn; + __entry->CRm = CRm; + __entry->Op2 = Op2; + ), + + TP_printk("Implementation defined CP14: %s\tp14, %u, r%u, c%u, c%u, %u", + (__entry->is_write) ? "mcr" : "mrc", + __entry->Op1, __entry->Rt1, __entry->CRn, + __entry->CRm, __entry->Op2) +); + TRACE_EVENT(kvm_wfx, TP_PROTO(unsigned long vcpu_pc, bool is_wfe), TP_ARGS(vcpu_pc, is_wfe),