Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Wed, 14 Mar 2018 10:42:51 -0700
From:   Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
To:     John Garry <john.garry@huawei.com>
Cc:     peterz@infradead.org, mingo@redhat.com, acme@kernel.org,
        alexander.shishkin@linux.intel.com, jolsa@redhat.com,
        namhyung@kernel.org, ak@linux.intel.com, wcohen@redhat.com,
        linux-kernel@vger.kernel.org, linuxarm@huawei.com
Subject: Re: [PATCH] perf vendor events: fix processing for xfs
References: <1521047452-28565-1-git-send-email-john.garry@huawei.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1521047452-28565-1-git-send-email-john.garry@huawei.com>
User-Agent: Mutt/1.7.1 (2016-10-04)
Message-Id: <20180314174251.GA28324@us.ibm.com>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

John Garry [john.garry@huawei.com] 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@linux.vnet.ibm.com>
> Signed-off-by: John Garry <john.garry@huawei.com>

Tested-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>

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