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 D3C8442DA6 for ; Sat, 15 Jul 2023 00:35:44 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD810427EE; Sat, 15 Jul 2023 00:35:44 +0200 (CEST) Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by mails.dpdk.org (Postfix) with ESMTP id EC33B40DFB for ; Sat, 15 Jul 2023 00:35:43 +0200 (CEST) Received: by mail-wr1-f44.google.com with SMTP id ffacd0b85a97d-307d58b3efbso2546322f8f.0 for ; Fri, 14 Jul 2023 15:35:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1689374143; x=1691966143; 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=0EtktHtt7Hg4VktPKAZWF6C9Lv8R9Jl+PMy38v3elT0=; b=hMtBrSX6O1d+KeKUjuNyfH/t8jmhXh1TvJS15/Fj6EKOnXo8/H2E5mf8z/L/SqxhYw 3+8OO5BC/y9YNjRscGchlkkNl8k9Jin4VIsOIzDgUY+l+CeaRepLqZUv4xyiIgHlA+/X VJl0S4i3DHA843mHXj2hwR/tmyZ/KqoTftHKIDsveWIfXR1cUapwKDV/fbVTdYjBg0eU Hac3Qc9lm29f+paVExHuQCfezEGU7Yh8We5EBVK/VyV6av3jMhDTuqCufJDGSYSk8mql IcwRV32zKbQljwB5gkXNbleZwAOYqxbYM3JTLVHMPe88/sz+2jRR5oyksAYqI6bPt/5a 80/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689374143; x=1691966143; 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=0EtktHtt7Hg4VktPKAZWF6C9Lv8R9Jl+PMy38v3elT0=; b=KlUG0su96cWk2BXRYQ5m1xDnssUtVw+nnyLG0dzC/z2j3xROG8o//XvR+YrriFrgBo JSFlID+77QxwXfkN8Vh0cWRL71qIyVcA2fva3pTFpUkEyHmjqAojaQh0rk8SVM5u/dB3 gvFV+Kx7l5lU84RHLO+19WKkyreZPrjyKnuADGFecsOXXV252iscvY+KWdcBX2gnYomj 6D5TW/fm2/C3dtYENf1HY+7IA4zb9EXSS40OPO8IJczmtT4VfhevbeelWTGaQWU0pmHg +TVS1DMgnjgPcif3zwzmhd363C1Y3hjHfFoATTI7FH9yDV9cSsZRsW31HpJQIzz6vyLQ dmZQ== X-Gm-Message-State: ABy/qLbES0PJD7avPi21th0ejHTaiSNlvuS1i3yMRoUBxxbTkB+XxkSm /+afevFGb/abvtF12iit1iT1zSCZKhCuYqCJLPg= X-Google-Smtp-Source: APBJJlEv0sNpgC3pXlVjI5zLXitJVLhaJJXkRy5qezdqZ08JltM2ulPpP2HHzl7/4V7EvD5gJdolEw== X-Received: by 2002:adf:f004:0:b0:313:deda:c444 with SMTP id j4-20020adff004000000b00313dedac444mr5235520wro.24.1689374143450; Fri, 14 Jul 2023 15:35:43 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id t14-20020a5d690e000000b003112f836d4esm11971154wru.85.2023.07.14.15.35.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 15:35:43 -0700 (PDT) From: luca.boccassi@gmail.com 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 20.11.9 Date: Fri, 14 Jul 2023 23:34:45 +0100 Message-Id: <20230714223447.1092828-16-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230714223447.1092828-1-luca.boccassi@gmail.com> References: <20230628141046.2145871-22-luca.boccassi@gmail.com> <20230714223447.1092828-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.9 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/16/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/e8648ad62ae883017c79ba70755134441f799c99 Thanks. Luca Boccassi --- >From e8648ad62ae883017c79ba70755134441f799c99 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 49af812d8b..972dd6c776 100644 --- a/app/test-crypto-perf/main.c +++ b/app/test-crypto-perf/main.c @@ -191,11 +191,10 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) #endif 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; rte_cryptodev_info_get(cdev_id, &cdev_info); @@ -607,7 +606,11 @@ 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( session_pool_socket[socket_id].sess_mp, -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-07-14 23:33:09.236646958 +0100 +++ 0016-app-crypto-perf-fix-socket-ID-default-value.patch 2023-07-14 23:33:08.507305494 +0100 @@ -1 +1 @@ -From a23b5064d9d01079f5578b83151e03b1f6baa844 Mon Sep 17 00:00:00 2001 +From e8648ad62ae883017c79ba70755134441f799c99 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 49af812d8b..972dd6c776 100644 @@ -25 +26 @@ -@@ -193,11 +193,10 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) +@@ -191,11 +191,10 @@ cperf_initialize_cryptodev(struct cperf_options *opts, uint8_t *enabled_cdevs) @@ -41 +42 @@ -@@ -650,7 +649,11 @@ main(int argc, char **argv) +@@ -607,7 +606,11 @@ main(int argc, char **argv)