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 56400A054C for ; Fri, 14 Feb 2020 18:06:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4E999F72; Fri, 14 Feb 2020 18:06:04 +0100 (CET) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id C5FB1F72 for ; Fri, 14 Feb 2020 18:06:02 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1581699962; 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=I1EsA0t279h2CSoVZkNavKIMGGcF4wP7hy6KfZnAseM=; b=O1qTKm3hM6LkZ8XwzpA16un7RQMOlmLu1VWYN5/5/z0e8POy2B0ffq/SltrOcLirb/Fs1A e/uyhACy6Avfyzpp5JtO0YmHLs3XrhG8aUXXD5OH0C4P+DU5lyjUZOhtQP5i4Ljk335nBl GBPcOp4jJIqrJNKb4Vy759mopZPqkOk= 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-351-DHtefGptOLmSd6gSkrigUg-1; Fri, 14 Feb 2020 12:05:59 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A56E1800D5E; Fri, 14 Feb 2020 17:05:58 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 73A7889F3C; Fri, 14 Feb 2020 17:05:54 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: Maxime Coquelin , dpdk stable Date: Fri, 14 Feb 2020 17:03:27 +0000 Message-Id: <20200214170337.25093-33-ktraynor@redhat.com> In-Reply-To: <20200214170337.25093-1-ktraynor@redhat.com> References: <20200214170337.25093-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: DHtefGptOLmSd6gSkrigUg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'vhost/crypto: fix fetch size' has been queued to LTS release 18.11.7 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.7 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/20/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 rebasi= ng (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/c81fe7e2d8a8f45256= 018dad3d8d5ae11e19de9d Thanks. Kevin. --- >From c81fe7e2d8a8f45256018dad3d8d5ae11e19de9d Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 29 Jan 2020 10:24:22 +0000 Subject: [PATCH] vhost/crypto: fix fetch size [ upstream commit 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 ] This patch fixes the incorrect rte_vhost_crypto_fetch_requests return value. Coverity issue: 343401 Fixes: 3bb595ecd682 ("vhost/crypto: add request handler") Signed-off-by: Fan Zhang Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_crypto.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/librte_vhost/vhost_crypto.c b/lib/librte_vhost/vhost_crypt= o.c index d8a0f954b2..cf01c7ebe3 100644 --- a/lib/librte_vhost/vhost_crypto.c +++ b/lib/librte_vhost/vhost_crypto.c @@ -1530,10 +1530,10 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t q= id, =09if (unlikely(dev =3D=3D NULL)) { =09=09VC_LOG_ERR("Invalid vid %i", vid); -=09=09return -EINVAL; +=09=09return 0; =09} =20 =09if (unlikely(qid >=3D VHOST_MAX_QUEUE_PAIRS)) { =09=09VC_LOG_ERR("Invalid qid %u", qid); -=09=09return -EINVAL; +=09=09return 0; =09} =20 @@ -1541,5 +1541,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid= , =09if (unlikely(vcrypto =3D=3D NULL)) { =09=09VC_LOG_ERR("Cannot find required data, is it initialized?"); -=09=09return -ENOENT; +=09=09return 0; =09} =20 @@ -1563,5 +1563,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid= , =09=09=09=09(void **)mbufs, count * 2) < 0)) { =09=09=09VC_LOG_ERR("Insufficient memory"); -=09=09=09return -ENOMEM; +=09=09=09return 0; =09=09} =20 @@ -1593,5 +1593,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qid= , =09=09=09=09(void **)mbufs, count) < 0)) { =09=09=09VC_LOG_ERR("Insufficient memory"); -=09=09=09return -ENOMEM; +=09=09=09return 0; =09=09} =20 --=20 2.21.1 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092020-02-14 17:02:38.904271196 +0000 +++ 0033-vhost-crypto-fix-fetch-size.patch=092020-02-14 17:02:37.043406018 = +0000 @@ -1 +1 @@ -From 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 Mon Sep 17 00:00:00 2001 +From c81fe7e2d8a8f45256018dad3d8d5ae11e19de9d Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 03df3c7473dfd8f2efafe525b61ef980d0a68aa1 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 684fddc30b..68911972b6 100644 +index d8a0f954b2..cf01c7ebe3 100644 @@ -23 +24 @@ -@@ -1540,10 +1540,10 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t = qid, +@@ -1530,10 +1530,10 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t = qid, @@ -36 +37 @@ -@@ -1551,5 +1551,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qi= d, +@@ -1541,5 +1541,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qi= d, @@ -43 +44 @@ -@@ -1573,5 +1573,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qi= d, +@@ -1563,5 +1563,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qi= d, @@ -50 +51 @@ -@@ -1603,5 +1603,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qi= d, +@@ -1593,5 +1593,5 @@ rte_vhost_crypto_fetch_requests(int vid, uint32_t qi= d,