From patchwork Fri Jul 23 16:54:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Leach X-Patchwork-Id: 12396333 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=-18.2 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 2C13CC4338F for ; Fri, 23 Jul 2021 16:58:08 +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 F134760E8F for ; Fri, 23 Jul 2021 16:58:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F134760E8F Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id: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=U4KJtyfbklWkaB/vs/RXEBj1J1hw5tTooSH2oxBUzvA=; b=rU4bG4qc963UEJ Aw9JrERg5WAJ+S5Yi8y/TqzxaNdzGCJLQEq9LHXgJ0UWwG3YP2uqNgTSyfC1WgI2dzYKkFMgxjo+T q2r5Yv7UfKI7JzK3jCFfmjnps8eqaq7K+alqOGcXvb2asehmqaB5TtlmOhFC+Tmxn5KSogmLtHKHn TUKVSug0LDjkm4qdOdsRUtKPlQ4KEzvRKWmlzdLBcIEcES7xwXUSbmTXNyT/CXhhOnd4G7aSTZME4 Lf849jENVGph4Ug+a7hQVjoBTxMstCFLWCbuMD19Nxr4zRnugLoMkMt3EWRy+YfVUYP9HMXTrLXiR fjnL7O83GFFSxmz6x49w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6yT1-005Np9-U1; Fri, 23 Jul 2021 16:56:08 +0000 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m6yRp-005NTd-EV for linux-arm-kernel@lists.infradead.org; Fri, 23 Jul 2021 16:54:55 +0000 Received: by mail-wm1-x334.google.com with SMTP id a80-20020a1c98530000b0290245467f26a4so2057545wme.0 for ; Fri, 23 Jul 2021 09:54:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ABwZIw+GuHuxpYSzBenQkHeYDXmCXaPxspUFiSW1wck=; b=pw2y8LlVvafgqp8yk4yW9Qv9oeKP51Ef8Vn63xUM2CjX6emH9TU0tPDxmLvEyr2Qdb 1tSMUbNeLfMNfdxTlwl3O0DjOWN9O8CZO23WlwyBjSJ4OwNBs2fhrV4SD7YBN5xBbDLI 0H36RkQmnKQb6Jb5pgrwxD54NQ+YcUHQQXVlKYlHt7DZ+cnC3lcdw6mATvjeArGlZgks uFNBSnHpIjGTDvOjhNa+Sxj/X6zKRwiTNeNFhRVhTeqmdFqPVYZeWr8S718OiQZ6lrlP bYZxbavryyjRsZbbcsw5FIQiMajT4u1QIDIdBhcj+THiAIKTHr9sfxgwoPoU+zX1l55Y Kq8w== 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; bh=ABwZIw+GuHuxpYSzBenQkHeYDXmCXaPxspUFiSW1wck=; b=dG++gVCi/8j8Jw7YyIZbCdY+CwLcPKA91YkkFDCW9Va+QLVCo1n44/e+1U6UUMCMGh 6MO7LrRc3t3DEXdKLWgaglXIKWQYj9SUQqeuK9kK/4aM435gdFQAee2KobWkBXu0Wk6r C3/7ozfH/V7U6W1sAoAY8N71GhFG3T/KsDfpYIq1uQE/wxrF5DmAz7/JpjpNnp0jnlzd 5M9KTEdWs3LE3GZeq9GWMrCMNk2bSX9XrXWdVyI574CqnmaXHq07Qzp3is3xCHqQOsEQ F7tDQ7sRrVzeXfrsIEat5ioILWwSmVfhEde7g41gSYaYxOFCt9CuUX0/o3Tn5590n1lW k7/w== X-Gm-Message-State: AOAM530iZ19j+yYLPaASG4q/XwmAgcUHDq7D0qTPdGx5eh1g9FegP1bR ApLb7tccBGvpxViWP2q6CKKCMCURPNRjug== X-Google-Smtp-Source: ABdhPJw3zayoDJdZLmgCzJQSMtm4EIMSBkw8dYeqlowjoDLt6ghMV+fSGyqbWNtMWgETJIo25l879w== X-Received: by 2002:a7b:ca59:: with SMTP id m25mr14941497wml.74.1627059291665; Fri, 23 Jul 2021 09:54:51 -0700 (PDT) Received: from linaro.org ([2a00:23c5:6809:2201:fdab:eb9d:1515:bff3]) by smtp.gmail.com with ESMTPSA id z11sm33193225wru.65.2021.07.23.09.54.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jul 2021 09:54:51 -0700 (PDT) From: Mike Leach To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, mathieu.poirier@linaro.org, suzuki.poulose@arm.com Cc: yabinc@google.com, leo.yan@linaro.org, alexander.shishkin@linux.intel.com, tingwei@codeaurora.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Mike Leach Subject: [PATCH v9 06/10] coresight: etm-perf: Update to activate selected configuration Date: Fri, 23 Jul 2021 17:54:40 +0100 Message-Id: <20210723165444.1048-7-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210723165444.1048-1-mike.leach@linaro.org> References: <20210723165444.1048-1-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210723_095453_561733_0442757E X-CRM114-Status: GOOD ( 17.71 ) 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: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Add calls to activate the selected configuration as perf starts and stops the tracing session. Signed-off-by: Mike Leach Reviewed-by: Suzuki K Poulose Reviewed-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm-perf.c | 14 +++++++++++++- drivers/hwtracing/coresight/coresight-etm-perf.h | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index e42ab919ddc3..8ebd728d3a80 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -215,6 +215,10 @@ static void free_event_data(struct work_struct *work) /* Free the sink buffers, if there are any */ free_sink_buffer(event_data); + /* clear any configuration we were using */ + if (event_data->cfg_hash) + cscfg_deactivate_config(event_data->cfg_hash); + for_each_cpu(cpu, mask) { struct list_head **ppath; @@ -292,7 +296,7 @@ static bool sinks_compatible(struct coresight_device *a, static void *etm_setup_aux(struct perf_event *event, void **pages, int nr_pages, bool overwrite) { - u32 id; + u32 id, cfg_hash; int cpu = event->cpu; cpumask_t *mask; struct coresight_device *sink = NULL; @@ -310,6 +314,14 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, sink = user_sink = coresight_get_sink_by_id(id); } + /* check if user wants a coresight configuration selected */ + cfg_hash = (u32)((event->attr.config2 & GENMASK_ULL(63, 32)) >> 32); + if (cfg_hash) { + if (cscfg_activate_config(cfg_hash)) + goto err; + event_data->cfg_hash = cfg_hash; + } + mask = &event_data->mask; /* diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h index ba617fe2217e..468f7799ab4f 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.h +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -49,12 +49,14 @@ struct etm_filters { * @work: Handle to free allocated memory outside IRQ context. * @mask: Hold the CPU(s) this event was set for. * @snk_config: The sink configuration. + * @cfg_hash: The hash id of any coresight config selected. * @path: An array of path, each slot for one CPU. */ struct etm_event_data { struct work_struct work; cpumask_t mask; void *snk_config; + u32 cfg_hash; struct list_head * __percpu *path; };