From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 642B61B4C8 for ; Fri, 5 Apr 2019 15:28:16 +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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2019 06:28:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,312,1549958400"; d="scan'208";a="158546461" Received: from mhajkowx-mobl.ger.corp.intel.com ([10.104.116.181]) by fmsmga002.fm.intel.com with ESMTP; 05 Apr 2019 06:28:15 -0700 From: Hajkowski To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Fri, 5 Apr 2019 15:24:53 +0200 Message-Id: <20190405132455.15468-3-marcinx.hajkowski@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190405132455.15468-1-marcinx.hajkowski@intel.com> References: <20190405132455.15468-1-marcinx.hajkowski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 2/4] power: extend guest channel API for reading X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: 20190402082121.5472-1-marcinx.hajkowski@intel.com List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Apr 2019 13:28:17 -0000 From: Marcin Hajkowski Added new experimental API rte_power_guest_channel_receive_msg which gives possibility to receive messages send to guest. Signed-off-by: Marcin Hajkowski --- lib/librte_power/channel_commands.h | 5 +++ lib/librte_power/guest_channel.c | 60 ++++++++++++++++++++++++++ lib/librte_power/guest_channel.h | 35 +++++++++++++++ lib/librte_power/rte_power_version.map | 1 + 4 files changed, 101 insertions(+) diff --git a/lib/librte_power/channel_commands.h b/lib/librte_power/channel_commands.h index e7b93a797..33fd53a6d 100644 --- a/lib/librte_power/channel_commands.h +++ b/lib/librte_power/channel_commands.h @@ -28,6 +28,11 @@ extern "C" { #define CPU_POWER_SCALE_MIN 4 #define CPU_POWER_ENABLE_TURBO 5 #define CPU_POWER_DISABLE_TURBO 6 + +/* Generic Power Command Response */ +#define CPU_POWER_CMD_ACK 1 +#define CPU_POWER_CMD_NACK 2 + #define HOURS 24 #define MAX_VFS 10 diff --git a/lib/librte_power/guest_channel.c b/lib/librte_power/guest_channel.c index 9cf7d2cb2..888423891 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -19,6 +20,9 @@ #define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1 +/* Timeout for incoming message in milliseconds. */ +#define TIMEOUT 10 + static int global_fds[RTE_MAX_LCORE] = { [0 ... RTE_MAX_LCORE-1] = -1 }; int @@ -125,6 +129,62 @@ int rte_power_guest_channel_send_msg(struct channel_packet *pkt, return guest_channel_send_msg(pkt, lcore_id); } +int power_guest_channel_read_msg(struct channel_packet *pkt, + unsigned int lcore_id) +{ + int ret; + struct pollfd fds; + void *buffer = pkt; + int buffer_len = sizeof(*pkt); + + fds.fd = global_fds[lcore_id]; + fds.events = POLLIN; + + ret = poll(&fds, 1, TIMEOUT); + if (ret == 0) { + RTE_LOG(DEBUG, GUEST_CHANNEL, "Timeout occurred during poll function.\n"); + return -1; + } else if (ret < 0) { + RTE_LOG(ERR, GUEST_CHANNEL, "Error occurred during poll function: %s\n", + strerror(ret)); + return -1; + } + + if (lcore_id >= RTE_MAX_LCORE) { + RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range 0...%d\n", + lcore_id, RTE_MAX_LCORE-1); + return -1; + } + + if (global_fds[lcore_id] < 0) { + RTE_LOG(ERR, GUEST_CHANNEL, "Channel is not connected\n"); + return -1; + } + + while (buffer_len > 0) { + ret = read(global_fds[lcore_id], + buffer, buffer_len); + if (ret < 0) { + if (errno == EINTR) + continue; + return -1; + } + if (ret == 0) { + RTE_LOG(ERR, GUEST_CHANNEL, "Expected more data, but connection has been closed.\n"); + return -1; + } + buffer = (char *)buffer + ret; + buffer_len -= ret; + } + + return 0; +} + +int rte_power_guest_channel_receive_msg(struct channel_packet *pkt, + unsigned int lcore_id) +{ + return power_guest_channel_read_msg(pkt, lcore_id); +} void guest_channel_host_disconnect(unsigned int lcore_id) diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/guest_channel.h index 373d39898..7c385df39 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -68,6 +68,41 @@ int guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id); int rte_power_guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id); +/** + * Read a message contained in pkt over the Virtio-Serial + * from the host endpoint. + * + * @param pkt + * Pointer to a populated struct channel_packet + * + * @param lcore_id + * lcore_id. + * + * @return + * - 0 on success. + * - Negative on error. + */ +int power_guest_channel_read_msg(struct channel_packet *pkt, + unsigned int lcore_id); + +/** + * Receive a message contained in pkt over the Virtio-Serial + * from the host endpoint. + * + * @param pkt + * Pointer to a populated struct channel_packet + * + * @param lcore_id + * lcore_id. + * + * @return + * - 0 on success. + * - Negative on error. + */ +int __rte_experimental +rte_power_guest_channel_receive_msg(struct channel_packet *pkt, + unsigned int lcore_id); + #ifdef __cplusplus } #endif diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map index 042917360..69f5ea3f4 100644 --- a/lib/librte_power/rte_power_version.map +++ b/lib/librte_power/rte_power_version.map @@ -44,4 +44,5 @@ EXPERIMENTAL { rte_power_empty_poll_stat_update; rte_power_poll_stat_fetch; rte_power_poll_stat_update; + rte_power_guest_channel_receive_msg; }; -- 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 62B76A0679 for ; Fri, 5 Apr 2019 15:28:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 125C71B4F7; Fri, 5 Apr 2019 15:28:25 +0200 (CEST) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by dpdk.org (Postfix) with ESMTP id 642B61B4C8 for ; Fri, 5 Apr 2019 15:28:16 +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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 05 Apr 2019 06:28:15 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,312,1549958400"; d="scan'208";a="158546461" Received: from mhajkowx-mobl.ger.corp.intel.com ([10.104.116.181]) by fmsmga002.fm.intel.com with ESMTP; 05 Apr 2019 06:28:15 -0700 From: Hajkowski To: david.hunt@intel.com Cc: dev@dpdk.org, Marcin Hajkowski Date: Fri, 5 Apr 2019 15:24:53 +0200 Message-Id: <20190405132455.15468-3-marcinx.hajkowski@intel.com> X-Mailer: git-send-email 2.20.1.windows.1 In-Reply-To: <20190405132455.15468-1-marcinx.hajkowski@intel.com> References: <20190405132455.15468-1-marcinx.hajkowski@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 2/4] power: extend guest channel API for reading X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: 20190402082121.5472-1-marcinx.hajkowski@intel.com 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: <20190405132453.raukMZw8R1ECmqTLVTKQ2V_BA-z8Lp-hO013KzrOz-w@z> From: Marcin Hajkowski Added new experimental API rte_power_guest_channel_receive_msg which gives possibility to receive messages send to guest. Signed-off-by: Marcin Hajkowski --- lib/librte_power/channel_commands.h | 5 +++ lib/librte_power/guest_channel.c | 60 ++++++++++++++++++++++++++ lib/librte_power/guest_channel.h | 35 +++++++++++++++ lib/librte_power/rte_power_version.map | 1 + 4 files changed, 101 insertions(+) diff --git a/lib/librte_power/channel_commands.h b/lib/librte_power/channel_commands.h index e7b93a797..33fd53a6d 100644 --- a/lib/librte_power/channel_commands.h +++ b/lib/librte_power/channel_commands.h @@ -28,6 +28,11 @@ extern "C" { #define CPU_POWER_SCALE_MIN 4 #define CPU_POWER_ENABLE_TURBO 5 #define CPU_POWER_DISABLE_TURBO 6 + +/* Generic Power Command Response */ +#define CPU_POWER_CMD_ACK 1 +#define CPU_POWER_CMD_NACK 2 + #define HOURS 24 #define MAX_VFS 10 diff --git a/lib/librte_power/guest_channel.c b/lib/librte_power/guest_channel.c index 9cf7d2cb2..888423891 100644 --- a/lib/librte_power/guest_channel.c +++ b/lib/librte_power/guest_channel.c @@ -10,6 +10,7 @@ #include #include #include +#include #include @@ -19,6 +20,9 @@ #define RTE_LOGTYPE_GUEST_CHANNEL RTE_LOGTYPE_USER1 +/* Timeout for incoming message in milliseconds. */ +#define TIMEOUT 10 + static int global_fds[RTE_MAX_LCORE] = { [0 ... RTE_MAX_LCORE-1] = -1 }; int @@ -125,6 +129,62 @@ int rte_power_guest_channel_send_msg(struct channel_packet *pkt, return guest_channel_send_msg(pkt, lcore_id); } +int power_guest_channel_read_msg(struct channel_packet *pkt, + unsigned int lcore_id) +{ + int ret; + struct pollfd fds; + void *buffer = pkt; + int buffer_len = sizeof(*pkt); + + fds.fd = global_fds[lcore_id]; + fds.events = POLLIN; + + ret = poll(&fds, 1, TIMEOUT); + if (ret == 0) { + RTE_LOG(DEBUG, GUEST_CHANNEL, "Timeout occurred during poll function.\n"); + return -1; + } else if (ret < 0) { + RTE_LOG(ERR, GUEST_CHANNEL, "Error occurred during poll function: %s\n", + strerror(ret)); + return -1; + } + + if (lcore_id >= RTE_MAX_LCORE) { + RTE_LOG(ERR, GUEST_CHANNEL, "Channel(%u) is out of range 0...%d\n", + lcore_id, RTE_MAX_LCORE-1); + return -1; + } + + if (global_fds[lcore_id] < 0) { + RTE_LOG(ERR, GUEST_CHANNEL, "Channel is not connected\n"); + return -1; + } + + while (buffer_len > 0) { + ret = read(global_fds[lcore_id], + buffer, buffer_len); + if (ret < 0) { + if (errno == EINTR) + continue; + return -1; + } + if (ret == 0) { + RTE_LOG(ERR, GUEST_CHANNEL, "Expected more data, but connection has been closed.\n"); + return -1; + } + buffer = (char *)buffer + ret; + buffer_len -= ret; + } + + return 0; +} + +int rte_power_guest_channel_receive_msg(struct channel_packet *pkt, + unsigned int lcore_id) +{ + return power_guest_channel_read_msg(pkt, lcore_id); +} void guest_channel_host_disconnect(unsigned int lcore_id) diff --git a/lib/librte_power/guest_channel.h b/lib/librte_power/guest_channel.h index 373d39898..7c385df39 100644 --- a/lib/librte_power/guest_channel.h +++ b/lib/librte_power/guest_channel.h @@ -68,6 +68,41 @@ int guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id); int rte_power_guest_channel_send_msg(struct channel_packet *pkt, unsigned int lcore_id); +/** + * Read a message contained in pkt over the Virtio-Serial + * from the host endpoint. + * + * @param pkt + * Pointer to a populated struct channel_packet + * + * @param lcore_id + * lcore_id. + * + * @return + * - 0 on success. + * - Negative on error. + */ +int power_guest_channel_read_msg(struct channel_packet *pkt, + unsigned int lcore_id); + +/** + * Receive a message contained in pkt over the Virtio-Serial + * from the host endpoint. + * + * @param pkt + * Pointer to a populated struct channel_packet + * + * @param lcore_id + * lcore_id. + * + * @return + * - 0 on success. + * - Negative on error. + */ +int __rte_experimental +rte_power_guest_channel_receive_msg(struct channel_packet *pkt, + unsigned int lcore_id); + #ifdef __cplusplus } #endif diff --git a/lib/librte_power/rte_power_version.map b/lib/librte_power/rte_power_version.map index 042917360..69f5ea3f4 100644 --- a/lib/librte_power/rte_power_version.map +++ b/lib/librte_power/rte_power_version.map @@ -44,4 +44,5 @@ EXPERIMENTAL { rte_power_empty_poll_stat_update; rte_power_poll_stat_fetch; rte_power_poll_stat_update; + rte_power_guest_channel_receive_msg; }; -- 2.17.2