From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id D6AAB42814 for ; Wed, 29 Mar 2023 03:05:12 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CB55742686; Wed, 29 Mar 2023 03:05:12 +0200 (CEST) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mails.dpdk.org (Postfix) with ESMTP id DFF6F42B8C for ; Wed, 29 Mar 2023 03:05:11 +0200 (CEST) Received: by mail-wm1-f52.google.com with SMTP id d11-20020a05600c3acb00b003ef6e6754c5so5037723wms.5 for ; Tue, 28 Mar 2023 18:05:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680051911; x=1682643911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=CF5VLEN+C4Ck4P98QRXBO5hiyF7tobxwfcHEGhF05lo=; b=NnNEUNJlu/hJAqHQunie2tpZWrcfALx28ZFTYuMm1lEjBlg3TwKvXUJUGZlRMvg2Ov 5sCsMr3vkzV8AHGg4SZY4EGevDnf51T8oaVCMDytknwrXGx0zVOGrjthyc5fgPCVMEYK KzH04YBmnX9CSSc1IR0pdY42Ufy7nXvnQuqfQ7P6CxGJfesMfImPak4P5anhFiJ5262N ZK3Af2hcWRV/ei7DdqLrAy2oKt3znnOBfMGR0zkDCgK+UDHSNrHUIjSLBkVuE/tsc4g/ v+YUWnOSAJZqfkuJklTgCTO7WK66mAnL8MkAH9+Eqfg4E46nGQA0M5GVM5TNu9nZJfCA qNoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680051911; x=1682643911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CF5VLEN+C4Ck4P98QRXBO5hiyF7tobxwfcHEGhF05lo=; b=w8Cz/mQlfyqHQwnCEk24vI2++CGbko1ONwnJBMROqAZMJm9uGpRmToB0sJdMOtQstr TuHPgdcVWujLa42/GCrNrjXJDxPdpmzvOFvWrQWTAkXC//x4MmmJ1vMp8qoWG9uFqdgp ZNZLOCIipogR3qGgPLtVSyQjZMs39N5bZebECOqNyk+dJqSGZQPfppPSV5jG4KeNlIFa bLA7JhyX/VfD+Q2Rk1u4rT+iGMNNLsvTL3sxmtizFzyDr8LuAlBaXW8MKikgH7zeyptN 5eMjA+DTDbxCKdi1cbS6PK1drpiCEKd1gyz8KLDgccCQuKOb90afDrr4BJoFScMTlVAb vkBQ== X-Gm-Message-State: AO0yUKW2Q6BBCa9n6cdbaqTTwxbQM9QBaY16q++wVPlGLys22MRjog4a hibeNhykZ1fXDYguYctLlSidbUgVGQ4= X-Google-Smtp-Source: AK7set+RTCBLD3eSTcbIQCtbQTsI6VHxIIKvLVdXyOJ7joYYJJAzXVnBtj0Lt4boePo3YtCT+RJ13g== X-Received: by 2002:a05:600c:2312:b0:3ee:b3bf:5f7c with SMTP id 18-20020a05600c231200b003eeb3bf5f7cmr13726316wmo.23.1680051911571; Tue, 28 Mar 2023 18:05:11 -0700 (PDT) Received: from localhost ([137.220.119.58]) by smtp.gmail.com with ESMTPSA id t14-20020a05600c198e00b003ee1e07a14asm364214wmq.45.2023.03.28.18.05.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 18:05:10 -0700 (PDT) From: luca.boccassi@gmail.com To: Saoirse O'Donovan Cc: Ciara Power , dpdk stable Subject: patch 'test/crypto: fix statistics error messages' has been queued to stable release 20.11.8 Date: Wed, 29 Mar 2023 02:04:42 +0100 Message-Id: <20230329010446.563852-6-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230329010446.563852-1-luca.boccassi@gmail.com> References: <20230322004155.2333903-19-luca.boccassi@gmail.com> <20230329010446.563852-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/21d71fb87106deef57df3f7e0cbbd1ae39efa717 Thanks. Luca Boccassi --- >From 21d71fb87106deef57df3f7e0cbbd1ae39efa717 Mon Sep 17 00:00:00 2001 From: Saoirse O'Donovan Date: Mon, 20 Mar 2023 09:29:56 +0000 Subject: [PATCH] test/crypto: fix statistics error messages [ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ] The test stats testcase was printing the same error message for multiple errors in the test stats testcase. This is now replaced with descriptive error messages, which match the cause of the failure. Fixes: 202d375c60bc ("app/test: add cryptodev unit and performance tests") Signed-off-by: Saoirse O'Donovan Acked-by: Ciara Power --- app/test/test_cryptodev.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 15675df2d5..e43ad30bc8 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -10172,11 +10172,11 @@ test_stats(void) TEST_ASSERT((stats.enqueued_count == 1), "rte_cryptodev_stats_get returned unexpected enqueued stat"); TEST_ASSERT((stats.dequeued_count == 1), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued stat"); TEST_ASSERT((stats.enqueue_err_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued error count stat"); TEST_ASSERT((stats.dequeue_err_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued error count stat"); /* invalid device but should ignore and not reset device stats*/ rte_cryptodev_stats_reset(ts_params->valid_devs[0] + 300); @@ -10184,7 +10184,7 @@ test_stats(void) &stats), "rte_cryptodev_stats_get failed"); TEST_ASSERT((stats.enqueued_count == 1), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued stat after invalid reset"); /* check that a valid reset clears stats */ rte_cryptodev_stats_reset(ts_params->valid_devs[0]); @@ -10192,9 +10192,9 @@ test_stats(void) &stats), "rte_cryptodev_stats_get failed"); TEST_ASSERT((stats.enqueued_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected enqueued stat after valid reset"); TEST_ASSERT((stats.dequeued_count == 0), - "rte_cryptodev_stats_get returned unexpected enqueued stat"); + "rte_cryptodev_stats_get returned unexpected dequeued stat after valid reset"); return TEST_SUCCESS; } -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-29 01:31:22.829092261 +0100 +++ 0006-test-crypto-fix-statistics-error-messages.patch 2023-03-29 01:31:22.506039977 +0100 @@ -1 +1 @@ -From 051af8d174dd0f100f407269c25c007216c912ad Mon Sep 17 00:00:00 2001 +From 21d71fb87106deef57df3f7e0cbbd1ae39efa717 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 051af8d174dd0f100f407269c25c007216c912ad ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -16 +16,0 @@ - .mailmap | 1 + @@ -18 +18 @@ - 2 files changed, 7 insertions(+), 6 deletions(-) + 1 file changed, 6 insertions(+), 6 deletions(-) @@ -20,12 +19,0 @@ -diff --git a/.mailmap b/.mailmap -index dc30369117..cac02a6f48 100644 ---- a/.mailmap -+++ b/.mailmap -@@ -1182,6 +1182,7 @@ Sangjin Han - Sankar Chokkalingam - Santoshkumar Karanappa Rastapur - Santosh Shukla -+Saoirse O'Donovan - Saori Usami - Sarath Somasekharan - Sarosh Arif @@ -33 +21 @@ -index f4648755e5..9c670e9a35 100644 +index 15675df2d5..e43ad30bc8 100644 @@ -36 +24 @@ -@@ -12341,11 +12341,11 @@ test_stats(void) +@@ -10172,11 +10172,11 @@ test_stats(void) @@ -51 +39 @@ -@@ -12353,7 +12353,7 @@ test_stats(void) +@@ -10184,7 +10184,7 @@ test_stats(void) @@ -60 +48 @@ -@@ -12361,9 +12361,9 @@ test_stats(void) +@@ -10192,9 +10192,9 @@ test_stats(void)