From patchwork Mon Sep 30 13:00:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 60184 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 3DC7B4C8E; Mon, 30 Sep 2019 15:01:00 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 49FFA37A2 for ; Mon, 30 Sep 2019 15:00:57 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Sep 2019 06:00:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,567,1559545200"; d="scan'208";a="220644311" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.222.38]) by fmsmga002.fm.intel.com with ESMTP; 30 Sep 2019 06:00:55 -0700 From: David Hunt To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Mon, 30 Sep 2019 14:00:41 +0100 Message-Id: <20190930130043.2885-2-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190930130043.2885-1-david.hunt@intel.com> References: <20190530161517.11916-2-marcinx.hajkowski@intel.com> <20190930130043.2885-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v2 1/3] power: add new packet type for capabilities 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 new packet type and commands for capabilities query. Signed-off-by: Marcin Hajkowski Tested-by: David Hunt Acked-by: Lee Daly --- lib/librte_power/channel_commands.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/librte_power/channel_commands.h b/lib/librte_power/channel_commands.h index e461d9c0d..adc8e5ca2 100644 --- a/lib/librte_power/channel_commands.h +++ b/lib/librte_power/channel_commands.h @@ -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 } From patchwork Mon Sep 30 13:00:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 60185 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 D682B5B32; Mon, 30 Sep 2019 15:01:02 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id E289344C3 for ; Mon, 30 Sep 2019 15:00:57 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Sep 2019 06:00:57 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,567,1559545200"; d="scan'208";a="220644320" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.222.38]) by fmsmga002.fm.intel.com with ESMTP; 30 Sep 2019 06:00:56 -0700 From: David Hunt To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Mon, 30 Sep 2019 14:00:42 +0100 Message-Id: <20190930130043.2885-3-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190930130043.2885-1-david.hunt@intel.com> References: <20190530161517.11916-2-marcinx.hajkowski@intel.com> <20190930130043.2885-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v2 2/3] examples/power_manager: send cpu capabilities on vm request 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 Send capabilities for requested cores. Signed-off-by: Marcin Hajkowski Tested-by: David Hunt Acked-by: Lee Daly --- examples/vm_power_manager/channel_monitor.c | 67 +++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index 0ae62835f..11b6db1c0 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #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 From patchwork Mon Sep 30 13:00:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Hunt, David" X-Patchwork-Id: 60186 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 159B458C4; Mon, 30 Sep 2019 15:01:06 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by dpdk.org (Postfix) with ESMTP id 1A1F944C3 for ; Mon, 30 Sep 2019 15:00:58 +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 orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 30 Sep 2019 06:00:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,567,1559545200"; d="scan'208";a="220644330" Received: from silpixa00399952.ir.intel.com (HELO silpixa00399952.ger.corp.intel.com) ([10.237.222.38]) by fmsmga002.fm.intel.com with ESMTP; 30 Sep 2019 06:00:57 -0700 From: David Hunt To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Mon, 30 Sep 2019 14:00:43 +0100 Message-Id: <20190930130043.2885-4-david.hunt@intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190930130043.2885-1-david.hunt@intel.com> References: <20190530161517.11916-2-marcinx.hajkowski@intel.com> <20190930130043.2885-1-david.hunt@intel.com> Subject: [dpdk-dev] [PATCH v2 3/3] examples/power_guest: send request for specified core capabilities 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 Send request to power manager for core id provided by user to get related capabilities. Signed-off-by: Marcin Hajkowski Tested-by: David Hunt Acked-by: Lee Daly Tested-by: David Hunt --- .../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 b/examples/vm_power_manager/guest_cli/vm_power_cli_guest.c index 0bdb2d0d0..096ecdc04 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 @@ -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 |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, };