From nobody Mon Feb 9 20:59:43 2026 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 47FA719D890 for ; Tue, 25 Feb 2025 16:47:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740502036; cv=none; b=kd5F0oCAmnlZhZMYJVC3CvBcJ93YP2FFQVErLQA92OG7iqXcJTZ903jQDqO7cBtCkrjnN5IAwmjBj/55O1STP/RBRP2q6JasXb+ep8Ddsd06Pq+pbwKWYlEH/heXRlg7xHFnFQlCCUUOpV1Gw3wh9ZeW7GcAO38ySwQpm7azG+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1740502036; c=relaxed/simple; bh=fJcj3avQNuqrPvfGogvQDFTwhN88MwqiTHVq32AqoM4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=QB33WwbLK2JtlcP7mlzf9LjrzXNfmqTL7wvUUHqAtN2m1TRmOKR8ZZIH2hPbTt7ATUU2mPxJ+znfSLkmJ/Emp9DuB3PBP87x2IDrlVn++eJ4A953RlMb3vk27Bdyq2e12U1L39n+1CAyUlDQWWyZnqTkCke0FGBPzDJNpJD9vAA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=U0gyxRI7; arc=none smtp.client-ip=209.85.128.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="U0gyxRI7" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-4399d14334aso51341295e9.0 for ; Tue, 25 Feb 2025 08:47:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1740502031; x=1741106831; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=T6zYunsslfLFaIghaKuBbDgwSTYPPEUyCdstyv8nGIk=; b=U0gyxRI7RGugzyu1uBefwjMdLMrNAns2UpJb5zn7i3gZcnHlBGr7f4u0XkooxVOU1H kk3YfTEGemNZ+P7oDio9F4Wm6h59z2UoAi//rPbw+Y8cEwkWSyWEiJ6Awg4DggRgPrel lKh2xOkS2u0ynlTE3vzCevhXuHjyEn6BHKnoUrASJG8Xm8lOsKNT1PPdYkmwH+ii6v8q NArWo+2Dwz6KRNUoD0jeJYk18PoFqsTF0Wetg6bBAJGpU1Rnr2nBQUO1CE2Kuq97Kyxx xIphUR2aNrsArg2RNxlS5a4lYEIxMIxkJ6p66LJsXL76pxnTpBVFhqNvAeRQCUDcSwb5 VJAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740502031; x=1741106831; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=T6zYunsslfLFaIghaKuBbDgwSTYPPEUyCdstyv8nGIk=; b=OgZ/uZUs59dsIkIIs+q8+BoC8k75qY9ixtuRr9sqWV0Xu6pui6wd35YjRweT4JuWA1 USW38NH8ZrdIQPkPhLL/nYUgXfqJ5LL9LzeIwQPnxw564xUH+/ku+xAOyUTJGBwcK0YR M2X06enGFwOUky2lVCNsdOPmWhRh/+q1tvVmWRDmjMIUKP33V7OLDu3g3igF8Gg4eSE4 +1/oGEW5MpebxOf/37U9S/QGg+cn4a2t33Exknm2S8Ch2hsoXb54JgJsc8XazpAghcrF R/Rtkcsgp/M9Es7Reokh91TwY8lvt5fUrwHOIVyJmd8vuF5VHNOMOTBujW8ibPR35ebP D2/w== X-Forwarded-Encrypted: i=1; AJvYcCVp5I9ONGNvB+7W/wLGZBxg9r3hCbl8RlogZaNUCE6PUh43D+p1GL8bzrVpCBgmV0WJB7IUqt3ga1Qlhrk=@vger.kernel.org X-Gm-Message-State: AOJu0YzJVMvIWEDw9PXsnfVE4LvQ4x9pCASBM0sIulrI1atx1fK9WnaJ PFbgM0/e7KbJ/JN+Mz/SRIVBC1DlbP+R6a6TSLQt2a1I96cHCCUfjFtOjiZ+fCU= X-Gm-Gg: ASbGncvMFcM+JaT/dXTC5FCiIOpzfQjdJo7Negy1amQFn4cQ6kYjArHg6ZPZ10gcRQK 587lGC4ekifYLBOitrtZ6Bb1WNx2zbd3+GG1db+Tyn1NTPhQOYYknHiK2AQWcEMY+YtOBjRZrAB oEFpJcznJhjwt+F19soGyaQxXIG9AAhhrwrTcmvDxmebHG/pQbqSn8imsV+QZEEkqQWosQKBirP TbCXlUNT0OqrKr48EZ1fpkeE+MYp5Q7AY7984ZvQ/6nUfGayTR6sDRmr004Miv9RZx9lyNFQ+cz zhQHXmY+AcMTPLqZexwxaLLC+Q== X-Google-Smtp-Source: AGHT+IHxcabNYd68N3fAYJwzKJtxAGyEN4XVr5OMEsGkvW8AeGZ4ctNdJiH2U7/OsTMvRHxz0sqrjw== X-Received: by 2002:a05:600c:3507:b0:439:9225:2f76 with SMTP id 5b1f17b1804b1-43ab8fe97d8mr2239285e9.18.1740502031441; Tue, 25 Feb 2025 08:47:11 -0800 (PST) Received: from pop-os.lan ([145.224.90.0]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-43ab154754esm32072415e9.21.2025.02.25.08.47.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Feb 2025 08:47:11 -0800 (PST) From: James Clark To: linux-perf-users@vger.kernel.org, irogers@google.com, namhyung@kernel.org, cyy@cyyself.name Cc: James Clark , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , Adrian Hunter , "Liang, Kan" , Yoshihiro Furudera , Greg Kroah-Hartman , Weilin Wang , Junhao He , Jean-Philippe Romain , linux-kernel@vger.kernel.org Subject: [PATCH 1/3] perf pmu: Dynamically allocate tool PMU Date: Tue, 25 Feb 2025 16:46:28 +0000 Message-Id: <20250225164639.522741-2-james.clark@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250225164639.522741-1-james.clark@linaro.org> References: <20250225164639.522741-1-james.clark@linaro.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" perf_pmus__destroy() treats all PMUs as allocated and free's them so we can't have any static PMUs that are added to the PMU lists. Fix it by allocating the tool PMU in the same way as the others. Current users of the tool PMU already use find_pmu() and not perf_pmus__tool_pmu(), so rename the function to add 'new' to avoid it being misused in the future. perf_pmus__fake_pmu() can remain as static as it's not added to the PMU lists. Fixes the following error: $ perf bench internals pmu-scan # Running 'internals/pmu-scan' benchmark: Computing performance of sysfs PMU event scan for 100 times munmap_chunk(): invalid pointer Aborted (core dumped) Fixes: 240505b2d0ad ("perf tool_pmu: Factor tool events into their own PMU") Signed-off-by: James Clark Reviewed-by: Ian Rogers --- tools/perf/util/pmus.c | 2 +- tools/perf/util/tool_pmu.c | 23 +++++++++++------------ tools/perf/util/tool_pmu.h | 2 +- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/tools/perf/util/pmus.c b/tools/perf/util/pmus.c index 8a0a919415d4..c1815edaca37 100644 --- a/tools/perf/util/pmus.c +++ b/tools/perf/util/pmus.c @@ -268,7 +268,7 @@ static void pmu_read_sysfs(unsigned int to_read_types) =20 if ((to_read_types & PERF_TOOL_PMU_TYPE_TOOL_MASK) !=3D 0 && (read_pmu_types & PERF_TOOL_PMU_TYPE_TOOL_MASK) =3D=3D 0) { - tool_pmu =3D perf_pmus__tool_pmu(); + tool_pmu =3D perf_pmus__new_tool_pmu(); list_add_tail(&tool_pmu->list, &other_pmus); } if ((to_read_types & PERF_TOOL_PMU_TYPE_HWMON_MASK) !=3D 0 && diff --git a/tools/perf/util/tool_pmu.c b/tools/perf/util/tool_pmu.c index 3a68debe7143..45eae810b205 100644 --- a/tools/perf/util/tool_pmu.c +++ b/tools/perf/util/tool_pmu.c @@ -490,17 +490,16 @@ int evsel__tool_pmu_read(struct evsel *evsel, int cpu= _map_idx, int thread) return 0; } =20 -struct perf_pmu *perf_pmus__tool_pmu(void) +struct perf_pmu *perf_pmus__new_tool_pmu(void) { - static struct perf_pmu tool =3D { - .name =3D "tool", - .type =3D PERF_PMU_TYPE_TOOL, - .aliases =3D LIST_HEAD_INIT(tool.aliases), - .caps =3D LIST_HEAD_INIT(tool.caps), - .format =3D LIST_HEAD_INIT(tool.format), - }; - if (!tool.events_table) - tool.events_table =3D find_core_events_table("common", "common"); - - return &tool; + struct perf_pmu *tool =3D zalloc(sizeof(struct perf_pmu)); + + tool->name =3D strdup("tool"); + tool->type =3D PERF_PMU_TYPE_TOOL; + INIT_LIST_HEAD(&tool->aliases); + INIT_LIST_HEAD(&tool->caps); + INIT_LIST_HEAD(&tool->format); + tool->events_table =3D find_core_events_table("common", "common"); + + return tool; } diff --git a/tools/perf/util/tool_pmu.h b/tools/perf/util/tool_pmu.h index a60184859080..268f05064d03 100644 --- a/tools/perf/util/tool_pmu.h +++ b/tools/perf/util/tool_pmu.h @@ -51,6 +51,6 @@ int evsel__tool_pmu_open(struct evsel *evsel, int start_cpu_map_idx, int end_cpu_map_idx); int evsel__tool_pmu_read(struct evsel *evsel, int cpu_map_idx, int thread); =20 -struct perf_pmu *perf_pmus__tool_pmu(void); +struct perf_pmu *perf_pmus__new_tool_pmu(void); =20 #endif /* __TOOL_PMU_H */ --=20 2.34.1