diff mbox series

[v2,2/5] perf arm-spe: Calculate meta data size

Message ID 20240914215458.751802-3-leo.yan@arm.com (mailing list archive)
State New, archived
Headers show
Series perf arm-spe: Introduce metadata version 2 | expand

Commit Message

Leo Yan Sept. 14, 2024, 9:54 p.m. UTC 
The metadata is designed to contain a header and per CPU information.

The arm_spe_find_cpus() function is introduced to identify how many CPUs
support ARM SPE. Based on the CPU number, calculates the metadata size.

Signed-off-by: Leo Yan <leo.yan@arm.com>
---
 tools/perf/arch/arm64/util/arm-spe.c | 35 +++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

Comments

Namhyung Kim Sept. 27, 2024, 6:14 a.m. UTC | #1 
On Sat, Sep 14, 2024 at 10:54:55PM +0100, Leo Yan wrote:
> The metadata is designed to contain a header and per CPU information.
> 
> The arm_spe_find_cpus() function is introduced to identify how many CPUs
> support ARM SPE. Based on the CPU number, calculates the metadata size.
> 
> Signed-off-by: Leo Yan <leo.yan@arm.com>
> ---
>  tools/perf/arch/arm64/util/arm-spe.c | 35 +++++++++++++++++++++++++---
>  1 file changed, 32 insertions(+), 3 deletions(-)
> 
> diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
> index c2d5c8ca4900..15478989ef30 100644
> --- a/tools/perf/arch/arm64/util/arm-spe.c
> +++ b/tools/perf/arch/arm64/util/arm-spe.c
> @@ -37,11 +37,40 @@ struct arm_spe_recording {
>  	bool			*wrapped;
>  };
>  
> +static struct perf_cpu_map *arm_spe_find_cpus(struct evlist *evlist)

Please add a comment that it returns a new cpu map, and caller should
release the reference after use.

