From patchwork Wed Jul 18 21:48:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 142304 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp1022332ljj; Wed, 18 Jul 2018 14:48:20 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfB1SZewehioDfn7ne8/0vSMAnGSL5ATHEXioZZP6+UxSab6u/i5wI4GvUAbOhU0stKxmXb X-Received: by 2002:a63:555:: with SMTP id 82-v6mr7478192pgf.25.1531950500679; Wed, 18 Jul 2018 14:48:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531950500; cv=none; d=google.com; s=arc-20160816; b=lvEe33PBDIR9ck0aH6M/nORWZrE+RytcEnQ+fO1EpM6mgvCGiSJ+ZbLA97bMfYlV4c i6rfkL4RBA13ya5Zi9UB/xFk3IN826kRWQonjCZfQT74YbLntd6ME8rpgLRN4kKkPk8K 1Gcpurya/eGdOT04zt/mv9PoROioVYmzzsDnKu9BR852Zh9IYzwle+ChlCn7QZ82jWGV xRBvbW4oHcd4TZCkMY4X1bZooGLSKSl5b5yGfATGphq5tKNF7l9Y5VkDEpH5ALXYP+gw nNjZW2VmG+FkPm+yLd9vqSG9IsVhBEUfIDYw7qWlKOnhwidTx8O22hJR3gwyBcpSxurL f3Vg== 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:arc-authentication-results; bh=zKokYU1sqv2XQ4BO3FvTpjJgpxRIa8oNDIwHvFCAE7Y=; b=i4VwDRNoSKHc8qkRy4HIlcQ5W53y2yS9MsUCPPQVigfoqC8WhaJpiQ3X9x/PdLuJLt Mc0b79H9JJvj/UUAdcEA80zwSHLwkntPe1fp9/S9NronLI/i7MquqRFdbDfZYpWOGLG3 gLkZNYlLmae/dvk3GD6BsfCg207SenMi7ELT7cfwLhBj8iyOuu9+Bg8J7yiYRJ1bOegc txadxC/Xold+hoqMIEazZrZscWYydMIrGpXYD33TEGclVtSAa2gVyPRyjEge7voCpBJO 4QIkJYpLV81bfbCwvONTA7DqCDuaeeUiAInTsyH6+nM/yG4uDLUS9zf5Q42TlwoeJuV5 0YrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=eBfH2OWN; 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 v25-v6si4411427pgk.555.2018.07.18.14.48.20; Wed, 18 Jul 2018 14:48:20 -0700 (PDT) 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=eBfH2OWN; 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 S1730499AbeGRW2J (ORCPT + 31 others); Wed, 18 Jul 2018 18:28:09 -0400 Received: from mail-it0-f68.google.com ([209.85.214.68]:52106 "EHLO mail-it0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726834AbeGRW2I (ORCPT ); Wed, 18 Jul 2018 18:28:08 -0400 Received: by mail-it0-f68.google.com with SMTP id h2-v6so6325562itj.1 for ; Wed, 18 Jul 2018 14:48:16 -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=zKokYU1sqv2XQ4BO3FvTpjJgpxRIa8oNDIwHvFCAE7Y=; b=eBfH2OWNI4YFGwcqpGBiVneColENwVAO96kDQ4vimYQqVBWyOH9iMIXUWhSz5rcfFs F0/HwIOPIrbymw1yf5JbwS/gV10EKFhVgrCGfUAg+0042oEtfyXCwfnJvH6A0EzZAEqm +rMKGxPsYGflsBwWnUkLgxRZoZQgJbSG5IYAQ= 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=zKokYU1sqv2XQ4BO3FvTpjJgpxRIa8oNDIwHvFCAE7Y=; b=cXk9n+YSyMVAq4roQDYBIHrcd9TDKesiTUolhtgl75qoUKzGSO77ylg94PLEt6uwBD SYMfYsyfYBMcePTMaAyDDxKKT5NGpAeKuoIHtzWLJE3GHinERXDgeN7lnaAyzqylmcsT pwPY3JLtl0E+ZV0hKCIqPesYFBymjbNOeb+cDhY/Don0eVGPV5KLqg1p4pc+M+DA/pdL N44FFmV0IGsiS7UFE2SdoF4kmAJI0u4zRGGl4CA5DIaiB4QHN+9ObEU4eGCQ3LISvKIM j1w03kHEzLNgBtAIWYG6BGkKisPyDsVSx/9YimikiwvmlkVAXN9aMSAMs3MFV7t1cAZd ryFQ== X-Gm-Message-State: AOUpUlF2iTDrVMNiJ1b/lp4g9paHm6i6bxm1bS+PqT/tyDDQu/lnWJEX pwcJZ571mptlGaUTB2vQlFdiaw== X-Received: by 2002:a24:41a3:: with SMTP id b35-v6mr3395672itd.12.1531950496150; Wed, 18 Jul 2018 14:48:16 -0700 (PDT) Received: from xps15.cg.shawcable.net (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id w193-v6sm2093386ita.35.2018.07.18.14.48.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 Jul 2018 14:48:15 -0700 (PDT) From: Mathieu Poirier To: peterz@infradead.org, acme@kernel.org Cc: mingo@redhat.com, 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, kim.phillips@arm.com, suzuki.poulosi@arm.com, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 2/7] perf/core: Use ioctl to communicate driver configuration to kernel Date: Wed, 18 Jul 2018 15:48:02 -0600 Message-Id: <1531950487-24554-3-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531950487-24554-1-git-send-email-mathieu.poirier@linaro.org> References: <1531950487-24554-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 adds the mechanic needed for user space to send PMU specific configuration to the kernel driver using an ioctl() command. That way events can keep track of options that don't fit in the perf_event_attr structure like the selection of a CoreSight sink to use for the session. Signed-off-by: Mathieu Poirier --- include/linux/perf_event.h | 45 ++++++++++++++++++++++++++ kernel/events/core.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) -- 2.7.4 diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 1fa12887ec02..7064b513ca2b 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -114,6 +114,14 @@ struct hw_perf_event_extra { int idx; /* index in shared_regs->regs[] */ }; +/* + * PMU driver configuration + */ +struct pmu_drv_config { + void *config; + raw_spinlock_t lock; +}; + /** * struct hw_perf_event - performance event hardware details: */ @@ -178,6 +186,9 @@ struct hw_perf_event { /* Last sync'ed generation of filters */ unsigned long addr_filters_gen; + /* PMU driver configuration */ + struct pmu_drv_config drv_config; + /* * hw_perf_event::state flags; used to track the PERF_EF_* state. */ @@ -447,6 +458,23 @@ struct pmu { * Filter events for PMU-specific reasons. */ int (*filter_match) (struct perf_event *event); /* optional */ + + /* + * Valiate complex PMU configuration that don't fit in the + * perf_event_attr struct. Returns a PMU specific pointer or an error + * value < 0. + * + * As with addr_filters_validate(), runs in the context of the ioctl() + * process and is not serialized with the rest of the PMU callbacks. + */ + void *(*drv_config_validate) (struct perf_event *event, + char *config_str); + + /* + * Release PMU specific configuration acquired by + * drv_config_validate() + */ + void (*drv_config_free) (void *drv_data); }; enum perf_addr_filter_action_t { @@ -1234,6 +1262,12 @@ static inline bool has_addr_filter(struct perf_event *event) return event->pmu->nr_addr_filters; } +static inline bool has_drv_config(struct perf_event *event) +{ + return event->pmu->drv_config_validate && + event->pmu->drv_config_free; +} + /* * An inherited event uses parent's filters */ @@ -1248,6 +1282,17 @@ perf_event_addr_filters(struct perf_event *event) return ifh; } +static inline struct pmu_drv_config * +perf_event_get_drv_config(struct perf_event *event) +{ + struct pmu_drv_config *cfg = &event->hw.drv_config; + + if (event->parent) + cfg = &event->parent->hw.drv_config; + + return cfg; +} + extern void perf_event_addr_filters_sync(struct perf_event *event); extern int perf_output_begin(struct perf_output_handle *handle, diff --git a/kernel/events/core.c b/kernel/events/core.c index a56f10b1e13b..4892246c3af2 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -4410,6 +4410,7 @@ static bool exclusive_event_installable(struct perf_event *event, static void perf_addr_filters_splice(struct perf_event *event, struct list_head *head); +static void perf_drv_config_replace(struct perf_event *event, void *drv_data); static void _free_event(struct perf_event *event) { @@ -4440,6 +4441,7 @@ static void _free_event(struct perf_event *event) perf_event_free_bpf_prog(event); perf_addr_filters_splice(event, NULL); kfree(event->addr_filters_offs); + perf_drv_config_replace(event, NULL); if (event->destroy) event->destroy(event); @@ -5002,6 +5004,8 @@ static inline int perf_fget_light(int fd, struct fd *p) static int perf_event_set_output(struct perf_event *event, struct perf_event *output_event); static int perf_event_set_filter(struct perf_event *event, void __user *arg); +static int perf_event_set_drv_config(struct perf_event *event, + void __user *arg); static int perf_event_set_bpf_prog(struct perf_event *event, u32 prog_fd); static int perf_copy_attr(struct perf_event_attr __user *uattr, struct perf_event_attr *attr); @@ -5088,6 +5092,10 @@ static long _perf_ioctl(struct perf_event *event, unsigned int cmd, unsigned lon return perf_event_modify_attr(event, &new_attr); } + + case PERF_EVENT_IOC_SET_DRV_CONFIG: + return perf_event_set_drv_config(event, (void __user *)arg); + default: return -ENOTTY; } @@ -9090,6 +9098,75 @@ static int perf_event_set_filter(struct perf_event *event, void __user *arg) return ret; } +static void perf_drv_config_replace(struct perf_event *event, void *drv_data) +{ + unsigned long flags; + void *old_drv_data; + struct pmu_drv_config *drv_config = &event->hw.drv_config; + + if (!has_drv_config(event)) + return; + + /* Children take their configuration from their parent */ + if (event->parent) + return; + + /* Make sure the PMU doesn't get a handle on the data */ + raw_spin_lock_irqsave(&drv_config->lock, flags); + + old_drv_data = drv_config->config; + drv_config->config = drv_data; + + raw_spin_unlock_irqrestore(&drv_config->lock, flags); + + /* Free PMU private data allocated by pmu::drv_config_validate() */ + event->pmu->drv_config_free(old_drv_data); +} + +static int +perf_event_process_drv_config(struct perf_event *event, char *config_str) +{ + int ret = -EINVAL; + void *drv_data; + + /* Make sure ctx.mutex is held */ + lockdep_assert_held(&event->ctx->mutex); + + /* Children take their configuration from their parent */ + if (WARN_ON_ONCE(event->parent)) + goto out; + + drv_data = event->pmu->drv_config_validate(event, config_str); + if (IS_ERR(drv_data)) { + ret = PTR_ERR(drv_data); + goto out; + } + + perf_drv_config_replace(event, drv_data); + + ret = 0; +out: + return ret; +} + +static int perf_event_set_drv_config(struct perf_event *event, void __user *arg) +{ + int ret = -EINVAL; + char *config_str; + + if (!has_drv_config(event)) + return ret; + + config_str = strndup_user(arg, PAGE_SIZE); + if (IS_ERR(config_str)) + return PTR_ERR(config_str); + + ret = perf_event_process_drv_config(event, config_str); + + kfree(config_str); + return ret; +} + /* * hrtimer based swevent callback */ @@ -10019,6 +10096,7 @@ perf_event_alloc(struct perf_event_attr *attr, int cpu, if (attr->freq && attr->sample_freq) hwc->sample_period = 1; hwc->last_period = hwc->sample_period; + raw_spin_lock_init(&hwc->drv_config.lock); local64_set(&hwc->period_left, hwc->sample_period);