From nobody Sat Feb 7 11:05:03 2026 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C702DF6E for ; Fri, 9 Feb 2024 20:50:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511813; cv=none; b=AqNHTBKtQiiSsNGOBHXUZsdfbufoq2BrCqtOLhbMusqExKitn4Lx2hFFRIH0SL9kzK3XVMbtNaA8W3XMGThdm4VYcDTCGTqx0ggFBFSZLl4eNSlB+2lyUhIX6e6GV3v/ex70i2q5Xum7LLCtHSQoRgNRLTSugD2N+Tek6bB2umQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511813; c=relaxed/simple; bh=dTqv/ElAR7jF9GPXK0vEBpGKVQd4I2e0pjKYqFqLypE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ER9G97AAdfd+BlGTSdbYymOGHcQdElp3oxE6+nMzRINj+jy6n1+FbqTD/ccdK//NGF29tTedp2fhrP+bPsNuKngqQmMiMfSUGQLg68zrk5Vht5vnSOxwsUnBcSTYMZzVmX6caH2NoUnheVPB+c5boWtStOjUfnsQ8j1LOrBVb5A= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=CkryVHF2; arc=none smtp.client-ip=209.85.128.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CkryVHF2" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-60482420605so20747827b3.3 for ; Fri, 09 Feb 2024 12:50:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707511811; x=1708116611; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=fMNJNpeOWO5Ji5jMn6B3E094OE7OuzEg0rGAuJgRsjI=; b=CkryVHF2T+fABMveDwIW0pX1m6Jt6eszA1YExxr+Vi+GREEbKypdu2+iXoYH8H+/k9 dJJ56Vfmbl+PQAHxZevvCzchOqeCVDW+uXWDjGzpbTmWTalAdMA8YEd6Cb0spdamrUUy zto7tF8d7KVWGZQZN+xM2DFluk8quqrKdv9pRV0ZTG2xyO4eHYC6x7ggzQgwRpwMv9Lv Nh3dpXsj+mFJXa+en2FNL7HykT2pe2bTDm9Nc1nF1skPmgvaUyMNacNog09K3tK2Oiji KGMgF5fvHUk8UfedHofkYClcKjFzVCh0BHfaYjC6/Xja9EqKKdxF0ENPrD9BulL0u593 QbnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707511811; x=1708116611; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=fMNJNpeOWO5Ji5jMn6B3E094OE7OuzEg0rGAuJgRsjI=; b=FE6DaZhGQiOFr5TD/F1ToumeLxNxnS1ngR9tDiuK7qj4WZ8On+I2YYxJOox8U7eChV DuM7+NuRZIbHvqiuTQxydr5zkeikJY65Ixyf7xYx/3Evfj3hWU5IXcZ9eXgvO1qvVsdN F1mtASuZQZSWDHu8QsIvGEnfqCAf7AF8b2TR4z/jJgdy5QaVpYc7dHSS77nZ0+v5DkeH 4wHwnVLyFMkeri7y4LG7qHsVhhia8oPx1CGed1US5H28MBtIPAYRvTDaU89MvbCKq/4K GXjGP+vWuZR4AG8rm2x8mVsBHA7Z+TfDXyx1BRCnfe47sylwCCwZPbZR2Qu1k705dXry q2TQ== X-Gm-Message-State: AOJu0YyGgSvI7w5SBZMa2K1w+kgMnhaGMfb0PJozQ7ztatI3n3g4vSFg B35sUq1ZGBWXBJeWjmqtQOvX477bGBbEqhrFCPRBZ+nE3HhRogCLP6nsyxGjlFBoLTSaqoGp0l4 QKE7hlQ== X-Google-Smtp-Source: AGHT+IESHNgzcmy9Dgs8JyJG8x+qRNOJl7CHBKaOnWWZ6rgcH4i+s+zgGZxx55zQzzsJPt1MajG6rFnGg8iV X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:877:241d:8c35:1c5b]) (user=irogers job=sendgmr) by 2002:a05:6902:1007:b0:dc6:e20f:80cb with SMTP id w7-20020a056902100700b00dc6e20f80cbmr5981ybt.3.1707511811233; Fri, 09 Feb 2024 12:50:11 -0800 (PST) Date: Fri, 9 Feb 2024 12:49:44 -0800 In-Reply-To: <20240209204947.3873294-1-irogers@google.com> Message-Id: <20240209204947.3873294-2-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240209204947.3873294-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Subject: [PATCH v1 1/4] perf expr: Allow NaN to be a valid number From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , James Clark , K Prateek Nayak , Kaige Ye , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently only floating point numbers can be parsed, add a special case for NaN. Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/expr.l | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tools/perf/util/expr.l b/tools/perf/util/expr.l index 0feef0726c48..a2fc43159ee9 100644 --- a/tools/perf/util/expr.l +++ b/tools/perf/util/expr.l @@ -94,6 +94,14 @@ static int literal(yyscan_t scanner, const struct expr_s= canner_ctx *sctx) } return LITERAL; } + +static int nan_value(yyscan_t scanner) +{ + YYSTYPE *yylval =3D expr_get_lval(scanner); + + yylval->num =3D NAN; + return NUMBER; +} %} =20 number ([0-9]+\.?[0-9]*|[0-9]*\.?[0-9]+)(e-?[0-9]+)? @@ -115,6 +123,7 @@ else { return ELSE; } source_count { return SOURCE_COUNT; } has_event { return HAS_EVENT; } strcmp_cpuid_str { return STRCMP_CPUID_STR; } +NaN { return nan_value(yyscanner); } {literal} { return literal(yyscanner, sctx); } {number} { return value(yyscanner); } {symbol} { return str(yyscanner, ID, sctx->runtime); } --=20 2.43.0.687.g38aa6559b0-goog From nobody Sat Feb 7 11:05:03 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EA96914F75 for ; Fri, 9 Feb 2024 20:50:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511816; cv=none; b=DMrJ6zVvNptUCnMHYzXLKpF7DZuJ1FU0ERil6aIxvKtBkuMRUBbbIrvpmu/cBoulmY4hOle9Z5YwkfPJ8W0wEUhJ87lWcRcnfdvgP3K8VMhKO56Oxfy7eAQi1SXY2zHxCvoUc1X/OWBOnRuC8GpVbzEWXO/ZBivtdrzcUTdphM0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511816; c=relaxed/simple; bh=CbVycyAyqWnjOhqGXZ0kFJxI7/ZRDcDTc9Vb1+mg4QU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=m1qrnPaBcTBk38My2I6q0/fl0VcOVoMugpLtTz5ReqYdF1FWoEcWFkhk8B0UFQYlNv1icaGEQdDywZ8b7BLhTPzlJQHrpxvF/ITmfgejGTIGVVQ4udUNhQXhI1dcFdo9hk1v6KwuLn9+eQmL3/N5bd/PGxbVsNIICqBuOFWRosU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=NKSu/MlE; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NKSu/MlE" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-dc6b26eef6cso1987569276.3 for ; Fri, 09 Feb 2024 12:50:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707511814; x=1708116614; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=qR84mNrslfcjY8XyWDHEQaLVA/4KGd9xMsI7WbfV4Ig=; b=NKSu/MlEPjqRlXp2ajUFxbptngSq73PdhmcXYYJQxXkCeNkHLDQvO5N7rRS3KsAmO+ l8eVBCYgMTl3TT6A0utsFOZtMbPfLzbbMuUC+8Ew8d18IS0Lz9T/u9KeEbDoQ60K+lEl QbvvNlTkfnDKt6zgOSU4CumTyXtONpNBVB+Pn7oz3h31Nvgz4Gw1xcs7uHCXYzPoeEQd fM0LcnaRATYRZAjWslvZ1qtc+DT+YqTb97/dHTzR1Pw3hp03h6jWr3AYP6fWHWBI3bNS kZrzhMLva2jF/76kLLSwtJr9hRUB0zTTgXBgpYxj/1KNffiF1c24A2Zk4z1D3Sw6gnkF yr6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707511814; x=1708116614; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=qR84mNrslfcjY8XyWDHEQaLVA/4KGd9xMsI7WbfV4Ig=; b=Wiqiz+ZLIkJ0OUfM1/RAr4iI0V1D0E6ptKbplW11mKatpCj7WT5Mn9bCNHlWwFLNHt wNe9V6X1FBZMnm5TVfvKAZIc6KsZusXlM45ve6SDfxTRBgoBJEpQDVNiBqzLoLmfSzF/ 5C2SS4V4c9yCPi3oOxx7OMfS33CPvWrqJzCMERihqsd3UC33nnBzibAbR3DHfuNb/S9T hTEyF/GMfEbypgdoMUZbMU1cjO+OFOqKLsP+G5R5DjBlwiSaRNU5gt7AN4S8dP+zFcSc MMmpv05bJsRViKXZsK9OwzL5pXimA1rT416okxKMSC5O99bxDYqyAimmRxUHaKfnZV4t cI8w== X-Forwarded-Encrypted: i=1; AJvYcCUmm/V6tqgYFv5YDn/fuMGj01bk6dSLWM79chnw5XcFaLHNvRin4jcGfMlJ8UjtShiiKdb9DfdfHiWQwI554DWY/678BIXTF/6nG2X8 X-Gm-Message-State: AOJu0YzC7dSI28wRmIF+i4La4gZQFOOFjW9kkr5IwBEL0kIOKZOY3T1a rJ+g4DGEtJeJQbPag8XZeVft/ZNSUlmw22/zXvJqGH/2cZs9WU5y0vSaqoEyy8R3Qgz1sAKnpny kbJp/Xg== X-Google-Smtp-Source: AGHT+IGG1Rxf3SMcCpxfxkRqDUz7dHOOD8Ki4rNA4wYhKtISteoWwvV3FknwBD0NosqhldKZg4qJbWokC5mc X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:877:241d:8c35:1c5b]) (user=irogers job=sendgmr) by 2002:a05:6902:709:b0:dc7:59d9:7b46 with SMTP id k9-20020a056902070900b00dc759d97b46mr11144ybt.3.1707511813991; Fri, 09 Feb 2024 12:50:13 -0800 (PST) Date: Fri, 9 Feb 2024 12:49:45 -0800 In-Reply-To: <20240209204947.3873294-1-irogers@google.com> Message-Id: <20240209204947.3873294-3-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240209204947.3873294-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Subject: [PATCH v1 2/4] perf expr: Fix "has_event" function for metric style events From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , James Clark , K Prateek Nayak , Kaige Ye , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Events in metrics cannot use '/' as a separator, it would be recognized as a divide, so they use '@'. The '@' is recognized in the metricgroups code and changed to '/', do the same in the has_event function so that the parsing is only tried without the @s. Fixes: 4a4a9bf9075f ("perf expr: Add has_event function") Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- Note, this fixes a has_event issue but as no metrics currently use metric style events like cpu@inst_retired.any@ no current metrics are broken. --- tools/perf/util/expr.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 7be23b3ac082..b8875aac8f87 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -500,7 +500,25 @@ double expr__has_event(const struct expr_parse_ctx *ct= x, bool compute_ids, const tmp =3D evlist__new(); if (!tmp) return NAN; - ret =3D parse_event(tmp, id) ? 0 : 1; + + if (strchr(id, '@')) { + char *tmp_id, *p; + + tmp_id =3D strdup(id); + if (!tmp_id) { + ret =3D NAN; + goto out; + } + p =3D strchr(tmp_id, '@'); + *p =3D '/'; + p =3D strrchr(tmp_id, '@'); + *p =3D '/'; + ret =3D parse_event(tmp, tmp_id) ? 0 : 1; + free(tmp_id); + } else { + ret =3D parse_event(tmp, id) ? 0 : 1; + } +out: evlist__delete(tmp); return ret; } --=20 2.43.0.687.g38aa6559b0-goog From nobody Sat Feb 7 11:05:03 2026 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3DF9C15485 for ; Fri, 9 Feb 2024 20:50:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511818; cv=none; b=R2vAdsqLj05iMTmHGh2O9RBucQuswittJKDaiMxm9ztxlKKVA7lbbxGbVtGvt2+ZE0BSIHPHK6aCbM3X5P0D+Zu88HtW+rZBWngIv3RgOGZFZcrh80AGnCNka4Xeb8cHx+QfQKFu3pGmKQgs8qXgRlfuzIBYgUUL2H+0azJ09hE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511818; c=relaxed/simple; bh=FN1xH7txpWYfGe8oXzu7wp0Df0lMgRHZJT67LPNIglU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ZMfOa6UcHNfYV87tymwYchQmZZ5KMWqE+QqVy4YLRwgk7LH4JLkBoLxytg9xW0GdOgG+BYVsOdEE1eDR5wO0sJdTzuzAekCw3pC5F8HwjhZ3ri1Em22clTa/TISLJwQnRLrm6vdkk3/e8+XSb0r5nZ5UlknNG4zfAu9VmSRMsAc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=LewBizmV; arc=none smtp.client-ip=209.85.219.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="LewBizmV" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dc6b269b172so3194833276.1 for ; Fri, 09 Feb 2024 12:50:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707511816; x=1708116616; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=oBdjorgQB0gt1zgRALPto7TpPrhqP+5PDX20bu5pfxU=; b=LewBizmV3f85bnm5XnNTMrsb6wd4bKnUbo2UeCWJCHCqbmnGvOxlAZ15l0DIYFxFl/ CPBIGBzRno0n6DJz+9eFK6I02sBVwueMzR0I3qH59KT54tFalKPz31ylLZm4jqVcFW8S 6VOB+oEHsP30+eJAFq0L3QePhh2nn1MngvbtHS6ddGzK3NXW3i3E9fUiHq3iPsmokuwk uLLM+TF7F03qEPMWNrY6S+JWezAOGxj6Qf+T6wyVBQQzPtUg4mu4soULBTGUPNax41qx eRhl+g86T24DbNfaqKv6E1uv4YIByunJdfzT5BuZ1GjlZP9xqsWopZyCvGidgixHVCZw Bauw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707511816; x=1708116616; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=oBdjorgQB0gt1zgRALPto7TpPrhqP+5PDX20bu5pfxU=; b=dgigybi3ipi1tlbCrcsKsSJbuYseyxNNn8ybUdBo68Gg4eFRVa2Wp3lo86EhKTC8TC wybWuK61ymgaRVjL+SPwa6/lNyh259R92b5n6SSSk5TIdjTwDT59Aa+z2fc5wlMPFN12 Km21FQ6rNpjHYOIIPHejSmnZRz6gl8Ztj5GfZjBym6LykcAskS6Elb73b5XaGsbTgUcY qbFXIoL4mWNpwI+E4VHMYJPa1m23wPbm2Ce28sB/RDWMExOH9e9bTjKdThqO8Wl7TSNN hilq0ZMy0FsuuYUGQ9cnlytpLY74Ipc9qyhm5hvqIS46D8MyTckCwo8iEWoH38Yx5HUI ou1Q== X-Gm-Message-State: AOJu0YxrZ8BHgatirE/Gh3mNEgRO8aBYTVViHNmC6N4SkXvp3w/qc5Tk ZM+d6Ts5EfJu1GPx5CPbkvRutSBcqDz1wVGeRyUKCmIZz1ZASsQzbmpeFLFVLb591h8pQKxVhhg 670VPFQ== X-Google-Smtp-Source: AGHT+IGCVCKuACIOU1FX0kOaK8wcfhbRrM75EuyLpzkhf7rKyVv1U4leJ8uARRH2YSaI56YeXEYjmx0YsVza X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:877:241d:8c35:1c5b]) (user=irogers job=sendgmr) by 2002:a25:ae03:0:b0:dc7:463a:46d2 with SMTP id a3-20020a25ae03000000b00dc7463a46d2mr421048ybj.0.1707511816316; Fri, 09 Feb 2024 12:50:16 -0800 (PST) Date: Fri, 9 Feb 2024 12:49:46 -0800 In-Reply-To: <20240209204947.3873294-1-irogers@google.com> Message-Id: <20240209204947.3873294-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240209204947.3873294-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Subject: [PATCH v1 3/4] perf stat: Avoid metric-only segv From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , James Clark , K Prateek Nayak , Kaige Ye , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Cycles is recognized as part of a hard coded metric in stat-shadow.c, it may call print_metric_only with a NULL fmt string leading to a segfault. Handle the NULL fmt explicitly. Fixes: 088519f318be ("perf stat: Move the display functions to stat-display= .c") Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- Note, the fixes tag is to a refactor that moved the function. The bug existed before this. --- tools/perf/util/stat-display.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index 8c61f8627ebc..b7d00a538d70 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -560,7 +560,7 @@ static void print_metric_only(struct perf_stat_config *= config, if (color) mlen +=3D strlen(color) + sizeof(PERF_COLOR_RESET) - 1; =20 - color_snprintf(str, sizeof(str), color ?: "", fmt, val); + color_snprintf(str, sizeof(str), color ?: "", fmt ?: "", val); fprintf(out, "%*s ", mlen, str); os->first =3D false; } --=20 2.43.0.687.g38aa6559b0-goog From nobody Sat Feb 7 11:05:03 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B3E411AAC9 for ; Fri, 9 Feb 2024 20:50:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511821; cv=none; b=oafDeDKtYxILWfnAUtpqeimL9s5W/Z2pETKV+jMMpedm6fitj2zr/8+CljbzzOn7KB3OSJZJgycAItdsUSVlLQDdUkChvDW5EMcyQhOTUKSfDvVKj4tdLy71TvE2SMRnrZs9y5o0MlqR2ZOEoGHxIEknDTFqcj1C0b8Cqv/GnfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707511821; c=relaxed/simple; bh=v4L2Yvy+TPTB2iQqHtTEg47KRn3FjqMxg156ChWAFME=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=dxUJLFhdKn7e5DKVovvUECQ4lRR8X8eRNJv6H5L/ePNFQ3OTw7LfJGZJi7op4YfMlryJQjh2zLrgXTZzXJCv1D3M9RPiWucHnKOmJtczkkbktWBpiuQ6l1+PJDsETka1ty5O8WWaVOmfw4NaVp4GLzEPd3yjoQqQOqkVLppd+G0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=0iyt/ez/; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="0iyt/ez/" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-5ffee6fcdc1so25337397b3.2 for ; Fri, 09 Feb 2024 12:50:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707511819; x=1708116619; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=gknoLaUB2sz5KFXkBLXORn9pUeJlqgUBUUSyFz57kQs=; b=0iyt/ez/4MjLd32489GYk3uUVOgqHjeKF5X618nVPzfmlb+NkyBI0PkQmB+g4+GupH +XIOM6NebXMjQZRRD7y/tEyWAp/WzB+lYzqdNJiN9k7S6UJIPck/zqBSNPgBdYOJrUVl 35vgmLWgKjnE5Fx/NzXsS7PuopUgDYEwZdtrHrLDTMozkWXUpVPb03k0dKeW2dLtVfgH iHqH4Y1mAEA/UvflvjQoCWxI5/vDg93hPtQS/+krEBOZVoNNgUhj3RVsXxwsjVBWoSJx 4G6EmQGl3cY6RIYvGwITZBL+RLUfNAzXdTHDcwZnOf4b4a9CjlxGpCZZOAvPc4AaXh9l rMeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707511819; x=1708116619; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gknoLaUB2sz5KFXkBLXORn9pUeJlqgUBUUSyFz57kQs=; b=f8INl2b6fyA9yllgdQ80Yh8rWLQIz8U+aYPZGNR+Egkqh8h9vLZCCOYBAMC//TB7Hx QzoJWvwKbm2yurwg8YKY49GP8K64lMDszgzp6Hjt2R5EvrgPYHYvZY6C4endzmkO0Ib6 2fb+2zHRruWg1dWwzN1y9Gt6zinzX67cHwDmxihwtmtYrscuc9hQBnw2QxQEN9jkPRRa MVQQnX3uSgrrQ819pMSTBqp759s3WtfYorLA9CezYgK4AxMQ7IAoKr2RGrAnKrXv4kFs A+s09hUKRKJ5Oa6vbAIUSLVM5XC0kDp20jqWBAG2JnH/AGHTyEmQ8YlM8mcaZ57imTN3 sWlw== X-Forwarded-Encrypted: i=1; AJvYcCUZ7AL+68apXInm4npFhcwu9g+lZNQOsEXeYLo0VGhtbxLeTbwLfAqNclQl/mIJIi2Pa/f7nYjM/Ks8bd9VX6oLjga9x6bryVr+Mlwi X-Gm-Message-State: AOJu0YwzpaFww9DLqWL4NZoCyNJQfiMlMzF9Q03c8iDbAv63aQtq79Nx Y9Rx2uDN8ufnROmjTcQ3pIErWycVNkbVUtXMrazFhjT/NLdvhuVLiDA/nFcSusaXXJQyLD8Vwwt avVcZWQ== X-Google-Smtp-Source: AGHT+IGEWg8J1iOGAYwp5/i/iMbjcwAa2gGukyNU06noyL1m3zapgRwM6609RJcQllvTA2fSM0tl40LH6ykJ X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:877:241d:8c35:1c5b]) (user=irogers job=sendgmr) by 2002:a05:6902:2201:b0:dc6:d890:1a97 with SMTP id dm1-20020a056902220100b00dc6d8901a97mr5150ybb.9.1707511818829; Fri, 09 Feb 2024 12:50:18 -0800 (PST) Date: Fri, 9 Feb 2024 12:49:47 -0800 In-Reply-To: <20240209204947.3873294-1-irogers@google.com> Message-Id: <20240209204947.3873294-5-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240209204947.3873294-1-irogers@google.com> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Subject: [PATCH v1 4/4] perf metric: Don't remove scale from counts From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , John Garry , Kan Liang , James Clark , K Prateek Nayak , Kaige Ye , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Counts were switched from the scaled saved value form to the aggregated count to avoid double accounting. When this happened the removing of scaling for a count should have been removed, however, it wasn't and this wasn't observed as it normally doesn't matter because a counter's scale is 1. A problem was observed with RAPL events that are scaled. Fixes: 37cc8ad77cf8 ("perf metric: Directly use counts rather than saved_va= lue") Signed-off-by: Ian Rogers Reviewed-by: Kan Liang --- tools/perf/util/stat-shadow.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index e31426167852..cf573ff3fa84 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -414,12 +414,7 @@ static int prepare_metric(struct evsel **metric_events, val =3D NAN; source_count =3D 0; } else { - /* - * If an event was scaled during stat gathering, - * reverse the scale before computing the - * metric. - */ - val =3D aggr->counts.val * (1.0 / metric_events[i]->scale); + val =3D aggr->counts.val; source_count =3D evsel__source_count(metric_events[i]); } } --=20 2.43.0.687.g38aa6559b0-goog