From: Hajkowski <marcinx.hajkowski@intel.com>
To: david.hunt@intel.com
Cc: dev@dpdk.org, Marcin Hajkowski <marcinx.hajkowski@intel.com>
Subject: [dpdk-dev] [PATCH 4/4] power: add cmd to query CPU freq.
Date: Wed, 3 Apr 2019 19:16:00 +0200 [thread overview]
Message-ID: <20190403171601.9788-5-marcinx.hajkowski@intel.com> (raw)
Message-ID: <20190403171600.kw78z13PlepYgXUzsTq8dvZCtwJMup96jJG0NwN08qA@z> (raw)
In-Reply-To: <20190403171601.9788-1-marcinx.hajkowski@intel.com>
From: Marcin Hajkowski <marcinx.hajkowski@intel.com>
Add command and related logic to query CPU frequencies
either for specified CPU or all cores.
Signed-off-by: Marcin Hajkowski <marcinx.hajkowski@intel.com>
---
.../guest_cli/vm_power_cli_guest.c | 150 ++++++++++++++++--
1 file changed, 138 insertions(+), 12 deletions(-)
diff --git a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
index af49dfef8..d1b4ac2aa 100644
--- a/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
+++ b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c
@@ -99,9 +99,9 @@ set_policy_defaults(struct channel_packet *pkt)
strcpy(pkt->vm_name, "ubuntu2");
}
-static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result,
- __attribute__((unused)) struct cmdline *cl,
- __attribute__((unused)) void *data)
+static void cmd_quit_parsed(__rte_unused void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
{
unsigned lcore_id;
@@ -126,10 +126,126 @@ cmdline_parse_inst_t cmd_quit = {
/* *** VM operations *** */
-struct cmd_set_cpu_freq_result {
- cmdline_fixed_string_t set_cpu_freq;
- uint8_t lcore_id;
- cmdline_fixed_string_t cmd;
+struct cmd_freq_list_result {
+ cmdline_fixed_string_t query_freq;
+ cmdline_fixed_string_t cpu_num;
+};
+
+static int
+query_freq_list(struct channel_packet *pkt, unsigned int lcore_id)
+{
+ int ret;
+ ret = rte_power_guest_channel_send_msg(pkt, lcore_id);
+ if (ret < 0) {
+ RTE_LOG(ERR, GUEST_CLI, "Error sending message.\n");
+ return -1;
+ }
+ return 0;
+}
+
+static int
+receive_freq_list(struct channel_packet_freq_list *pkt_freq_list,
+ unsigned int lcore_id)
+{
+ int ret;
+
+ ret = rte_power_guest_channel_receive_msg(pkt_freq_list,
+ sizeof(struct channel_packet_freq_list),
+ lcore_id);
+ if (ret < 0) {
+ RTE_LOG(ERR, GUEST_CLI, "Error receiving message.\n");
+ return -1;
+ }
+ if (pkt_freq_list->command != CPU_POWER_FREQ_LIST) {
+ RTE_LOG(ERR, GUEST_CLI, "Unexpected message received.\n");
+ return -1;
+ }
+ return 0;
+}
+
+static void
+cmd_query_freq_list_parsed(void *parsed_result,
+ __rte_unused struct cmdline *cl,
+ __rte_unused void *data)
+{
+ struct cmd_freq_list_result *res = parsed_result;
+ unsigned int lcore_id;
+ struct channel_packet_freq_list pkt_freq_list;
+ struct channel_packet pkt;
+ bool query_list = false;
+ int ret;
+ char *ep;
+
+ memset(&pkt, 0, sizeof(struct channel_packet));
+ memset(&pkt_freq_list, 0, sizeof(struct channel_packet_freq_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_FREQ_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_FREQ;
+ strcpy(pkt.vm_name, policy.vm_name);
+ pkt.resource_id = lcore_id;
+ }
+
+ ret = query_freq_list(&pkt, lcore_id);
+ if (ret < 0) {
+ cmdline_printf(cl, "Error during sending frequency list query.\n");
+ return;
+ }
+
+ ret = receive_freq_list(&pkt_freq_list, lcore_id);
+ if (ret < 0) {
+ cmdline_printf(cl, "Error during frequency list reception.\n");
+ return;
+ }
+ if (query_list) {
+ unsigned int i;
+ for (i = 0; i < pkt_freq_list.num_vcpu; ++i)
+ cmdline_printf(cl, "Frequency of [%d] vcore is %d.\n",
+ i,
+ pkt_freq_list.freq_list[i]);
+ } else {
+ cmdline_printf(cl, "Frequency of [%d] vcore is %d.\n",
+ lcore_id,
+ pkt_freq_list.freq_list[lcore_id]);
+ }
+}
+
+cmdline_parse_token_string_t cmd_query_freq_token =
+ TOKEN_STRING_INITIALIZER(struct cmd_freq_list_result, query_freq, "query_cpu_freq");
+cmdline_parse_token_string_t cmd_query_freq_cpu_num_token =
+ TOKEN_STRING_INITIALIZER(struct cmd_freq_list_result, cpu_num, NULL);
+
+cmdline_parse_inst_t cmd_query_freq_list = {
+ .f = cmd_query_freq_list_parsed, /* function to call */
+ .data = NULL, /* 2nd arg of func */
+ .help_str = "query_cpu_freq <core_num>|all, request"
+ " information regarding virtual core frequencies."
+ " The keyword 'all' will query list of all vcores for the VM",
+ .tokens = { /* token list, NULL terminated */
+ (void *)&cmd_query_freq_token,
+ (void *)&cmd_query_freq_cpu_num_token,
+ NULL,
+ },
};
static int
@@ -138,7 +254,10 @@ check_response_cmd(unsigned int lcore_id, int *result)
struct channel_packet pkt;
int ret;
- ret = rte_power_guest_channel_receive_msg(&pkt, lcore_id);
+ ret = rte_power_guest_channel_receive_msg(&pkt,
+ sizeof(pkt),
+ lcore_id);
+
if (ret < 0)
return -1;
@@ -150,16 +269,22 @@ check_response_cmd(unsigned int lcore_id, int *result)
*result = 0;
break;
default:
- RTE_LOG(DEBUG, GUEST_CLI, "Not expected command has been received.\n");
+ RTE_LOG(ERR, GUEST_CLI, "Not expected command has been received.\n");
return -1;
}
return 0;
}
+struct cmd_set_cpu_freq_result {
+ cmdline_fixed_string_t set_cpu_freq;
+ uint8_t lcore_id;
+ cmdline_fixed_string_t cmd;
+};
+
static void
cmd_set_cpu_freq_parsed(void *parsed_result, struct cmdline *cl,
- __attribute__((unused)) void *data)
+ __rte_unused void *data)
{
int ret = -1;
struct cmd_set_cpu_freq_result *res = parsed_result;
@@ -245,7 +370,7 @@ send_policy(struct channel_packet *pkt, struct cmdline *cl)
static void
cmd_send_policy_parsed(void *parsed_result, struct cmdline *cl,
- __attribute__((unused)) void *data)
+ __rte_unused void *data)
{
int ret = -1;
struct cmd_send_policy_result *res = parsed_result;
@@ -281,11 +406,12 @@ cmdline_parse_ctx_t main_ctx[] = {
(cmdline_parse_inst_t *)&cmd_quit,
(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,
NULL,
};
void
-run_cli(__attribute__((unused)) void *arg)
+run_cli(__rte_unused void *arg)
{
struct cmdline *cl;
--
2.17.2
next prev parent reply other threads:[~2019-04-03 17:18 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-03 17:15 [dpdk-dev] [PATCH 0/4] Frequency list query Hajkowski
2019-04-03 17:15 ` Hajkowski
2019-04-03 17:15 ` [dpdk-dev] [PATCH 1/4] power: extend guest channel for query freq Hajkowski
2019-04-03 17:15 ` Hajkowski
2019-09-27 12:15 ` [dpdk-dev] [PATCH v2 0/4] frequency list query from guest David Hunt
2019-09-27 12:15 ` [dpdk-dev] [PATCH v2 1/4] power: extend guest channel for query freq David Hunt
2019-09-30 9:54 ` Hunt, David
2019-09-27 12:15 ` [dpdk-dev] [PATCH v2 2/4] power: process cpu freq query David Hunt
2019-09-27 12:16 ` [dpdk-dev] [PATCH v2 3/4] power: add mechanism to disable queries David Hunt
2019-09-27 12:16 ` [dpdk-dev] [PATCH v2 4/4] power: add cmd to query CPU freq David Hunt
2019-09-27 12:38 ` Hunt, David
2019-10-27 19:59 ` [dpdk-dev] [PATCH v2 0/4] frequency list query from guest Thomas Monjalon
2019-04-03 17:15 ` [dpdk-dev] [PATCH 2/4] power: process cpu freq. query Hajkowski
2019-04-03 17:15 ` Hajkowski
2019-04-03 17:15 ` [dpdk-dev] [PATCH 3/4] power: add mechanism to disable queries Hajkowski
2019-04-03 17:15 ` Hajkowski
2019-04-03 17:16 ` Hajkowski [this message]
2019-04-03 17:16 ` [dpdk-dev] [PATCH 4/4] power: add cmd to query CPU freq Hajkowski
2019-09-27 9:52 ` Daly, Lee
2019-09-27 10:19 ` Ferruh Yigit
2019-09-27 10:40 ` Hunt, David
2019-07-04 19:57 ` [dpdk-dev] [PATCH 0/4] Frequency list query Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190403171601.9788-5-marcinx.hajkowski@intel.com \
--to=marcinx.hajkowski@intel.com \
--cc=david.hunt@intel.com \
--cc=dev@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).