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.0 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,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 48F24C433B4 for ; Tue, 20 Apr 2021 03:17:54 +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 B4A01600EF for ; Tue, 20 Apr 2021 03:17:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B4A01600EF 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=0UlVYP0GSHvfgvDrwcCSGutA8as9igdXzK93aHjmToQ=; b=qjj9TCCbGQ97bTXIFd0Y74oQ0 H251lOOvP2HEeQhCd7ahd0V7RsmsYQa6o+CewqUyN9GjvJuw5HJAoobUuk9y70PJV2wLogrJqD6nW 7TKoHyjvE5uFqV9apaCAt3p2joUoj6ZgLdvbw2PAH5JvHRksvODHGVuN/jttejoLhELC9dSXvEnbo tQb+m0RUczXXzCjuPiRPI2sC9KI6RLAVJBhNy5upj84YzW0LwxS8JmH86QaIKxXm62WE8meIFg0bv AssjwzVrv+/Sj622M+GJpxsRpkJd8K+IpsI0FF26OptRXXex7d3LXw9aRAM8lRwxTMhcDGc9I4rlH IY/0i8Rzg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lYgrw-00B3Fm-RL; Tue, 20 Apr 2021 03:16:09 +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 1lYgrI-00B37a-MB for linux-arm-kernel@desiato.infradead.org; Tue, 20 Apr 2021 03:15:29 +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=fe06l4mMv/umMH3B2MqQPjc0UcqJVWjftNupHuwIv3M=; b=StK0kiYgp66U7cGLen5VjC6jjj HmQmKRbw3iICMY4SOFifinz7Nvt04Zcw0pNjsQjPFuIXxS1394LLXZFbz9UseMzjh6g4u0NoiLt1r K4LuxXB1qN6AajSxbXa3nMYj+D3tZA6dNT0I2Ih0GVOuFGwEAmZVi/ua7qBW6Ym9TwCnxWMQDP5+x SK/dyQxUICW753BM8bkcHTYrqgtEWJfP/8/7QXwFcATb8xuknNAOa3nbBWf+JAd2SoQekRF/2IEEc ZtS5p/g9Pzw/xz5+J9OYrKdS+mVFbfWk5g426cztO+BT5a7LJdsOKkGELbo7QlC+Lug+BMpUarQUv DiPSqJnA==; Received: from mail-oi1-f176.google.com ([209.85.167.176]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lYgrE-00BmjF-Rq for linux-arm-kernel@lists.infradead.org; Tue, 20 Apr 2021 03:15:27 +0000 Received: by mail-oi1-f176.google.com with SMTP id r186so9834560oif.8 for ; Mon, 19 Apr 2021 20:15:23 -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=fe06l4mMv/umMH3B2MqQPjc0UcqJVWjftNupHuwIv3M=; b=rHo1gREriFHkRPrHSZi/6ZXg7SzwfpW1uo/IM4ZYEWakFJReFwdGMwayUAs0ICPPTv MrJLbtvfXFh0f/K9LKE8q6JlRthpFRAvmpguSpDN2qAzxpQ5cyPxoMGjpUCDg0vo3Vrn oOjpu9h2SdcHuDz2cgcfMj1g4ScalMjRfhWIh1kI0s71E5R0QMrb9pR2UvId97vzbpq1 XmCVgOTrRS2pgZsLxtYMoEysuXD8Ut9cLpml8gcsIN32BYnOZJAhcCcIIG5Clk2AcZ+6 AwgcLx1czveBwDRr9PljLoEXdQB72boyznaZJgj7Ot2KrKspVwggf7ZkhB09BnB4qyZh HoMg== X-Gm-Message-State: AOAM531Q8UXX6wqYbSmfyin1LMzkGoUm7+HMgAuayNt0uRaubZ1Wtsrg H1cg5amJREpus47W8LFLtA== X-Google-Smtp-Source: ABdhPJwFnnE12a945ApPg7D1QPBH7crLjsZAs4f3E13EDN8Kbcjr0x4ok7Ya+2cNi/5hbw+8ooiSJA== X-Received: by 2002:aca:33d5:: with SMTP id z204mr1633768oiz.32.1618888522872; Mon, 19 Apr 2021 20:15:22 -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 g16sm2347896oof.43.2021.04.19.20.15.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Apr 2021 20:15:21 -0700 (PDT) From: Rob Herring To: Will Deacon , Catalin Marinas , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa , Mark Rutland Cc: 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 v7 5/9] arm64: perf: Add userspace counter access disable switch Date: Mon, 19 Apr 2021 22:15:07 -0500 Message-Id: <20210420031511.2348977-6-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210420031511.2348977-1-robh@kernel.org> References: <20210420031511.2348977-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210419_201524_921938_53730D42 X-CRM114-Status: GOOD ( 21.52 ) 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 --- arch/arm64/kernel/perf_event.c | 61 ++++++++++++++++++++++++++++++++-- include/linux/perf/arm_pmu.h | 4 ++- 2 files changed, 61 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index bfbb7f449aca..1ab6308ca89c 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -336,6 +336,54 @@ static const struct attribute_group armv8_pmuv3_caps_attr_group = { .attrs = armv8_pmuv3_caps_attrs, }; +static void armv8pmu_disable_user_access(void *mm); + +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, 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 */ @@ -950,7 +998,8 @@ static void armv8pmu_sched_task(struct perf_event_context *ctx, bool sched_in) * If a new task has user access enabled, clear the dirty counters * to prevent the potential leak. */ - if (ctx && current->mm && atomic_read(¤t->mm->context.pmu_direct_access)) { + if (ctx && to_arm_pmu(ctx->pmu)->attr_rdpmc && + current->mm && atomic_read(¤t->mm->context.pmu_direct_access)) { armv8pmu_enable_user_access(); armv8pmu_clear_dirty_counters(to_arm_pmu(ctx->pmu)); } else { @@ -1093,7 +1142,8 @@ static int __armv8_pmuv3_map_event(struct perf_event *event, &armv8_pmuv3_perf_cache_map, ARMV8_PMU_EVTYPE_EVENT); - if (armv8pmu_event_want_user_access(event) || !armv8pmu_event_is_64bit(event)) + if (armpmu->attr_rdpmc && + (armv8pmu_event_want_user_access(event) || !armv8pmu_event_is_64bit(event))) event->hw.flags |= ARMPMU_EL0_RD_CNTR; /* @@ -1218,7 +1268,9 @@ static int armv8pmu_probe_pmu(struct arm_pmu *cpu_pmu) static int armv8pmu_undef_handler(struct pt_regs *regs, u32 insn) { - if (atomic_read(¤t->mm->context.pmu_direct_access)) { + struct arm_pmu *armpmu = *this_cpu_ptr(&cpu_armpmu); + + if (armpmu->attr_rdpmc && atomic_read(¤t->mm->context.pmu_direct_access)) { armv8pmu_enable_user_access(); return 0; } @@ -1277,6 +1329,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 1daad3b2cce5..9303cd07ac57 100644 --- a/include/linux/perf/arm_pmu.h +++ b/include/linux/perf/arm_pmu.h @@ -82,6 +82,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 }; @@ -107,7 +108,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