From patchwork Thu Sep 24 22:31:07 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shannon Zhao X-Patchwork-Id: 7261181 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 71325BEEC1 for ; Thu, 24 Sep 2015 22:32:02 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6FCD320B29 for ; Thu, 24 Sep 2015 22:32:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57F6220B27 for ; Thu, 24 Sep 2015 22:32:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932083AbbIXWb5 (ORCPT ); Thu, 24 Sep 2015 18:31:57 -0400 Received: from mail-pa0-f44.google.com ([209.85.220.44]:34559 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751738AbbIXWb4 (ORCPT ); Thu, 24 Sep 2015 18:31:56 -0400 Received: by padhy16 with SMTP id hy16so85156685pad.1 for ; Thu, 24 Sep 2015 15:31:56 -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=XZovsRaLpfmdyLdPzhqvKQeRIoIhwcWTR/hDNGx0axo=; b=WB+2apcySnEkPmKinyxQqViDh7Dli6lbVtlgBRUKJfX1WlwoUYiN19A1hnxfoClPIb GuLAe69YX184/s5YbeW0Oe56XGTktOLNdTMJgN+UEUa4IR/1b4ipyk47tYxwwskH6LIh dSiszCSNRPLt6zi78rZtnhZcTpDINtHhDrSlt7poiXVCO/tPHQOHUrBZ5DDRo4cnLuYp GiKpa7YfSJoiDtOzgb+G8GD+F/wC/t28EBn2mwd5MPdp5Csd2h1xCPPbCYreqWqa6brV dfHB5r2qn0WNj2UXf8A0Up8pZ7kdv5cf9anltac8YAUeoT3NIQ8UkpT4v00AkzMcKvvj EynA== X-Gm-Message-State: ALoCoQlNoYXX46EjQ/fOweQFQrWod2a4TYenskAYDAOfbgaCdUfBQ4y9vVLrxnRI72wAj29BaSIM X-Received: by 10.66.97.102 with SMTP id dz6mr2657682pab.29.1443133916415; Thu, 24 Sep 2015 15:31:56 -0700 (PDT) Received: from localhost.localdomain ([40.139.248.3]) by smtp.gmail.com with ESMTPSA id ll9sm325723pbc.42.2015.09.24.15.31.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Sep 2015 15:31:55 -0700 (PDT) From: Shannon Zhao To: kvmarm@lists.cs.columbia.edu Cc: linux-arm-kernel@lists.infradead.org, kvm@vger.kernel.org, marc.zyngier@arm.com, christoffer.dall@linaro.org, will.deacon@arm.com, wei@redhat.com, alex.bennee@linaro.org, peter.huangpeng@huawei.com, shannon.zhao@linaro.org Subject: [PATCH v3 02/20] KVM: ARM64: Define PMU data structure for each vcpu Date: Thu, 24 Sep 2015 15:31:07 -0700 Message-Id: <1443133885-3366-3-git-send-email-shannon.zhao@linaro.org> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1443133885-3366-1-git-send-email-shannon.zhao@linaro.org> References: <1443133885-3366-1-git-send-email-shannon.zhao@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 Here we plan to support virtual PMU for guest by full software emulation, so define some basic structs and functions preparing for futher steps. Define struct kvm_pmc for performance monitor counter and struct kvm_pmu for performance monitor unit for each vcpu. According to ARMv8 spec, the PMU contains at most 32(ARMV8_MAX_COUNTERS) counters. Since this only supports ARM64 (or PMUv3), add a separate config symbol for it. Signed-off-by: Shannon Zhao --- arch/arm64/include/asm/kvm_host.h | 2 ++ arch/arm64/kvm/Kconfig | 8 ++++++++ include/kvm/arm_pmu.h | 40 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+) create mode 100644 include/kvm/arm_pmu.h diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h index 415938d..6a246a3 100644 --- a/arch/arm64/include/asm/kvm_host.h +++ b/arch/arm64/include/asm/kvm_host.h @@ -42,6 +42,7 @@ #include #include +#include #define KVM_VCPU_MAX_FEATURES 3 @@ -135,6 +136,7 @@ struct kvm_vcpu_arch { /* VGIC state */ struct vgic_cpu vgic_cpu; struct arch_timer_cpu timer_cpu; + struct kvm_pmu pmu; /* * Anything that is not used directly from assembly code goes diff --git a/arch/arm64/kvm/Kconfig b/arch/arm64/kvm/Kconfig index bfffe8f..3c7c58d 100644 --- a/arch/arm64/kvm/Kconfig +++ b/arch/arm64/kvm/Kconfig @@ -31,6 +31,7 @@ config KVM select KVM_VFIO select HAVE_KVM_EVENTFD select HAVE_KVM_IRQFD + select KVM_ARM_PMU ---help--- Support hosting virtualized guest machines. @@ -52,4 +53,11 @@ config KVM_ARM_MAX_VCPUS large, so only choose a reasonable number that you expect to actually use. +config KVM_ARM_PMU + bool + depends on KVM_ARM_HOST + ---help--- + Adds support for a virtual Performance Monitoring Unit (PMU) in + virtual machines. + endif # VIRTUALIZATION diff --git a/include/kvm/arm_pmu.h b/include/kvm/arm_pmu.h new file mode 100644 index 0000000..bb0cd21 --- /dev/null +++ b/include/kvm/arm_pmu.h @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2015 Linaro Ltd. + * Author: Shannon Zhao + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#ifndef __ASM_ARM_KVM_PMU_H +#define __ASM_ARM_KVM_PMU_H + +#include +#include + +struct kvm_pmc { + u8 idx;/* index into the pmu->pmc array */ + struct perf_event *perf_event; + struct kvm_vcpu *vcpu; +}; + +struct kvm_pmu { +#ifdef CONFIG_KVM_ARM_PMU + /* PMU IRQ Number per VCPU */ + int irq_num; + /* IRQ pending flag */ + bool irq_pending; + struct kvm_pmc pmc[ARMV8_MAX_COUNTERS]; +#endif +}; + +#endif