Commit 51ce1dcc authored by John Garry's avatar John Garry Committed by Arnaldo Carvalho de Melo

perf vendor events: Add support for pmu events vendor subdirectory

For some architectures (like arm), it is required to support a vendor
subdirectory and not locate all the JSONs for a specific vendor in the
same folder.

This is because all the events for the same vendor will be placed in the
same pmu events table, which may cause conflict.  This conflict would be
in the instance that a vendor's custom implemented events do have the
same meaning on different platforms, so events in the pmu table would
conflict. In addition, per list command may show events which are not
even supported for a given platform.

This patch adds support for a arch/vendor/platform directory hierarchy,
while maintaining backwards-compatibility for existing arch/platform
structure. In this, each platform would always have its own pmu events
table.

In generated file pmu_events.c, each platform table name is in the
format pme{_vendor}_platform, like this:

struct pmu_events_map pmu_events_map[] = {
{
	.cpuid = "0x00000000420f5160",
	.version = "v1",
	.type = "core",
	.table = pme_cavium_thunderx2
},
{
	.cpuid = 0,
	.version = 0,
	.type = 0,
	.table = 0,
},
};
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarSukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ganapatrao Kulkarni <ganapatrao.kulkarni@cavium.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Shaokun Zhang <zhangshaokun@hisilicon.com>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: William Cohen <wcohen@redhat.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxarm@huawei.com
Link: http://lkml.kernel.org/r/1520506716-197429-5-git-send-email-john.garry@huawei.com
Link: http://lkml.kernel.org/r/1521047452-28565-1-git-send-email-john.garry@huawei.com
[ Add missing limits.h include, fixing the build on at least all Alpine Linux versions tested (3.4 to 3.7 + edge), ]
[ Applied a patch to fix reading ./.. directories in XFS, see second Link tag ]
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 6f2f2ca3
...@@ -28,6 +28,10 @@ sub directory. Thus for the Silvermont X86 CPU: ...@@ -28,6 +28,10 @@ sub directory. Thus for the Silvermont X86 CPU:
Cache.json Memory.json Virtual-Memory.json Cache.json Memory.json Virtual-Memory.json
Frontend.json Pipeline.json Frontend.json Pipeline.json
The JSONs folder for a CPU model/family may be placed in the root arch
folder, or may be placed in a vendor sub-folder under the arch folder
for instances where the arch and vendor are not the same.
Using the JSON files and the mapfile, 'jevents' generates the C source file, Using the JSON files and the mapfile, 'jevents' generates the C source file,
'pmu-events.c', which encodes the two sets of tables: 'pmu-events.c', which encodes the two sets of tables:
......
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
#include <unistd.h> #include <unistd.h>
#include <stdarg.h> #include <stdarg.h>
#include <libgen.h> #include <libgen.h>
#include <limits.h>
#include <dirent.h> #include <dirent.h>
#include <sys/time.h> /* getrlimit */ #include <sys/time.h> /* getrlimit */
#include <sys/resource.h> /* getrlimit */ #include <sys/resource.h> /* getrlimit */
...@@ -572,7 +573,7 @@ static char *file_name_to_table_name(char *fname) ...@@ -572,7 +573,7 @@ static char *file_name_to_table_name(char *fname)
* Derive rest of table name from basename of the JSON file, * Derive rest of table name from basename of the JSON file,
* replacing hyphens and stripping out .json suffix. * replacing hyphens and stripping out .json suffix.
*/ */
n = asprintf(&tblname, "pme_%s", basename(fname)); n = asprintf(&tblname, "pme_%s", fname);
if (n < 0) { if (n < 0) {
pr_info("%s: asprintf() error %s for file %s\n", prog, pr_info("%s: asprintf() error %s for file %s\n", prog,
strerror(errno), fname); strerror(errno), fname);
...@@ -582,7 +583,7 @@ static char *file_name_to_table_name(char *fname) ...@@ -582,7 +583,7 @@ static char *file_name_to_table_name(char *fname)
for (i = 0; i < strlen(tblname); i++) { for (i = 0; i < strlen(tblname); i++) {
c = tblname[i]; c = tblname[i];
if (c == '-') if (c == '-' || c == '/')
tblname[i] = '_'; tblname[i] = '_';
else if (c == '.') { else if (c == '.') {
tblname[i] = '\0'; tblname[i] = '\0';
...@@ -739,25 +740,80 @@ static int get_maxfds(void) ...@@ -739,25 +740,80 @@ static int get_maxfds(void)
static FILE *eventsfp; static FILE *eventsfp;
static char *mapfile; static char *mapfile;
static int is_leaf_dir(const char *fpath)
{
DIR *d;
struct dirent *dir;
int res = 1;
d = opendir(fpath);
if (!d)
return 0;
while ((dir = readdir(d)) != NULL) {
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) {
char path[PATH_MAX];
struct stat st;
sprintf(path, "%s/%s", fpath, dir->d_name);
if (stat(path, &st))
break;
if (S_ISDIR(st.st_mode)) {
res = 0;
break;
}
}
}
closedir(d);
return res;
}
static int process_one_file(const char *fpath, const struct stat *sb, static int process_one_file(const char *fpath, const struct stat *sb,
int typeflag, struct FTW *ftwbuf) int typeflag, struct FTW *ftwbuf)
{ {
char *tblname, *bname = (char *) fpath + ftwbuf->base; char *tblname, *bname;
int is_dir = typeflag == FTW_D; int is_dir = typeflag == FTW_D;
int is_file = typeflag == FTW_F; int is_file = typeflag == FTW_F;
int level = ftwbuf->level; int level = ftwbuf->level;
int err = 0; int err = 0;
if (level == 2 && is_dir) {
/*
* For level 2 directory, bname will include parent name,
* like vendor/platform. So search back from platform dir
* to find this.
*/
bname = (char *) fpath + ftwbuf->base - 2;
for (;;) {
if (*bname == '/')
break;
bname--;
}
bname++;
} else
bname = (char *) fpath + ftwbuf->base;
pr_debug("%s %d %7jd %-20s %s\n", pr_debug("%s %d %7jd %-20s %s\n",
is_file ? "f" : is_dir ? "d" : "x", is_file ? "f" : is_dir ? "d" : "x",
level, sb->st_size, bname, fpath); level, sb->st_size, bname, fpath);
/* base dir */ /* base dir or too deep */
if (level == 0) if (level == 0 || level > 3)
return 0; return 0;
/* model directory, reset topic */ /* model directory, reset topic */
if (level == 1 && is_dir) { if ((level == 1 && is_dir && is_leaf_dir(fpath)) ||
(level == 2 && is_dir)) {
if (close_table) if (close_table)
print_events_table_suffix(eventsfp); print_events_table_suffix(eventsfp);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment