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 493EEA04DD for ; Wed, 28 Oct 2020 11:48:46 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 40C12C9FE; Wed, 28 Oct 2020 11:48:45 +0100 (CET) Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) by dpdk.org (Postfix) with ESMTP id 09170C9FE for ; Wed, 28 Oct 2020 11:48:43 +0100 (CET) Received: by mail-wm1-f48.google.com with SMTP id d3so4292999wma.4 for ; Wed, 28 Oct 2020 03:48:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=AEoqc60eU0Y9BM1J09+tiHt0i3zD/vpvHAkb2Cqkj0Q=; b=Wrne0JrWWvVU661C4+gcjU6Uk20JaVXDsd642+CWUxek6loiEiD92LAqa/DEZ/wKnn lNM+z+BmyvgwqOmZ6QPqQ4pJVKrXDeQzZyvcpP5vvfnd7sBwfe7jNl/NNRKLun1rKHQo QLNg1fZcx+im4Iz1megLiFz5rVFEn7uL0+arPhDNCuAi2JwNVLVTdmqf/KqLqnswPTHE l3rK+dcGqo8KqnZihu+XXHP5ncS1pXc8P3NgjBVYj6yfl2U7FU2+Fsz/EGd76Y8WMfkP jndlfJIV/x746zENpFN5f/2WlJMSfy5t1I6Lz9CNn4WgFJzIDYmzv6PI8ytN4Pu6Qsvg 3KuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=AEoqc60eU0Y9BM1J09+tiHt0i3zD/vpvHAkb2Cqkj0Q=; b=TADhu6jwQjeDquflSgoZfecMTR6taM88fs3F7QBt82nH51+y42qgUl3s6zzwu3rTVK gynN7IjYpIXhpa1ElL91MRPM+a9TP28WkLhiQa73NcNRkvCaRHiQPcl9zZugG4vSWrYD 0JQFOMIKK14Dtnksn5ZqyWY3Ok8hho5VLxNEaCShi9pIycveykgWJFGMf8LMHJ0JuC0J bQ27Wb6kfxoCa9//FJ0rXd4BhDpXQC9q2Cz/eyqZwdj2DOPA1aEk9aUqDXZo2y1kxiAf W43xSvA038QFVGqeI38qy1FraIXzDq97IBfE3kaeb0wZ9HeObJHwZNdeFKSmOCVZE5K1 05FA== X-Gm-Message-State: AOAM530OvqLbnb65b/4NttkaK/XwGMUAp9w3eF7/ox8pRYqoVfjLQsZ3 BSAP9sNGJ1UXL6NS4qRSAQ4= X-Google-Smtp-Source: ABdhPJzj+bINp02dL//HXT/fy1seWy608Q49sPEFCQdGDdy7AeLycJs+fzLKF/IKzuXpVc4yQ1qeuQ== X-Received: by 2002:a7b:c11a:: with SMTP id w26mr2123937wmi.78.1603882121763; Wed, 28 Oct 2020 03:48:41 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id c130sm6281732wma.1.2020.10.28.03.48.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:48:41 -0700 (PDT) From: luca.boccassi@gmail.com To: =?UTF-8?q?Eugenio=20P=C3=A9rez?= Cc: Chenbo Xia , Maxime Coquelin , dpdk stable Date: Wed, 28 Oct 2020 10:43:29 +0000 Message-Id: <20201028104606.3504127-50-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 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 stable release 19.11.6 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 stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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. Thanks. Luca Boccassi --- >From 824ebcd5cf0310553dcb85470f5ba804453e6c73 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 07443a94bc..2e90a63bb1 100644 --- a/lib/librte_vhost/iotlb.c +++ b/lib/librte_vhost/iotlb.c @@ -321,8 +321,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) IOTLB_CACHE_SIZE, sizeof(struct vhost_iotlb_entry), 0, 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, "Failed to create IOTLB cache pool (%s)\n", -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:13.343102393 +0000 +++ 0050-vhost-fix-IOTLB-mempool-single-consumer-flag.patch 2020-10-28 10:35:11.512830142 +0000 @@ -1,4 +1,4 @@ -From 46d3f57537059ef9ec497f97d98e57a1e5f2f417 Mon Sep 17 00:00:00 2001 +From 824ebcd5cf0310553dcb85470f5ba804453e6c73 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 @@ -6,6 +6,8 @@ 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 @@ -13,7 +15,6 @@ Bugzilla ID: 523 Fixes: d012d1f293f4 ("vhost: add IOTLB helper functions") -Cc: stable@dpdk.org Signed-off-by: Eugenio Pérez Reviewed-by: Chenbo Xia @@ -23,7 +24,7 @@ 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/librte_vhost/iotlb.c b/lib/librte_vhost/iotlb.c -index 5b3a0c090c..e0b67721b6 100644 +index 07443a94bc..2e90a63bb1 100644 --- a/lib/librte_vhost/iotlb.c +++ b/lib/librte_vhost/iotlb.c @@ -321,8 +321,7 @@ vhost_user_iotlb_init(struct virtio_net *dev, int vq_index) @@ -34,7 +35,7 @@ - MEMPOOL_F_SC_GET); + MEMPOOL_F_SP_PUT); if (!vq->iotlb_pool) { - VHOST_LOG_CONFIG(ERR, + RTE_LOG(ERR, VHOST_CONFIG, "Failed to create IOTLB cache pool (%s)\n", -- 2.20.1