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: 54134 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id 07E1B22B1E for ; Thu, 24 Sep 2015 22:33:37 +0000 (UTC) Received: by laff1 with SMTP id f1sf29361307laf.2 for ; Thu, 24 Sep 2015 15:33:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:cc:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=PEuooATsBeTsoVFgrEK28YbBQyIALJS+OpPtCpNcIRE=; b=D5FllEmD/KJfGxaSg2eNwoEdpcd3ayZER7nXvQopn1MWR/9BJlkFLB1cUwnhNSt6Gi D/fjkkU3YS6hFpXk6a2gN6Z6Ny2RcGb9B0N5XRDvjpRFKU8jCu70a4F094mXO4tHGa+J XzNT74XFyORamlAt2fS1kSD3g3v6+faKJY+0TnVVFAUPWSuRGKbiJrFSZgtK5witxdn8 8fL5ZgouyAgsw4F0ZgaXgDP+ACw/pAkDIcx0yEb3R875UKOjTO3Apbkz1fxYPjsoarSq q7MDdfTVBFeDfcsYWneDJfSn47oq53BECKJAIAzU3JdG1ttXKDi+UWGyPgnRck1YRgLo FRnA== X-Gm-Message-State: ALoCoQnCuYN31Cp655j/9RBI6yTs2A8swu7hxcrIXuVa+Tl6o+9Qr4LMZDG/VnpuARGeWp8UNuwJ X-Received: by 10.112.189.105 with SMTP id gh9mr333798lbc.16.1443134015871; Thu, 24 Sep 2015 15:33:35 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.7.170 with SMTP id dd10ls137143lad.32.gmail; Thu, 24 Sep 2015 15:33:35 -0700 (PDT) X-Received: by 10.112.162.2 with SMTP id xw2mr595635lbb.98.1443134015539; Thu, 24 Sep 2015 15:33:35 -0700 (PDT) Received: from mail-la0-f48.google.com (mail-la0-f48.google.com. [209.85.215.48]) by mx.google.com with ESMTPS id t1si247315lbk.72.2015.09.24.15.33.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 15:33:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) client-ip=209.85.215.48; Received: by lacrr8 with SMTP id rr8so775661lac.2 for ; Thu, 24 Sep 2015 15:33:35 -0700 (PDT) X-Received: by 10.152.18.225 with SMTP id z1mr611951lad.88.1443134015392; Thu, 24 Sep 2015 15:33:35 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp585457lbq; Thu, 24 Sep 2015 15:33:34 -0700 (PDT) X-Received: by 10.68.197.7 with SMTP id iq7mr2666753pbc.108.1443134014294; Thu, 24 Sep 2015 15:33:34 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id dd6si703040pad.84.2015.09.24.15.33.34 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 Sep 2015 15:33:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZfF44-0007BX-HQ; Thu, 24 Sep 2015 22:32:32 +0000 Received: from mail-pa0-f42.google.com ([209.85.220.42]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZfF3p-0006pP-0b for linux-arm-kernel@lists.infradead.org; Thu, 24 Sep 2015 22:32:18 +0000 Received: by pacgz1 with SMTP id gz1so2632070pac.3 for ; Thu, 24 Sep 2015 15:31:56 -0700 (PDT) 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150924_153217_321282_99EEA730 X-CRM114-Status: GOOD ( 20.66 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.42 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.220.42 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Cc: wei@redhat.com, kvm@vger.kernel.org, marc.zyngier@arm.com, will.deacon@arm.com, peter.huangpeng@huawei.com, linux-arm-kernel@lists.infradead.org, alex.bennee@linaro.org, christoffer.dall@linaro.org, shannon.zhao@linaro.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: shannon.zhao@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.48 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 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