From patchwork Tue Apr 5 16:09:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Loftus, Ciara" X-Patchwork-Id: 11945 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 17BC5293B; Tue, 5 Apr 2016 18:09:58 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id BDA0C293B for ; Tue, 5 Apr 2016 18:09:56 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 05 Apr 2016 09:09:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.24,444,1455004800"; d="scan'208";a="925951659" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga001.jf.intel.com with ESMTP; 05 Apr 2016 09:09:50 -0700 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u35G9mCr006847; Tue, 5 Apr 2016 17:09:48 +0100 Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u35G9mHr012036; Tue, 5 Apr 2016 17:09:48 +0100 Received: (from cloftus@localhost) by sivswdev01.ir.intel.com with id u35G9lo2012032; Tue, 5 Apr 2016 17:09:47 +0100 From: Ciara Loftus To: dev@dpdk.org Cc: mukawa@igel.co.jp Date: Tue, 5 Apr 2016 17:09:47 +0100 Message-Id: <1459872587-11655-1-git-send-email-ciara.loftus@intel.com> X-Mailer: git-send-email 1.7.4.1 Subject: [dpdk-dev] [PATCH] vhost: Fix retrieval of numa information in PMD 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" After some testing, it was found that retrieving numa information about a vhost device via a call to get_mempolicy is more accurate when performed during the new_device callback versus the vring_state_changed callback, in particular upon initial boot of the VM. Performing this check during new_device is also potentially more efficient as this callback is only triggered once during device initialisation, compared with vring_state_changed which may be called multiple times depending on the number of queues assigned to the device. Reorganise the code to perform this check and assign the correct socket_id to the device during the new_device callback. Signed-off-by: Ciara Loftus Acked-by: Yuanhan Liu --- drivers/net/vhost/rte_eth_vhost.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/net/vhost/rte_eth_vhost.c b/drivers/net/vhost/rte_eth_vhost.c index 4cc6bec..b1eb082 100644 --- a/drivers/net/vhost/rte_eth_vhost.c +++ b/drivers/net/vhost/rte_eth_vhost.c @@ -229,6 +229,9 @@ new_device(struct virtio_net *dev) struct pmd_internal *internal; struct vhost_queue *vq; unsigned i; +#ifdef RTE_LIBRTE_VHOST_NUMA + int newnode, ret; +#endif if (dev == NULL) { RTE_LOG(INFO, PMD, "Invalid argument\n"); @@ -244,6 +247,17 @@ new_device(struct virtio_net *dev) eth_dev = list->eth_dev; internal = eth_dev->data->dev_private; +#ifdef RTE_LIBRTE_VHOST_NUMA + ret = get_mempolicy(&newnode, NULL, 0, dev, + MPOL_F_NODE | MPOL_F_ADDR); + if (ret < 0) { + RTE_LOG(ERR, PMD, "Unknown numa node\n"); + return -1; + } + + eth_dev->data->numa_node = newnode; +#endif + for (i = 0; i < eth_dev->data->nb_rx_queues; i++) { vq = eth_dev->data->rx_queues[i]; if (vq == NULL) @@ -352,9 +366,6 @@ vring_state_changed(struct virtio_net *dev, uint16_t vring, int enable) struct rte_vhost_vring_state *state; struct rte_eth_dev *eth_dev; struct internal_list *list; -#ifdef RTE_LIBRTE_VHOST_NUMA - int newnode, ret; -#endif if (dev == NULL) { RTE_LOG(ERR, PMD, "Invalid argument\n"); @@ -370,17 +381,6 @@ vring_state_changed(struct virtio_net *dev, uint16_t vring, int enable) eth_dev = list->eth_dev; /* won't be NULL */ state = vring_states[eth_dev->data->port_id]; - -#ifdef RTE_LIBRTE_VHOST_NUMA - ret = get_mempolicy(&newnode, NULL, 0, dev, - MPOL_F_NODE | MPOL_F_ADDR); - if (ret < 0) { - RTE_LOG(ERR, PMD, "Unknown numa node\n"); - return -1; - } - - eth_dev->data->numa_node = newnode; -#endif rte_spinlock_lock(&state->lock); state->cur[vring] = enable; state->max_vring = RTE_MAX(vring, state->max_vring);