> +{
> +	struct perf_cpu_map *event_cpus = evlist->core.user_requested_cpus;
> +	struct perf_cpu_map *online_cpus = perf_cpu_map__new_online_cpus();
> +	struct perf_cpu_map *intersect_cpus;
> +
> +	/* cpu map is not "any" CPU , we have specific CPUs to work with */
> +	if (!perf_cpu_map__has_any_cpu(event_cpus)) {
> +		intersect_cpus = perf_cpu_map__intersect(event_cpus, online_cpus);
> +		perf_cpu_map__put(online_cpus);
> +	/* Event can be "any" CPU so count all CPUs. */
> +	} else {
> +		intersect_cpus = online_cpus;
> +	}
> +
> +	return intersect_cpus;
> +}
> +
>  static size_t
>  arm_spe_info_priv_size(struct auxtrace_record *itr __maybe_unused,
> -		       struct evlist *evlist __maybe_unused)
> +		       struct evlist *evlist)
>  {
> -	return ARM_SPE_AUXTRACE_V1_PRIV_SIZE;
> +	struct perf_cpu_map *cpu_map = arm_spe_find_cpus(evlist);
> +	size_t size;
> +
> +	if (!cpu_map)
> +		return 0;
> +
> +	size = ARM_SPE_AUXTRACE_PRIV_MAX +
> +	       ARM_SPE_CPU_PRIV_MAX * perf_cpu_map__nr(cpu_map);
> +	size *= sizeof(u64);
> +
> +	perf_cpu_map__put(cpu_map);
> +	return size;
>  }
>  
>  static int arm_spe_info_fill(struct auxtrace_record *itr,
> @@ -53,7 +82,7 @@ static int arm_spe_info_fill(struct auxtrace_record *itr,
>  			container_of(itr, struct arm_spe_recording, itr);
>  	struct perf_pmu *arm_spe_pmu = sper->arm_spe_pmu;
>  
> -	if (priv_size != ARM_SPE_AUXTRACE_V1_PRIV_SIZE)
> +	if (priv_size != arm_spe_info_priv_size(itr, session->evlist))
>  		return -EINVAL;
>  
>  	if (!session->evlist->core.nr_mmaps)
> -- 
> 2.34.1
>
Leo Yan Sept. 27, 2024, 8:07 a.m. UTC | #2 
On 9/27/24 07:14, Namhyung Kim wrote:
> Warning: EXTERNAL SENDER, use caution when opening links or attachments.
> 
> 
> On Sat, Sep 14, 2024 at 10:54:55PM +0100, Leo Yan wrote:
>> The metadata is designed to contain a header and per CPU information.
>>
>> The arm_spe_find_cpus() function is introduced to identify how many CPUs
>> support ARM SPE. Based on the CPU number, calculates the metadata size.
>>
>> Signed-off-by: Leo Yan <leo.yan@arm.com>
>> ---
>>   tools/perf/arch/arm64/util/arm-spe.c | 35 +++++++++++++++++++++++++---
>>   1 file changed, 32 insertions(+), 3 deletions(-)
>>
>> diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
>> index c2d5c8ca4900..15478989ef30 100644
>> --- a/tools/perf/arch/arm64/util/arm-spe.c
>> +++ b/tools/perf/arch/arm64/util/arm-spe.c
>> @@ -37,11 +37,40 @@ struct arm_spe_recording {
>>        bool                    *wrapped;
>>   };
>>
>> +static struct perf_cpu_map *arm_spe_find_cpus(struct evlist *evlist)
> 
> Please add a comment that it returns a new cpu map, and caller should
> release the reference after use.

Will do.

Thanks,
Leo

>> +{
>> +     struct perf_cpu_map *event_cpus = evlist->core.user_requested_cpus;
>> +     struct perf_cpu_map *online_cpus = perf_cpu_map__new_online_cpus();
>> +     struct perf_cpu_map *intersect_cpus;
>> +
>> +     /* cpu map is not "any" CPU , we have specific CPUs to work with */
>> +     if (!perf_cpu_map__has_any_cpu(event_cpus)) {
>> +             intersect_cpus = perf_cpu_map__intersect(event_cpus, online_cpus);
>> +             perf_cpu_map__put(online_cpus);
>> +     /* Event can be "any" CPU so count all CPUs. */
>> +     } else {
>> +             intersect_cpus = online_cpus;
>> +     }
>> +
>> +     return intersect_cpus;
>> +}
diff mbox series

Patch

diff --git a/tools/perf/arch/arm64/util/arm-spe.c b/tools/perf/arch/arm64/util/arm-spe.c
index c2d5c8ca4900..15478989ef30 100644
--- a/tools/perf/arch/arm64/util/arm-spe.c
+++ b/tools/perf/arch/arm64/util/arm-spe.c
@@ -37,11 +37,40 @@  struct arm_spe_recording {
 	bool			*wrapped;
 };
 
+static struct perf_cpu_map *arm_spe_find_cpus(struct evlist *evlist)
+{
+	struct perf_cpu_map *event_cpus = evlist->core.user_requested_cpus;
+	struct perf_cpu_map *online_cpus = perf_cpu_map__new_online_cpus();
+	struct perf_cpu_map *intersect_cpus;
+
+	/* cpu map is not "any" CPU , we have specific CPUs to work with */
+	if (!perf_cpu_map__has_any_cpu(event_cpus)) {
+		intersect_cpus = perf_cpu_map__intersect(event_cpus, online_cpus);
+		perf_cpu_map__put(online_cpus);
+	/* Event can be "any" CPU so count all CPUs. */
+	} else {
+		intersect_cpus = online_cpus;
+	}
+
+	return intersect_cpus;
+}
+
 static size_t
 arm_spe_info_priv_size(struct auxtrace_record *itr __maybe_unused,
-		       struct evlist *evlist __maybe_unused)
+		       struct evlist *evlist)
 {
-	return ARM_SPE_AUXTRACE_V1_PRIV_SIZE;
+	struct perf_cpu_map *cpu_map = arm_spe_find_cpus(evlist);
+	size_t size;
+
+	if (!cpu_map)
+		return 0;
+
+	size = ARM_SPE_AUXTRACE_PRIV_MAX +
+	       ARM_SPE_CPU_PRIV_MAX * perf_cpu_map__nr(cpu_map);
+	size *= sizeof(u64);
+
+	perf_cpu_map__put(cpu_map);
+	return size;
 }
 
 static int arm_spe_info_fill(struct auxtrace_record *itr,
@@ -53,7 +82,7 @@  static int arm_spe_info_fill(struct auxtrace_record *itr,
 			container_of(itr, struct arm_spe_recording, itr);
 	struct perf_pmu *arm_spe_pmu = sper->arm_spe_pmu;
 
-	if (priv_size != ARM_SPE_AUXTRACE_V1_PRIV_SIZE)
+	if (priv_size != arm_spe_info_priv_size(itr, session->evlist))
 		return -EINVAL;
 
 	if (!session->evlist->core.nr_mmaps)