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 A7A0DA04B1 for ; Thu, 5 Nov 2020 13:41:13 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A0F78C31B; Thu, 5 Nov 2020 13:41:12 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 71A79C325 for ; Thu, 5 Nov 2020 13:41:10 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580069; 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; bh=UMoMCf48BQqYfXcqiT30Km1yNCph2dObBMU1NuZjFLM=; b=jLh0JnAc5UfMWAYtsKeAxXIXOgcOuXNkhKZTQPq6amIj9IEqGAqBSvY7FcDjCSyuS5alI+ JTf/V6R+w7BrPr5M9yF7eXOgZLJ2CUZn23pZK/UvXafmEEMJhX5zm+RNpaTr3bprVoAmhN iCqa3fETrvr2+/J51yGI3nvKA0HZ6A4= 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-126-_eaPNM5XNe6yRHafi656Ew-1; Thu, 05 Nov 2020 07:41:05 -0500 X-MC-Unique: _eaPNM5XNe6yRHafi656Ew-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D37A36414C; Thu, 5 Nov 2020 12:41:04 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id 98AD35C5DE; Thu, 5 Nov 2020 12:41:00 +0000 (UTC) From: Kevin Traynor To: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Cc: Chenbo Xia , Maxime Coquelin , dpdk stable Date: Thu, 5 Nov 2020 12:39:26 +0000 Message-Id: <20201105124015.306404-19-ktraynor@redhat.com> In-Reply-To: <20201105124015.306404-1-ktraynor@redhat.com> References: <20201105124015.306404-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix IOTLB mempool single-consumer flag' has been queued to LTS release 18.11.11 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" Hi, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/10/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/d50676330dde6f9cf1a6779f17774a43b8745222 Thanks. Kevin. --- >From d50676330dde6f9cf1a6779f17774a43b8745222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Date: Mon, 31 Aug 2020 09:59:22 +0200 Subject: [PATCH] vhost: fix IOTLB mempool single-consumer flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 46d3f57537059ef9ec497f97d98e57a1e5f2f417 ] Control thread (which handles iotlb msg) and forwarding thread both use iotlb to translate address. The former may modify the same entry of mempool and may cause a loop in iotlb_pending_entries list. Bugzilla ID: 523 Fixes: d012d1f293f4 ("vhost: add IOTLB helper functions") Signed-off-by: Eugenio Pérez Reviewed-by: Chenbo Xia Reviewed-by: Maxime Coquelin --- lib/librte_vhost/iotlb.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c index 3dfde94e80..23d5e11752 100644 --- a/lib/librte_vhost/iotlb.c +++ b/lib/librte_vhost/iotlb.c @@ -350,6 +350,5 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) 0, 0, NULL, NULL, NULL, socket, MEMPOOL_F_NO_CACHE_ALIGN | - MEMPOOL_F_SP_PUT | - MEMPOOL_F_SC_GET); + MEMPOOL_F_SP_PUT); if (!vq->iotlb_pool) { RTE_LOG(ERR, VHOST_CONFIG, -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:54.616495269 +0000 +++ 0019-vhost-fix-IOTLB-mempool-single-consumer-flag.patch 2020-11-05 12:38:54.180895973 +0000 @@ -1 +1 @@ -From 46d3f57537059ef9ec497f97d98e57a1e5f2f417 Mon Sep 17 00:00:00 2001 +From d50676330dde6f9cf1a6779f17774a43b8745222 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 46d3f57537059ef9ec497f97d98e57a1e5f2f417 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 5b3a0c090c..e0b67721b6 100644 +index 3dfde94e80..23d5e11752 100644 @@ -29 +30 @@ -@@ -322,6 +322,5 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) +@@ -350,6 +350,5 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) @@ -36 +37 @@ - VHOST_LOG_CONFIG(ERR, + RTE_LOG(ERR, VHOST_CONFIG,