Re: [PATCH] perf vendor events: fix processing for xfs

[Sukadev Bhattiprolu]

John Garry [john.garry@xxxxxxxxxx] wrote:
> In the recently introduced support for vendor subdirectory,
> the checking for directory entries under xfs (or any other fs
> which does not support dirent.d_type) is missing the check
> for links for current and parent directory. This can result
> in a broken pmu_events.c being generated.

I run into the problem on a 4.15-based kernel/xfs but not on a
3.10-based kernel! Have not investigated, but this fix is good.
> 
> Fix this by adding the appropriate check in is_leaf_dir().
> 
> Cc: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: John Garry <john.garry@xxxxxxxxxx>

Tested-by: Sukadev Bhattiprolu <sukadev@xxxxxxxxxxxxxxxxxx>

Thanks John.

Sukadev
> 
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index 1c01844..db3a594 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -873,7 +873,10 @@ static int is_leaf_dir(const char *fpath)
>  		return 0;
> 
>  	while ((dir = readdir(d)) != NULL) {
> -		if (dir->d_type == DT_DIR && dir->d_name[0] != '.') {
> +		if (!strcmp(dir->d_name, ".") || !strcmp(dir->d_name, ".."))
> +			continue;
> +
> +		if (dir->d_type == DT_DIR) {
>  			res = 0;
>  			break;
>  		} else if (dir->d_type == DT_UNKNOWN) {
> -- 
> 1.9.1