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 EBBA6A2EEB for ; Thu, 12 Sep 2019 11:26:57 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9ADA11E882; Thu, 12 Sep 2019 11:26:56 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 91DC01E869 for ; Thu, 12 Sep 2019 11:26:54 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 74EA785A07; Thu, 12 Sep 2019 09:26:53 +0000 (UTC) Received: from [10.36.112.53] (ovpn-112-53.ams2.redhat.com [10.36.112.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5F51F60C57; Thu, 12 Sep 2019 09:26:50 +0000 (UTC) To: JinYu , dev@dpdk.org Cc: changpeng.liu@intel.com, tiwei.bie@intel.com, zhihong.wang@intel.com, Lin Li , Xun Ni , Yu Zhang References: <20190806182500.22320> <20190829141224.49700-1-jin.yu@intel.com> <20190829141224.49700-7-jin.yu@intel.com> From: Maxime Coquelin Openpgp: preference=signencrypt Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: Date: Thu, 12 Sep 2019 11:26:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190829141224.49700-7-jin.yu@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 12 Sep 2019 09:26:53 +0000 (UTC) Subject: Re: [dpdk-dev] [PATCH v6 06/10] vhost: add the APIs to operate inflight ring 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 8/29/19 4:12 PM, JinYu wrote: > This patch introduces three APIs to operate the inflight > ring. Three APIs are set, set last and clear. It includes > split and packed ring. > > Signed-off-by: Lin Li > Signed-off-by: Xun Ni > Signed-off-by: Yu Zhang > Signed-off-by: Jin Yu > --- > lib/librte_vhost/rte_vhost.h | 116 ++++++++++++++++ > lib/librte_vhost/vhost.c | 252 +++++++++++++++++++++++++++++++++++ > 2 files changed, 368 insertions(+) > > diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h > index e090cdfee..d3b6eda21 100644 > --- a/lib/librte_vhost/rte_vhost.h > +++ b/lib/librte_vhost/rte_vhost.h > @@ -693,6 +693,122 @@ int rte_vhost_get_mem_table(int vid, struct rte_vhost_memory **mem); > int rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx, > struct rte_vhost_vring *vring); > > +/** > + * Set split inflight descriptor. > + * > + * This function save descriptors that has been comsumed in available > + * ring > + * > + * @param vid > + * vhost device ID > + * @param vring_idx > + * vring index > + * @param idx > + * inflight entry index > + * @return > + * 0 on success, -1 on failure > + */ > +__rte_experimental > +int > +rte_vhost_set_inflight_desc_split(int vid, uint16_t vring_idx, > + uint16_t idx); > + > +/** > + * Set packed inflight descriptor and get corresponding inflight entry > + * > + * This function save descriptors that has been comsumed > + * > + * @param vid > + * vhost device ID > + * @param vring_idx > + * vring index > + * @param head > + * head of descriptors > + * @param last > + * last of descriptors > + * @param inflight_entry > + * corresponding inflight entry > + * @return > + * 0 on success, -1 on failure > + */ > +__rte_experimental > +int > +rte_vhost_set_inflight_desc_packed(int vid, uint16_t vring_idx, > + uint16_t head, uint16_t last, uint16_t *inflight_entry); > + > +/** > + * Save the head of list that the last batch of used descriptors. > + * > + * @param vid > + * vhost device ID > + * @param vring_idx > + * vring index > + * @param idx > + * descriptor entry index > + * @return > + * 0 on success, -1 on failure > + */ > +__rte_experimental > +int > +rte_vhost_set_last_inflight_io_split(int vid, > + uint16_t vring_idx, uint16_t idx); > + > +/** > + * Update the inflight free_head, used_idx and used_wrap_counter. > + * > + * This function will update status first before updating descriptors > + * to used > + * > + * @param vid > + * vhost device ID > + * @param vring_idx > + * vring index > + * @param head > + * head of descriptors > + * @return > + * 0 on success, -1 on failure > + */ > +__rte_experimental > +int > +rte_vhost_set_last_inflight_io_packed(int vid, > + uint16_t vring_idx, uint16_t head); > + > +/** > + * Clear the split inflight status. > + * > + * @param vid > + * vhost device ID > + * @param vring_idx > + * vring index > + * @param last_used_idx > + * last used idx of used ring > + * @param idx > + * inflight entry index > + * @return > + * 0 on success, -1 on failure > + */ > +__rte_experimental > +int > +rte_vhost_clr_inflight_desc_split(int vid, uint16_t vring_idx, > + uint16_t last_used_idx, uint16_t idx); > + > +/** > + * Clear the packed inflight status. > + * > + * @param vid > + * vhost device ID > + * @param vring_idx > + * vring index > + * @param head > + * inflight entry index > + * @return > + * 0 on success, -1 on failure > + */ > +__rte_experimental > +int > +rte_vhost_clr_inflight_desc_packed(int vid, uint16_t vring_idx, > + uint16_t head); > + > /** > * Notify the guest that used descriptors have been added to the vring. This > * function acts as a memory barrier. > diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c > index 660ac2a07..58940152f 100644 > --- a/lib/librte_vhost/vhost.c > +++ b/lib/librte_vhost/vhost.c > @@ -783,6 +783,258 @@ rte_vhost_get_vhost_vring(int vid, uint16_t vring_idx, > return 0; > } > > +int > +rte_vhost_set_inflight_desc_split(int vid, uint16_t vring_idx, > + uint16_t idx) > +{ > + struct virtio_net *dev; > + struct vhost_virtqueue *vq; > + > + dev = get_device(vid); > + if (unlikely(!dev)) > + return -1; > + > + if (unlikely(!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))) > + return 0; > + > + if (unlikely(vq_is_packed(dev))) > + return -1; > + > + if (unlikely(vring_idx >= VHOST_MAX_VRING)) > + return -1; > + > + vq = dev->virtqueue[vring_idx]; > + if (unlikely(!vq)) > + return -1; > + > + if (unlikely(!vq->inflight_split)) > + return -1; > + > + vq->inflight_split->desc[idx].counter = vq->global_counter++; > + vq->inflight_split->desc[idx].inflight = 1; > + return 0; > +} > + > +int > +rte_vhost_set_inflight_desc_packed(int vid, uint16_t vring_idx, > + uint16_t head, uint16_t last, uint16_t *inflight_entry) > +{ > + struct virtio_net *dev; > + struct vhost_virtqueue *vq; > + struct inflight_info_packed *inflight_info; > + struct vring_packed_desc *desc; > + uint16_t old_free_head, free_head; > + > + dev = get_device(vid); > + if (unlikely(!dev)) > + return -1; > + > + if (unlikely(!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))) > + return 0; > + > + if (unlikely(!vq_is_packed(dev))) > + return -1; > + > + if (unlikely(vring_idx >= VHOST_MAX_VRING)) > + return -1; > + > + vq = dev->virtqueue[vring_idx]; > + if (unlikely(!vq)) > + return -1; > + > + inflight_info = vq->inflight_packed; > + if (unlikely(!inflight_info)) > + return -1; > + > + desc = vq->desc_packed; > + old_free_head = inflight_info->old_free_head; > + free_head = old_free_head; > + > + /* init header descriptor */ > + inflight_info->desc[old_free_head].num = 0; > + inflight_info->desc[old_free_head].counter = vq->global_counter++; > + inflight_info->desc[old_free_head].inflight = 1; I think head has to be validated so that it does not causes out of bounds accesses. > + /* save desc entry in flight entry */ > + while (head != ((last + 1) % vq->size)) { > + inflight_info->desc[old_free_head].num++; > + inflight_info->desc[free_head].addr = desc[head].addr; > + inflight_info->desc[free_head].len = desc[head].len; > + inflight_info->desc[free_head].flags = desc[head].flags; > + inflight_info->desc[free_head].id = desc[head].id; > + > + inflight_info->desc[old_free_head].last = free_head; > + free_head = inflight_info->desc[free_head].next; > + inflight_info->free_head = free_head; > + head = (head + 1) % vq->size; > + } > + > + inflight_info->old_free_head = free_head; > + *inflight_entry = old_free_head; > + > + return 0; > +} > + > +int > +rte_vhost_clr_inflight_desc_split(int vid, uint16_t vring_idx, > + uint16_t last_used_idx, uint16_t idx) > +{ > + struct virtio_net *dev; > + struct vhost_virtqueue *vq; > + > + dev = get_device(vid); > + if (unlikely(!dev)) > + return -1; > + > + if (unlikely(!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))) > + return 0; > + > + if (unlikely(vq_is_packed(dev))) > + return -1; > + > + if (unlikely(vring_idx >= VHOST_MAX_VRING)) > + return -1; > + > + vq = dev->virtqueue[vring_idx]; > + if (unlikely(!vq)) > + return -1; > + > + if (unlikely(!vq->inflight_split)) > + return -1; > + > + rte_compiler_barrier(); > + > + vq->inflight_split->desc[idx].inflight = 0; Maybe it would be better to check idx value, so that it does not causes out-of-bound accesses. > + > + rte_compiler_barrier(); > + > + vq->inflight_split->used_idx = last_used_idx; > + return 0; > +} > + > +int > +rte_vhost_clr_inflight_desc_packed(int vid, uint16_t vring_idx, > + uint16_t head) > +{ > + struct virtio_net *dev; > + struct vhost_virtqueue *vq; > + struct inflight_info_packed *inflight_info; > + > + dev = get_device(vid); > + if (unlikely(!dev)) > + return -1; > + > + if (unlikely(!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))) > + return 0; > + > + if (unlikely(!vq_is_packed(dev))) > + return -1; > + > + if (unlikely(vring_idx >= VHOST_MAX_VRING)) > + return -1; > + > + vq = dev->virtqueue[vring_idx]; > + if (unlikely(!vq)) > + return -1; > + > + inflight_info = vq->inflight_packed; > + if (unlikely(!inflight_info)) > + return -1; > + > + rte_compiler_barrier(); > + > + inflight_info->desc[head].inflight = 0; Maybe it would be better to check head value, so that it does not causes out-of-bound accesses. > + rte_compiler_barrier(); > + > + inflight_info->old_free_head = inflight_info->free_head; > + inflight_info->old_used_idx = inflight_info->used_idx; > + inflight_info->old_used_wrap_counter = inflight_info->used_wrap_counter; > + > + return 0; > +} > + > +int > +rte_vhost_set_last_inflight_io_split(int vid, uint16_t vring_idx, > + uint16_t idx) > +{ > + struct virtio_net *dev; > + struct vhost_virtqueue *vq; > + > + dev = get_device(vid); > + if (unlikely(!dev)) > + return -1; > + > + if (unlikely(!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))) > + return 0; > + > + if (unlikely(vq_is_packed(dev))) > + return -1; > + > + if (unlikely(vring_idx >= VHOST_MAX_VRING)) > + return -1; > + > + vq = dev->virtqueue[vring_idx]; > + if (unlikely(!vq)) > + return -1; > + > + if (unlikely(!vq->inflight_split)) > + return -1; > + > + vq->inflight_split->last_inflight_io = idx; > + return 0; > +} > + > +int > +rte_vhost_set_last_inflight_io_packed(int vid, uint16_t vring_idx, > + uint16_t head) > +{ > + struct virtio_net *dev; > + struct vhost_virtqueue *vq; > + struct inflight_info_packed *inflight_info; > + uint16_t last; > + > + dev = get_device(vid); > + if (unlikely(!dev)) > + return -1; > + > + if (unlikely(!(dev->protocol_features & > + (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD)))) > + return 0; > + > + if (unlikely(!vq_is_packed(dev))) > + return -1; > + > + if (unlikely(vring_idx >= VHOST_MAX_VRING)) > + return -1; > + > + vq = dev->virtqueue[vring_idx]; > + if (unlikely(!vq)) > + return -1; > + > + inflight_info = vq->inflight_packed; > + if (unlikely(!inflight_info)) > + return -1; > + > + last = inflight_info->desc[head].last; Ditto > + inflight_info->desc[last].next = inflight_info->free_head; > + inflight_info->free_head = head; > + inflight_info->used_idx += inflight_info->desc[head].num; > + if (inflight_info->used_idx >= inflight_info->desc_num) { > + inflight_info->used_idx -= inflight_info->desc_num; > + inflight_info->used_wrap_counter = > + !inflight_info->used_wrap_counter; > + } > + > + return 0; > +} > + > int > rte_vhost_vring_call(int vid, uint16_t vring_idx) > { >