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 DF512A0553 for ; Mon, 17 Feb 2020 18:47:03 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D73A31DA9E; Mon, 17 Feb 2020 18:47:03 +0100 (CET) Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by dpdk.org (Postfix) with ESMTP id 1BB561DABC for ; Mon, 17 Feb 2020 18:47:02 +0100 (CET) Received: by mail-wm1-f68.google.com with SMTP id t23so199917wmi.1 for ; Mon, 17 Feb 2020 09:47:02 -0800 (PST) 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=PuFJIg0C1vaDgCTzuABosF5NtNLXxX1EXguUZmhMXUk=; b=h8Ojn3gw9DmHbP674rlsaX1QhmEDcM9MhwfWbnDVgUDYSnelOSn5DBPzl7JKbiyofj wL4guMRo7vcmHLEYhF47tiilgjgrwgunYlKJK+3Q1JUsoaeOcO4JYuedDMGcrCDYpeKX BOhwhRVpEjBqya1yiOqP4ZyvGtaU/3OX6gBOE9Ry01ipXa5mEhO8YjXV8rCqTGrvkXoH /C5LSmEbBRNV7QxIB5X9X7DN00ouo6nc5jWG7eX03ipri1UwYWwC6XC7CPx1n7vMA2Z4 nbaEzeU3+3e7kb7119VVLbrZN9jEG57WUBRYyinTXGFHowwoPydwrxg3t+7rH9YnInVS QoHA== 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=PuFJIg0C1vaDgCTzuABosF5NtNLXxX1EXguUZmhMXUk=; b=cduliFXp3VBCdQsLIzeNd014jPH4dDhdjsi2kYufwg6nTHqM/7umbBqBv7ml9Xw4EU BNzwoxe2gW9EtDgYt65D4AbCzwEIuKFkPLXhaT3CXl4Udn5hmaQIS+484U74L48X5igS 7OU152VLJN08btlmcjeucPAvzZgyubt4n2M8OdcSca5kABqz0NsiAMeaDi4025scBSRs 5kC5doEgH+BNTwtAPZyFye/7PbarrxYnq5ZWO6UJmpV9Tg0PL3bf+5YKa6MLt6Apg8EU gPE2slhjhiJwf3ZRRLEjtF/4y1wtfK2swgx5eaPeK2anRYL0JV4ZaUZxBCfXCZtNOXq2 Q2Dw== X-Gm-Message-State: APjAAAVW3zFUX5qFYUIt6u1FB+Xb52z1CarUac772O1gPkGi2LKuVBkO l040Lcll7wJLWQiVpjicpHYOR2sPtIJYcA== X-Google-Smtp-Source: APXvYqyBg55au/EGmE9mSFkiRxltDrlEyXauNdy+rlnE4PVPLhCWrOQsoVLV8PbrIGH5CjqngUTjJA== X-Received: by 2002:a7b:cc6a:: with SMTP id n10mr161653wmj.170.1581961621794; Mon, 17 Feb 2020 09:47:01 -0800 (PST) Received: from localhost (userh634.uk.uudial.com. [194.69.103.7]) by smtp.gmail.com with ESMTPSA id m3sm1854375wrs.53.2020.02.17.09.47.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2020 09:47:01 -0800 (PST) From: luca.boccassi@gmail.com To: Jin Yu Cc: Maxime Coquelin , dpdk stable Date: Mon, 17 Feb 2020 17:45:34 +0000 Message-Id: <20200217174546.25334-42-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200217174546.25334-1-luca.boccassi@gmail.com> References: <20200211112216.3929-190-luca.boccassi@gmail.com> <20200217174546.25334-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'vhost: fix inflight resubmit check' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/19/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 f07186f3291858a6b8e64c3233a54762d87497e2 Mon Sep 17 00:00:00 2001 From: Jin Yu Date: Wed, 25 Dec 2019 22:18:35 +0800 Subject: [PATCH] vhost: fix inflight resubmit check [ upstream commit c47edd040a6a409de6bc86a31f44e86e5fa55b19 ] The frontend may not send the get_inflight_fd and set_inflight_fd although we negotiate the protocol feature. When we meet this situation just return OK. Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information") Signed-off-by: Jin Yu Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index d224932dda..8a33510a47 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1645,8 +1645,11 @@ vhost_check_queue_inflights_split(struct virtio_net *dev, (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))) return RTE_VHOST_MSG_RESULT_OK; + /* The frontend may still not support the inflight feature + * although we negotiate the protocol feature. + */ if ((!vq->inflight_split)) - return RTE_VHOST_MSG_RESULT_ERR; + return RTE_VHOST_MSG_RESULT_OK; if (!vq->inflight_split->version) { vq->inflight_split->version = INFLIGHT_VERSION; @@ -1726,8 +1729,11 @@ vhost_check_queue_inflights_packed(struct virtio_net *dev, (1ULL << VHOST_USER_PROTOCOL_F_INFLIGHT_SHMFD))) return RTE_VHOST_MSG_RESULT_OK; + /* The frontend may still not support the inflight feature + * although we negotiate the protocol feature. + */ if ((!vq->inflight_packed)) - return RTE_VHOST_MSG_RESULT_ERR; + return RTE_VHOST_MSG_RESULT_OK; if (!vq->inflight_packed->version) { vq->inflight_packed->version = INFLIGHT_VERSION; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-17 17:00:16.482548378 +0000 +++ 0042-vhost-fix-inflight-resubmit-check.patch 2020-02-17 17:00:15.363951249 +0000 @@ -1,14 +1,15 @@ -From c47edd040a6a409de6bc86a31f44e86e5fa55b19 Mon Sep 17 00:00:00 2001 +From f07186f3291858a6b8e64c3233a54762d87497e2 Mon Sep 17 00:00:00 2001 From: Jin Yu Date: Wed, 25 Dec 2019 22:18:35 +0800 Subject: [PATCH] vhost: fix inflight resubmit check +[ upstream commit c47edd040a6a409de6bc86a31f44e86e5fa55b19 ] + The frontend may not send the get_inflight_fd and set_inflight_fd although we negotiate the protocol feature. When we meet this situation just return OK. Fixes: ad0a4ae491fe ("vhost: checkout resubmit inflight information") -Cc: stable@dpdk.org Signed-off-by: Jin Yu Reviewed-by: Maxime Coquelin @@ -17,7 +18,7 @@ 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c -index 91482ccd67..9a7b8b3088 100644 +index d224932dda..8a33510a47 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1645,8 +1645,11 @@ vhost_check_queue_inflights_split(struct virtio_net *dev,