From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1846C43462 for ; Mon, 17 May 2021 19:57:02 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5037B60FF3 for ; Mon, 17 May 2021 19:57:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5037B60FF3 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1P7ZUe/krifKBPvQ1bScZdKedS7nMjkfM8VuXAFVAgs=; b=EBQjXKb/mPF+dPcaZ0EZxzPyA Gxl0pVcmToT4Jj2rMYlmT5Ndx2NGciyaFUffotpEcwkJbu75XA2jO6iwQi6+JHy0MkBFaRmouO/XL bDxBb1/xWhkSgEsUA+qc4WSWWuvGNHNupBA2v14gn6quXcBNe8pIKL4uLxQeHJUpv48DH6XzMIwkn LfNKE2xNFtUdcAbbKgWHxEI+i73/KbIafrjUn4yu4EHL+AhzBV1rqTHqwBkOJsWellL3CUPpwFWt6 tbrGXKq+v8ELMw7V3dl1cQQpbBmnGpl3lCyGD27ABdkBJzlfCaW+QlNsKbCs2wtmN95hIp+KfLtin I1NrBxdOg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lijKV-00FzQv-9l; Mon, 17 May 2021 19:55:07 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lijJj-00FzGt-Pu for linux-arm-kernel@desiato.infradead.org; Mon, 17 May 2021 19:54:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=4cNBCoea0mf78a2MH4F0spkjulstbsJuX6u2flP4NwM=; b=2yHSbsggiwRH12slo5FzPggciG mI/ldFC1BF5TkKWA6plvIsUGQ2iD0KD/jk70jvG3EU79CIQbKlrBTQCNCp2SnljAEdcu98JnowUqh HnTPlx6FFQRc7JqewUVhoc0Zyog9j7KNpX8xLLzvXIJrojVbKtH1ebDPryBg2IlBV+qUfAexZv5Hd 9wDreQd0Ijc/Z+8RFUqcu7wTUQyHxhXvA2wA9fl5BWkVji5iSUlLZ+KbGTfCxnAO0jzpm/dHoE4x6 4aTOZXoDcwvLlIYN/KkaA6SlQk/peyOFfYE9S321aN+W3x4scBjXLgZHO0GLG5fYQJlerLGsBYJ3p O7tnT+QA==; Received: from mail-oi1-f173.google.com ([209.85.167.173]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lijJg-00E6bA-CY for linux-arm-kernel@lists.infradead.org; Mon, 17 May 2021 19:54:18 +0000 Received: by mail-oi1-f173.google.com with SMTP id c3so7566431oic.8 for ; Mon, 17 May 2021 12:54:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4cNBCoea0mf78a2MH4F0spkjulstbsJuX6u2flP4NwM=; b=b/SVkGUU26LO0TdELIPkLX/couXFF+NjKGyZYOoujv02GfpB8Koy/cNO5f5g6eAQ5S wA0K32JmVoVqsIIFqHzT2HP/YMH2Alpjpbpvi+3wkIbRgKbTxrHJ9a8HFFCl+L9m2fm4 TxLkU4HmpCxL90gf3QM8PkNDTKNiJhFFTtsLsSmhIvXr2xpnjrXtMS2xz/4BjFOHLoU3 e8Ywxprg41Sl3F4sRcg5uxLr6CfTvf8UDHTE+bL24N3simWOyeep8qSThDux6FoSqMpR y4CbwlDqD+UwT91b4hecpYZLlqSJwbX1/sfOUyaVcW+ncNB29B1YUwZ3DOQX7KXaC8YH uizQ== X-Gm-Message-State: AOAM5309aHBZqm3FPH1Ja6kkdXiwuw/g7eh96/Bal/zZSI6vHVwfvVgi Pz6FLb6itNYcbUahwfKBjA== X-Google-Smtp-Source: ABdhPJwsT9q/WJRnG8Ec/1MXZWl7bJ6fKA4esaU21p/pJRaBjygtmPU1lk3pGfOayWL+IWpPgQCGHg== X-Received: by 2002:a05:6808:13d5:: with SMTP id d21mr1087201oiw.31.1621281255773; Mon, 17 May 2021 12:54:15 -0700 (PDT) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id m81sm2920758oig.43.2021.05.17.12.54.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 May 2021 12:54:14 -0700 (PDT) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Mark Rutland Cc: Arnaldo Carvalho de Melo , Jiri Olsa , Kan Liang , Ian Rogers , Alexander Shishkin , honnappa.nagarahalli@arm.com, Zachary.Leaf@arm.com, Raphael Gault , Jonathan Cameron , Namhyung Kim , Itaru Kitayama , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 4/5] arm64: perf: Add userspace counter access disable switch Date: Mon, 17 May 2021 14:54:04 -0500 Message-Id: <20210517195405.3079458-5-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210517195405.3079458-1-robh@kernel.org> References: <20210517195405.3079458-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210517_125416_448751_42ADFECD X-CRM114-Status: GOOD ( 22.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Like x86, some users may want to disable userspace PMU counter altogether. Add a sysfs 'rdpmc' file to control userspace counter access. The default is '1' which is enabled. Writing '0' disables access. In the case of multiple PMUs (i.e. big.LITTLE), the control is per PMU and userspace must disable access on each PMU. Note that x86 also supports writing '2' to globally enable user access. As there's not existing userspace support to worry about, this shouldn't be necessary for Arm. It could be added later if the need arises. Signed-off-by: Rob Herring --- v8: - Adjust due to patch 3 changes v7: - New patch --- arch/arm64/kernel/perf_event.c | 64 ++++++++++++++++++++++++++++++++-- include/linux/perf/arm_pmu.h | 4 ++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index dc79cf7b58ee..4e7b93c23db9 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -334,6 +334,60 @@ static const struct attribute_group armv8_pmuv3_caps_attr_group = { .attrs = armv8_pmuv3_caps_attrs, }; +static void armv8pmu_disable_user_access(void); + +static void armv8pmu_disable_user_access_ipi(void *unused) +{ + armv8pmu_disable_user_access(); +} + +static ssize_t get_attr_rdpmc(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct pmu *pmu = dev_get_drvdata(dev); + struct arm_pmu *cpu_pmu = container_of(pmu, struct arm_pmu, pmu); + + return snprintf(buf, 40, "%d\n", cpu_pmu->attr_rdpmc); +} + +static ssize_t set_attr_rdpmc(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct pmu *pmu = dev_get_drvdata(dev); + struct arm_pmu *cpu_pmu = container_of(pmu, struct arm_pmu, pmu); + unsigned long val; + ssize_t ret; + + ret = kstrtoul(buf, 0, &val); + if (ret) + return ret; + + if (val > 1) + return -EINVAL; + + if (!!val != cpu_pmu->attr_rdpmc) { + cpu_pmu->attr_rdpmc = !!val; + if (!val) + on_each_cpu_mask(&cpu_pmu->supported_cpus, + armv8pmu_disable_user_access_ipi, NULL, 1); + } + + return count; +} + +static DEVICE_ATTR(rdpmc, S_IRUSR | S_IWUSR, get_attr_rdpmc, set_attr_rdpmc); + +static struct attribute *armv8_pmuv3_rdpmc_attrs[] = { + &dev_attr_rdpmc.attr, + NULL, +}; + +static const struct attribute_group armv8_pmuv3_rdpmc_attr_group = { + .attrs = armv8_pmuv3_rdpmc_attrs, +}; + /* * Perf Events' indices */ @@ -711,6 +765,9 @@ static void armv8pmu_enable_user_access(struct arm_pmu *cpu_pmu) { struct pmu_hw_events *cpuc = this_cpu_ptr(cpu_pmu->hw_events); + if (!cpu_pmu->attr_rdpmc) + return; + if (!bitmap_empty(cpuc->dirty_mask, ARMPMU_MAX_HWEVENTS)) { int i; /* Don't need to clear assigned counters. */ @@ -918,7 +975,7 @@ static void armv8pmu_clear_event_idx(struct pmu_hw_events *cpuc, static int armv8pmu_access_event_idx(struct perf_event *event) { - if (!(event->hw.flags & ARMPMU_EL0_RD_CNTR)) + if (!to_arm_pmu(event->pmu)->attr_rdpmc || !(event->hw.flags & ARMPMU_EL0_RD_CNTR)) return 0; /* @@ -1071,7 +1128,7 @@ static int __armv8_pmuv3_map_event(struct perf_event *event, event->hw.flags |= ARMPMU_EVT_64BIT; /* Userspace counter access only enabled if requested and a per task event */ - if (armv8pmu_event_want_user_access(event) && event->hw.target) + if (to_arm_pmu(event->pmu)->attr_rdpmc && armv8pmu_event_want_user_access(event) && event->hw.target) event->hw.flags |= ARMPMU_EL0_RD_CNTR; /* Only expose micro/arch events supported by this PMU */ @@ -1219,6 +1276,9 @@ static int armv8_pmu_init(struct arm_pmu *cpu_pmu, char *name, cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_CAPS] = caps ? caps : &armv8_pmuv3_caps_attr_group; + cpu_pmu->attr_groups[ARMPMU_ATTR_GROUP_RDPMC] = &armv8_pmuv3_rdpmc_attr_group; + cpu_pmu->attr_rdpmc = true; + return 0; } diff --git a/include/linux/perf/arm_pmu.h b/include/linux/perf/arm_pmu.h index 02ab0010c6d0..2ecd41df29dd 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -81,6 +81,7 @@ enum armpmu_attr_groups { ARMPMU_ATTR_GROUP_EVENTS, ARMPMU_ATTR_GROUP_FORMATS, ARMPMU_ATTR_GROUP_CAPS, + ARMPMU_ATTR_GROUP_RDPMC, ARMPMU_NR_ATTR_GROUPS }; @@ -106,7 +107,8 @@ struct arm_pmu { int (*map_event)(struct perf_event *event); int (*filter_match)(struct perf_event *event); int num_events; - bool secure_access; /* 32-bit ARM only */ + bool secure_access:1; /* 32-bit ARM only */ + bool attr_rdpmc:1; #define ARMV8_PMUV3_MAX_COMMON_EVENTS 0x40 DECLARE_BITMAP(pmceid_bitmap, ARMV8_PMUV3_MAX_COMMON_EVENTS); #define ARMV8_PMUV3_EXT_COMMON_EVENT_BASE 0x4000 -- 2.27.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel