Skip to contentSkip to conversation

Core capabilities query

PATCH In review Hajkowski 4 participants 15 messages May 30, 2019 – Oct 27, 2019

lore
Share & tools
lore

Hajkowski

author
#0 lore raw

cover Core capabilities query

From: Marcin Hajkowski <[email protected]>

Extend guest channel and sample apps to query CPU capabilities.

Please note that these changes depends on
(http://patchwork.dpdk.org/cover/52335/) and
(http://patchwork.dpdk.org/cover/52213/) which should be applied first.

Marcin Hajkowski (3):
power: add new packet type for capabilities examples/power_manager: send cpu capabilities on vm request examples/power_guest: send request for specified core capabilities

 examples/vm_power_manager/channel_monitor.c   |  67 ++++++++++
 .../guest_cli/vm_power_cli_guest.c            | 119 +++++++++++++++++-
 lib/librte_power/channel_commands.h           |  14 +++
 3 files changed, 198 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.2
author
#1 lore raw

PATCH 1/3 power: add new packet type for capabilities

From: Marcin Hajkowski <[email protected]>

Add new packet type and commands for capabilities query.

---
 lib/librte_power/channel_commands.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
lib/librte_power/channel_commands.h +14 -0
index ce587283c..b1f5584a8 100644
@@ -34,6 +34,8 @@ extern "C" {
 /* CPU Power Queries */
 #define CPU_POWER_QUERY_FREQ_LIST  7
 #define CPU_POWER_QUERY_FREQ       8
+#define CPU_POWER_QUERY_CAPS_LIST  9
+#define CPU_POWER_QUERY_CAPS       10
 
 /* --- Outgoing messages --- */
 
@@ -43,6 +45,7 @@ extern "C" {
 
 /* CPU Power Query Responses */
 #define CPU_POWER_FREQ_LIST     3
+#define CPU_POWER_CAPS_LIST     4
 
 #define HOURS 24
 
@@ -106,6 +109,17 @@ struct channel_packet_freq_list {
 	uint8_t num_vcpu;
 };
 
+struct channel_packet_caps_list {
+	uint64_t resource_id; /**< core_num, device */
+	uint32_t unit;        /**< scale down/up/min/max */
+	uint32_t command;     /**< Power, IO, etc */
+	char vm_name[VM_MAX_NAME_SZ];
+
+	uint64_t turbo[MAX_VCPU_PER_VM];
+	uint64_t priority[MAX_VCPU_PER_VM];
+	uint8_t num_vcpu;
+};
+
 
 #ifdef __cplusplus
 }
Signature · 1 line
2.17.2
Acked-by on v1 1/3
#2 lore raw

Re: [dpdk-dev] [PATCH 1/3] power: add new packet type for capabilities

Quoted 59 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Hajkowski
Sent: Thursday, May 30, 2019 5:15 PM
To: Hunt, David <[email protected]>
Cc: [email protected]; Hajkowski, MarcinX <[email protected]>
Subject: [dpdk-dev] [PATCH 1/3] power: add new packet type for capabilities

From: Marcin Hajkowski <[email protected]>

Add new packet type and commands for capabilities query.

---
 lib/librte_power/channel_commands.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
lib/librte_power/channel_commands.h +14 -1
index ce587283c..b1f5584a8 100644
@@ -34,6 +34,8 @@ extern "C" {
 /* CPU Power Queries */
 #define CPU_POWER_QUERY_FREQ_LIST  7
 #define CPU_POWER_QUERY_FREQ       8
+#define CPU_POWER_QUERY_CAPS_LIST  9
+#define CPU_POWER_QUERY_CAPS       10
 
 /* --- Outgoing messages --- */
 
@@ -43,6 +45,7 @@ extern "C" {
 
 /* CPU Power Query Responses */
 #define CPU_POWER_FREQ_LIST     3
+#define CPU_POWER_CAPS_LIST     4
 
 #define HOURS 24
 
@@ -106,6 +109,17 @@ struct channel_packet_freq_list {
 	uint8_t num_vcpu;
 };
 
+struct channel_packet_caps_list {
+	uint64_t resource_id; /**< core_num, device */
+	uint32_t unit;        /**< scale down/up/min/max */
+	uint32_t command;     /**< Power, IO, etc */
+	char vm_name[VM_MAX_NAME_SZ];
+
+	uint64_t turbo[MAX_VCPU_PER_VM];
+	uint64_t priority[MAX_VCPU_PER_VM];
+	uint8_t num_vcpu;
+};
+
 
 #ifdef __cplusplus
 }
--
Quoted 1 line

2.17.2

#3 lore raw

v2 cover Core capabilities query

In reply to Hajkowski

Extend guest channel and sample apps to query CPU capabilities. Useful when a guest wants to see if there is a high frequency/priority core available for heavier workloads, i.e. Intel SST-BF.

The guest_cli implements an example of this via the query_cpu_caps cmd.

Please note that these changes depend on
(http://patches.dpdk.org/project/dpdk/list/?series=6568) and
(http://patches.dpdk.org/project/dpdk/list/?series=6585) which should be applied first.

#4 lore raw

PATCH v2 1/3 power: add new packet type for capabilities

From: Marcin Hajkowski <[email protected]>

Add new packet type and commands for capabilities query.

---
 lib/librte_power/channel_commands.h | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
lib/librte_power/channel_commands.h +14 -0
index e461d9c0d..adc8e5ca2 100644
@@ -31,6 +31,8 @@ extern "C" {
 /* CPU Power Queries */
 #define CPU_POWER_QUERY_FREQ_LIST  7
 #define CPU_POWER_QUERY_FREQ       8
+#define CPU_POWER_QUERY_CAPS_LIST  9
+#define CPU_POWER_QUERY_CAPS       10
 
 /* --- Outgoing messages --- */
 
@@ -40,6 +42,7 @@ extern "C" {
 
 /* CPU Power Query Responses */
 #define CPU_POWER_FREQ_LIST     3
+#define CPU_POWER_CAPS_LIST     4
 
 #define HOURS 24
 
@@ -103,6 +106,17 @@ struct channel_packet_freq_list {
 	uint8_t num_vcpu;
 };
 
+struct channel_packet_caps_list {
+	uint64_t resource_id; /**< core_num, device */
+	uint32_t unit;        /**< scale down/up/min/max */
+	uint32_t command;     /**< Power, IO, etc */
+	char vm_name[VM_MAX_NAME_SZ];
+
+	uint64_t turbo[MAX_VCPU_PER_VM];
+	uint64_t priority[MAX_VCPU_PER_VM];
+	uint8_t num_vcpu;
+};
+
 
 #ifdef __cplusplus
 }
Signature · 1 line
2.17.1
#5 lore raw

PATCH v2 2/3 examples/power_manager: send cpu capabilities on vm request

In reply to David Hunt

From: Marcin Hajkowski <[email protected]>

Send capabilities for requested cores.

---
 examples/vm_power_manager/channel_monitor.c | 67 +++++++++++++++++++++
 1 file changed, 67 insertions(+)
examples/vm_power_manager/channel_monitor.c +67 -0
index 0ae62835f..11b6db1c0 100644
@@ -29,6 +29,7 @@
 #include <rte_cycles.h>
 #include <rte_ethdev.h>
 #include <rte_pmd_i40e.h>
+#include <rte_power.h>
 
 #include <libvirt/libvirt.h>
 #include "channel_monitor.h"
@@ -737,6 +738,60 @@ send_freq(struct channel_packet *pkt,
 			chan_info);
 }
 
+static int
+send_capabilities(struct channel_packet *pkt,
+		struct channel_info *chan_info,
+		bool list_requested)
+{
+	unsigned int vcore_id = pkt->resource_id;
+	struct channel_packet_caps_list channel_pkt_caps_list;
+	struct vm_info info;
+	struct rte_power_core_capabilities caps;
+	int ret;
+
+	if (get_info_vm(pkt->vm_name, &info) != 0)
+		return -1;
+
+	if (!list_requested && vcore_id >= MAX_VCPU_PER_VM)
+		return -1;
+
+	if (!info.allow_query)
+		return -1;
+
+	channel_pkt_caps_list.command = CPU_POWER_CAPS_LIST;
+	channel_pkt_caps_list.num_vcpu = info.num_vcpus;
+
+	if (list_requested) {
+		unsigned int i;
+		for (i = 0; i < info.num_vcpus; i++) {
+			ret = rte_power_get_capabilities(info.pcpu_map[i],
+					&caps);
+			if (ret == 0) {
+				channel_pkt_caps_list.turbo[i] =
+						caps.turbo;
+				channel_pkt_caps_list.priority[i] =
+						caps.priority;
+			} else
+				return -1;
+
+		}
+	} else {
+		ret = rte_power_get_capabilities(info.pcpu_map[vcore_id],
+				&caps);
+		if (ret == 0) {
+			channel_pkt_caps_list.turbo[vcore_id] =
+					caps.turbo;
+			channel_pkt_caps_list.priority[vcore_id] =
+					caps.priority;
+		} else
+			return -1;
+	}
+
+	return write_binary_packet(&channel_pkt_caps_list,
+			sizeof(channel_pkt_caps_list),
+			chan_info);
+}
+
 static int
 send_ack_for_received_cmd(struct channel_packet *pkt,
 		struct channel_info *chan_info,
@@ -845,6 +900,18 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)
 			RTE_LOG(ERR, CHANNEL_MONITOR, "Error during frequency sending.\n");
 	}
 
+	if (pkt->command == CPU_POWER_QUERY_CAPS_LIST ||
+		pkt->command == CPU_POWER_QUERY_CAPS) {
+
+		RTE_LOG(INFO, CHANNEL_MONITOR,
+			"Capabilities for %s requested.\n", pkt->vm_name);
+		int ret = send_capabilities(pkt,
+				chan_info,
+				pkt->command == CPU_POWER_QUERY_CAPS_LIST);
+		if (ret < 0)
+			RTE_LOG(ERR, CHANNEL_MONITOR, "Error during sending capabilities.\n");
+	}
+
 	/*
 	 * Return is not checked as channel status may have been set to DISABLED
 	 * from management thread
Signature · 1 line
2.17.1
#6 lore raw

PATCH v2 3/3 examples/power_guest: send request for specified core capabilities

In reply to David Hunt

From: Marcin Hajkowski <[email protected]>

Send request to power manager for core id provided by user to get related capabilities.

---
 .../guest_cli/vm_power_cli_guest.c            | 119 +++++++++++++++++-
 1 file changed, 117 insertions(+), 2 deletions(-)
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +117 -2
index 0bdb2d0d0..096ecdc04 100644
@@ -132,7 +132,7 @@ struct cmd_freq_list_result {
 };
 
 static int
-query_freq_list(struct channel_packet *pkt, unsigned int lcore_id)
+query_data(struct channel_packet *pkt, unsigned int lcore_id)
 {
 	int ret;
 	ret = rte_power_guest_channel_send_msg(pkt, lcore_id);
@@ -206,7 +206,7 @@ cmd_query_freq_list_parsed(void *parsed_result,
 		pkt.resource_id = lcore_id;
 	}
 
-	ret = query_freq_list(&pkt, lcore_id);
+	ret = query_data(&pkt, lcore_id);
 	if (ret < 0) {
 		cmdline_printf(cl, "Error during sending frequency list query.\n");
 		return;
@@ -248,6 +248,120 @@ cmdline_parse_inst_t cmd_query_freq_list = {
 	},
 };
 
+struct cmd_query_caps_result {
+	cmdline_fixed_string_t query_caps;
+	cmdline_fixed_string_t cpu_num;
+};
+
+static int
+receive_capabilities(struct channel_packet_caps_list *pkt_caps_list,
+		unsigned int lcore_id)
+{
+	int ret;
+
+	ret = rte_power_guest_channel_receive_msg(pkt_caps_list,
+		sizeof(struct channel_packet_caps_list),
+		lcore_id);
+	if (ret < 0) {
+		RTE_LOG(ERR, GUEST_CLI, "Error receiving message.\n");
+		return -1;
+	}
+	if (pkt_caps_list->command != CPU_POWER_CAPS_LIST) {
+		RTE_LOG(ERR, GUEST_CLI, "Unexpected message received.\n");
+		return -1;
+	}
+	return 0;
+}
+
+static void
+cmd_query_caps_list_parsed(void *parsed_result,
+		__rte_unused struct cmdline *cl,
+		__rte_unused void *data)
+{
+	struct cmd_query_caps_result *res = parsed_result;
+	unsigned int lcore_id;
+	struct channel_packet_caps_list pkt_caps_list;
+	struct channel_packet pkt;
+	bool query_list = false;
+	int ret;
+	char *ep;
+
+	memset(&pkt, 0, sizeof(struct channel_packet));
+	memset(&pkt_caps_list, 0, sizeof(struct channel_packet_caps_list));
+
+	if (!strcmp(res->cpu_num, "all")) {
+
+		/* Get first enabled lcore. */
+		lcore_id = rte_get_next_lcore(-1,
+				0,
+				0);
+		if (lcore_id == RTE_MAX_LCORE) {
+			cmdline_printf(cl, "Enabled core not found.\n");
+			return;
+		}
+
+		pkt.command = CPU_POWER_QUERY_CAPS_LIST;
+		strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.vm_name));
+		query_list = true;
+	} else {
+		errno = 0;
+		lcore_id = (unsigned int)strtol(res->cpu_num, &ep, 10);
+		if (errno != 0 || lcore_id >= MAX_VCPU_PER_VM ||
+			ep == res->cpu_num) {
+			cmdline_printf(cl, "Invalid parameter provided.\n");
+			return;
+		}
+		pkt.command = CPU_POWER_QUERY_CAPS;
+		strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.vm_name));
+		pkt.resource_id = lcore_id;
+	}
+
+	ret = query_data(&pkt, lcore_id);
+	if (ret < 0) {
+		cmdline_printf(cl, "Error during sending capabilities query.\n");
+		return;
+	}
+
+	ret = receive_capabilities(&pkt_caps_list, lcore_id);
+	if (ret < 0) {
+		cmdline_printf(cl, "Error during capabilities reception.\n");
+		return;
+	}
+	if (query_list) {
+		unsigned int i;
+		for (i = 0; i < pkt_caps_list.num_vcpu; ++i)
+			cmdline_printf(cl, "Capabilities of [%d] vcore are:"
+					" turbo possibility: %ld, is priority core: %ld.\n",
+					i,
+					pkt_caps_list.turbo[i],
+					pkt_caps_list.priority[i]);
+	} else {
+		cmdline_printf(cl, "Capabilities of [%d] vcore are:"
+				" turbo possibility: %ld, is priority core: %ld.\n",
+				lcore_id,
+				pkt_caps_list.turbo[lcore_id],
+				pkt_caps_list.priority[lcore_id]);
+	}
+}
+
+cmdline_parse_token_string_t cmd_query_caps_token =
+	TOKEN_STRING_INITIALIZER(struct cmd_query_caps_result, query_caps, "query_cpu_caps");
+cmdline_parse_token_string_t cmd_query_caps_cpu_num_token =
+	TOKEN_STRING_INITIALIZER(struct cmd_query_caps_result, cpu_num, NULL);
+
+cmdline_parse_inst_t cmd_query_caps_list = {
+	.f = cmd_query_caps_list_parsed,  /* function to call */
+	.data = NULL,      /* 2nd arg of func */
+	.help_str = "query_cpu_caps <core_num>|all, request"
+				" information regarding virtual core capabilities."
+				" The keyword 'all' will query list of all vcores for the VM",
+	.tokens = {        /* token list, NULL terminated */
+		(void *)&cmd_query_caps_token,
+		(void *)&cmd_query_caps_cpu_num_token,
+		NULL,
+	},
+};
+
 static int
 check_response_cmd(unsigned int lcore_id, int *result)
 {
@@ -408,6 +522,7 @@ cmdline_parse_ctx_t main_ctx[] = {
 		(cmdline_parse_inst_t *)&cmd_send_policy_set,
 		(cmdline_parse_inst_t *)&cmd_set_cpu_freq_set,
 		(cmdline_parse_inst_t *)&cmd_query_freq_list,
+		(cmdline_parse_inst_t *)&cmd_query_caps_list,
 		NULL,
 };
 
Signature · 1 line
2.17.1
Tested-by on v2 3/3
#7 lore raw

Re: [dpdk-dev] [PATCH v2 3/3] examples/power_guest: send request for specified core capabilities

Quoted 5 lines · David Hunt

From: Marcin Hajkowski <[email protected]>

Send request to power manager for core id provided by user to get related capabilities.

Quoted 7 lines
---
  .../guest_cli/vm_power_cli_guest.c            | 119 +++++++++++++++++-
  1 file changed, 117 insertions(+), 2 deletions(-)

--snip--

Some of the steps to test included blow:

In the Host, enable queries via the virtio-serial interface from the guest to the host:

vmpower> set_query ubuntu3 enable

In an SST-BF enabled host, with 6 high priority cores per socket, query the list of high prioroty cores with the sst_bf.py python script
(https://github.com/intel/commspowermanagement):

root@silpixa00399952:~# sst_bf.py -l
1,6,7,8,9,16,21,26,27,28,29,30
0x7c2103c2

In the host, query the cores used by the VM:

vmpower> show_vm ubuntu3
...snip...
Virtual CPU(s): 8
  [0]: Physical CPU 28
  [1]: Physical CPU 29
  [2]: Physical CPU 30
  [3]: Physical CPU 31
  [4]: Physical CPU 32
  [5]: Physical CPU 33
  [6]: Physical CPU 34
  [7]: Physical CPU 35

So we now know that cores 28,29 and 30 should show up as high priority in the VM. So, from the VM side, we use the new 'query_cpu_caps' command to see the capabilities of each core:

vmpower(guest)> query_cpu_caps all
Capabilities of [0] vcore are: turbo possibility: 1, is priority core: 1. Capabilities of [1] vcore are: turbo possibility: 1, is priority core: 1. Capabilities of [2] vcore are: turbo possibility: 1, is priority core: 1. Capabilities of [3] vcore are: turbo possibility: 1, is priority core: 0. Capabilities of [4] vcore are: turbo possibility: 1, is priority core: 0. Capabilities of [5] vcore are: turbo possibility: 1, is priority core: 0. Capabilities of [6] vcore are: turbo possibility: 1, is priority core: 0. Capabilities of [7] vcore are: turbo possibility: 1, is priority core: 0.

As expected, vcore 0,1,2 (pcore 28,29,30) are high priority cores.

#8 lore raw
In reply to David Hunt

30/09/2019 15:00, David Hunt:

Quoted 5 lines

Extend guest channel and sample apps to query CPU capabilities. Useful when a guest wants to see if there is a high frequency/priority core available for heavier workloads, i.e. Intel SST-BF.

The guest_cli implements an example of this via the query_cpu_caps cmd.

Applied, thanks

author
#9 lore raw

PATCH 2/3 examples/power_manager: send cpu capabilities on vm request

In reply to Hajkowski

From: Marcin Hajkowski <[email protected]>

Send capabilities for requested cores.

---
 examples/vm_power_manager/channel_monitor.c | 67 +++++++++++++++++++++
 1 file changed, 67 insertions(+)
examples/vm_power_manager/channel_monitor.c +67 -0
index bfd9cc38d..731b3b480 100644
@@ -29,6 +29,7 @@
 #include <rte_cycles.h>
 #include <rte_ethdev.h>
 #include <rte_pmd_i40e.h>
+#include <rte_power.h>
 
 #include <libvirt/libvirt.h>
 #include "channel_monitor.h"
@@ -704,6 +705,60 @@ send_freq(struct channel_packet *pkt,
 			chan_info);
 }
 
+static int
+send_capabilities(struct channel_packet *pkt,
+		struct channel_info *chan_info,
+		bool list_requested)
+{
+	unsigned int vcore_id = pkt->resource_id;
+	struct channel_packet_caps_list channel_pkt_caps_list;
+	struct vm_info info;
+	struct rte_power_core_capabilities caps;
+	int ret;
+
+	if (get_info_vm(pkt->vm_name, &info) != 0)
+		return -1;
+
+	if (!list_requested && vcore_id >= MAX_VCPU_PER_VM)
+		return -1;
+
+	if (!info.allow_query)
+		return -1;
+
+	channel_pkt_caps_list.command = CPU_POWER_CAPS_LIST;
+	channel_pkt_caps_list.num_vcpu = info.num_vcpus;
+
+	if (list_requested) {
+		unsigned int i;
+		for (i = 0; i < info.num_vcpus; i++) {
+			ret = rte_power_get_capabilities(info.pcpu_map[i],
+					&caps);
+			if (ret == 0) {
+				channel_pkt_caps_list.turbo[i] =
+						caps.turbo;
+				channel_pkt_caps_list.priority[i] =
+						caps.priority;
+			} else
+				return -1;
+
+		}
+	} else {
+		ret = rte_power_get_capabilities(info.pcpu_map[vcore_id],
+				&caps);
+		if (ret == 0) {
+			channel_pkt_caps_list.turbo[vcore_id] =
+					caps.turbo;
+			channel_pkt_caps_list.priority[vcore_id] =
+					caps.priority;
+		} else
+			return -1;
+	}
+
+	return write_binary_packet(&channel_pkt_caps_list,
+			sizeof(channel_pkt_caps_list),
+			chan_info);
+}
+
 static int
 send_ack_for_received_cmd(struct channel_packet *pkt,
 		struct channel_info *chan_info,
@@ -812,6 +867,18 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info)
 			RTE_LOG(ERR, CHANNEL_MONITOR, "Error during frequency sending.\n");
 	}
 
+	if (pkt->command == CPU_POWER_QUERY_CAPS_LIST ||
+		pkt->command == CPU_POWER_QUERY_CAPS) {
+
+		RTE_LOG(INFO, CHANNEL_MONITOR,
+			"Capabilities for %s requested.\n", pkt->vm_name);
+		int ret = send_capabilities(pkt,
+				chan_info,
+				pkt->command == CPU_POWER_QUERY_CAPS_LIST);
+		if (ret < 0)
+			RTE_LOG(ERR, CHANNEL_MONITOR, "Error during sending capabilities.\n");
+	}
+
 	/*
 	 * Return is not checked as channel status may have been set to DISABLED
 	 * from management thread
Signature · 1 line
2.17.2
Acked-by on v1 2/3
#10 lore raw

Re: [dpdk-dev] [PATCH 2/3] examples/power_manager: send cpu capabilities on vm request

examples/vm_power_manager/channel_monitor.c

Quoted 25 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Hajkowski
Sent: Thursday, May 30, 2019 5:15 PM
To: Hunt, David <[email protected]>
Cc: [email protected]; Hajkowski, MarcinX <[email protected]>
Subject: [dpdk-dev] [PATCH 2/3] examples/power_manager: send cpu capabilities on vm request

From: Marcin Hajkowski <[email protected]>

Send capabilities for requested cores.

---
 examples/vm_power_manager/channel_monitor.c | 67
+++++++++++++++++++++
 1 file changed, 67 insertions(+)
examples/vm_power_manager/channel_monitor.c +0 -0
index bfd9cc38d..731b3b480 100644
author
#11 lore raw

PATCH 3/3 examples/power_guest: send request for specified core capabilities

In reply to Hajkowski

From: Marcin Hajkowski <[email protected]>

Send request to power manager for core id provided by user to get related capabilities.

---
 .../guest_cli/vm_power_cli_guest.c            | 119 +++++++++++++++++-
 1 file changed, 117 insertions(+), 2 deletions(-)
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +117 -2
index 848230248..de85c1406 100644
@@ -132,7 +132,7 @@ struct cmd_freq_list_result {
 };
 
 static int
-query_freq_list(struct channel_packet *pkt, unsigned int lcore_id)
+query_data(struct channel_packet *pkt, unsigned int lcore_id)
 {
 	int ret;
 	ret = rte_power_guest_channel_send_msg(pkt, lcore_id);
@@ -206,7 +206,7 @@ cmd_query_freq_list_parsed(void *parsed_result,
 		pkt.resource_id = lcore_id;
 	}
 
-	ret = query_freq_list(&pkt, lcore_id);
+	ret = query_data(&pkt, lcore_id);
 	if (ret < 0) {
 		cmdline_printf(cl, "Error during sending frequency list query.\n");
 		return;
@@ -248,6 +248,120 @@ cmdline_parse_inst_t cmd_query_freq_list = {
 	},
 };
 
+struct cmd_query_caps_result {
+	cmdline_fixed_string_t query_caps;
+	cmdline_fixed_string_t cpu_num;
+};
+
+static int
+receive_capabilities(struct channel_packet_caps_list *pkt_caps_list,
+		unsigned int lcore_id)
+{
+	int ret;
+
+	ret = rte_power_guest_channel_receive_msg(pkt_caps_list,
+		sizeof(struct channel_packet_caps_list),
+		lcore_id);
+	if (ret < 0) {
+		RTE_LOG(ERR, GUEST_CLI, "Error receiving message.\n");
+		return -1;
+	}
+	if (pkt_caps_list->command != CPU_POWER_CAPS_LIST) {
+		RTE_LOG(ERR, GUEST_CLI, "Unexpected message received.\n");
+		return -1;
+	}
+	return 0;
+}
+
+static void
+cmd_query_caps_list_parsed(void *parsed_result,
+		__rte_unused struct cmdline *cl,
+		__rte_unused void *data)
+{
+	struct cmd_query_caps_result *res = parsed_result;
+	unsigned int lcore_id;
+	struct channel_packet_caps_list pkt_caps_list;
+	struct channel_packet pkt;
+	bool query_list = false;
+	int ret;
+	char *ep;
+
+	memset(&pkt, 0, sizeof(struct channel_packet));
+	memset(&pkt_caps_list, 0, sizeof(struct channel_packet_caps_list));
+
+	if (!strcmp(res->cpu_num, "all")) {
+
+		/* Get first enabled lcore. */
+		lcore_id = rte_get_next_lcore(-1,
+				0,
+				0);
+		if (lcore_id == RTE_MAX_LCORE) {
+			cmdline_printf(cl, "Enabled core not found.\n");
+			return;
+		}
+
+		pkt.command = CPU_POWER_QUERY_CAPS_LIST;
+		strcpy(pkt.vm_name, policy.vm_name);
+		query_list = true;
+	} else {
+		errno = 0;
+		lcore_id = (unsigned int)strtol(res->cpu_num, &ep, 10);
+		if (errno != 0 || lcore_id >= MAX_VCPU_PER_VM ||
+			ep == res->cpu_num) {
+			cmdline_printf(cl, "Invalid parameter provided.\n");
+			return;
+		}
+		pkt.command = CPU_POWER_QUERY_CAPS;
+		strcpy(pkt.vm_name, policy.vm_name);
+		pkt.resource_id = lcore_id;
+	}
+
+	ret = query_data(&pkt, lcore_id);
+	if (ret < 0) {
+		cmdline_printf(cl, "Error during sending capabilities query.\n");
+		return;
+	}
+
+	ret = receive_capabilities(&pkt_caps_list, lcore_id);
+	if (ret < 0) {
+		cmdline_printf(cl, "Error during capabilities reception.\n");
+		return;
+	}
+	if (query_list) {
+		unsigned int i;
+		for (i = 0; i < pkt_caps_list.num_vcpu; ++i)
+			cmdline_printf(cl, "Capabilities of [%d] vcore are:"
+					" turbo possibility: %ld, is priority core: %ld.\n",
+					i,
+					pkt_caps_list.turbo[i],
+					pkt_caps_list.priority[i]);
+	} else {
+		cmdline_printf(cl, "Capabilities of [%d] vcore are:"
+				" turbo possibility: %ld, is priority core: %ld.\n",
+				lcore_id,
+				pkt_caps_list.turbo[lcore_id],
+				pkt_caps_list.priority[lcore_id]);
+	}
+}
+
+cmdline_parse_token_string_t cmd_query_caps_token =
+	TOKEN_STRING_INITIALIZER(struct cmd_query_caps_result, query_caps, "query_cpu_caps");
+cmdline_parse_token_string_t cmd_query_caps_cpu_num_token =
+	TOKEN_STRING_INITIALIZER(struct cmd_query_caps_result, cpu_num, NULL);
+
+cmdline_parse_inst_t cmd_query_caps_list = {
+	.f = cmd_query_caps_list_parsed,  /* function to call */
+	.data = NULL,      /* 2nd arg of func */
+	.help_str = "query_cpu_caps <core_num>|all, request"
+				" information regarding virtual core capabilities."
+				" The keyword 'all' will query list of all vcores for the VM",
+	.tokens = {        /* token list, NULL terminated */
+		(void *)&cmd_query_caps_token,
+		(void *)&cmd_query_caps_cpu_num_token,
+		NULL,
+	},
+};
+
 static int
 check_response_cmd(unsigned int lcore_id, int *result)
 {
@@ -407,6 +521,7 @@ cmdline_parse_ctx_t main_ctx[] = {
 		(cmdline_parse_inst_t *)&cmd_send_policy_set,
 		(cmdline_parse_inst_t *)&cmd_set_cpu_freq_set,
 		(cmdline_parse_inst_t *)&cmd_query_freq_list,
+		(cmdline_parse_inst_t *)&cmd_query_caps_list,
 		NULL,
 };
 
Signature · 1 line
2.17.2
#12 lore raw

Re: [dpdk-dev] [PATCH 3/3] examples/power_guest: send request for specified core capabilities

Hi dave,
See comments below.

examples/vm_power_manager/guest_cli/vm_power_cli_guest.c

Quoted 23 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Hajkowski
Sent: Thursday, May 30, 2019 5:15 PM
To: Hunt, David <[email protected]>
Cc: [email protected]; Hajkowski, MarcinX <[email protected]>
Subject: [dpdk-dev] [PATCH 3/3] examples/power_guest: send request for specified core capabilities

From: Marcin Hajkowski <[email protected]>

Send request to power manager for core id provided by user to get related capabilities.

---
 .../guest_cli/vm_power_cli_guest.c            | 119 +++++++++++++++++-
 1 file changed, 117 insertions(+), 2 deletions(-)
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +0 -0
index 848230248..de85c1406 100644

));

