From patchwork Wed Nov 28 22:01:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 152353 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1632780ljp; Wed, 28 Nov 2018 14:01:31 -0800 (PST) X-Google-Smtp-Source: AFSGD/VVq/GLT0LnaWMBXBANeMn0OV+MnfTxDIVz2n5vAK8GBD0OYE++UYFsD6HGJZ+OhJIkL1Mt X-Received: by 2002:a63:160d:: with SMTP id w13mr35541418pgl.43.1543442491117; Wed, 28 Nov 2018 14:01:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543442491; cv=none; d=google.com; s=arc-20160816; b=PxoPlUIBnNNlsnA5+4lP0t855rLGkg40RF/y6Jqt7bvd5+efKlm8MK2hLR5QLzRG4b x8E51nQFBxQac6hz47cTWW/HUTsrcFl3MvTuVJB6EEkGdqFfsdfdlxpPwXm3ipjrvvrN +EHT3y/JTREgKKgJxDNUGTxDuMJPrWQ8uPLHEj0YM/4yPeNJaSZIKfWq1YG+3TxLWdYU ozwU/GatMrAHDATYg4I0wKKRSD696l065M444/qshA8efArtXvBfx2K6LBE4rIpqwjOY NNTsVpx9/lH3wbTbXdoYqVpnqYh+pGdC8+/p6wHknFdxflg9QYJbX5LwACEpETUmOv/8 4sWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=xnEBPlZvLoiwiqqm9S9JUInQL+RU7pyQ/G1YI/wchKg=; b=MIB7uWU3CDEuX5fkm+mgpGXWPzdVcyy0QwVvdWjMp+25o5niHos92O0FgupbjugtwM KySb4O0PJ7MgDhgYEEp80kBW6/e4uHW29F32IPCKOgCrxnoZHsrU0Y/VBpUwhA3H1+o3 K7+wVs9tOTlN3xnWkMYPcOeuQCMbXZDy0mpuG5AXpoHJre0NGMIWmAAUk2a8DXaoeK/c qH2jPJPZENh/oLjJ/e5LhhfFM37sjFtQqYrjmxI+K9Q5VQMwGfIdrB12cx0Vft6ggXpG 9UWZPJyXLPHi1TrpZsNlLfuaBvcOlIqY469RV3MaaR1LY9fstdvpdolfuIogV7HOo7yC Mx1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S8hfGFdH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 12-v6si9045089pfu.2.2018.11.28.14.01.30; Wed, 28 Nov 2018 14:01:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=S8hfGFdH; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726683AbeK2JEc (ORCPT + 32 others); Thu, 29 Nov 2018 04:04:32 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:34393 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726628AbeK2JEc (ORCPT ); Thu, 29 Nov 2018 04:04:32 -0500 Received: by mail-pg1-f194.google.com with SMTP id 17so10109716pgg.1 for ; Wed, 28 Nov 2018 14:01:27 -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=xnEBPlZvLoiwiqqm9S9JUInQL+RU7pyQ/G1YI/wchKg=; b=S8hfGFdHktHmbFUcmAAAToL1GHM1166VP0cPbnSTtGAShRAN8OGq7+DzzlKUPc1kwm q9tTlNGl+LwEQxzx0YOB8iSxeNATA+URaq8VoYLMLfwpyHTC4jdI4KnTuEVdJ+ZjLypr DaZFMb38dcGUgHztaRy4p8mUcekTLvtnA3v0k= 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=xnEBPlZvLoiwiqqm9S9JUInQL+RU7pyQ/G1YI/wchKg=; b=oXc2Zmna+s4TAuRjsyhwuNUL8vGxQOySWnBUhO/kYgxRBnCt/K9J6YmW/ScPsCSQ6J hcgqldaPcWHijPG3UlNxB1zbF88CtPl9AjshrxpDtIiVJyJ/AkgZ/1HzezWWIZGxHFlo VY6EYn8QJEhg0VF8PeVuGrrKdzERuDDAzJ++dQv187378wTlt1zSVFOZJUcucn0ELn+z c4bqBU5JdMUHVv1LOG3K+Z7db+qs+RZmVJyPvHeEuecObMvo2JoZ7trOWzfFgtBgVtms 0LZdN3w6DNCR7LuaBY2oknFyR+QTR18fhzGNJw5iED+A790yYvfKkCREoCV6cGeDQyI/ Hgjw== X-Gm-Message-State: AGRZ1gInzalu48WPNDcDa1miFrxEO0q+euNxGTdvK6ZsnHkwDZ+GrOoU pnVRmP2+9g2En+gMXKjd13ssMQ== X-Received: by 2002:a63:42c1:: with SMTP id p184mr34369774pga.202.1543442487192; Wed, 28 Nov 2018 14:01:27 -0800 (PST) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id 12sm8698051pgd.35.2018.11.28.14.01.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Nov 2018 14:01:26 -0800 (PST) From: Mathieu Poirier To: acme@kernel.org, peterz@infradead.org, mingo@redhat.com Cc: tglx@linutronix.de, alexander.shishkin@linux.intel.com, schwidefsky@de.ibm.com, heiko.carstens@de.ibm.com, will.deacon@arm.com, mark.rutland@arm.com, jolsa@redhat.com, namhyung@kernel.org, adrian.hunter@intel.com, ast@kernel.org, gregkh@linuxfoundation.org, hpa@zytor.com, suzuki.poulosi@arm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 4/6] coresight: Use PMU driver configuration for sink selection Date: Wed, 28 Nov 2018 15:01:16 -0700 Message-Id: <1543442478-31465-5-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1543442478-31465-1-git-send-email-mathieu.poirier@linaro.org> References: <1543442478-31465-1-git-send-email-mathieu.poirier@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch uses the PMU driver configuration held in event::hw::drv_config to select a sink for each event that is created (the old sysFS way of working is kept around for backward compatibility). By proceeding in this way a sink can be used by multiple sessions without having to play games with entries in sysFS. Signed-off-by: Mathieu Poirier --- drivers/hwtracing/coresight/coresight-etm-perf.c | 58 +++++++++++++++++++----- 1 file changed, 46 insertions(+), 12 deletions(-) -- 2.7.4 diff --git a/drivers/hwtracing/coresight/coresight-etm-perf.c b/drivers/hwtracing/coresight/coresight-etm-perf.c index f21eb28b6782..0fbff912d515 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 @@ -177,6 +178,26 @@ static void etm_free_aux(void *data) schedule_work(&event_data->work); } +static struct coresight_device *etm_drv_config_sync(struct perf_event *event) +{ + struct coresight_device *sink = NULL; + struct pmu_drv_config *drv_config = perf_event_get_drv_config(event); + + /* + * Make sure we don't race with perf_drv_config_replace() in + * kernel/events/core.c. + */ + raw_spin_lock(&drv_config->lock); + + /* Copy what we got from user space if applicable. */ + if (drv_config->config) + sink = drv_config->config; + + raw_spin_unlock(&drv_config->lock); + + return sink; +} + static void *etm_setup_aux(struct perf_event *event, void **pages, int nr_pages, bool overwrite) { @@ -190,18 +211,11 @@ static void *etm_setup_aux(struct perf_event *event, void **pages, return NULL; INIT_WORK(&event_data->work, free_event_data); - /* - * In theory nothing prevent tracers in a trace session from being - * associated with different sinks, nor having a sink per tracer. But - * until we have HW with this kind of topology we need to assume tracers - * in a trace session are using the same sink. Therefore go through - * the coresight bus and pick the first enabled sink. - * - * When operated from sysFS users are responsible to enable the sink - * while from perf, the perf tools will do it based on the choice made - * on the cmd line. As such the "enable_sink" flag in sysFS is reset. - */ - sink = coresight_get_enabled_sink(true); + /* First get the sink config from user space. */ + sink = etm_drv_config_sync(event); + if (!sink) + sink = coresight_get_enabled_sink(true); + if (!sink || !sink_ops(sink)->alloc_buffer) goto err; @@ -454,6 +468,25 @@ static void etm_addr_filters_sync(struct perf_event *event) filters->nr_filters = i; } +static void *etm_drv_config_validate(struct perf_event *event, char *cstr) +{ + char drv_config[NAME_MAX]; + struct device *dev; + struct coresight_device *sink; + + strncpy(drv_config, cstr, NAME_MAX); + + /* Look for the device with that name on the CS bus. */ + dev = bus_find_device_by_name(&coresight_bustype, NULL, drv_config); + if (!dev) + return ERR_PTR(-EINVAL); + + sink = to_coresight_device(dev); + put_device(dev); + + return sink; +} + int etm_perf_symlink(struct coresight_device *csdev, bool link) { char entry[sizeof("cpu9999999")]; @@ -498,6 +531,7 @@ static int __init etm_perf_init(void) etm_pmu.addr_filters_sync = etm_addr_filters_sync; etm_pmu.addr_filters_validate = etm_addr_filters_validate; etm_pmu.nr_addr_filters = ETM_ADDR_CMP_MAX; + etm_pmu.drv_config_validate = etm_drv_config_validate; ret = perf_pmu_register(&etm_pmu, CORESIGHT_ETM_PMU_NAME, -1); if (ret == 0)