From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id BE049A0613 for ; Thu, 26 Sep 2019 15:00:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 804F737A2; Thu, 26 Sep 2019 15:00:30 +0200 (CEST) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id 1CAED34F3 for ; Thu, 26 Sep 2019 15:00:28 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 26 Sep 2019 06:00:28 -0700 X-IronPort-AV: E=Sophos;i="5.64,552,1559545200"; d="scan'208";a="194119577" Received: from dhunt5-mobl4.ger.corp.intel.com (HELO [10.237.221.113]) ([10.237.221.113]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/AES256-SHA; 26 Sep 2019 06:00:27 -0700 To: 20190402082121.5472-1-marcinx.hajkowski@intel.com Cc: dev@dpdk.org, Marcin Hajkowski References: <20190405132455.15468-1-marcinx.hajkowski@intel.com> <20190405132455.15468-3-marcinx.hajkowski@intel.com> From: "Hunt, David" Message-ID: <29cd9e80-a972-43a9-4277-1d34617d9f2a@intel.com> Date: Thu, 26 Sep 2019 14:00:12 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <20190405132455.15468-3-marcinx.hajkowski@intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Subject: Re: [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 List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 05/04/2019 14:24, Hajkowski wrote: > 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; > }; I tested this with the later patches in the set, and the acknowledges successfully get back to the guest from the host in the form of an Ack or Nack for various commands sent from the guest. Tested-by: David Hunt