From nobody Fri Feb 13 09:49:16 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 6332D2110F for ; Mon, 15 Apr 2024 06:36:38 +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=1713162999; cv=none; b=P4joCF23FKfiM7sF66AdrH1ahVdjY1+AwUT46++sYVZs7+6MBfKrLkMrNTiLZSoiOJOxGdn9EP8DWgk88qP5OXdS6oY9QglojgpDeYTcDXFTGQ1suzwsVQGGAeVHZ7R729NwBtBw7tA8ToXQqeea4Av5Ha1tpoNYUs5Ggt9HgnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713162999; c=relaxed/simple; bh=A9tG8iOIBqHAbekqVK9mlABKDk+WYPW2yjNIRApp2Ow=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=enKRBvilS48vbg4cZWWJ0TLYWcsdEr4J7/oOgGmXthIeZctCV1smkYpMU3CQcDh22rUOSMeP8xgyeL030XxC+xS6+OOgYDc0NnniyuXCLtQzZWuXXnG7e1bZSHKzcFrtl/1j71bWBGqCufKkE2VDE56+lglq7UZfhxB6+UWc1fA= 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=frTX9Xd5; 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="frTX9Xd5" Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-dcc0bcf9256so4041982276.3 for ; Sun, 14 Apr 2024 23:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1713162997; x=1713767797; 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=p+gciuZSLFdHIk1i0SV08AyznRpAEm+5KjCzM2jFJbc=; b=frTX9Xd5/JSeHqyqq4FTi1Zm+ZTlCqczsOi7cq5poH8+Zcmv5mDAtmNRiwyrH8HMmI SJ4+5rcl6LnwxY88Jc/jGf86G9AhMhU6fIqDFHocDvga58vCYbmd3L4xgFeJGo9NuYBB ZhxZnpE3z+BpIGR2X2ZtuVZzRnfoZ5/mVR1laEcxHTmEHXxe2/U/aURQYE6l04nD/G3i 75qeIoB2wGnZesTey+yRYJ8ioVHl7TrFUZVahqF84x7WYHBX6JmcAGwk1152vmShppna OouHSvDkTdU6MMcer9yAsy+U+dTppoME3tfeFFG84VAuCl2T0Q41ZerBqIrXyLw22SBT AfHQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713162997; x=1713767797; 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=p+gciuZSLFdHIk1i0SV08AyznRpAEm+5KjCzM2jFJbc=; b=a5O+WgL9JCYJ90xdhktcaxNANstSeyyIUqbvlW75gigVP27W0xiXQ83TtCxZKGvn1p N8Oo3iTks/oTMm0u06tGZgeFFt+PZ0/1cP0cfKhWMef/P4WCyb5EiTgZaSycQVXzAA4x ALAQnl9HFkmms44zcCWxew6xTizNXghXALOti/7NuLF1sFGPLWepUXfPd/QaRBuOgsko Cx6SLJwyPUtDD44pmUh+eHXR/5j9bmodM3DNyDuCbz3in1ODsJMyGyxWJuSghbdPJ2wF 3NL3iWznBzvrm9aEaXqqiL2GgnVajwGyGZcAPE3UoeF97P5C9uQRnSu2ws/8OEwDZK+/ dc/A== X-Forwarded-Encrypted: i=1; AJvYcCXrV6zIo6PL7sxiV6cm1hnTNboHD1SlJ0hoTestTiXePafv1TqjUrBdVgtG1UMnBP5hoSuNZfPm7orKXBOsEEkFZoiPqrLer97pMoYC X-Gm-Message-State: AOJu0YwXUE7ND29Ru9OJW76w4GKFRJe7pM6duUYKThB1L1dQcuiRU9Ha P8h2JIrfuAgYO5VYtdGuFfg5sNBULUTiDXj8hwZgwF1bFyi9MZfH/ixN/Mc3qeOzZCogCcFBdHS TLpRi9A== X-Google-Smtp-Source: AGHT+IFL+Tvkj6R3nO3XnJ0ewuekhH4PPx8UF3ahuI3cz/n03WZ3OYIbXOAvlx9w1Oc053fj9XHZnbkS+UNY X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f304:d776:d707:4b57]) (user=irogers job=sendgmr) by 2002:a25:b21b:0:b0:dda:c566:dadd with SMTP id i27-20020a25b21b000000b00ddac566daddmr529521ybj.4.1713162997423; Sun, 14 Apr 2024 23:36:37 -0700 (PDT) Date: Sun, 14 Apr 2024 23:36:20 -0700 In-Reply-To: <20240415063626.453987-1-irogers@google.com> Message-Id: <20240415063626.453987-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: <20240415063626.453987-1-irogers@google.com> X-Mailer: git-send-email 2.44.0.683.g7961c838ac-goog Subject: [PATCH v1 3/9] perf parse-events: Avoid copying an empty list 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 , James Clark , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Atish Patra , linux-riscv@lists.infradead.org, Beeman Strong Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" In parse_events_add_pmu, delay copying the list of terms until it is known the list contains terms. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index bc4a5e3c6c21..7e23168deeb9 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1398,29 +1398,20 @@ static int parse_events_add_pmu(struct parse_events= _state *parse_state, struct parse_events_terms parsed_terms; bool alias_rewrote_terms =3D false; =20 - parse_events_terms__init(&parsed_terms); - if (const_parsed_terms) { - int ret =3D parse_events_terms__copy(const_parsed_terms, &parsed_terms); - - if (ret) - return ret; - } - if (verbose > 1) { struct strbuf sb; =20 strbuf_init(&sb, /*hint=3D*/ 0); - if (pmu->selectable && list_empty(&parsed_terms.terms)) { + if (pmu->selectable && const_parsed_terms && list_empty(&const_parsed_te= rms->terms)) { strbuf_addf(&sb, "%s//", pmu->name); } else { strbuf_addf(&sb, "%s/", pmu->name); - parse_events_terms__to_strbuf(&parsed_terms, &sb); + parse_events_terms__to_strbuf(const_parsed_terms, &sb); strbuf_addch(&sb, '/'); } fprintf(stderr, "Attempt to add: %s\n", sb.buf); strbuf_release(&sb); } - fix_raw(&parsed_terms, pmu); =20 memset(&attr, 0, sizeof(attr)); if (pmu->perf_event_attr_init_default) @@ -1428,7 +1419,7 @@ static int parse_events_add_pmu(struct parse_events_s= tate *parse_state, =20 attr.type =3D pmu->type; =20 - if (list_empty(&parsed_terms.terms)) { + if (!const_parsed_terms || list_empty(&const_parsed_terms->terms)) { evsel =3D __add_event(list, &parse_state->idx, &attr, /*init_attr=3D*/true, /*name=3D*/NULL, /*metric_id=3D*/NULL, pmu, @@ -1437,6 +1428,15 @@ static int parse_events_add_pmu(struct parse_events_= state *parse_state, return evsel ? 0 : -ENOMEM; } =20 + parse_events_terms__init(&parsed_terms); + if (const_parsed_terms) { + int ret =3D parse_events_terms__copy(const_parsed_terms, &parsed_terms); + + if (ret) + return ret; + } + fix_raw(&parsed_terms, pmu); + /* Configure attr/terms with a known PMU, this will set hardcoded terms. = */ if (config_attr(&attr, &parsed_terms, parse_state->error, config_term_pmu= )) { parse_events_terms__exit(&parsed_terms); --=20 2.44.0.683.g7961c838ac-goog