From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 2D5C61B4ED for ; Wed, 3 Apr 2019 19:16:22 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2019 10:16:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,305,1549958400"; d="scan'208";a="161086727" Received: from mhajkowx-mobl.ger.corp.intel.com ([10.104.116.180]) by fmsmga001.fm.intel.com with ESMTP; 03 Apr 2019 10:16:20 -0700 From: Hajkowski To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Wed, 3 Apr 2019 19:15:58 +0200 Message-Id: <20190403171601.9788-3-marcinx.hajkowski@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190403171601.9788-1-marcinx.hajkowski@intel.com> References: <20190403171601.9788-1-marcinx.hajkowski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/4] power: process cpu freq. query 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: , X-List-Received-Date: Wed, 03 Apr 2019 17:16:23 -0000 From: Marcin Hajkowski On query received from VM guest send CPUs frequencies. Signed-off-by: Marcin Hajkowski --- examples/vm_power_manager/channel_monitor.c | 67 ++++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index ed580b36a..69934d4e6 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -628,10 +628,14 @@ apply_policy(struct policy *pol) } static int -write_binary_packet(struct channel_packet *pkt, struct channel_info *chan_info) +write_binary_packet(void *buffer, + size_t buffer_len, + struct channel_info *chan_info) { - int ret, buffer_len = sizeof(*pkt); - void *buffer = pkt; + int ret; + + if (buffer_len == 0 || buffer == NULL) + return -1; if (chan_info->fd < 0) { RTE_LOG(ERR, CHANNEL_MONITOR, "Channel is not connected\n"); @@ -653,13 +657,48 @@ write_binary_packet(struct channel_packet *pkt, struct channel_info *chan_info) return 0; } +static int +send_freq(struct channel_packet *pkt, + struct channel_info *chan_info, + bool freq_list) +{ + unsigned int vcore_id = pkt->resource_id; + struct channel_packet_freq_list channel_pkt_freq_list; + struct vm_info info; + + if (get_info_vm(pkt->vm_name, &info) != 0) + return -1; + + if (!freq_list && vcore_id >= MAX_VCPU_PER_VM) + return -1; + + channel_pkt_freq_list.command = CPU_POWER_FREQ_LIST; + channel_pkt_freq_list.num_vcpu = info.num_vcpus; + + if (freq_list) { + unsigned int i; + for (i = 0; i < info.num_vcpus; i++) + channel_pkt_freq_list.freq_list[i] = + power_manager_get_current_frequency(info.pcpu_map[i]); + } else { + channel_pkt_freq_list.freq_list[vcore_id] = + power_manager_get_current_frequency(info.pcpu_map[vcore_id]); + } + + return write_binary_packet(&channel_pkt_freq_list, + sizeof(channel_pkt_freq_list), + chan_info); +} + static int send_ack_for_received_cmd(struct channel_packet *pkt, struct channel_info *chan_info, uint32_t command) { pkt->command = command; - return write_binary_packet(pkt, chan_info); + return write_binary_packet(pkt, + sizeof(struct channel_packet), + chan_info); } static int @@ -685,8 +724,8 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) RTE_LOG(DEBUG, CHANNEL_MONITOR, "Processing requested cmd for cpu:%d\n", core_num); - bool valid_unit = true; int scale_res; + bool valid_unit = true; switch (pkt->unit) { case(CPU_POWER_SCALE_MIN): @@ -719,9 +758,9 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) CPU_POWER_CMD_ACK : CPU_POWER_CMD_NACK); if (ret < 0) - RTE_LOG(DEBUG, CHANNEL_MONITOR, "Error during sending ack command.\n"); + RTE_LOG(ERR, CHANNEL_MONITOR, "Error during sending ack command.\n"); } else - RTE_LOG(DEBUG, CHANNEL_MONITOR, "Unexpected unit type.\n"); + RTE_LOG(ERR, CHANNEL_MONITOR, "Unexpected unit type.\n"); } @@ -732,7 +771,7 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) chan_info, CPU_POWER_CMD_ACK); if (ret < 0) - RTE_LOG(DEBUG, CHANNEL_MONITOR, "Error during sending ack command.\n"); + RTE_LOG(ERR, CHANNEL_MONITOR, "Error during sending ack command.\n"); update_policy(pkt); policy_is_set = 1; } @@ -747,6 +786,18 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) "Policy %s does not exist\n", pkt->vm_name); } + if (pkt->command == CPU_POWER_QUERY_FREQ_LIST || + pkt->command == CPU_POWER_QUERY_FREQ) { + + RTE_LOG(INFO, CHANNEL_MONITOR, + "Frequency for %s requested.\n", pkt->vm_name); + int ret = send_freq(pkt, + chan_info, + pkt->command == CPU_POWER_QUERY_FREQ_LIST); + if (ret < 0) + RTE_LOG(ERR, CHANNEL_MONITOR, "Error during frequency sending.\n"); + } + /* * Return is not checked as channel status may have been set to DISABLED * from management thread -- 2.17.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 22E2AA0679 for ; Wed, 3 Apr 2019 19:17:27 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CB9221B54D; Wed, 3 Apr 2019 19:16:41 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 2D5C61B4ED for ; Wed, 3 Apr 2019 19:16:22 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 Apr 2019 10:16:21 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,305,1549958400"; d="scan'208";a="161086727" Received: from mhajkowx-mobl.ger.corp.intel.com ([10.104.116.180]) by fmsmga001.fm.intel.com with ESMTP; 03 Apr 2019 10:16:20 -0700 From: Hajkowski To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Wed, 3 Apr 2019 19:15:58 +0200 Message-Id: <20190403171601.9788-3-marcinx.hajkowski@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190403171601.9788-1-marcinx.hajkowski@intel.com> References: <20190403171601.9788-1-marcinx.hajkowski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 2/4] power: process cpu freq. query 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" Content-Type: text/plain; charset="UTF-8" Message-ID: <20190403171558.Flxu-tDAxjibHhOhAZJ6xuprnG0umOPXYhux3CgVLgI@z> From: Marcin Hajkowski On query received from VM guest send CPUs frequencies. Signed-off-by: Marcin Hajkowski --- examples/vm_power_manager/channel_monitor.c | 67 ++++++++++++++++++--- 1 file changed, 59 insertions(+), 8 deletions(-) diff --git a/examples/vm_power_manager/channel_monitor.c b/examples/vm_power_manager/channel_monitor.c index ed580b36a..69934d4e6 100644 --- a/examples/vm_power_manager/channel_monitor.c +++ b/examples/vm_power_manager/channel_monitor.c @@ -628,10 +628,14 @@ apply_policy(struct policy *pol) } static int -write_binary_packet(struct channel_packet *pkt, struct channel_info *chan_info) +write_binary_packet(void *buffer, + size_t buffer_len, + struct channel_info *chan_info) { - int ret, buffer_len = sizeof(*pkt); - void *buffer = pkt; + int ret; + + if (buffer_len == 0 || buffer == NULL) + return -1; if (chan_info->fd < 0) { RTE_LOG(ERR, CHANNEL_MONITOR, "Channel is not connected\n"); @@ -653,13 +657,48 @@ write_binary_packet(struct channel_packet *pkt, struct channel_info *chan_info) return 0; } +static int +send_freq(struct channel_packet *pkt, + struct channel_info *chan_info, + bool freq_list) +{ + unsigned int vcore_id = pkt->resource_id; + struct channel_packet_freq_list channel_pkt_freq_list; + struct vm_info info; + + if (get_info_vm(pkt->vm_name, &info) != 0) + return -1; + + if (!freq_list && vcore_id >= MAX_VCPU_PER_VM) + return -1; + + channel_pkt_freq_list.command = CPU_POWER_FREQ_LIST; + channel_pkt_freq_list.num_vcpu = info.num_vcpus; + + if (freq_list) { + unsigned int i; + for (i = 0; i < info.num_vcpus; i++) + channel_pkt_freq_list.freq_list[i] = + power_manager_get_current_frequency(info.pcpu_map[i]); + } else { + channel_pkt_freq_list.freq_list[vcore_id] = + power_manager_get_current_frequency(info.pcpu_map[vcore_id]); + } + + return write_binary_packet(&channel_pkt_freq_list, + sizeof(channel_pkt_freq_list), + chan_info); +} + static int send_ack_for_received_cmd(struct channel_packet *pkt, struct channel_info *chan_info, uint32_t command) { pkt->command = command; - return write_binary_packet(pkt, chan_info); + return write_binary_packet(pkt, + sizeof(struct channel_packet), + chan_info); } static int @@ -685,8 +724,8 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) RTE_LOG(DEBUG, CHANNEL_MONITOR, "Processing requested cmd for cpu:%d\n", core_num); - bool valid_unit = true; int scale_res; + bool valid_unit = true; switch (pkt->unit) { case(CPU_POWER_SCALE_MIN): @@ -719,9 +758,9 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) CPU_POWER_CMD_ACK : CPU_POWER_CMD_NACK); if (ret < 0) - RTE_LOG(DEBUG, CHANNEL_MONITOR, "Error during sending ack command.\n"); + RTE_LOG(ERR, CHANNEL_MONITOR, "Error during sending ack command.\n"); } else - RTE_LOG(DEBUG, CHANNEL_MONITOR, "Unexpected unit type.\n"); + RTE_LOG(ERR, CHANNEL_MONITOR, "Unexpected unit type.\n"); } @@ -732,7 +771,7 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) chan_info, CPU_POWER_CMD_ACK); if (ret < 0) - RTE_LOG(DEBUG, CHANNEL_MONITOR, "Error during sending ack command.\n"); + RTE_LOG(ERR, CHANNEL_MONITOR, "Error during sending ack command.\n"); update_policy(pkt); policy_is_set = 1; } @@ -747,6 +786,18 @@ process_request(struct channel_packet *pkt, struct channel_info *chan_info) "Policy %s does not exist\n", pkt->vm_name); } + if (pkt->command == CPU_POWER_QUERY_FREQ_LIST || + pkt->command == CPU_POWER_QUERY_FREQ) { + + RTE_LOG(INFO, CHANNEL_MONITOR, + "Frequency for %s requested.\n", pkt->vm_name); + int ret = send_freq(pkt, + chan_info, + pkt->command == CPU_POWER_QUERY_FREQ_LIST); + if (ret < 0) + RTE_LOG(ERR, CHANNEL_MONITOR, "Error during frequency sending.\n"); + } + /* * Return is not checked as channel status may have been set to DISABLED * from management thread -- 2.17.2