From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <hxie5@shecgisg003.sh.intel.com>
Received: from mga09.intel.com (mga09.intel.com [134.134.136.24])
by dpdk.org (Postfix) with ESMTP id 7282EC762
for <dev@dpdk.org>; Thu, 18 Jun 2015 19:00:07 +0200 (CEST)
Received: from orsmga001.jf.intel.com ([10.7.209.18])
by orsmga102.jf.intel.com with ESMTP; 18 Jun 2015 10:00:07 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.13,640,1427785200"; d="scan'208";a="713405160"
Received: from shvmail01.sh.intel.com ([10.239.29.42])
by orsmga001.jf.intel.com with ESMTP; 18 Jun 2015 10:00:06 -0700
Received: from shecgisg003.sh.intel.com (shecgisg003.sh.intel.com
[10.239.29.90])
by shvmail01.sh.intel.com with ESMTP id t5IH04D7014424;
Fri, 19 Jun 2015 01:00:04 +0800
Received: from shecgisg003.sh.intel.com (localhost [127.0.0.1])
by shecgisg003.sh.intel.com (8.13.6/8.13.6/SuSE Linux 0.8) with ESMTP id
t5IH021l023187; Fri, 19 Jun 2015 01:00:04 +0800
Received: (from hxie5@localhost)
by shecgisg003.sh.intel.com (8.13.6/8.13.6/Submit) id t5IH014Y023183;
Fri, 19 Jun 2015 01:00:01 +0800
From: Huawei Xie <huawei.xie@intel.com>
To: dev@dpdk.org
Date: Fri, 19 Jun 2015 00:59:55 +0800
Message-Id: <1434646796-23101-2-git-send-email-huawei.xie@intel.com>
X-Mailer: git-send-email 1.7.4.1
In-Reply-To: <1434646796-23101-1-git-send-email-huawei.xie@intel.com>
References: <1433474005-597-1-git-send-email-huawei.xie@intel.com>
<1434646796-23101-1-git-send-email-huawei.xie@intel.com>
Subject: [dpdk-dev] [PATCH v2 1/2] vhost: use rte_malloc to allocate device
and queues
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Jun 2015 17:00:07 -0000
use rte_malloc to allocate vhost device and queues
Signed-off-by: Huawei Xie <huawei.xie@intel.com>
---
lib/librte_vhost/virtio-net.c | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c
index 4672e67..19b74d6 100644
--- a/lib/librte_vhost/virtio-net.c
+++ b/lib/librte_vhost/virtio-net.c
@@ -45,6 +45,7 @@
#include <rte_log.h>
#include <rte_string_fns.h>
#include <rte_memory.h>
+#include <rte_malloc.h>
#include <rte_virtio_net.h>
#include "vhost-net.h"
@@ -202,9 +203,9 @@ static void
free_device(struct virtio_net_config_ll *ll_dev)
{
/* Free any malloc'd memory */
- free(ll_dev->dev.virtqueue[VIRTIO_RXQ]);
- free(ll_dev->dev.virtqueue[VIRTIO_TXQ]);
- free(ll_dev);
+ rte_free(ll_dev->dev.virtqueue[VIRTIO_RXQ]);
+ rte_free(ll_dev->dev.virtqueue[VIRTIO_TXQ]);
+ rte_free(ll_dev);
}
/*
@@ -278,7 +279,7 @@ new_device(struct vhost_device_ctx ctx)
struct vhost_virtqueue *virtqueue_rx, *virtqueue_tx;
/* Setup device and virtqueues. */
- new_ll_dev = malloc(sizeof(struct virtio_net_config_ll));
+ new_ll_dev = rte_malloc(NULL, sizeof(struct virtio_net_config_ll), 0);
if (new_ll_dev == NULL) {
RTE_LOG(ERR, VHOST_CONFIG,
"(%"PRIu64") Failed to allocate memory for dev.\n",
@@ -286,19 +287,19 @@ new_device(struct vhost_device_ctx ctx)
return -1;
}
- virtqueue_rx = malloc(sizeof(struct vhost_virtqueue));
+ virtqueue_rx = rte_malloc(NULL, sizeof(struct vhost_virtqueue), 0);
if (virtqueue_rx == NULL) {
- free(new_ll_dev);
+ rte_free(new_ll_dev);
RTE_LOG(ERR, VHOST_CONFIG,
"(%"PRIu64") Failed to allocate memory for rxq.\n",
ctx.fh);
return -1;
}
- virtqueue_tx = malloc(sizeof(struct vhost_virtqueue));
+ virtqueue_tx = rte_malloc(NULL, sizeof(struct vhost_virtqueue), 0);
if (virtqueue_tx == NULL) {
- free(virtqueue_rx);
- free(new_ll_dev);
+ rte_free(virtqueue_rx);
+ rte_free(new_ll_dev);
RTE_LOG(ERR, VHOST_CONFIG,
"(%"PRIu64") Failed to allocate memory for txq.\n",
ctx.fh);
--
1.8.1.4