Quoted 4 lines
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +4 -0
+
+	if (!strcmp(res->cpu_num, "all")) {
+
+		/* Get first enabled lcore. */

examples/vm_power_manager/guest_cli/vm_power_cli_guest.c cmdline_parse_inst_t cmd_query_freq_list = { · line 304

Quoted 10 lines
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +10 -0
+		lcore_id = rte_get_next_lcore(-1,
+				0,
+				0);
+		if (lcore_id == RTE_MAX_LCORE) {
+			cmdline_printf(cl, "Enabled core not found.\n");
+			return;
+		}
+
+		pkt.command = CPU_POWER_QUERY_CAPS_LIST;
+		strcpy(pkt.vm_name, policy.vm_name);

2 uses of strcpy in this patch, could this be changed to strlcpy(). /Lee.

Acked-by on v1 3/3
#13 lore raw

Re: [dpdk-dev] [PATCH 3/3] examples/power_guest: send request for specified core capabilities

In reply to Hajkowski
Quoted 38 lines

-----Original Message-----
From: Daly, Lee
Sent: Monday, September 30, 2019 11:55 AM
To: 'Hajkowski' <[email protected]>; Hunt, David <[email protected]>
Cc: [email protected]; Hajkowski, MarcinX <[email protected]>
Subject: RE: [dpdk-dev] [PATCH 3/3] examples/power_guest: send request for specified core capabilities

Hi dave,
See comments below.

Quoted 13 lines

-----Original Message-----
From: dev [mailto:[email protected]] On Behalf Of Hajkowski
Sent: Thursday, May 30, 2019 5:15 PM
To: Hunt, David <[email protected]>
Cc: [email protected]; Hajkowski, MarcinX <[email protected]>
Subject: [dpdk-dev] [PATCH 3/3] examples/power_guest: send request for specified core capabilities

From: Marcin Hajkowski <[email protected]>

Send request to power manager for core id provided by user to get related capabilities.

Quoted 6 lines
---
 .../guest_cli/vm_power_cli_guest.c            | 119 +++++++++++++++++-
 1 file changed, 117 insertions(+), 2 deletions(-)

diff --git

a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c

examples/vm_power_manager/guest_cli/vm_power_cli_guest.c

Quoted 4 lines

b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c index 848230248..de85c1406 100644

examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +0 -0

));

