From nobody Sun Nov 24 19:58:09 2024 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 A2ABD1A7273 for ; Sat, 2 Nov 2024 16:54:12 +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=1730566454; cv=none; b=HkrCVHxAilLhIPWtobP/3iqSIpKVZuE/OIWmuy1+LhVEC7t8yn9r7+08uLOtLUMVRv3ksT/gb8jFpSr+JQYIAq9SFrC13Vr4UtCCchYvxRwz34Pa8t/DZrLdESKVX+VY2pEblPFe63znZ5B/pWAtJ8uBvwdMk95oMRe41J2zEiE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730566454; c=relaxed/simple; bh=0UelXkPPHtu3Lbgh81jbZ3m39fj7o+Lntdf2ZlzEBXE=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=YE4iK0iAQDyX/+jCa1NkVcQSs8R69FdTsU1owxuXGHaH30WAbXvExz4NQ81wfCv6arKzTDqpCDBmgTI1ihiXWXYf8OXtGW23lWDSbtQOG5IOJRfFvHXxmcYPgW+YqM4ylDBrzKKjVle1tSfVdxTTN7qOfwT52h904GmNKQ0qaQo= 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=K83sUV/5; 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="K83sUV/5" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e30c7a38bd7so3768021276.0 for ; Sat, 02 Nov 2024 09:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730566451; x=1731171251; 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=zD1HnzB3QtGTgZf1hSToxgFVkHLaqYNzGE0Bj2UaIas=; b=K83sUV/53EN9py7s+1GIoYlS/izWgZOovbQve2fdQEYY81AwAIe6uHTCvu9/Ygtrs9 1I3GAeXO9e84wGTD0BPPxkDX958bzz99dzKeARQLrjrmDudOE8lpIGp3tSTnYmvk1aIL kvNETdZYckBGIjtGliJ24EKEXmTuxbrjqqK6lBt8FbI0Tl25bxdFAoBdxVx5BYyCHbTf 9m8yXMzXZ3qAJ6/QmVtooQylwxNFlOx18pS0iiOghJjRuL0pauQQTyG4oEN/AmkETF7J tuYCGE0G8+UDQYq5Kck3OqHRQHBxC/wbNFj6mRlB26StdM4wU38ztmc5hUZkAJQrtjjV amDg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730566451; x=1731171251; 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=zD1HnzB3QtGTgZf1hSToxgFVkHLaqYNzGE0Bj2UaIas=; b=JrxXvyQHLQf/pDjSW5XvABgKoQuMqTdsmBt42QaOn2htf+anRZz+6nH+QiSkakMAfx Jn8kG04v0A1qXu0ZeXZSXsKktAgypO/EOcbiHxjOc8mhUhVnhcunqLThtw3x97Nh8co/ 16JzB3OS2WlQ6gTtVJDATwCv+bCf+g7Rdp3OFJzy2V9MqcwtSC9hX6RGsbA+hln5Pce3 QuMjOgTfhxtDKZxEanX8VT8pf1nNkjFU+Au5qACmHVsdeEYayAtnySprhE9+xQKo+3jj s0pYVJToLjStyOWimwtUDcthkDLuy0lEa/Chcui86HoRzMWKl+UScHKXh098F0sts5rN zkJA== X-Forwarded-Encrypted: i=1; AJvYcCXjTifKBKdKojiM7dduE+vuoW73sTIYGOn2icxf2G9wYfa334+Q2Rl+oPYLbIMuU0wd3WYjM/Bw3rBtonM=@vger.kernel.org X-Gm-Message-State: AOJu0YwmNxLXoUzv6dBQYEgK2BTK9q943QJ+QQf1woyA8ZKuUXnfbkhx GvZcQI5CX5i3QYW8AZFTIflKusQ8AVq0nHK/7LYqww02uEU0z6Dr7h0NOtzlj5PSEEmORBQe6HS h1+NRNA== X-Google-Smtp-Source: AGHT+IFBaTryzrPh+JXnXKZudoEn30+nNMTh+mTSHhYqrA3l+SHSN0vPByNNg0cmbh4sAu9o+ZzPLiReolI1 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:26a5:cdb5:356c:64a4]) (user=irogers job=sendgmr) by 2002:a05:6902:1801:b0:e30:b89f:e3d with SMTP id 3f1490d57ef6-e3328a15f4emr1543276.1.1730566451619; Sat, 02 Nov 2024 09:54:11 -0700 (PDT) Date: Sat, 2 Nov 2024 09:53:55 -0700 In-Reply-To: <20241102165400.75785-1-irogers@google.com> Message-Id: <20241102165400.75785-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: <20241102165400.75785-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v2 1/6] tool api fs: Correctly encode errno for read/write open failures From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Switch from returning -1 to -errno so that callers can determine types of failure. Signed-off-by: Ian Rogers Acked-by: Arnaldo Carvalho de Melo --- tools/lib/api/fs/fs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/lib/api/fs/fs.c b/tools/lib/api/fs/fs.c index 337fde770e45..edec23406dbc 100644 --- a/tools/lib/api/fs/fs.c +++ b/tools/lib/api/fs/fs.c @@ -296,7 +296,7 @@ int filename__read_int(const char *filename, int *value) int fd =3D open(filename, O_RDONLY), err =3D -1; =20 if (fd < 0) - return -1; + return -errno; =20 if (read(fd, line, sizeof(line)) > 0) { *value =3D atoi(line); @@ -314,7 +314,7 @@ static int filename__read_ull_base(const char *filename, int fd =3D open(filename, O_RDONLY), err =3D -1; =20 if (fd < 0) - return -1; + return -errno; =20 if (read(fd, line, sizeof(line)) > 0) { *value =3D strtoull(line, NULL, base); @@ -372,7 +372,7 @@ int filename__write_int(const char *filename, int value) char buf[64]; =20 if (fd < 0) - return err; + return -errno; =20 sprintf(buf, "%d", value); if (write(fd, buf, sizeof(buf)) =3D=3D sizeof(buf)) --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 19:58:09 2024 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 C432D1AAE0B for ; Sat, 2 Nov 2024 16:54:14 +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=1730566456; cv=none; b=kMxvZh3ZBOl9cEAgsDzMbxvlupS7eAMfeDI347YOKEqEvLPt0tNbqbs9mtlD/IvyGGvKMmcUbDyAMXmPxLFy8lbBUM/ecoIPAcQ9AIHMKlVW/n9VrowkAEF+Jzp1XI03QSVp3NCjZzmeO6aLmcPpbbja5jx57uAEgig0/o/KRFo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730566456; c=relaxed/simple; bh=jqtfqcDozTYMQzjOGe7gtUqSxh4PDuu/Rn5JE1kCsYM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=mZCUQBbNLeCzq+2iKT6h2+3/lkGbeeJT8pnmdSVd4jyWTrnY5IQHnTDSCWiDYHTeLLN0VNBhlTcjWAREIluUijyE+9ov4sEAC/vzIqhqbUBvD6QvcNqnIcEklXXViF3Ot0xKV/d7AeAKz89W6g9plr3GxPDOqYMpsrN0FH08XwU= 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=QXglA3+L; 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="QXglA3+L" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6ea527764c3so65217677b3.0 for ; Sat, 02 Nov 2024 09:54:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730566454; x=1731171254; 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=kmeR/ooJwGRf7dfAO7pFQRGOg67G8nX2zbSdm6KkuuA=; b=QXglA3+LQdT8Q5Kjr7m/cxW9naHt8SY2dhi4+CxBJSiTtxa7OIWppFNN+xI0QubqC4 oLio/rDTRDaReCw/2ODvlvclJENjFvJHuHvC8xZpfzzTCsf5we5I2oNhG9W0KEUcO2DN dbFus9nFrZJKymzLvMzontD7vb/qKmQi4KAgmKPBYKkpv9+ow36JUCgMK7Y5PESfKfQT eAkbLUAjwvSF+F2zQ6VGmawptyMCi1eGB+Zx93Gk6UL67DSvAizWgavyMAOX0KZIxfa4 vQyRySBKDYosFgoDjY+98IIYD8fFVDbEfqkGQCoGWgcOrh2t8s7ZtAfWkqUozI3j4JOK J0CA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730566454; x=1731171254; 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=kmeR/ooJwGRf7dfAO7pFQRGOg67G8nX2zbSdm6KkuuA=; b=NUlHEee7fc12cShkU5Qy1uDhbGrXEzBGnebsxrfRj2lRoFJtNWi8LvJSp8EuBt7GV4 J/1k0aAh1iiAOXoy3pBPzql6NRsTiaecsMGl4nKsSCUMadoF7yd0D0G54cKx7tlrHKPl gPQZb94yhNZyVyZJPX5jV7HGkChYOxXwQirIGr1xn1S8/L7E7qLTBAVFUnRH2xnuRZN9 EMgY7MAcsT6Vxltjd0N274czhXgdf0Y/mW7QhLDq1ab3FHWZ4e4JpBk+5VCw6kqzI78r EVRV8Uf5CMkg61TW4fW+tzqu6vwEa5d2pK54Uw9mrCIQMx0uMzXdrKpz2cxYsEXZlcEn VPmg== X-Forwarded-Encrypted: i=1; AJvYcCX/yTN0UWC9Pdoja7zalqn+lh6y45aBevsikoruBsHvX9nUpDSNWvkdASYJguEk5I5r6cJXTh0WwxBF/cw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzx98rQAeBs6zst+5/4TMPDOAcpgDZDCI/yq9hunFa6YcS/a3fG QYKxYlmhamfIxYHE0C3pFVk5Bl14y2ZPqY43PAjWxXRiGvFL5tRzwY6ZgBj9aE8UgHBmQ34Dchu /OcncbA== X-Google-Smtp-Source: AGHT+IFq/57/M1dR4TI5sTZFRkJ+7pfYTpS18HTUCeIYozNVMDf4uGtf39Rs8KrRHBzucavqtbOBsbu5v5wx X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:26a5:cdb5:356c:64a4]) (user=irogers job=sendgmr) by 2002:a05:690c:45c5:b0:6e3:b93:3ae2 with SMTP id 00721157ae682-6ea3b88e882mr2411427b3.1.1730566453754; Sat, 02 Nov 2024 09:54:13 -0700 (PDT) Date: Sat, 2 Nov 2024 09:53:56 -0700 In-Reply-To: <20241102165400.75785-1-irogers@google.com> Message-Id: <20241102165400.75785-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: <20241102165400.75785-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v2 2/6] perf trace-event: Constify print arguments From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Capture that these functions don't mutate their input. Signed-off-by: Ian Rogers Acked-by: Arnaldo Carvalho de Melo --- tools/perf/util/trace-event-parse.c | 4 ++-- tools/perf/util/trace-event.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-ev= ent-parse.c index f0332bd3a501..6f11ca5513e3 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -99,7 +99,7 @@ unsigned long long read_size(struct tep_event *event, voi= d *ptr, int size) return tep_read_number(event->tep, ptr, size); } =20 -void event_format__fprintf(struct tep_event *event, +void event_format__fprintf(const struct tep_event *event, int cpu, void *data, int size, FILE *fp) { struct tep_record record; @@ -116,7 +116,7 @@ void event_format__fprintf(struct tep_event *event, trace_seq_destroy(&s); } =20 -void event_format__print(struct tep_event *event, +void event_format__print(const struct tep_event *event, int cpu, void *data, int size) { return event_format__fprintf(event, cpu, data, size, stdout); diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index bbf8b26bc8da..084068fb36a1 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -39,10 +39,10 @@ trace_event__tp_format(const char *sys, const char *nam= e); =20 struct tep_event *trace_event__tp_format_id(int id); =20 -void event_format__fprintf(struct tep_event *event, +void event_format__fprintf(const struct tep_event *event, int cpu, void *data, int size, FILE *fp); =20 -void event_format__print(struct tep_event *event, +void event_format__print(const struct tep_event *event, int cpu, void *data, int size); =20 int parse_ftrace_file(struct tep_handle *pevent, char *buf, unsigned long = size); --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 19:58:09 2024 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 B672E1AAE39 for ; Sat, 2 Nov 2024 16:54:16 +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=1730566458; cv=none; b=VKVz96p/PMkMEe4bIUkn0nAP7UgKW/YUmjw2Bdbr64pqL7VfLcUG2vrcuZWvKwoiJOAq1t5vYglyHivWsezVl6L473343OobDjVgLsyuUj80jlH8KVzFsn+vrAI6DlkTBgVKHG7IP0WEMme0NrBbUHBs5JBoupfTsXxp3u8QDwI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730566458; c=relaxed/simple; bh=fw5FTiisDk5cyhf8wcogBBpQyMSz0nXrYiG3JWj7IaI=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=AqHVOjpX7rvhhwZt3/ZwpzJqeexEQTLd85wXnSvAX9RYMXqylGDz6dnexaiWernYNjAuhsWeYCW7bm/PisXmqoPMTIb44+LAOeXMaEDKrZkgH8JlKugKa3GCRhzIatlwSszfoTPMQ0yYSiC+dsI7OaGrBxk/jn1Qe39ImmLgCiY= 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=1cwEUS2G; 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="1cwEUS2G" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e36cfed818so47789867b3.3 for ; Sat, 02 Nov 2024 09:54:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730566456; x=1731171256; 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=QCWMpv5edYfDnb5d8WWLsWf6rYHjMo4DKAX+NrFH0Vo=; b=1cwEUS2GEzHZKiW8qYgz1z9euCjKdWnqYfCvLlKIyysVXM3XNcxgRb52457XZgpavQ XvGBhC4cwHoBMwZbwukUhJnfTSzBvdOIxbHKjL/h+MRhbNkjmMtUmlnKxWSKavPmDpn4 3pNNglaZey7JntHhpE1OTB+VoEMYnPRkITubP7uwqDOFIvrvGp+9zhunAPFZUYKUbpks D7DJ7/3Gn5J0hdi/RI7DRv7K5m9BFktlYHCzzVdbjGe6CKd2C4WUj/EVvVvwkgvSLEVc 7ZynAWtALQJZ03lVf+USpNM62f72wvNCo0eG6Y/BKDJ2emkqE/2TJvGkALJRJNSteXga DjSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730566456; x=1731171256; 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=QCWMpv5edYfDnb5d8WWLsWf6rYHjMo4DKAX+NrFH0Vo=; b=w+YC0MWr63JZTgR+FAxD7DwwqaQu5iJYUKKG2vS9OOIkEUH+wIOyXaqFr17t+JtiRb DgLJi4x6Z9XvnhfwbLfmOwvEXG3SpUUV0bBfMZVma7uzotaRGNf65300mEY1oAraSHWs 5PUvYr8YSIdoURDMc+9WvwbtmE2LZ85wDjoDj30esz90rn1e/moxLZEoKsXp5g2G+0sY OIvYDi1aGC3DPBCQgcQICE4u3svzc9DF5J5mQDIlbD6qAcSKmy9mp8lM3MJekPnWz2zT 2Lvxnq+O7hYpZYqObFuZhUogya0cvwnlSFrR2FfVgE4t+Qz9MbLVi3lYECwkpyYmsPhi vXHg== X-Forwarded-Encrypted: i=1; AJvYcCVQLFMsp84Ux6CevhFunzsnL5kQ1Fx/sPJx1wcH+BrNrFskUEYhdRTSdad/93iE1hvu81ZlqLV9YwXLaP4=@vger.kernel.org X-Gm-Message-State: AOJu0YyFf+FrX5iocYddSlZDhObN5RhocGQzzsov8DMRC9kgwQs1HvTZ 5To+4batOr43ewmSeuweAXNhDBqdbdWRLEiR5pD0hWyEQqEyM5aG+Fqp/nhBB55KDOpmu6qZmpY JmLBf5A== X-Google-Smtp-Source: AGHT+IEKC7dcHOrelEdoxz5nY0GcsHeDEIN7ZEVCnbp2eYlUfdgzM/utYNQ2dIQoUX2Y+C0PU6dj7B/bQ8X2 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:26a5:cdb5:356c:64a4]) (user=irogers job=sendgmr) by 2002:a25:838d:0:b0:e30:cac7:5b70 with SMTP id 3f1490d57ef6-e3303408237mr5157276.11.1730566455922; Sat, 02 Nov 2024 09:54:15 -0700 (PDT) Date: Sat, 2 Nov 2024 09:53:57 -0700 In-Reply-To: <20241102165400.75785-1-irogers@google.com> Message-Id: <20241102165400.75785-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: <20241102165400.75785-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v2 3/6] perf trace-event: Always build trace-event-info.c From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" trace-event-info.c has no libtraceevent depdendencies, always build it and use it in builtin-record and perf_event_attr printing. Signed-off-by: Ian Rogers Acked-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 2 -- tools/perf/util/Build | 2 +- tools/perf/util/perf_event_attr_fprintf.c | 4 ---- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f83252472921..0b637cea4850 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -1748,10 +1748,8 @@ static void record__init_features(struct record *rec) if (rec->no_buildid) perf_header__clear_feat(&session->header, HEADER_BUILD_ID); =20 -#ifdef HAVE_LIBTRACEEVENT if (!have_tracepoints(&rec->evlist->core.entries)) perf_header__clear_feat(&session->header, HEADER_TRACING_DATA); -#endif =20 if (!rec->opts.branch_stack) perf_header__clear_feat(&session->header, HEADER_BRANCH_STACK); diff --git a/tools/perf/util/Build b/tools/perf/util/Build index 1eedead5f2f2..609c69995c51 100644 --- a/tools/perf/util/Build +++ b/tools/perf/util/Build @@ -85,7 +85,7 @@ perf-util-y +=3D pmu-flex.o perf-util-y +=3D pmu-bison.o perf-util-y +=3D tool_pmu.o perf-util-y +=3D svghelper.o -perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-info.o +perf-util-y +=3D trace-event-info.o perf-util-y +=3D trace-event-scripting.o perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event.o perf-util-$(CONFIG_LIBTRACEEVENT) +=3D trace-event-parse.o diff --git a/tools/perf/util/perf_event_attr_fprintf.c b/tools/perf/util/pe= rf_event_attr_fprintf.c index 59fbbba79697..a73c74b99a3b 100644 --- a/tools/perf/util/perf_event_attr_fprintf.c +++ b/tools/perf/util/perf_event_attr_fprintf.c @@ -212,7 +212,6 @@ static void __p_config_hw_cache_id(char *buf, size_t si= ze, u64 value) } } =20 -#ifdef HAVE_LIBTRACEEVENT static void __p_config_tracepoint_id(char *buf, size_t size, u64 value) { char *str =3D tracepoint_id_to_name(value); @@ -220,7 +219,6 @@ static void __p_config_tracepoint_id(char *buf, size_t = size, u64 value) print_id_hex(str); free(str); } -#endif =20 static void __p_config_id(struct perf_pmu *pmu, char *buf, size_t size, u3= 2 type, u64 value) { @@ -238,9 +236,7 @@ static void __p_config_id(struct perf_pmu *pmu, char *b= uf, size_t size, u32 type case PERF_TYPE_HW_CACHE: return __p_config_hw_cache_id(buf, size, value); case PERF_TYPE_TRACEPOINT: -#ifdef HAVE_LIBTRACEEVENT return __p_config_tracepoint_id(buf, size, value); -#endif case PERF_TYPE_RAW: case PERF_TYPE_BREAKPOINT: default: --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 19:58:09 2024 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 765BF1AB6DA for ; Sat, 2 Nov 2024 16:54:19 +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=1730566461; cv=none; b=KeLzQ9wKZ19MEYFujlPtxlXFoy/STlp9vLCVdYcR1kc8M25YHpWzSw6ySKDE2ZsTEv/kF8F/RzcmVsDQmSIDopotwjSYYUUIOrNRWK/Gwa5cXeSRcVWpjHQcMC+mXB99RYVzb+gj54cenKexswF7UYmH8sB4p4RwHIAaaLL1934= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730566461; c=relaxed/simple; bh=p7JbZtY359sIwsP6/30E7FGfNcIiIa5lbTt91oXbRrA=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=ZjSF8cwouVlKNW8LR947ak1mml88NfnfO802jU7cxoG14I0ye9KSN+oPU120re80CegPLnzJ4xt+vTgF/U9ElvUl/qoD/zyV5nebxRIfA6rAOwI173m+vznH20j9QUz633nQGlqQMlyyRcwnR5a742Z4OefYyuFu0DTLzS3Z/fE= 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=zxXiCML1; 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="zxXiCML1" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e30df8dbfd4so6434122276.0 for ; Sat, 02 Nov 2024 09:54:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730566458; x=1731171258; 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=rRBQ2ML6N/YG88KmO13bVL/2Y2EfcM0lDZcGBfBGi9k=; b=zxXiCML1Xp50YpwhTRFqfjQavhkAQlEkEQ6+6Rowv4yr+/Gb5o5fnLWb8C1d6VALiY qjDM5JpXB9KJmTg6/KCz7GYGWf/nbU4iJ7PCVkHzS8jx5K7Os/rCJ+9nbYQjZsB89+PD kLFJk3sgtRPQxZjzgs3VneCacZgdoG/do2p+T1aLYfA24PjzqstP+yTslnexQlUiOKxw +ilmaSgUzlHptiwS2TpGVYcBGzPSypq8UxBiswxwnDjDg7KKuJFBicDi6huYYd/1fqZb lGTsWU1Qipp7LYnNW97v865QXp3mmptqc2LGbxev0AoI85d8UQAcLJpPwLMl/Jip6+qS Wjuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730566458; x=1731171258; 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=rRBQ2ML6N/YG88KmO13bVL/2Y2EfcM0lDZcGBfBGi9k=; b=LbWTsbpath0TtqIeqfg7U0vYa/n4+MKrXs+yhjbFkPdgpfWZh4YAQw/Z1Eny0ElHBm T/KM/RdZfbroNqGCurzYAckqoTEeCdutSizSpID+bbx2cJwi5n1wtlbjevnBOW931Wpy BTMzHsvH19NgFX0vxKhE7FcAyxLzU/ol/BR4wdp3zgzBctiEVNdC6L1SRpS+LXTpxtQJ 7tMJKbk5l2B7aAxVmlhM2uuHAF6826PmBBZYlIIZXEScOARU+p6UNuY5EbyaNOVseE64 O96Ou4fJa/OR/J86x2QWKgzPWyCPdMvtQSgXTe89qbPCV7z7B6XJtM+WR1URAAcDYJHW iUDg== X-Forwarded-Encrypted: i=1; AJvYcCWspouwHtqMIrcDqp66uruJGPSeVIiSXD6Sz8aiD/8+EQrY8LJUxgNmzx9eV7TRbN1+XCJPhQJH0U7E2mI=@vger.kernel.org X-Gm-Message-State: AOJu0YyYClow2N/llb6e7mHWXYhEXg4dmaS/hv199gqomrJfXSQZOKuX 6vBxYMkyMLe+95MFWK/SHL+jNqb40OX/vEpCI4h6C2yGPgAyB2ODAB3NrFnUEAfLaBV+nsHAP/0 Z/H2avA== X-Google-Smtp-Source: AGHT+IGx1Brrru35LQFIxMB+V9WZqm+t0mIliaZCPEfGer2gtgR0+gJ0GaplOOFHy7dyQ339ze+/wa/PldAe X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:26a5:cdb5:356c:64a4]) (user=irogers job=sendgmr) by 2002:a25:dc4e:0:b0:e29:6e61:3db4 with SMTP id 3f1490d57ef6-e3302527b97mr5564276.2.1730566458181; Sat, 02 Nov 2024 09:54:18 -0700 (PDT) Date: Sat, 2 Nov 2024 09:53:58 -0700 In-Reply-To: <20241102165400.75785-1-irogers@google.com> Message-Id: <20241102165400.75785-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: <20241102165400.75785-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v2 4/6] perf evsel: Add/use accessor for tp_format From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add an accessor function for tp_format. Rather than search+replace uses try to use a variable and reuse it. Add additional NULL checks when accessing/using the value. Make sure the PTR_ERR is nulled out on error path in evsel__newtp_idx. Signed-off-by: Ian Rogers --- tools/perf/builtin-kmem.c | 15 ++-- tools/perf/builtin-kwork.c | 3 +- tools/perf/builtin-script.c | 9 ++- tools/perf/builtin-trace.c | 80 +++++++++++++------ tools/perf/util/data-convert-bt.c | 10 ++- tools/perf/util/data-convert-json.c | 8 +- tools/perf/util/evsel.c | 9 ++- tools/perf/util/evsel.h | 5 ++ tools/perf/util/evsel_fprintf.c | 4 +- .../util/scripting-engines/trace-event-perl.c | 3 +- .../scripting-engines/trace-event-python.c | 3 +- tools/perf/util/sort.c | 33 +++++--- tools/perf/util/trace-event-scripting.c | 10 ++- 13 files changed, 131 insertions(+), 61 deletions(-) diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index a756147e2eec..8d9477d3f52b 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c @@ -761,6 +761,7 @@ static int parse_gfp_flags(struct evsel *evsel, struct = perf_sample *sample, }; struct trace_seq seq; char *str, *pos =3D NULL; + const struct tep_event *tp_format; =20 if (nr_gfps) { struct gfp_flag key =3D { @@ -772,8 +773,9 @@ static int parse_gfp_flags(struct evsel *evsel, struct = perf_sample *sample, } =20 trace_seq_init(&seq); - tep_print_event(evsel->tp_format->tep, - &seq, &record, "%s", TEP_PRINT_INFO); + tp_format =3D evsel__tp_format(evsel); + if (tp_format) + tep_print_event(tp_format->tep, &seq, &record, "%s", TEP_PRINT_INFO); =20 str =3D strtok_r(seq.buffer, " ", &pos); while (str) { @@ -2011,14 +2013,15 @@ int cmd_kmem(int argc, const char **argv) } =20 if (kmem_page) { - struct evsel *evsel =3D evlist__find_tracepoint_by_name(session->evlist,= "kmem:mm_page_alloc"); + struct evsel *evsel =3D evlist__find_tracepoint_by_name(session->evlist, + "kmem:mm_page_alloc"); + const struct tep_event *tp_format =3D evsel ? evsel__tp_format(evsel) : = NULL; =20 - if (evsel =3D=3D NULL) { + if (tp_format =3D=3D NULL) { pr_err(errmsg, "page", "page"); goto out_delete; } - - kmem_page_size =3D tep_get_page_size(evsel->tp_format->tep); + kmem_page_size =3D tep_get_page_size(tp_format->tep); symbol_conf.use_callchain =3D true; } =20 diff --git a/tools/perf/builtin-kwork.c b/tools/perf/builtin-kwork.c index c1daf82c9b92..8834e642c4ba 100644 --- a/tools/perf/builtin-kwork.c +++ b/tools/perf/builtin-kwork.c @@ -1103,7 +1103,8 @@ static char *evsel__softirq_name(struct evsel *evsel,= u64 num) char *name =3D NULL; bool found =3D false; struct tep_print_flag_sym *sym =3D NULL; - struct tep_print_arg *args =3D evsel->tp_format->print_fmt.args; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_print_arg *args =3D tp_format ? evsel__tp_format(evsel)->print= _fmt.args : NULL; =20 if ((args =3D=3D NULL) || (args->next =3D=3D NULL)) return NULL; diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 6b6d4472db6e..0acdb98314f8 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2289,8 +2289,13 @@ static void process_event(struct perf_script *script, } #ifdef HAVE_LIBTRACEEVENT if (PRINT_FIELD(TRACE) && sample->raw_data) { - event_format__fprintf(evsel->tp_format, sample->cpu, - sample->raw_data, sample->raw_size, fp); + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + + if (tp_format) { + event_format__fprintf(tp_format, sample->cpu, + sample->raw_data, sample->raw_size, + fp); + } } #endif if (attr->type =3D=3D PERF_TYPE_SYNTH && PRINT_FIELD(SYNTH)) diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 748b061f8678..86f159f25169 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c @@ -389,7 +389,12 @@ static struct syscall_arg_fmt *evsel__syscall_arg_fmt(= struct evsel *evsel) } =20 if (et->fmt =3D=3D NULL) { - et->fmt =3D calloc(evsel->tp_format->format.nr_fields, sizeof(struct sys= call_arg_fmt)); + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + + if (tp_format =3D=3D NULL) + goto out_delete; + + et->fmt =3D calloc(tp_format->format.nr_fields, sizeof(struct syscall_ar= g_fmt)); if (et->fmt =3D=3D NULL) goto out_delete; } @@ -2154,8 +2159,12 @@ static int evsel__init_tp_arg_scnprintf(struct evsel= *evsel, bool *use_btf) struct syscall_arg_fmt *fmt =3D evsel__syscall_arg_fmt(evsel); =20 if (fmt !=3D NULL) { - syscall_arg_fmt__init_array(fmt, evsel->tp_format->format.fields, use_bt= f); - return 0; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + + if (tp_format) { + syscall_arg_fmt__init_array(fmt, tp_format->format.fields, use_btf); + return 0; + } } =20 return -ENOMEM; @@ -3026,7 +3035,8 @@ static size_t trace__fprintf_tp_fields(struct trace *= trace, struct evsel *evsel, { char bf[2048]; size_t size =3D sizeof(bf); - struct tep_format_field *field =3D evsel->tp_format->format.fields; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_format_field *field =3D tp_format ? tp_format->format.fields := NULL; struct syscall_arg_fmt *arg =3D __evsel__syscall_arg_fmt(evsel); size_t printed =3D 0, btf_printed; unsigned long val; @@ -3096,6 +3106,7 @@ static int trace__event_handler(struct trace *trace, = struct evsel *evsel, { struct thread *thread; int callchain_ret =3D 0; + /* * Check if we called perf_evsel__disable(evsel) due to, for instance, * this event's max_events having been hit and this is an entry coming @@ -3149,11 +3160,13 @@ static int trace__event_handler(struct trace *trace= , struct evsel *evsel, =20 if (evsel__is_bpf_output(evsel)) { bpf_output__fprintf(trace, sample); - } else if (evsel->tp_format) { - if (strncmp(evsel->tp_format->name, "sys_enter_", 10) || - trace__fprintf_sys_enter(trace, evsel, sample)) { + } else { + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + + if (tp_format && (strncmp(tp_format->name, "sys_enter_", 10) || + trace__fprintf_sys_enter(trace, evsel, sample))) { if (trace->libtraceevent_print) { - event_format__fprintf(evsel->tp_format, sample->cpu, + event_format__fprintf(tp_format, sample->cpu, sample->raw_data, sample->raw_size, trace->output); } else { @@ -4081,17 +4094,23 @@ static int ordered_events__deliver_event(struct ord= ered_events *oe, static struct syscall_arg_fmt *evsel__find_syscall_arg_fmt_by_name(struct = evsel *evsel, char *arg, char **type) { - struct tep_format_field *field; + const struct tep_format_field *field; struct syscall_arg_fmt *fmt =3D __evsel__syscall_arg_fmt(evsel); + const struct tep_event *tp_format; + + if (!fmt) + return NULL; =20 - if (evsel->tp_format =3D=3D NULL || fmt =3D=3D NULL) + tp_format =3D evsel__tp_format(evsel); + if (!tp_format) return NULL; =20 - for (field =3D evsel->tp_format->format.fields; field; field =3D field->n= ext, ++fmt) + for (field =3D tp_format->format.fields; field; field =3D field->next, ++= fmt) { if (strcmp(field->name, arg) =3D=3D 0) { *type =3D field->type; return fmt; } + } =20 return NULL; } @@ -4844,13 +4863,18 @@ static void evsel__set_syscall_arg_fmt(struct evsel= *evsel, const char *name) const struct syscall_fmt *scfmt =3D syscall_fmt__find(name); =20 if (scfmt) { - int skip =3D 0; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + + if (tp_format) { + int skip =3D 0; =20 - if (strcmp(evsel->tp_format->format.fields->name, "__syscall_nr") =3D= =3D 0 || - strcmp(evsel->tp_format->format.fields->name, "nr") =3D=3D 0) - ++skip; + if (strcmp(tp_format->format.fields->name, "__syscall_nr") =3D=3D 0 || + strcmp(tp_format->format.fields->name, "nr") =3D=3D 0) + ++skip; =20 - memcpy(fmt + skip, scfmt->arg, (evsel->tp_format->format.nr_fields - sk= ip) * sizeof(*fmt)); + memcpy(fmt + skip, scfmt->arg, + (tp_format->format.nr_fields - skip) * sizeof(*fmt)); + } } } } @@ -4860,10 +4884,16 @@ static int evlist__set_syscall_tp_fields(struct evl= ist *evlist, bool *use_btf) struct evsel *evsel; =20 evlist__for_each_entry(evlist, evsel) { - if (evsel->priv || !evsel->tp_format) + const struct tep_event *tp_format; + + if (evsel->priv) + continue; + + tp_format =3D evsel__tp_format(evsel); + if (!tp_format) continue; =20 - if (strcmp(evsel->tp_format->system, "syscalls")) { + if (strcmp(tp_format->system, "syscalls")) { evsel__init_tp_arg_scnprintf(evsel, use_btf); continue; } @@ -4871,20 +4901,24 @@ static int evlist__set_syscall_tp_fields(struct evl= ist *evlist, bool *use_btf) if (evsel__init_syscall_tp(evsel)) return -1; =20 - if (!strncmp(evsel->tp_format->name, "sys_enter_", 10)) { + if (!strncmp(tp_format->name, "sys_enter_", 10)) { struct syscall_tp *sc =3D __evsel__syscall_tp(evsel); =20 if (__tp_field__init_ptr(&sc->args, sc->id.offset + sizeof(u64))) return -1; =20 - evsel__set_syscall_arg_fmt(evsel, evsel->tp_format->name + sizeof("sys_= enter_") - 1); - } else if (!strncmp(evsel->tp_format->name, "sys_exit_", 9)) { + evsel__set_syscall_arg_fmt(evsel, + tp_format->name + sizeof("sys_enter_") - 1); + } else if (!strncmp(tp_format->name, "sys_exit_", 9)) { struct syscall_tp *sc =3D __evsel__syscall_tp(evsel); =20 - if (__tp_field__init_uint(&sc->ret, sizeof(u64), sc->id.offset + sizeof= (u64), evsel->needs_swap)) + if (__tp_field__init_uint(&sc->ret, sizeof(u64), + sc->id.offset + sizeof(u64), + evsel->needs_swap)) return -1; =20 - evsel__set_syscall_arg_fmt(evsel, evsel->tp_format->name + sizeof("sys_= exit_") - 1); + evsel__set_syscall_arg_fmt(evsel, + tp_format->name + sizeof("sys_exit_") - 1); } } =20 diff --git a/tools/perf/util/data-convert-bt.c b/tools/perf/util/data-conve= rt-bt.c index 021e9b1d5cc5..d022d3c2955e 100644 --- a/tools/perf/util/data-convert-bt.c +++ b/tools/perf/util/data-convert-bt.c @@ -426,8 +426,9 @@ static int add_tracepoint_values(struct ctf_writer *cw, struct evsel *evsel, struct perf_sample *sample) { - struct tep_format_field *common_fields =3D evsel->tp_format->format.commo= n_fields; - struct tep_format_field *fields =3D evsel->tp_format->format.field= s; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_format_field *common_fields =3D tp_format->format.common_field= s; + struct tep_format_field *fields =3D tp_format->format.fields; int ret; =20 ret =3D add_tracepoint_fields_values(cw, event_class, event, @@ -1064,8 +1065,9 @@ static int add_tracepoint_types(struct ctf_writer *cw, struct evsel *evsel, struct bt_ctf_event_class *class) { - struct tep_format_field *common_fields =3D evsel->tp_format->format.commo= n_fields; - struct tep_format_field *fields =3D evsel->tp_format->format.field= s; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_format_field *common_fields =3D tp_format ? tp_format->format.= common_fields : NULL; + struct tep_format_field *fields =3D tp_format ? tp_format->format.= fields : NULL; int ret; =20 ret =3D add_tracepoint_fields_types(cw, common_fields, class); diff --git a/tools/perf/util/data-convert-json.c b/tools/perf/util/data-con= vert-json.c index 20bfb0884e9e..eb068f38ca81 100644 --- a/tools/perf/util/data-convert-json.c +++ b/tools/perf/util/data-convert-json.c @@ -230,12 +230,12 @@ static int process_sample_event(const struct perf_too= l *tool, =20 #ifdef HAVE_LIBTRACEEVENT if (sample->raw_data) { - int i; - struct tep_format_field **fields; + struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_format_field **fields =3D tp_format ? tep_event_fields(tp_for= mat) : NULL; =20 - fields =3D tep_event_fields(evsel->tp_format); if (fields) { - i =3D 0; + int i =3D 0; + while (fields[i]) { struct trace_seq s; =20 diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index f780e30aa259..a95db7e900d5 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -570,6 +570,7 @@ struct evsel *evsel__newtp_idx(const char *sys, const c= har *name, int idx, bool evsel->tp_format =3D trace_event__tp_format(sys, name); if (IS_ERR(evsel->tp_format)) { err =3D PTR_ERR(evsel->tp_format); + evsel->tp_format =3D NULL; goto out_free; } attr.config =3D evsel->tp_format->id; @@ -3209,12 +3210,16 @@ u16 evsel__id_hdr_size(const struct evsel *evsel) #ifdef HAVE_LIBTRACEEVENT struct tep_format_field *evsel__field(struct evsel *evsel, const char *nam= e) { - return tep_find_field(evsel->tp_format, name); + struct tep_event *tp_format =3D evsel__tp_format(evsel); + + return tp_format ? tep_find_field(tp_format, name) : NULL; } =20 struct tep_format_field *evsel__common_field(struct evsel *evsel, const ch= ar *name) { - return tep_find_common_field(evsel->tp_format, name); + struct tep_event *tp_format =3D evsel__tp_format(evsel); + + return tp_format ? tep_find_common_field(tp_format, name) : NULL; } =20 void *evsel__rawptr(struct evsel *evsel, struct perf_sample *sample, const= char *name) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index 04934a7af174..c3e53d320bf5 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -257,6 +257,11 @@ static inline struct evsel *evsel__newtp(const char *s= ys, const char *name) { return evsel__newtp_idx(sys, name, 0, true); } + +static inline struct tep_event *evsel__tp_format(struct evsel *evsel) +{ + return evsel->tp_format; +} #endif =20 #ifdef HAVE_LIBTRACEEVENT diff --git a/tools/perf/util/evsel_fprintf.c b/tools/perf/util/evsel_fprint= f.c index c2c0500d5da9..54c5702f8c00 100644 --- a/tools/perf/util/evsel_fprintf.c +++ b/tools/perf/util/evsel_fprintf.c @@ -81,13 +81,15 @@ int evsel__fprintf(struct evsel *evsel, struct perf_att= r_details *details, FILE #ifdef HAVE_LIBTRACEEVENT if (details->trace_fields) { struct tep_format_field *field; + const struct tep_event *tp_format; =20 if (evsel->core.attr.type !=3D PERF_TYPE_TRACEPOINT) { printed +=3D comma_fprintf(fp, &first, " (not a tracepoint)"); goto out; } =20 - field =3D evsel->tp_format->format.fields; + tp_format =3D evsel__tp_format(evsel); + field =3D tp_format ? tp_format->format.fields : NULL; if (field =3D=3D NULL) { printed +=3D comma_fprintf(fp, &first, " (no trace field)"); goto out; diff --git a/tools/perf/util/scripting-engines/trace-event-perl.c b/tools/p= erf/util/scripting-engines/trace-event-perl.c index e16257d5ab2c..0d63b77b5140 100644 --- a/tools/perf/util/scripting-engines/trace-event-perl.c +++ b/tools/perf/util/scripting-engines/trace-event-perl.c @@ -344,7 +344,7 @@ static void perl_process_tracepoint(struct perf_sample = *sample, struct addr_location *al) { struct thread *thread =3D al->thread; - struct tep_event *event =3D evsel->tp_format; + struct tep_event *event; struct tep_format_field *field; static char handler[256]; unsigned long long val; @@ -362,6 +362,7 @@ static void perl_process_tracepoint(struct perf_sample = *sample, if (evsel->core.attr.type !=3D PERF_TYPE_TRACEPOINT) return; =20 + event =3D evsel__tp_format(evsel); if (!event) { pr_debug("ug! no event found for type %" PRIu64, (u64)evsel->core.attr.c= onfig); return; diff --git a/tools/perf/util/scripting-engines/trace-event-python.c b/tools= /perf/util/scripting-engines/trace-event-python.c index d7183134b669..77f1ab2d3eac 100644 --- a/tools/perf/util/scripting-engines/trace-event-python.c +++ b/tools/perf/util/scripting-engines/trace-event-python.c @@ -946,7 +946,7 @@ static void python_process_tracepoint(struct perf_sampl= e *sample, struct addr_location *al, struct addr_location *addr_al) { - struct tep_event *event =3D evsel->tp_format; + struct tep_event *event; PyObject *handler, *context, *t, *obj =3D NULL, *callchain; PyObject *dict =3D NULL, *all_entries_dict =3D NULL; static char handler_name[256]; @@ -963,6 +963,7 @@ static void python_process_tracepoint(struct perf_sampl= e *sample, =20 bitmap_zero(events_defined, TRACE_EVENT_TYPE_MAX); =20 + event =3D evsel__tp_format(evsel); if (!event) { snprintf(handler_name, sizeof(handler_name), "ug! no event found for type %" PRIu64, (u64)evsel->core.attr.config); diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 168c488f0178..710839ec3f99 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -1038,17 +1038,19 @@ static char *get_trace_output(struct hist_entry *he) .data =3D he->raw_data, .size =3D he->raw_size, }; + struct tep_event *tp_format; =20 evsel =3D hists_to_evsel(he->hists); =20 trace_seq_init(&seq); - if (symbol_conf.raw_trace) { - tep_print_fields(&seq, he->raw_data, he->raw_size, - evsel->tp_format); - } else { - tep_print_event(evsel->tp_format->tep, - &seq, &rec, "%s", TEP_PRINT_INFO); + tp_format =3D evsel__tp_format(evsel); + if (tp_format) { + if (symbol_conf.raw_trace) + tep_print_fields(&seq, he->raw_data, he->raw_size, tp_format); + else + tep_print_event(tp_format->tep, &seq, &rec, "%s", TEP_PRINT_INFO); } + /* * Trim the buffer, it starts at 4KB and we're not going to * add anything more to this buffer. @@ -3293,9 +3295,8 @@ static int __dynamic_dimension__add(struct evsel *evs= el, static int add_evsel_fields(struct evsel *evsel, bool raw_trace, int level) { int ret; - struct tep_format_field *field; - - field =3D evsel->tp_format->format.fields; + struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_format_field *field =3D tp_format ? tp_format->format.fields := NULL; while (field) { ret =3D __dynamic_dimension__add(evsel, field, raw_trace, level); if (ret < 0) @@ -3328,13 +3329,19 @@ static int add_all_matching_fields(struct evlist *e= vlist, { int ret =3D -ESRCH; struct evsel *evsel; - struct tep_format_field *field; =20 evlist__for_each_entry(evlist, evsel) { + struct tep_event *tp_format; + struct tep_format_field *field; + if (evsel->core.attr.type !=3D PERF_TYPE_TRACEPOINT) continue; =20 - field =3D tep_find_any_field(evsel->tp_format, field_name); + tp_format =3D evsel__tp_format(evsel); + if (tp_format =3D=3D NULL) + continue; + + field =3D tep_find_any_field(tp_format, field_name); if (field =3D=3D NULL) continue; =20 @@ -3416,7 +3423,9 @@ static int add_dynamic_entry(struct evlist *evlist, c= onst char *tok, if (!strcmp(field_name, "*")) { ret =3D add_evsel_fields(evsel, raw_trace, level); } else { - struct tep_format_field *field =3D tep_find_any_field(evsel->tp_format, = field_name); + struct tep_event *tp_format =3D evsel__tp_format(evsel); + struct tep_format_field *field =3D + tp_format ? tep_find_any_field(tp_format, field_name) : NULL; =20 if (field =3D=3D NULL) { pr_debug("Cannot find event field for %s.%s\n", diff --git a/tools/perf/util/trace-event-scripting.c b/tools/perf/util/trac= e-event-scripting.c index bd0000300c77..bab893587863 100644 --- a/tools/perf/util/trace-event-scripting.c +++ b/tools/perf/util/trace-event-scripting.c @@ -28,12 +28,14 @@ void scripting_context__update(struct scripting_context= *c, struct addr_location *al, struct addr_location *addr_al) { - c->event_data =3D sample->raw_data; - c->pevent =3D NULL; #ifdef HAVE_LIBTRACEEVENT - if (evsel->tp_format) - c->pevent =3D evsel->tp_format->tep; + const struct tep_event *tp_format =3D evsel__tp_format(evsel); + + c->pevent =3D tp_format ? tp_format->tep : NULL; +#else + c->pevent =3D NULL; #endif + c->event_data =3D sample->raw_data; c->event =3D event; c->sample =3D sample; c->evsel =3D evsel; --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 19:58:09 2024 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 E550C1AAE39 for ; Sat, 2 Nov 2024 16:54:21 +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=1730566463; cv=none; b=RxxaV0zk9+PRybz0eHw292To3sA/P+IiWglvykxutFXWGUWlCadhdiJ3IrDPX8MR46wNkDD1sjPZrnhrTDn3za9u7NnWoROq/8RRlXKTiKpCGYbkyIk8aB5WAm6uwD3a18lwV7e0WPxWzkTnV5gl0C+4RK2dqUhNYeNwPgMz9TE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730566463; c=relaxed/simple; bh=qcUpsCevuN/4ezMm92doq0Egamb9T9a2FAtuBKLW57I=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=aTsAzbWVTGC1oXI6Yl57RqO0m7fRzjG0KZcM2JiIkhnWvnbVvmJtkL+TQY1h92ENpScLl4dBi1TsqlVI9BHyLD2Vtp6w7h0zGRf2PYT8KZPlV/JZ3dwP8tIDbOYXIOGuD+u4aPFqIBh/qgQi3nLShcHtA/bHsFrUZ8bxF3i4vhY= 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=gIWw0jDt; 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="gIWw0jDt" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-e30df8dbfd4so6434148276.0 for ; Sat, 02 Nov 2024 09:54:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730566461; x=1731171261; 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=cKL4rNcuhrwPlLoLHBamtHw/kLIkbIZ6raoruCdzEkE=; b=gIWw0jDtNKOE8DOGyiyRCXnxlO7ZWHdXwWj0TI9UFjUEze6chkELfyLQHR2Y/WSx+6 AUSowwQ7P2XF+L9WnIf371avEhBrrfquqgpHmZ7whf2M/IBer0wyZOi0pTTflX+VOVa4 iYbLTqTPVcAeVxuK4GfkVcgBOGMzvpifhpw2UkoGNdxx5gHNX4IuY+Vhm1RpT3bJPkMX FYxBSZ4wCQL7y1JJ9G39Nn+ExluAzbNzBXz+IuNHoOVYj7raqvxBqkluDOcBk6G2kC4q dSQfbgJBpMS5SBRLQTHOuq9tKGRzODhgQ2U6HTH82xEKTn5g6T6h6/dPw9Tjma9bXBp8 XWeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730566461; x=1731171261; 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=cKL4rNcuhrwPlLoLHBamtHw/kLIkbIZ6raoruCdzEkE=; b=YC4qFGK2jSvyec6C3UAdavSzdGzy1dtu+9iBKvE5LOstSWpaJ/yA/8wLEruKB8OSLT rY1klSVGRUYbM6lX6RyK/AjVJjjQVtDQ7MSCwsuaxixQjc4EvVaGfOyCX9nwRP1uL1wR 9wxiPbE6xXshWWp3TY8iFoQJDGuMAUJzqGpr+f7deETVGa4kTVd7YL1hvKO+D2uXj1n+ aCByO1iLJHPtTFTs77lRrWNtKPeK7LFQ6CCPcyBZkGqCtU35fTGD/3w5N46LuK/kvAAL V7zHSDLnjqU0fV5vLRw/rXVLwlivjddKyJal6tDYA4oUpxYgAqoGMhPH3f0/ZKnDLrVu UB5A== X-Forwarded-Encrypted: i=1; AJvYcCUs3cYtFMArJ2KU6jTXKJwpuvz6mS3gDnsmn+056MiwYM2M8V2qdvkS/7gIhnejz7gaUiNgddnglLQUon0=@vger.kernel.org X-Gm-Message-State: AOJu0Yz6GvzDefKdJpfzj9qwADMc9BBfTrpB+L/ovIUkdBLkQxQyOJJf 7OVUhH0FPgNxFo36k0+QmmG4fNFGCQf+Vph3EYLxhZjHqVIz0RNCN5qQxh87caoRBBU99HwSiz8 D2VgHsQ== X-Google-Smtp-Source: AGHT+IHrWFF8XB0Ejx6WGD/SXrz27eQANQLf64H381k9WXM4DTRS37BbPMV8alVXwEeI+l/eOkNQYLQqtrZ3 X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:26a5:cdb5:356c:64a4]) (user=irogers job=sendgmr) by 2002:a25:aacf:0:b0:e28:ec75:75ed with SMTP id 3f1490d57ef6-e3302422eb0mr6728276.0.1730566460824; Sat, 02 Nov 2024 09:54:20 -0700 (PDT) Date: Sat, 2 Nov 2024 09:53:59 -0700 In-Reply-To: <20241102165400.75785-1-irogers@google.com> Message-Id: <20241102165400.75785-6-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241102165400.75785-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v2 5/6] perf evsel: Allow evsel__newtp without libtraceevent From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Switch from reading the tracepoint format to reading the id directly for the evsel config. This avoids the need to initialize libtraceevent, plugins, etc. It is sufficient for many tracepoint commands to work like: $ perf stat -e sched:sched_switch true To populate evsel->tp_format, do lazy initialization using libtraceevent in the evsel__tp_format function (the sys and name are saved in evsel__newtp_idx for this purpose). Reading the id should be indicative of the format failing to load, but if not an error is reported in evsel__tp_format. This could happen for a tracepoint with a format that fails to parse. As tracepoints can be parsed without libtraceevent with this, remove the associated #ifdefs in parse-events.c. By only lazily parsing the tracepoint format information it is hoped this will help improve the performance of code using tracepoints but not the format information. It also cuts down on the build and ifdef logic. Signed-off-by: Ian Rogers Tested-by: Arnaldo Carvalho de Melo --- tools/perf/util/evsel.c | 103 ++++++++++++++++++++++++--------- tools/perf/util/evsel.h | 14 ++--- tools/perf/util/parse-events.c | 16 +---- 3 files changed, 82 insertions(+), 51 deletions(-) diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index a95db7e900d5..56e19e32a852 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c @@ -543,54 +543,101 @@ struct evsel *evsel__clone(struct evsel *orig) return NULL; } =20 +static int trace_event__id(const char *sys, const char *name) +{ + char *tp_dir =3D get_events_file(sys); + char path[PATH_MAX]; + int id, err; + + if (!tp_dir) + return -1; + + scnprintf(path, PATH_MAX, "%s/%s/id", tp_dir, name); + put_events_file(tp_dir); + err =3D filename__read_int(path, &id); + if (err) + return err; + + return id; +} + /* * Returns pointer with encoded error via interface. */ -#ifdef HAVE_LIBTRACEEVENT struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx,= bool format) { + struct perf_event_attr attr =3D { + .type =3D PERF_TYPE_TRACEPOINT, + .sample_type =3D (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | + PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD), + }; struct evsel *evsel =3D zalloc(perf_evsel__object.size); - int err =3D -ENOMEM; + int err =3D -ENOMEM, id =3D -1; =20 - if (evsel =3D=3D NULL) { + if (evsel =3D=3D NULL) goto out_err; - } else { - struct perf_event_attr attr =3D { - .type =3D PERF_TYPE_TRACEPOINT, - .sample_type =3D (PERF_SAMPLE_RAW | PERF_SAMPLE_TIME | - PERF_SAMPLE_CPU | PERF_SAMPLE_PERIOD), - }; =20 - if (asprintf(&evsel->name, "%s:%s", sys, name) < 0) - goto out_free; =20 - event_attr_init(&attr); + if (asprintf(&evsel->name, "%s:%s", sys, name) < 0) + goto out_free; =20 - if (format) { - evsel->tp_format =3D trace_event__tp_format(sys, name); - if (IS_ERR(evsel->tp_format)) { - err =3D PTR_ERR(evsel->tp_format); - evsel->tp_format =3D NULL; - goto out_free; - } - attr.config =3D evsel->tp_format->id; - } else { - attr.config =3D (__u64) -1; - } +#ifdef HAVE_LIBTRACEEVENT + evsel->tp_sys =3D strdup(sys); + if (!evsel->tp_sys) + goto out_free; =20 + evsel->tp_name =3D strdup(name); + if (!evsel->tp_name) + goto out_free; +#endif =20 - attr.sample_period =3D 1; - evsel__init(evsel, &attr, idx); - } + event_attr_init(&attr); =20 + if (format) { + id =3D trace_event__id(sys, name); + if (id < 0) { + err =3D id; + goto out_free; + } + } + attr.config =3D (__u64)id; + attr.sample_period =3D 1; + evsel__init(evsel, &attr, idx); return evsel; =20 out_free: zfree(&evsel->name); +#ifdef HAVE_LIBTRACEEVENT + zfree(&evsel->tp_sys); + zfree(&evsel->tp_name); +#endif free(evsel); out_err: return ERR_PTR(err); } + +#ifdef HAVE_LIBTRACEEVENT +struct tep_event *evsel__tp_format(struct evsel *evsel) +{ + struct tep_event *tp_format =3D evsel->tp_format; + + if (tp_format) + return tp_format; + + if (evsel->core.attr.type !=3D PERF_TYPE_TRACEPOINT) + return NULL; + + tp_format =3D trace_event__tp_format(evsel->tp_sys, evsel->tp_name); + if (IS_ERR(tp_format)) { + int err =3D -PTR_ERR(evsel->tp_format); + + pr_err("Error getting tracepoint format '%s' '%s'(%d)\n", + evsel__name(evsel), strerror(err), err); + return NULL; + } + evsel->tp_format =3D tp_format; + return evsel->tp_format; +} #endif =20 const char *const evsel__hw_names[PERF_COUNT_HW_MAX] =3D { @@ -1587,6 +1634,10 @@ void evsel__exit(struct evsel *evsel) perf_thread_map__put(evsel->core.threads); zfree(&evsel->group_name); zfree(&evsel->name); +#ifdef HAVE_LIBTRACEEVENT + zfree(&evsel->tp_sys); + zfree(&evsel->tp_name); +#endif zfree(&evsel->filter); zfree(&evsel->group_pmu_name); zfree(&evsel->unit); diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index c3e53d320bf5..93b6244ec302 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -59,6 +59,8 @@ struct evsel { char *group_name; const char *group_pmu_name; #ifdef HAVE_LIBTRACEEVENT + char *tp_sys; + char *tp_name; struct tep_event *tp_format; #endif char *filter; @@ -247,25 +249,17 @@ int copy_config_terms(struct list_head *dst, struct l= ist_head *src); void free_config_terms(struct list_head *config_terms); =20 =20 -#ifdef HAVE_LIBTRACEEVENT -struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx,= bool format); - /* * Returns pointer with encoded error via interface. */ +struct evsel *evsel__newtp_idx(const char *sys, const char *name, int idx,= bool format); static inline struct evsel *evsel__newtp(const char *sys, const char *name) { return evsel__newtp_idx(sys, name, 0, true); } =20 -static inline struct tep_event *evsel__tp_format(struct evsel *evsel) -{ - return evsel->tp_format; -} -#endif - #ifdef HAVE_LIBTRACEEVENT -struct tep_event *event_format__new(const char *sys, const char *name); +struct tep_event *evsel__tp_format(struct evsel *evsel); #endif =20 void evsel__init(struct evsel *evsel, struct perf_event_attr *attr, int id= x); diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index afeb8d815bbf..7fc1c36ef2a4 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -489,7 +489,6 @@ int parse_events_add_cache(struct list_head *list, int = *idx, const char *name, return found_supported ? 0 : -EINVAL; } =20 -#ifdef HAVE_LIBTRACEEVENT static void tracepoint_error(struct parse_events_error *e, int err, const char *sys, const char *name, int column) { @@ -644,7 +643,6 @@ static int add_tracepoint_multi_sys(struct parse_events= _state *parse_state, closedir(events_dir); return ret; } -#endif /* HAVE_LIBTRACEEVENT */ =20 size_t default_breakpoint_len(void) { @@ -1066,7 +1064,6 @@ static int config_term_pmu(struct perf_event_attr *at= tr, return config_term_common(attr, term, err); } =20 -#ifdef HAVE_LIBTRACEEVENT static int config_term_tracepoint(struct perf_event_attr *attr, struct parse_events_term *term, struct parse_events_error *err) @@ -1111,7 +1108,6 @@ static int config_term_tracepoint(struct perf_event_a= ttr *attr, =20 return 0; } -#endif =20 static int config_attr(struct perf_event_attr *attr, const struct parse_events_terms *head, @@ -1303,7 +1299,7 @@ int parse_events_add_tracepoint(struct parse_events_s= tate *parse_state, struct parse_events_terms *head_config, void *loc_) { YYLTYPE *loc =3D loc_; -#ifdef HAVE_LIBTRACEEVENT + if (head_config) { struct perf_event_attr attr; =20 @@ -1318,16 +1314,6 @@ int parse_events_add_tracepoint(struct parse_events_= state *parse_state, else return add_tracepoint_event(parse_state, list, sys, event, err, head_config, loc); -#else - (void)parse_state; - (void)list; - (void)sys; - (void)event; - (void)head_config; - parse_events_error__handle(err, loc->first_column, strdup("unsupported tr= acepoint"), - strdup("libtraceevent is necessary for tracepoint support")); - return -1; -#endif } =20 static int __parse_events_add_numeric(struct parse_events_state *parse_sta= te, --=20 2.47.0.199.ga7371fff76-goog From nobody Sun Nov 24 19:58:09 2024 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 1AE7C1ABEC5 for ; Sat, 2 Nov 2024 16:54:24 +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=1730566465; cv=none; b=c18HhxOAbC+m3Wr9nOn49KYm2ootqAG+GK/bUOZGcLTf3xR3exl717wfMr01LUoPVR/fcKRI2FbJAFMaChCc/DTeQ1f58WXUgbXytQo4fgR+8Zca2SjKv0yFErmLjPbyMuG2qurraSzgfXyuW99MNNmKSwnETt7qonqRtHyaWNc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730566465; c=relaxed/simple; bh=CkQ0PqkTIWt9YwGPuFgU+xUVEgjnar/6hDiTfIJH+ac=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=kp8BKtEsDSJVDw84wpVPeLyMcez/Mslfgfj8L53p3dVOzHtv01kvqYK1cX81l6IEkUbdwufAqGwl7XjNnLeaP8D7+eoI+fsTTgncMORjSEr3lZLPXkOEDhPfFThH+Y1lLLxh7/UvXZ7WaA0WYO6BczyJpXIZ1Gt45i0ib+qTqhA= 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=NWE+482o; 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="NWE+482o" Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-6e35bdb6a31so53859457b3.1 for ; Sat, 02 Nov 2024 09:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1730566463; x=1731171263; 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=bHyQZ7KuzF1BHlUEcfMzmmjCRw5gxHBITHCl3IdIk30=; b=NWE+482ojGddDEsyVSN7hu4OX9p4fL6MyYiCr2IysjWq7UjYN1Ub0kyctjBzwfVT2e HS2wQ/DvfXuFJsWUTmlaQY5Z96bp0IKV55xmY6qAu5yVLdYixajrRa+bcdH2U+r3RMxz 6qQ8AOICV7iso7BiXrOq0U1rr/CvP725V+fRCVl7wGoTI55W6nsoDPO8SffllgPU1wXF J8I//5g1dlMPNFfazqmB+eIw4WHsFoXVIPKNV4rmo8PrYzf5fMX1dOtwICqXscMw/dEa P8w/QDcR5DtDKv1faIriE0dDLQY9/ZdSrJAcFvMR9svk+F8enzrKEojQfIUyNPRCAzTt /9Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730566463; x=1731171263; 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=bHyQZ7KuzF1BHlUEcfMzmmjCRw5gxHBITHCl3IdIk30=; b=vfQLnbamV33yMlSQTL4kzuaCalMgufjWkmP3AyofmVhsD4unl6rFuvzgz5eY6kwmwz hxmNjjzsS0eZr03DUeu9aibG3JMIwipHV5AblLvlC3Fn6FxbJXdOCX/4/UVU6eRclWxk +4tFuBiKtOIA73bF1KUgEiZzV0tG82ADYvIQm4nZ5RNCx04Ltws+6zSNKulh1fKIpWvL fH5UI97BY/Hm+wu6rE8Xykz8ePy15BYJ0hI1XKzJbQ4IUHu2Yux+fh7+GZEv0iCpVM2l ySr5s/d6gDi3QG73LMM5ZYtfuSkUNcnyZD1hCKCrq1jsC5CfsbAFuWRyBqT/3B9NJXxu l4iQ== X-Forwarded-Encrypted: i=1; AJvYcCWoydsAwxg8ILMu2xSvPyLygR/ZaL3Oc5NIEW89lSCRTSAjcJ/JohW56EEBnOM2YLUPSy8MvvrGaVeWqQo=@vger.kernel.org X-Gm-Message-State: AOJu0YyfjtkGC8jledff+7S236VB1XpjNIhojEO+61Qlpm3GNZBJ930I D7f5UuL3EoQkyaCB5nYjyQC5KHKgLDp8sBxzU7+ShfYthomkdLRqYj2iAUVeygVnviJAWniXwIT 3TUkvgA== X-Google-Smtp-Source: AGHT+IHvIfjIVlSNpoCWEllWxrK2Fwv3qM/NdTT3f32H1uXkLTOVbIoX8JVD0iVdEJxRyn1iqXdqGpB5soCF X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:26a5:cdb5:356c:64a4]) (user=irogers job=sendgmr) by 2002:a25:aa83:0:b0:e30:c235:d79f with SMTP id 3f1490d57ef6-e30e5b282d1mr5227276.8.1730566463143; Sat, 02 Nov 2024 09:54:23 -0700 (PDT) Date: Sat, 2 Nov 2024 09:54:00 -0700 In-Reply-To: <20241102165400.75785-1-irogers@google.com> Message-Id: <20241102165400.75785-7-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241102165400.75785-1-irogers@google.com> X-Mailer: git-send-email 2.47.0.199.ga7371fff76-goog Subject: [PATCH v2 6/6] perf tests: Enable tests disabled due to tracepoint parsing From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , Athira Jajeev , James Clark , Dominique Martinet , Yang Li , Colin Ian King , Yang Jihong , "Steinar H. Gunderson" , Oliver Upton , Ilkka Koskinen , Ze Gao , Weilin Wang , Ben Gainey , zhaimingbing , Zixian Cai , Andi Kleen , Paran Lee , Thomas Falcon , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, "Steven Rostedt (Google)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Tracepoint parsing required libtraceevent but no longer does. Remove the Build logic and #ifdefs that caused the tests not to be run. Test code that directly uses libtraceevent is still guarded. Signed-off-by: Ian Rogers Tested-by: Arnaldo Carvalho de Melo --- tools/perf/tests/Build | 6 +++--- tools/perf/tests/builtin-test.c | 2 -- tools/perf/tests/parse-events.c | 25 +------------------------ 3 files changed, 4 insertions(+), 29 deletions(-) diff --git a/tools/perf/tests/Build b/tools/perf/tests/Build index 03cbdf7c50a0..db33b33dc970 100644 --- a/tools/perf/tests/Build +++ b/tools/perf/tests/Build @@ -5,10 +5,10 @@ perf-test-y +=3D tests-scripts.o perf-test-y +=3D parse-events.o perf-test-y +=3D dso-data.o perf-test-y +=3D vmlinux-kallsyms.o -perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall.o -perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-all-cpus.o +perf-test-y +=3D openat-syscall.o +perf-test-y +=3D openat-syscall-all-cpus.o perf-test-$(CONFIG_LIBTRACEEVENT) +=3D openat-syscall-tp-fields.o -perf-test-$(CONFIG_LIBTRACEEVENT) +=3D mmap-basic.o +perf-test-y +=3D mmap-basic.o perf-test-y +=3D perf-record.o perf-test-y +=3D evsel-roundtrip-name.o perf-test-$(CONFIG_LIBTRACEEVENT) +=3D evsel-tp-sched.o diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-tes= t.c index d2cabaa8ad92..4c3b622130a9 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -60,11 +60,9 @@ static struct test_suite *arch_tests[] =3D { =20 static struct test_suite *generic_tests[] =3D { &suite__vmlinux_matches_kallsyms, -#ifdef HAVE_LIBTRACEEVENT &suite__openat_syscall_event, &suite__openat_syscall_event_on_all_cpus, &suite__basic_mmap, -#endif &suite__mem, &suite__parse_events, &suite__expr, diff --git a/tools/perf/tests/parse-events.c b/tools/perf/tests/parse-event= s.c index 82a19674a38f..5ec2e5607987 100644 --- a/tools/perf/tests/parse-events.c +++ b/tools/perf/tests/parse-events.c @@ -54,8 +54,6 @@ static bool test_perf_config(const struct perf_evsel *evs= el, __u64 expected_conf return (evsel->attr.config & PERF_HW_EVENT_MASK) =3D=3D expected_config; } =20 -#ifdef HAVE_LIBTRACEEVENT - #if defined(__s390x__) /* Return true if kvm module is available and loaded. Test this * and return success when trace point kvm_s390_create_vm @@ -112,7 +110,6 @@ static int test__checkevent_tracepoint_multi(struct evl= ist *evlist) } return TEST_OK; } -#endif /* HAVE_LIBTRACEEVENT */ =20 static int test__checkevent_raw(struct evlist *evlist) { @@ -311,7 +308,6 @@ static int test__checkevent_breakpoint_rw(struct evlist= *evlist) return TEST_OK; } =20 -#ifdef HAVE_LIBTRACEEVENT static int test__checkevent_tracepoint_modifier(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); @@ -340,7 +336,6 @@ test__checkevent_tracepoint_multi_modifier(struct evlis= t *evlist) =20 return test__checkevent_tracepoint_multi(evlist); } -#endif /* HAVE_LIBTRACEEVENT */ =20 static int test__checkevent_raw_modifier(struct evlist *evlist) { @@ -629,7 +624,6 @@ static int test__checkevent_pmu(struct evlist *evlist) return TEST_OK; } =20 -#ifdef HAVE_LIBTRACEEVENT static int test__checkevent_list(struct evlist *evlist) { struct evsel *evsel =3D evlist__first(evlist); @@ -671,7 +665,6 @@ static int test__checkevent_list(struct evlist *evlist) =20 return TEST_OK; } -#endif =20 static int test__checkevent_pmu_name(struct evlist *evlist) { @@ -971,7 +964,6 @@ static int test__group2(struct evlist *evlist) return TEST_OK; } =20 -#ifdef HAVE_LIBTRACEEVENT static int test__group3(struct evlist *evlist __maybe_unused) { struct evsel *evsel, *group1_leader =3D NULL, *group2_leader =3D NULL; @@ -1078,7 +1070,6 @@ static int test__group3(struct evlist *evlist __maybe= _unused) } return TEST_OK; } -#endif =20 static int test__group4(struct evlist *evlist __maybe_unused) { @@ -1813,7 +1804,6 @@ static int test__term_equal_legacy(struct evlist *evl= ist) return TEST_OK; } =20 -#ifdef HAVE_LIBTRACEEVENT static int count_tracepoints(void) { struct dirent *events_ent; @@ -1867,7 +1857,6 @@ static int test__all_tracepoints(struct evlist *evlis= t) =20 return test__checkevent_tracepoint_multi(evlist); } -#endif /* HAVE_LIBTRACEVENT */ =20 struct evlist_test { const char *name; @@ -1876,7 +1865,6 @@ struct evlist_test { }; =20 static const struct evlist_test test__events[] =3D { -#ifdef HAVE_LIBTRACEEVENT { .name =3D "syscalls:sys_enter_openat", .check =3D test__checkevent_tracepoint, @@ -1887,7 +1875,6 @@ static const struct evlist_test test__events[] =3D { .check =3D test__checkevent_tracepoint_multi, /* 1 */ }, -#endif { .name =3D "r1a", .check =3D test__checkevent_raw, @@ -1938,7 +1925,6 @@ static const struct evlist_test test__events[] =3D { .check =3D test__checkevent_breakpoint_w, /* 1 */ }, -#ifdef HAVE_LIBTRACEEVENT { .name =3D "syscalls:sys_enter_openat:k", .check =3D test__checkevent_tracepoint_modifier, @@ -1949,7 +1935,6 @@ static const struct evlist_test test__events[] =3D { .check =3D test__checkevent_tracepoint_multi_modifier, /* 3 */ }, -#endif { .name =3D "r1a:kp", .check =3D test__checkevent_raw_modifier, @@ -1995,13 +1980,11 @@ static const struct evlist_test test__events[] =3D { .check =3D test__checkevent_breakpoint_w_modifier, /* 2 */ }, -#ifdef HAVE_LIBTRACEEVENT { .name =3D "r1,syscalls:sys_enter_openat:k,1:1:hp", .check =3D test__checkevent_list, /* 3 */ }, -#endif { .name =3D "instructions:G", .check =3D test__checkevent_exclude_host_modifier, @@ -2032,13 +2015,11 @@ static const struct evlist_test test__events[] =3D { .check =3D test__group2, /* 9 */ }, -#ifdef HAVE_LIBTRACEEVENT { .name =3D "group1{syscalls:sys_enter_openat:H,cycles:kppp},group2{cycle= s,1:3}:G,instructions:u", .check =3D test__group3, /* 0 */ }, -#endif { .name =3D "{cycles:u,instructions:kp}:p", .check =3D test__group4, @@ -2049,13 +2030,11 @@ static const struct evlist_test test__events[] =3D { .check =3D test__group5, /* 2 */ }, -#ifdef HAVE_LIBTRACEEVENT { .name =3D "*:*", .check =3D test__all_tracepoints, /* 3 */ }, -#endif { .name =3D "{cycles,cache-misses:G}:H", .check =3D test__group_gh1, @@ -2111,7 +2090,7 @@ static const struct evlist_test test__events[] =3D { .check =3D test__checkevent_breakpoint_len_rw_modifier, /* 4 */ }, -#if defined(__s390x__) && defined(HAVE_LIBTRACEEVENT) +#if defined(__s390x__) { .name =3D "kvm-s390:kvm_s390_create_vm", .check =3D test__checkevent_tracepoint, @@ -2265,13 +2244,11 @@ static const struct evlist_test test__events[] =3D { .check =3D test__checkevent_breakpoint_2_events, /* 3 */ }, -#ifdef HAVE_LIBTRACEEVENT { .name =3D "9p:9p_client_req", .check =3D test__checkevent_tracepoint, /* 4 */ }, -#endif }; =20 static const struct evlist_test test__events_pmu[] =3D { --=20 2.47.0.199.ga7371fff76-goog