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 69F69A04DD for ; Wed, 18 Nov 2020 17:36:56 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 62E49160; Wed, 18 Nov 2020 17:36:55 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id B095B160 for ; Wed, 18 Nov 2020 17:36:52 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717411; 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=QbAChMEKvJsk5k7uZcT7qvpk7+q6w92pANFrW2yiXXk=; b=egmYq61TWoLuIhV/vIRUpSreOihq/J8gBmt1WWl8fWIeRFtZ/OBAvLBBwDCiEi7Z5oMnIO HQTFB8h4Tlg1SLKOzegxT7Sh3+64iGoXSvB8I/aEWFi/qpPZuqKx+JyonOQNWxKZDvc1wQ h04kYj25+g21yWpudtLbJTqBTou5m4w= 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-290-87AMeb08NAG31o080yEvwg-1; Wed, 18 Nov 2020 11:36:48 -0500 X-MC-Unique: 87AMeb08NAG31o080yEvwg-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 C303518C89D6; Wed, 18 Nov 2020 16:36:28 +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 A61365F9CB; Wed, 18 Nov 2020 16:36:27 +0000 (UTC) From: Kevin Traynor To: Ankur Dwivedi Cc: Abhinandan Gujjar , dpdk stable Date: Wed, 18 Nov 2020 16:34:52 +0000 Message-Id: <20201118163558.1101823-6-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-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 'test/event: fix function arguments for crypto adapter' 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/24/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/e79d221ec489178780db9559f87996f9175df768 Thanks. Kevin. --- >From e79d221ec489178780db9559f87996f9175df768 Mon Sep 17 00:00:00 2001 From: Ankur Dwivedi Date: Thu, 8 Oct 2020 18:22:33 +0530 Subject: [PATCH] test/event: fix function arguments for crypto adapter [ upstream commit 45eb85e9bff1c03cf72fb2ff9722757b64d47735 ] The arguments passed to rte_event_crypto_adapter_caps_get() and rte_event_crypto_adapter_create() are incorrect. In the rte_event_crypto_adapter_caps_get(), event device id should be the first argument and cryptodev id should be the second argument. In the rte_event_crypto_adapter_create(), the event device id should be the second argument. Fixes: 3c2c535ecfc0 ("test: add event crypto adapter auto-test") Signed-off-by: Ankur Dwivedi Acked-by: Abhinandan Gujjar --- test/test/test_event_crypto_adapter.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/test/test/test_event_crypto_adapter.c b/test/test/test_event_crypto_adapter.c index de258c3462..24894fedf0 100644 --- a/test/test/test_event_crypto_adapter.c +++ b/test/test/test_event_crypto_adapter.c @@ -201,6 +201,6 @@ test_op_forward_mode(uint8_t session_less) &cipher_xform, params.session_mpool); - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, - evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, + &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); @@ -288,5 +288,5 @@ test_sessionless_with_op_forward_mode(void) int ret; - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); @@ -308,5 +308,5 @@ test_session_with_op_forward_mode(void) int ret; - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); @@ -385,6 +385,6 @@ test_op_new_mode(uint8_t session_less) TEST_ASSERT_NOT_NULL(sess, "Session creation failed\n"); - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, - evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, + &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); @@ -433,5 +433,5 @@ test_sessionless_with_op_new_mode(void) int ret; - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); @@ -455,5 +455,5 @@ test_session_with_op_new_mode(void) int ret; - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); @@ -664,5 +664,5 @@ test_crypto_adapter_create(void) /* Create adapter with default port creation callback */ ret = rte_event_crypto_adapter_create(TEST_ADAPTER_ID, - TEST_CDEV_ID, + evdev, &conf, 0); TEST_ASSERT_SUCCESS(ret, "Failed to create event crypto adapter\n"); @@ -677,5 +677,5 @@ test_crypto_adapter_qp_add_del(void) int ret; - ret = rte_event_crypto_adapter_caps_get(TEST_ADAPTER_ID, evdev, &cap); + ret = rte_event_crypto_adapter_caps_get(evdev, TEST_CDEV_ID, &cap); TEST_ASSERT_SUCCESS(ret, "Failed to get adapter capabilities\n"); -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.104484615 +0000 +++ 0006-test-event-fix-function-arguments-for-crypto-adapter.patch 2020-11-18 16:33:37.901215044 +0000 @@ -1 +1 @@ -From 45eb85e9bff1c03cf72fb2ff9722757b64d47735 Mon Sep 17 00:00:00 2001 +From e79d221ec489178780db9559f87996f9175df768 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 45eb85e9bff1c03cf72fb2ff9722757b64d47735 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ - app/test/test_event_crypto_adapter.c | 20 ++++++++++---------- + test/test/test_event_crypto_adapter.c | 20 ++++++++++---------- @@ -23,6 +24,6 @@ -diff --git a/app/test/test_event_crypto_adapter.c b/app/test/test_event_crypto_adapter.c -index db9d75d3ff..37bcbecd47 100644 ---- a/app/test/test_event_crypto_adapter.c -+++ b/app/test/test_event_crypto_adapter.c -@@ -202,6 +202,6 @@ test_op_forward_mode(uint8_t session_less) - TEST_ASSERT_SUCCESS(ret, "Failed to init session\n"); +diff --git a/test/test/test_event_crypto_adapter.c b/test/test/test_event_crypto_adapter.c +index de258c3462..24894fedf0 100644 +--- a/test/test/test_event_crypto_adapter.c ++++ b/test/test/test_event_crypto_adapter.c +@@ -201,6 +201,6 @@ test_op_forward_mode(uint8_t session_less) + &cipher_xform, params.session_mpool); @@ -36 +37 @@ -@@ -289,5 +289,5 @@ test_sessionless_with_op_forward_mode(void) +@@ -288,5 +288,5 @@ test_sessionless_with_op_forward_mode(void) @@ -43 +44 @@ -@@ -314,5 +314,5 @@ test_session_with_op_forward_mode(void) +@@ -308,5 +308,5 @@ test_session_with_op_forward_mode(void) @@ -50 +51 @@ -@@ -395,6 +395,6 @@ test_op_new_mode(uint8_t session_less) +@@ -385,6 +385,6 @@ test_op_new_mode(uint8_t session_less) @@ -59 +60 @@ -@@ -445,5 +445,5 @@ test_sessionless_with_op_new_mode(void) +@@ -433,5 +433,5 @@ test_sessionless_with_op_new_mode(void) @@ -66 +67 @@ -@@ -471,5 +471,5 @@ test_session_with_op_new_mode(void) +@@ -455,5 +455,5 @@ test_session_with_op_new_mode(void) @@ -73 +74 @@ -@@ -693,5 +693,5 @@ test_crypto_adapter_create(void) +@@ -664,5 +664,5 @@ test_crypto_adapter_create(void) @@ -80 +81 @@ -@@ -706,5 +706,5 @@ test_crypto_adapter_qp_add_del(void) +@@ -677,5 +677,5 @@ test_crypto_adapter_qp_add_del(void)