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 B39E1A0564 for ; Tue, 10 Mar 2020 06:00:25 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 89B041BFFB; Tue, 10 Mar 2020 06:00:25 +0100 (CET) Received: from valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by dpdk.org (Postfix) with ESMTP id EECB62E81; Tue, 10 Mar 2020 06:00:22 +0100 (CET) Received: by valinux.co.jp (Postfix, from userid 1000) id 6C075240A70; Tue, 10 Mar 2020 14:00:21 +0900 (JST) From: Itsuro Oda To: dev@dpdk.org, maxime.coquelin@redhat.com, zhihong.wang@intel.com, xiaolong.ye@intel.com Cc: Itsuro Oda , stable@dpdk.org Date: Tue, 10 Mar 2020 14:00:03 +0900 Message-Id: <20200310050003.16728-1-oda@valinux.co.jp> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-stable] [PATCH] vhost: make iotlb cache name unique among multi processes X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Currently, iotlb cache name is comprised of vid and virtqueue index. For example, "iotlb_cache_0_0". Because vid is assigned per process, iotlb cache name is not unique among multi processes. For example a secondary process uses a vhost (ex. eth_vhost0,iface=/tmp/sock0) and another secondary process uses a vhost (ex. eth_vhost1,iface=/tmp/sock1), iotlb cache name of both vhost ("iotlb_cache_0_0") are same and as a result iotlb cache is broken. This patch makes iotlb cache name unique among milti processes by using the interface name not vid to comprise iotlb cache name. Since the length of interface name is variable, this patch uses hash value calculated by the interface name. Fixes: d012d1f293f4 (vhost: add IOTLB helper functions) Cc: stable@dpdk.org Signed-off-by: Itsuro Oda --- lib/librte_vhost/iotlb.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c index bc1758528..0992c145b 100644 --- a/lib/librte_vhost/iotlb.c +++ b/lib/librte_vhost/iotlb.c @@ -6,6 +6,7 @@ #include #endif +#include #include #include "iotlb.h" @@ -288,6 +289,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) char pool_name[RTE_MEMPOOL_NAMESIZE]; struct vhost_virtqueue *vq = dev->virtqueue[vq_index]; int socket = 0; + uint32_t val; if (vq->iotlb_pool) { /* @@ -308,8 +310,10 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) TAILQ_INIT(&vq->iotlb_list); TAILQ_INIT(&vq->iotlb_pending_list); - snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%d_%d", - dev->vid, vq_index); + val = rte_jhash(dev->ifname, strlen(dev->ifname), 0); + snprintf(pool_name, sizeof(pool_name), "iotlb_cache_%08x_%d", + val, vq_index); + VHOST_LOG_CONFIG(DEBUG, "IOTLB cache name: %s\n", pool_name); /* If already created, free it and recreate */ vq->iotlb_pool = rte_mempool_lookup(pool_name); -- 2.17.0