Received: by 2002:a05:6a10:8c0a:0:0:0:0 with SMTP id go10csp201582pxb; Tue, 9 Mar 2021 21:13:36 -0800 (PST) X-Google-Smtp-Source: ABdhPJwkWiLHL61vdq7sML1L/3QqVCRPV+vmNc+2TBhsXpCj/HhQWzHrJYBjMj69NDLO+S24+zK8 X-Received: by 2002:a17:906:73c2:: with SMTP id n2mr1702798ejl.224.1615353216399; Tue, 09 Mar 2021 21:13:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1615353216; cv=none; d=google.com; s=arc-20160816; b=JFnP6X8cdEsXr9zfEzgwY/Ln8ywYu+55W77pm2J2njyLpQRhYLfz948FY54jm1emXf i3iTk4c4VWzP+w2a3hdftWdtVTQfmeQOW2R/nBDWOV0OfRTPwEiceh3IuMQPXtV5qQAP 88wEfwDBwYailj3IqtiS8OkRVD3WAZoktKKQRuSsl0I5VTm9v2k+/Os6yBAd0sHD/8wT xrdwAAQZ1ufq3m7ycB2cs/Yz/qR2XYRyDDUCxMKaIBGIfaVYzbUxfkBxh+ajpPplkr1g yCk92pUYvlNgii8hryiTLMcDMJRsNcrRkHqxeP+vgW0Mt//V9r/T9800wkjStYNLctpu lBZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:message-id:date:subject:cc:to:from:ironport-sdr :ironport-sdr; bh=X7qVPKPfcjYncrWDMO1UsLiSq/9WqRoRPWtPGRiFRWM=; b=EiVlEdmm9l5OJMxi0e2qwsfHo3ljh+BBVXV+D6kLsuNRm9tuhxzq+/mf6IMy4af3/7 uMOtCwXs03Rfp/3j3Aj06gAY0aIqADCKhAZ+JvFBScKI/OZoM8zDGqQMMLMjvsAgCVAA x/sz3ys6SK+rW/2I18w5aHknrtbHVlra9OgZs1xng5OLgwuUdBP/zxPtsfsRRFWknqzx GsPMiBMlgxCoJiraEadL88BEo5eMr2iRGBGXer1rB+iqDm5uPSlWiLOKLlS0r4TpAy2i 5TiGypT6eRzfKf5PSo/2rsMMOtyl6160pqgfe/vEkoZkpJf8kMLwLNM7HMxdIJ9lJniS 6eEw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id b24si10733319ejc.584.2021.03.09.21.13.14; Tue, 09 Mar 2021 21:13:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229804AbhCJFMS (ORCPT + 99 others); Wed, 10 Mar 2021 00:12:18 -0500 Received: from mga18.intel.com ([134.134.136.126]:50276 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229476AbhCJFMD (ORCPT ); Wed, 10 Mar 2021 00:12:03 -0500 IronPort-SDR: RB3BhizsX3IraSnZVj+DBgXaBKaDDxGskH3Jf0EiBUsSYQxgTBUKgkSd/EsQwn7UArxuKgNLwg X7xXJjsQnP9w== X-IronPort-AV: E=McAfee;i="6000,8403,9917"; a="175986255" X-IronPort-AV: E=Sophos;i="5.81,236,1610438400"; d="scan'208";a="175986255" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Mar 2021 21:12:02 -0800 IronPort-SDR: xJNOPGTXdMQU7bFFcUM/kYwREaFQUlWeSruOezUR/03oCjA3HfjH3Sp09R13jfr1Gg7r+V/BwC 3I49PZPmCBpQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,236,1610438400"; d="scan'208";a="431066039" Received: from kbl-ppc.sh.intel.com ([10.239.159.163]) by fmsmga004.fm.intel.com with ESMTP; 09 Mar 2021 21:12:00 -0800 From: Jin Yao To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com, Jin Yao Subject: [PATCH v4] perf pmu: Validate raw event with sysfs exported format bits Date: Wed, 10 Mar 2021 13:11:38 +0800 Message-Id: <20210310051138.12154-1-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.17.1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org A raw PMU event (eventsel+umask) in the form of rNNN is supported by perf but lacks of checking for the validity of raw encoding. For example, bit 16 and bit 17 are not valid on KBL but perf doesn't report warning when encoding with these bits. Before: # ./perf stat -e cpu/r031234/ -a -- sleep 1 Performance counter stats for 'system wide': 0 cpu/r031234/ 1.003798924 seconds time elapsed It may silently measure the wrong event! The kernel supported bits have been exported through /sys/devices//format/. Perf collects the information to 'struct perf_pmu_format' and links it to 'pmu->format' list. The 'struct perf_pmu_format' has a bitmap which records the valid bits for this format. For example, root@kbl-ppc:/sys/devices/cpu/format# cat umask config:8-15 The valid bits (bit8-bit15) are recorded in bitmap of format 'umask'. We collect total valid bits of all formats, save to a local variable 'masks' and reverse it. Now '~masks' represents total invalid bits. bits = config & ~masks; The set bits in 'bits' indicate the invalid bits used in config. Finally we use bitmap_scnprintf to report the invalid bits. Some architectures may not export supported bits through sysfs, so if masks is 0, perf_pmu__warn_invalid_config directly returns. After: Single event without name: # ./perf stat -e cpu/r031234/ -a -- sleep 1 WARNING: event 'N/A' not valid (bits 16-17 of config '31234' not supported by kernel)! Performance counter stats for 'system wide': 0 cpu/r031234/ 1.001597373 seconds time elapsed Multiple events with names: # ./perf stat -e cpu/rf01234,name=aaa/,cpu/r031234,name=bbb/ -a -- sleep 1 WARNING: event 'aaa' not valid (bits 20,22 of config 'f01234' not supported by kernel)! WARNING: event 'bbb' not valid (bits 16-17 of config '31234' not supported by kernel)! Performance counter stats for 'system wide': 0 aaa 0 bbb 1.001573787 seconds time elapsed Warnings are reported for invalid bits. Co-developed-by: Jiri Olsa Signed-off-by: Jin Yao --- tools/perf/util/parse-events.c | 3 +++ tools/perf/util/pmu.c | 33 +++++++++++++++++++++++++++++++++ tools/perf/util/pmu.h | 3 +++ 3 files changed, 39 insertions(+) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 42c84adeb2fb..c0c0fab22cb8 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -356,6 +356,9 @@ __add_event(struct list_head *list, int *idx, struct perf_cpu_map *cpus = pmu ? perf_cpu_map__get(pmu->cpus) : cpu_list ? perf_cpu_map__new(cpu_list) : NULL; + if (pmu && attr->type == PERF_TYPE_RAW) + perf_pmu__warn_invalid_config(pmu, attr->config, name); + if (init_attr) event_attr_init(attr); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 44ef28302fc7..46fd0f998484 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1812,3 +1812,36 @@ int perf_pmu__caps_parse(struct perf_pmu *pmu) return nr_caps; } + +void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, + char *name) +{ + struct perf_pmu_format *format; + __u64 masks = 0, bits; + char buf[100]; + unsigned int i; + + list_for_each_entry(format, &pmu->format, list) { + if (format->value != PERF_PMU_FORMAT_VALUE_CONFIG) + continue; + + for_each_set_bit(i, format->bits, PERF_PMU_FORMAT_BITS) + masks |= 1ULL << i; + } + + /* + * Kernel doesn't export any valid format bits. + */ + if (masks == 0) + return; + + bits = config & ~masks; + if (bits == 0) + return; + + bitmap_scnprintf((unsigned long *)&bits, sizeof(bits) * 8, buf, sizeof(buf)); + + pr_warning("WARNING: event '%s' not valid (bits %s of config " + "'%llx' not supported by kernel)!\n", + name ?: "N/A", buf, config); +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 8164388478c6..160b0f561771 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -123,4 +123,7 @@ int perf_pmu__convert_scale(const char *scale, char **end, double *sval); int perf_pmu__caps_parse(struct perf_pmu *pmu); +void perf_pmu__warn_invalid_config(struct perf_pmu *pmu, __u64 config, + char *name); + #endif /* __PMU_H */ -- 2.17.1