From patchwork Fri Sep 27 12:16:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 60027 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3E2D71BF3F; Fri, 27 Sep 2019 14:16:26 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 7B6C01BF23 for ; Fri, 27 Sep 2019 14:16:15 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Sep 2019 05:16:14 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,555,1559545200"; d="scan'208";a="219753994" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.222.38]) by fmsmga002.fm.intel.com with ESMTP; 27 Sep 2019 05:16:13 -0700 From: David Hunt To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Fri, 27 Sep 2019 13:16:01 +0100 Message-Id: <20190927121601.23661-5-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190927121601.23661-1-david.hunt@intel.com> References: <20190403171601.9788-2-marcinx.hajkowski@intel.com> <20190927121601.23661-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v2 4/4] power: add cmd to query CPU freq X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Marcin Hajkowski Add command and related logic to query CPU frequencies either for specified CPU or all cores. Signed-off-by: Marcin Hajkowski Tested-by: David Hunt Acked-by: Lee Daly --- .../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 cdb241801..0bdb2d0d0 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 @@ -96,12 +96,12 @@ set_policy_defaults(struct channel_packet *pkt) pkt->workload = LOW; pkt->policy_to_use = TIME; pkt->command = PKT_POLICY; - strcpy(pkt->vm_name, "ubuntu2"); + strlcpy(pkt->vm_name, "ubuntu2", sizeof(pkt->vm_name)); } -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; + 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_FREQ; + strlcpy(pkt.vm_name, policy.vm_name, sizeof(pkt.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 |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; @@ -158,9 +277,15 @@ check_response_cmd(unsigned int lcore_id, int *result) 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; @@ -246,7 +371,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; @@ -282,11 +407,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;