From patchwork Thu Nov 15 12:55:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Murray X-Patchwork-Id: 10684285 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BC7FF14DB for ; Thu, 15 Nov 2018 12:56:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A93C628F21 for ; Thu, 15 Nov 2018 12:56:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DA5A2C55D; Thu, 15 Nov 2018 12:56:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4EA3228F21 for ; Thu, 15 Nov 2018 12:56:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=lT3adTXR8eHeenjQsbwlWx85/MBXRsyLg8/Mu/jH4d8=; b=aQ7RSKBr1nhv7iMzQio4903xwP 9M0OHpdzttjjRvo5jtriFXv7oG1TI2+QMdhQfXhuqzU04Hna2gQV56gisd8caARedbtyhvbgcCQ4A xVAgzczizee9j9WwX/HdjwWi15qJNnsM7DwlBN7FhMaApqCqorW9nf+mPVbN+ml4NgPRhUdHKSv5A N8tHKLQDuX6G6JZw2tWsECd+6RFzEdZhe4UaWf7lMFjSsSLn5uLu1SVagN5ViC606BV7V7m/YpXnS BAandr/Pno081fEqkCbF8AboNQ4InFQpOuXsq/BPgh3htiuj9QbgkH9zHUoChNWRYQ2og8h2gc149 KIcBM8Fg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNHCF-0006Nn-Gj; Thu, 15 Nov 2018 12:56:35 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNHBu-0005zu-5M for linux-arm-kernel@bombadil.infradead.org; Thu, 15 Nov 2018 12:56:14 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=y6NPgQZBpfhI9EXwfX6bxgJr+XTPHrvkjo5m3qIZO7k=; b=Kn97zsO1vaPfzHQr3TtrnTEel swtPHCAhyMZz53LfHpJi+yyBJrEbP0bOEoC6bW2GWYUkiXbAAAUCYZe2x9tBIGm4vyX9mBeqRJyST 4nuE5ivAcNdZzgwe9xxAmZ24T2e0Lnz/CBzPsjqrTY/hyfYbFSFT2u5GvGURDOaVOFZHIt6Y9jN2b pXo8JXJbBTEFGa3XtPfqTTZfVYAyifojLhl40X3gUmBEnfk6FY0bfM2rIWfn0SuHejtoUahYevPFB RwqJKm4h4f+MQluYOr2J8Hw1XQPGC5sJdL7BjlnFgfpECy7bBSSkCTXELZ92AnNjWyYPOR5ycW41I cTDV5J23w==; Received: from foss.arm.com ([217.140.101.70]) by casper.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gNHBo-0004Ec-Qn for linux-arm-kernel@lists.infradead.org; Thu, 15 Nov 2018 12:56:12 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 13CB615AD; Thu, 15 Nov 2018 04:56:02 -0800 (PST) Received: from e119886-lin.cambridge.arm.com (unknown [10.37.6.11]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7952C3F5CF; Thu, 15 Nov 2018 04:56:00 -0800 (PST) From: Andrew Murray To: Christoffer Dall , Marc Zyngier , Catalin Marinas , Will Deacon , Mark Rutland Subject: [PATCH 3/4] arm64: arm_pmu: Exclude EL1,2 with :G :H perf attributes Date: Thu, 15 Nov 2018 12:55:48 +0000 Message-Id: <1542286549-4501-4-git-send-email-andrew.murray@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1542286549-4501-1-git-send-email-andrew.murray@arm.com> References: <1542286549-4501-1-git-send-email-andrew.murray@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181115_125609_009527_8FFDC37F X-CRM114-Status: GOOD ( 12.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP When using VHE, EL1 is unused by the host and EL2 is unused by the guest - therefore we can filter out these events with the PMU as per the 'exclude_host' and 'exclude_guest' attributes. With both VHE and non-VHE we switch the counters between host/guest at EL2. With non-VHE when using 'exclude_host' we filter out EL2. These changes eliminate counters counting host events on the boundaries of guest entry/exit when using :G. However when using :H unless exclude_hv is set on non-VHE then there is a small blackout window at the guest entry/exit where host events are not captured. Signed-off-by: Andrew Murray --- arch/arm64/kernel/perf_event.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 89d444f..c079c1f 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -971,12 +971,14 @@ static int armv8pmu_set_event_filter(struct hw_perf_event *event, * with other architectures (x86 and Power). */ if (is_kernel_in_hyp_mode()) { - if (!attr->exclude_kernel) + if (!attr->exclude_kernel && !attr->exclude_host) config_base |= ARMV8_PMU_INCLUDE_EL2; + if (attr->exclude_guest) + config_base |= ARMV8_PMU_EXCLUDE_EL1; } else { if (attr->exclude_kernel) config_base |= ARMV8_PMU_EXCLUDE_EL1; - if (!attr->exclude_hv) + if (!attr->exclude_hv && !attr->exclude_host) config_base |= ARMV8_PMU_INCLUDE_EL2; } if (attr->exclude_user)