From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 275891B4C1 for ; Thu, 29 Nov 2018 14:22:51 +0100 (CET) Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8D5D79FDF4; Thu, 29 Nov 2018 13:22:50 +0000 (UTC) Received: from ktraynor.remote.csb (ovpn-117-230.ams2.redhat.com [10.36.117.230]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A1C21001F50; Thu, 29 Nov 2018 13:22:48 +0000 (UTC) From: Kevin Traynor To: Fan Zhang Cc: dpdk stable Date: Thu, 29 Nov 2018 13:20:33 +0000 Message-Id: <20181129132128.7609-33-ktraynor@redhat.com> In-Reply-To: <20181129132128.7609-1-ktraynor@redhat.com> References: <20181129132128.7609-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Thu, 29 Nov 2018 13:22:50 +0000 (UTC) Subject: [dpdk-stable] patch 'crypto/aesni_mb: fix queue pair free' has been queued to stable release 18.08.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: , X-List-Received-Date: Thu, 29 Nov 2018 13:22:51 -0000 Hi, FYI, your patch has been queued to stable release 18.08.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 12/08/18. 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. If the code is different (ie: not only metadata diffs), due for example to a change in context or macro names, please double check it. Thanks. Kevin Traynor --- >>From 2394c7d7d54cfd28d597cff43e6e654679e290c9 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 16 Oct 2018 10:45:54 +0100 Subject: [PATCH] crypto/aesni_mb: fix queue pair free [ upstream commit 1fd1aa0c91bf138a4e7f6f7ce60c8d850da73564 ] This patch fixes the queue pair free for AESNI-MB PMD. Originally the queue pair ring name are different than the object name, caused the aesni_mb_pmd_qp_release() cannot find the ring to release. This patch uses the same name between queue pair object name and ring name. Fixes: a831c318c54d ("crypto/aesni_mb: free ring memory on queue release") Signed-off-by: Fan Zhang --- drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c index ab26e5ae4..200023fd8 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c @@ -450,12 +450,10 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev, static struct rte_ring * aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp, - const char *str, unsigned int ring_size, int socket_id) + unsigned int ring_size, int socket_id) { struct rte_ring *r; char ring_name[RTE_CRYPTODEV_NAME_MAX_LEN]; - unsigned int n = snprintf(ring_name, sizeof(ring_name), - "%s_%s", - qp->name, str); + unsigned int n = snprintf(ring_name, sizeof(ring_name), "%s", qp->name); if (n >= sizeof(ring_name)) @@ -515,5 +513,5 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, qp->ingress_queue = aesni_mb_pmd_qp_create_processed_ops_ring(qp, - "ingress", qp_conf->nb_descriptors, socket_id); + qp_conf->nb_descriptors, socket_id); if (qp->ingress_queue == NULL) { ret = -1; -- 2.19.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2018-11-29 13:11:35.867655142 +0000 +++ 0032-crypto-aesni_mb-fix-queue-pair-free.patch 2018-11-29 13:11:34.000000000 +0000 @@ -1,8 +1,10 @@ -From 1fd1aa0c91bf138a4e7f6f7ce60c8d850da73564 Mon Sep 17 00:00:00 2001 +From 2394c7d7d54cfd28d597cff43e6e654679e290c9 Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Tue, 16 Oct 2018 10:45:54 +0100 Subject: [PATCH] crypto/aesni_mb: fix queue pair free +[ upstream commit 1fd1aa0c91bf138a4e7f6f7ce60c8d850da73564 ] + This patch fixes the queue pair free for AESNI-MB PMD. Originally the queue pair ring name are different than the object name, caused the aesni_mb_pmd_qp_release() cannot find the ring to @@ -10,7 +12,6 @@ name and ring name. Fixes: a831c318c54d ("crypto/aesni_mb: free ring memory on queue release") -Cc: stable@dpdk.org Signed-off-by: Fan Zhang --- @@ -18,10 +19,10 @@ 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c -index 43f6c26ed..f3eff2685 100644 +index ab26e5ae4..200023fd8 100644 --- a/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c +++ b/drivers/crypto/aesni_mb/rte_aesni_mb_pmd_ops.c -@@ -536,12 +536,10 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev, +@@ -450,12 +450,10 @@ aesni_mb_pmd_qp_set_unique_name(struct rte_cryptodev *dev, static struct rte_ring * aesni_mb_pmd_qp_create_processed_ops_ring(struct aesni_mb_qp *qp, - const char *str, unsigned int ring_size, int socket_id) @@ -36,7 +37,7 @@ + unsigned int n = snprintf(ring_name, sizeof(ring_name), "%s", qp->name); if (n >= sizeof(ring_name)) -@@ -601,5 +599,5 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, +@@ -515,5 +513,5 @@ aesni_mb_pmd_qp_setup(struct rte_cryptodev *dev, uint16_t qp_id, qp->ingress_queue = aesni_mb_pmd_qp_create_processed_ops_ring(qp, - "ingress", qp_conf->nb_descriptors, socket_id);