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 42797A04B1; Wed, 23 Sep 2020 11:15:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EAB191DBE1; Wed, 23 Sep 2020 11:15:31 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 2A6371DBD2 for ; Wed, 23 Sep 2020 11:15:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600852529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=62Wdi+TOTodVTS/8mUzMjhYJ7yD3VVCz1P/eJJC6fiQ=; b=HrNpk4RyWdykfkavtzpDTKo2qeNp889ApMkbhLtt3N2MCpu67z1sbihmgz6w0YB2xjV1WK t0WsgW0Mt+JxYu7OWehlMcMqLOYNDEX/aOsBm7/uNAFWIURIMH8juW4xJInmP6cZ7egVTc xNTbOtneAFtjt0hn/8lesl4noIqDiRY= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-17-WSyUnDMROdqC5MBXu_e3zQ-1; Wed, 23 Sep 2020 05:15:27 -0400 X-MC-Unique: WSyUnDMROdqC5MBXu_e3zQ-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A412C1017DC5; Wed, 23 Sep 2020 09:15:25 +0000 (UTC) Received: from [10.36.110.9] (unknown [10.36.110.9]) by smtp.corp.redhat.com (Postfix) with ESMTPS id CA8FF19C4F; Wed, 23 Sep 2020 09:15:23 +0000 (UTC) To: Patrick Fu , dev@dpdk.org, chenbo.xia@intel.com Cc: zhihong.wang@intel.com, cheng1.jiang@intel.com References: <20200911015316.1903181-1-patrick.fu@intel.com> <20200911015316.1903181-3-patrick.fu@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <1522ca39-d9d7-72ff-8bb6-a5a29d12314f@redhat.com> Date: Wed, 23 Sep 2020 11:15:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20200911015316.1903181-3-patrick.fu@intel.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v1 2/4] vhost: dynamically alloc async memory 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" s/alloc/allocate/ On 9/11/20 3:53 AM, Patrick Fu wrote: > alloc async internal memory buffer by rte_malloc(), replacing array Allocate async internal memory buffer with rte_malloc() > declaration inside vq structure. Dynamic allocation can help to save > memory footprint when async path is not registered. > > Signed-off-by: Patrick Fu > --- > lib/librte_vhost/vhost.c | 49 ++++++++++++++++++++++++---------------- > lib/librte_vhost/vhost.h | 4 ++-- > 2 files changed, 31 insertions(+), 22 deletions(-) > > diff --git a/lib/librte_vhost/vhost.c b/lib/librte_vhost/vhost.c > index eca507836..ba374da67 100644 > --- a/lib/librte_vhost/vhost.c > +++ b/lib/librte_vhost/vhost.c > @@ -324,6 +324,24 @@ cleanup_device(struct virtio_net *dev, int destroy) > } > } > > +static void > +vhost_free_async_mem(struct vhost_virtqueue *vq) > +{ > + if (vq->async_pkts_pending) > + rte_free(vq->async_pkts_pending); > + if (vq->async_pkts_info) > + rte_free(vq->async_pkts_info); > + if (vq->it_pool) > + rte_free(vq->it_pool); > + if (vq->vec_pool) > + rte_free(vq->vec_pool); > + > + vq->async_pkts_pending = NULL; > + vq->async_pkts_info = NULL; > + vq->it_pool = NULL; > + vq->vec_pool = NULL; > +} > + > void > free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq) > { > @@ -331,10 +349,7 @@ free_vq(struct virtio_net *dev, struct vhost_virtqueue *vq) > rte_free(vq->shadow_used_packed); > else { > rte_free(vq->shadow_used_split); > - if (vq->async_pkts_pending) > - rte_free(vq->async_pkts_pending); > - if (vq->async_pkts_info) > - rte_free(vq->async_pkts_info); > + vhost_free_async_mem(vq); > } > rte_free(vq->batch_copy_elems); > rte_mempool_free(vq->iotlb_pool); > @@ -1576,13 +1591,15 @@ int rte_vhost_async_channel_register(int vid, uint16_t queue_id, > vq->async_pkts_info = rte_malloc(NULL, > vq->size * sizeof(struct async_inflight_info), > RTE_CACHE_LINE_SIZE); > - if (!vq->async_pkts_pending || !vq->async_pkts_info) { > - if (vq->async_pkts_pending) > - rte_free(vq->async_pkts_pending); > - > - if (vq->async_pkts_info) > - rte_free(vq->async_pkts_info); > - > + vq->it_pool = rte_malloc(NULL, > + VHOST_MAX_ASYNC_IT * sizeof(struct rte_vhost_iov_iter), > + RTE_CACHE_LINE_SIZE); > + vq->vec_pool = rte_malloc(NULL, > + VHOST_MAX_ASYNC_VEC * sizeof(struct iovec), > + RTE_CACHE_LINE_SIZE); > + if (!vq->async_pkts_pending || !vq->async_pkts_info || > + !vq->it_pool || !vq->vec_pool) { > + vhost_free_async_mem(vq); > VHOST_LOG_CONFIG(ERR, > "async register failed: cannot allocate memory for vq data " > "(vid %d, qid: %d)\n", vid, queue_id); > @@ -1630,15 +1647,7 @@ int rte_vhost_async_channel_unregister(int vid, uint16_t queue_id) > goto out; > } > > - if (vq->async_pkts_pending) { > - rte_free(vq->async_pkts_pending); > - vq->async_pkts_pending = NULL; > - } > - > - if (vq->async_pkts_info) { > - rte_free(vq->async_pkts_info); > - vq->async_pkts_info = NULL; > - } > + vhost_free_async_mem(vq); > > vq->async_ops.transfer_data = NULL; > vq->async_ops.check_completed_copies = NULL; > diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h > index 28aa77380..0af0ac23d 100644 > --- a/lib/librte_vhost/vhost.h > +++ b/lib/librte_vhost/vhost.h > @@ -218,8 +218,8 @@ struct vhost_virtqueue { > /* operation callbacks for async dma */ > struct rte_vhost_async_channel_ops async_ops; > > - struct rte_vhost_iov_iter it_pool[VHOST_MAX_ASYNC_IT]; > - struct iovec vec_pool[VHOST_MAX_ASYNC_VEC]; > + struct rte_vhost_iov_iter *it_pool; > + struct iovec *vec_pool; > > /* async data transfer status */ > uintptr_t **async_pkts_pending; > I think you should also take care of reallocating on the same numa node the ring is (seel numa_realloc().