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 4E7A7A04B1 for ; Thu, 5 Nov 2020 13:42:52 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 986D5C80A; Thu, 5 Nov 2020 13:42:38 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 89228C80C for ; Thu, 5 Nov 2020 13:42:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604580155; 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=hb+oKeIynKTMOLvDKz0CBEKkJ0zCzZqDOKlQyLsbUlA=; b=Wlidu0Zj273p98QFS7I6lRO0kNzhdP3IUkZOdCAKxszQTeRHalKaHF3BWxC9qR0Mf2XwN+ 762E+3yI4yBscqSJk7yjH4xq6SJ1vclY5MTCmbqUURwgmxxbbPra6+tGbF9FGLqICSgk+G IedMu8AdyboRphRdHv40HAiFKJDeaAM= 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-291-UnwFI_qFNhO96AR-CTCg3g-1; Thu, 05 Nov 2020 07:42:31 -0500 X-MC-Unique: UnwFI_qFNhO96AR-CTCg3g-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 38ACC1074646; Thu, 5 Nov 2020 12:42:30 +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 4AB425C3E1; Thu, 5 Nov 2020 12:42:29 +0000 (UTC) From: Kevin Traynor To: Hemant Agrawal Cc: Akhil Goyal , dpdk stable Date: Thu, 5 Nov 2020 12:40:13 +0000 Message-Id: <20201105124015.306404-66-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-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' 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/303642f06bdd3643a12bd0ffea0c70be21be9c53 Thanks. Kevin. --- >From 303642f06bdd3643a12bd0ffea0c70be21be9c53 Mon Sep 17 00:00:00 2001 From: Hemant Agrawal Date: Thu, 3 Sep 2020 22:47:44 +0530 Subject: [PATCH] crypto/dpaa2_sec: fix stats query without queue pair [ upstream commit 356bcac8f11ef916f47be74b295c36755d8165cf ] dpdk-procinfo calls the crypto stats API, which results segmentation fault on DPAA2_SEC. The queue pair array will be NULL, when it is used without configuring the SEC device. Fixes: 02f35eee264b ("crypto/dpaa2_sec: support statistics") Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index db8a6b0ee3..0db5b4e6d9 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3067,5 +3067,5 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev, } for (i = 0; i < dev->data->nb_queue_pairs; i++) { - if (qp[i] == NULL) { + if (qp == NULL || qp[i] == NULL) { DPAA2_SEC_DEBUG("Uninitialised queue pair"); continue; -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-05 12:38:55.801917573 +0000 +++ 0066-crypto-dpaa2_sec-fix-stats-query-without-queue-pair.patch 2020-11-05 12:38:54.278896049 +0000 @@ -1 +1 @@ -From 356bcac8f11ef916f47be74b295c36755d8165cf Mon Sep 17 00:00:00 2001 +From 303642f06bdd3643a12bd0ffea0c70be21be9c53 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 356bcac8f11ef916f47be74b295c36755d8165cf ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index 109e61ae16..f480aafd01 100644 +index db8a6b0ee3..0db5b4e6d9 100644 @@ -24 +25 @@ -@@ -3502,5 +3502,5 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev, +@@ -3067,5 +3067,5 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev,