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 7B9DDA04DD for ; Wed, 28 Oct 2020 11:54:18 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6969FCA16; Wed, 28 Oct 2020 11:54:17 +0100 (CET) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by dpdk.org (Postfix) with ESMTP id 82910C9F6 for ; Wed, 28 Oct 2020 11:54:15 +0100 (CET) Received: by mail-wm1-f46.google.com with SMTP id v5so4115783wmh.1 for ; Wed, 28 Oct 2020 03:54:15 -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=ubVCIgpAYDadt6AlgPXWgNztWBHKmTZGibD+1nEM1XE=; b=siSJXedf8SVlUCGMKszbHRau0xdX4qAQj/TKeGXS63lO7fOGuk4g1kBF9VeiHTOk7R zg8fexlDaHxH5iLzW91s0e2td8wcv9NAADSzHXZzkJZc8qU/AVWhRsnwIrwpEvY9F056 3VxEzIYOc5h4LzhmEnaA45zMO+U3MWuGYQzPR9nzi5XcNGXyeGmStvHCmPWH+hMS6xmZ buEe6Q018x4l6cBQOUx+hBruUvo1O++CGQ+zWbRplTwnWgOcw0y+PHWX1vMIK+EgL1Zl wff8gYCn09BmLnwOFoaP/MUVTV9mDsih5QW+iL3isWmwVnfvD5AbjLwrpG6T7nZ9BKTc 8jDw== 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=ubVCIgpAYDadt6AlgPXWgNztWBHKmTZGibD+1nEM1XE=; b=TwqVMNlgT9yk/xysXIqhGIOr+1WqNqFWigWDlq0HeN+2/7ttQUZPvIurvlEMy4qzWN HdPi/AxiAGbRrdeE/JBC/QLiDT5IgUIBwspnzfmk8I1MlSomw7SMWRl8bsjAWnTnlWvb i693PAYhoCYnMQtynsGY/7d1vCU4bLLWVuCeLt3FKXCC9abhf5g4aPstDRJxUiWebKZG Qln+y0Fb3sDp4z6oCxlbmydQF/R529c/WXYQYlpaSN6EZwhTXmb+NycbCNYREb5aJ1j+ mq+ZOtEwcN/dL/AIT5HuA66QLF3yzbaRD5WAlETX0/Af/csBXGqz21GY5MwWIqLspzPM BXeQ== X-Gm-Message-State: AOAM530qIQBUBX1DVFntNKej/GUoLGoiXPPo351UgKzZn+VW/fAF69C7 ZJIn9dYvi5/tILGpegGIxF8= X-Google-Smtp-Source: ABdhPJyTNexgBhdWU24ZB0EfhesFB91seCkd2L0Sgvmft9SlwScsPLUOChNTrz6uchg+OZkfAkbqcw== X-Received: by 2002:a7b:cc09:: with SMTP id f9mr7437334wmh.93.1603882455309; Wed, 28 Oct 2020 03:54:15 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e5sm6099103wrw.93.2020.10.28.03.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:54:14 -0700 (PDT) From: luca.boccassi@gmail.com To: Hemant Agrawal Cc: Akhil Goyal , dpdk stable Date: Wed, 28 Oct 2020 10:45:11 +0000 Message-Id: <20201028104606.3504127-152-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-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'crypto/dpaa2_sec: fix stats query without queue pair' 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 459f36b9a03db55d3b56b8857b030ae80d6a626f 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 0cc98b3c2b..60e9bf702b 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3492,7 +3492,7 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev, return; } 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.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.456856146 +0000 +++ 0152-crypto-dpaa2_sec-fix-stats-query-without-queue-pair.patch 2020-10-28 10:35:11.748833616 +0000 @@ -1,15 +1,16 @@ -From 356bcac8f11ef916f47be74b295c36755d8165cf Mon Sep 17 00:00:00 2001 +From 459f36b9a03db55d3b56b8857b030ae80d6a626f 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") -Cc: stable@dpdk.org Signed-off-by: Hemant Agrawal Acked-by: Akhil Goyal @@ -18,10 +19,10 @@ 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 109e61ae16..f480aafd01 100644 +index 0cc98b3c2b..60e9bf702b 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c -@@ -3501,7 +3501,7 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev, +@@ -3492,7 +3492,7 @@ void dpaa2_sec_stats_get(struct rte_cryptodev *dev, return; } for (i = 0; i < dev->data->nb_queue_pairs; i++) {