From b9709a7866498a84dc4ab60fb006631569bedbf0 Mon Sep 17 00:00:00 2001

From: Stephane Eranian <eranian@gmail.com>

Date: Mon, 3 Apr 2017 22:48:31 -0700

Subject: [PATCH 1/7] Revert "fix struct validation for pfm_event_attr_info_t"

This reverts commit 06b296c72838be44d8950dc03227fe0dc8ca1fb1.

Break ABI compatibility from 4.7 to 4.8.

Signed-off-by: Stephane Eranian <eranian@gmail.com>

---

 include/perfmon/pfmlib.h | 5 ++---

 tests/validate.c         | 3 +--

 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/include/perfmon/pfmlib.h b/include/perfmon/pfmlib.h

index 0e370ba50318..d9be4453accf 100644

--- a/include/perfmon/pfmlib.h

+++ b/include/perfmon/pfmlib.h

@@ -490,7 +490,6 @@ typedef struct {

 	size_t			size;	/* struct sizeof */

 	uint64_t		code;	/* attribute code */

 	pfm_attr_t		type;	/* attribute type */

-	int			pad;	/* padding */

 	uint64_t		idx;	/* attribute opaque index */

 	pfm_attr_ctrl_t		ctrl;	/* what is providing attr */

 	struct {

@@ -520,13 +519,13 @@ typedef struct {

 #if __WORDSIZE == 64

 #define PFM_PMU_INFO_ABI0	56

 #define PFM_EVENT_INFO_ABI0	64

-#define PFM_ATTR_INFO_ABI0	72

+#define PFM_ATTR_INFO_ABI0	64

 #define PFM_RAW_ENCODE_ABI0	32

 #else

 #define PFM_PMU_INFO_ABI0	44

 #define PFM_EVENT_INFO_ABI0	48

-#define PFM_ATTR_INFO_ABI0	56

+#define PFM_ATTR_INFO_ABI0	48

 #define PFM_RAW_ENCODE_ABI0	20

 #endif

diff --git a/tests/validate.c b/tests/validate.c

index 0da0adc4995a..522a6ab7140d 100644

--- a/tests/validate.c

+++ b/tests/validate.c

@@ -201,7 +201,6 @@ static const struct_desc_t pfmlib_structs[]={

 		FIELD(code, pfm_event_attr_info_t),

 		FIELD(type, pfm_event_attr_info_t),

 		FIELD(idx, pfm_event_attr_info_t),

-		FIELD(pad, pfm_event_attr_info_t), /* padding */

 		FIELD(ctrl, pfm_event_attr_info_t),

 		LAST_FIELD

 	 },

@@ -271,7 +270,7 @@ validate_structs(void)

 		}

 		if (sz != d->sz) {

-			printf("Failed (invisible padding of %zu bytes, total struct size %zu bytes)\n", d->sz - sz, d->sz);

+			printf("Failed (invisible padding of %zu bytes)\n", d->sz - sz);

 			errors++;

 			continue;

 		}

-- 

2.7.4

From 01c24ef2c781c614544eeb5ce3922313118e3053 Mon Sep 17 00:00:00 2001

From: Stephane Eranian <eranian@gmail.com>

Date: Mon, 3 Apr 2017 22:49:18 -0700

Subject: [PATCH 2/7] Revert "Fix pfmlib_parse_event_attr() parsing of raw

 umask for 32-bit"

This reverts commit bfb9baf1c8a9533fde271d0436ecd465934dfa17.

support for 32-bit umask as implemented breaks ABI between 4.7 and 4.8.

Signed-off-by: Stephane Eranian <eranian@gmail.com>

---

 lib/pfmlib_common.c | 8 ++++----

 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pfmlib_common.c b/lib/pfmlib_common.c

index cff4d2ecbd2c..c88e2aaae274 100644

--- a/lib/pfmlib_common.c

+++ b/lib/pfmlib_common.c

@@ -1011,10 +1011,10 @@ pfmlib_parse_event_attr(char *str, pfmlib_event_desc_t *d)

 			ainfo->name = "RAW_UMASK";

 			ainfo->type = PFM_ATTR_RAW_UMASK;

 			ainfo->ctrl = PFM_ATTR_CTRL_PMU;

-			ainfo->idx  = strtoull(s, &endptr, 0);

+			ainfo->idx  = strtoul(s, &endptr, 0);

 			ainfo->equiv= NULL;

 			if (*endptr) {

-				DPRINT("raw umask (%s) is not a number\n", s);

+				DPRINT("raw umask (%s) is not a number\n");

 				return PFM_ERR_ATTR;

 			}

@@ -1368,9 +1368,9 @@ pfmlib_parse_event(const char *event, pfmlib_event_desc_t *d)

 	for (i = 0; i < d->nattrs; i++) {

 		pfm_event_attr_info_t *a = attr(d, i);

 		if (a->type != PFM_ATTR_RAW_UMASK)

-			DPRINT("%d %d %"PRIu64" %s\n", d->event, i, a->idx, d->pattrs[d->attrs[i].id].name);

+			DPRINT("%d %d %d %s\n", d->event, i, a->idx, d->pattrs[d->attrs[i].id].name);

 		else

-			DPRINT("%d %d RAW_UMASK (0x%"PRIx64")\n", d->event, i, a->idx);

+			DPRINT("%d %d RAW_UMASK (0x%x)\n", d->event, i, a->idx);

 	}

 error:

 	free(str);

-- 

2.7.4

From e206315c36e39409b7fc1e4cdd72caa5040b45c4 Mon Sep 17 00:00:00 2001

From: Stephane Eranian <eranian@gmail.com>

Date: Mon, 3 Apr 2017 22:52:22 -0700

Subject: [PATCH 3/7] Revert "Allow raw umask for OFFCORE_RESPONSE on Intel

 core PMUs"

This reverts commit 4dc4c6ada254f30eee8cd2ae27bb0869a111b613.

32-bit raw umask support break ABI between 4.7 and 4.8, so remove

for now.

Signed-off-by: Stephane Eranian <eranian@gmail.com>

---

 include/perfmon/pfmlib.h |   4 +-

 lib/pfmlib_intel_x86.c   |  16 ++--

 tests/validate_x86.c     | 232 -----------------------------------------------

 3 files changed, 9 insertions(+), 243 deletions(-)

diff --git a/include/perfmon/pfmlib.h b/include/perfmon/pfmlib.h

index d9be4453accf..6904c1c79b68 100644

--- a/include/perfmon/pfmlib.h

+++ b/include/perfmon/pfmlib.h

@@ -490,8 +490,8 @@ typedef struct {

 	size_t			size;	/* struct sizeof */

 	uint64_t		code;	/* attribute code */

 	pfm_attr_t		type;	/* attribute type */

-	uint64_t		idx;	/* attribute opaque index */

-	pfm_attr_ctrl_t		ctrl;	/* what is providing attr */

+	int			idx;	/* attribute opaque index */

+	pfm_attr_ctrl_t		ctrl;		/* what is providing attr */

 	struct {

 		unsigned int    is_dfl:1;	/* is default umask */

 		unsigned int    is_precise:1;	/* Intel X86: supports PEBS */

diff --git a/lib/pfmlib_intel_x86.c b/lib/pfmlib_intel_x86.c

index b698144f1da4..497cf1b9246a 100644

--- a/lib/pfmlib_intel_x86.c

+++ b/lib/pfmlib_intel_x86.c

@@ -481,18 +481,16 @@ pfm_intel_x86_encode_gen(void *this, pfmlib_event_desc_t *e)

 				reg.sel_event_select = last_ucode;

 			}

 		} else if (a->type == PFM_ATTR_RAW_UMASK) {

-			uint64_t rmask;

+

 			/* there can only be one RAW_UMASK per event */

-			if (intel_x86_eflag(this, e->event, INTEL_X86_NHM_OFFCORE)) {

-				rmask = (1ULL << 38) - 1;

-			} else {

-				rmask = 0xff;

-			}

-			if (a->idx & ~rmask) {

-				DPRINT("raw umask is too wide\n");

+

+			/* sanity check */

+			if (a->idx & ~0xff) {

+				DPRINT("raw umask is 8-bit wide\n");

 				return PFM_ERR_ATTR;

 			}

-			umask2  = a->idx & rmask;

+			/* override umask */

+			umask2 = a->idx & 0xff;

 			ugrpmsk = grpmsk;

 		} else {

 			uint64_t ival = e->attrs[k].ival;

diff --git a/tests/validate_x86.c b/tests/validate_x86.c

index 790ba585d8e7..906afba636e1 100644

--- a/tests/validate_x86.c

+++ b/tests/validate_x86.c

@@ -4057,238 +4057,6 @@ static const test_event_t x86_test_events[]={

 	  .fstr = "hsw::CYCLE_ACTIVITY:CYCLES_L2_PENDING:k=1:u=1:e=0:i=0:c=1:t=0:intx=0:intxcp=0",

 	},

 	{ SRC_LINE,

-	  .name = "wsm::offcore_response_0:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xf,

-	  .fstr = "wsm::OFFCORE_RESPONSE_0:0xf:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "wsm::offcore_response_0:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "wsm::OFFCORE_RESPONSE_0:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "wsm::offcore_response_0:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "snb::offcore_response_0:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xf,

-	  .fstr = "snb::OFFCORE_RESPONSE_0:0xf:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "snb::offcore_response_0:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "snb::OFFCORE_RESPONSE_0:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "snb::offcore_response_0:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "ivb_ep::offcore_response_0:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xf,

-	  .fstr = "ivb_ep::OFFCORE_RESPONSE_0:0xf:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "ivb_ep::offcore_response_0:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "ivb_ep::OFFCORE_RESPONSE_0:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "ivb_ep::offcore_response_0:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "hsw::offcore_response_0:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xf,

-	  .fstr = "hsw::OFFCORE_RESPONSE_0:0xf:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "hsw::offcore_response_0:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "hsw::OFFCORE_RESPONSE_0:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "hsw::offcore_response_0:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "bdw_ep::offcore_response_0:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xf,

-	  .fstr = "bdw_ep::OFFCORE_RESPONSE_0:0xf:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "bdw_ep::offcore_response_0:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "bdw_ep::OFFCORE_RESPONSE_0:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "bdw_ep::offcore_response_0:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "skl::offcore_response_0:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xf,

-	  .fstr = "skl::OFFCORE_RESPONSE_0:0xf:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "skl::offcore_response_0:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301b7,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "skl::OFFCORE_RESPONSE_0:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "skl::offcore_response_0:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "wsm::offcore_response_1:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "wsm::OFFCORE_RESPONSE_1:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "wsm::offcore_response_1:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "snb::offcore_response_1:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xf,

-	  .fstr = "snb::OFFCORE_RESPONSE_1:0xf:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "snb::offcore_response_1:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "snb::OFFCORE_RESPONSE_1:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "snb::offcore_response_1:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "ivb_ep::offcore_response_1:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xf,

-	  .fstr = "ivb_ep::OFFCORE_RESPONSE_1:0xf:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "ivb_ep::offcore_response_1:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "ivb_ep::OFFCORE_RESPONSE_1:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0",

-	},

-	{ SRC_LINE,

-	  .name = "ivb_ep::offcore_response_1:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "hsw::offcore_response_1:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xf,

-	  .fstr = "hsw::OFFCORE_RESPONSE_1:0xf:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "hsw::offcore_response_1:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "hsw::OFFCORE_RESPONSE_1:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "hsw::offcore_response_1:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "bdw_ep::offcore_response_1:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xf,

-	  .fstr = "bdw_ep::OFFCORE_RESPONSE_1:0xf:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "bdw_ep::offcore_response_1:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "bdw_ep::OFFCORE_RESPONSE_1:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "bdw_ep::offcore_response_1:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

-	  .name = "skl::offcore_response_1:0xf",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xf,

-	  .fstr = "skl::OFFCORE_RESPONSE_1:0xf:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "skl::offcore_response_1:0xfffffffff",

-	  .ret  = PFM_SUCCESS,

-	  .count = 2,

-	  .codes[0] = 0x5301bb,

-	  .codes[1] = 0xfffffffffull,

-	  .fstr = "skl::OFFCORE_RESPONSE_1:0xffffffff:k=1:u=1:e=0:i=0:c=0:t=0:intx=0:intxcp=0",

-	},

-	{ SRC_LINE,

-	  .name = "skl::offcore_response_1:0x7fffffffff",

-	  .ret  = PFM_ERR_ATTR,

-	},

-	{ SRC_LINE,

 	  .name = "glm::offcore_response_1:any_request",

 	  .ret  = PFM_SUCCESS,

 	  .count = 2,

-- 

2.7.4

From 1e01aa2112461ecb67ddc58750316cadd19a8612 Mon Sep 17 00:00:00 2001

From: Stephane Eranian <eranian@gmail.com>

Date: Mon, 3 Apr 2017 22:55:16 -0700

Subject: [PATCH 4/7] improve error message in validate.c

Add more detailed info in czase of size mismatch.

Signed-off-by: Stephane Eranian <eranian@gmail.com>

---

 tests/validate.c | 2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/validate.c b/tests/validate.c

index 522a6ab7140d..e4a8025f3f14 100644

--- a/tests/validate.c

+++ b/tests/validate.c

@@ -270,7 +270,7 @@ validate_structs(void)

 		}

 		if (sz != d->sz) {

-			printf("Failed (invisible padding of %zu bytes)\n", d->sz - sz);

+			printf("Failed (invisible padding of %zu bytes, total struct size %zu bytes)\n", d->sz - sz, d->sz);

 			errors++;

 			continue;

 		}

-- 

2.7.4

From 321133e1486084ea2b1494bc67b38ee085b31f71 Mon Sep 17 00:00:00 2001

From: Stephane Eranian <eranian@gmail.com>

Date: Mon, 3 Apr 2017 23:32:50 -0700

Subject: [PATCH 5/7] create internal type for perf_event_attr_info_t

This patch creates an internal version of the ABI

pfm_event_attr_info structure called pfmlib_event_attr_info_t.

The advantage is that we can change the internal version without

ABI changes. The new struct is just a clone of the external version.

But it can be customized for internal needs.

The pfm_get_event_attr_info() converts the internal version into

the external version.

This patch changes internal interface to use pfmlib_event_attr_info_t

for all architectures.

Signed-off-by: Stephane Eranian <eranian@gmail.com>

---

 lib/pfmlib_amd64.c                |  4 ++--

 lib/pfmlib_amd64_priv.h           |  2 +-

 lib/pfmlib_arm.c                  |  4 ++--

 lib/pfmlib_arm_priv.h             |  2 +-

 lib/pfmlib_common.c               | 32 ++++++++++++++++++++------------

 lib/pfmlib_intel_netburst.c       |  4 ++--

 lib/pfmlib_intel_nhm_unc.c        |  2 +-

 lib/pfmlib_intel_snbep_unc.c      |  4 ++--

 lib/pfmlib_intel_snbep_unc_priv.h |  2 +-

 lib/pfmlib_intel_x86.c            | 10 +++++-----

 lib/pfmlib_intel_x86_perf_event.c |  6 +++---

 lib/pfmlib_intel_x86_priv.h       |  2 +-

 lib/pfmlib_mips.c                 |  4 ++--

 lib/pfmlib_mips_priv.h            |  2 +-

 lib/pfmlib_perf_event.c           |  4 ++--

 lib/pfmlib_perf_event_pmu.c       |  6 +++---

 lib/pfmlib_perf_event_raw.c       |  2 +-

 lib/pfmlib_power_priv.h           |  2 +-

 lib/pfmlib_powerpc.c              |  2 +-

 lib/pfmlib_priv.h                 | 26 ++++++++++++++++++++++++--

 lib/pfmlib_sparc.c                |  4 ++--

 lib/pfmlib_sparc_priv.h           |  2 +-

 lib/pfmlib_torrent.c              |  2 +-

 23 files changed, 80 insertions(+), 50 deletions(-)

diff --git a/lib/pfmlib_amd64.c b/lib/pfmlib_amd64.c

index 13838040b55a..be2a4ef86faf 100644

--- a/lib/pfmlib_amd64.c

+++ b/lib/pfmlib_amd64.c

@@ -426,7 +426,7 @@ pfm_amd64_get_encoding(void *this, pfmlib_event_desc_t *e)

 {

 	const amd64_entry_t *pe = this_pe(this);

 	pfm_amd64_reg_t reg;

-	pfm_event_attr_info_t *a;

+	pfmlib_event_attr_info_t *a;

 	uint64_t umask = 0;

 	unsigned int plmmsk = 0;

 	int k, ret, grpid;

@@ -661,7 +661,7 @@ pfm_amd64_event_is_valid(void *this, int pidx)

 }

 int

-pfm_amd64_get_event_attr_info(void *this, int pidx, int attr_idx, pfm_event_attr_info_t *info)

+pfm_amd64_get_event_attr_info(void *this, int pidx, int attr_idx, pfmlib_event_attr_info_t *info)

 {

 	const amd64_entry_t *pe = this_pe(this);

 	int numasks, idx;

diff --git a/lib/pfmlib_amd64_priv.h b/lib/pfmlib_amd64_priv.h

index 66ca49ef1b1d..c3caae514f52 100644

--- a/lib/pfmlib_amd64_priv.h

+++ b/lib/pfmlib_amd64_priv.h

@@ -202,7 +202,7 @@ extern int pfm_amd64_get_encoding(void *this, pfmlib_event_desc_t *e);

 extern int pfm_amd64_get_event_first(void *this);

 extern int pfm_amd64_get_event_next(void *this, int idx);

 extern int pfm_amd64_event_is_valid(void *this, int idx);

-extern int pfm_amd64_get_event_attr_info(void *this, int idx, int attr_idx, pfm_event_attr_info_t *info);

+extern int pfm_amd64_get_event_attr_info(void *this, int idx, int attr_idx, pfmlib_event_attr_info_t *info);

 extern int pfm_amd64_get_event_info(void *this, int idx, pfm_event_info_t *info);

 extern int pfm_amd64_validate_table(void *this, FILE *fp);

 extern int pfm_amd64_detect(void *this);

diff --git a/lib/pfmlib_arm.c b/lib/pfmlib_arm.c

index a49ca4504644..91c35c670ebe 100644

--- a/lib/pfmlib_arm.c

+++ b/lib/pfmlib_arm.c

@@ -180,7 +180,7 @@ pfm_arm_get_encoding(void *this, pfmlib_event_desc_t *e)

 {

 	const arm_entry_t *pe = this_pe(this);

-	pfm_event_attr_info_t *a;

+	pfmlib_event_attr_info_t *a;

 	pfm_arm_reg_t reg;

 	unsigned int plm = 0;

 	int i, idx, has_plm = 0;

@@ -305,7 +305,7 @@ pfm_arm_validate_table(void *this, FILE *fp)

 }

 int

-pfm_arm_get_event_attr_info(void *this, int pidx, int attr_idx, pfm_event_attr_info_t *info)

+pfm_arm_get_event_attr_info(void *this, int pidx, int attr_idx, pfmlib_event_attr_info_t *info)

 {

 	int idx;

diff --git a/lib/pfmlib_arm_priv.h b/lib/pfmlib_arm_priv.h

index 81a9df9afdc7..4fc2e74955e4 100644

--- a/lib/pfmlib_arm_priv.h

+++ b/lib/pfmlib_arm_priv.h

@@ -66,7 +66,7 @@ extern int pfm_arm_get_event_first(void *this);

 extern int pfm_arm_get_event_next(void *this, int idx);

 extern int pfm_arm_event_is_valid(void *this, int pidx);

 extern int pfm_arm_validate_table(void *this, FILE *fp);

-extern int pfm_arm_get_event_attr_info(void *this, int pidx, int attr_idx, pfm_event_attr_info_t *info);

+extern int pfm_arm_get_event_attr_info(void *this, int pidx, int attr_idx, pfmlib_event_attr_info_t *info);

 extern int pfm_arm_get_event_info(void *this, int idx, pfm_event_info_t *info);

 extern unsigned int pfm_arm_get_event_nattrs(void *this, int pidx);

diff --git a/lib/pfmlib_common.c b/lib/pfmlib_common.c

index c88e2aaae274..f3c6dfa23e55 100644

--- a/lib/pfmlib_common.c

+++ b/lib/pfmlib_common.c

@@ -504,7 +504,7 @@ pfmlib_compact_attrs(pfmlib_event_desc_t *e, int i)

 static inline int

 pfmlib_same_attr(pfmlib_event_desc_t *d, int i, int j)

 {

-	pfm_event_attr_info_t *a1, *a2;

+	pfmlib_event_attr_info_t *a1, *a2;

 	pfmlib_attr_t *b1, *b2;

 	a1 = attr(d, i);

@@ -967,7 +967,7 @@ pfmlib_sanitize_event(pfmlib_event_desc_t *d)

 static int

 pfmlib_parse_event_attr(char *str, pfmlib_event_desc_t *d)

 {

-	pfm_event_attr_info_t *ainfo;

+	pfmlib_event_attr_info_t *ainfo;

 	char *s, *p, *q, *endptr;

 	char yes[2] = "y";

 	pfm_attr_t type;

@@ -1366,7 +1366,7 @@ pfmlib_parse_event(const char *event, pfmlib_event_desc_t *d)

 		ret = pfmlib_sanitize_event(d);

 	for (i = 0; i < d->nattrs; i++) {

-		pfm_event_attr_info_t *a = attr(d, i);

+		pfmlib_event_attr_info_t *a = attr(d, i);

 		if (a->type != PFM_ATTR_RAW_UMASK)

 			DPRINT("%d %d %d %s\n", d->event, i, a->idx, d->pattrs[d->attrs[i].id].name);

 		else

@@ -1549,7 +1549,7 @@ static int

 pfmlib_pmu_validate_encoding(pfmlib_pmu_t *pmu, FILE *fp)

 {

 	pfm_event_info_t einfo;

-	pfm_event_attr_info_t ainfo;

+	pfmlib_event_attr_info_t ainfo;

 	char *buf;

 	size_t maxlen = 0, len;

 	int i, u, n = 0, um;

@@ -1811,7 +1811,7 @@ pfm_get_event_info(int idx, pfm_os_t os, pfm_event_info_t *uinfo)

 int

 pfm_get_event_attr_info(int idx, int attr_idx, pfm_os_t os, pfm_event_attr_info_t *uinfo)

 {

-	pfm_event_attr_info_t info;

+	pfmlib_event_attr_info_t info;

 	pfmlib_event_desc_t e;

 	pfmlib_pmu_t *pmu;

 	size_t sz = sizeof(info);

@@ -1857,17 +1857,25 @@ pfm_get_event_attr_info(int idx, int attr_idx, pfm_os_t os, pfm_event_attr_info_

 	info = e.pattrs[attr_idx];

 	/*

-	 * rewrite size to reflect what we are returning

-	 */

-	info.size = sz;

-	/*

 	 * info.idx = private, namespace specific index,

 	 * should not be visible externally, so override

 	 * with public index

+	 *

+	 * cannot memcpy() info into uinfo as they do not

+	 * have the same size, cf. idx field (uint64 vs, uint32)

 	 */

-	info.idx  = attr_idx;

-

-	memcpy(uinfo, &info, sz);

+	uinfo->name  = info.name;

+	uinfo->desc  = info.desc;

+	uinfo->equiv = info.equiv;

+	uinfo->size  = sz;

+	uinfo->code  = info.code;

+	uinfo->type  = info.type;

+	uinfo->idx   = attr_idx;

+	uinfo->ctrl  = info.ctrl;

+	uinfo->is_dfl= info.is_dfl;

+	uinfo->is_precise = info.is_precise;

+	uinfo->reserved_bits = 0;

+	uinfo->dfl_val64 = info.dfl_val64;

 	ret = PFM_SUCCESS;

 error:

diff --git a/lib/pfmlib_intel_netburst.c b/lib/pfmlib_intel_netburst.c

index 9d8f22b7705d..9b4960583523 100644

--- a/lib/pfmlib_intel_netburst.c

+++ b/lib/pfmlib_intel_netburst.c

@@ -110,7 +110,7 @@ netburst_add_defaults(pfmlib_event_desc_t *e, unsigned int *evmask)

 int

 pfm_netburst_get_encoding(void *this, pfmlib_event_desc_t *e)

 {

-	pfm_event_attr_info_t *a;

+	pfmlib_event_attr_info_t *a;

 	netburst_escr_value_t escr;

 	netburst_cccr_value_t cccr;

 	unsigned int evmask = 0;

@@ -322,7 +322,7 @@ pfm_netburst_event_is_valid(void *this, int pidx)

 }

 static int

-pfm_netburst_get_event_attr_info(void *this, int pidx, int attr_idx, pfm_event_attr_info_t *info)

+pfm_netburst_get_event_attr_info(void *this, int pidx, int attr_idx, pfmlib_event_attr_info_t *info)

 {

 	const netburst_entry_t *pe = this_pe(this);

 	int numasks, idx;

diff --git a/lib/pfmlib_intel_nhm_unc.c b/lib/pfmlib_intel_nhm_unc.c

index 4c27b070f2d6..6731f4045332 100644

--- a/lib/pfmlib_intel_nhm_unc.c

+++ b/lib/pfmlib_intel_nhm_unc.c

@@ -82,7 +82,7 @@ static int

 pfm_nhm_unc_get_encoding(void *this, pfmlib_event_desc_t *e)

 {

 	pfm_intel_x86_reg_t reg;

-	pfm_event_attr_info_t *a;

+	pfmlib_event_attr_info_t *a;

 	const intel_x86_entry_t *pe = this_pe(this);

 	unsigned int grpmsk, ugrpmsk = 0;

 	int umodmsk = 0, modmsk_r = 0;

diff --git a/lib/pfmlib_intel_snbep_unc.c b/lib/pfmlib_intel_snbep_unc.c

index 075ae33b3a57..1e80147fc1a3 100644

--- a/lib/pfmlib_intel_snbep_unc.c

+++ b/lib/pfmlib_intel_snbep_unc.c

@@ -281,7 +281,7 @@ pfm_intel_snbep_unc_get_encoding(void *this, pfmlib_event_desc_t *e)

 	pfm_snbep_unc_reg_t reg;

 	pfm_snbep_unc_reg_t filters[INTEL_X86_MAX_FILTERS];

 	pfm_snbep_unc_reg_t addr;

-	pfm_event_attr_info_t *a;

+	pfmlib_event_attr_info_t *a;

 	uint64_t val, umask1, umask2;

 	int k, ret;

 	int has_cbo_tid = 0;

@@ -641,7 +641,7 @@ pfm_intel_snbep_unc_can_auto_encode(void *this, int pidx, int uidx)

 }

 int

-pfm_intel_snbep_unc_get_event_attr_info(void *this, int pidx, int attr_idx, pfm_event_attr_info_t *info)

+pfm_intel_snbep_unc_get_event_attr_info(void *this, int pidx, int attr_idx, pfmlib_event_attr_info_t *info)

 {

 	const intel_x86_entry_t *pe = this_pe(this);

 	const pfmlib_attr_desc_t *atdesc = this_atdesc(this);

diff --git a/lib/pfmlib_intel_snbep_unc_priv.h b/lib/pfmlib_intel_snbep_unc_priv.h

index 500ff84cc123..4984242c35bb 100644

--- a/lib/pfmlib_intel_snbep_unc_priv.h

+++ b/lib/pfmlib_intel_snbep_unc_priv.h

@@ -329,7 +329,7 @@ extern int  pfm_intel_hswep_unc_detect(void *this);

 extern int  pfm_intel_knl_unc_detect(void *this);

 extern int  pfm_intel_snbep_unc_get_perf_encoding(void *this, pfmlib_event_desc_t *e);

 extern int  pfm_intel_snbep_unc_can_auto_encode(void *this, int pidx, int uidx);

-extern int pfm_intel_snbep_unc_get_event_attr_info(void *this, int pidx, int attr_idx, pfm_event_attr_info_t *info);

+extern int pfm_intel_snbep_unc_get_event_attr_info(void *this, int pidx, int attr_idx, pfmlib_event_attr_info_t *info);

 static inline int

 is_cbo_filt_event(void *this, pfm_intel_x86_reg_t reg)

diff --git a/lib/pfmlib_intel_x86.c b/lib/pfmlib_intel_x86.c

index 497cf1b9246a..09a0f50a3a4e 100644