From patchwork Tue Jan 22 18:11:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 10775903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id E7AE96C2 for ; Tue, 22 Jan 2019 18:12:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D65D82B40E for ; Tue, 22 Jan 2019 18:12:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CA4FB2B998; Tue, 22 Jan 2019 18:12:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7200B2B9A6 for ; Tue, 22 Jan 2019 18:12:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=7jBndF+vBBkN7UZtFXhKpZuewJ3lWNbnZ8Dv++ZdjGU=; b=A7p8Yjg2pEvt5TKPRgHzNLUCpp Myg1yrA52NzHo3NnBCy+tuoVBh00Inpd2VBUzM+Wqb9u0nxNtpaiRjLa4kG+tP99R0S+C869wiYLZ +xoWbn8kZSuZ/S1SdHf3Q7zbMs6/on4U0EEzJ+fnxwdXuICPhJcuAwsU4JaozhBNDnQVTPafXZuc3 9DGDL3F65zxE+ZpMlHPVf0qJHxSG1tmIqxkGC5tnaki9fbCgFZqsvVRjtRYLKiRCYQgeGLLD7mnxr TgIurl3PXL0waTFVVnkCD7T+lWwJ92X8XB43s7nVgAUjaeOOzdjCXvi/q3IKPE/DLLLtx2mGtOJDw gPtoU5ag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gm0X5-0004mY-HO; Tue, 22 Jan 2019 18:12:19 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gm0Wd-0004Gj-70 for linux-arm-kernel@lists.infradead.org; Tue, 22 Jan 2019 18:11:58 +0000 Received: by mail-pl1-x642.google.com with SMTP id t13so11837534ply.13 for ; Tue, 22 Jan 2019 10:11:51 -0800 (PST) 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=w2HxLo0zTdY2xYNYUVAZCND3mlCXe1W0iz7EyzmW3zA=; b=FI/KdH3RKgeLXUHbaFZIgCH6VzqCe6b72MaEcYzUU+yXdZ/kD3ay8TojNyezCwIitG 1v4Z7aLBdjfy2wAdId7EIaxA++MPtdYuUIH3zB5hyIhQYkSrTIzLLQ0DhNyRhBolsfcl z0AC6bs6Rkbz6jiqnl248D4O2eSviJUf7PPI4= 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=w2HxLo0zTdY2xYNYUVAZCND3mlCXe1W0iz7EyzmW3zA=; b=pcb9LnPDnttLO1sa0XGlnBE2zdD4OXM+SIucLrpUxR/8LYDz2zABA8RQylpZQG39RV O66aqi+IglNoPrD7+eOyiE5we857SXYjyZZYjjGL7iKYkrBXdOVFWLKiPm1HeSdu/HnD MaGCrQqVv65JR2NO96KWY2xUR8EVVoczZYsavUoStwKL6UhTK/MHoe6ESg2CDZeI6Bvv BksdlqAqgna5cG1NiBxWo/W3S9CktdBL5tnVqmdaHmRjurczGEG/nULZsb6SZNsBXO/o QElZjF0XTEThrVFfBLcYu7sjCXNgNmak2A2vy5HyXCj9f+PFF7tIOQnIbwoYDWuEXcGQ S3Pg== X-Gm-Message-State: AJcUukfo1ni1adyNZaBSfGdqKJxKBtYsAbhpNJQUcMM/3E1iSNutpH9G K0dnT0KeCI5z4iLjvQamKEEhjQ== X-Google-Smtp-Source: ALg8bN4ggbRu69VnBu5YDNIjbHtDpky7lakWWZW3cxtTnvc9FM0dJ+MlzUHXBN67l7kT/vqJbrkgCw== X-Received: by 2002:a17:902:e10a:: with SMTP id cc10mr35698716plb.165.1548180710633; Tue, 22 Jan 2019 10:11:50 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id a18sm23489919pgj.30.2019.01.22.10.11.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 22 Jan 2019 10:11:50 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org, peterz@infradead.org Subject: [PATCH v2 2/7] coresight: perf: Add "sinks" group to PMU directory Date: Tue, 22 Jan 2019 11:11:39 -0700 Message-Id: <20190122181144.26645-3-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190122181144.26645-1-mathieu.poirier@linaro.org> References: <20190122181144.26645-1-mathieu.poirier@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190122_101151_472146_E2EA39CD X-CRM114-Status: GOOD ( 21.31 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, linux-s390@vger.kernel.org, suzuki.poulose@arm.com, alexander.shishkin@linux.intel.com, gregkh@linuxfoundation.org, heiko.carstens@de.ibm.com, adrian.hunter@intel.com, will.deacon@arm.com, ast@kernel.org, mingo@redhat.com, linux-arm-kernel@lists.infradead.org, hpa@zytor.com, schwidefsky@de.ibm.com, namhyung@kernel.org, tglx@linutronix.de, jolsa@redhat.com, linux-kernel@vger.kernel.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add a "sinks" directory entry so that users can see all the sinks available in the system in a single place. Individual sink are added as they are registered with the coresight bus. Signed-off-by: Mathieu Poirier --- .../hwtracing/coresight/coresight-etm-perf.c | 76 +++++++++++++++++++ .../hwtracing/coresight/coresight-etm-perf.h | 6 +- drivers/hwtracing/coresight/coresight.c | 18 +++++ include/linux/coresight.h | 7 +- 4 files changed, 104 insertions(+), 3 deletions(-) diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index f21eb28b6782..c68a0036532c 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.c +++ b/drivers/hwtracing/coresight/coresight-etm-perf.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -43,8 +44,18 @@ static const struct attribute_group etm_pmu_format_group = { .attrs = etm_config_formats_attr, }; +static struct attribute *etm_config_sinks_attr[] = { + NULL, +}; + +static const struct attribute_group etm_pmu_sinks_group = { + .name = "sinks", + .attrs = etm_config_sinks_attr, +}; + static const struct attribute_group *etm_pmu_attr_groups[] = { &etm_pmu_format_group, + &etm_pmu_sinks_group, NULL, }; @@ -479,6 +490,71 @@ int etm_perf_symlink(struct coresight_device *csdev, bool link) return 0; } +static ssize_t etm_perf_sink_name_show(struct device *dev, + struct device_attribute *dattr, + char *buf) +{ + /* See function coresight_get_sink_by_id() to know where this is used */ + u32 hash = hashlen_hash(hashlen_string(NULL, dattr->attr.name)); + + return scnprintf(buf, PAGE_SIZE, "%x\n", hash); +} + +int etm_perf_add_symlink_sink(struct coresight_device *csdev) +{ + int ret; + struct device *pmu_dev = etm_pmu.dev; + struct device *pdev = csdev->dev.parent; + struct device_attribute *dattr; + + if (csdev->type != CORESIGHT_DEV_TYPE_SINK && + csdev->type != CORESIGHT_DEV_TYPE_LINKSINK) + return -EINVAL; + + if (csdev->dattr != NULL) + return -EINVAL; + + if (!etm_perf_up) + return -EPROBE_DEFER; + + dattr = kzalloc(sizeof(*dattr), GFP_KERNEL); + dattr->attr.name = kstrdup(dev_name(pdev), GFP_KERNEL); + dattr->attr.mode = 0444; + dattr->show = etm_perf_sink_name_show; + csdev->dattr = dattr; + + ret = sysfs_add_file_to_group(&pmu_dev->kobj, + &dattr->attr, "sinks"); + + if (!ret) + return 0; + + csdev->dattr = NULL; + kfree(dattr->attr.name); + kfree(dattr); + + return ret; +} + +void etm_perf_del_symlink_sink(struct coresight_device *csdev) +{ + struct device *pmu_dev = etm_pmu.dev; + struct device_attribute *dattr = csdev->dattr; + + if (csdev->type != CORESIGHT_DEV_TYPE_SINK && + csdev->type != CORESIGHT_DEV_TYPE_LINKSINK) + return; + + if (!dattr) + return; + + sysfs_remove_file_from_group(&pmu_dev->kobj, + &dattr->attr, "sinks"); + csdev->dattr = NULL; + kfree(dattr->attr.name); + kfree(dattr); +} + static int __init etm_perf_init(void) { int ret; diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.h b/drivers/hwtracing/coresight/coresight-etm-perf.h index da7d9336a15c..015213abe00a 100644 --- a/drivers/hwtracing/coresight/coresight-etm-perf.h +++ b/drivers/hwtracing/coresight/coresight-etm-perf.h @@ -59,6 +59,8 @@ struct etm_event_data { #ifdef CONFIG_CORESIGHT int etm_perf_symlink(struct coresight_device *csdev, bool link); +int etm_perf_add_symlink_sink(struct coresight_device *csdev); +void etm_perf_del_symlink_sink(struct coresight_device *csdev); static inline void *etm_perf_sink_config(struct perf_output_handle *handle) { struct etm_event_data *data = perf_get_aux(handle); @@ -70,7 +72,9 @@ static inline void *etm_perf_sink_config(struct perf_output_handle *handle) #else static inline int etm_perf_symlink(struct coresight_device *csdev, bool link) { return -EINVAL; } - +int etm_perf_add_symlink_sink(struct coresight_device *csdev) +{ return -EINVAL; } +void etm_perf_del_symlink_sink(struct coresight_device *csdev) {} static inline void *etm_perf_sink_config(struct perf_output_handle *handle) { return NULL; diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 2b0df1a0a8df..d7fa90be6f42 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c @@ -18,6 +18,7 @@ #include #include +#include "coresight-etm-perf.h" #include "coresight-priv.h" static DEFINE_MUTEX(coresight_mutex); @@ -1167,6 +1168,22 @@ struct coresight_device *coresight_register(struct coresight_desc *desc) goto err_out; } + if (csdev->type == CORESIGHT_DEV_TYPE_SINK || + csdev->type == CORESIGHT_DEV_TYPE_LINKSINK) { + ret = etm_perf_add_symlink_sink(csdev); + + if (ret) { + device_unregister(&csdev->dev); + /* + * As with the above, all resources are free'd + * explicitly via coresight_device_release() triggered + * from put_device(), which is in turn called from + * function device_unregister(). + */ + goto err_out; + } + } + mutex_lock(&coresight_mutex); coresight_fixup_device_conns(csdev); @@ -1185,6 +1202,7 @@ EXPORT_SYMBOL_GPL(coresight_register); void coresight_unregister(struct coresight_device *csdev) { + etm_perf_del_symlink_sink(csdev); /* Remove references of that device in the topology */ coresight_remove_conns(csdev); device_unregister(&csdev->dev); diff --git a/include/linux/coresight.h b/include/linux/coresight.h index 46c67a764877..a42fac83eac9 100644 --- a/include/linux/coresight.h +++ b/include/linux/coresight.h @@ -154,8 +154,9 @@ struct coresight_connection { * @orphan: true if the component has connections that haven't been linked. * @enable: 'true' if component is currently part of an active path. * @activated: 'true' only if a _sink_ has been activated. A sink can be - activated but not yet enabled. Enabling for a _sink_ - happens when a source has been selected for that it. + * activated but not yet enabled. Enabling for a _sink_ + * appens when a source has been selected for that it. + * @dattr: Device attribute for sink representation under PMU directory. */ struct coresight_device { struct coresight_connection *conns; @@ -168,7 +169,9 @@ struct coresight_device { atomic_t *refcnt; bool orphan; bool enable; /* true only if configured as part of a path */ + /* sink specific fields */ bool activated; /* true only if a sink is part of a path */ + struct device_attribute *dattr; }; #define to_coresight_device(d) container_of(d, struct coresight_device, dev)