[dpdk-dev] [PATCH] examples/l2fwd-cat: fix build according to API changes

2017-08-29 Thread Vladimir Kuramshin 
Current version is compatible with PQOS version 1.3
but not compatible with higher versions. This change
makes l2fwd-cat example compatible with versions since 1.4

Signed-off-by: Vladimir Kuramshin 
---
 examples/l2fwd-cat/Makefile |  5 +---
 examples/l2fwd-cat/cat.c| 60 ++---
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
index ae921ade6..a7fe6d68e 100644
--- a/examples/l2fwd-cat/Makefile
+++ b/examples/l2fwd-cat/Makefile
@@ -40,9 +40,6 @@ endif
 # Default target, can be overridden by command line or environment
 RTE_TARGET ?= x86_64-native-linuxapp-gcc
 
-# Location of PQoS library and includes,
-PQOS_LIBRARY_PATH = $(PQOS_INSTALL_PATH)/libpqos.a
-
 include $(RTE_SDK)/mk/rte.vars.mk
 
 # binary name
@@ -65,6 +62,6 @@ CFLAGS += -I$(PQOS_INSTALL_PATH)/../include
 CFLAGS_cat.o := -D_GNU_SOURCE
 
 LDLIBS += -L$(PQOS_INSTALL_PATH)
-LDLIBS += $(PQOS_LIBRARY_PATH)
+LDLIBS += -lpqos
 
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index 6133bf5bb..4a0a22319 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -53,7 +53,7 @@
 static const struct pqos_cap *m_cap;
 static const struct pqos_cpuinfo *m_cpu;
 static const struct pqos_capability *m_cap_l3ca;
-static unsigned m_sockets[PQOS_MAX_SOCKETS];
+static unsigned *m_sockets;
 static unsigned m_sock_count;
 static struct cat_config m_config[PQOS_MAX_CORES];
 static unsigned m_config_count;
@@ -271,16 +271,16 @@ parse_l3ca(const char *l3ca)
/* scan the separator '@', ','(next) or '\0'(finish) */
l3ca += strcspn(l3ca, "@,");
 
-   if (*l3ca == '@') {
-   /* explicit assign cpu_set */
-   offset = parse_set(l3ca + 1, &cpuset);
-   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
-   goto err;
+   if (*l3ca != '@')
+   goto err;
 
-   end = l3ca + 1 + offset;
-   } else
+   /* explicit assign cpu_set */
+   offset = parse_set(l3ca + 1, &cpuset);
+   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
goto err;
 
+   end = l3ca + 1 + offset;
+
if (*end != ',' && *end != '\0')
goto err;
 
@@ -353,9 +353,6 @@ parse_l3ca(const char *l3ca)
idx++;
} while (*end != '\0' && idx < PQOS_MAX_CORES);
 
-   if (m_config_count == 0)
-   goto err;
-
return 0;
 
 err:
@@ -408,7 +405,7 @@ check_cpus(void)
goto exit;
}
 
-   ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS "
"associated to cpu %u.\n",
@@ -512,7 +509,7 @@ check_and_select_classes(unsigned 
cos_id_map[][PQOS_MAX_SOCKETS])
for (j = 0; j < m_cpu->num_cores; j++) {
cpu_id = m_cpu->cores[j].lcore;
 
-   ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS associated to "
"cpu %u on phy_pkg %u.\n", cpu_id, phy_pkg_id);
@@ -598,10 +595,10 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
l3ca.cdp = m_config[i].cdp;
if (m_config[i].cdp == 1) {
-   l3ca.code_mask = m_config[i].code_mask;
-   l3ca.data_mask = m_config[i].data_mask;
+   l3ca.u.s.code_mask = m_config[i].code_mask;
+   l3ca.u.s.data_mask = m_config[i].data_mask;
} else
-   l3ca.ways_mask = m_config[i].mask;
+   l3ca.u.ways_mask = m_config[i].mask;
 
for (j = 0; j < m_sock_count; j++) {
phy_pkg_id = m_sockets[j];
@@ -637,7 +634,7 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
cos_id = cos_id_map[i][phy_pkg_id];
 
-   ret = pqos_l3ca_assoc_set(cpu_id, cos_id);
+   ret = pqos_alloc_assoc_set(cpu_id, cos_id);
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to associate COS %u to "

[dpdk-dev] [PATCH v2] examples/l2fwd-cat: fix build according to API changes

2017-09-07 Thread Vladimir Kuramshin 
Current version is compatible with PQOS version 1.3
but not compatible with higher versions. This change
makes l2fwd-cat example compatible with versions since 1.4

Signed-off-by: Vladimir Kuramshin 
---
Version 2 changes: fixed checkpatch warnings
"Prefer 'unsigned int *' to bare use of 'unsigned *'"

 examples/l2fwd-cat/Makefile |  5 +---
 examples/l2fwd-cat/cat.c| 60 ++---
 2 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
index ae921ade6..a7fe6d68e 100644
--- a/examples/l2fwd-cat/Makefile
+++ b/examples/l2fwd-cat/Makefile
@@ -40,9 +40,6 @@ endif
 # Default target, can be overridden by command line or environment
 RTE_TARGET ?= x86_64-native-linuxapp-gcc
 
-# Location of PQoS library and includes,
-PQOS_LIBRARY_PATH = $(PQOS_INSTALL_PATH)/libpqos.a
-
 include $(RTE_SDK)/mk/rte.vars.mk
 
 # binary name
@@ -65,6 +62,6 @@ CFLAGS += -I$(PQOS_INSTALL_PATH)/../include
 CFLAGS_cat.o := -D_GNU_SOURCE
 
 LDLIBS += -L$(PQOS_INSTALL_PATH)
-LDLIBS += $(PQOS_LIBRARY_PATH)
+LDLIBS += -lpqos
 
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index 6133bf5bb..6b464bffa 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -53,7 +53,7 @@
 static const struct pqos_cap *m_cap;
 static const struct pqos_cpuinfo *m_cpu;
 static const struct pqos_capability *m_cap_l3ca;
-static unsigned m_sockets[PQOS_MAX_SOCKETS];
+static unsigned int *m_sockets;
 static unsigned m_sock_count;
 static struct cat_config m_config[PQOS_MAX_CORES];
 static unsigned m_config_count;
@@ -271,16 +271,16 @@ parse_l3ca(const char *l3ca)
/* scan the separator '@', ','(next) or '\0'(finish) */
l3ca += strcspn(l3ca, "@,");
 
-   if (*l3ca == '@') {
-   /* explicit assign cpu_set */
-   offset = parse_set(l3ca + 1, &cpuset);
-   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
-   goto err;
+   if (*l3ca != '@')
+   goto err;
 
-   end = l3ca + 1 + offset;
-   } else
+   /* explicit assign cpu_set */
+   offset = parse_set(l3ca + 1, &cpuset);
+   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
goto err;
 
+   end = l3ca + 1 + offset;
+
if (*end != ',' && *end != '\0')
goto err;
 
@@ -353,9 +353,6 @@ parse_l3ca(const char *l3ca)
idx++;
} while (*end != '\0' && idx < PQOS_MAX_CORES);
 
-   if (m_config_count == 0)
-   goto err;
-
return 0;
 
 err:
@@ -408,7 +405,7 @@ check_cpus(void)
goto exit;
}
 
-   ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS "
"associated to cpu %u.\n",
@@ -512,7 +509,7 @@ check_and_select_classes(unsigned 
cos_id_map[][PQOS_MAX_SOCKETS])
for (j = 0; j < m_cpu->num_cores; j++) {
cpu_id = m_cpu->cores[j].lcore;
 
-   ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS associated to "
"cpu %u on phy_pkg %u.\n", cpu_id, phy_pkg_id);
@@ -598,10 +595,10 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
l3ca.cdp = m_config[i].cdp;
if (m_config[i].cdp == 1) {
-   l3ca.code_mask = m_config[i].code_mask;
-   l3ca.data_mask = m_config[i].data_mask;
+   l3ca.u.s.code_mask = m_config[i].code_mask;
+   l3ca.u.s.data_mask = m_config[i].data_mask;
} else
-   l3ca.ways_mask = m_config[i].mask;
+   l3ca.u.ways_mask = m_config[i].mask;
 
for (j = 0; j < m_sock_count; j++) {
phy_pkg_id = m_sockets[j];
@@ -637,7 +634,7 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
cos_id = cos_id_map[i][phy_pkg_id];
 
-   ret = pqos_l3ca_assoc_set(cpu_id, cos_id);
+   ret = pqos_alloc_assoc_set(cpu_id, cos_id);
if (ret != PQOS_RETVAL_OK

Re: [dpdk-dev] [PATCH v2] examples/l2fwd-cat: fix build according to API changes

2017-09-18 Thread Vladimir Kuramshin 
I agree with you but the problem is that in this case I should also 
change Makefile in order to add version checking there also but I don't 
know how to write correct condition in Makefile that checks if it's 
higher or lower version, e.g. if PQOS_VERSION > 1.3 then ... else ...


If there was some spec file I'd add such checking there but I have 
Makefile only.



Regards,
Vladimir Kuramshin

On 18.09.2017 17:49, Bruce Richardson wrote:

On Thu, Sep 07, 2017 at 02:45:27PM +0300, Vladimir Kuramshin wrote:

Current version is compatible with PQOS version 1.3
but not compatible with higher versions. This change
makes l2fwd-cat example compatible with versions since 1.4

Signed-off-by: Vladimir Kuramshin 
---
Version 2 changes: fixed checkpatch warnings
"Prefer 'unsigned int *' to bare use of 'unsigned *'"


I can confirm this at least allows the code to compile with the latest
versions of the pqos library, which is currently broken.

One enhancement might be to put into our code a check for PQOS_VERSION
from pqos.h (which is, interestingly enough, currently at 1.1), to flag
when we have an unsupported version - right now one that is too old.

Otherwise, this is a good fix to have.

Acked-by: Bruce Richardson

[dpdk-dev] [PATCH v3] examples/l2fwd-cat: fix build according to API changes

2017-09-19 Thread Vladimir Kuramshin 
Current version is compatible with PQOS version 1.3
but not compatible with higher versions. This change
makes l2fwd-cat example compatible with versions since 1.4

Signed-off-by: Vladimir Kuramshin 
---
 examples/l2fwd-cat/Makefile |  5 +--
 examples/l2fwd-cat/cat.c| 85 +++--
 2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
index ae921ade6..a7fe6d68e 100644
--- a/examples/l2fwd-cat/Makefile
+++ b/examples/l2fwd-cat/Makefile
@@ -40,9 +40,6 @@ endif
 # Default target, can be overridden by command line or environment
 RTE_TARGET ?= x86_64-native-linuxapp-gcc
 
-# Location of PQoS library and includes,
-PQOS_LIBRARY_PATH = $(PQOS_INSTALL_PATH)/libpqos.a
-
 include $(RTE_SDK)/mk/rte.vars.mk
 
 # binary name
@@ -65,6 +62,6 @@ CFLAGS += -I$(PQOS_INSTALL_PATH)/../include
 CFLAGS_cat.o := -D_GNU_SOURCE
 
 LDLIBS += -L$(PQOS_INSTALL_PATH)
-LDLIBS += $(PQOS_LIBRARY_PATH)
+LDLIBS += -lpqos
 
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index 6133bf5bb..9330b2d26 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -53,7 +53,11 @@
 static const struct pqos_cap *m_cap;
 static const struct pqos_cpuinfo *m_cpu;
 static const struct pqos_capability *m_cap_l3ca;
+#if PQOS_VERSION <= 10300
 static unsigned m_sockets[PQOS_MAX_SOCKETS];
+#else
+static unsigned int *m_sockets;
+#endif
 static unsigned m_sock_count;
 static struct cat_config m_config[PQOS_MAX_CORES];
 static unsigned m_config_count;
@@ -271,16 +275,16 @@ parse_l3ca(const char *l3ca)
/* scan the separator '@', ','(next) or '\0'(finish) */
l3ca += strcspn(l3ca, "@,");
 
-   if (*l3ca == '@') {
-   /* explicit assign cpu_set */
-   offset = parse_set(l3ca + 1, &cpuset);
-   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
-   goto err;
+   if (*l3ca != '@')
+   goto err;
 
-   end = l3ca + 1 + offset;
-   } else
+   /* explicit assign cpu_set */
+   offset = parse_set(l3ca + 1, &cpuset);
+   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
goto err;
 
+   end = l3ca + 1 + offset;
+
if (*end != ',' && *end != '\0')
goto err;
 
@@ -353,9 +357,6 @@ parse_l3ca(const char *l3ca)
idx++;
} while (*end != '\0' && idx < PQOS_MAX_CORES);
 
-   if (m_config_count == 0)
-   goto err;
-
return 0;
 
 err:
@@ -408,7 +409,11 @@ check_cpus(void)
goto exit;
}
 
+#if PQOS_VERSION <= 10300
ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+#else
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
+#endif
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS "
"associated to cpu %u.\n",
@@ -512,7 +517,11 @@ check_and_select_classes(unsigned 
cos_id_map[][PQOS_MAX_SOCKETS])
for (j = 0; j < m_cpu->num_cores; j++) {
cpu_id = m_cpu->cores[j].lcore;
 
+#if PQOS_VERSION <= 10300
ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+#else
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
+#endif
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS associated to "
"cpu %u on phy_pkg %u.\n", cpu_id, phy_pkg_id);
@@ -598,10 +607,19 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
l3ca.cdp = m_config[i].cdp;
if (m_config[i].cdp == 1) {
+#if PQOS_VERSION <= 10300
l3ca.code_mask = m_config[i].code_mask;
l3ca.data_mask = m_config[i].data_mask;
+#else
+   l3ca.u.s.code_mask = m_config[i].code_mask;
+   l3ca.u.s.data_mask = m_config[i].data_mask;
+#endif
} else
+#if PQOS_VERSION <= 10300
l3ca.ways_mask = m_config[i].mask;
+#else
+   l3ca.u.ways_mask = m_config[i].mask;
+#endif
 
for (j = 0; j < m_sock_count; j++) {
phy_pkg_id = m_sockets[j];
@@ -637,7 +655,11 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
cos_id = cos_id_map[i][phy_pkg_id];
 
+#if PQOS_VERSION <= 10300
ret = pqos_l3ca_assoc_set(cpu_id,

Re: [dpdk-dev] [PATCH v3] examples/l2fwd-cat: fix build according to API changes

2017-09-19 Thread Vladimir Kuramshin 

On 19.09.2017 11:56, Bruce Richardson wrote:

On Tue, Sep 19, 2017 at 11:17:31AM +0300, Vladimir Kuramshin wrote:

Current version is compatible with PQOS version 1.3
but not compatible with higher versions. This change
makes l2fwd-cat example compatible with versions since 1.4

Signed-off-by: Vladimir Kuramshin 
---
  examples/l2fwd-cat/Makefile |  5 +--
  examples/l2fwd-cat/cat.c| 85 +++--
  2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
index ae921ade6..a7fe6d68e 100644
--- a/examples/l2fwd-cat/Makefile
+++ b/examples/l2fwd-cat/Makefile
@@ -40,9 +40,6 @@ endif
  # Default target, can be overridden by command line or environment
  RTE_TARGET ?= x86_64-native-linuxapp-gcc
  
-# Location of PQoS library and includes,

-PQOS_LIBRARY_PATH = $(PQOS_INSTALL_PATH)/libpqos.a
-
  include $(RTE_SDK)/mk/rte.vars.mk
  
  # binary name

@@ -65,6 +62,6 @@ CFLAGS += -I$(PQOS_INSTALL_PATH)/../include
  CFLAGS_cat.o := -D_GNU_SOURCE
  
  LDLIBS += -L$(PQOS_INSTALL_PATH)

-LDLIBS += $(PQOS_LIBRARY_PATH)
+LDLIBS += -lpqos
  
  include $(RTE_SDK)/mk/rte.extapp.mk

diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index 6133bf5bb..9330b2d26 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -53,7 +53,11 @@
  static const struct pqos_cap *m_cap;
  static const struct pqos_cpuinfo *m_cpu;
  static const struct pqos_capability *m_cap_l3ca;
+#if PQOS_VERSION <= 10300
  static unsigned m_sockets[PQOS_MAX_SOCKETS];
+#else
+static unsigned int *m_sockets;
+#endif

Does this check work right? The version number in git right now seems to
be just 10100, which would use the "old" path here, despite being latest
code? https://github.com/01org/intel-cmt-cat/blob/master/lib/pqos.h

I will try and follow up with the maintainers of the pqos files, and see
how the version numbers in pqos.h are meant to work.

Regards,
/Bruce

Sorry, added redundant zeros. The correct version number should be 103. 
But there is one pitfall in this commit 
6a6d9ef0cae67efe63a394f09fa587b6fc8b1046 but for other case 103 will work.

[dpdk-dev] [PATCH v4] examples/l2fwd-cat: fix build according to API changes

2017-09-19 Thread Vladimir Kuramshin 
Current version is compatible with PQOS version 1.3
but not compatible with higher versions. This change
makes l2fwd-cat example compatible with versions since 1.4

Signed-off-by: Vladimir Kuramshin 
---
Version 4 changes:
 Fixed version number - 103 instead of 10300

Version 3 changes:
 Keep both API versions under #if .. #else .. #endif macro

 examples/l2fwd-cat/Makefile |  5 +--
 examples/l2fwd-cat/cat.c| 85 +++--
 2 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/examples/l2fwd-cat/Makefile b/examples/l2fwd-cat/Makefile
index ae921ade6..a7fe6d68e 100644
--- a/examples/l2fwd-cat/Makefile
+++ b/examples/l2fwd-cat/Makefile
@@ -40,9 +40,6 @@ endif
 # Default target, can be overridden by command line or environment
 RTE_TARGET ?= x86_64-native-linuxapp-gcc
 
-# Location of PQoS library and includes,
-PQOS_LIBRARY_PATH = $(PQOS_INSTALL_PATH)/libpqos.a
-
 include $(RTE_SDK)/mk/rte.vars.mk
 
 # binary name
@@ -65,6 +62,6 @@ CFLAGS += -I$(PQOS_INSTALL_PATH)/../include
 CFLAGS_cat.o := -D_GNU_SOURCE
 
 LDLIBS += -L$(PQOS_INSTALL_PATH)
-LDLIBS += $(PQOS_LIBRARY_PATH)
+LDLIBS += -lpqos
 
 include $(RTE_SDK)/mk/rte.extapp.mk
diff --git a/examples/l2fwd-cat/cat.c b/examples/l2fwd-cat/cat.c
index 6133bf5bb..689dcb11f 100644
--- a/examples/l2fwd-cat/cat.c
+++ b/examples/l2fwd-cat/cat.c
@@ -53,7 +53,11 @@
 static const struct pqos_cap *m_cap;
 static const struct pqos_cpuinfo *m_cpu;
 static const struct pqos_capability *m_cap_l3ca;
+#if PQOS_VERSION <= 103
 static unsigned m_sockets[PQOS_MAX_SOCKETS];
+#else
+static unsigned int *m_sockets;
+#endif
 static unsigned m_sock_count;
 static struct cat_config m_config[PQOS_MAX_CORES];
 static unsigned m_config_count;
@@ -271,16 +275,16 @@ parse_l3ca(const char *l3ca)
/* scan the separator '@', ','(next) or '\0'(finish) */
l3ca += strcspn(l3ca, "@,");
 
-   if (*l3ca == '@') {
-   /* explicit assign cpu_set */
-   offset = parse_set(l3ca + 1, &cpuset);
-   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
-   goto err;
+   if (*l3ca != '@')
+   goto err;
 
-   end = l3ca + 1 + offset;
-   } else
+   /* explicit assign cpu_set */
+   offset = parse_set(l3ca + 1, &cpuset);
+   if (offset < 0 || CPU_COUNT(&cpuset) == 0)
goto err;
 
+   end = l3ca + 1 + offset;
+
if (*end != ',' && *end != '\0')
goto err;
 
@@ -353,9 +357,6 @@ parse_l3ca(const char *l3ca)
idx++;
} while (*end != '\0' && idx < PQOS_MAX_CORES);
 
-   if (m_config_count == 0)
-   goto err;
-
return 0;
 
 err:
@@ -408,7 +409,11 @@ check_cpus(void)
goto exit;
}
 
+#if PQOS_VERSION <= 103
ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+#else
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
+#endif
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS "
"associated to cpu %u.\n",
@@ -512,7 +517,11 @@ check_and_select_classes(unsigned 
cos_id_map[][PQOS_MAX_SOCKETS])
for (j = 0; j < m_cpu->num_cores; j++) {
cpu_id = m_cpu->cores[j].lcore;
 
+#if PQOS_VERSION <= 103
ret = pqos_l3ca_assoc_get(cpu_id, &cos_id);
+#else
+   ret = pqos_alloc_assoc_get(cpu_id, &cos_id);
+#endif
if (ret != PQOS_RETVAL_OK) {
printf("PQOS: Failed to read COS associated to "
"cpu %u on phy_pkg %u.\n", cpu_id, phy_pkg_id);
@@ -598,10 +607,19 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])
 
l3ca.cdp = m_config[i].cdp;
if (m_config[i].cdp == 1) {
+#if PQOS_VERSION <= 103
l3ca.code_mask = m_config[i].code_mask;
l3ca.data_mask = m_config[i].data_mask;
+#else
+   l3ca.u.s.code_mask = m_config[i].code_mask;
+   l3ca.u.s.data_mask = m_config[i].data_mask;
+#endif
} else
+#if PQOS_VERSION <= 103
l3ca.ways_mask = m_config[i].mask;
+#else
+   l3ca.u.ways_mask = m_config[i].mask;
+#endif
 
for (j = 0; j < m_sock_count; j++) {
phy_pkg_id = m_sockets[j];
@@ -637,7 +655,11 @@ configure_cat(unsigned cos_id_map[][PQOS_MAX_SOCKETS])