Quoted 16 lines
Quoted 4 lines
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +4 -0
+
+	if (!strcmp(res->cpu_num, "all")) {
+
+		/* Get first enabled lcore. */

examples/vm_power_manager/guest_cli/vm_power_cli_guest.c cmdline_parse_inst_t cmd_query_freq_list = { · line 304

Quoted 10 lines
examples/vm_power_manager/guest_cli/vm_power_cli_guest.c +10 -0
+		lcore_id = rte_get_next_lcore(-1,
+				0,
+				0);
+		if (lcore_id == RTE_MAX_LCORE) {
+			cmdline_printf(cl, "Enabled core not found.\n");
+			return;
+		}
+
+		pkt.command = CPU_POWER_QUERY_CAPS_LIST;
+		strcpy(pkt.vm_name, policy.vm_name);

2 uses of strcpy in this patch, could this be changed to strlcpy(). /Lee.

Feel free to add my ack after that small change.

#14 lore raw
In reply to Hajkowski

30/05/2019 18:15, Hajkowski:

Quoted 8 lines

Please note that these changes depends on
(http://patchwork.dpdk.org/cover/52335/) and
(http://patchwork.dpdk.org/cover/52213/) which should be applied first.

Marcin Hajkowski (3):
power: add new packet type for capabilities examples/power_manager: send cpu capabilities on vm request examples/power_guest: send request for specified core capabilities

As other series for lib power, there was no review.