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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 343EEC433F5 for ; Tue, 19 Oct 2021 23:28:29 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 EB43C60FC2 for ; Tue, 19 Oct 2021 23:28:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EB43C60FC2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; 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=axjG+fJSQKIZdNqNGtO3pyhV18h0ZyXZsU8zKFKdBEY=; b=O4OfRk4+RDxsgw T2wB+YSVXBDGJD6pEaoGV6pUTuu2f0PtfyVjwcJPocrV4nhcCuveYlVVOfx8qQT4U+inBGXjYpoHD 1T28tt6covscfK8YLcwnUfjC8vyk1A07VDcdx/ejbP36nffXZZz0C5U+HhlbYIm5CHrTg1cEfJmHY c22cJRQ4NAQmOfQQaNTZgHffcS66+CdtSGb1kXKixImmiBsCMIu/e6XzcoYeDxQq77e8Azb3Kpgfw Qm87cP55k6AyaZDbloZ6PxSh9kqewgMb0O/y6xhGhqSsnQ3M0XnjYQPybvcDj6A3X2kjTpIG0RB1K WZC7L71Vs7x0gN8LDnNQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcyVl-002yDx-Tw; Tue, 19 Oct 2021 23:27:14 +0000 Received: from mail-oi1-f176.google.com ([209.85.167.176]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcyVi-002yDM-2i for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 23:27:11 +0000 Received: by mail-oi1-f176.google.com with SMTP id o83so7367122oif.4 for ; Tue, 19 Oct 2021 16:27:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ittPuaaAb6BbKzqxfVLQuW2CwyJEQqA2ePbGsF19zjE=; b=MUQU98UTvu4tYoVKPKtyX3q1LrH6O8ZgVh8me89lk8BCxxL2vIek/pt0lECb/YpBXY jNTDpbn+ZqN03DY7OiPwFVXITDLc+ex9r2qVIOnOwQXKSTvnIdqv+uD9wmiefRaA4rnw MFZ1I2e+OCFutqUmMTG/tRwZ6BJ1itNZ5m37/W5Zzcvq8GBReO8mtPdUYMO6m6l/vTUR BIjhtA0H3WGQe6KbcyjE3DY2Z88McnkMgPffn1IzUr7dZQJnUv6M1UUfAEIycE8dbrmZ tBnm1NyhUZ3BgfejIQ59pch1EPHETUF9/6OoFBnPFM2r24pBDAUYdHl5nhfMci50p8pD M3qA== X-Gm-Message-State: AOAM531oPl8cHR39WqHfO+eRq2SUnMIvSTjB6oR7aVtf1MgNci8mofxh Xg3lKg/HzjNcSaNdssekpME3pCRhCA== X-Google-Smtp-Source: ABdhPJwfAmKftrawIsbL/H+4+r+nNQRmwOG5i68jp2kA55oez+5lwFCtksS/X0B/5F6t4+cv0yRW7A== X-Received: by 2002:aca:3e8a:: with SMTP id l132mr6195713oia.95.1634685550299; Tue, 19 Oct 2021 16:19:10 -0700 (PDT) Received: from xps15.herring.priv (66-90-148-213.dyn.grandenetworks.net. [66.90.148.213]) by smtp.googlemail.com with ESMTPSA id w141sm118375oif.20.2021.10.19.16.19.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 16:19:09 -0700 (PDT) From: Rob Herring To: Will Deacon , Mark Rutland , Peter Zijlstra Cc: Vince Weaver , honnappa.nagarahalli@arm.com, Zachary.Leaf@arm.com, Catalin Marinas , Ingo Molnar , Arnaldo Carvalho de Melo , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Thomas Gleixner , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, Kan Liang Subject: [PATCH v11 1/5] x86: perf: Move RDPMC event flag to a common definition Date: Tue, 19 Oct 2021 18:19:03 -0500 Message-Id: <20211019231907.1009567-2-robh@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211019231907.1009567-1-robh@kernel.org> References: <20211019231907.1009567-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_162710_131269_47629713 X-CRM114-Status: GOOD ( 21.56 ) 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 In preparation to enable user counter access on arm64 and to move some of the user access handling to perf core, create a common event flag for user counter access and convert x86 to use it. Since the architecture specific flags start at the LSB, starting at the MSB for common flags. Cc: Peter Zijlstra Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Alexander Shishkin Cc: Jiri Olsa Cc: Namhyung Kim Cc: Kan Liang Cc: Thomas Gleixner Cc: Borislav Petkov Cc: x86@kernel.org Cc: "H. Peter Anvin" Cc: linux-perf-users@vger.kernel.org Reviewed-by: Mark Rutland Signed-off-by: Rob Herring --- v11: - Move PERF_EVENT_FLAG_USER_READ_CNT definition above struct --- arch/x86/events/core.c | 10 +++++----- arch/x86/events/perf_event.h | 2 +- include/linux/perf_event.h | 9 +++++++++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 2a57dbed4894..2bd50fc061e1 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -2469,7 +2469,7 @@ static int x86_pmu_event_init(struct perf_event *event) if (READ_ONCE(x86_pmu.attr_rdpmc) && !(event->hw.flags & PERF_X86_EVENT_LARGE_PEBS)) - event->hw.flags |= PERF_X86_EVENT_RDPMC_ALLOWED; + event->hw.flags |= PERF_EVENT_FLAG_USER_READ_CNT; return err; } @@ -2503,7 +2503,7 @@ void perf_clear_dirty_counters(void) static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm) { - if (!(event->hw.flags & PERF_X86_EVENT_RDPMC_ALLOWED)) + if (!(event->hw.flags & PERF_EVENT_FLAG_USER_READ_CNT)) return; /* @@ -2524,7 +2524,7 @@ static void x86_pmu_event_mapped(struct perf_event *event, struct mm_struct *mm) static void x86_pmu_event_unmapped(struct perf_event *event, struct mm_struct *mm) { - if (!(event->hw.flags & PERF_X86_EVENT_RDPMC_ALLOWED)) + if (!(event->hw.flags & PERF_EVENT_FLAG_USER_READ_CNT)) return; if (atomic_dec_and_test(&mm->context.perf_rdpmc_allowed)) @@ -2535,7 +2535,7 @@ static int x86_pmu_event_idx(struct perf_event *event) { struct hw_perf_event *hwc = &event->hw; - if (!(hwc->flags & PERF_X86_EVENT_RDPMC_ALLOWED)) + if (!(hwc->flags & PERF_EVENT_FLAG_USER_READ_CNT)) return 0; if (is_metric_idx(hwc->idx)) @@ -2718,7 +2718,7 @@ void arch_perf_update_userpage(struct perf_event *event, userpg->cap_user_time = 0; userpg->cap_user_time_zero = 0; userpg->cap_user_rdpmc = - !!(event->hw.flags & PERF_X86_EVENT_RDPMC_ALLOWED); + !!(event->hw.flags & PERF_EVENT_FLAG_USER_READ_CNT); userpg->pmc_width = x86_pmu.cntval_bits; if (!using_native_sched_clock() || !sched_clock_stable()) diff --git a/arch/x86/events/perf_event.h b/arch/x86/events/perf_event.h index e3ac05c97b5e..49f68b15745f 100644 --- a/arch/x86/events/perf_event.h +++ b/arch/x86/events/perf_event.h @@ -73,7 +73,7 @@ static inline bool constraint_match(struct event_constraint *c, u64 ecode) #define PERF_X86_EVENT_PEBS_NA_HSW 0x0010 /* haswell style datala, unknown */ #define PERF_X86_EVENT_EXCL 0x0020 /* HT exclusivity on counter */ #define PERF_X86_EVENT_DYNAMIC 0x0040 /* dynamic alloc'd constraint */ -#define PERF_X86_EVENT_RDPMC_ALLOWED 0x0080 /* grant rdpmc permission */ + #define PERF_X86_EVENT_EXCL_ACCT 0x0100 /* accounted EXCL event */ #define PERF_X86_EVENT_AUTO_RELOAD 0x0200 /* use PEBS auto-reload */ #define PERF_X86_EVENT_LARGE_PEBS 0x0400 /* use large PEBS */ diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index fe156a8170aa..34ebcc9af608 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -128,6 +128,15 @@ struct hw_perf_event_extra { int idx; /* index in shared_regs->regs[] */ }; +/** + * hw_perf_event::flag values + * + * PERF_EVENT_FLAG_ARCH bits are reserved for architecture-specific + * usage. + */ +#define PERF_EVENT_FLAG_ARCH 0x0000ffff +#define PERF_EVENT_FLAG_USER_READ_CNT 0x80000000 + /** * struct hw_perf_event - performance event hardware details: */ -- 2.32.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel