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=-18.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,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 D7850C433B4 for ; Wed, 14 Apr 2021 19:19:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BEA21610FC for ; Wed, 14 Apr 2021 19:19:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1353251AbhDNTUE (ORCPT ); Wed, 14 Apr 2021 15:20:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1353231AbhDNTTe (ORCPT ); Wed, 14 Apr 2021 15:19:34 -0400 Received: from mail-wr1-x42b.google.com (mail-wr1-x42b.google.com [IPv6:2a00:1450:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53B60C06138D for ; Wed, 14 Apr 2021 12:19:12 -0700 (PDT) Received: by mail-wr1-x42b.google.com with SMTP id w4so17186811wrt.5 for ; Wed, 14 Apr 2021 12:19:12 -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=Qp1rtf5vTNCYxLgq97ox1ro8HilwNvlQ34tjmWDteno=; b=yz3jNvqKpyMyEfgR81XsaWyGFfxC77h2/q4tnUpvVy1V80bTfLwd6chrspXEkrxvFU VAOBD+Tb27lAvw3ipOMRkbVzSn89z477PTtJhgVFxHDiL3euYLTqOxtXfnn99Fc/NJYT T3RbZHtofcibb2rM3XUqclT5y/yy9LilKmV4ivIx1MvfhYi7NKdMpIE+gOdu1pbDFPAl EfUEMk4tzY7ASCae5ciJAxHNqsMLkDnq9ljXczMr+DH3f7b8ZCstWoDXAzfKTROkMIzH WQLJTGh+GLCiWeH6vngUkiNkB4GpTkStXDJd2eYhlClI5RhFEnwOVdFm8iBEmYHa/4LF KM4w== 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=Qp1rtf5vTNCYxLgq97ox1ro8HilwNvlQ34tjmWDteno=; b=svHVBZBGgLnkh5cKTKePDRE3rEyPblo2NZbME2/ku5cRZ+G0EwtbP8m8lWw7GfuDaz KqnePRR3HKp99pJ6+MdZRmcHCmnwjCxiREkBGKj68PmZCuyAO0jUkTIvCyyu+BdE2nsz s6EWi7qKGCB96twjzh7bGB1CsqENe/MHlYCnqPnnPaSg5eVmMvpbzssG8Wd0HRPP3DEn WkE2PeH4zfGnT/mubFoNPxEaulSwZPRWx9Gt/Wclo/LC2+ohDHiNJo/SMLzwaz5m/Klp k420q7vwX8p8dJbACvgAZsASZccjy0/lzF97h2TTAObDDlSb3d1Uv8RTpo3TyY+fv/7n nHMQ== X-Gm-Message-State: AOAM532X+JuOWTBsHbYOs574u9Uucq7X2YUgQ2T2FrPV0qBmHXxzNrb0 t0S7rrnhxbRLYWI5iawD9tcSgQ== X-Google-Smtp-Source: ABdhPJwq1IQoqE7/mmybFnQ9IpYRleea4gq55kbZKh4LVZhLh5cQ9efS2H/C4DTU95M15AYAxU+IMA== X-Received: by 2002:adf:fdca:: with SMTP id i10mr23520500wrs.55.1618427951061; Wed, 14 Apr 2021 12:19:11 -0700 (PDT) Received: from linaro.org ([2a00:23c5:6809:2201:546d:7d59:1703:bf96]) by smtp.gmail.com with ESMTPSA id a3sm327073wru.40.2021.04.14.12.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 12:19:10 -0700 (PDT) From: Mike Leach To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, mathieu.poirier@linaro.org, linux-doc@vger.kernel.org, suzuki.poulose@arm.com Cc: yabinc@google.com, corbet@lwn.net, leo.yan@linaro.org, alexander.shishkin@linux.intel.com, tingwei@codeaurora.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Mike Leach Subject: [PATCH v7 06/10] coresight: etm-perf: Update to activate selected configuration Date: Wed, 14 Apr 2021 20:18:59 +0100 Message-Id: <20210414191903.18349-7-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210414191903.18349-1-mike.leach@linaro.org> References: <20210414191903.18349-1-mike.leach@linaro.org> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.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 26b4bca156aa..560baefdfed8 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; }; -- 2.17.1 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=-16.8 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,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 2E6ECC43460 for ; Wed, 14 Apr 2021 19:24:10 +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 B100D6113B for ; Wed, 14 Apr 2021 19:24:09 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B100D6113B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.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: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=TM3xfUzeZ7mYnBmKuHBM0+xYrN7auUWWoN9k1/3yExA=; b=hNee9m0ZY3XW1LtNDjMdDVhzjy docIXPQ0V6fhJhH2Nm/FkC0A8zA+tpyzN+G+3ZlXHOULadJzAjFUUMQteLD6bIRO4Rj+Uv5dDXKbh nppbJzk+00fvqKsukiFg8wqBjgyR5LTiWjDMq3By95strjGAXRYx1Zvo9p4rqA4jrDLKzXO3gse3T 4tJ2Zp2FxYkTvZSCUOkkvlsHLqBtmuN3b0YdKcg00vheWK4lBBYlNoUvWIw4LoNIdS3zrcUu6wWpU bH3SEWYWBLbeRojuT+xrJDRk3wttGQjjtRq/mppst6qjruaonr3gH25rrQw0LfGDivpco9yqrDGFD QvxKuyEQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lWl5A-00DXSF-J2; Wed, 14 Apr 2021 19:21:48 +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 1lWl2h-00DX4C-Bt for linux-arm-kernel@desiato.infradead.org; Wed, 14 Apr 2021 19:19:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; 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; bh=Qp1rtf5vTNCYxLgq97ox1ro8HilwNvlQ34tjmWDteno=; b=K6ZM1GN3n0fC+jtdIalDP/Ni97 yEUPQvM4ZDbQTQ8y0IcDbPnzJXTVhe5qF4WQUihxHXSt8ifY5CKqwkBWzq44EeJMnezVuGxyzb+tN tgCfuIrDZMFf89hQtwnPoa+/UjBJLzwcApuE6OM4hUap5Y0tRNYhpPdXKwgBHMm5zLK2lakkpfSOw t73Bvm0Nq31fqwChE3UiSAwlf/ZfzuLyuS1EhWBI9TWTRDgvkQ9rvOGBeJpGAooRFTlyfO7w4vLl+ Z2w9EA4HXdP410szTYXSBMddkWuB6FOO7KM0+BgQz+2qaaSjhnKdeKE5gq23eChf3Xb4LtUzyTTtP oo+6vxvg==; Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lWl2e-0082qv-Qy for linux-arm-kernel@lists.infradead.org; Wed, 14 Apr 2021 19:19:14 +0000 Received: by mail-wr1-x430.google.com with SMTP id 12so20942585wrz.7 for ; Wed, 14 Apr 2021 12:19:12 -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=Qp1rtf5vTNCYxLgq97ox1ro8HilwNvlQ34tjmWDteno=; b=yz3jNvqKpyMyEfgR81XsaWyGFfxC77h2/q4tnUpvVy1V80bTfLwd6chrspXEkrxvFU VAOBD+Tb27lAvw3ipOMRkbVzSn89z477PTtJhgVFxHDiL3euYLTqOxtXfnn99Fc/NJYT T3RbZHtofcibb2rM3XUqclT5y/yy9LilKmV4ivIx1MvfhYi7NKdMpIE+gOdu1pbDFPAl EfUEMk4tzY7ASCae5ciJAxHNqsMLkDnq9ljXczMr+DH3f7b8ZCstWoDXAzfKTROkMIzH WQLJTGh+GLCiWeH6vngUkiNkB4GpTkStXDJd2eYhlClI5RhFEnwOVdFm8iBEmYHa/4LF KM4w== 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=Qp1rtf5vTNCYxLgq97ox1ro8HilwNvlQ34tjmWDteno=; b=rfXxO5sGRCWRlK5R7p4Gwv5nyYx0uBm7A1SpYOn8DFJC5cj6/HGqbVMBnkFL29fbSF RUEKLwun5y7ZW+CmElfiQh5jcz5EIMkEqL2nJ4r7Hcg0kfwUzXe1W7fyAsSaop9sRKnz Fje/WG2ma3Yq6O6lnmRpWCg26+y2auaOI01wYOTbVjGtzyrP5kivygxD6nrAPiwgdQTM aEUqwA1vJ5w4J6ImvFd2OehFSzER66HW1qgyTuFvBCCCHmZnvo30c5mhRgm4jvzh/Whf cHu4bp3D9OrdzK6P3h8QkNdHXtfUsNwzaqZ4HJI0QuNXsS7eP5EsKQHedmAW3pYorFvJ 3FVw== X-Gm-Message-State: AOAM532LRHT61DMzdiwYIvl9jLsjkDtpYt2yAfmzkuiP5lopfoJ8HsPv UZoxEtt86pXjv/ApX/4BEwSbP4TnO1VA8Q== X-Google-Smtp-Source: ABdhPJwq1IQoqE7/mmybFnQ9IpYRleea4gq55kbZKh4LVZhLh5cQ9efS2H/C4DTU95M15AYAxU+IMA== X-Received: by 2002:adf:fdca:: with SMTP id i10mr23520500wrs.55.1618427951061; Wed, 14 Apr 2021 12:19:11 -0700 (PDT) Received: from linaro.org ([2a00:23c5:6809:2201:546d:7d59:1703:bf96]) by smtp.gmail.com with ESMTPSA id a3sm327073wru.40.2021.04.14.12.19.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Apr 2021 12:19:10 -0700 (PDT) From: Mike Leach To: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, mathieu.poirier@linaro.org, linux-doc@vger.kernel.org, suzuki.poulose@arm.com Cc: yabinc@google.com, corbet@lwn.net, leo.yan@linaro.org, alexander.shishkin@linux.intel.com, tingwei@codeaurora.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Mike Leach Subject: [PATCH v7 06/10] coresight: etm-perf: Update to activate selected configuration Date: Wed, 14 Apr 2021 20:18:59 +0100 Message-Id: <20210414191903.18349-7-mike.leach@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210414191903.18349-1-mike.leach@linaro.org> References: <20210414191903.18349-1-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210414_121912_891693_178D2A78 X-CRM114-Status: GOOD ( 17.92 ) 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 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 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 26b4bca156aa..560baefdfed8 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; }; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel