From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 798588D8F for ; Tue, 22 Dec 2015 08:27:14 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 21 Dec 2015 23:27:14 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,463,1444719600"; d="scan'208";a="878839800" Received: from yliu-dev.sh.intel.com ([10.239.66.49]) by fmsmga002.fm.intel.com with ESMTP; 21 Dec 2015 23:27:12 -0800 From: Yuanhan Liu To: dev@dpdk.org Date: Tue, 22 Dec 2015 15:28:24 +0800 Message-Id: <1450769304-22986-3-git-send-email-yuanhan.liu@linux.intel.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1450769304-22986-1-git-send-email-yuanhan.liu@linux.intel.com> References: <1450422247-6814-1-git-send-email-yuanhan.liu@linux.intel.com> <1450769304-22986-1-git-send-email-yuanhan.liu@linux.intel.com> Subject: [dpdk-dev] [PATCH v2 3/3] vhost: fix vq realloc at numa_realloc X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Dec 2015 07:27:14 -0000 vq is allocated on pairs, hence we should do pair reallocation at numa_realloc() as well, otherwise an error like following occurs while do numa reallocation: VHOST_CONFIG: reallocate vq from 0 to 1 node PANIC in rte_free(): Fatal error: Invalid memory The reason we don't catch it is because numa_realloc() will not take effect when RTE_LIBRTE_VHOST_NUMA is not enabled, which is the default case. Fixes: e049ca6d10e0 ("vhost-user: prepare multiple queue setup") Signed-off-by: Yuanhan Liu Acked-by: Huawei Xie --- lib/librte_vhost/virtio-net.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/virtio-net.c b/lib/librte_vhost/virtio-net.c index 1566c93..7469312 100644 --- a/lib/librte_vhost/virtio-net.c +++ b/lib/librte_vhost/virtio-net.c @@ -445,6 +445,13 @@ numa_realloc(struct virtio_net *dev, int index) struct vhost_virtqueue *old_vq, *vq; int ret; + /* + * vq is allocated on pairs, we should try to do realloc + * on first queue of one queue pair only. + */ + if (index % VIRTIO_QNUM != 0) + return dev; + old_dev = dev; vq = old_vq = dev->virtqueue[index]; @@ -461,11 +468,12 @@ numa_realloc(struct virtio_net *dev, int index) if (oldnode != newnode) { RTE_LOG(INFO, VHOST_CONFIG, "reallocate vq from %d to %d node\n", oldnode, newnode); - vq = rte_malloc_socket(NULL, sizeof(*vq), 0, newnode); + vq = rte_malloc_socket(NULL, sizeof(*vq) * VIRTIO_QNUM, 0, + newnode); if (!vq) return dev; - memcpy(vq, old_vq, sizeof(*vq)); + memcpy(vq, old_vq, sizeof(*vq) * VIRTIO_QNUM); rte_free(old_vq); } @@ -491,6 +499,7 @@ numa_realloc(struct virtio_net *dev, int index) out: dev->virtqueue[index] = vq; + dev->virtqueue[index + 1] = vq + 1; vhost_devices[dev->device_fh] = dev; return dev; -- 1.9.0