From nobody Fri Dec 19 18:42:00 2025 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5184413A889; Sun, 24 Mar 2024 23:07:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321680; cv=none; b=cqVjsZjonNPC/K7mqs+MUIlmK2VS5n+H+rlx8WdAYi+HBs6w0fdzhMbQN/CGBRl24COAilXj+kp8X+RARG2D2h8EbaxS3XlC+oJBYvS0vfObCVFKG2sWSFSYvvKjQvPTSRvZ+awsgkc9kwWkKSbCUvztae+/rw0LwGM1fqdSmgA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711321680; c=relaxed/simple; bh=M1QItdYAF71ObWMVTznHt14H9vDAKX8BuqolOPqVItE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lumpuD+UqypozqA6u7OqHZHgAeYyIxGsdWxis6ba+kLlcslZo/NWKz1tH9CbnRK5f8VrL74pGJZ951xrRCbHAPaHcG586sFx8qGdXeQOPhteDGgTyx9n4pGX0fIfWOAtckGT5Ll3HM68gp4a7CeQyZZZoviygjWH0DEykj1tPCI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a/cDvQjv; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a/cDvQjv" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 208ADC433C7; Sun, 24 Mar 2024 23:07:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711321679; bh=M1QItdYAF71ObWMVTznHt14H9vDAKX8BuqolOPqVItE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a/cDvQjvx+8jJxfLmkRwip0S3UjhZkQJ4LaWZ7AbuSAKluJ6jV+7aoYEfF/pwCrym GT6Zg2Ubi4p6zsZRV+oxJIhZmLwlrNBKwZogufv0NMaCwvtHHl4ukPr+L35CmIgxyL bJtKEw73BWr2TQHQirfUH5xaEsD71/bNYn3XW04UAzDAZR0JSa1cAZUqbFjKENGFqC 5LsXlikFP3f8h8nXzuEjtUMYqUpUEPdCIlGcjvZmotmmamhP9Bqes78ryJB3lolHpq sM5dNQeQjs5/20wRncNkRZ9I2DpdVYhgP/yt0TOgf/jI7xRE+Yz2jtvE1SjiPbsguz U84YmSr7rgJug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ian Rogers , Kan Liang , K Prateek Nayak , James Clark , Kaige Ye , John Garry , Namhyung Kim , Sasha Levin Subject: [PATCH 6.6 408/638] perf expr: Fix "has_event" function for metric style events Date: Sun, 24 Mar 2024 18:57:25 -0400 Message-ID: <20240324230116.1348576-409-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324230116.1348576-1-sashal@kernel.org> References: <20240324230116.1348576-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Ian Rogers [ Upstream commit 6dd76680b925228312756c13b9b983661b552a64 ] 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 Cc: K Prateek Nayak Cc: James Clark Cc: Kaige Ye Cc: John Garry Signed-off-by: Namhyung Kim Link: https://lore.kernel.org/r/20240209204947.3873294-3-irogers@google.com Signed-off-by: Sasha Levin --- 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 4488f306de785..80cf2478f98fc 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