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 2FFFCA3168 for ; Wed, 16 Oct 2019 13:05:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E8B131E8A5; Wed, 16 Oct 2019 13:05:28 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 5DA661E8A0 for ; Wed, 16 Oct 2019 13:05:27 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 97572308FBB4; Wed, 16 Oct 2019 11:05:26 +0000 (UTC) Received: from [10.36.112.44] (ovpn-112-44.ams2.redhat.com [10.36.112.44]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 19A625DA8C; Wed, 16 Oct 2019 11:05:23 +0000 (UTC) To: Marvin Liu , tiwei.bie@intel.com, zhihong.wang@intel.com, stephen@networkplumber.org, gavin.hu@arm.com Cc: dev@dpdk.org References: <20191015143014.1656-1-yong.liu@intel.com> <20191015160739.51940-1-yong.liu@intel.com> <20191015160739.51940-8-yong.liu@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <227d1298-d475-f840-ab35-3873c4e61084@redhat.com> Date: Wed, 16 Oct 2019 13:05:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 MIME-Version: 1.0 In-Reply-To: <20191015160739.51940-8-yong.liu@intel.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Wed, 16 Oct 2019 11:05:26 +0000 (UTC) Subject: Re: [dpdk-dev] [PATCH v6 07/13] vhost: flush enqueue updates by batch 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 10/15/19 6:07 PM, Marvin Liu wrote: > Buffer vhost enqueue shadowed ring flush action buffered number exceed > one batch. Thus virtio can receive packets at a faster frequency. The commit message isn't very clear to me. Could you please improve it? > Signed-off-by: Marvin Liu > > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index 96bf763b1..a60b88d89 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -166,6 +166,8 @@ struct vhost_virtqueue { > struct vring_used_elem_packed *shadow_used_packed; > }; > uint16_t shadow_used_idx; > + /* Record packed ring enqueue latest desc cache aligned index */ > + uint16_t shadow_aligned_idx; > struct vhost_vring_addr ring_addrs; > > struct batch_copy_elem *batch_copy_elems; > diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c > index 274a28f99..020c9b858 100644 > --- a/lib/librte_vhost/virtio_net.c > +++ b/lib/librte_vhost/virtio_net.c > @@ -91,6 +91,69 @@ update_shadow_used_ring_split(struct vhost_virtqueue *vq, > vq->shadow_used_split[i].len = len; > } > > +static __rte_always_inline void > +vhost_flush_enqueue_shadow_packed(struct virtio_net *dev, > + struct vhost_virtqueue *vq) > +{ > + int i; > + uint16_t used_idx = vq->last_used_idx; > + uint16_t head_idx = vq->last_used_idx; > + uint16_t head_flags = 0; > + > + /* Split loop in two to save memory barriers */ > + for (i = 0; i < vq->shadow_used_idx; i++) { > + vq->desc_packed[used_idx].id = vq->shadow_used_packed[i].id; > + vq->desc_packed[used_idx].len = vq->shadow_used_packed[i].len; > + > + used_idx += vq->shadow_used_packed[i].count; > + if (used_idx >= vq->size) > + used_idx -= vq->size; > + } > + > + rte_smp_wmb(); > + > + for (i = 0; i < vq->shadow_used_idx; i++) { > + uint16_t flags; > + > + if (vq->shadow_used_packed[i].len) > + flags = VRING_DESC_F_WRITE; > + else > + flags = 0; > + > + if (vq->used_wrap_counter) { > + flags |= VRING_DESC_F_USED; > + flags |= VRING_DESC_F_AVAIL; > + } else { > + flags &= ~VRING_DESC_F_USED; > + flags &= ~VRING_DESC_F_AVAIL; > + } > + > + if (i > 0) { > + vq->desc_packed[vq->last_used_idx].flags = flags; > + > + vhost_log_cache_used_vring(dev, vq, > + vq->last_used_idx * > + sizeof(struct vring_packed_desc), > + sizeof(struct vring_packed_desc)); > + } else { > + head_idx = vq->last_used_idx; > + head_flags = flags; > + } > + > + vq_inc_last_used_packed(vq, vq->shadow_used_packed[i].count); > + } > + > + vq->desc_packed[head_idx].flags = head_flags; > + > + vhost_log_cache_used_vring(dev, vq, > + head_idx * > + sizeof(struct vring_packed_desc), > + sizeof(struct vring_packed_desc)); > + > + vq->shadow_used_idx = 0; > + vhost_log_cache_sync(dev, vq); > +} > + > static __rte_always_inline void > flush_shadow_used_ring_packed(struct virtio_net *dev, > struct vhost_virtqueue *vq) > @@ -194,6 +257,33 @@ do_data_copy_dequeue(struct vhost_virtqueue *vq) > vq->batch_copy_nb_elems = 0; > } > > +static __rte_always_inline void > +vhost_shadow_enqueue_single_packed(struct virtio_net *dev, > + struct vhost_virtqueue *vq, > + uint32_t len[], > + uint16_t id[], > + uint16_t count[], > + uint16_t num_buffers) > +{ > + uint16_t i; > + for (i = 0; i < num_buffers; i++) { > + /* enqueue shadow flush action aligned with batch num */ > + if (!vq->shadow_used_idx) > + vq->shadow_aligned_idx = vq->last_used_idx & > + PACKED_BATCH_MASK; > + vq->shadow_used_packed[vq->shadow_used_idx].id = id[i]; > + vq->shadow_used_packed[vq->shadow_used_idx].len = len[i]; > + vq->shadow_used_packed[vq->shadow_used_idx].count = count[i]; > + vq->shadow_aligned_idx += count[i]; > + vq->shadow_used_idx++; > + } > + > + if (vq->shadow_aligned_idx >= PACKED_BATCH_SIZE) { > + do_data_copy_enqueue(dev, vq); > + vhost_flush_enqueue_shadow_packed(dev, vq); > + } > +} > + > /* avoid write operation when necessary, to lessen cache issues */ > #define ASSIGN_UNLESS_EQUAL(var, val) do { \ > if ((var) != (val)) \ > @@ -785,6 +875,9 @@ vhost_enqueue_single_packed(struct virtio_net *dev, > uint16_t desc_count; > uint32_t size = pkt->pkt_len + dev->vhost_hlen; > uint16_t num_buffers = 0; > + uint32_t buffer_len[vq->size]; > + uint16_t buffer_buf_id[vq->size]; > + uint16_t buffer_desc_count[vq->size]; With rings up to 1024 elements, maybe it would be better to have that allocated as vq metadata like shadow_used_packed? > > if (rxvq_is_mergeable(dev)) > max_tries = vq->size - 1; > @@ -810,6 +903,9 @@ vhost_enqueue_single_packed(struct virtio_net *dev, > len = RTE_MIN(len, size); > size -= len; > > + buffer_len[num_buffers] = len; > + buffer_buf_id[num_buffers] = buf_id; > + buffer_desc_count[num_buffers] = desc_count; > num_buffers += 1; > > *nr_descs += desc_count; > @@ -821,6 +917,9 @@ vhost_enqueue_single_packed(struct virtio_net *dev, > if (copy_mbuf_to_desc(dev, vq, pkt, buf_vec, nr_vec, num_buffers) < 0) > return -1; > > + vhost_shadow_enqueue_single_packed(dev, vq, buffer_len, buffer_buf_id, > + buffer_desc_count, num_buffers); > + > return 0; > } > > @@ -1017,7 +1116,7 @@ virtio_dev_rx_packed(struct virtio_net *dev, struct vhost_virtqueue *vq, > do_data_copy_enqueue(dev, vq); > > if (likely(vq->shadow_used_idx)) { > - flush_shadow_used_ring_packed(dev, vq); > + vhost_flush_enqueue_shadow_packed(dev, vq); > vhost_vring_call_packed(dev, vq); > } > >