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 7038642ECF for ; Thu, 20 Jul 2023 17:24:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6CE5940685; Thu, 20 Jul 2023 17:24:13 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 8722E42D51 for ; Thu, 20 Jul 2023 17:24:11 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1689866651; 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=qGq/hcGsH2FZcghfjE3bZapveIMkqawNE1kDu8d9aII=; b=gFa/rRDuW5Ap2VADaevmWyWD2a2jlEX0jyt4a1L7dxvtYTh02oSUSfFhx2Do+b25PzWItW CAKo/ilkkYc99LD2ANQZiN5TWzAcf+ZgLdcga/jhpLScbMai/KP2+n+lgt6wNVzxJyEg0I 5lFElSkSc8pz4qMioEcll7WdtVLv6WM= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-595-f1RAJCI2OS2wWHriT4Q7qA-1; Thu, 20 Jul 2023 11:23:35 -0400 X-MC-Unique: f1RAJCI2OS2wWHriT4Q7qA-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C91AD936D36; Thu, 20 Jul 2023 15:23:28 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.15]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5605E492C13; Thu, 20 Jul 2023 15:23:26 +0000 (UTC) From: Kevin Traynor To: Ciara Power Cc: Kai Ji , Akhil Goyal , dpdk stable Subject: patch 'app/crypto-perf: fix socket ID default value' has been queued to stable release 21.11.5 Date: Thu, 20 Jul 2023 16:19:29 +0100 Message-ID: <20230720151942.262154-138-ktraynor@redhat.com> In-Reply-To: <20230720151942.262154-1-ktraynor@redhat.com> References: <20230720151942.262154-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/25/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/1ff3b5ffc33c86ef8926f7d608de244439d4234b Thanks. Kevin --- >From 1ff3b5ffc33c86ef8926f7d608de244439d4234b Mon Sep 17 00:00:00 2001 From: Ciara Power Date: Thu, 6 Jul 2023 10:51:51 +0000 Subject: [PATCH] app/crypto-perf: fix socket ID default value [ upstream commit a23b5064d9d01079f5578b83151e03b1f6baa844 ] Due to recent changes to the default device socket ID, before being used as an index for session mempool list, the socket ID should be set to 0 if unknown (-1). Fixes: 7dcd73e37965 ("drivers/bus: set device NUMA node to unknown by default") Fixes: 64c469b9e7d8 ("app/crypto-perf: check range of socket id") Signed-off-by: Ciara Power Acked-by: Kai Ji Acked-by: Akhil Goyal --- app/test-crypto-perf/main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/app/test-crypto-perf/main.c b/app/test-crypto-perf/main.c index 6fdb92fb7c..db0ebd0050 100644 --- a/app/test-crypto-perf/main.c +++ b/app/test-crypto-perf/main.c @@ -238,9 +238,8 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) struct rte_cryptodev_info cdev_info; - uint8_t socket_id = rte_cryptodev_socket_id(cdev_id); - /* range check the socket_id - negative values become big - * positive ones due to use of unsigned value - */ - if (socket_id >= RTE_MAX_NUMA_NODES) + int socket_id = rte_cryptodev_socket_id(cdev_id); + + /* Use the first socket if SOCKET_ID_ANY is returned. */ + if (socket_id == SOCKET_ID_ANY) socket_id = 0; @@ -702,5 +701,9 @@ main(int argc, char **argv) cdev_id = enabled_cdevs[cdev_index]; - uint8_t socket_id = rte_cryptodev_socket_id(cdev_id); + int socket_id = rte_cryptodev_socket_id(cdev_id); + + /* Use the first socket if SOCKET_ID_ANY is returned. */ + if (socket_id == SOCKET_ID_ANY) + socket_id = 0; ctx[i] = cperf_testmap[opts.test].constructor( -- 2.41.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-20 16:18:11.289292173 +0100 +++ 0138-app-crypto-perf-fix-socket-ID-default-value.patch 2023-07-20 16:17:55.222752799 +0100 @@ -1 +1 @@ -From a23b5064d9d01079f5578b83151e03b1f6baa844 Mon Sep 17 00:00:00 2001 +From 1ff3b5ffc33c86ef8926f7d608de244439d4234b Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit a23b5064d9d01079f5578b83151e03b1f6baa844 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index af5bd0d23b..bc1f0f9659 100644 +index 6fdb92fb7c..db0ebd0050 100644 @@ -25 +26 @@ -@@ -194,9 +194,8 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) +@@ -238,9 +238,8 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) @@ -39 +40 @@ -@@ -651,5 +650,9 @@ main(int argc, char **argv) +@@ -702,5 +701,9 @@ main(int argc, char **argv)